Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[rharabien] 54404: [SHELL32] - Remove a not needed hack
by rharabien＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: rharabien Date: Thu Nov 17 14:33:35 2011 New Revision: 54404 URL: http://svn.reactos.org/svn/reactos?rev=54404&view=rev Log: [SHELL32] - Remove a not needed hack 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 14:33:35 2011 @@ -1377,11 +1377,6 @@ HIMAGELIST ShellSmallIconList = 0; HIMAGELIST ShellBigIconList = 0; -void *operator new (size_t, void *buf) -{ - return buf; -} - /************************************************************************* * SHELL32 DllMain * @@ -1393,12 +1388,6 @@ 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); @@ -1448,7 +1437,7 @@ } /*********************************************************************** - * DllRegisterServer (BROWSEUI.@) + * DllRegisterServer (SHELL32.@) */ STDAPI DllRegisterServer() { @@ -1463,7 +1452,7 @@ } /*********************************************************************** - * DllUnregisterServer (BROWSEUI.@) + * DllUnregisterServer (SHELL32.@) */ STDAPI DllUnregisterServer() {

1 0

[rharabien] 54403: [SHELL32] - Register Printers folder in ControlPanel namespace. Fixes "Printers is not a GUID" warning
by rharabien＠svn.reactos.org 17 Nov '11

17 Nov '11

Author: rharabien Date: Thu Nov 17 14:31:19 2011 New Revision: 54403 URL: http://svn.reactos.org/svn/reactos?rev=54403&view=rev Log: [SHELL32] - Register Printers folder in ControlPanel namespace. Fixes "Printers is not a GUID" warning Modified: trunk/reactos/dll/win32/shell32/res/rgs/printers.rgs Modified: trunk/reactos/dll/win32/shell32/res/rgs/printers.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/printers.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/rgs/printers.rgs [iso-8859-1] Thu Nov 17 14:31:19 2011 @@ -32,7 +32,7 @@ { NoRemove Explorer { - NoRemove Desktop + NoRemove ControlPanel { NoRemove NameSpace {

1 0

[cgutman] 54402: [NDIS] - Fix a critical bug in registry entry parsing that was causing all REG_SZ values to be reported as NdisParameterTypeInteger - Distinguish between NdisParameterTypeInteger a...
by cgutman＠svn.reactos.org 16 Nov '11

16 Nov '11

Author: cgutman Date: Wed Nov 16 22:01:11 2011 New Revision: 54402 URL: http://svn.reactos.org/svn/reactos?rev=54402&view=rev Log: [NDIS] - Fix a critical bug in registry entry parsing that was causing all REG_SZ values to be reported as NdisParameterTypeInteger - Distinguish between NdisParameterTypeInteger and NdisParameterTypeHexInteger - 3Com NICs are fully functional now [bug 4330] Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Wed Nov 16 22:01:11 2011 @@ -320,304 +320,6 @@ *Status = NDIS_STATUS_SUCCESS; } - -/* - * @implemented - */ -VOID -EXPORT -NdisReadConfiguration( - OUT PNDIS_STATUS Status, - OUT PNDIS_CONFIGURATION_PARAMETER * ParameterValue, - IN NDIS_HANDLE ConfigurationHandle, - IN PNDIS_STRING Keyword, - IN NDIS_PARAMETER_TYPE ParameterType) -/* - * FUNCTION: Read a configuration value from the registry, tracking its resources - * ARGUMENTS: - * Status: points to a place to write status into - * ParameterValue: Pointer to receive a newly-allocated parameter structure - * ConfigurationHandle: handle originally returned by an open function - * Keyword: Value name to read, or one of the following constants: - * Environment - returns NdisEnvironmentWindowsNt - * ProcessorType - returns NdisProcessorX86 until more architectures are added - * NdisVersion - returns NDIS_VERSION - * ParameterType: the type of the value to be queried - * RETURNS: - * - A status in Status - * - A parameter value in ParameterValue - */ -{ - KEY_VALUE_PARTIAL_INFORMATION *KeyInformation; - ULONG KeyDataLength; - PMINIPORT_RESOURCE MiniportResource; - PMINIPORT_CONFIGURATION_CONTEXT ConfigurationContext = (PMINIPORT_CONFIGURATION_CONTEXT)ConfigurationHandle; - PVOID Buffer; - - *ParameterValue = NULL; - *Status = NDIS_STATUS_FAILURE; - - NDIS_DbgPrint(MAX_TRACE,("requested read of %wZ\n", Keyword)); - - if (ConfigurationContext == NULL) - { - NDIS_DbgPrint(MIN_TRACE,("invalid parameter ConfigurationContext (0x%x)\n",ConfigurationContext)); - return; - } - - if( - !wcsncmp(Keyword->Buffer, L"Environment", Keyword->Length/sizeof(WCHAR)) && - wcslen(L"Environment") == Keyword->Length/sizeof(WCHAR) - ) - { - *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); - if(!*ParameterValue) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE)); - if(!MiniportResource) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(*ParameterValue); - *ParameterValue = NULL; - *Status = NDIS_STATUS_RESOURCES; - return; - } - - MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_REGISTRY_DATA; - MiniportResource->Resource = *ParameterValue; - - NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", - MiniportResource->Resource)); - - ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, - &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); - - (*ParameterValue)->ParameterType = NdisParameterInteger; - (*ParameterValue)->ParameterData.IntegerData = NdisEnvironmentWindowsNt; - *Status = NDIS_STATUS_SUCCESS; - - return; - } - - if( - !wcsncmp(Keyword->Buffer, L"ProcessorType", Keyword->Length/sizeof(WCHAR)) && - wcslen(L"ProcessorType") == Keyword->Length/sizeof(WCHAR) - ) - { - *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); - if(!*ParameterValue) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE)); - if(!MiniportResource) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(*ParameterValue); - *ParameterValue = NULL; - *Status = NDIS_STATUS_RESOURCES; - return; - } - - MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_REGISTRY_DATA; - MiniportResource->Resource = *ParameterValue; - NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource)); - ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, - &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); - - (*ParameterValue)->ParameterType = NdisParameterInteger; - (*ParameterValue)->ParameterData.IntegerData = NdisProcessorX86; /* XXX non-portable */ - *Status = NDIS_STATUS_SUCCESS; - - return; - } - - if( - !wcsncmp(Keyword->Buffer, L"NdisVersion", Keyword->Length/sizeof(WCHAR)) && - wcslen(L"NdisVersion") == Keyword->Length/sizeof(WCHAR) - ) - { - *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); - if(!*ParameterValue) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE)); - if(!MiniportResource) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(*ParameterValue); - *ParameterValue = NULL; - *Status = NDIS_STATUS_RESOURCES; - return; - } - - MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_REGISTRY_DATA; - MiniportResource->Resource = *ParameterValue; - NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource)); - ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, - &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); - - (*ParameterValue)->ParameterType = NdisParameterInteger; - (*ParameterValue)->ParameterData.IntegerData = NDIS_VERSION; - *Status = NDIS_STATUS_SUCCESS; - - NDIS_DbgPrint(MAX_TRACE,("ParameterType = %0x%x, ParameterValue = 0x%x\n", - (*ParameterValue)->ParameterType, (*ParameterValue)->ParameterData.IntegerData)); - return; - } - - /* figure out how much buffer i should allocate */ - *Status = ZwQueryValueKey(ConfigurationContext->Handle, Keyword, KeyValuePartialInformation, NULL, 0, &KeyDataLength); - if(*Status != STATUS_BUFFER_OVERFLOW && *Status != STATUS_BUFFER_TOO_SMALL && *Status != STATUS_SUCCESS) - { - NDIS_DbgPrint(MID_TRACE,("ZwQueryValueKey #1 failed for %wZ, status 0x%x\n", Keyword, *Status)); - *Status = NDIS_STATUS_FAILURE; - return; - } - - /* allocate it */ - KeyInformation = ExAllocatePool(PagedPool, KeyDataLength + sizeof(KEY_VALUE_PARTIAL_INFORMATION)); - if(!KeyInformation) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - /* grab the value */ - *Status = ZwQueryValueKey(ConfigurationContext->Handle, Keyword, KeyValuePartialInformation, - KeyInformation, KeyDataLength + sizeof(KEY_VALUE_PARTIAL_INFORMATION), &KeyDataLength); - if(*Status != STATUS_SUCCESS) - { - ExFreePool(KeyInformation); - NDIS_DbgPrint(MIN_TRACE,("ZwQueryValueKey #2 failed for %wZ, status 0x%x\n", Keyword, *Status)); - *Status = NDIS_STATUS_FAILURE; - return; - } - - MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE)); - if(!MiniportResource) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); - if (!*ParameterValue) - { - NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - ExFreePool(MiniportResource); - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - RtlZeroMemory(*ParameterValue, sizeof(NDIS_CONFIGURATION_PARAMETER)); - - if (KeyInformation->Type == REG_BINARY) - { - NDIS_DbgPrint(MAX_TRACE, ("NdisParameterBinary\n")); - - (*ParameterValue)->ParameterType = NdisParameterBinary; - - Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); - if (!Buffer) - { - NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - ExFreePool(MiniportResource); - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - RtlCopyMemory(Buffer, KeyInformation->Data, KeyInformation->DataLength); - - (*ParameterValue)->ParameterData.BinaryData.Buffer = Buffer; - (*ParameterValue)->ParameterData.BinaryData.Length = KeyInformation->DataLength; - } - else if (KeyInformation->Type == REG_MULTI_SZ) - { - NDIS_DbgPrint(MAX_TRACE, ("NdisParameterMultiString\n")); - - (*ParameterValue)->ParameterType = NdisParameterMultiString; - - Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); - if (!Buffer) - { - NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - ExFreePool(MiniportResource); - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - RtlCopyMemory(Buffer, KeyInformation->Data, KeyInformation->DataLength); - - (*ParameterValue)->ParameterData.StringData.Buffer = Buffer; - (*ParameterValue)->ParameterData.StringData.Length = KeyInformation->DataLength; - } - else - { - UNICODE_STRING str; - - str.Length = str.MaximumLength = (USHORT)KeyInformation->DataLength; - str.Buffer = (PWCHAR)KeyInformation->Data; - - if ((*Status = RtlUnicodeStringToInteger(&str, 0, - &(*ParameterValue)->ParameterData.IntegerData)) == STATUS_SUCCESS) - { - NDIS_DbgPrint(MAX_TRACE, ("NdisParameterInteger\n")); - - (*ParameterValue)->ParameterType = NdisParameterInteger; - } - else - { - NDIS_DbgPrint(MAX_TRACE, ("NdisParameterString\n")); - - (*ParameterValue)->ParameterType = NdisParameterString; - - Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); - if (!Buffer) - { - NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - ExFreePool(MiniportResource); - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - RtlCopyMemory(Buffer, KeyInformation->Data, KeyInformation->DataLength); - - (*ParameterValue)->ParameterData.StringData.Buffer = Buffer; - (*ParameterValue)->ParameterData.StringData.Length = KeyInformation->DataLength; - } - } - - MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_REGISTRY_DATA; - MiniportResource->Resource = *ParameterValue; - - ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); - - ExFreePool(KeyInformation); - - *Status = NDIS_STATUS_SUCCESS; -} - - UCHAR UnicodeToHexByte(WCHAR chr) /* * FUNCTION: Converts a unicode hex character to its numerical value @@ -658,9 +360,354 @@ case L'f': return 15; } - return -1; + return 0xFF; } +BOOLEAN +IsValidNumericString(PNDIS_STRING String, NDIS_PARAMETER_TYPE *ParameterType) +/* + * FUNCTION: Determines if a string is a valid number + * ARGUMENTS: + * String: Unicode string to evaluate + * RETURNS: + * TRUE if it is valid, FALSE if not + */ +{ + ULONG i; + + /* I don't think this will ever happen, but we warn it if it does */ + if (String->Length == 0) + { + NDIS_DbgPrint(MIN_TRACE, ("Got an empty string; not sure what to do here\n")); + return FALSE; + } + + /* Set the default parameter type */ + *ParameterType = NdisParameterInteger; + + for (i = 0; i < String->Length / sizeof(WCHAR); i++) + { + /* Look at the second character for the base */ + if (i == 1) + { + if (String->Buffer[i] == L'X' || + String->Buffer[i] == L'x') + { + NDIS_DbgPrint(MID_TRACE, ("Identified hex string\n")); + *ParameterType = NdisParameterHexInteger; + continue; + } + } + + /* Skip any NULL characters we find */ + if (String->Buffer[i] == UNICODE_NULL) + continue; + + /* Make sure the character is valid for a numeric string */ + if (UnicodeToHexByte(String->Buffer[i]) == 0xFF) + return FALSE; + } + + /* It's valid */ + return TRUE; +} + +/* + * @implemented + */ +VOID +EXPORT +NdisReadConfiguration( + OUT PNDIS_STATUS Status, + OUT PNDIS_CONFIGURATION_PARAMETER * ParameterValue, + IN NDIS_HANDLE ConfigurationHandle, + IN PNDIS_STRING Keyword, + IN NDIS_PARAMETER_TYPE ParameterType) +/* + * FUNCTION: Read a configuration value from the registry, tracking its resources + * ARGUMENTS: + * Status: points to a place to write status into + * ParameterValue: Pointer to receive a newly-allocated parameter structure + * ConfigurationHandle: handle originally returned by an open function + * Keyword: Value name to read, or one of the following constants: + * Environment - returns NdisEnvironmentWindowsNt + * ProcessorType - returns NdisProcessorX86 until more architectures are added + * NdisVersion - returns NDIS_VERSION + * ParameterType: the type of the value to be queried + * RETURNS: + * - A status in Status + * - A parameter value in ParameterValue + */ +{ + KEY_VALUE_PARTIAL_INFORMATION *KeyInformation; + ULONG KeyDataLength; + PMINIPORT_RESOURCE MiniportResource; + PMINIPORT_CONFIGURATION_CONTEXT ConfigurationContext = (PMINIPORT_CONFIGURATION_CONTEXT)ConfigurationHandle; + PVOID Buffer; + + *ParameterValue = NULL; + *Status = NDIS_STATUS_FAILURE; + + NDIS_DbgPrint(MAX_TRACE,("requested read of %wZ\n", Keyword)); + + if (ConfigurationContext == NULL) + { + NDIS_DbgPrint(MIN_TRACE,("invalid parameter ConfigurationContext (0x%x)\n",ConfigurationContext)); + return; + } + + if( + !wcsncmp(Keyword->Buffer, L"Environment", Keyword->Length/sizeof(WCHAR)) && + wcslen(L"Environment") == Keyword->Length/sizeof(WCHAR) + ) + { + *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); + if(!*ParameterValue) + { + NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE)); + if(!MiniportResource) + { + NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + ExFreePool(*ParameterValue); + *ParameterValue = NULL; + *Status = NDIS_STATUS_RESOURCES; + return; + } + + MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_REGISTRY_DATA; + MiniportResource->Resource = *ParameterValue; + + NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", + MiniportResource->Resource)); + + ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, + &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); + + (*ParameterValue)->ParameterType = NdisParameterInteger; + (*ParameterValue)->ParameterData.IntegerData = NdisEnvironmentWindowsNt; + *Status = NDIS_STATUS_SUCCESS; + + return; + } + + if( + !wcsncmp(Keyword->Buffer, L"ProcessorType", Keyword->Length/sizeof(WCHAR)) && + wcslen(L"ProcessorType") == Keyword->Length/sizeof(WCHAR) + ) + { + *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); + if(!*ParameterValue) + { + NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE)); + if(!MiniportResource) + { + NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + ExFreePool(*ParameterValue); + *ParameterValue = NULL; + *Status = NDIS_STATUS_RESOURCES; + return; + } + + MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_REGISTRY_DATA; + MiniportResource->Resource = *ParameterValue; + NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource)); + ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, + &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); + + (*ParameterValue)->ParameterType = NdisParameterInteger; + (*ParameterValue)->ParameterData.IntegerData = NdisProcessorX86; /* XXX non-portable */ + *Status = NDIS_STATUS_SUCCESS; + + return; + } + + if( + !wcsncmp(Keyword->Buffer, L"NdisVersion", Keyword->Length/sizeof(WCHAR)) && + wcslen(L"NdisVersion") == Keyword->Length/sizeof(WCHAR) + ) + { + *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); + if(!*ParameterValue) + { + NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE)); + if(!MiniportResource) + { + NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + ExFreePool(*ParameterValue); + *ParameterValue = NULL; + *Status = NDIS_STATUS_RESOURCES; + return; + } + + MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_REGISTRY_DATA; + MiniportResource->Resource = *ParameterValue; + NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource)); + ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, + &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); + + (*ParameterValue)->ParameterType = NdisParameterInteger; + (*ParameterValue)->ParameterData.IntegerData = NDIS_VERSION; + *Status = NDIS_STATUS_SUCCESS; + + NDIS_DbgPrint(MAX_TRACE,("ParameterType = %0x%x, ParameterValue = 0x%x\n", + (*ParameterValue)->ParameterType, (*ParameterValue)->ParameterData.IntegerData)); + return; + } + + /* figure out how much buffer i should allocate */ + *Status = ZwQueryValueKey(ConfigurationContext->Handle, Keyword, KeyValuePartialInformation, NULL, 0, &KeyDataLength); + if(*Status != STATUS_BUFFER_OVERFLOW && *Status != STATUS_BUFFER_TOO_SMALL && *Status != STATUS_SUCCESS) + { + NDIS_DbgPrint(MID_TRACE,("ZwQueryValueKey #1 failed for %wZ, status 0x%x\n", Keyword, *Status)); + *Status = NDIS_STATUS_FAILURE; + return; + } + + /* allocate it */ + KeyInformation = ExAllocatePool(PagedPool, KeyDataLength + sizeof(KEY_VALUE_PARTIAL_INFORMATION)); + if(!KeyInformation) + { + NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + /* grab the value */ + *Status = ZwQueryValueKey(ConfigurationContext->Handle, Keyword, KeyValuePartialInformation, + KeyInformation, KeyDataLength + sizeof(KEY_VALUE_PARTIAL_INFORMATION), &KeyDataLength); + if(*Status != STATUS_SUCCESS) + { + ExFreePool(KeyInformation); + NDIS_DbgPrint(MIN_TRACE,("ZwQueryValueKey #2 failed for %wZ, status 0x%x\n", Keyword, *Status)); + *Status = NDIS_STATUS_FAILURE; + return; + } + + MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE)); + if(!MiniportResource) + { + NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); + if (!*ParameterValue) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ExFreePool(MiniportResource); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + RtlZeroMemory(*ParameterValue, sizeof(NDIS_CONFIGURATION_PARAMETER)); + + if (KeyInformation->Type == REG_BINARY) + { + NDIS_DbgPrint(MAX_TRACE, ("NdisParameterBinary\n")); + + (*ParameterValue)->ParameterType = NdisParameterBinary; + + Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); + if (!Buffer) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ExFreePool(MiniportResource); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + RtlCopyMemory(Buffer, KeyInformation->Data, KeyInformation->DataLength); + + (*ParameterValue)->ParameterData.BinaryData.Buffer = Buffer; + (*ParameterValue)->ParameterData.BinaryData.Length = KeyInformation->DataLength; + } + else if (KeyInformation->Type == REG_MULTI_SZ) + { + NDIS_DbgPrint(MAX_TRACE, ("NdisParameterMultiString\n")); + + (*ParameterValue)->ParameterType = NdisParameterMultiString; + + Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); + if (!Buffer) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ExFreePool(MiniportResource); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + RtlCopyMemory(Buffer, KeyInformation->Data, KeyInformation->DataLength); + + (*ParameterValue)->ParameterData.StringData.Buffer = Buffer; + (*ParameterValue)->ParameterData.StringData.Length = KeyInformation->DataLength; + } + else + { + UNICODE_STRING str; + + str.Length = str.MaximumLength = (USHORT)KeyInformation->DataLength; + str.Buffer = (PWCHAR)KeyInformation->Data; + + if (IsValidNumericString(&str, &(*ParameterValue)->ParameterType) && + ((*Status = RtlUnicodeStringToInteger(&str, 0, + &(*ParameterValue)->ParameterData.IntegerData)) == STATUS_SUCCESS)) + { + NDIS_DbgPrint(MAX_TRACE, ("NdisParameter(Hex)Integer\n")); + + /* IsValidNumericString sets the parameter type when parsing the string */ + } + else + { + NDIS_DbgPrint(MAX_TRACE, ("NdisParameterString\n")); + + (*ParameterValue)->ParameterType = NdisParameterString; + + Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); + if (!Buffer) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ExFreePool(MiniportResource); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + RtlCopyMemory(Buffer, KeyInformation->Data, KeyInformation->DataLength); + + (*ParameterValue)->ParameterData.StringData.Buffer = Buffer; + (*ParameterValue)->ParameterData.StringData.Length = KeyInformation->DataLength; + } + } + + MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_REGISTRY_DATA; + MiniportResource->Resource = *ParameterValue; + + ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); + + ExFreePool(KeyInformation); + + *Status = NDIS_STATUS_SUCCESS; +} /* * @implemented

1 0

[tfaber] 54401: [ATL] - Fix buffer overflow in CComDynamicUnkArray::Add. Found by Coverity (CID 2474) [NDK] - Remove meaningless const attribute from pointer rvalues to make Coverity's life easier
by tfaber＠svn.reactos.org 16 Nov '11

16 Nov '11

Author: tfaber Date: Wed Nov 16 21:17:38 2011 New Revision: 54401 URL: http://svn.reactos.org/svn/reactos?rev=54401&view=rev Log: [ATL] - Fix buffer overflow in CComDynamicUnkArray::Add. Found by Coverity (CID 2474) [NDK] - Remove meaningless const attribute from pointer rvalues to make Coverity's life easier Modified: trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/lib/atl/atlcom.h Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Wed Nov 16 21:17:38 2011 @@ -27,10 +27,10 @@ // KPCR Access for non-IA64 builds // #define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) -#define PCR ((KPCR * const)K0IPCR) +#define PCR ((KPCR *)K0IPCR) #if defined(CONFIG_SMP) || defined(NT_BUILD) #undef KeGetPcr -#define KeGetPcr() ((KPCR * const)__readfsdword(FIELD_OFFSET(KPCR, SelfPcr))) +#define KeGetPcr() ((KPCR *)__readfsdword(FIELD_OFFSET(KPCR, SelfPcr))) #endif // Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Wed Nov 16 21:17:38 2011 @@ -128,7 +128,7 @@ // // Dereferencable pointer to KUSER_SHARED_DATA in User-Mode // -#define SharedUserData ((KUSER_SHARED_DATA *CONST)USER_SHARED_DATA) +#define SharedUserData ((KUSER_SHARED_DATA *)USER_SHARED_DATA) // // Maximum WOW64 Entries in KUSER_SHARED_DATA Modified: trunk/reactos/lib/atl/atlcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlcom.h?rev=54401… ============================================================================== --- trunk/reactos/lib/atl/atlcom.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlcom.h [iso-8859-1] Wed Nov 16 21:17:38 2011 @@ -849,9 +849,10 @@ return 0; m_ppUnk = newArray; memset(&m_ppUnk[m_nSize], 0, (newSize - m_nSize) * sizeof(IUnknown *)); + curCookie = m_nSize + 1; m_nSize = newSize; - m_ppUnk[m_nSize] = pUnk; - return m_nSize + 1; + m_ppUnk[curCookie - 1] = pUnk; + return curCookie; } BOOL Remove(DWORD dwCookie)

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