Ros-diffs November 2011

ros-diffs@reactos.org

16 participants
274 discussions

[pschweitzer] 54414: [CRT] Fix _fpclass. Spotted by: Vincenzo Cotugno Reviewed by: Timo Kreuzer
by pschweitzer＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: pschweitzer Date: Thu Nov 17 22:38:15 2011 New Revision: 54414 URL: http://svn.reactos.org/svn/reactos?rev=54414&view=rev Log: [CRT] Fix _fpclass. Spotted by: Vincenzo Cotugno Reviewed by: Timo Kreuzer Modified: trunk/reactos/lib/sdk/crt/float/fpclass.c trunk/reactos/lib/sdk/crt/float/isnan.c Modified: trunk/reactos/lib/sdk/crt/float/fpclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/fpclass.… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/fpclass.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/fpclass.c [iso-8859-1] Thu Nov 17 22:38:15 2011 @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/crt/?????? - * PURPOSE: Unknown + * FILE: lib/sdk/crt/float/fpclass.c + * PURPOSE: Floating-point classes * PROGRAMER: Unknown * UPDATE HISTORY: * 25/11/05: Added license header @@ -55,32 +55,28 @@ d.__d = &__d; if ( d.d->exponent == 0 ) { - if ( d.d->mantissah == 0 && d.d->mantissal == 0 ) { - if ( d.d->sign ==0 ) + if ( d.d->mantissah == 0 && d.d->mantissal == 0 ) { + if ( d.d->sign == 0 ) + return FP_PZERO; + else return FP_NZERO; + } else { + if ( d.d->sign == 0 ) + return FP_PDENORM; else - return FP_PZERO; - } else { - if ( d.d->sign ==0 ) return FP_NDENORM; - else - return FP_PDENORM; } } - if (d.d->exponent == 0x7ff ) { - if ( d.d->mantissah == 0 && d.d->mantissal == 0 ) { - if ( d.d->sign ==0 ) + else if (d.d->exponent == 0x7ff ) { + if ( d.d->mantissah == 0 && d.d->mantissal == 0 ) { + if ( d.d->sign == 0 ) + return FP_PINF; + else return FP_NINF; - else - return FP_PINF; } - else if ( d.d->mantissah == 0 && d.d->mantissal != 0 ) { + else if ( (d.d->mantissah & 0x80000) != 0 ) { return FP_QNAN; } - else if ( d.d->mantissah == 0 && d.d->mantissal != 0 ) { - return FP_SNAN; - } - } - return 0; + return FP_SNAN; } Modified: trunk/reactos/lib/sdk/crt/float/isnan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/isnan.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/isnan.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/isnan.c [iso-8859-1] Thu Nov 17 22:38:15 2011 @@ -50,7 +50,7 @@ exponent and a nonzero mantissa. */ return (( x.x->exponent == 0x7fff) - && ( (x.x->mantissah & 0x80000000) != 0) + && ( (x.x->mantissah & 0x80000) != 0) && ( (x.x->mantissah & (unsigned int)0x7fffffff) != 0 || x.x->mantissal != 0 )); } @@ -91,7 +91,7 @@ maximum possible value and a zero mantissa. */ - if ( x.x->exponent == 0x7fff && ( (x.x->mantissah == 0x80000000 ) && x.x->mantissal == 0 )) + if ( x.x->exponent == 0x7fff && ( (x.x->mantissah == 0x80000 ) && x.x->mantissal == 0 )) return x.x->sign ? -1 : 1; return 0; }

1 0

[rharabien] 54413: [SHELL32] - Revert r54404
by rharabien＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: rharabien Date: Thu Nov 17 22:19:48 2011 New Revision: 54413 URL: http://svn.reactos.org/svn/reactos?rev=54413&view=rev Log: [SHELL32] - Revert r54404 Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Thu Nov 17 22:19:48 2011 @@ -1377,6 +1377,11 @@ HIMAGELIST ShellSmallIconList = 0; HIMAGELIST ShellBigIconList = 0; +void *operator new (size_t, void *buf) +{ + return buf; +} + /************************************************************************* * SHELL32 DllMain * @@ -1388,6 +1393,12 @@ TRACE("%p 0x%x %p\n", hInstance, dwReason, fImpLoad); if (dwReason == DLL_PROCESS_ATTACH) { + /* HACK - the global constructors don't run, so I placement new them here */ + new (&gModule) CShell32Module; + new (&_AtlWinModule) CAtlWinModule; + new (&_AtlBaseModule) CAtlBaseModule; + new (&_AtlComModule) CAtlComModule; + shell32_hInstance = hInstance; gModule.Init(ObjectMap, hInstance, NULL);

1 0

[cgutman] 54412: [I8042PRT] - Discard extra ACK packets from the mouse during reset - Fixes certain mice that send the ACK out of order
by cgutman＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: cgutman Date: Thu Nov 17 21:19:32 2011 New Revision: 54412 URL: http://svn.reactos.org/svn/reactos?rev=54412&view=rev Log: [I8042PRT] - Discard extra ACK packets from the mouse during reset - Fixes certain mice that send the ACK out of order Modified: trunk/reactos/drivers/input/i8042prt/mouse.c Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] Thu Nov 17 21:19:32 2011 @@ -458,7 +458,7 @@ IoMarkIrpPending(Irp); DeviceExtension->MouseState = MouseResetting; - DeviceExtension->MouseResetState = 1100; + DeviceExtension->MouseResetState = ExpectingReset; DeviceExtension->MouseHook.IsrWritePort = i8042MouIsrWritePort; DeviceExtension->MouseHook.QueueMousePacket = i8042MouQueuePacket; DeviceExtension->MouseHook.CallContext = DeviceExtension; @@ -640,10 +640,13 @@ switch ((ULONG)DeviceExtension->MouseResetState) { - case 1100: /* the first ack, drop it. */ - DeviceExtension->MouseResetState = ExpectingReset; - return TRUE; case ExpectingReset: + if (MOUSE_ACK == Value) + { + WARN_(I8042PRT, "Dropping extra ACK\n"); + return TRUE; + } + /* First, 0xFF is sent. The mouse is supposed to say AA00 if ok, FC00 if not. */ if (0xAA == Value) { @@ -657,6 +660,12 @@ } return TRUE; case ExpectingResetId: + if (MOUSE_ACK == Value) + { + WARN_(I8042PRT, "Dropping extra ACK #2\n"); + return TRUE; + } + if (0x00 == Value) { DeviceExtension->MouseResetState++;

1 0

[dgorbachev] 54411: [SMSS] Limit the size of swapfile (to 2GiB). Bug #4760.
by dgorbachev＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: dgorbachev Date: Thu Nov 17 20:22:16 2011 New Revision: 54411 URL: http://svn.reactos.org/svn/reactos?rev=54411&view=rev Log: [SMSS] Limit the size of swapfile (to 2GiB). Bug #4760. Modified: trunk/reactos/base/system/smss/initpage.c Modified: trunk/reactos/base/system/smss/initpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initpage.… ============================================================================== --- trunk/reactos/base/system/smss/initpage.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initpage.c [iso-8859-1] Thu Nov 17 20:22:16 2011 @@ -196,6 +196,12 @@ } + /* FIXME */ + if (InitialSize.QuadPart > (ULONGLONG)GIGABYTE * 2) + InitialSize.QuadPart = (ULONGLONG)GIGABYTE * 2; + if (MaximumSize.QuadPart > (ULONGLONG)GIGABYTE * 2) + MaximumSize.QuadPart = (ULONGLONG)GIGABYTE * 2; + /* Make sure that max is not smaller then initial */ if (InitialSize.QuadPart > MaximumSize.QuadPart) { @@ -457,6 +463,12 @@ } } + /* FIXME */ + if (InitialSizeInMB.QuadPart > 2048) + InitialSizeInMB.QuadPart = 2048; + if (MaximumSizeInMB.QuadPart > 2048) + MaximumSizeInMB.QuadPart = 2048; + DPRINT("InitialSize %I64u MB MaximumSize %I64u MB\n", InitialSizeInMB.QuadPart, MaximumSizeInMB.QuadPart);

1 0

[pschweitzer] 54410: The IUT students will actually work on MMC
by pschweitzer＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: pschweitzer Date: Thu Nov 17 19:34:20 2011 New Revision: 54410 URL: http://svn.reactos.org/svn/reactos?rev=54410&view=rev Log: The IUT students will actually work on MMC Added: branches/iut-mmc/ (props changed) - copied from r54409, branches/iut-netsh/ Removed: branches/iut-netsh/ Propchange: branches/iut-mmc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Nov 17 19:34:20 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/iut-mmc/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/iut-mmc/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/iut-mmc/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Nov 17 19:34:20 2011 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/iut-mmc/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Nov 17 19:34:20 2011 @@ -1,0 +1,12 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 Propchange: branches/iut-mmc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[cgutman] 54409: [INF] - Fix ServiceType value for the ne2000 driver - Should fix ne2000 installation
by cgutman＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: cgutman Date: Thu Nov 17 18:21:58 2011 New Revision: 54409 URL: http://svn.reactos.org/svn/reactos?rev=54409&view=rev Log: [INF] - Fix ServiceType value for the ne2000 driver - Should fix ne2000 installation Modified: trunk/reactos/media/inf/netrtpnt.inf Modified: trunk/reactos/media/inf/netrtpnt.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netrtpnt.inf?rev… ============================================================================== Binary files - no diff available.

1 0

[rharabien] 54408: [SHELL32] - Support keys with readable name and default value set to GUID in MyComputer name space. Fixes a warning about "Controls" not beeing GUID.
by rharabien＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: rharabien Date: Thu Nov 17 17:33:22 2011 New Revision: 54408 URL: http://svn.reactos.org/svn/reactos?rev=54408&view=rev Log: [SHELL32] - Support keys with readable name and default value set to GUID in MyComputer name space. Fixes a warning about "Controls" not beeing GUID. Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.cpp Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_mycomp.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_mycomp.cpp [iso-8859-1] Thu Nov 17 17:33:22 2011 @@ -93,7 +93,7 @@ BOOL CDrivesFolderEnum::CreateMyCompEnumList(DWORD dwFlags) { - BOOL ret = TRUE; + BOOL bRet = TRUE; TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); @@ -102,52 +102,57 @@ { WCHAR wszDriveName[] = {'A', ':', '\\', '\0'}; DWORD dwDrivemap = GetLogicalDrives(); - HKEY hkey; + HKEY hKey; UINT i; - while (ret && wszDriveName[0]<='Z') + while (bRet && wszDriveName[0]<='Z') { if(dwDrivemap & 0x00000001L) - ret = AddToEnumList(_ILCreateDrive(wszDriveName)); + bRet = AddToEnumList(_ILCreateDrive(wszDriveName)); wszDriveName[0]++; dwDrivemap = dwDrivemap >> 1; } TRACE("-- (%p)-> enumerate (mycomputer shell extensions)\n", this); - for (i=0; i<2; i++) + for (i = 0; i < 2; i++) { - if (ret && !RegOpenKeyExW(i == 0 ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, - MyComputer_NameSpaceW, 0, KEY_READ, &hkey)) + if (bRet && ERROR_SUCCESS == RegOpenKeyExW(i == 0 ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, + MyComputer_NameSpaceW, 0, KEY_READ, &hKey)) { - WCHAR iid[50]; - int i=0; - - while (ret) + WCHAR wszBuf[50]; + DWORD dwSize, j = 0; + LONG ErrorCode; + LPITEMIDLIST pidl; + + while (bRet) { - DWORD size; - LONG r; - - size = sizeof(iid) / sizeof(iid[0]); - r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL); - if (ERROR_SUCCESS == r) + dwSize = sizeof(wszBuf) / sizeof(wszBuf[0]); + ErrorCode = RegEnumKeyExW(hKey, j, wszBuf, &dwSize, 0, NULL, NULL, NULL); + if (ERROR_SUCCESS == ErrorCode) { + if (wszBuf[0] != L'{') + { + dwSize = sizeof(wszBuf); + RegGetValueW(hKey, wszBuf, NULL, RRF_RT_REG_SZ, NULL, wszBuf, &dwSize); + } + /* FIXME: shell extensions, shouldn't the type be * PT_SHELLEXT? */ - LPITEMIDLIST pidl = _ILCreateGuidFromStrW(iid); + pidl = _ILCreateGuidFromStrW(wszBuf); if (pidl != NULL) - ret = AddToEnumList(pidl); - i++; + bRet = AddToEnumList(pidl); + j++; } - else if (ERROR_NO_MORE_ITEMS == r) + else if (ERROR_NO_MORE_ITEMS == ErrorCode) break; else - ret = FALSE; + bRet = FALSE; } - RegCloseKey(hkey); + RegCloseKey(hKey); } } } - return ret; + return bRet; } CDrivesFolder::CDrivesFolder()

1 0

[jimtabor] 54407: - Add WndProc address to error prints.
by jimtabor＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: jimtabor Date: Thu Nov 17 17:02:01 2011 New Revision: 54407 URL: http://svn.reactos.org/svn/reactos?rev=54407&view=rev Log: - Add WndProc address to error prints. Modified: trunk/reactos/dll/win32/user32/windows/message.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Thu Nov 17 17:02:01 2011 @@ -1297,10 +1297,10 @@ switch(Hit) { case 1: - ERR("CallWindowProcW Ansi Failed!\n"); + ERR("CallWindowProcW Ansi Failed! WndProc %p\n",WndProc); break; case 2: - ERR("CallWindowProcW Unicode Failed!\n"); + ERR("CallWindowProcW Unicode Failed! WndProc %p\n",WndProc); break; } } @@ -1461,10 +1461,10 @@ switch(Hit) { case 1: - ERR("CallWindowProcA Ansi Failed!\n"); + ERR("CallWindowProcA Ansi Failed! WndProc %p\n",WndProc); break; case 2: - ERR("CallWindowProcA Unicode Failed!\n"); + ERR("CallWindowProcA Unicode Failed! WndProc %p\n",WndProc); break; } }

1 0

[rharabien] 54406: [KERNEL32] - Make sure GetEnvironmentVariableW does not use uninitialized variable - Fix GetDllLoadPath not terminating string with NULL if PATH env variable is not defined. Fixe...
by rharabien＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: rharabien Date: Thu Nov 17 16:44:51 2011 New Revision: 54406 URL: http://svn.reactos.org/svn/reactos?rev=54406&view=rev Log: [KERNEL32] - Make sure GetEnvironmentVariableW does not use uninitialized variable - Fix GetDllLoadPath not terminating string with NULL if PATH env variable is not defined. Fixes hang on manual INF selection in New Device wizard. See issue #6480 for more details. Modified: trunk/reactos/dll/win32/kernel32/client/environ.c trunk/reactos/dll/win32/kernel32/client/loader.c Modified: trunk/reactos/dll/win32/kernel32/client/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] Thu Nov 17 16:44:51 2011 @@ -182,11 +182,10 @@ UniSize = UNICODE_STRING_MAX_BYTES - sizeof(UNICODE_NULL); } + RtlInitEmptyUnicodeString(&VarValue, lpBuffer, UniSize); Status = RtlInitUnicodeStringEx(&VarName, lpName); if (NT_SUCCESS(Status)) { - RtlInitEmptyUnicodeString(&VarValue, lpBuffer, UniSize); - Status = RtlQueryEnvironmentVariable_U(NULL, &VarName, &VarValue); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/dll/win32/kernel32/client/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] Thu Nov 17 16:44:51 2011 @@ -80,7 +80,7 @@ LPWSTR GetDllLoadPath(LPCWSTR lpModule) { - ULONG Pos = 0, Length = 0; + ULONG Pos = 0, Length = 4, Tmp; PWCHAR EnvironmentBufferW = NULL; LPCWSTR lpModuleEnd = NULL; UNICODE_STRING ModuleName; @@ -88,7 +88,7 @@ // FIXME: This function is used only by SearchPathW, and is deprecated and will be deleted ASAP. - if ((lpModule != NULL) && (wcslen(lpModule) > 2) && (lpModule[1] == ':')) + if (lpModule != NULL && wcslen(lpModule) > 2 && lpModule[1] == ':') { lpModuleEnd = lpModule + wcslen(lpModule); } @@ -116,10 +116,10 @@ Length += GetEnvironmentVariableW(L"PATH", NULL, 0); EnvironmentBufferW = RtlAllocateHeap(RtlGetProcessHeap(), 0, - Length * sizeof(WCHAR)); + (Length + 1) * sizeof(WCHAR)); if (EnvironmentBufferW == NULL) { - return NULL; + return NULL; } if (lpModule) @@ -130,15 +130,39 @@ EnvironmentBufferW[Pos++] = L';'; } - Pos += GetCurrentDirectoryW(Length, EnvironmentBufferW + Pos); - EnvironmentBufferW[Pos++] = L';'; - Pos += GetDllDirectoryW(Length - Pos, EnvironmentBufferW + Pos); - EnvironmentBufferW[Pos++] = L';'; - Pos += GetSystemDirectoryW(EnvironmentBufferW + Pos, Length - Pos); - EnvironmentBufferW[Pos++] = L';'; - Pos += GetWindowsDirectoryW(EnvironmentBufferW + Pos, Length - Pos); - EnvironmentBufferW[Pos++] = L';'; - Pos += GetEnvironmentVariableW(L"PATH", EnvironmentBufferW + Pos, Length - Pos); + Tmp = GetCurrentDirectoryW(Length, EnvironmentBufferW + Pos); + if(Tmp > 0 && Tmp < Length - Pos) + { + Pos += Tmp; + if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; + } + + Tmp = GetDllDirectoryW(Length - Pos, EnvironmentBufferW + Pos); + if(Tmp > 0 && Tmp < Length - Pos) + { + Pos += Tmp; + if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; + } + + Tmp = GetSystemDirectoryW(EnvironmentBufferW + Pos, Length - Pos); + if(Tmp > 0 && Tmp < Length - Pos) + { + Pos += Tmp; + if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; + } + + Tmp = GetWindowsDirectoryW(EnvironmentBufferW + Pos, Length - Pos); + if(Tmp > 0 && Tmp < Length - Pos) + { + Pos += Tmp; + if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; + } + + Tmp = GetEnvironmentVariableW(L"PATH", EnvironmentBufferW + Pos, Length - Pos); + + /* Make sure buffer is null terminated */ + EnvironmentBufferW[Pos++] = UNICODE_NULL; + SetLastError(LastError); return EnvironmentBufferW;

1 0

[dgorbachev] 54405: [SERIAL] Pretend that functions IOCTL_SERIAL_{GET, SET}_{CHARS, HANDFLOW} are implemented. It allows PuTTY to set baud rate.
by dgorbachev＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: dgorbachev Date: Thu Nov 17 15:37:47 2011 New Revision: 54405 URL: http://svn.reactos.org/svn/reactos?rev=54405&view=rev Log: [SERIAL] Pretend that functions IOCTL_SERIAL_{GET,SET}_{CHARS,HANDFLOW} are implemented. It allows PuTTY to set baud rate. Modified: trunk/reactos/drivers/serial/serial/devctrl.c Modified: trunk/reactos/drivers/serial/serial/devctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/devc… ============================================================================== --- trunk/reactos/drivers/serial/serial/devctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/devctrl.c [iso-8859-1] Thu Nov 17 15:37:47 2011 @@ -374,8 +374,24 @@ case IOCTL_SERIAL_GET_CHARS: { /* FIXME */ + PSERIAL_CHARS pSerialChars; ERR_(SERIAL, "IOCTL_SERIAL_GET_CHARS not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; + if (LengthOut < sizeof(SERIAL_CHARS)) + Status = STATUS_BUFFER_TOO_SMALL; + else if (BufferOut == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + pSerialChars = (PSERIAL_CHARS)BufferOut; + pSerialChars->EofChar = 0; + pSerialChars->ErrorChar = 0; + pSerialChars->BreakChar = 0; + pSerialChars->EventChar = 0; + pSerialChars->XonChar = 0; + pSerialChars->XoffChar = 0; + Information = sizeof(SERIAL_CHARS); + Status = STATUS_SUCCESS; + } break; } case IOCTL_SERIAL_GET_COMMSTATUS: @@ -414,8 +430,22 @@ case IOCTL_SERIAL_GET_HANDFLOW: { /* FIXME */ + PSERIAL_HANDFLOW pSerialHandflow; ERR_(SERIAL, "IOCTL_SERIAL_GET_HANDFLOW not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; + if (LengthOut < sizeof(SERIAL_HANDFLOW)) + Status = STATUS_BUFFER_TOO_SMALL; + else if (BufferOut == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + pSerialHandflow = (PSERIAL_HANDFLOW)BufferOut; + pSerialHandflow->ControlHandShake = 0; + pSerialHandflow->FlowReplace = 0; + pSerialHandflow->XonLimit = 0; + pSerialHandflow->XoffLimit = 0; + Information = sizeof(SERIAL_HANDFLOW); + Status = STATUS_SUCCESS; + } break; } case IOCTL_SERIAL_GET_LINE_CONTROL: @@ -623,7 +653,7 @@ { /* FIXME */ ERR_(SERIAL, "IOCTL_SERIAL_SET_CHARS not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; + Status = STATUS_SUCCESS; break; } case IOCTL_SERIAL_SET_DTR: @@ -665,7 +695,7 @@ { /* FIXME */ ERR_(SERIAL, "IOCTL_SERIAL_SET_HANDFLOW not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; + Status = STATUS_SUCCESS; break; } case IOCTL_SERIAL_SET_LINE_CONTROL:

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
28
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 November 2011