Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: core/src/fxcrt/fx_basic_util.cpp

Issue 1105253002: Merge to XFA: Fix windows-specific usage of CFX_WideStr::operator LPCWSTR(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « core/src/fpdfdoc/doc_form.cpp ('k') | fpdfsdk/src/fsdk_baseform.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "../../include/fxcrt/fx_basic.h" 7 #include "../../include/fxcrt/fx_basic.h"
8 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ 8 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
9 #include <sys/types.h> 9 #include <sys/types.h>
10 #include <dirent.h> 10 #include <dirent.h>
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 #endif 346 #endif
347 } 347 }
348 void* FX_OpenFolder(FX_LPCWSTR path) 348 void* FX_OpenFolder(FX_LPCWSTR path)
349 { 349 {
350 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ 350 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
351 CFindFileDataW* pData = FX_NEW CFindFileDataW; 351 CFindFileDataW* pData = FX_NEW CFindFileDataW;
352 if (!pData) { 352 if (!pData) {
353 return NULL; 353 return NULL;
354 } 354 }
355 #ifdef _FX_WINAPI_PARTITION_DESKTOP_ 355 #ifdef _FX_WINAPI_PARTITION_DESKTOP_
356 pData->m_Handle = FindFirstFileW(CFX_WideString(path) + L"/*.*", &pData->m_F indData); 356 pData->m_Handle = FindFirstFileW((CFX_WideString(path) + L"/*.*").c_str(), & pData->m_FindData);
357 #else 357 #else
358 pData->m_Handle = FindFirstFileExW(CFX_WideString(path) + L"/*.*", FindExInf oStandard, &pData->m_FindData, FindExSearchNameMatch, NULL, 0); 358 pData->m_Handle = FindFirstFileExW((CFX_WideString(path) + L"/*.*").c_str(), FindExInfoStandard, &pData->m_FindData, FindExSearchNameMatch, NULL, 0);
359 #endif 359 #endif
360 if (pData->m_Handle == INVALID_HANDLE_VALUE) { 360 if (pData->m_Handle == INVALID_HANDLE_VALUE) {
361 delete pData; 361 delete pData;
362 return NULL; 362 return NULL;
363 } 363 }
364 pData->m_bEnd = FALSE; 364 pData->m_bEnd = FALSE;
365 return pData; 365 return pData;
366 #else 366 #else
367 DIR* dir = opendir(CFX_ByteString::FromUnicode(path)); 367 DIR* dir = opendir(CFX_ByteString::FromUnicode(path));
368 return dir; 368 return dir;
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 } 496 }
497 497
498 CFX_Vector_3by1 CFX_Matrix_3by3::TransformVector(const CFX_Vector_3by1 &v) 498 CFX_Vector_3by1 CFX_Matrix_3by3::TransformVector(const CFX_Vector_3by1 &v)
499 { 499 {
500 return CFX_Vector_3by1( 500 return CFX_Vector_3by1(
501 a * v.a + b * v.b + c * v.c, 501 a * v.a + b * v.b + c * v.c,
502 d * v.a + e * v.b + f * v.c, 502 d * v.a + e * v.b + f * v.c,
503 g * v.a + h * v.b + i * v.c 503 g * v.a + h * v.b + i * v.c
504 ); 504 );
505 } 505 }
OLDNEW
« no previous file with comments | « core/src/fpdfdoc/doc_form.cpp ('k') | fpdfsdk/src/fsdk_baseform.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698