Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 17637: - Disable two tests since the Balance Set Manager isn't implemented yet and they'll freeze ROS.
by ion＠svn.reactos.com 04 Sep '05

04 Sep '05

- Disable two tests since the Balance Set Manager isn't implemented yet and they'll freeze ROS. Modified: trunk/reactos/regtests/winetests/kernel32/thread.c _____ Modified: trunk/reactos/regtests/winetests/kernel32/thread.c --- trunk/reactos/regtests/winetests/kernel32/thread.c 2005-09-04 15:18:52 UTC (rev 17636) +++ trunk/reactos/regtests/winetests/kernel32/thread.c 2005-09-04 15:57:17 UTC (rev 17637) @@ -425,10 +425,10 @@ "SetThreadPriority Failed\n"); ok(GetThreadPriority(curthread)==THREAD_PRIORITY_TIME_CRITICAL, "GetThreadPriority Failed\n"); - ok(SetThreadPriority(curthread,THREAD_PRIORITY_IDLE)!=0, - "SetThreadPriority Failed\n"); - ok(GetThreadPriority(curthread)==THREAD_PRIORITY_IDLE, - "GetThreadPriority Failed\n"); + //ok(SetThreadPriority(curthread,THREAD_PRIORITY_IDLE)!=0, + //"SetThreadPriority Failed\n"); + //ok(GetThreadPriority(curthread)==THREAD_PRIORITY_IDLE, + //"GetThreadPriority Failed\n"); ok(SetThreadPriority(curthread,0)!=0,"SetThreadPriority Failed\n"); /* Check thread priority boost */

1 0

[navaraf] 17636: Get correct physical address in HalpGrowMapBuffers.
by navaraf＠svn.reactos.com 04 Sep '05

04 Sep '05

Get correct physical address in HalpGrowMapBuffers. Modified: trunk/reactos/hal/halx86/generic/dma.c _____ Modified: trunk/reactos/hal/halx86/generic/dma.c --- trunk/reactos/hal/halx86/generic/dma.c 2005-09-04 14:40:12 UTC (rev 17635) +++ trunk/reactos/hal/halx86/generic/dma.c 2005-09-04 15:18:52 UTC (rev 17636) @@ -235,6 +235,8 @@ if (VirtualAddress == NULL) return FALSE; + PhysicalAddress = MmGetPhysicalAddress(VirtualAddress); + /* * All the following must be done with the master adapter lock held * to prevent corruption.

1 0

[ekohl] 17635: Implement CM_Get_Class_Name_ExA.
by ekohl＠svn.reactos.com 04 Sep '05

04 Sep '05

Implement CM_Get_Class_Name_ExA. Modified: trunk/reactos/lib/setupapi/cfgmgr.c _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-04 11:47:50 UTC (rev 17634) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-04 14:40:12 UTC (rev 17635) @@ -474,9 +474,39 @@ LPGUID ClassGuid, PCHAR Buffer, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p %p %p %lx %lx\n", + WCHAR szBuffer[MAX_CLASS_NAME_LEN]; + CONFIGRET ret = CR_SUCCESS; + ULONG ulLength; + ULONG ulOrigLength; + + TRACE("%p %p %p %lx %lx\n", ClassGuid, Buffer, pulLength, ulFlags, hMachine); - return CR_FAILURE; + + if (ClassGuid == NULL || Buffer == NULL || pulLength == NULL) + return CR_INVALID_POINTER; + + ulOrigLength = *pulLength; + *pulLength = 0; + + ulLength = MAX_CLASS_NAME_LEN; + ret = CM_Get_Class_Name_ExW(ClassGuid, szBuffer, &ulLength, + ulFlags, hMachine); + if (ret == CR_SUCCESS) + { + if (WideCharToMultiByte(CP_ACP, + 0, + szBuffer, + ulLength, + Buffer, + ulOrigLength, + NULL, + NULL) == 0) + ret = CR_FAILURE; + else + *pulLength = lstrlenA(Buffer) + 1; + } + + return ret; }

1 0

[greatlrd] 17634: fix bug 739 can not create file notepad newfile.txt
by greatlrd＠svn.reactos.com 04 Sep '05

04 Sep '05

fix bug 739 can not create file notepad newfile.txt at cmd prompt Modified: trunk/reactos/subsys/system/notepad/dialog.c _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2005-09-04 11:31:54 UTC (rev 17633) +++ trunk/reactos/subsys/system/notepad/dialog.c 2005-09-04 11:47:50 UTC (rev 17634) @@ -216,7 +216,7 @@ return; hFile = CreateFile(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if(hFile == INVALID_HANDLE_VALUE) { ShowLastError();

1 0

[greatlrd] 17633: Revers the change after reboot it did carcgh for me hole time.
by greatlrd＠svn.reactos.com 04 Sep '05

04 Sep '05

Revers the change after reboot it did carcgh for me hole time. Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/cmdinput.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-04 11:26:09 UTC (rev 17632) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-04 11:31:54 UTC (rev 17633) @@ -1037,14 +1037,13 @@ ProcessInput (BOOL bFlag) { TCHAR commandline[CMDLINE_LENGTH]; - TCHAR *readline = NULL; + TCHAR readline[CMDLINE_LENGTH]; LPTSTR tp = NULL; LPTSTR ip; LPTSTR cp; BOOL bEchoThisLine; - - readline = malloc(CMDLINE_LENGTH * sizeof(TCHAR)); + do { /* if no batch input then... */ @@ -1053,7 +1052,7 @@ if (bFlag) return 0; - readline = ReadCommand (readline, CMDLINE_LENGTH); + ReadCommand (readline, CMDLINE_LENGTH); ip = readline; bEchoThisLine = FALSE; } _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-09-04 11:26:09 UTC (rev 17632) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-09-04 11:31:54 UTC (rev 17633) @@ -106,7 +106,7 @@ /* Prototypes for CMDINPUT.C */ -TCHAR * ReadCommand (LPTSTR, INT); +VOID ReadCommand (LPTSTR, INT); /* Prototypes for CMDTABLE.C */ _____ Modified: trunk/reactos/subsys/system/cmd/cmdinput.c --- trunk/reactos/subsys/system/cmd/cmdinput.c 2005-09-04 11:26:09 UTC (rev 17632) +++ trunk/reactos/subsys/system/cmd/cmdinput.c 2005-09-04 11:31:54 UTC (rev 17633) @@ -124,7 +124,7 @@ /* read in a command line */ -TCHAR * ReadCommand (LPTSTR str, INT maxlen) +VOID ReadCommand (LPTSTR str, INT maxlen) { SHORT orgx; /* origin x/y */ SHORT orgy; @@ -508,15 +508,10 @@ default: #ifdef _UNICODE ch = ir.Event.KeyEvent.uChar.UnicodeChar; - charcount ++; - str = realloc(str, charcount); - - if ((ch >= 32 && ch <= 255)) + if ((ch >= 32 && ch <= 255) && (charcount != (maxlen - 2))) #else - ch = ir.Event.KeyEvent.uChar.AsciiChar; - str = realloc(str, 2 + current * sizeof(TCHAR)); - - if ((UCHAR)ch >= 32 ) + ch = ir.Event.KeyEvent.uChar.AsciiChar; + if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2))) #endif /* _UNICODE */ { /* insert character into string... */ @@ -525,8 +520,6 @@ /* If this character insertion will cause screen scrolling, * adjust the saved origin of the command prompt. */ tempscreen = _tcslen(str + current) + curx; - str = realloc(str, tempscreen * sizeof(TCHAR)); - if ((tempscreen % maxx) == (maxx - 1) && (tempscreen / maxx) + cury == (maxy - 1)) { @@ -534,8 +527,6 @@ cury--; } - - for (count = charcount; count > current; count--) str[count] = str[count - 1]; str[current++] = ch; @@ -579,6 +570,4 @@ while (ir.Event.KeyEvent.wVirtualKeyCode != VK_RETURN); SetCursorType (bInsert, TRUE); - - return str; }

1 0

[ekohl] 17632: - Enclose GUID in curly brackets.
by ekohl＠svn.reactos.com 04 Sep '05

04 Sep '05

- Enclose GUID in curly brackets. - Implement CM_Get_Class_Key_Name_ExA. Modified: trunk/reactos/lib/setupapi/cfgmgr.c _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-04 11:18:39 UTC (rev 17631) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-04 11:26:09 UTC (rev 17632) @@ -357,9 +357,39 @@ LPGUID ClassGuid, LPSTR pszKeyName, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p %p %p %lx %lx\n", + WCHAR szBuffer[MAX_GUID_STRING_LEN]; + CONFIGRET ret = CR_SUCCESS; + ULONG ulLength; + ULONG ulOrigLength; + + TRACE("%p %p %p %lx %lx\n", ClassGuid, pszKeyName, pulLength, ulFlags, hMachine); - return CR_FAILURE; + + if (ClassGuid == NULL || pszKeyName == NULL || pulLength == NULL) + return CR_INVALID_POINTER; + + ulOrigLength = *pulLength; + *pulLength = 0; + + ulLength = MAX_GUID_STRING_LEN; + ret = CM_Get_Class_Key_Name_ExW(ClassGuid, szBuffer, &ulLength, + ulFlags, hMachine); + if (ret == CR_SUCCESS) + { + if (WideCharToMultiByte(CP_ACP, + 0, + szBuffer, + ulLength, + pszKeyName, + ulOrigLength, + NULL, + NULL) == 0) + ret = CR_FAILURE; + else + *pulLength = lstrlenA(pszKeyName) + 1; + } + + return CR_SUCCESS; } @@ -370,8 +400,12 @@ if (UuidToStringW(Guid, &lpString) != RPC_S_OK) return FALSE; - lstrcpyW(String, lpString); + lstrcpyW(&String[1], lpString); + String[0] = L'{'; + String[MAX_GUID_STRING_LEN - 2] = L'}'; + String[MAX_GUID_STRING_LEN - 1] = 0; + RpcStringFree(&lpString); return TRUE; @@ -400,7 +434,7 @@ return CR_BUFFER_SMALL; } - if (!GuidToString(ClassGuid, pszKeyName)) + if (!GuidToString(ClassGuid, pszKeyName)) return CR_INVALID_DATA; *pulLength = MAX_GUID_STRING_LEN;

1 0

[greatlrd] 17631: remove some hardcode buffer value. The dymatic buffer does not work yet, until all CMDLINE_LENGTH are remove.
by greatlrd＠svn.reactos.com 04 Sep '05

04 Sep '05

remove some hardcode buffer value. The dymatic buffer does not work yet, until all CMDLINE_LENGTH are remove. Modified: trunk/reactos/subsys/system/cmd/bugs.txt Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/cmdinput.c _____ Modified: trunk/reactos/subsys/system/cmd/bugs.txt --- trunk/reactos/subsys/system/cmd/bugs.txt 2005-09-04 11:17:37 UTC (rev 17630) +++ trunk/reactos/subsys/system/cmd/bugs.txt 2005-09-04 11:18:39 UTC (rev 17631) @@ -11,5 +11,12 @@ o "alias v = dir" doesn't work because of the spaces. +o Dymatic commandline buffer need to be implement, current set to 8192bytes +o Batchfile read row size need to be implement as dymatic not set to 2000bytes + + + + + **** Please report bugs to ekohl(a)rz-online.de! **** _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-04 11:17:37 UTC (rev 17630) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-04 11:18:39 UTC (rev 17631) @@ -1037,13 +1037,14 @@ ProcessInput (BOOL bFlag) { TCHAR commandline[CMDLINE_LENGTH]; - TCHAR readline[CMDLINE_LENGTH]; + TCHAR *readline = NULL; LPTSTR tp = NULL; LPTSTR ip; LPTSTR cp; BOOL bEchoThisLine; + + readline = malloc(CMDLINE_LENGTH * sizeof(TCHAR)); - do { /* if no batch input then... */ @@ -1052,7 +1053,7 @@ if (bFlag) return 0; - ReadCommand (readline, CMDLINE_LENGTH); + readline = ReadCommand (readline, CMDLINE_LENGTH); ip = readline; bEchoThisLine = FALSE; } _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-09-04 11:17:37 UTC (rev 17630) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-09-04 11:18:39 UTC (rev 17631) @@ -106,7 +106,7 @@ /* Prototypes for CMDINPUT.C */ -VOID ReadCommand (LPTSTR, INT); +TCHAR * ReadCommand (LPTSTR, INT); /* Prototypes for CMDTABLE.C */ _____ Modified: trunk/reactos/subsys/system/cmd/cmdinput.c --- trunk/reactos/subsys/system/cmd/cmdinput.c 2005-09-04 11:17:37 UTC (rev 17630) +++ trunk/reactos/subsys/system/cmd/cmdinput.c 2005-09-04 11:18:39 UTC (rev 17631) @@ -124,7 +124,7 @@ /* read in a command line */ -VOID ReadCommand (LPTSTR str, INT maxlen) +TCHAR * ReadCommand (LPTSTR str, INT maxlen) { SHORT orgx; /* origin x/y */ SHORT orgy; @@ -508,10 +508,15 @@ default: #ifdef _UNICODE ch = ir.Event.KeyEvent.uChar.UnicodeChar; - if ((ch >= 32 && ch <= 255) && (charcount != (maxlen - 2))) + charcount ++; + str = realloc(str, charcount); + + if ((ch >= 32 && ch <= 255)) #else - ch = ir.Event.KeyEvent.uChar.AsciiChar; - if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2))) + ch = ir.Event.KeyEvent.uChar.AsciiChar; + str = realloc(str, 2 + current * sizeof(TCHAR)); + + if ((UCHAR)ch >= 32 ) #endif /* _UNICODE */ { /* insert character into string... */ @@ -520,6 +525,8 @@ /* If this character insertion will cause screen scrolling, * adjust the saved origin of the command prompt. */ tempscreen = _tcslen(str + current) + curx; + str = realloc(str, tempscreen * sizeof(TCHAR)); + if ((tempscreen % maxx) == (maxx - 1) && (tempscreen / maxx) + cury == (maxy - 1)) { @@ -527,6 +534,8 @@ cury--; } + + for (count = charcount; count > current; count--) str[count] = str[count - 1]; str[current++] = ch; @@ -570,4 +579,6 @@ while (ir.Event.KeyEvent.wVirtualKeyCode != VK_RETURN); SetCursorType (bInsert, TRUE); + + return str; }

1 0

[navaraf] 17630: Fix the return value of HalReadDmaCounter at the end of transfer.
by navaraf＠svn.reactos.com 04 Sep '05

04 Sep '05

Fix the return value of HalReadDmaCounter at the end of transfer. Modified: trunk/reactos/hal/halx86/generic/dma.c _____ Modified: trunk/reactos/hal/halx86/generic/dma.c --- trunk/reactos/hal/halx86/generic/dma.c 2005-09-04 10:02:19 UTC (rev 17629) +++ trunk/reactos/hal/halx86/generic/dma.c 2005-09-04 11:17:37 UTC (rev 17630) @@ -977,6 +977,7 @@ KeReleaseSpinLock(&AdapterObject->MasterAdapter->SpinLock, OldIrql); Count++; + Count &= 0xffff; if (AdapterObject->Width16Bits) Count *= 2;

1 0

[navaraf] 17629: - Set the MAP_BASE_SW_SG flag for map registers in IoFreeMapRegisters.
by navaraf＠svn.reactos.com 04 Sep '05

04 Sep '05

- Set the MAP_BASE_SW_SG flag for map registers in IoFreeMapRegisters. - Fix address calculation in HalpCopyBufferMap. - Correctly set the map register counter in IoMapTransfer if dealing with MAP_BASE_SW_SG map registers. Modified: trunk/reactos/hal/halx86/generic/dma.c _____ Modified: trunk/reactos/hal/halx86/generic/dma.c --- trunk/reactos/hal/halx86/generic/dma.c 2005-09-04 09:54:59 UTC (rev 17628) +++ trunk/reactos/hal/halx86/generic/dma.c 2005-09-04 10:02:19 UTC (rev 17629) @@ -1402,6 +1402,13 @@ AdapterObject->MapRegisterBase = MasterAdapter->MapRegisterBase + Index; + if (!AdapterObject->ScatterGather) + { + AdapterObject->MapRegisterBase = + (PMAP_REGISTER_ENTRY)( + (ULONG_PTR)AdapterObject->MapRegisterBase | + MAP_BASE_SW_SG); + } Result = ((PDRIVER_CONTROL)AdapterObject->CurrentWcb->DeviceRoutine)( AdapterObject->CurrentWcb->DeviceObject, @@ -1471,7 +1478,8 @@ KEBUGCHECK(0); } - CurrentAddress = (ULONG_PTR)CurrentVa - + CurrentAddress = (ULONG_PTR)VirtualAddress + + (ULONG_PTR)CurrentVa - (ULONG_PTR)MmGetMdlVirtualAddress(Mdl); while (Length > 0) @@ -1583,7 +1591,7 @@ Length -= HalReadDmaCounter(AdapterObject); } - HalpCopyBufferMap(Mdl, RealMapRegisterBase, CurrentVa, Length, 0); + HalpCopyBufferMap(Mdl, RealMapRegisterBase, CurrentVa, Length, FALSE); } else { @@ -1763,7 +1771,7 @@ RealMapRegisterBase->Counter += BYTES_TO_PAGES(ByteOffset + TransferLength); /* - * Check if the buffer doesn't exceed the highest phisical address + * Check if the buffer doesn't exceed the highest physical address * limit of the device. In that case we must use the map registers to * store the data. */ @@ -1775,6 +1783,10 @@ UseMapRegisters = TRUE; PhysicalAddress = RealMapRegisterBase->PhysicalAddress; PhysicalAddress.QuadPart += ByteOffset; + if ((ULONG_PTR)MapRegisterBase & MAP_BASE_SW_SG) + { + RealMapRegisterBase->Counter = ~0; + } } }

1 0

[greatlrd] 17628: Remove more hardcode buffer value to dymatic buffer.
by greatlrd＠svn.reactos.com 04 Sep '05

04 Sep '05

Remove more hardcode buffer value to dymatic buffer. 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-04 09:29:44 UTC (rev 17627) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-04 09:54:59 UTC (rev 17628) @@ -296,9 +296,9 @@ Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest) { TCHAR szFullName[MAX_PATH]; - TCHAR first[CMDLINE_LENGTH]; - TCHAR rest[CMDLINE_LENGTH]; - TCHAR full[CMDLINE_LENGTH]; + TCHAR *first = NULL; + TCHAR *rest = NULL; + TCHAR *full = NULL; #ifndef __REACTOS__ TCHAR szWindowTitle[MAX_PATH]; #endif @@ -308,10 +308,39 @@ DebugPrintf (_T("Execute: \'%s\' \'%s\'\n"), first, rest); #endif + /* we need biger buffer that First, Rest, Full are already + need rewrite some code to use realloc when it need instead + of add 512bytes extra */ + + first = malloc ( _tcslen(First) + 512 * sizeof(TCHAR)); + if (first == NULL) + { + error_out_of_memory(); + return ; + } + + rest = malloc ( _tcslen(Rest) + 512 * sizeof(TCHAR)); + if (rest == NULL) + { + free (full); + error_out_of_memory(); + return ; + } + + full = malloc ( _tcslen(Full) + 512 * sizeof(TCHAR)); + if (full == NULL) + { + free (full); + free (rest); + error_out_of_memory(); + return ; + } + + /* Though it was already parsed once, we have a different set of rules for parsing before we pass to CreateProccess */ if(!_tcschr(Full,_T('\"'))) - { + { _tcscpy(first,First); _tcscpy(rest,Rest); _tcscpy(full,Full); @@ -468,6 +497,10 @@ #ifndef __REACTOS__ SetConsoleTitle (szWindowTitle); #endif + + free(first); + free(rest); + free(full); }

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