Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 38290: Replace deprecated stricmp with _stricmp
by tkreuzer＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: tkreuzer Date: Mon Dec 22 19:22:36 2008 New Revision: 38290 URL: http://svn.reactos.org/svn/reactos?rev=38290&view=rev Log: Replace deprecated stricmp with _stricmp Modified: trunk/rostests/tests/moztest/moztest.c Modified: trunk/rostests/tests/moztest/moztest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/moztest/moztest.c?r… ============================================================================== --- trunk/rostests/tests/moztest/moztest.c [iso-8859-1] (original) +++ trunk/rostests/tests/moztest/moztest.c [iso-8859-1] Mon Dec 22 19:22:36 2008 @@ -240,9 +240,9 @@ return 0; } - if (!stricmp(argv[1], "socket")) + if (!_stricmp(argv[1], "socket")) return SocketTest(); - if (!stricmp(argv[1], "virtual")) + if (!_stricmp(argv[1], "virtual")) return VirtualTest(); printf("Test '%s' doesn't exist\n", argv[1]);

1 0

[jmorlan] 38289: - cmd_mkdir: Give an error message if the directory already exists (Bug 3961) - Also, allow multiple directories to be created by one invocation
by jmorlan＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: jmorlan Date: Mon Dec 22 17:50:53 2008 New Revision: 38289 URL: http://svn.reactos.org/svn/reactos?rev=38289&view=rev Log: - cmd_mkdir: Give an error message if the directory already exists (Bug 3961) - Also, allow multiple directories to be created by one invocation Modified: trunk/reactos/base/shell/cmd/internal.c Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Mon Dec 22 17:50:53 2008 @@ -431,6 +431,12 @@ TCHAR *p = DirPath; INT n; + if (CreateDirectory(DirPath, NULL)) + return TRUE; + else if (GetLastError() != ERROR_PATH_NOT_FOUND) + return FALSE; + + /* got ERROR_PATH_NOT_FOUND, so try building it up one component at a time */ if (p[0] && p[1] == _T(':')) p += 2; while (*p == _T('\\')) @@ -445,8 +451,6 @@ (GetLastError() != ERROR_ALREADY_EXISTS)) return FALSE; } while (p != NULL); - if (GetLastError() == ERROR_ALREADY_EXISTS) - SetLastError(ERROR_SUCCESS); return TRUE; } @@ -457,55 +461,42 @@ */ INT cmd_mkdir (LPTSTR param) { - LPTSTR dir; /* pointer to the directory to change to */ - LPTSTR *p = NULL; - INT argc; - nErrorLevel = 0; + LPTSTR *p; + INT argc, i; if (!_tcsncmp (param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_MKDIR_HELP); return 0; } - - p = split (param, &argc, FALSE); - if (argc > 1) - { - /*JPP 20-Jul-1998 use standard error message */ - error_too_many_parameters (param); - freep (p); - return 1; - } - else - dir = p[0]; - - if (!dir) - { - ConErrResPuts (STRING_ERROR_REQ_PARAM_MISSING); + p = split (param, &argc, FALSE); + if (argc == 0) + { + ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING); nErrorLevel = 1; - if(p != NULL) - freep (p); + freep(p); return 1; } - if (!MakeFullPath(dir)) - { - if(GetLastError() == ERROR_PATH_NOT_FOUND) - { - ConErrResPuts(STRING_MD_ERROR2); - } - else - { - ErrorMessage (GetLastError(), _T("MD")); - } - nErrorLevel = 1; - freep (p); - return 1; - } + nErrorLevel = 0; + for (i = 0; i < argc; i++) + { + if (!MakeFullPath(p[i])) + { + if(GetLastError() == ERROR_PATH_NOT_FOUND) + { + ConErrResPuts(STRING_MD_ERROR2); + } + else + { + ErrorMessage (GetLastError(), _T("MD")); + } + nErrorLevel = 1; + } + } freep (p); - - return 0; + return nErrorLevel; } #endif

1 0

[tkreuzer] 38288: kjk_hyperion: "underscores solve all issues" replace wcsicmp with _wcsicmp
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Mon Dec 22 17:49:02 2008 New Revision: 38288 URL: http://svn.reactos.org/svn/reactos?rev=38288&view=rev Log: kjk_hyperion: "underscores solve all issues" replace wcsicmp with _wcsicmp Modified: trunk/rosapps/applications/sysutils/gettype/gettype.c Modified: trunk/rosapps/applications/sysutils/gettype/gettype.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/gett… ============================================================================== --- trunk/rosapps/applications/sysutils/gettype/gettype.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/gettype/gettype.c [iso-8859-1] Mon Dec 22 17:49:02 2008 @@ -275,9 +275,9 @@ _tcscpy(ServerName,argv[++i]); bLocal = FALSE; } - else if(!wcsicmp(argv[i], L"/U") && i + 1 < argc) + else if(!_wcsicmp(argv[i], L"/U") && i + 1 < argc) _tcscpy(UserName,argv[++i]); - else if(!wcsicmp(argv[i], L"/P") && i + 1 < argc) + else if(!_wcsicmp(argv[i], L"/P") && i + 1 < argc) _tcscpy(Password,argv[++i]); else {

1 0

[dgorbachev] 38287: Fix spurious warning/error reported by GCC 4.4.0.
by dgorbachev＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: dgorbachev Date: Mon Dec 22 17:46:23 2008 New Revision: 38287 URL: http://svn.reactos.org/svn/reactos?rev=38287&view=rev Log: Fix spurious warning/error reported by GCC 4.4.0. Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Mon Dec 22 17:46:23 2008 @@ -728,6 +728,10 @@ PTEXTOBJ TextObj; NTSTATUS Status = STATUS_SUCCESS; + /* Silence GCC warnings */ + SafeLogfont.elfEnumLogfontEx.elfLogFont.lfEscapement = 0; + SafeLogfont.elfEnumLogfontEx.elfLogFont.lfOrientation = 0; + if (!pelfw) { return NULL;

1 0

[dgorbachev] 38286: Do not pop and push the same reg.
by dgorbachev＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: dgorbachev Date: Mon Dec 22 17:44:15 2008 New Revision: 38286 URL: http://svn.reactos.org/svn/reactos?rev=38286&view=rev Log: Do not pop and push the same reg. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Mon Dec 22 17:44:15 2008 @@ -96,10 +96,8 @@ .macro UNHANDLED_PATH /* Get EIP */ call $+5 - pop eax /* Print debug message */ - push eax push offset _UnhandledMsg call _DbgPrint add esp, 8

1 0

[dgorbachev] 38285: Define __MINGW_MSC_PREREQ() macro, build failed with GCC 4.4.0 without it.
by dgorbachev＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: dgorbachev Date: Mon Dec 22 17:43:10 2008 New Revision: 38285 URL: http://svn.reactos.org/svn/reactos?rev=38285&view=rev Log: Define __MINGW_MSC_PREREQ() macro, build failed with GCC 4.4.0 without it. Modified: trunk/reactos/include/crt/_mingw.h Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/_mingw.h [iso-8859-1] Mon Dec 22 17:43:10 2008 @@ -48,6 +48,10 @@ #define __MINGW_GNUC_PREREQ(major, minor) 0 #endif +#if !defined (_MSC_VER) +#define __MINGW_MSC_PREREQ(major, minor) 0 +#endif + #define USE___UUIDOF 0 #ifdef __cplusplus

1 0

[tkreuzer] 38284: don't define strcasecmp to strcmp, use _stricmp, and define strcasecmp to _strnicmp.
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Mon Dec 22 17:35:35 2008 New Revision: 38284 URL: http://svn.reactos.org/svn/reactos?rev=38284&view=rev Log: don't define strcasecmp to strcmp, use _stricmp, and define strcasecmp to _strnicmp. Modified: trunk/reactos/base/applications/network/ftp/fake.h Modified: trunk/reactos/base/applications/network/ftp/fake.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/fake.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/fake.h [iso-8859-1] Mon Dec 22 17:35:35 2008 @@ -6,8 +6,8 @@ #define getwd getcwd -#define strcasecmp strcmp -#define strncasecmp strnicmp +#define strcasecmp _stricmp +#define strncasecmp _strnicmp struct timezone { int tz_minuteswest; /* minutes W of Greenwich */

1 0

[tkreuzer] 38283: Replace deprectaed function (unlink, stricmp) with new ones (_unlink, _stricmp)
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Mon Dec 22 17:24:18 2008 New Revision: 38283 URL: http://svn.reactos.org/svn/reactos?rev=38283&view=rev Log: Replace deprectaed function (unlink, stricmp) with new ones (_unlink, _stricmp) Modified: trunk/rosapps/dflat32/config.c trunk/rosapps/dflat32/direct.c trunk/rosapps/dflat32/edit.c trunk/rosapps/dflat32/helpbox.c Modified: trunk/rosapps/dflat32/config.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dflat32/config.c?rev=38283… ============================================================================== --- trunk/rosapps/dflat32/config.c [iso-8859-1] (original) +++ trunk/rosapps/dflat32/config.c [iso-8859-1] Mon Dec 22 17:24:18 2008 @@ -479,7 +479,7 @@ char path[64]; DfBuildFileName(path, ".DfCfg"); fclose(fp); - unlink(path); + _unlink(path); strcpy(DfCfg.version, DF_VERSION); } ConfigLoaded = TRUE; Modified: trunk/rosapps/dflat32/direct.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dflat32/direct.c?rev=38283… ============================================================================== --- trunk/rosapps/dflat32/direct.c [iso-8859-1] (original) +++ trunk/rosapps/dflat32/direct.c [iso-8859-1] Mon Dec 22 17:24:18 2008 @@ -78,7 +78,7 @@ static int dircmp(const void *c1, const void *c2) { - return stricmp(*(char **)c1, *(char **)c2); + return _stricmp(*(char **)c1, *(char **)c2); } Modified: trunk/rosapps/dflat32/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dflat32/edit.c?rev=38283&r… ============================================================================== --- trunk/rosapps/dflat32/edit.c [iso-8859-1] (original) +++ trunk/rosapps/dflat32/edit.c [iso-8859-1] Mon Dec 22 17:24:18 2008 @@ -241,7 +241,7 @@ while (wnd1 != NULL) { if (wnd1->extension && - stricmp(FileName, wnd1->extension) == 0) + _stricmp(FileName, wnd1->extension) == 0) { DfSendMessage(wnd1, DFM_SETFOCUS, TRUE, 0); DfSendMessage(wnd1, DFM_RESTORE, 0, 0); @@ -462,7 +462,7 @@ char msg[30]; sprintf(msg, "Delete %s?", fn); if (DfYesNoBox(msg)) { - unlink(wnd->extension); + _unlink(wnd->extension); DfSendMessage(wnd, DFM_CLOSE_WINDOW, 0, 0); } } Modified: trunk/rosapps/dflat32/helpbox.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dflat32/helpbox.c?rev=3828… ============================================================================== --- trunk/rosapps/dflat32/helpbox.c [iso-8859-1] (original) +++ trunk/rosapps/dflat32/helpbox.c [iso-8859-1] Mon Dec 22 17:24:18 2008 @@ -536,7 +536,7 @@ FindHelp(Help); if (ThisHelp != NULL) { if (LastStack == NULL || - stricmp(Help, LastStack->hname)) { + _stricmp(Help, LastStack->hname)) { /* ---- add the window to the history stack ---- */ ThisStack = DfCalloc(1,sizeof(struct HelpStack)); ThisStack->hname = DfMalloc(strlen(Help)+1);

1 0

[tkreuzer] 38282: use _str(n)icmp instead of non-standard str(n)casecmp
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Mon Dec 22 17:11:21 2008 New Revision: 38282 URL: http://svn.reactos.org/svn/reactos?rev=38282&view=rev Log: use _str(n)icmp instead of non-standard str(n)casecmp Modified: trunk/reactos/lib/sdk/crt/locale/locale.c Modified: trunk/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.… ============================================================================== --- trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] Mon Dec 22 17:11:21 2008 @@ -150,7 +150,7 @@ size_t i; for (i = 0; i < sizeof(_country_synonyms)/sizeof(char*); i += 2 ) { - if (!strcasecmp(_country_synonyms[i],name)) + if (!_stricmp(_country_synonyms[i],name)) { TRACE(":Mapping synonym %s to %s\n",name,_country_synonyms[i+1]); name[0] = _country_synonyms[i+1][0]; @@ -172,7 +172,7 @@ if (!buff[0] || !cmp[0]) return 0; /* Partial matches are allowed, e.g. "Germ" matches "Germany" */ - return !strncasecmp(cmp, buff, strlen(cmp)); + return !_strnicmp(cmp, buff, strlen(cmp)); } @@ -271,12 +271,12 @@ else { /* Special codepage values: OEM & ANSI */ - if (strcasecmp(locale->search_codepage,"OCP")) + if (_stricmp(locale->search_codepage,"OCP")) { GetLocaleInfoA(lcid, LOCALE_IDEFAULTCODEPAGE, locale->found_codepage, MAX_ELEM_LEN); } - if (strcasecmp(locale->search_codepage,"ACP")) + if (_stricmp(locale->search_codepage,"ACP")) { GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, locale->found_codepage, MAX_ELEM_LEN);

1 0

[tkreuzer] 38281: Use _getch instead of deprecated getch
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Mon Dec 22 16:58:41 2008 New Revision: 38281 URL: http://svn.reactos.org/svn/reactos?rev=38281&view=rev Log: Use _getch instead of deprecated getch Modified: trunk/rosapps/applications/sysutils/utils/binpatch/patch.c Modified: trunk/rosapps/applications/sysutils/utils/binpatch/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/binpatch/patch.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/binpatch/patch.c [iso-8859-1] Mon Dec 22 16:58:41 2008 @@ -444,7 +444,7 @@ printf("(S)kip, (R)etry, (A)bort, (M)anually enter filename"); do { - c = getch(); + c = _getch(); } while (c != 's' && c != 'r' && c != 'a' && c != 'm'); printf("\n"); @@ -496,7 +496,7 @@ printf("Do you want to make a backup of %s? (Y)es, (N)o, (A)bort", fileName); do { - c = getch(); + c = _getch(); } while (c != 'y' && c != 'n' && c != 'a'); printf("\n"); @@ -511,7 +511,7 @@ printf("File %s already exists, overwrite? (Y)es, (N)o, (A)bort", buffer); do { - c = getch(); + c = _getch(); } while (c != 'y' && c != 'n' && c != 'a'); printf("\n");

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs