From 8153fdd1941ac11c4334161d39f7337ea01d7ff7 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Tue, 29 Nov 2005 09:22:39 +0000 Subject: [PATCH] switch to standard conform CRT function names svn path=/trunk/; revision=19745 --- reactos/subsys/system/explorer/explorer.cpp | 2 +- reactos/subsys/system/explorer/shell/filechild.cpp | 2 +- reactos/subsys/system/explorer/shell/ntobjfs.cpp | 2 +- reactos/subsys/system/explorer/taskbar/favorites.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/reactos/subsys/system/explorer/explorer.cpp b/reactos/subsys/system/explorer/explorer.cpp index 7d5826cfa35..504f8a829e9 100644 --- a/reactos/subsys/system/explorer/explorer.cpp +++ b/reactos/subsys/system/explorer/explorer.cpp @@ -985,7 +985,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL _dup2(_open_osfhandle((long)GetStdHandle(STD_OUTPUT_HANDLE), 0), 1); _dup2(_open_osfhandle((long)GetStdHandle(STD_ERROR_HANDLE), 0), 2); - g_Globals._log = fdopen(1, "w"); + g_Globals._log = _fdopen(1, "w"); setvbuf(g_Globals._log, 0, _IONBF, 0); LOG(TEXT("starting explorer debug log\n")); diff --git a/reactos/subsys/system/explorer/shell/filechild.cpp b/reactos/subsys/system/explorer/shell/filechild.cpp index fe27b011b1a..341cc70d3a9 100644 --- a/reactos/subsys/system/explorer/shell/filechild.cpp +++ b/reactos/subsys/system/explorer/shell/filechild.cpp @@ -548,7 +548,7 @@ int FileChildWindow::Command(int id, int code) } -void FileChildWindow::activate_entry(Pane* pane) ///@todo enable using key accelerator +void FileChildWindow::activate_entry(Pane* pane) ///@todo enable using RETURN key accelerator { Entry* entry = pane->_cur; diff --git a/reactos/subsys/system/explorer/shell/ntobjfs.cpp b/reactos/subsys/system/explorer/shell/ntobjfs.cpp index 914069d7f61..d182cd6a75b 100644 --- a/reactos/subsys/system/explorer/shell/ntobjfs.cpp +++ b/reactos/subsys/system/explorer/shell/ntobjfs.cpp @@ -328,7 +328,7 @@ void NtObjDirectory::read_directory(int scan_flags) #else char type_name[32]; WideCharToMultiByte(CP_ACP, 0, info->type.string_ptr, info->type.string_len, type_name, 32, 0, 0); - entry->_type_name = strdup(type_name); + entry->_type_name = _strdup(type_name); #endif if (!first_entry) diff --git a/reactos/subsys/system/explorer/taskbar/favorites.cpp b/reactos/subsys/system/explorer/taskbar/favorites.cpp index 6e6fe8a18fc..3793f681179 100644 --- a/reactos/subsys/system/explorer/taskbar/favorites.cpp +++ b/reactos/subsys/system/explorer/taskbar/favorites.cpp @@ -72,9 +72,9 @@ bool Bookmark::read_url(LPCTSTR path) while(isspace(*cont)) ++cont; - if (!strnicmp(keyword, "URL", 3)) + if (!_strnicmp(keyword, "URL", 3)) _url = DecodeURLString(cont); - else if (!strnicmp(keyword, "IconFile", 8)) + else if (!_strnicmp(keyword, "IconFile", 8)) _icon_path = DecodeURLString(cont); } } -- 2.17.1