Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[turner] 17881: start even console apps in there own new window. caught by GvG.

by turner＠svn.reactos.com

start even console apps in there own new window. caught by GvG. Modified: trunk/reactos/subsys/system/cmd/start.c _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-09-16 15:00:22 UTC (rev 17880) +++ trunk/reactos/subsys/system/cmd/start.c 2005-09-16 15:18:07 UTC (rev 17881) @@ -237,18 +237,8 @@ } else { - if(!_tcsicmp(szFullName,comspec)) - { bCreate = CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE, CREATE_NEW_CONSOLE, NULL, NULL, &stui, &prci); - - } - else - { - bCreate = CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE, - DETACHED_PROCESS, NULL, NULL, &stui, &prci); - } - } if (bCreate)

20 years

[turner] 17880: fix a bug in 'if exsist', it was only reading to the first space for the file name, ignoring quotes and there fore searching for bad file names.

by turner＠svn.reactos.com

fix a bug in 'if exsist', it was only reading to the first space for the file name, ignoring quotes and there fore searching for bad file names. Modified: trunk/reactos/subsys/system/cmd/if.c _____ Modified: trunk/reactos/subsys/system/cmd/if.c --- trunk/reactos/subsys/system/cmd/if.c 2005-09-16 14:50:25 UTC (rev 17879) +++ trunk/reactos/subsys/system/cmd/if.c 2005-09-16 15:00:22 UTC (rev 17880) @@ -69,15 +69,36 @@ param++; pp = param; - while (*pp && !_istspace (*pp)) + + INT i; + BOOL bInside = FALSE; + /* find the whole path to the file */ + for(i = 0; i < _tcslen(param); i++) + { + if(param[i] == _T('\"')) + bInside = !bInside; + if((param[i] == _T(' ')) && !bInside) + { + break; + } pp++; + } + *pp++ = _T('\0'); + i = 0; + /* remove quotes */ + while(i < _tcslen(param)) + { + if(param[i] == _T('\"')) + memmove(&param[i],&param[i + 1], _tcslen(&param[i]) * sizeof(TCHAR)); + else + i++; + } if (*pp) - { + { WIN32_FIND_DATA f; HANDLE hFind; - - *pp++ = _T('\0'); + hFind = FindFirstFile (param, &f); x_flag ^= (hFind == INVALID_HANDLE_VALUE) ? 0 : X_EXEC; if (hFind != INVALID_HANDLE_VALUE)

20 years

[hbirr] 17879: Dereference the port object in PspExitThread.

by hbirr＠svn.reactos.com

Dereference the port object in PspExitThread. Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-09-16 13:58:37 UTC (rev 17878) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-09-16 14:50:25 UTC (rev 17879) @@ -281,6 +281,7 @@ /* Send the LPC Message */ LpcSendTerminationPort(TerminationPort->Port, CurrentThread->CreateTime); + ObDereferenceObject(TerminationPort->Port); /* Free the Port */ ExFreePool(TerminationPort);

20 years

[turner] 17878: Set errorlevel to 0 when user enters 'no' on del confirmation. this is how MS does it.

by turner＠svn.reactos.com

Set errorlevel to 0 when user enters 'no' on del confirmation. this is how MS does it. Modified: trunk/reactos/subsys/system/cmd/del.c _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-09-16 08:48:00 UTC (rev 17877) +++ trunk/reactos/subsys/system/cmd/del.c 2005-09-16 13:58:37 UTC (rev 17878) @@ -264,7 +264,8 @@ if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) { - continue; //FIXME: Errorcode? + nErrorLevel = 0; + continue; } }

20 years

[sedwards] 17877: added support for test on 2k, XP and 2k3. Check for a bug in our implementation and wrap it in a todo_wine block

by sedwards＠svn.reactos.com

added support for test on 2k,XP and 2k3. Check for a bug in our implementation and wrap it in a todo_wine block Modified: trunk/reactos/regtests/winetests/setupapi/stringtable.c _____ Modified: trunk/reactos/regtests/winetests/setupapi/stringtable.c --- trunk/reactos/regtests/winetests/setupapi/stringtable.c 2005-09-16 05:51:20 UTC (rev 17876) +++ trunk/reactos/regtests/winetests/setupapi/stringtable.c 2005-09-16 08:48:00 UTC (rev 17877) @@ -17,14 +17,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* TODO: +/* + * TODO: * Add case sensitivity test for StringTableAddString/StringTableLookupString * Add test for StringTableStringFromIdEx - * - * BUGS: - * These functions are undocumented and exported under another name on - * Windows XP and Windows Server 2003. This test assumes the Windows 2000 - * implementation. */ #include <stdarg.h> @@ -38,12 +34,56 @@ #include "wine/test.h" + +static DWORD (WINAPI *pStringTableAddString)(HSTRING_TABLE, LPWSTR, DWORD); +static VOID (WINAPI *pStringTableDestroy)(HSTRING_TABLE); +static HSTRING_TABLE (WINAPI *pStringTableDuplicate)(HSTRING_TABLE hStringTable); +static HSTRING_TABLE (WINAPI *pStringTableInitialize)(VOID); +static DWORD (WINAPI *pStringTableLookUpString)(HSTRING_TABLE, LPWSTR, DWORD); +static LPWSTR (WINAPI *pStringTableStringFromId)(HSTRING_TABLE, DWORD); +#if 0 +static BOOL (WINAPI *pStringTableStringFromIdEx)(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD); +static VOID (WINAPI *pStringTableTrim)(HSTRING_TABLE); +#endif + +HMODULE hdll; +static WCHAR string[] = {'s','t','r','i','n','g',0}; HANDLE table, table2; /* Handles pointing to our tables */ -static WCHAR string[] = {'s','t','r','i','n','g',0}; +static void load_it_up() +{ + hdll = LoadLibraryA("setupapi.dll"); + if (!hdll) + return; + + pStringTableInitialize = (void*)GetProcAddress(hdll, "StringTableInitialize"); + if (!pStringTableInitialize) + pStringTableInitialize = (void*)GetProcAddress(hdll, "pSetupStringTableInitialize"); + + pStringTableAddString = (void*)GetProcAddress(hdll, "StringTableAddString"); + if (!pStringTableAddString) + pStringTableAddString = (void*)GetProcAddress(hdll, "pSetupStringTableAddString"); + + pStringTableDuplicate = (void*)GetProcAddress(hdll, "StringTableDuplicate"); + if (!pStringTableDuplicate) + pStringTableDuplicate = (void*)GetProcAddress(hdll, "pSetupStringTableDuplicate"); + + pStringTableDestroy = (void*)GetProcAddress(hdll, "StringTableDestroy"); + if (!pStringTableDestroy) + pStringTableDestroy = (void*)GetProcAddress(hdll, "pSetupStringTableDestroy"); + + pStringTableLookUpString = (void*)GetProcAddress(hdll, "StringTableLookUpString"); + if (!pStringTableLookUpString) + pStringTableLookUpString = (void*)GetProcAddress(hdll, "pSetupStringTableLookUpString"); + + pStringTableStringFromId = (void*)GetProcAddress(hdll, "StringTableStringFromId"); + if (!pStringTableStringFromId) + pStringTableStringFromId = (void*)GetProcAddress(hdll, "pSetupStringTableStringFromId"); +} + static void test_StringTableInitialize() { - table=StringTableInitialize(); + table=pStringTableInitialize(); ok(table!=NULL,"Failed to Initialize String Table\n"); } @@ -51,13 +91,13 @@ { DWORD retval; - retval=StringTableAddString(table,string,0); + retval=pStringTableAddString(table,string,0); ok(retval!=-1,"Failed to add string to String Table\n"); } static void test_StringTableDuplicate() { - table2=StringTableDuplicate(table); + table2=pStringTableDuplicate(table); ok(table2!=NULL,"Failed to duplicate String Table\n"); } @@ -65,33 +105,48 @@ { DWORD retval, retval2; - retval=StringTableLookUpString(table,string,0); + retval=pStringTableLookUpString(table,string,0); ok(retval!=-1,"Failed find string in String Table 1\n"); - retval2=StringTableLookUpString(table2,string,0); + retval2=pStringTableLookUpString(table2,string,0); ok(retval2!=-1,"Failed find string in String Table 2\n"); } static void test_StringTableStringFromId() { - WCHAR *string2; + WCHAR *string2, *string3; int result; - - string2=StringTableStringFromId(table,0); + + /* correct */ + string2=pStringTableStringFromId(table,pStringTableLookUpString(table,st ring,0)); ok(string2!=NULL,"Failed to look up string by ID from String Table\n"); result=lstrcmpiW(string, string2); ok(result==0,"String %p does not match requested StringID %p\n",string,string2); + + todo_wine{ + /* This should not pass on Wine but it does */ + string3=pStringTableStringFromId(table,0); + ok(string3!=NULL,"Failed to look up string by ID from String Table\n"); + + result=lstrcmpiW(string, string3); + ok(result!=0,"String %p does not match requested StringID %p\n",string,string2); + } } START_TEST(stringtable) { + load_it_up(); + test_StringTableInitialize(); test_StringTableAddString(); test_StringTableDuplicate(); test_StringTableLookUpString(); test_StringTableStringFromId(); - /* Cleanup */ - StringTableDestroy(table); + /* assume we can always distroy */ + pStringTableDestroy(table); + pStringTableDestroy(table2); + + FreeLibrary(hdll); }

20 years

[turner] 17876: When searching for a file to execute, if you fail to find it using the first part of the input, try to use the full line input. problem is really only seen when doing "start foo.bat".

by turner＠svn.reactos.com

When searching for a file to execute, if you fail to find it using the first part of the input, try to use the full line input. problem is really only seen when doing "start foo.bat". Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-16 05:35:43 UTC (rev 17875) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-16 05:51:20 UTC (rev 17876) @@ -420,13 +420,16 @@ /* search the PATH environment variable for the binary */ if (!SearchForExecutable (first, szFullName)) { - error_bad_command (); + if (!SearchForExecutable (full, szFullName)) + { + error_bad_command (); + free (first); + free (rest); + free (full); + free (szFullName); + return; + } - free (first); - free (rest); - free (full); - free (szFullName); - return; } GetConsoleTitle (szWindowTitle, MAX_PATH); @@ -539,7 +542,6 @@ INT cl; LPCOMMAND cmdptr; - #ifdef _DEBUG DebugPrintf (_T("DoCommand: (\'%s\')\n"), line); #endif /* DEBUG */

20 years

[turner] 17875: "start" or "start cmd" now opens a new cmd.exe in its own process. this is how MS cmd does it.

by turner＠svn.reactos.com

"start" or "start cmd" now opens a new cmd.exe in its own process. this is how MS cmd does it. Modified: trunk/reactos/subsys/system/cmd/start.c _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-09-16 04:53:07 UTC (rev 17874) +++ trunk/reactos/subsys/system/cmd/start.c 2005-09-16 05:35:43 UTC (rev 17875) @@ -169,7 +169,6 @@ return 0; } - /* get the PATH environment variable and parse it */ /* search the PATH environment variable for the binary */ if (!SearchForExecutable (rest, szFullName)) @@ -186,6 +185,7 @@ free(comspec); return 1; } + /* check if this is a .BAT or .CMD file */ if (!_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".bat")) || @@ -197,14 +197,11 @@ _tcscpy(szFullCmdLine,comspec); - memcpy(&szFullCmdLine[_tcslen(szFullCmdLine)],_T(" \" /K \""), 6 * sizeof(TCHAR)); + memcpy(&szFullCmdLine[_tcslen(szFullCmdLine)],_T("\" /K \""), 6 * sizeof(TCHAR)); memcpy(&szFullCmdLine[_tcslen(szFullCmdLine)], szFullName, _tcslen(szFullName) * sizeof(TCHAR)); memcpy(&szFullCmdLine[1], &szFullCmdLine[0], _tcslen(szFullCmdLine) * sizeof(TCHAR)); szFullCmdLine[0] = _T('\"'); szFullCmdLine[_tcslen(szFullCmdLine)] = _T('\"'); - - - } #ifdef _DEBUG @@ -240,8 +237,17 @@ } else { - bCreate = CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE, - DETACHED_PROCESS, NULL, NULL, &stui, &prci); + if(!_tcsicmp(szFullName,comspec)) + { + bCreate = CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE, + CREATE_NEW_CONSOLE, NULL, NULL, &stui, &prci); + + } + else + { + bCreate = CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE, + DETACHED_PROCESS, NULL, NULL, &stui, &prci); + } }

20 years

[turner] 17874: last time. fix a typo. im so sorry!

by turner＠svn.reactos.com

last time. fix a typo. im so sorry! Modified: trunk/reactos/subsys/system/cmd/start.c _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-09-16 04:46:06 UTC (rev 17873) +++ trunk/reactos/subsys/system/cmd/start.c 2005-09-16 04:53:07 UTC (rev 17874) @@ -78,7 +78,7 @@ rest = malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR)); if (rest == NULL) { - if(compsec != NULL) + if(comspec != NULL) free(comspec); error_out_of_memory(); return 1; @@ -87,7 +87,7 @@ param =malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR)); if (rest == NULL) { - if(compsec != NULL) + if(comspec != NULL) free(comspec); free(rest); error_out_of_memory(); @@ -164,7 +164,7 @@ if (param != NULL) free(param); - if (compsec != NULL) + if (comspec != NULL) free(comspec); return 0; } @@ -182,7 +182,7 @@ if (param != NULL) free(param); - if (compsec != NULL) + if (comspec != NULL) free(comspec); return 1; } @@ -197,7 +197,7 @@ _tcscpy(szFullCmdLine,comspec); - memcpy(&szFullCmdLine[_tcslen(szFullCmdLine)],_T("\" /K \""), 6 * sizeof(TCHAR)); + memcpy(&szFullCmdLine[_tcslen(szFullCmdLine)],_T(" \" /K \""), 6 * sizeof(TCHAR)); memcpy(&szFullCmdLine[_tcslen(szFullCmdLine)], szFullName, _tcslen(szFullName) * sizeof(TCHAR)); memcpy(&szFullCmdLine[1], &szFullCmdLine[0], _tcslen(szFullCmdLine) * sizeof(TCHAR)); szFullCmdLine[0] = _T('\"'); @@ -273,7 +273,7 @@ if (param != NULL) free(param); - if (compsec != NULL) + if (comspec != NULL) free(comspec); return 0; }

20 years

[turner] 17873: forgot to free comspec, very sorry.

by turner＠svn.reactos.com

forgot to free comspec, very sorry. Modified: trunk/reactos/subsys/system/cmd/start.c _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-09-16 04:40:46 UTC (rev 17872) +++ trunk/reactos/subsys/system/cmd/start.c 2005-09-16 04:46:06 UTC (rev 17873) @@ -78,6 +78,8 @@ rest = malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR)); if (rest == NULL) { + if(compsec != NULL) + free(comspec); error_out_of_memory(); return 1; } @@ -85,6 +87,8 @@ param =malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR)); if (rest == NULL) { + if(compsec != NULL) + free(comspec); free(rest); error_out_of_memory(); return 1; @@ -160,7 +164,8 @@ if (param != NULL) free(param); - + if (compsec != NULL) + free(comspec); return 0; } @@ -177,6 +182,8 @@ if (param != NULL) free(param); + if (compsec != NULL) + free(comspec); return 1; } @@ -266,6 +273,8 @@ if (param != NULL) free(param); + if (compsec != NULL) + free(comspec); return 0; }

20 years

[turner] 17872: Use compsec instead of "cmd" when trying to find cmd.exe

by turner＠svn.reactos.com

Use compsec instead of "cmd" when trying to find cmd.exe Modified: trunk/reactos/subsys/system/cmd/start.c _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-09-15 22:07:35 UTC (rev 17871) +++ trunk/reactos/subsys/system/cmd/start.c 2005-09-16 04:40:46 UTC (rev 17872) @@ -23,6 +23,8 @@ TCHAR first[CMDLINE_LENGTH]; TCHAR *rest = NULL; TCHAR *param = NULL; + INT size; + LPTSTR comspec; BOOL bWait = FALSE; BOOL bBat = FALSE; BOOL bCreate = FALSE; @@ -38,14 +40,41 @@ return 0; } + /* get comspec */ + comspec = malloc ( MAX_PATH * sizeof(TCHAR)); + if (comspec == NULL) + { + error_out_of_memory(); + return 1; + } + SetLastError(0); + size = GetEnvironmentVariable (_T("COMSPEC"), comspec, 512); + if(GetLastError() == ERROR_ENVVAR_NOT_FOUND) + { + Rest = _T("cmd"); + } + else + { + if (size > MAX_PATH) + { + comspec = realloc(comspec,size * sizeof(TCHAR) ); + if (comspec==NULL) + { + return 1; + } + size = GetEnvironmentVariable (_T("COMSPEC"), comspec, size); + } + } + nErrorLevel = 0; if( !*Rest ) { - // FIXME: use comspec instead - Rest = _T("cmd"); + _tcscpy(Rest,_T("\"")); + _tcscat(Rest,comspec); + _tcscat(Rest,_T("\"")); } - + rest = malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR)); if (rest == NULL) { @@ -158,20 +187,9 @@ bBat = TRUE; memset(szFullCmdLine,0,CMDLINE_LENGTH * sizeof(TCHAR)); - /* FIXME : use comspec instead */ - if (!SearchForExecutable (_T("CMD"), szFullCmdLine)) - { - error_bad_command (); - if (rest != NULL) - free(rest); + _tcscpy(szFullCmdLine,comspec); - if (param != NULL) - free(param); - - return 1; - } - memcpy(&szFullCmdLine[_tcslen(szFullCmdLine)],_T("\" /K \""), 6 * sizeof(TCHAR)); memcpy(&szFullCmdLine[_tcslen(szFullCmdLine)], szFullName, _tcslen(szFullName) * sizeof(TCHAR)); memcpy(&szFullCmdLine[1], &szFullCmdLine[0], _tcslen(szFullCmdLine) * sizeof(TCHAR)); @@ -217,7 +235,7 @@ { bCreate = CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &stui, &prci); - + } if (bCreate)

20 years

← Newer
1
...
28
29
30
31
32
33
34
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005