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

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

Issue 1103343002: Fix windows-specific usage of CFX_WideStr::operator LPCWSTR(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Rebase from linux side. Created 5 years, 7 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 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 #else 337 #else
338 DIR* dir = opendir(path); 338 DIR* dir = opendir(path);
339 return dir; 339 return dir;
340 #endif 340 #endif
341 } 341 }
342 void* FX_OpenFolder(FX_LPCWSTR path) 342 void* FX_OpenFolder(FX_LPCWSTR path)
343 { 343 {
344 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ 344 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
345 CFindFileDataW* pData = new CFindFileDataW; 345 CFindFileDataW* pData = new CFindFileDataW;
346 #ifdef _FX_WINAPI_PARTITION_DESKTOP_ 346 #ifdef _FX_WINAPI_PARTITION_DESKTOP_
347 pData->m_Handle = FindFirstFileW(CFX_WideString(path) + L"/*.*", &pData->m_F indData); 347 pData->m_Handle = FindFirstFileW((CFX_WideString(path) + L"/*.*").c_str(), & pData->m_FindData);
348 #else 348 #else
349 pData->m_Handle = FindFirstFileExW(CFX_WideString(path) + L"/*.*", FindExInf oStandard, &pData->m_FindData, FindExSearchNameMatch, NULL, 0); 349 pData->m_Handle = FindFirstFileExW((CFX_WideString(path) + L"/*.*").c_str(), FindExInfoStandard, &pData->m_FindData, FindExSearchNameMatch, NULL, 0);
350 #endif 350 #endif
351 if (pData->m_Handle == INVALID_HANDLE_VALUE) { 351 if (pData->m_Handle == INVALID_HANDLE_VALUE) {
352 delete pData; 352 delete pData;
353 return NULL; 353 return NULL;
354 } 354 }
355 pData->m_bEnd = FALSE; 355 pData->m_bEnd = FALSE;
356 return pData; 356 return pData;
357 #else 357 #else
358 DIR* dir = opendir(CFX_ByteString::FromUnicode(path)); 358 DIR* dir = opendir(CFX_ByteString::FromUnicode(path));
359 return dir; 359 return dir;
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 } 487 }
488 488
489 CFX_Vector_3by1 CFX_Matrix_3by3::TransformVector(const CFX_Vector_3by1 &v) 489 CFX_Vector_3by1 CFX_Matrix_3by3::TransformVector(const CFX_Vector_3by1 &v)
490 { 490 {
491 return CFX_Vector_3by1( 491 return CFX_Vector_3by1(
492 a * v.a + b * v.b + c * v.c, 492 a * v.a + b * v.b + c * v.c,
493 d * v.a + e * v.b + f * v.c, 493 d * v.a + e * v.b + f * v.c,
494 g * v.a + h * v.b + i * v.c 494 g * v.a + h * v.b + i * v.c
495 ); 495 );
496 } 496 }
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