Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32]

Browse source 
Don't make CopyFileExA() rely on Wine's strings conversions functions

svn path=/trunk/; revision=50869
This commit is contained in:
Pierre Schweitzer 2011-02-22 19:07:45 +00:00
parent 8dc411563b
commit 41ee0f405e
1 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
reactos/dll/win32/kernel32/file/copy.c
View file

@ -314,37 +314,36 @@ CopyFileExW (
*/ */
BOOL BOOL
WINAPI WINAPI
CopyFileExA ( CopyFileExA(IN LPCSTR lpExistingFileName,
LPCSTR lpExistingFileName, IN LPCSTR lpNewFileName,
LPCSTR lpNewFileName, IN LPPROGRESS_ROUTINE lpProgressRoutine OPTIONAL,
LPPROGRESS_ROUTINE lpProgressRoutine, IN LPVOID lpData OPTIONAL,
LPVOID lpData, IN LPBOOL pbCancel OPTIONAL,
BOOL *pbCancel, IN DWORD dwCopyFlags)
DWORD dwCopyFlags
)
{ {
PWCHAR ExistingFileNameW; BOOL Result = FALSE;
PWCHAR NewFileNameW; UNICODE_STRING lpNewFileNameW;
BOOL Result; PUNICODE_STRING lpExistingFileNameW;
if (!(ExistingFileNameW = FilenameA2W(lpExistingFileName, FALSE))) lpExistingFileNameW = Basep8BitStringToStaticUnicodeString(lpExistingFileName);
return FALSE; if (!lpExistingFileName)
{
return FALSE;
}
if (!(NewFileNameW = FilenameA2W(lpNewFileName, TRUE))) if (Basep8BitStringToDynamicUnicodeString(&lpNewFileNameW, lpNewFileName))
return FALSE; {
Result = CopyFileExW(lpExistingFileNameW->Buffer,
lpNewFileNameW.Buffer,
lpProgressRoutine,
lpData,
pbCancel,
dwCopyFlags);
Result = CopyFileExW (ExistingFileNameW , RtlFreeUnicodeString(&lpNewFileNameW);
NewFileNameW , }
lpProgressRoutine,
lpData,
pbCancel,
dwCopyFlags);
RtlFreeHeap (RtlGetProcessHeap (), return Result;
0,
NewFileNameW);
return Result;
} }