diff --git a/plugins/lua/lua-xp.vcxproj b/plugins/lua/lua-xp.vcxproj index fae42fb4..dfb85b5b 100644 --- a/plugins/lua/lua-xp.vcxproj +++ b/plugins/lua/lua-xp.vcxproj @@ -72,7 +72,7 @@ true true $(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories) - "$(LuaLib).lib";;dirent-win32.lib;%(AdditionalDependencies) + "$(LuaLib).lib";%(AdditionalDependencies) @@ -92,17 +92,17 @@ true true $(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories) - "$(LuaLib).lib";;dirent-win32.lib;%(AdditionalDependencies) + "$(LuaLib).lib";%(AdditionalDependencies) - "$(LuaLib).lib";$(DepLibs);dirent-win32.lib;%(AdditionalDependencies) + "$(LuaLib).lib";$(DepLibs);%(AdditionalDependencies) - "$(LuaLib).lib";$(DepLibs);dirent-win32.lib;%(AdditionalDependencies) + "$(LuaLib).lib";$(DepLibs);%(AdditionalDependencies) diff --git a/plugins/lua/lua.vcxproj b/plugins/lua/lua.vcxproj index fc3e92e4..38388587 100644 --- a/plugins/lua/lua.vcxproj +++ b/plugins/lua/lua.vcxproj @@ -69,7 +69,7 @@ true true $(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories) - "$(LuaLib).lib";;dirent-win32.lib;%(AdditionalDependencies) + "$(LuaLib).lib";%(AdditionalDependencies) @@ -89,17 +89,17 @@ true true $(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories) - "$(LuaLib).lib";;dirent-win32.lib;%(AdditionalDependencies) + "$(LuaLib).lib";%(AdditionalDependencies) - "$(LuaLib).lib";$(DepLibs);dirent-win32.lib;%(AdditionalDependencies) + "$(LuaLib).lib";$(DepLibs);%(AdditionalDependencies) - "$(LuaLib).lib";$(DepLibs);dirent-win32.lib;%(AdditionalDependencies) + "$(LuaLib).lib";$(DepLibs);%(AdditionalDependencies) diff --git a/plugins/python/python-xp.vcxproj b/plugins/python/python-xp.vcxproj index 7a6ab316..c6f075c0 100644 --- a/plugins/python/python-xp.vcxproj +++ b/plugins/python/python-xp.vcxproj @@ -73,7 +73,7 @@ true true python.def - "$(PythonLib).lib";$(DepLibs);dirent-win32.lib;%(AdditionalDependencies) + "$(PythonLib).lib";$(DepLibs);%(AdditionalDependencies) $(DepsRoot)\lib;$(OutDir);$(PythonPath)\libs;%(AdditionalLibraryDirectories) @@ -95,7 +95,7 @@ true true python.def - "$(PythonLib).lib";$(DepLibs);dirent-win32.lib;%(AdditionalDependencies) + "$(PythonLib).lib";$(DepLibs);%(AdditionalDependencies) $(DepsRoot)\lib;$(OutDir);$(PythonPath)\libs;%(AdditionalLibraryDirectories) diff --git a/plugins/python/python.vcxproj b/plugins/python/python.vcxproj index 63840764..1ef484fb 100644 --- a/plugins/python/python.vcxproj +++ b/plugins/python/python.vcxproj @@ -70,7 +70,7 @@ true true python.def - "$(PythonLib).lib";$(DepLibs);dirent-win32.lib;%(AdditionalDependencies) + "$(PythonLib).lib";$(DepLibs);%(AdditionalDependencies) $(DepsRoot)\lib;$(OutDir);$(PythonPath)\libs;%(AdditionalLibraryDirectories) @@ -92,7 +92,7 @@ true true python.def - "$(PythonLib).lib";$(DepLibs);dirent-win32.lib;%(AdditionalDependencies) + "$(PythonLib).lib";$(DepLibs);%(AdditionalDependencies) $(DepsRoot)\lib;$(OutDir);$(PythonPath)\libs;%(AdditionalLibraryDirectories) diff --git a/src/dirent/dirent-win32.c b/src/dirent/dirent-win32.c deleted file mode 100644 index 273c6732..00000000 --- a/src/dirent/dirent-win32.c +++ /dev/null @@ -1,199 +0,0 @@ -/***************************************************************************** - * dirent.h - dirent API for Microsoft Visual Studio - * - * Copyright (C) 2006 Toni Ronkko - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * ``Software''), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL TONI RONKKO BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - * Dec 15, 2009, John Cunningham - * Added rewinddir member function - * - * Jan 18, 2008, Toni Ronkko - * Using FindFirstFileA and WIN32_FIND_DATAA to avoid converting string - * between multi-byte and unicode representations. This makes the - * code simpler and also allows the code to be compiled under MingW. Thanks - * to Azriel Fasten for the suggestion. - * - * Mar 4, 2007, Toni Ronkko - * Bug fix: due to the strncpy_s() function this file only compiled in - * Visual Studio 2005. Using the new string functions only when the - * compiler version allows. - * - * Nov 2, 2006, Toni Ronkko - * Major update: removed support for Watcom C, MS-DOS and Turbo C to - * simplify the file, updated the code to compile cleanly on Visual - * Studio 2005 with both unicode and multi-byte character strings, - * removed rewinddir() as it had a bug. - * - * Aug 20, 2006, Toni Ronkko - * Removed all remarks about MSVC 1.0, which is antiqued now. Simplified - * comments by removing SGML tags. - * - * May 14 2002, Toni Ronkko - * Embedded the function definitions directly to the header so that no - * source modules need to be included in the Visual Studio project. Removed - * all the dependencies to other projects so that this very header can be - * used independently. - * - * May 28 1998, Toni Ronkko - * First version. - *****************************************************************************/ - -#include "dirent-win32.h" - -/* Use the new safe string functions introduced in Visual Studio 2005 */ -#if defined(_MSC_VER) && _MSC_VER >= 1400 -# define STRNCPY(dest,src,size) strncpy_s((dest),(size),(src),_TRUNCATE) -#else -# define STRNCPY(dest,src,size) strncpy((dest),(src),(size)) -#endif - - -/***************************************************************************** - * Open directory stream DIRNAME for read and return a pointer to the - * internal working area that is used to retrieve individual directory - * entries. - */ -DIR *opendir(const char *dirname) -{ - DIR *dirp; - assert (dirname != NULL); - assert (strlen (dirname) < MAX_PATH); - - /* construct new DIR structure */ - dirp = (DIR*) malloc (sizeof (struct DIR)); - if (dirp != NULL) { - char *p; - - /* take directory name... */ - STRNCPY (dirp->patt, dirname, sizeof(dirp->patt)); - dirp->patt[MAX_PATH] = '\0'; - - /* ... and append search pattern to it */ - p = strchr (dirp->patt, '\0'); - if (dirp->patt < p && *(p-1) != '\\' && *(p-1) != ':') { - *p++ = '\\'; - } - *p++ = '*'; - *p = '\0'; - - /* open stream and retrieve first file */ - dirp->search_handle = FindFirstFileA (dirp->patt, &dirp->current.data); - if (dirp->search_handle == INVALID_HANDLE_VALUE) { - /* invalid search pattern? */ - free (dirp); - return NULL; - } - - /* there is an un-processed directory entry in memory now */ - dirp->cached = 1; - } - - return dirp; -} - - -/***************************************************************************** - * Read a directory entry, and return a pointer to a dirent structure - * containing the name of the entry in d_name field. Individual directory - * entries returned by this very function include regular files, - * sub-directories, pseudo-directories "." and "..", but also volume labels, - * hidden files and system files may be returned. - */ -struct dirent *readdir(DIR *dirp) -{ - assert (dirp != NULL); - - if (dirp->search_handle == INVALID_HANDLE_VALUE) { - /* directory stream was opened/rewound incorrectly or ended normally */ - return NULL; - } - - /* get next directory entry */ - if (dirp->cached != 0) { - /* a valid directory entry already in memory */ - dirp->cached = 0; - } else { - /* read next directory entry from disk */ - if (FindNextFileA (dirp->search_handle, &dirp->current.data) == FALSE) { - /* the very last file has been processed or an error occured */ - FindClose (dirp->search_handle); - dirp->search_handle = INVALID_HANDLE_VALUE; - return NULL; - } - } - - /* copy as a multibyte character string */ - STRNCPY ( dirp->current.d_name, - dirp->current.data.cFileName, - sizeof(dirp->current.d_name) ); - dirp->current.d_name[MAX_PATH] = '\0'; - - return &dirp->current; -} - - -/***************************************************************************** - * Close directory stream opened by opendir() function. Close of the - * directory stream invalidates the DIR structure as well as any previously - * read directory entry. - */ -int closedir(DIR *dirp) -{ - assert (dirp != NULL); - - /* release search handle */ - if (dirp->search_handle != INVALID_HANDLE_VALUE) { - FindClose (dirp->search_handle); - dirp->search_handle = INVALID_HANDLE_VALUE; - } - - /* release directory handle */ - free (dirp); - return 0; -} - - -/***************************************************************************** - * Resets the position of the directory stream to which dirp refers to the - * beginning of the directory. It also causes the directory stream to refer - * to the current state of the corresponding directory, as a call to opendir() - * would have done. If dirp does not refer to a directory stream, the effect - * is undefined. - */ -void rewinddir(DIR* dirp) -{ - /* release search handle */ - if (dirp->search_handle != INVALID_HANDLE_VALUE) { - FindClose (dirp->search_handle); - dirp->search_handle = INVALID_HANDLE_VALUE; - } - - /* open new search handle and retrieve first file */ - dirp->search_handle = FindFirstFileA (dirp->patt, &dirp->current.data); - if (dirp->search_handle == INVALID_HANDLE_VALUE) { - /* invalid search pattern? */ - free (dirp); - return; - } - - /* there is an un-processed directory entry in memory now */ - dirp->cached = 1; -} diff --git a/src/dirent/dirent-win32.h b/src/dirent/dirent-win32.h index cbb753e6..a61f7b6a 100644 --- a/src/dirent/dirent-win32.h +++ b/src/dirent/dirent-win32.h @@ -1,28 +1,695 @@ +/* + * dirent.h - dirent API for Microsoft Visual Studio + * + * Copyright (C) 2006-2012 Toni Ronkko + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * ``Software''), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL TONI RONKKO BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * + * Version 1.12.1, Oct 1 2012, Toni Ronkko + * Bug fix: renamed wide-character DIR structure _wDIR to _WDIR (with + * capital W) in order to maintain compatibility with MingW. + * + * Version 1.12, Sep 30 2012, Toni Ronkko + * Define PATH_MAX and NAME_MAX. + * + * Added wide-character variants _wDIR, _wdirent, _wopendir(), + * _wreaddir(), _wclosedir() and _wrewinddir(). Thanks to Edgar Buerkle + * and Jan Nijtmans for ideas and code. + * + * Do not include windows.h. This allows dirent.h to be integrated more + * easily into programs using winsock. Thanks to Fernando Azaldegui. + * + * Version 1.11, Mar 15, 2011, Toni Ronkko + * Defined FILE_ATTRIBUTE_DEVICE for MSVC 6.0. + * + * Version 1.10, Aug 11, 2010, Toni Ronkko + * Added d_type and d_namlen fields to dirent structure. The former is + * especially useful for determining whether directory entry represents a + * file or a directory. For more information, see + * http://www.delorie.com/gnu/docs/glibc/libc_270.html + * + * Improved conformance to the standards. For example, errno is now set + * properly on failure and assert() is never used. Thanks to Peter Brockam + * for suggestions. + * + * Fixed a bug in rewinddir(): when using relative directory names, change + * of working directory no longer causes rewinddir() to fail. + * + * Version 1.9, Dec 15, 2009, John Cunningham + * Added rewinddir member function + * + * Version 1.8, Jan 18, 2008, Toni Ronkko + * Using FindFirstFileA and WIN32_FIND_DATAA to avoid converting string + * between multi-byte and unicode representations. This makes the + * code simpler and also allows the code to be compiled under MingW. Thanks + * to Azriel Fasten for the suggestion. + * + * Mar 4, 2007, Toni Ronkko + * Bug fix: due to the strncpy_s() function this file only compiled in + * Visual Studio 2005. Using the new string functions only when the + * compiler version allows. + * + * Nov 2, 2006, Toni Ronkko + * Major update: removed support for Watcom C, MS-DOS and Turbo C to + * simplify the file, updated the code to compile cleanly on Visual + * Studio 2005 with both unicode and multi-byte character strings, + * removed rewinddir() as it had a bug. + * + * Aug 20, 2006, Toni Ronkko + * Removed all remarks about MSVC 1.0, which is antiqued now. Simplified + * comments by removing SGML tags. + * + * May 14 2002, Toni Ronkko + * Embedded the function definitions directly to the header so that no + * source modules need to be included in the Visual Studio project. Removed + * all the dependencies to other projects so that this header file can be + * used independently. + * + * May 28 1998, Toni Ronkko + * First version. + *****************************************************************************/ #ifndef DIRENT_H #define DIRENT_H -#include +#if !defined(_68K_) && !defined(_MPPC_) && !defined(_X86_) && !defined(_IA64_) && !defined(_AMD64_) && defined(_M_IX86) +#define _X86_ +#endif +#include +#include +#include +#include +#include +#include #include -#include +#include +#include +#include +#include -typedef struct dirent +/* Windows 8 wide-character string functions */ +#if (_WIN32_WINNT >= 0x0602) +# include +#endif + +/* Entries missing from MSVC 6.0 */ +#if !defined(FILE_ATTRIBUTE_DEVICE) +# define FILE_ATTRIBUTE_DEVICE 0x40 +#endif + +/* File type and permission flags for stat() */ +#if defined(_MSC_VER) && !defined(S_IREAD) +# define S_IFMT _S_IFMT /* File type mask */ +# define S_IFDIR _S_IFDIR /* Directory */ +# define S_IFCHR _S_IFCHR /* Character device */ +# define S_IFFIFO _S_IFFIFO /* Pipe */ +# define S_IFREG _S_IFREG /* Regular file */ +# define S_IREAD _S_IREAD /* Read permission */ +# define S_IWRITE _S_IWRITE /* Write permission */ +# define S_IEXEC _S_IEXEC /* Execute permission */ +#endif +#define S_IFBLK 0 /* Block device */ +#define S_IFLNK 0 /* Link */ +#define S_IFSOCK 0 /* Socket */ + +#if defined(_MSC_VER) +# define S_IRUSR S_IREAD /* Read user */ +# define S_IWUSR S_IWRITE /* Write user */ +# define S_IXUSR 0 /* Execute user */ +# define S_IRGRP 0 /* Read group */ +# define S_IWGRP 0 /* Write group */ +# define S_IXGRP 0 /* Execute group */ +# define S_IROTH 0 /* Read others */ +# define S_IWOTH 0 /* Write others */ +# define S_IXOTH 0 /* Execute others */ +#endif + +/* Indicates that d_type field is available in dirent structure */ +#define _DIRENT_HAVE_D_TYPE + +/* File type flags for d_type */ +#define DT_UNKNOWN 0 +#define DT_REG S_IFREG +#define DT_DIR S_IFDIR +#define DT_FIFO S_IFFIFO +#define DT_SOCK S_IFSOCK +#define DT_CHR S_IFCHR +#define DT_BLK S_IFBLK + +/* Macros for converting between st_mode and d_type */ +#define IFTODT(mode) ((mode) & S_IFMT) +#define DTTOIF(type) (type) + +/* + * File type macros. Note that block devices, sockets and links cannot be + * distinguished on Windows and the macros S_ISBLK, S_ISSOCK and S_ISLNK are + * only defined for compatibility. These macros should always return false + * on Windows. + */ +#define S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFFIFO) +#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) +#define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG) +#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK) +#define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK) +#define S_ISCHR(mode) (((mode) & S_IFMT) == S_IFCHR) +#define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK) + +/* For compatiblity with Unix */ +#if !defined(PATH_MAX) +# define PATH_MAX MAX_PATH +#endif +#if !defined(FILENAME_MAX) +# define FILENAME_MAX MAX_PATH +#endif +#if !defined(NAME_MAX) +# define NAME_MAX FILENAME_MAX +#endif + +/* Set errno variable */ +#if defined(_MSC_VER) +#define DIRENT_SET_ERRNO(x) _set_errno (x) +#else +#define DIRENT_SET_ERRNO(x) (errno = (x)) +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* Wide-character versions */ +struct _wdirent { + long d_ino; /* Always zero */ + unsigned short d_reclen; /* Structure size */ + size_t d_namlen; /* Length of name without \0 */ + int d_type; /* File type */ + wchar_t d_name[PATH_MAX + 1]; /* File name */ +}; +typedef struct _wdirent _wdirent; + +struct _WDIR { + struct _wdirent ent; /* Current directory entry */ + WIN32_FIND_DATAW find_data; /* Private file data */ + int cached; /* True if data is valid */ + HANDLE handle; /* Win32 search handle */ + wchar_t *patt; /* Initial directory name */ +}; +typedef struct _WDIR _WDIR; + +static _WDIR *_wopendir (const wchar_t *dirname); +static struct _wdirent *_wreaddir (_WDIR *dirp); +static int _wclosedir (_WDIR *dirp); +static void _wrewinddir (_WDIR* dirp); + +/* For compatibility with Symbian */ +#define wdirent _wdirent +#define WDIR _WDIR +#define wopendir _wopendir +#define wreaddir _wreaddir +#define wclosedir _wclosedir +#define wrewinddir _wrewinddir + + +/* Multi-byte character versions */ +struct dirent { + long d_ino; /* Always zero */ + unsigned short d_reclen; /* Structure size */ + size_t d_namlen; /* Length of name without \0 */ + int d_type; /* File type */ + char d_name[PATH_MAX + 1]; /* File name */ +}; +typedef struct dirent dirent; + +struct DIR { + struct dirent ent; + struct _WDIR *wdirp; +}; +typedef struct DIR DIR; + +static DIR *opendir (const char *dirname); +static struct dirent *readdir (DIR *dirp); +static int closedir (DIR *dirp); +static void rewinddir (DIR* dirp); + + +/* + * Open directory stream DIRNAME for read and return a pointer to the + * internal working area that is used to retrieve individual directory + * entries. + */ +static _WDIR* +_wopendir( + const wchar_t *dirname) { - char d_name[MAX_PATH + 1]; /* current dir entry (multi-byte char string) */ - WIN32_FIND_DATAA data; /* file attributes */ -} dirent; + _WDIR *dirp = NULL; + int error = 0; -typedef struct DIR + /* Allocate new _WDIR structure */ + dirp = (_WDIR*) malloc (sizeof (struct _WDIR)); + if (dirp != NULL) { + DWORD n; + + /* Reset _WDIR structure */ + dirp->handle = INVALID_HANDLE_VALUE; + dirp->patt = NULL; + + /* Compute the length of full path plus zero terminator */ + n = GetFullPathNameW (dirname, 0, NULL, NULL); + + /* Allocate room for full path and search patterns */ + dirp->patt = (wchar_t*) malloc (sizeof (wchar_t) * n + 16); + if (dirp->patt) { + + /* + * Convert relative directory name to an absolute one. This + * allows rewinddir() to function correctly when the current + * working directory is changed between opendir() and rewinddir(). + */ + n = GetFullPathNameW (dirname, n, dirp->patt, NULL); + if (n > 0) { + wchar_t *p; + + /* Append search pattern \* to the directory name */ + p = dirp->patt + n; + if (dirp->patt < p) { + switch (p[-1]) { + case '\\': + case '/': + case ':': + /* Directory ends in path separator, e.g. c:\temp\ */ + /*NOP*/; + break; + + default: + /* Directory name doesn't end in path separator */ + *p++ = '\\'; + } + } + *p++ = '*'; + *p = '\0'; + + /* Open directory stream and retrieve the first entry */ + dirp->handle = FindFirstFileW (dirp->patt, &dirp->find_data); + if (dirp->handle != INVALID_HANDLE_VALUE) { + + /* Directory entry is now waiting in memory */ + dirp->cached = 1; + + } else { + /* Search pattern is not a directory name? */ + DIRENT_SET_ERRNO (ENOENT); + error = 1; + } + + } else { + /* Cannot convert directory name to wide character string */ + DIRENT_SET_ERRNO (ENOENT); + error = 1; + } + + } else { + /* Cannot allocate memory for search pattern */ + error = 1; + } + + } else { + /* Cannot allocate _WDIR structure */ + error = 1; + } + + /* Clean up in case of error */ + if (error && dirp) { + _wclosedir (dirp); + dirp = NULL; + } + + return dirp; +} + +/* + * Read next directory entry. The directory entry is returned in dirent + * structure in the d_name field. Individual directory entries returned by + * this function include regular files, sub-directories, pseudo-directories + * "." and ".." as well as volume labels, hidden files and system files. + */ +static struct _wdirent* +_wreaddir( + _WDIR *dirp) { - dirent current; /* Current directory entry */ - int cached; /* Indicates un-processed entry in memory */ - HANDLE search_handle; /* File search handle */ - char patt[MAX_PATH + 3]; /* search pattern (3 = pattern + "\\*\0") */ -} DIR; + DWORD attr; + errno_t error; -/* Forward declarations */ -DIR *opendir (const char *dirname); -struct dirent *readdir (DIR *dirp); -int closedir (DIR *dirp); -void rewinddir(DIR* dirp); + /* Get next directory entry */ + if (dirp->cached != 0) { + /* A valid directory entry already in memory */ + dirp->cached = 0; + } else { + /* Get the next directory entry from stream */ + if (dirp->handle == INVALID_HANDLE_VALUE) { + return NULL; + } + if (FindNextFileW (dirp->handle, &dirp->find_data) == FALSE) { + /* The very last entry has been processed or an error occured */ + FindClose (dirp->handle); + dirp->handle = INVALID_HANDLE_VALUE; + return NULL; + } + } + /* Copy file name as a wide-character string */ + error = wcsncpy_s( + dirp->ent.d_name, /* Destination string */ + PATH_MAX, /* Size of dest in words */ + dirp->find_data.cFileName, /* Source string */ + PATH_MAX + 1); /* Max # of chars to copy */ + if (!error) { + + /* Compute the length of name */ + dirp->ent.d_namlen = wcsnlen (dirp->ent.d_name, PATH_MAX); + + /* Determine file type */ + attr = dirp->find_data.dwFileAttributes; + if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) { + dirp->ent.d_type = DT_CHR; + } else if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) { + dirp->ent.d_type = DT_DIR; + } else { + dirp->ent.d_type = DT_REG; + } + + /* Reset dummy fields */ + dirp->ent.d_ino = 0; + dirp->ent.d_reclen = sizeof (dirp->ent); + + } else { + + /* + * Cannot copy file name from find_data to ent. Construct a + * dummy _wdirent structure to pass error to caller. + */ + dirp->ent.d_name[0] = '?'; + dirp->ent.d_name[1] = '\0'; + dirp->ent.d_namlen = 1; + dirp->ent.d_type = DT_UNKNOWN; + dirp->ent.d_ino = 0; + dirp->ent.d_reclen = 0; + } + + return &dirp->ent; +} + +/* + * Close directory stream opened by opendir() function. This invalidates the + * DIR structure as well as any directory entry read previously by + * _wreaddir(). + */ +static int +_wclosedir( + _WDIR *dirp) +{ + int ok; + if (dirp) { + + /* Release search handle */ + if (dirp->handle != INVALID_HANDLE_VALUE) { + FindClose (dirp->handle); + dirp->handle = INVALID_HANDLE_VALUE; + } + + /* Release search pattern */ + if (dirp->patt) { + free (dirp->patt); + dirp->patt = NULL; + } + + /* Release directory structure */ + free (dirp); + ok = /*success*/0; + + } else { + /* Invalid directory stream */ + DIRENT_SET_ERRNO (EBADF); + ok = /*failure*/-1; + } + return ok; +} + +/* + * Rewind directory stream such that _wreaddir() returns the very first + * file name again. + */ +static void +_wrewinddir( + _WDIR* dirp) +{ + if (dirp != NULL) { + /* release search handle */ + if (dirp->handle != INVALID_HANDLE_VALUE) { + FindClose (dirp->handle); + } + + /* Open new search handle and retrieve the first directory entry */ + dirp->handle = FindFirstFileW (dirp->patt, &dirp->find_data); + if (dirp->handle != INVALID_HANDLE_VALUE) { + /* a directory entry is now waiting in memory */ + dirp->cached = 1; + } else { + /* Failed to re-open directory: no directory entry in memory */ + dirp->cached = 0; + } + } +} + +/* + * Open directory stream using plain old C-string. + */ +static DIR* +opendir( + const char *dirname) +{ + struct DIR *dirp; + errno_t error = 0; + + /* Must have directory name */ + if (dirname == NULL) { + DIRENT_SET_ERRNO (ENOENT); + return NULL; + } + + /* Allocate memory for multi-byte string directory structures */ + dirp = (DIR*) malloc (sizeof (struct DIR)); + if (dirp) { + wchar_t wname[PATH_MAX + 1]; + size_t n; + + /* + * Convert directory name to wide-character string. + * + * Be ware of the return schemantics of MultiByteToWideChar() -- + * the function basically returns the number of characters written to + * output buffer or zero if the conversion fails. However, the + * function does not necessarily zero-terminate the output + * buffer and may return 0xFFFD if the string contains invalid + * characters! + */ + n = MultiByteToWideChar( + CP_ACP, /* Input code page */ + MB_PRECOMPOSED, /* Conversion flags */ + dirname, /* Input string */ + -1, /* Length of input string */ + wname, /* Output buffer */ + PATH_MAX); /* Size of output buffer */ + if (n > 0 && n < PATH_MAX) { + + /* Zero-terminate output buffer */ + wname[n] = '\0'; + + /* Open directory stream with wide-character string file name */ + dirp->wdirp = _wopendir (wname); + if (dirp->wdirp) { + + /* Initialize directory structure */ + dirp->ent.d_name[0] = '\0'; + dirp->ent.d_namlen = 0; + dirp->ent.d_type = 0; + dirp->ent.d_ino = 0; + dirp->ent.d_reclen = 0; + + + } else { + /* Failed to open directory stream */ + error = 1; + } + + } else { + /* + * Cannot convert file name to wide-character string. This + * occurs if the string contains invalid multi-byte sequences or + * the output buffer is too small to contain the resulting + * string. + */ + error = 1; + } + + } else { + /* Cannot allocate DIR structure */ + error = 1; + } + + /* Clean up in case of error */ + if (error && dirp) { + free (dirp); + dirp = NULL; + } + + return dirp; +} + +/* + * Read next directory entry. + * + * When working with console, please note that file names returned by + * readdir() are represented in the default ANSI code page while the + * console typically runs on another code page. Thus, non-ASCII characters + * will not usually display correctly. The problem can be fixed in two ways: + * (1) change the character set of console to 1252 using chcp utility and use + * Lucida Console font, or (2) always use _cprintf function when writing to + * console. The _cprinf() will re-encode ANSI strings to the console code + * page so non-ASCII characters will display correcly. + */ +static struct dirent* +readdir( + DIR *dirp) +{ + struct dirent *p; + struct _wdirent *wp; + + /* Read next directory entry using wide-character string functions */ + wp = _wreaddir (dirp->wdirp); + if (wp) { + size_t n; + + /* + * Convert file name to multi-byte string. + * + * Be ware of the return schemantics of WideCharToMultiByte() -- + * the function basically returns the number of bytes + * written to output buffer or zero if the conversion fails. + * However, the function does not necessarily zero-terminate the + * buffer and it may even return 0xFFFD the string contains + * invalid characters! + */ + n = WideCharToMultiByte( + CP_ACP, /* Output code page */ + 0, /* Conversion flags */ + wp->d_name, /* Input string */ + wp->d_namlen, /* Length of input string */ + dirp->ent.d_name, /* Output buffer */ + PATH_MAX, /* Size of output buffer */ + NULL, /* Replacement character */ + NULL); /* If chars were replaced */ + if (n > 0 && n < PATH_MAX) { + + /* Zero-terminate buffer */ + dirp->ent.d_name[n] = '\0'; + + /* Initialize directory entry for return */ + p = &dirp->ent; + + /* Compute length */ + p->d_namlen = strnlen (dirp->ent.d_name, PATH_MAX); + + /* Copy file attributes */ + p->d_type = wp->d_type; + + /* Reset dummy fields */ + p->d_ino = 0; + p->d_reclen = sizeof (dirp->ent); + + + } else { + + /* + * Cannot convert file name to multi-byte string so construct + * an errornous directory entry and return that. Note that + * we cannot return NULL as that would stop the processing + * of directory entries completely. + */ + p = &dirp->ent; + p->d_name[0] = '?'; + p->d_name[1] = '\0'; + p->d_namlen = 1; + p->d_type = DT_UNKNOWN; + p->d_ino = 0; + p->d_reclen = 0; + + } + + } else { + + /* End of directory stream */ + p = NULL; + + } + + return p; +} + +/* + * Close directory stream. + */ +static int +closedir( + DIR *dirp) +{ + int ok; + if (dirp) { + + /* Close wide-character directory stream */ + ok = _wclosedir (dirp->wdirp); + dirp->wdirp = NULL; + + /* Release multi-byte character version */ + free (dirp); + + } else { + /* Invalid directory stream */ + DIRENT_SET_ERRNO (EBADF); + ok = /*failure*/-1; + } + return ok; +} + +/* + * Rewind directory stream to beginning. + */ +static void +rewinddir( + DIR* dirp) +{ + /* Rewind wide-character string directory stream */ + _wrewinddir (dirp->wdirp); +} + + +#ifdef __cplusplus +} +#endif #endif /*DIRENT_H*/ + diff --git a/src/dirent/dirent-xp.vcxproj b/src/dirent/dirent-xp.vcxproj deleted file mode 100644 index 1f54ecb5..00000000 --- a/src/dirent/dirent-xp.vcxproj +++ /dev/null @@ -1,101 +0,0 @@ - - - - - Release - Win32 - - - Release - x64 - - - - - - - - - - {98B56DF9-E4F1-4696-A565-5F7823CF214D} - Win32Proj - dirent - dirent - - - - StaticLibrary - false - true - MultiByte - WDK7 - - - StaticLibrary - false - true - MultiByte - WDK7 - - - - - - - - - - - - - - - $(ProjectName)-win32 - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - $(ProjectName)-win32 - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - - Level1 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - - - - - Level1 - - - MaxSpeed - true - true - WIN32;_WIN64;_AMD64_;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - - - - - - \ No newline at end of file diff --git a/src/dirent/dirent-xp.vcxproj.filters b/src/dirent/dirent-xp.vcxproj.filters deleted file mode 100644 index d889015d..00000000 --- a/src/dirent/dirent-xp.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/src/dirent/dirent.vcxproj b/src/dirent/dirent.vcxproj deleted file mode 100644 index 0d116e95..00000000 --- a/src/dirent/dirent.vcxproj +++ /dev/null @@ -1,98 +0,0 @@ - - - - - Release - Win32 - - - Release - x64 - - - - - - - - - - {98B56DF9-E4F1-4696-A565-5F7823CF214D} - Win32Proj - dirent - - - - StaticLibrary - false - true - MultiByte - - - StaticLibrary - false - true - MultiByte - - - - - - - - - - - - - - - $(ProjectName)-win32 - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - $(ProjectName)-win32 - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - - Level1 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - - - - - Level1 - - - MaxSpeed - true - true - WIN32;_WIN64;_AMD64_;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - - - - - - \ No newline at end of file diff --git a/src/dirent/dirent.vcxproj.filters b/src/dirent/dirent.vcxproj.filters deleted file mode 100644 index d889015d..00000000 --- a/src/dirent/dirent.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/src/fe-gtk/fe-gtk-xp.vcxproj b/src/fe-gtk/fe-gtk-xp.vcxproj index 26fb830f..3c1bbd2d 100644 --- a/src/fe-gtk/fe-gtk-xp.vcxproj +++ b/src/fe-gtk/fe-gtk-xp.vcxproj @@ -73,7 +73,7 @@ true true $(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories) - $(DepLibs);common.lib;dirent-win32.lib;%(AdditionalDependencies) + $(DepLibs);common.lib;%(AdditionalDependencies) mainCRTStartup @@ -95,7 +95,7 @@ true true $(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories) - $(DepLibs);common.lib;dirent-win32.lib;%(AdditionalDependencies) + $(DepLibs);common.lib;%(AdditionalDependencies) mainCRTStartup diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj index 4a150d92..29add83f 100644 --- a/src/fe-gtk/fe-gtk.vcxproj +++ b/src/fe-gtk/fe-gtk.vcxproj @@ -70,7 +70,7 @@ true true $(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories) - $(DepLibs);common.lib;dirent-win32.lib;%(AdditionalDependencies) + $(DepLibs);common.lib;%(AdditionalDependencies) mainCRTStartup @@ -92,7 +92,7 @@ true true $(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories) - $(DepLibs);common.lib;dirent-win32.lib;%(AdditionalDependencies) + $(DepLibs);common.lib;%(AdditionalDependencies) mainCRTStartup diff --git a/src/fe-text/fe-text-xp.vcxproj b/src/fe-text/fe-text-xp.vcxproj index cd87b616..4e147db3 100644 --- a/src/fe-text/fe-text-xp.vcxproj +++ b/src/fe-text/fe-text-xp.vcxproj @@ -72,7 +72,7 @@ true true true - $(DepLibs);"$(OutDir)\common.lib";"$(OutDir)\dirent-win32.lib";%(AdditionalDependencies) + $(DepLibs);"$(OutDir)\common.lib";%(AdditionalDependencies) $(DepsRoot)\lib;%(AdditionalLibraryDirectories) @@ -93,7 +93,7 @@ true true true - $(DepLibs);"$(OutDir)\common.lib";"$(OutDir)\dirent-win32.lib";%(AdditionalDependencies) + $(DepLibs);"$(OutDir)\common.lib";%(AdditionalDependencies) $(DepsRoot)\lib;%(AdditionalLibraryDirectories) diff --git a/src/fe-text/fe-text.vcxproj b/src/fe-text/fe-text.vcxproj index 3a8d5c31..d2e2aad6 100644 --- a/src/fe-text/fe-text.vcxproj +++ b/src/fe-text/fe-text.vcxproj @@ -69,7 +69,7 @@ true true true - $(DepLibs);"$(OutDir)\common.lib";"$(OutDir)\dirent-win32.lib";%(AdditionalDependencies) + $(DepLibs);"$(OutDir)\common.lib";%(AdditionalDependencies) $(DepsRoot)\lib;%(AdditionalLibraryDirectories) @@ -90,7 +90,7 @@ true true true - $(DepLibs);"$(OutDir)\common.lib";"$(OutDir)\dirent-win32.lib";%(AdditionalDependencies) + $(DepLibs);"$(OutDir)\common.lib";%(AdditionalDependencies) $(DepsRoot)\lib;%(AdditionalLibraryDirectories) diff --git a/win32/hexchat-xp.sln b/win32/hexchat-xp.sln index 383f917f..28f6c046 100644 --- a/win32/hexchat-xp.sln +++ b/win32/hexchat-xp.sln @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\src\common\common-xp.vcxproj", "{87554B59-006C-4D94-9714-897B27067BA3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dirent", "..\src\dirent\dirent-xp.vcxproj", "{98B56DF9-E4F1-4696-A565-5F7823CF214D}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pixmaps", "..\src\pixmaps\pixmaps-xp.vcxproj", "{626DA61C-FA8B-474C-B2F5-72AD9DFEE642}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "..\src\version\version-xp.vcxproj", "{6CD3647E-4541-4849-9DD7-C8816665AE42}" @@ -14,13 +12,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fe-gtk", "..\src\fe-gtk\fe- {626DA61C-FA8B-474C-B2F5-72AD9DFEE642} = {626DA61C-FA8B-474C-B2F5-72AD9DFEE642} {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} {6CD3647E-4541-4849-9DD7-C8816665AE42} = {6CD3647E-4541-4849-9DD7-C8816665AE42} - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fe-text", "..\src\fe-text\fe-text-xp.vcxproj", "{E93E1255-95D1-4B08-8FDF-B53CC6A21280}" ProjectSection(ProjectDependencies) = postProject {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hexchat", "hexchat", "{AAACEB12-9475-410E-AF5A-FDFF907E9043}" @@ -34,31 +30,20 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcl", "..\plugins\tcl\tcl-xp.vcxproj", "{2773666A-8CFC-4533-A043-EAD59F16A1C7}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl-512", "..\plugins\perl\perl-512-xp.vcxproj", "{987E9374-98A1-44BA-946F-D3472D7A7055}" - ProjectSection(ProjectDependencies) = postProject - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl-514", "..\plugins\perl\perl-514-xp.vcxproj", "{C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0}" ProjectSection(ProjectDependencies) = postProject {987E9374-98A1-44BA-946F-D3472D7A7055} = {987E9374-98A1-44BA-946F-D3472D7A7055} - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl-516", "..\plugins\perl\perl-516-xp.vcxproj", "{58654438-F674-42F7-88FA-73EF90AD80B1}" ProjectSection(ProjectDependencies) = postProject {C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0} = {C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0} - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "..\plugins\python\python-xp.vcxproj", "{19C52A0A-A790-409E-A28A-9745FF990F5C}" - ProjectSection(ProjectDependencies) = postProject - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "..\plugins\lua\lua-xp.vcxproj", "{646B4316-C8B8-4DB6-B6AE-E586929E5729}" - ProjectSection(ProjectDependencies) = postProject - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doat", "..\plugins\doat\doat-xp.vcxproj", "{4980AF24-9D42-427D-A8E6-0DF3B97C455D}" EndProject @@ -133,10 +118,6 @@ Global {87554B59-006C-4D94-9714-897B27067BA3}.Release|Win32.Build.0 = Release|Win32 {87554B59-006C-4D94-9714-897B27067BA3}.Release|x64.ActiveCfg = Release|x64 {87554B59-006C-4D94-9714-897B27067BA3}.Release|x64.Build.0 = Release|x64 - {98B56DF9-E4F1-4696-A565-5F7823CF214D}.Release|Win32.ActiveCfg = Release|Win32 - {98B56DF9-E4F1-4696-A565-5F7823CF214D}.Release|Win32.Build.0 = Release|Win32 - {98B56DF9-E4F1-4696-A565-5F7823CF214D}.Release|x64.ActiveCfg = Release|x64 - {98B56DF9-E4F1-4696-A565-5F7823CF214D}.Release|x64.Build.0 = Release|x64 {626DA61C-FA8B-474C-B2F5-72AD9DFEE642}.Release|Win32.ActiveCfg = Release|Win32 {626DA61C-FA8B-474C-B2F5-72AD9DFEE642}.Release|Win32.Build.0 = Release|Win32 {626DA61C-FA8B-474C-B2F5-72AD9DFEE642}.Release|x64.ActiveCfg = Release|x64 @@ -255,7 +236,6 @@ Global {DE87FFCA-9606-4116-B747-062D88A56A28} = {AAACEB12-9475-410E-AF5A-FDFF907E9043} {A7D7CE59-2A31-48AE-BED2-A9828E241832} = {AAACEB12-9475-410E-AF5A-FDFF907E9043} {6CD3647E-4541-4849-9DD7-C8816665AE42} = {BB051F0F-A841-4A9A-BAF6-51DD9866D65A} - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {BB051F0F-A841-4A9A-BAF6-51DD9866D65A} {4980AF24-9D42-427D-A8E6-0DF3B97C455D} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {3786FA8C-3E76-45E3-984E-FCCFF44729C9} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} diff --git a/win32/hexchat.sln b/win32/hexchat.sln index 7efa14bc..6dd2a18f 100644 --- a/win32/hexchat.sln +++ b/win32/hexchat.sln @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\src\common\common.vcxproj", "{87554B59-006C-4D94-9714-897B27067BA3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dirent", "..\src\dirent\dirent.vcxproj", "{98B56DF9-E4F1-4696-A565-5F7823CF214D}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pixmaps", "..\src\pixmaps\pixmaps.vcxproj", "{626DA61C-FA8B-474C-B2F5-72AD9DFEE642}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "..\src\version\version.vcxproj", "{6CD3647E-4541-4849-9DD7-C8816665AE42}" @@ -14,13 +12,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fe-gtk", "..\src\fe-gtk\fe- {626DA61C-FA8B-474C-B2F5-72AD9DFEE642} = {626DA61C-FA8B-474C-B2F5-72AD9DFEE642} {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} {6CD3647E-4541-4849-9DD7-C8816665AE42} = {6CD3647E-4541-4849-9DD7-C8816665AE42} - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fe-text", "..\src\fe-text\fe-text.vcxproj", "{E93E1255-95D1-4B08-8FDF-B53CC6A21280}" ProjectSection(ProjectDependencies) = postProject {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hexchat", "hexchat", "{AAACEB12-9475-410E-AF5A-FDFF907E9043}" @@ -34,31 +30,20 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcl", "..\plugins\tcl\tcl.vcxproj", "{2773666A-8CFC-4533-A043-EAD59F16A1C7}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl-512", "..\plugins\perl\perl-512.vcxproj", "{987E9374-98A1-44BA-946F-D3472D7A7055}" - ProjectSection(ProjectDependencies) = postProject - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl-514", "..\plugins\perl\perl-514.vcxproj", "{C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0}" ProjectSection(ProjectDependencies) = postProject {987E9374-98A1-44BA-946F-D3472D7A7055} = {987E9374-98A1-44BA-946F-D3472D7A7055} - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl-516", "..\plugins\perl\perl-516.vcxproj", "{58654438-F674-42F7-88FA-73EF90AD80B1}" ProjectSection(ProjectDependencies) = postProject {C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0} = {C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0} - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "..\plugins\python\python.vcxproj", "{19C52A0A-A790-409E-A28A-9745FF990F5C}" - ProjectSection(ProjectDependencies) = postProject - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "..\plugins\lua\lua.vcxproj", "{646B4316-C8B8-4DB6-B6AE-E586929E5729}" - ProjectSection(ProjectDependencies) = postProject - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doat", "..\plugins\doat\doat.vcxproj", "{4980AF24-9D42-427D-A8E6-0DF3B97C455D}" EndProject @@ -133,10 +118,6 @@ Global {87554B59-006C-4D94-9714-897B27067BA3}.Release|Win32.Build.0 = Release|Win32 {87554B59-006C-4D94-9714-897B27067BA3}.Release|x64.ActiveCfg = Release|x64 {87554B59-006C-4D94-9714-897B27067BA3}.Release|x64.Build.0 = Release|x64 - {98B56DF9-E4F1-4696-A565-5F7823CF214D}.Release|Win32.ActiveCfg = Release|Win32 - {98B56DF9-E4F1-4696-A565-5F7823CF214D}.Release|Win32.Build.0 = Release|Win32 - {98B56DF9-E4F1-4696-A565-5F7823CF214D}.Release|x64.ActiveCfg = Release|x64 - {98B56DF9-E4F1-4696-A565-5F7823CF214D}.Release|x64.Build.0 = Release|x64 {626DA61C-FA8B-474C-B2F5-72AD9DFEE642}.Release|Win32.ActiveCfg = Release|Win32 {626DA61C-FA8B-474C-B2F5-72AD9DFEE642}.Release|Win32.Build.0 = Release|Win32 {626DA61C-FA8B-474C-B2F5-72AD9DFEE642}.Release|x64.ActiveCfg = Release|x64 @@ -255,7 +236,6 @@ Global {DE87FFCA-9606-4116-B747-062D88A56A28} = {AAACEB12-9475-410E-AF5A-FDFF907E9043} {A7D7CE59-2A31-48AE-BED2-A9828E241832} = {AAACEB12-9475-410E-AF5A-FDFF907E9043} {6CD3647E-4541-4849-9DD7-C8816665AE42} = {BB051F0F-A841-4A9A-BAF6-51DD9866D65A} - {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {BB051F0F-A841-4A9A-BAF6-51DD9866D65A} {4980AF24-9D42-427D-A8E6-0DF3B97C455D} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {3786FA8C-3E76-45E3-984E-FCCFF44729C9} = {561126F4-FA18-45FC-A2BF-8F858F161D6D}