Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 16 Sep '05

16 Sep '05

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); }

1 0

[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 16 Sep '05

16 Sep '05

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 */

1 0

[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 16 Sep '05

16 Sep '05

"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); + } }

1 0

[turner] 17874: last time. fix a typo. im so sorry!
by turner＠svn.reactos.com 16 Sep '05

16 Sep '05

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; }

1 0

[turner] 17873: forgot to free comspec, very sorry.
by turner＠svn.reactos.com 16 Sep '05

16 Sep '05

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; }

1 0

[turner] 17872: Use compsec instead of "cmd" when trying to find cmd.exe
by turner＠svn.reactos.com 16 Sep '05

16 Sep '05

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)

1 0

[gvg] 17871: Fix some of the damage r17811 did to the GDB stub
by gvg＠svn.reactos.com 15 Sep '05

15 Sep '05

Fix some of the damage r17811 did to the GDB stub Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-09-15 20:24:30 UTC (rev 17870) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-09-15 22:07:35 UTC (rev 17871) @@ -1068,7 +1068,7 @@ } -static BOOL gdb_attached_yet = TRUE; +static BOOL gdb_attached_yet = FALSE; /* * This function does all command procesing for interfacing to gdb. */ @@ -1102,7 +1102,7 @@ { GspAccessLocation = NULL; GspMemoryError = TRUE; - TrapFrame->Eip += 3; + Context->Eip += 3; } else { @@ -1321,8 +1321,7 @@ #error Unknown compiler for inline assembler #endif - KeContextToTrapFrame(Context, NULL, TrapFrame, KernelMode); - return ((SigVal == 5) ? (kdContinue) : (kdHandleException)); + return kdContinue; break; } @@ -1399,7 +1398,7 @@ ASSERT(0); } - return kdDoNotHandleException; + return kdContinue; } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-09-15 20:24:30 UTC (rev 17870) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-09-15 22:07:35 UTC (rev 17871) @@ -1242,7 +1242,7 @@ &Context, TrapFrame, TRUE, - FALSE); + TRUE); /* Exit if we're continuing */ if (Action == kdContinue) goto Handled;

1 0

[fireball] 17870: Fix the tree at last, by reverting previous changes to RtlpCheckForActiveDebugger.
by fireball＠svn.reactos.com 15 Sep '05

15 Sep '05

Fix the tree at last, by reverting previous changes to RtlpCheckForActiveDebugger. Modified: trunk/reactos/lib/rtl/exception.c Modified: trunk/reactos/lib/rtl/rtlp.h _____ Modified: trunk/reactos/lib/rtl/exception.c --- trunk/reactos/lib/rtl/exception.c 2005-09-15 19:30:27 UTC (rev 17869) +++ trunk/reactos/lib/rtl/exception.c 2005-09-15 20:24:30 UTC (rev 17870) @@ -39,7 +39,7 @@ Context.ContextFlags = CONTEXT_FULL; /* Check if we're being debugged (user-mode only) */ - if (!RtlpCheckForActiveDebugger(TRUE)) + if (!RtlpCheckForActiveDebugger()) { /* Raise an exception immediately */ Status = ZwRaiseException(ExceptionRecord, &Context, TRUE); @@ -91,7 +91,7 @@ Context.ContextFlags = CONTEXT_FULL; /* Check if we're being debugged (user-mode only) */ - if (!RtlpCheckForActiveDebugger(TRUE)) + if (!RtlpCheckForActiveDebugger()) { /* Raise an exception immediately */ ZwRaiseException(&ExceptionRecord, &Context, TRUE); _____ Modified: trunk/reactos/lib/rtl/rtlp.h --- trunk/reactos/lib/rtl/rtlp.h 2005-09-15 19:30:27 UTC (rev 17869) +++ trunk/reactos/lib/rtl/rtlp.h 2005-09-15 20:24:30 UTC (rev 17870) @@ -51,7 +51,7 @@ BOOLEAN NTAPI -RtlpCheckForActiveDebugger(BOOLEAN Type); +RtlpCheckForActiveDebugger(VOID); BOOLEAN NTAPI

1 0

[fireball] 17869: Revert 17867:17866 change, introduced to temporarily fix tree-compiling. Made obsolete by rev. 17868.
by fireball＠svn.reactos.com 15 Sep '05

15 Sep '05

Revert 17867:17866 change, introduced to temporarily fix tree-compiling. Made obsolete by rev. 17868. Modified: trunk/reactos/lib/rtl/exception.c _____ Modified: trunk/reactos/lib/rtl/exception.c --- trunk/reactos/lib/rtl/exception.c 2005-09-15 19:18:59 UTC (rev 17868) +++ trunk/reactos/lib/rtl/exception.c 2005-09-15 19:30:27 UTC (rev 17869) @@ -39,7 +39,7 @@ Context.ContextFlags = CONTEXT_FULL; /* Check if we're being debugged (user-mode only) */ - if (!RtlpCheckForActiveDebugger()) + if (!RtlpCheckForActiveDebugger(TRUE)) { /* Raise an exception immediately */ Status = ZwRaiseException(ExceptionRecord, &Context, TRUE); @@ -91,7 +91,7 @@ Context.ContextFlags = CONTEXT_FULL; /* Check if we're being debugged (user-mode only) */ - if (!RtlpCheckForActiveDebugger()) + if (!RtlpCheckForActiveDebugger(TRUE)) { /* Raise an exception immediately */ ZwRaiseException(&ExceptionRecord, &Context, TRUE);

1 0

[ion] 17868: - Fix build, sorry.
by ion＠svn.reactos.com 15 Sep '05

15 Sep '05

- Fix build, sorry. Modified: trunk/reactos/lib/rtl/rtlp.h _____ Modified: trunk/reactos/lib/rtl/rtlp.h --- trunk/reactos/lib/rtl/rtlp.h 2005-09-15 19:14:42 UTC (rev 17867) +++ trunk/reactos/lib/rtl/rtlp.h 2005-09-15 19:18:59 UTC (rev 17868) @@ -51,7 +51,7 @@ BOOLEAN NTAPI -RtlpCheckForActiveDebugger(VOID); +RtlpCheckForActiveDebugger(BOOLEAN Type); BOOLEAN NTAPI @@ -63,6 +63,10 @@ #define RtlpAllocateStringMemory RtlpAllocateMemory #define RtlpFreeStringMemory RtlpFreeMemory +BOOLEAN +NTAPI +RtlpSetInDbgPrint(IN BOOLEAN NewValue); + /* i386/except.S */ EXCEPTION_DISPOSITION @@ -96,6 +100,15 @@ NTAPI RtlpCaptureContext(OUT PCONTEXT ContextRecord); +/* i386/debug.S */ +NTSTATUS +NTAPI +DebugService(IN ULONG Service, + IN PVOID Buffer, + IN ULONG Length, + IN PVOID Argument1, + IN PVOID Argument2); + /* Tags for the String Allocators */ #define TAG_USTR TAG('U', 'S', 'T', 'R') #define TAG_ASTR TAG('A', 'S', 'T', 'R')

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