Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 66521: [STREAMCI] - install driver's inf
by janderwald＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: janderwald Date: Sun Mar 1 15:26:49 2015 New Revision: 66521 URL: http://svn.reactos.org/svn/reactos?rev=66521&view=rev Log: [STREAMCI] - install driver's inf Modified: trunk/reactos/dll/win32/streamci/streamci.c Modified: trunk/reactos/dll/win32/streamci/streamci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/streamci/streamc… ============================================================================== --- trunk/reactos/dll/win32/streamci/streamci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/streamci/streamci.c [iso-8859-1] Sun Mar 1 15:26:49 2015 @@ -130,6 +130,53 @@ return dwResult; } +DWORD +InstallSoftwareDeviceInterfaceInf(IN LPWSTR InfName, + IN LPWSTR SectionName) +{ + HDEVINFO hDevInfo; + HINF hInf; + HKEY hKey; + SP_DEVICE_INTERFACE_DATA DeviceInterfaceData; + GUID SWBusGuid = {STATIC_BUSID_SoftwareDeviceEnumerator}; + + hDevInfo = SetupDiGetClassDevsW(&SWBusGuid, NULL, NULL, 0); + if (!hDevInfo) + { + // failed + return GetLastError(); + } + + DeviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); + if (!SetupDiEnumDeviceInterfaces(hDevInfo, NULL, &SWBusGuid, 0, &DeviceInterfaceData)) + { + // failed + return GetLastError(); + } + + hInf = SetupOpenInfFileW(InfName, NULL, INF_STYLE_WIN4, NULL); + if (hInf == INVALID_HANDLE_VALUE) + { + SetupDiDestroyDeviceInfoList(hDevInfo); + return GetLastError(); + } + + // + // FIXME check if interface is already installed + // + + hKey = SetupDiCreateDeviceInterfaceRegKeyW(hDevInfo, &DeviceInterfaceData, 0, KEY_ALL_ACCESS, hInf, SectionName); + + SetupCloseInfFile(hInf); + SetupDiDestroyDeviceInfoList(hDevInfo); + if (hKey != INVALID_HANDLE_VALUE) + { + RegCloseKey(hKey); + } + return ERROR_SUCCESS; +} + + VOID WINAPI StreamingDeviceSetupW(IN HWND hwnd, @@ -137,11 +184,11 @@ IN LPWSTR lpszCmdLine, IN int nCmdShow) { - DWORD Length; + DWORD Length, dwResult; LPWSTR pCmdLine; LPWSTR pStr; GUID Guids[2]; - //WCHAR DevicePath[MAX_PATH]; + WCHAR DevicePath[MAX_PATH]; HRESULT hResult; DWORD Index; @@ -187,10 +234,19 @@ }while(Index < 2); - - hResult = InstallSoftwareDeviceInterface(&Guids[0], &Guids[1], pStr); - - // FIXME - // install inf section - + + dwResult = InstallSoftwareDeviceInterface(&Guids[0], &Guids[1], pStr); + if (dwResult == ERROR_SUCCESS) + { + pStr = wcstok(NULL, L",\t\""); + if (pStr != NULL) + { + wcscpy(DevicePath, pStr); + pStr = wcstok(NULL, L",\t\""); + if (pStr != NULL) + { + dwResult = InstallSoftwareDeviceInterfaceInf(DevicePath, pStr); + } + } + } }

1 0

[ekohl] 66520: [LSASRV] Implement the Directory Service Setup (dssetup) server.
by ekohl＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: ekohl Date: Sun Mar 1 15:21:23 2015 New Revision: 66520 URL: http://svn.reactos.org/svn/reactos?rev=66520&view=rev Log: [LSASRV] Implement the Directory Service Setup (dssetup) server. Added: trunk/reactos/dll/win32/lsasrv/dssetup.c (with props) Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Sun Mar 1 15:21:23 2015 @@ -4,13 +4,16 @@ ${REACTOS_SOURCE_DIR}/include/reactos/idl ${REACTOS_SOURCE_DIR}/include/reactos/subsys/lsass) -add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/lsa.idl) +add_rpc_files(server + ${REACTOS_SOURCE_DIR}/include/reactos/idl/dssetup.idl + ${REACTOS_SOURCE_DIR}/include/reactos/idl/lsa.idl) spec2def(lsasrv.dll lsasrv.spec ADD_IMPORTLIB) list(APPEND SOURCE authpackage.c authport.c database.c + dssetup.c lookup.c lsarpc.c lsasrv.c @@ -21,6 +24,7 @@ session.c utils.c lsasrv.h + ${CMAKE_CURRENT_BINARY_DIR}/dssetup_s.c ${CMAKE_CURRENT_BINARY_DIR}/lsa_s.c ${CMAKE_CURRENT_BINARY_DIR}/lsasrv_stubs.c) Added: trunk/reactos/dll/win32/lsasrv/dssetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/dssetup.c… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/dssetup.c (added) +++ trunk/reactos/dll/win32/lsasrv/dssetup.c [iso-8859-1] Sun Mar 1 15:21:23 2015 @@ -0,0 +1,169 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Local Security Authority (LSA) Server + * FILE: reactos/dll/win32/lsasrv/dssetup.c + * PURPOSE: Directory Service setup functions + * + * PROGRAMMERS: Eric Kohl + */ + +#include "lsasrv.h" +#include "dssetup_s.h" +#include "resources.h" + +VOID +NTAPI +LsaIFree_LSAPR_POLICY_INFORMATION(IN POLICY_INFORMATION_CLASS InformationClass, + IN PLSAPR_POLICY_INFORMATION PolicyInformation); + +/* GLOBALS *****************************************************************/ + +VOID +DsSetupInit(VOID) +{ + RPC_STATUS Status; + + Status = RpcServerRegisterIf(dssetup_v0_0_s_ifspec, + NULL, + NULL); + if (Status != RPC_S_OK) + { + WARN("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return; + } +} + + +static +NET_API_STATUS +DsRolepGetBasicInfo( + PDSROLER_PRIMARY_DOMAIN_INFORMATION *DomainInfo) +{ + LSAPR_OBJECT_ATTRIBUTES ObjectAttributes; + PDSROLER_PRIMARY_DOMAIN_INFO_BASIC Buffer; + PLSAPR_POLICY_INFORMATION PolicyInfo; + LSA_HANDLE PolicyHandle; + ULONG Size; + NTSTATUS Status; + + ZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes)); + Status = LsarOpenPolicy(NULL, + &ObjectAttributes, + POLICY_VIEW_LOCAL_INFORMATION, + &PolicyHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("LsarOpenPolicyFailed with NT status %x\n", + LsaNtStatusToWinError(Status)); + return ERROR_OUTOFMEMORY; + } + + Status = LsarQueryInformationPolicy(PolicyHandle, + PolicyAccountDomainInformation, + &PolicyInfo); + LsarClose(PolicyHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("LsarQueryInformationPolicy with NT status %x\n", + LsaNtStatusToWinError(Status)); + return ERROR_OUTOFMEMORY; + } + + Size = sizeof(DSROLER_PRIMARY_DOMAIN_INFO_BASIC) + + PolicyInfo->PolicyAccountDomainInfo.DomainName.Length + sizeof(WCHAR); + + Buffer = midl_user_allocate(Size); + if (Buffer == NULL) + { + LsaIFree_LSAPR_POLICY_INFORMATION(PolicyAccountDomainInformation, + PolicyInfo); + return ERROR_OUTOFMEMORY; + } + + Buffer->MachineRole = DsRole_RoleStandaloneWorkstation; + Buffer->DomainNameFlat = (LPWSTR)((LPBYTE)Buffer + + sizeof(DSROLER_PRIMARY_DOMAIN_INFO_BASIC)); + wcscpy(Buffer->DomainNameFlat, PolicyInfo->PolicyAccountDomainInfo.DomainName.Buffer); + + LsaIFree_LSAPR_POLICY_INFORMATION(PolicyAccountDomainInformation, + PolicyInfo); + + *DomainInfo = (PDSROLER_PRIMARY_DOMAIN_INFORMATION)Buffer; + + return ERROR_SUCCESS; +} + + +static +NET_API_STATUS +DsRolepGetUpdateStatus( + PDSROLER_PRIMARY_DOMAIN_INFORMATION *DomainInfo) +{ + PDSROLE_UPGRADE_STATUS_INFO Buffer; + + Buffer = midl_user_allocate(sizeof(DSROLE_UPGRADE_STATUS_INFO)); + if (Buffer == NULL) + return ERROR_OUTOFMEMORY; + + Buffer->OperationState = 0; + Buffer->PreviousServerState = 0; + + *DomainInfo = (PDSROLER_PRIMARY_DOMAIN_INFORMATION)Buffer; + + return ERROR_SUCCESS; +} + + +static +NET_API_STATUS +DsRolepGetOperationState( + PDSROLER_PRIMARY_DOMAIN_INFORMATION *DomainInfo) +{ + PDSROLE_OPERATION_STATE_INFO Buffer; + + Buffer = midl_user_allocate(sizeof(DSROLE_OPERATION_STATE_INFO)); + if (Buffer == NULL) + return ERROR_OUTOFMEMORY; + + Buffer->OperationState = DsRoleOperationIdle; + + *DomainInfo = (PDSROLER_PRIMARY_DOMAIN_INFORMATION)Buffer; + + return ERROR_SUCCESS; +} + + +DWORD +WINAPI +DsRolerGetPrimaryDomainInformation( + handle_t hBinding, + DSROLE_PRIMARY_DOMAIN_INFO_LEVEL InfoLevel, + PDSROLER_PRIMARY_DOMAIN_INFORMATION *DomainInfo) +{ + NET_API_STATUS ret; + + TRACE("DsRolerGetPrimaryDomainInformation(%p, %d, %p)\n", + hBinding, InfoLevel, DomainInfo); + + switch (InfoLevel) + { + case DsRolePrimaryDomainInfoBasic: + ret = DsRolepGetBasicInfo(DomainInfo); + break; + + case DsRoleUpgradeStatus: + ret = DsRolepGetUpdateStatus(DomainInfo); + break; + + case DsRoleOperationState: + ret = DsRolepGetOperationState(DomainInfo); + break; + + default: + ret = ERROR_CALL_NOT_IMPLEMENTED; + } + + return ret; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/lsasrv/dssetup.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Mar 1 15:21:23 2015 @@ -43,6 +43,8 @@ WARN("RpcServerRegisterIf() failed (Status %lx)\n", Status); return; } + + DsSetupInit(); Status = RpcServerListen(1, 20, TRUE); if (Status != RPC_S_OK) Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sun Mar 1 15:21:23 2015 @@ -166,6 +166,10 @@ LsapDeleteObjectAttribute(PLSA_DB_OBJECT DbObject, LPWSTR AttributeName); +/* dssetup.c */ +VOID +DsSetupInit(VOID); + /* lookup.c */ NTSTATUS LsapInitSids(VOID);

1 0

[janderwald] 66519: [NTOS] - plug leak in error case
by janderwald＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: janderwald Date: Sun Mar 1 13:53:16 2015 New Revision: 66519 URL: http://svn.reactos.org/svn/reactos?rev=66519&view=rev Log: [NTOS] - plug leak in error case Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Sun Mar 1 13:53:16 2015 @@ -1397,6 +1397,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("RtlGUIDFromString() failed with status 0x%08lx\n", Status); + ObDereferenceObject(FileObject); return Status; }

1 0

[hbelusca] 66518: [CMD] - Do not hardcode the length of the string arrays in the LoadString calls (use ARRAYSIZE instead) - Localize the command prompt info line. CORE-9293 #resolve #comment I plac...
by hbelusca＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: hbelusca Date: Sun Mar 1 12:28:38 2015 New Revision: 66518 URL: http://svn.reactos.org/svn/reactos?rev=66518&view=rev Log: [CMD] - Do not hardcode the length of the string arrays in the LoadString calls (use ARRAYSIZE instead) - Localize the command prompt info line. CORE-9293 #resolve #comment I placed the string in the resource files so that you can now localize it! Modified: trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/copy.c trunk/reactos/base/shell/cmd/del.c trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/error.c trunk/reactos/base/shell/cmd/free.c trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sq-AL.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/zh-CN.rc trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/prompt.c trunk/reactos/base/shell/cmd/resource.h Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -249,14 +249,14 @@ VOID ConOutResPaging(BOOL NewPage, UINT resID) { TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); ConOutPrintfPaging(NewPage, szMsg); } VOID ConOutResPuts(UINT resID) { TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); ConPuts(szMsg, STD_OUTPUT_HANDLE); } @@ -373,7 +373,7 @@ } else { - LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, ARRAYSIZE(szMsg)); ConErrPrintf(szMsg); } } @@ -402,7 +402,7 @@ } else { - LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, ARRAYSIZE(szMsg)); ConErrPrintf(szMsg); } } @@ -413,7 +413,7 @@ va_list arg_ptr; va_start(arg_ptr, resID); - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); ConPrintf(szMsg, arg_ptr, STD_OUTPUT_HANDLE); va_end(arg_ptr); } @@ -447,7 +447,7 @@ VOID ConErrResPuts(UINT resID) { TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); ConPuts(szMsg, STD_ERROR_HANDLE); } @@ -463,7 +463,7 @@ va_list arg_ptr; va_start(arg_ptr, resID); - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); ConPrintf(szMsg, arg_ptr, STD_ERROR_HANDLE); va_end(arg_ptr); } Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -852,7 +852,7 @@ if (copy(tmpSrcPath,tmpDestPath, bAppend, dwFlags, bTouch)) { nFiles++; - //LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); + //LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, ARRAYSIZE(szMsg)); } else { Modified: trunk/reactos/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/del.c?rev=6… ============================================================================== --- trunk/reactos/base/shell/cmd/del.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/del.c [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -83,7 +83,7 @@ static VOID LoadStrings(VOID) { - LoadString( CMD_ModuleHandle, STRING_DELETE_WIPE, szDeleteWipe, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DELETE_WIPE, szDeleteWipe, ARRAYSIZE(szDeleteWipe)); GetModuleFileName(NULL, CMDPath, MAX_PATH); StringsLoaded = TRUE; } Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=6… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -585,17 +585,17 @@ /* print drive info */ if (szVolName[0] != _T('\0')) { - LoadString(CMD_ModuleHandle, STRING_DIR_HELP2, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP2, szMsg, ARRAYSIZE(szMsg)); DirPrintf(lpFlags, szMsg, szRootName[0], szVolName); } else { - LoadString(CMD_ModuleHandle, STRING_DIR_HELP3, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP3, szMsg, ARRAYSIZE(szMsg)); DirPrintf(lpFlags, szMsg, szRootName[0]); } /* print the volume serial number if the return was successful */ - LoadString(CMD_ModuleHandle, STRING_DIR_HELP4, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP4, szMsg, ARRAYSIZE(szMsg)); DirPrintf(lpFlags, szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); return TRUE; @@ -763,7 +763,7 @@ if (TotalSummary && lpFlags->bRecursive) { ConvertULargeInteger(u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); - LoadString(CMD_ModuleHandle, STRING_DIR_HELP5, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP5, szMsg, ARRAYSIZE(szMsg)); DirPrintf(lpFlags, szMsg, ulFiles, szBuffer); } else @@ -772,7 +772,7 @@ /* Condition to print summary is: If we are not in bare format and if we have results! */ ConvertULargeInteger(u64Bytes, szBuffer, 20, lpFlags->bTSeperator); - LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, ARRAYSIZE(szMsg)); DirPrintf(lpFlags, szMsg, ulFiles, szBuffer); } @@ -781,7 +781,7 @@ { GetUserDiskFreeSpace(szPath, &uliFree); ConvertULargeInteger(uliFree.QuadPart, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); - LoadString(CMD_ModuleHandle, STRING_DIR_HELP6, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP6, szMsg, ARRAYSIZE(szMsg)); DirPrintf(lpFlags, szMsg, ulDirs, szBuffer); } @@ -1101,7 +1101,7 @@ and if we are in recursive mode... we must have results */ if (!(lpFlags->bBareFormat ) && !((lpFlags->bRecursive) && (dwCount <= 0))) { - LoadString(CMD_ModuleHandle, STRING_DIR_HELP7, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP7, szMsg, ARRAYSIZE(szMsg)); if (DirPrintf(lpFlags, szMsg, szTemp)) return; } Modified: trunk/reactos/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/error.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/error.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/error.c [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -98,7 +98,7 @@ { TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, ARRAYSIZE(szMsg)); ConErrPrintf(_T("%s - %s\n"), szMsg, f); nErrorLevel = 1; } @@ -150,7 +150,7 @@ { TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR2, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR2, szMsg, ARRAYSIZE(szMsg)); if (s) ConErrPrintf(_T("%s - %s\n"), szMsg, s); Modified: trunk/reactos/base/shell/cmd/free.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/free.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/free.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/free.c [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -45,7 +45,7 @@ if (!GetVolumeInformation (szRootPath, szVolume, 64, &dwSerial, NULL, NULL, NULL, 0)) { - LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, ARRAYSIZE(szMsg)); ConErrPrintf(_T("%s %s:\n"), szMsg, szDrive); return; } @@ -53,7 +53,7 @@ if (szVolume[0] == _T('\0')) { - LoadString(CMD_ModuleHandle, STRING_FREE_ERROR2, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_FREE_ERROR2, szMsg, ARRAYSIZE(szMsg)); _tcscpy (szVolume, szMsg); } @@ -65,7 +65,7 @@ if (!GetDiskFreeSpace (szRootPath, &dwSecPerCl, &dwBytPerSec, &dwFreeCl, &dwTotCl)) { - LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, ARRAYSIZE(szMsg)); ConErrPrintf(_T("%s %s:\n"), szMsg, szDrive); return; } Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -520,6 +520,7 @@ STRING_REPLACE_ERROR5 "Zugriff verweigert - %s\n" STRING_REPLACE_ERROR6 "Keine Dateien gefunden - %s\n" STRING_REPLACE_ERROR7 "Erweiterter Fehler 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ReactOS Betriebssystem [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS-Befehlszeileninterpreter\nVersion %s %s" STRING_VERSION_RUNNING_ON "LÃ¤uft in: " Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -525,6 +525,7 @@ STRING_REPLACE_ERROR5 "ÎÎµÎ½ ÎµÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ Î· ÏÏÏÏÎ²Î±ÏÎ· - %s\n" STRING_REPLACE_ERROR6 "ÎÎµ Î²ÏÎÎ¸Î·ÎºÎ±Î½ Î±ÏÏÎµÎ¯Î± - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNNING_ON "Running on: " Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -521,6 +521,7 @@ STRING_REPLACE_ERROR5 "Access denied - %s\n" STRING_REPLACE_ERROR6 "No files found - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNNING_ON "Running on: " Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -523,6 +523,7 @@ STRING_REPLACE_ERROR5 "Access denied - %s\n" STRING_REPLACE_ERROR6 "No files found - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nIntÃ©rprete de comandos de ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "Corriendo en: " Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -535,6 +535,7 @@ STRING_REPLACE_ERROR5 "AccÃ¨s refusÃ© - %s\n" STRING_REPLACE_ERROR6 "Aucun fichier trouvÃ© - %s\n" STRING_REPLACE_ERROR7 "Erreur Ã©tendue 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nInterprÃ©teur de ligne de commandes ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "Fonctionnant sous: " Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -505,6 +505,7 @@ STRING_REPLACE_ERROR5 "Access denied - %s\n" STRING_REPLACE_ERROR6 "No files found - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS Parancssor Ã©rtelmezÃµ\nVersion %s %s" STRING_VERSION_RUNNING_ON "Running on: " Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -520,6 +520,7 @@ STRING_REPLACE_ERROR5 "Access denied - %s\n" STRING_REPLACE_ERROR6 "No files found - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nInterpreter Baris Perintah ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "Berjalan pada: " Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -531,6 +531,7 @@ STRING_REPLACE_ERROR5 "Accesso negato - %s\n" STRING_REPLACE_ERROR6 "Nessun file trovato - %s\n" STRING_REPLACE_ERROR7 "Errore esteso 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nInterprete di linea di comando di ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "In esecuzione su: " Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -528,6 +528,7 @@ STRING_REPLACE_ERROR5 "Access denied - %s\n" STRING_REPLACE_ERROR6 "No files found - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNNING_ON "Running on: " Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -519,6 +519,7 @@ STRING_REPLACE_ERROR5 "Tilgang nektet - %s\n" STRING_REPLACE_ERROR6 "Ingen filer ble funnet - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ReactOS Operativsystem [Versjon %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS Kommandotolk\nVersjon %s %s" STRING_VERSION_RUNNING_ON "KjÃ¸rer pÃ¥: " Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -525,6 +525,7 @@ STRING_REPLACE_ERROR5 "DostÄp zabroniony - %s\n" STRING_REPLACE_ERROR6 "Nie znaleziono plikÃ³w - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32 - BÅÄd wspÃ³Ådzielenia\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nInterpreter linii poleceÅ ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "DziaÅajÄcy na: " Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -558,6 +558,7 @@ STRING_REPLACE_ERROR5 "Acces nepermis - %s\n" STRING_REPLACE_ERROR6 "FiÈierele nu au fost gÄsite - %s\n" STRING_REPLACE_ERROR7 "Eroare ExtinsÄ 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ReactOS [Versiunea %s-%s]\n" STRING_CMD_SHELLINFO "\nInterpretorul de comenzi ReactOS\nVersiunea %s %s" STRING_VERSION_RUNNING_ON "OperÃ¢nd pe: " Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -530,6 +530,7 @@ STRING_REPLACE_ERROR5 "ÐÐ¾ÑÑÑÐ¿ Ð·Ð°Ð¿ÑÐµÑÐµÐ½ - %s\n" STRING_REPLACE_ERROR6 "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐ°Ð¹Ð»Ð¾Ð² - %s\n" STRING_REPLACE_ERROR7 "Ð Ð°ÑÑÐ¸ÑÐµÐ½Ð½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ° 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° ReactOS [ÐÐµÑÑÐ¸Ñ %s-%s]\n" STRING_CMD_SHELLINFO "\nÐÐ½ÑÐµÑÐ¿ÑÐµÑÐ°ÑÐ¾Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸ ReactOS\nÐÐµÑÑÐ¸Ñ %s %s" STRING_VERSION_RUNNING_ON "ÐÐ°Ð¿ÑÑÐµÐ½ Ð½Ð°: " Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -527,6 +527,7 @@ STRING_REPLACE_ERROR5 "PrÃstup zamietnutÃ½ - %s\n" STRING_REPLACE_ERROR6 "Å½iadne sÃºbory sa nenaÅ¡li - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "OperaÄnÃ½ systÃ©m ReactOS [Verzia %s-%s]\n" STRING_CMD_SHELLINFO "\nInterprÃ©ter prÃkazovÃ©ho riadku systÃ©mu ReactOS\nVerzia %s %s" STRING_VERSION_RUNNING_ON "Running on: " Modified: trunk/reactos/base/shell/cmd/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sq-AL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -525,6 +525,7 @@ STRING_REPLACE_ERROR5 "Refuzot hyrja - %s\n" STRING_REPLACE_ERROR6 "Nuk u gjet dokumenti - %s\n" STRING_REPLACE_ERROR7 "Error i zgjatur 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "Sistemi Operativ ReactOS [Versioni %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS Interpretuesi i komandave\nVersioni %s %s" STRING_VERSION_RUNNING_ON "Funksionon nÃ«: " Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -519,6 +519,7 @@ STRING_REPLACE_ERROR5 "Tilgang nektet - %s\n" STRING_REPLACE_ERROR6 "Ingen filer ble funnet - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ReactOS Operativsystem [Versjon %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS Kommandotolk\nVersjon %s %s" STRING_VERSION_RUNNING_ON "KÃ¶rs pÃ¥: " Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -531,6 +531,7 @@ STRING_REPLACE_ERROR5 "ÐÐµÐ¼Ð°Ñ Ð´Ð¾ÑÑÑÐ¿Ñ - %s\n" STRING_REPLACE_ERROR6 "Ð¤Ð°Ð¹Ð»Ð¸ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ - %s\n" STRING_REPLACE_ERROR7 "Ð Ð¾Ð·ÑÐ¸ÑÐµÐ½Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ÐÐ¿ÐµÑÐ°ÑiÐ¹Ð½Ð° Ð¡Ð¸ÑÑÐµÐ¼Ð° ReactOS [ÐÐµÑÑiÑ %s-%s]\n" STRING_CMD_SHELLINFO "\nIÐ½ÑÐµÑÐ¿ÑÐµÑÐ°ÑÐ¾Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ ÑÑÐ´ÐºÐ° ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "ÐÐ°Ð¿ÑÑÐµÐ½Ð¸Ð¹ Ð½Ð°: " Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -490,6 +490,7 @@ STRING_REPLACE_ERROR5 "ç¦æ¢è®¿é® - %s\n" STRING_REPLACE_ERROR6 "æ²¡ææä»¶è¢«åç° - %s\n" STRING_REPLACE_ERROR7 "æ©å±éè¯¯ 32\n" + STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " STRING_REACTOS_VERSION "ReactOS æä½ç³»ç» [çæ¬ %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS å½ä»¤è¡è§£éå¨\nçæ¬ %s %s" STRING_VERSION_RUNNING_ON "å¨ ä¸è¿è¡" Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -586,7 +586,7 @@ for (p = szIn; _istspace (*p); p++) ; - LoadString(CMD_ModuleHandle, STRING_CHOICE_OPTION, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CHOICE_OPTION, szMsg, ARRAYSIZE(szMsg)); if (_tcsncmp(p, &szMsg[0], 1) == 0) return PROMPT_YES; @@ -650,7 +650,7 @@ for (p = szIn; _istspace (*p); p++) ; - LoadString( CMD_ModuleHandle, STRING_COPY_OPTION, szMsg, RC_STRING_MAX_SIZE); + LoadString( CMD_ModuleHandle, STRING_COPY_OPTION, szMsg, ARRAYSIZE(szMsg)); if (_tcsncmp(p, &szMsg[0], 1) == 0) return PROMPT_YES; Modified: trunk/reactos/base/shell/cmd/prompt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/prompt.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -48,12 +48,8 @@ */ #include "precomp.h" -// FIXME: Localize the information line. -static TCHAR InfoLine[] = _T(" ReactOS Command Prompt Type HELP = Help "); - /* The default prompt */ static TCHAR DefaultPrompt[] = _T("$P$G"); - /* * Initialize prompt support @@ -66,7 +62,7 @@ * Set the PROMPT environment variable if it doesn't exist already. * You can change the PROMPT environment variable before cmd starts. */ - if (GetEnvironmentVariable(_T("PROMPT"), Buffer, sizeof(Buffer) / sizeof(Buffer[0])) == 0) + if (GetEnvironmentVariable(_T("PROMPT"), Buffer, ARRAYSIZE(Buffer)) == 0) SetEnvironmentVariable(_T("PROMPT"), DefaultPrompt); } @@ -82,12 +78,16 @@ COORD coPos; DWORD dwWritten; + TCHAR szInfoLine[80 + 1]; // The info line is 80 characters long (without NULL character) + INT iInfoLineLen; + + /* Return directly if the output handle is not a console handle */ if (!GetConsoleScreenBufferInfo(hOutput, &csbi)) - { - /* No console */ return; - } - + + iInfoLineLen = LoadString(CMD_ModuleHandle, STRING_CMD_INFOLINE, szInfoLine, ARRAYSIZE(szInfoLine)); + + /* Display the localized information line */ coPos.X = 0; coPos.Y = 0; FillConsoleOutputAttribute(hOutput, BACKGROUND_BLUE | FOREGROUND_WHITE, @@ -97,8 +97,7 @@ csbi.dwSize.X, coPos, &dwWritten); - WriteConsoleOutputCharacter(hOutput, InfoLine, - sizeof(InfoLine)/sizeof(TCHAR) - 1, + WriteConsoleOutputCharacter(hOutput, szInfoLine, iInfoLineLen, coPos, &dwWritten); } Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?… ============================================================================== --- trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] Sun Mar 1 12:28:38 2015 @@ -89,8 +89,9 @@ #define STRING_ASSOC_HELP 616 #define STRING_MKLINK_HELP 617 -#define STRING_REACTOS_VERSION 623 -#define STRING_CMD_SHELLINFO 624 +#define STRING_CMD_INFOLINE 620 +#define STRING_REACTOS_VERSION 623 +#define STRING_CMD_SHELLINFO 624 #define STRING_COLOR_HELP1 625 #define STRING_COPY_HELP1 626

1 0

[akhaldi] 66517: [OLE32] Export stubs for CoCancelCall, CoDisableCallCancellation and CoEnableCallCancellation. Brought to you by Radek Liška. CORE-9298
by akhaldi＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: akhaldi Date: Sun Mar 1 11:55:56 2015 New Revision: 66517 URL: http://svn.reactos.org/svn/reactos?rev=66517&view=rev Log: [OLE32] Export stubs for CoCancelCall, CoDisableCallCancellation and CoEnableCallCancellation. Brought to you by Radek Liška. CORE-9298 Modified: trunk/reactos/dll/win32/ole32/ole32.spec Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Sun Mar 1 11:55:56 2015 @@ -14,7 +14,7 @@ @ stdcall CoAddRefServerProcess() @ stdcall CoAllowSetForegroundWindow(ptr ptr) @ stdcall CoBuildVersion() -# CoCancelCall +@ stdcall -stub CoCancelCall(long long) @ stdcall CoCopyProxy(ptr ptr) @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) @ stdcall CoCreateGuid(ptr) @@ -22,10 +22,10 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) # CoCreateObjectInContext # CoDeactivateObject -# CoDisableCallCancellation +@ stdcall -stub CoDisableCallCancellation(ptr) @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime -# CoEnableCallCancellation +@ stdcall -stub CoEnableCallCancellation(ptr) @ stdcall CoFileTimeNow(ptr) @ stdcall CoFileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime @ stdcall CoFreeAllLibraries()

1 0

[cfinck] 66516: [ROSAUTOTEST] - Finish a test run in the database when all tests have successfully been run. This got lost during the C++ rewrite of rosautotest in r40147. - Don't spam the logs wit...
by cfinck＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: cfinck Date: Sun Mar 1 11:19:30 2015 New Revision: 66516 URL: http://svn.reactos.org/svn/reactos?rev=66516&view=rev Log: [ROSAUTOTEST] - Finish a test run in the database when all tests have successfully been run. This got lost during the C++ rewrite of rosautotest in r40147. - Don't spam the logs with useless OK messages. Only report the web service response if an error occurred. Modified: trunk/rostests/rosautotest/CWebService.cpp trunk/rostests/rosautotest/CWebService.h trunk/rostests/rosautotest/CWineTest.cpp Modified: trunk/rostests/rosautotest/CWebService.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWebService.c… ============================================================================== --- trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] Sun Mar 1 11:19:30 2015 @@ -92,6 +92,38 @@ Data[DataLength] = 0; return Data.release(); +} + +/** +* Interface to other classes for finishing this test run +* +* @param TestType +* Constant pointer to a char array containing the test type to be run (i.e. "wine") +*/ +void +CWebService::Finish(const char* TestType) +{ + auto_array_ptr<char> Response; + string Data; + stringstream ss; + + if (!m_TestID) + EXCEPTION("CWebService::Finish was called, but not a single result had been submitted!"); + + Data = "action=finish"; + Data += Configuration.GetAuthenticationRequestString(); + Data += "&testtype="; + Data += TestType; + Data += "&testid="; + Data += m_TestID; + + Response.reset(DoRequest(Data)); + + if (strcmp(Response, "OK")) + { + ss << "When finishing the test run, the server responded:" << endl << Response << endl; + SSEXCEPTION; + } } /** @@ -206,9 +238,9 @@ Response.reset(DoRequest(Data)); - ss << "The server responded:" << endl << Response << endl; - StringOut(ss.str()); - - if(strcmp(Response, "OK")) - EXCEPTION("Aborted!\n"); -} + if (strcmp(Response, "OK")) + { + ss << "When submitting the result, the server responded:" << endl << Response << endl; + SSEXCEPTION; + } +} Modified: trunk/rostests/rosautotest/CWebService.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWebService.h… ============================================================================== --- trunk/rostests/rosautotest/CWebService.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWebService.h [iso-8859-1] Sun Mar 1 11:19:30 2015 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Automatic Testing Utility * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Class implementing the interface to the "testman" Web Service - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009-2015 Colin Finck <colin(a)reactos.org> */ class CWebService @@ -21,5 +21,6 @@ CWebService(); ~CWebService(); + void Finish(const char* TestType); void Submit(const char* TestType, CTestInfo* TestInfo); }; Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Sun Mar 1 11:19:30 2015 @@ -372,6 +372,10 @@ StringOut("\n\n"); } + /* We're done with all tests. Finish this run */ + if(Configuration.DoSubmit()) + WebService->Finish("wine"); + /* Restore the original error mode */ if(!Configuration.IsInteractive()) SetErrorMode(ErrorMode);

1 0

[akhaldi] 66515: [WS2_32] Improve exports and make them match native. CORE-8174
by akhaldi＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: akhaldi Date: Sun Mar 1 11:04:03 2015 New Revision: 66515 URL: http://svn.reactos.org/svn/reactos?rev=66515&view=rev Log: [WS2_32] Improve exports and make them match native. CORE-8174 Modified: trunk/reactos/dll/win32/ws2_32/ws2_32.spec Modified: trunk/reactos/dll/win32/ws2_32/ws2_32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/ws2_32.sp… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/ws2_32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/ws2_32.spec [iso-8859-1] Sun Mar 1 11:04:03 2015 @@ -1,34 +1,102 @@ -1 stdcall accept(long ptr ptr) -2 stdcall bind(long ptr long) -3 stdcall closesocket(long) -4 stdcall connect(long ptr long) -5 stdcall getpeername(long ptr ptr) -6 stdcall getsockname(long ptr ptr) -7 stdcall getsockopt(long long long ptr ptr) -8 stdcall htonl(long) -9 stdcall htons(long) -10 stdcall ioctlsocket(long long ptr) -11 stdcall inet_addr(str) -12 stdcall inet_ntoa(ptr) -13 stdcall listen(long long) -14 stdcall ntohl(long) -15 stdcall ntohs(long) -16 stdcall recv(long ptr long long) -17 stdcall recvfrom(long ptr long long ptr ptr) -18 stdcall select(long ptr ptr ptr ptr) -19 stdcall send(long ptr long long) -20 stdcall sendto(long ptr long long ptr long) -21 stdcall setsockopt(long long long ptr long) -22 stdcall shutdown(long long) -23 stdcall socket(long long long) -51 stdcall gethostbyaddr(ptr long long) -52 stdcall gethostbyname(str) -53 stdcall getprotobyname(str) -54 stdcall getprotobynumber(long) -55 stdcall getservbyname(str str) -56 stdcall getservbyport(long str) -57 stdcall gethostname(ptr long) - +1 stdcall accept(long ptr ptr) +2 stdcall bind(long ptr long) +3 stdcall closesocket(long) +4 stdcall connect(long ptr long) +5 stdcall getpeername(long ptr ptr) +6 stdcall getsockname(long ptr ptr) +7 stdcall getsockopt(long long long ptr ptr) +8 stdcall htonl(long) +9 stdcall htons(long) +10 stdcall ioctlsocket(long long ptr) +11 stdcall inet_addr(str) +12 stdcall inet_ntoa(ptr) +13 stdcall listen(long long) +14 stdcall ntohl(long) +15 stdcall ntohs(long) +16 stdcall recv(long ptr long long) +17 stdcall recvfrom(long ptr long long ptr ptr) +18 stdcall select(long ptr ptr ptr ptr) +19 stdcall send(long ptr long long) +20 stdcall sendto(long ptr long long ptr long) +21 stdcall setsockopt(long long long ptr long) +22 stdcall shutdown(long long) +23 stdcall socket(long long long) +24 stdcall WSApSetPostRoutine(ptr) +25 stdcall FreeAddrInfoW(ptr) freeaddrinfo +26 stdcall GetAddrInfoW(wstr wstr ptr ptr) +27 stdcall GetNameInfoW(ptr long wstr long wstr long long) +28 stdcall WPUCompleteOverlappedRequest(long ptr long long ptr) +29 stdcall WSAAccept(long ptr ptr ptr long) +30 stdcall WSAAddressToStringA(ptr long ptr ptr ptr) +31 stdcall WSAAddressToStringW(ptr long ptr ptr ptr) +32 stdcall WSACloseEvent(long) +33 stdcall WSAConnect(long ptr long ptr ptr ptr ptr) +34 stdcall WSACreateEvent () +35 stdcall WSADuplicateSocketA(long long ptr) +36 stdcall WSADuplicateSocketW(long long ptr) +37 stdcall WSAEnumNameSpaceProvidersA(ptr ptr) +38 stdcall WSAEnumNameSpaceProvidersW(ptr ptr) +39 stdcall WSAEnumNetworkEvents(long long ptr) +40 stdcall WSAEnumProtocolsA(ptr ptr ptr) +41 stdcall WSAEnumProtocolsW(ptr ptr ptr) +42 stdcall WSAEventSelect(long long long) +43 stdcall WSAGetOverlappedResult(long ptr ptr long ptr) +44 stdcall WSAGetQOSByName(long ptr ptr) +45 stdcall WSAGetServiceClassInfoA(ptr ptr ptr ptr) +46 stdcall WSAGetServiceClassInfoW(ptr ptr ptr ptr) +47 stdcall WSAGetServiceClassNameByClassIdA(ptr ptr ptr) +48 stdcall WSAGetServiceClassNameByClassIdW(ptr ptr ptr) +49 stdcall WSAHtonl(long long ptr) +50 stdcall WSAHtons(long long ptr) +51 stdcall gethostbyaddr(ptr long long) +52 stdcall gethostbyname(str) +53 stdcall getprotobyname(str) +54 stdcall getprotobynumber(long) +55 stdcall getservbyname(str str) +56 stdcall getservbyport(long str) +57 stdcall gethostname(ptr long) +58 stdcall WSAInstallServiceClassA(ptr) +59 stdcall WSAInstallServiceClassW(ptr) +60 stdcall WSAIoctl(long long ptr long ptr long ptr ptr ptr) +61 stdcall WSAJoinLeaf(long ptr long ptr ptr ptr ptr long) +62 stdcall WSALookupServiceBeginA(ptr long ptr) +63 stdcall WSALookupServiceBeginW(ptr long ptr) +64 stdcall WSALookupServiceEnd(long) +65 stdcall WSALookupServiceNextA(long long ptr ptr) +66 stdcall WSALookupServiceNextW(long long ptr ptr) +67 stdcall WSANSPIoctl(ptr long ptr long ptr long ptr ptr) +68 stdcall WSANtohl(long long ptr) +69 stdcall WSANtohs(long long ptr) +70 stdcall WSAProviderConfigChange(ptr ptr ptr) +71 stdcall WSARecv(long ptr long ptr ptr ptr ptr) +72 stdcall WSARecvDisconnect(long ptr) +73 stdcall WSARecvFrom(long ptr long ptr ptr ptr ptr ptr ptr ) +74 stdcall WSARemoveServiceClass(ptr) +75 stdcall WSAResetEvent(long) kernel32.ResetEvent +76 stdcall WSASend(long ptr long ptr long ptr ptr) +77 stdcall WSASendDisconnect(long ptr) +78 stdcall WSASendTo(long ptr long ptr long ptr long ptr ptr) +79 stdcall WSASetEvent(long) kernel32.SetEvent +80 stdcall WSASetServiceA(ptr long long) +81 stdcall WSASetServiceW(ptr long long) +82 stdcall WSASocketA(long long long ptr long long) +83 stdcall WSASocketW(long long long ptr long long) +84 stdcall WSAStringToAddressA(str long ptr ptr ptr) +85 stdcall WSAStringToAddressW(wstr long ptr ptr ptr) +86 stdcall WSAWaitForMultipleEvents(long ptr long long long) kernel32.WaitForMultipleObjectsEx +87 stdcall WSCDeinstallProvider(ptr ptr) +88 stdcall WSCEnableNSProvider(ptr long) +89 stdcall WSCEnumProtocols(ptr ptr ptr ptr) +90 stdcall WSCGetProviderPath(ptr ptr ptr ptr) +91 stdcall WSCInstallNameSpace(wstr wstr long long ptr) +92 stdcall WSCInstallProvider(ptr wstr ptr long ptr) +93 stdcall WSCUnInstallNameSpace(ptr) +94 stdcall WSCUpdateProvider(ptr ptr ptr long ptr) +95 stdcall WSCWriteNameSpaceOrder(ptr long) +96 stdcall WSCWriteProviderOrder(ptr long) +97 stdcall freeaddrinfo(ptr) +98 stdcall getaddrinfo(str str ptr ptr) +99 stdcall getnameinfo(ptr long ptr long ptr long long) 101 stdcall WSAAsyncSelect(long long long long) 102 stdcall WSAAsyncGetHostByAddr(long long ptr long long ptr long) 103 stdcall WSAAsyncGetHostByName(long long str ptr long) @@ -45,77 +113,5 @@ 114 stdcall WSAIsBlocking() 115 stdcall WSAStartup(long ptr) 116 stdcall WSACleanup() - -151 stdcall __WSAFDIsSet(long ptr) - +151 stdcall __WSAFDIsSet(long ptr) 500 stdcall WEP() - -@ stdcall FreeAddrInfoW(ptr) freeaddrinfo -@ stdcall GetAddrInfoW(wstr wstr ptr ptr) -@ stdcall WSApSetPostRoutine(ptr) -@ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr) -@ stdcall WSAAccept(long ptr ptr ptr long) -@ stdcall WSAAddressToStringA(ptr long ptr ptr ptr) -@ stdcall WSAAddressToStringW(ptr long ptr ptr ptr) -@ stdcall WSACloseEvent(long) -@ stdcall WSAConnect(long ptr long ptr ptr ptr ptr) -@ stdcall WSACreateEvent () -@ stdcall WSADuplicateSocketA(long long ptr) -@ stdcall WSADuplicateSocketW(long long ptr) -@ stdcall WSAEnumNameSpaceProvidersA(ptr ptr) -@ stdcall WSAEnumNameSpaceProvidersW(ptr ptr) -@ stdcall WSAEnumNetworkEvents(long long ptr) -@ stdcall WSAEnumProtocolsA(ptr ptr ptr) -@ stdcall WSAEnumProtocolsW(ptr ptr ptr) -@ stdcall WSAEventSelect(long long long) -@ stdcall WSAGetOverlappedResult(long ptr ptr long ptr) -@ stdcall WSAGetQOSByName(long ptr ptr) -@ stdcall WSAGetServiceClassInfoA(ptr ptr ptr ptr) -@ stdcall WSAGetServiceClassInfoW(ptr ptr ptr ptr) -@ stdcall WSAGetServiceClassNameByClassIdA(ptr ptr ptr) -@ stdcall WSAGetServiceClassNameByClassIdW(ptr ptr ptr) -@ stdcall WSAHtonl(long long ptr) -@ stdcall WSAHtons(long long ptr) -@ stdcall WSAInstallServiceClassA(ptr) -@ stdcall WSAInstallServiceClassW(ptr) -@ stdcall WSAIoctl(long long ptr long ptr long ptr ptr ptr) -@ stdcall WSAJoinLeaf(long ptr long ptr ptr ptr ptr long) -@ stdcall WSALookupServiceBeginA(ptr long ptr) -@ stdcall WSALookupServiceBeginW(ptr long ptr) -@ stdcall WSALookupServiceEnd(long) -@ stdcall WSALookupServiceNextA(long long ptr ptr) -@ stdcall WSALookupServiceNextW(long long ptr ptr) -@ stdcall WSANSPIoctl(ptr long ptr long ptr long ptr ptr) -@ stdcall WSANtohl(long long ptr) -@ stdcall WSANtohs(long long ptr) -@ stdcall WSAProviderConfigChange(ptr ptr ptr) -@ stdcall WSARecv(long ptr long ptr ptr ptr ptr) -@ stdcall WSARecvDisconnect(long ptr) -@ stdcall WSARecvFrom(long ptr long ptr ptr ptr ptr ptr ptr ) -@ stdcall WSARemoveServiceClass(ptr) -@ stdcall WSAResetEvent(long) kernel32.ResetEvent -@ stdcall WSASend(long ptr long ptr long ptr ptr) -@ stdcall WSASendDisconnect(long ptr) -@ stdcall WSASendTo(long ptr long ptr long ptr long ptr ptr) -@ stdcall WSASetEvent(long) kernel32.SetEvent -@ stdcall WSASetServiceA(ptr long long) -@ stdcall WSASetServiceW(ptr long long) -@ stdcall WSASocketA(long long long ptr long long) -@ stdcall WSASocketW(long long long ptr long long) -@ stdcall WSAStringToAddressA(str long ptr ptr ptr) -@ stdcall WSAStringToAddressW(wstr long ptr ptr ptr) -@ stdcall WSAWaitForMultipleEvents(long ptr long long long) kernel32.WaitForMultipleObjectsEx -@ stdcall WSCDeinstallProvider(ptr ptr) -@ stdcall WSCEnableNSProvider(ptr long) -@ stdcall WSCEnumProtocols(ptr ptr ptr ptr) -@ stdcall WSCGetProviderPath(ptr ptr ptr ptr) -@ stdcall WSCInstallNameSpace(wstr wstr long long ptr) -@ stdcall WSCInstallProvider(ptr wstr ptr long ptr) -@ stdcall WSCUnInstallNameSpace(ptr) -@ stdcall WSCUpdateProvider(ptr ptr ptr long ptr) -@ stdcall WSCWriteNameSpaceOrder(ptr long) -@ stdcall WSCWriteProviderOrder(ptr long) -@ stdcall freeaddrinfo(ptr) -@ stdcall getaddrinfo(str str ptr ptr) -@ stdcall getnameinfo(ptr long ptr long ptr long long) -@ stdcall GetNameInfoW(ptr long wstr long wstr long long)

1 0

[cgutman] 66514: [NDIS] - Fix a bugcheck caused when drivers pend requests NDIS-internal requests issued during initialization - Fixes Dell 1390 WLAN card (currently scanning via wlanconf isn't wor...
by cgutman＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: cgutman Date: Sun Mar 1 10:43:12 2015 New Revision: 66514 URL: http://svn.reactos.org/svn/reactos?rev=66514&view=rev Log: [NDIS] - Fix a bugcheck caused when drivers pend requests NDIS-internal requests issued during initialization - Fixes Dell 1390 WLAN card (currently scanning via wlanconf isn't working, but connecting via SSID works) Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Mar 1 10:43:12 2015 @@ -495,11 +495,25 @@ MacBlock = (PNDIS_REQUEST_MAC_BLOCK)Request->MacReserved; - if( MacBlock->Binding->RequestCompleteHandler ) { - (*MacBlock->Binding->RequestCompleteHandler)( - MacBlock->Binding->ProtocolBindingContext, - Request, - Status); + /* We may or may not be doing this request on behalf of an adapter binding */ + if (MacBlock->Binding != NULL) + { + /* We are, so invoke its request complete handler */ + if (MacBlock->Binding->RequestCompleteHandler != NULL) + { + (*MacBlock->Binding->RequestCompleteHandler)( + MacBlock->Binding->ProtocolBindingContext, + Request, + Status); + } + } + else + { + /* We are doing this internally, so we'll signal this event we've stashed in the MacBlock */ + ASSERT(MacBlock->Unknown1 != NULL); + ASSERT(MacBlock->Unknown3 == NULL); + MacBlock->Unknown3 = (PVOID)Status; + KeSetEvent(MacBlock->Unknown1, IO_NO_INCREMENT, FALSE); } KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); @@ -746,6 +760,8 @@ { NDIS_STATUS NdisStatus; PNDIS_REQUEST NdisRequest; + KEVENT Event; + PNDIS_REQUEST_MAC_BLOCK MacBlock; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); @@ -762,11 +778,19 @@ NdisRequest->DATA.SET_INFORMATION.InformationBuffer = Buffer; NdisRequest->DATA.SET_INFORMATION.InformationBufferLength = Size; + /* We'll need to give the completion routine some way of letting us know + * when it's finished. We'll stash a pointer to an event in the MacBlock */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + MacBlock = (PNDIS_REQUEST_MAC_BLOCK)NdisRequest->MacReserved; + MacBlock->Unknown1 = &Event; + NdisStatus = MiniDoRequest(Adapter, NdisRequest); - /* FIXME: Wait in pending case! */ - - ASSERT(NdisStatus != NDIS_STATUS_PENDING); + if (NdisStatus == NDIS_STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + NdisStatus = (NDIS_STATUS)MacBlock->Unknown3; + } *BytesRead = NdisRequest->DATA.SET_INFORMATION.BytesRead; @@ -796,6 +820,8 @@ { NDIS_STATUS NdisStatus; PNDIS_REQUEST NdisRequest; + KEVENT Event; + PNDIS_REQUEST_MAC_BLOCK MacBlock; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); @@ -812,11 +838,19 @@ NdisRequest->DATA.QUERY_INFORMATION.InformationBuffer = Buffer; NdisRequest->DATA.QUERY_INFORMATION.InformationBufferLength = Size; + /* We'll need to give the completion routine some way of letting us know + * when it's finished. We'll stash a pointer to an event in the MacBlock */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + MacBlock = (PNDIS_REQUEST_MAC_BLOCK)NdisRequest->MacReserved; + MacBlock->Unknown1 = &Event; + NdisStatus = MiniDoRequest(Adapter, NdisRequest); - /* FIXME: Wait in pending case! */ - - ASSERT(NdisStatus != NDIS_STATUS_PENDING); + if (NdisStatus == NDIS_STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + NdisStatus = (NDIS_STATUS)MacBlock->Unknown3; + } *BytesWritten = NdisRequest->DATA.QUERY_INFORMATION.BytesWritten;

1 0

[cwittich] 66513: [NDIS] support REG_DWORD in NdisReadConfiguration CORE-8046
by cwittich＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: cwittich Date: Sun Mar 1 10:15:50 2015 New Revision: 66513 URL: http://svn.reactos.org/svn/reactos?rev=66513&view=rev Log: [NDIS] support REG_DWORD in NdisReadConfiguration CORE-8046 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] Sun Mar 1 10:15:50 2015 @@ -645,6 +645,13 @@ (*ParameterValue)->ParameterData.StringData.Buffer = Buffer; (*ParameterValue)->ParameterData.StringData.Length = KeyInformation->DataLength; } + else if (KeyInformation->Type == REG_DWORD) + { + ASSERT(KeyInformation->DataLength == sizeof(ULONG)); + NDIS_DbgPrint(MAX_TRACE, ("NdisParameterInteger\n")); + (*ParameterValue)->ParameterType = NdisParameterInteger; + (*ParameterValue)->ParameterData.IntegerData = * (ULONG *) &KeyInformation->Data[0]; + } else if (KeyInformation->Type == REG_SZ) { UNICODE_STRING str;

1 0

[cgutman] 66512: [NDIS] - Always call MiniportISR if the interrupt is shared - Call MiniportHandleInterrupt even if MiniportInitialize is running - This commit and r66511 fix the Broadcom 57XX NIC ...
by cgutman＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: cgutman Date: Sun Mar 1 08:11:53 2015 New Revision: 66512 URL: http://svn.reactos.org/svn/reactos?rev=66512&view=rev Log: [NDIS] - Always call MiniportISR if the interrupt is shared - Call MiniportHandleInterrupt even if MiniportInitialize is running - This commit and r66511 fix the Broadcom 57XX NIC (CORE-9295) Modified: trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Sun Mar 1 08:11:53 2015 @@ -71,7 +71,7 @@ NDIS_DbgPrint(MAX_TRACE, ("MiniportInitialize executing: %s\n", (Initializing ? "yes" : "no"))); /* MiniportISR is always called for interrupts during MiniportInitialize */ - if ((Initializing) || (NdisInterrupt->IsrRequested)) { + if ((Initializing) || (NdisInterrupt->IsrRequested) || (NdisInterrupt->SharedInterrupt)) { NDIS_DbgPrint(MAX_TRACE, ("Calling MiniportISR\n")); (*NdisMiniportBlock->DriverHandle->MiniportCharacteristics.ISRHandler)( &InterruptRecognized, @@ -86,8 +86,9 @@ InterruptRecognized = TRUE; } - /* MiniportHandleInterrupt is never called for an interrupt during MiniportInitialize */ - if ((QueueMiniportHandleInterrupt) && (!Initializing)) + /* TODO: Figure out if we should call this or not if Initializing is true. It appears + * that calling it fixes some NICs, but documentation is contradictory on it. */ + if (QueueMiniportHandleInterrupt) { NDIS_DbgPrint(MAX_TRACE, ("Queuing DPC.\n")); KeInsertQueueDpc(&NdisInterrupt->InterruptDpc, NULL, NULL);

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