ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xcopy.exe: Get rid of remaining uses of Unicode macros.

This commit is contained in:
Alexandre Julliard 2008-09-04 14:08:19 +02:00
parent 90685fcf03
commit 09874bf78a
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/xcopy/Makefile.in
View File

@ -1,3 +1,4 @@
EXTRADEFS = -DWINE_NO_UNICODE_MACROS
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
@ -5,7 +6,6 @@ VPATH = @srcdir@
MODULE = xcopy.exe MODULE = xcopy.exe
APPMODE = -mconsole -municode -mno-cygwin APPMODE = -mconsole -municode -mno-cygwin
IMPORTS = shell32 user32 kernel32 IMPORTS = shell32 user32 kernel32
EXTRADEFS = -DUNICODE
EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
MODCFLAGS = @BUILTINFLAG@ MODCFLAGS = @BUILTINFLAG@

56
programs/xcopy/xcopy.c
View File

@ -120,7 +120,7 @@ int wmain (int argc, WCHAR *argvW[])
} }
/* Preinitialize flags based on COPYCMD */ /* Preinitialize flags based on COPYCMD */
if (GetEnvironmentVariable(COPYCMD, copyCmd, MAXSTRING)) { if (GetEnvironmentVariableW(COPYCMD, copyCmd, MAXSTRING)) {
if (wcsstr(copyCmd, PROMPTSTR1) != NULL || if (wcsstr(copyCmd, PROMPTSTR1) != NULL ||
wcsstr(copyCmd, PROMPTSTR2) != NULL) { wcsstr(copyCmd, PROMPTSTR2) != NULL) {
flags |= OPT_NOPROMPT; flags |= OPT_NOPROMPT;
@ -177,7 +177,7 @@ int wmain (int argc, WCHAR *argvW[])
OPT_REMOVEARCH; break; OPT_REMOVEARCH; break;
/* E can be /E or /EXCLUDE */ /* E can be /E or /EXCLUDE */
case 'E': if (CompareString (LOCALE_USER_DEFAULT, case 'E': if (CompareStringW(LOCALE_USER_DEFAULT,
NORM_IGNORECASE | SORT_STRINGSORT, NORM_IGNORECASE | SORT_STRINGSORT,
&argvW[0][1], 8, &argvW[0][1], 8,
EXCLUDE, -1) == 2) { EXCLUDE, -1) == 2) {
@ -221,10 +221,10 @@ int wmain (int argc, WCHAR *argvW[])
/* Debug info: */ /* Debug info: */
FileTimeToSystemTime (&dateRange, &st); FileTimeToSystemTime (&dateRange, &st);
GetDateFormat (0, DATE_SHORTDATE, &st, NULL, datestring, GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring,
sizeof(datestring)); sizeof(datestring)/sizeof(WCHAR));
GetTimeFormat (0, TIME_NOSECONDS, &st, GetTimeFormatW(0, TIME_NOSECONDS, &st,
NULL, timestring, sizeof(timestring)); NULL, timestring, sizeof(timestring)/sizeof(WCHAR));
WINE_TRACE("Date being used is: %s %s\n", WINE_TRACE("Date being used is: %s %s\n",
wine_dbgstr_w(datestring), wine_dbgstr_w(timestring)); wine_dbgstr_w(datestring), wine_dbgstr_w(timestring));
@ -323,7 +323,7 @@ static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem,
/* /*
* Validate the source, expanding to full path ensuring it exists * Validate the source, expanding to full path ensuring it exists
*/ */
if (GetFullPathName(suppliedsource, MAX_PATH, actualsource, NULL) == 0) { if (GetFullPathNameW(suppliedsource, MAX_PATH, actualsource, NULL) == 0) {
WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError()); WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError());
return RC_INITERROR; return RC_INITERROR;
} }
@ -351,7 +351,7 @@ static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem,
if (starPos || questPos) { if (starPos || questPos) {
attribs = 0x00; /* Ensures skips invalid or directory check below */ attribs = 0x00; /* Ensures skips invalid or directory check below */
} else { } else {
attribs = GetFileAttributes(actualsource); attribs = GetFileAttributesW(actualsource);
} }
if (attribs == INVALID_FILE_ATTRIBUTES) { if (attribs == INVALID_FILE_ATTRIBUTES) {
@ -393,7 +393,7 @@ static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem,
lstrcpyW(spec, suppliedsource+2); lstrcpyW(spec, suppliedsource+2);
} else { } else {
WCHAR curdir[MAXSTRING]; WCHAR curdir[MAXSTRING];
GetCurrentDirectory (sizeof(curdir), curdir); GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir);
stem[0] = curdir[0]; stem[0] = curdir[0];
stem[1] = curdir[1]; stem[1] = curdir[1];
stem[2] = 0x00; stem[2] = 0x00;
@ -418,13 +418,13 @@ static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, WCHAR
/* /*
* Validate the source, expanding to full path ensuring it exists * Validate the source, expanding to full path ensuring it exists
*/ */
if (GetFullPathName(supplieddestination, MAX_PATH, actualdestination, NULL) == 0) { if (GetFullPathNameW(supplieddestination, MAX_PATH, actualdestination, NULL) == 0) {
WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError()); WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError());
return RC_INITERROR; return RC_INITERROR;
} }
/* Destination is either a directory or a file */ /* Destination is either a directory or a file */
attribs = GetFileAttributes(actualdestination); attribs = GetFileAttributesW(actualdestination);
if (attribs == INVALID_FILE_ATTRIBUTES) { if (attribs == INVALID_FILE_ATTRIBUTES) {
@ -500,7 +500,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
WCHAR *deststem, WCHAR *destspec, WCHAR *deststem, WCHAR *destspec,
DWORD flags) DWORD flags)
{ {
WIN32_FIND_DATA *finddata; WIN32_FIND_DATAW *finddata;
HANDLE h; HANDLE h;
BOOL findres = TRUE; BOOL findres = TRUE;
WCHAR *inputpath, *outputpath; WCHAR *inputpath, *outputpath;
@ -510,7 +510,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
int ret = 0; int ret = 0;
/* Allocate some working memory on heap to minimize footprint */ /* Allocate some working memory on heap to minimize footprint */
finddata = HeapAlloc(GetProcessHeap(), 0, sizeof(WIN32_FIND_DATA)); finddata = HeapAlloc(GetProcessHeap(), 0, sizeof(WIN32_FIND_DATAW));
inputpath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); inputpath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR));
outputpath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); outputpath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR));
@ -519,7 +519,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
lstrcatW(inputpath, srcspec); lstrcatW(inputpath, srcspec);
/* Search 1 - Look for matching files */ /* Search 1 - Look for matching files */
h = FindFirstFile(inputpath, finddata); h = FindFirstFileW(inputpath, finddata);
while (h != INVALID_HANDLE_VALUE && findres) { while (h != INVALID_HANDLE_VALUE && findres) {
skipFile = FALSE; skipFile = FALSE;
@ -587,7 +587,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
/* If just /D supplied, only overwrite if src newer than dest */ /* If just /D supplied, only overwrite if src newer than dest */
if (!skipFile && (flags & OPT_DATENEWER) && if (!skipFile && (flags & OPT_DATENEWER) &&
(destAttribs != INVALID_FILE_ATTRIBUTES)) { (destAttribs != INVALID_FILE_ATTRIBUTES)) {
HANDLE h = CreateFile(copyTo, GENERIC_READ, FILE_SHARE_READ, HANDLE h = CreateFileW(copyTo, GENERIC_READ, FILE_SHARE_READ,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,
NULL); NULL);
if (h != INVALID_HANDLE_VALUE) { if (h != INVALID_HANDLE_VALUE) {
@ -611,7 +611,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
/* Uppercase source filename */ /* Uppercase source filename */
lstrcpyW(copyFromUpper, copyFrom); lstrcpyW(copyFromUpper, copyFrom);
CharUpperBuff(copyFromUpper, lstrlenW(copyFromUpper)); CharUpperBuffW(copyFromUpper, lstrlenW(copyFromUpper));
/* Loop through testing each exclude line */ /* Loop through testing each exclude line */
while (pos) { while (pos) {
@ -703,13 +703,13 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
write protection */ write protection */
if ((destAttribs & FILE_ATTRIBUTE_READONLY) && if ((destAttribs & FILE_ATTRIBUTE_READONLY) &&
(flags & OPT_REPLACEREAD)) { (flags & OPT_REPLACEREAD)) {
SetFileAttributes(copyTo, destAttribs & ~FILE_ATTRIBUTE_READONLY); SetFileAttributesW(copyTo, destAttribs & ~FILE_ATTRIBUTE_READONLY);
} }
copiedFile = TRUE; copiedFile = TRUE;
if (flags & OPT_SIMULATE || flags & OPT_NOCOPY) { if (flags & OPT_SIMULATE || flags & OPT_NOCOPY) {
/* Skip copy */ /* Skip copy */
} else if (CopyFile(copyFrom, copyTo, FALSE) == 0) { } else if (CopyFileW(copyFrom, copyTo, FALSE) == 0) {
DWORD error = GetLastError(); DWORD error = GetLastError();
XCOPY_wprintf(XCOPY_LoadMessage(STRING_COPYFAIL), XCOPY_wprintf(XCOPY_LoadMessage(STRING_COPYFAIL),
@ -728,7 +728,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
if (!skipFile) { if (!skipFile) {
if ((srcAttribs & FILE_ATTRIBUTE_ARCHIVE) && if ((srcAttribs & FILE_ATTRIBUTE_ARCHIVE) &&
(flags & OPT_REMOVEARCH)) { (flags & OPT_REMOVEARCH)) {
SetFileAttributes(copyFrom, (srcAttribs & ~FILE_ATTRIBUTE_ARCHIVE)); SetFileAttributesW(copyFrom, (srcAttribs & ~FILE_ATTRIBUTE_ARCHIVE));
} }
filesCopied++; filesCopied++;
} }
@ -736,7 +736,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
} }
/* Find next file */ /* Find next file */
findres = FindNextFile(h, finddata); findres = FindNextFileW(h, finddata);
} }
FindClose(h); FindClose(h);
@ -747,7 +747,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
findres = TRUE; findres = TRUE;
WINE_TRACE("Processing subdirs with spec: %s\n", wine_dbgstr_w(inputpath)); WINE_TRACE("Processing subdirs with spec: %s\n", wine_dbgstr_w(inputpath));
h = FindFirstFile(inputpath, finddata); h = FindFirstFileW(inputpath, finddata);
while (h != INVALID_HANDLE_VALUE && findres) { while (h != INVALID_HANDLE_VALUE && findres) {
/* Only looking for dirs */ /* Only looking for dirs */
@ -778,7 +778,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
} }
/* Find next one */ /* Find next one */
findres = FindNextFile(h, finddata); findres = FindNextFileW(h, finddata);
} }
} }
@ -809,7 +809,7 @@ static BOOL XCOPY_CreateDirectory(const WCHAR* path)
while ((len = lstrlenW(new_path)) && new_path[len - 1] == '\\') while ((len = lstrlenW(new_path)) && new_path[len - 1] == '\\')
new_path[len - 1] = 0; new_path[len - 1] = 0;
while (!CreateDirectory(new_path,NULL)) while (!CreateDirectoryW(new_path,NULL))
{ {
WCHAR *slash; WCHAR *slash;
DWORD last_error = GetLastError(); DWORD last_error = GetLastError();
@ -899,7 +899,7 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) {
} }
/* Process line by line */ /* Process line by line */
while (fgetws(buffer, sizeof(buffer), inFile) != NULL) { while (fgetws(buffer, sizeof(buffer)/sizeof(WCHAR), inFile) != NULL) {
EXCLUDELIST *thisEntry; EXCLUDELIST *thisEntry;
int length = lstrlenW(buffer); int length = lstrlenW(buffer);
@ -914,7 +914,7 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) {
thisEntry->name = HeapAlloc(GetProcessHeap(), 0, thisEntry->name = HeapAlloc(GetProcessHeap(), 0,
(length * sizeof(WCHAR))+1); (length * sizeof(WCHAR))+1);
lstrcpyW(thisEntry->name, buffer); lstrcpyW(thisEntry->name, buffer);
CharUpperBuff(thisEntry->name, length); CharUpperBuffW(thisEntry->name, length);
WINE_TRACE("Read line : '%s'\n", wine_dbgstr_w(thisEntry->name)); WINE_TRACE("Read line : '%s'\n", wine_dbgstr_w(thisEntry->name));
} }
} }
@ -940,7 +940,7 @@ static WCHAR *XCOPY_LoadMessage(UINT id) {
static WCHAR msg[MAXSTRING]; static WCHAR msg[MAXSTRING];
const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0};
if (!LoadString(GetModuleHandle(NULL), id, msg, sizeof(msg))) { if (!LoadStringW(GetModuleHandleW(NULL), id, msg, sizeof(msg)/sizeof(WCHAR))) {
WINE_FIXME("LoadString failed with %d\n", GetLastError()); WINE_FIXME("LoadString failed with %d\n", GetLastError());
lstrcpyW(msg, failedMsg); lstrcpyW(msg, failedMsg);
} }
@ -955,10 +955,10 @@ static void XCOPY_FailMessage(DWORD err) {
LPWSTR lpMsgBuf; LPWSTR lpMsgBuf;
int status; int status;
status = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM, FORMAT_MESSAGE_FROM_SYSTEM,
NULL, err, 0, NULL, err, 0,
(LPTSTR) &lpMsgBuf, 0, NULL); (LPWSTR) &lpMsgBuf, 0, NULL);
if (!status) { if (!status) {
WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n", WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n",
err, GetLastError()); err, GetLastError());