diff options
| -rw-r--r-- | core/src/fxcrt/fx_basic_util.cpp | 10 | ||||
| -rw-r--r-- | core/src/fxcrt/fx_extension.cpp | 11 |
2 files changed, 0 insertions, 21 deletions
diff --git a/core/src/fxcrt/fx_basic_util.cpp b/core/src/fxcrt/fx_basic_util.cpp index fdf7284883..7228af1a8a 100644 --- a/core/src/fxcrt/fx_basic_util.cpp +++ b/core/src/fxcrt/fx_basic_util.cpp @@ -208,14 +208,9 @@ void* FX_OpenFolder(const FX_CHAR* path) { #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ #ifndef _WIN32_WCE CFindFileDataA* pData = new CFindFileDataA; -#ifdef _FX_WINAPI_PARTITION_DESKTOP_ - pData->m_Handle = - FindFirstFileA(CFX_ByteString(path) + "/*.*", &pData->m_FindData); -#else pData->m_Handle = FindFirstFileExA(CFX_ByteString(path) + "/*.*", FindExInfoStandard, &pData->m_FindData, FindExSearchNameMatch, NULL, 0); -#endif #else CFindFileDataW* pData = new CFindFileDataW; pData->m_Handle = FindFirstFileW(CFX_WideString::FromLocal(path) + L"/*.*", @@ -235,14 +230,9 @@ void* FX_OpenFolder(const FX_CHAR* path) { void* FX_OpenFolder(const FX_WCHAR* path) { #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ CFindFileDataW* pData = new CFindFileDataW; -#ifdef _FX_WINAPI_PARTITION_DESKTOP_ - pData->m_Handle = FindFirstFileW((CFX_WideString(path) + L"/*.*").c_str(), - &pData->m_FindData); -#else pData->m_Handle = FindFirstFileExW((CFX_WideString(path) + L"/*.*").c_str(), FindExInfoStandard, &pData->m_FindData, FindExSearchNameMatch, NULL, 0); -#endif if (pData->m_Handle == INVALID_HANDLE_VALUE) { delete pData; return NULL; diff --git a/core/src/fxcrt/fx_extension.cpp b/core/src/fxcrt/fx_extension.cpp index 31f645ae0f..09414cb0c0 100644 --- a/core/src/fxcrt/fx_extension.cpp +++ b/core/src/fxcrt/fx_extension.cpp @@ -365,18 +365,7 @@ void FX_Random_GenerateCrypto(FX_DWORD* pBuffer, int32_t iCount) { #ifdef PDF_ENABLE_XFA void FX_GUID_CreateV4(FX_LPGUID pGUID) { -#if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \ - _FX_OS_ == _FX_WIN64_) -#ifdef _FX_WINAPI_PARTITION_DESKTOP_ - if (!FX_GenerateCryptoRandom((FX_DWORD*)pGUID, 4)) { - FX_Random_GenerateMT((FX_DWORD*)pGUID, 4); - } -#else - FX_Random_GenerateMT((FX_DWORD*)pGUID, 4); -#endif -#else FX_Random_GenerateMT((FX_DWORD*)pGUID, 4); -#endif uint8_t& b = ((uint8_t*)pGUID)[6]; b = (b & 0x0F) | 0x40; } |