Clean up fx_basic_util a little

core/fxcrt/fx_stream.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_FXCRT_FX_STREAM_H_
 #define CORE_FXCRT_FX_STREAM_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 
-void* FX_OpenFolder(const FX_CHAR* path);
-void* FX_OpenFolder(const FX_WCHAR* path);
-FX_BOOL FX_GetNextFile(void* handle,
-                       CFX_ByteString& filename,
-                       FX_BOOL& bFolder);
-FX_BOOL FX_GetNextFile(void* handle,
-                       CFX_WideString& filename,
-                       FX_BOOL& bFolder);
-void FX_CloseFolder(void* handle);
+#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#include <dirent.h>
+#include <sys/types.h>
+#else
+#include <direct.h>
+#endif
+
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+class CFindFileDataA;
+
+typedef CFindFileDataA FX_FileHandle;
+#else
+typedef DIR FX_FileHandle;

[dsinclair, 2016/10/13 13:45:47]

Can this if/else move into the if/else above?

[npm, 2016/10/13 17:49:01]

Done.

+#endif
+
+FX_FileHandle* FX_OpenFolder(const FX_CHAR* path);
+bool FX_GetNextFile(FX_FileHandle* handle,
+                    CFX_ByteString* filename,
+                    bool* bFolder);
+void FX_CloseFolder(FX_FileHandle* handle);
 FX_WCHAR FX_GetFolderSeparator();
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_

[dsinclair, 2016/10/13 13:45:47]

Combine with this as well?

[npm, 2016/10/13 17:49:01]

Done.

 #define FX_FILESIZE int32_t
 #else
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #ifndef O_BINARY
 #define O_BINARY 0
 #endif  // O_BINARY
 
@@ skipping 117 matching lines @@
   FX_BOOL IsEOF() override = 0;
   FX_FILESIZE GetPosition() override = 0;
   size_t ReadBlock(void* buffer, size_t size) override = 0;
 
   virtual FX_BOOL ReadNextBlock(FX_BOOL bRestart = FALSE) = 0;
   virtual const uint8_t* GetBlockBuffer() = 0;
   virtual size_t GetBlockSize() = 0;
   virtual FX_FILESIZE GetBlockOffset() = 0;
 };
 
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+class CFindFileData {
+ public:
+  virtual ~CFindFileData() {}
+  HANDLE m_Handle;
+  bool m_bEnd;
+};
+
+class CFindFileDataA : public CFindFileData {
+ public:
+  ~CFindFileDataA() override {}
+  WIN32_FIND_DATAA m_FindData;
+};
+
+class CFindFileDataW : public CFindFileData {
+ public:
+  ~CFindFileDataW() override {}
+  WIN32_FIND_DATAW m_FindData;
+};
+#endif
+
 #endif  // CORE_FXCRT_FX_STREAM_H_