From cf1eeea343cda634290bb95432f75802aa9d2783 Mon Sep 17 00:00:00 2001
From: George Tasker <gtasker@allenbrook.com>
Date: Wed, 21 Mar 2001 18:32:35 +0000
Subject: [PATCH] Checked back in the change from rev 1.57 that allows UNC dirs
and root dirs to be properly evaluated as to their existence under __WIN32__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/msw/utils.cpp | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 2a9d0a99a4..f5217d22f9 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -436,29 +436,14 @@ wxChar *wxGetUserHome(const wxString& user)
bool wxDirExists(const wxString& dir)
{
#if defined(__WIN32__)
- WIN32_FIND_DATA fileInfo;
+ DWORD attribs = GetFileAttributes(dir);
+ return ((attribs != -1) && (attribs & FILE_ATTRIBUTE_DIRECTORY));
#else // Win16
#ifdef __BORLANDC__
struct ffblk fileInfo;
#else
struct find_t fileInfo;
#endif
-#endif // Win32/16
-
-#if defined(__WIN32__)
- HANDLE h = ::FindFirstFile(dir, &fileInfo);
-
- if ( h == INVALID_HANDLE_VALUE )
- {
- wxLogLastError(wxT("FindFirstFile"));
-
- return FALSE;
- }
-
- ::FindClose(h);
-
- return (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
-#else // Win16
// In Borland findfirst has a different argument
// ordering from _dos_findfirst. But _dos_findfirst
// _should_ be ok in both MS and Borland... why not?
--
2.47.2