From: ftillier Date: Tue, 21 Apr 2009 04:27:57 +0000 (+0000) Subject: Update to ND installer. X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=cd5c951d6d94f4295d12a88cc3b3085fce83102d;p=~shefty%2Frdma-win.git Update to ND installer. Signed-off-by: Fab Tillier git-svn-id: svn://openib.tc.cornell.edu/gen1@2112 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- diff --git a/trunk/tools/ndinstall/user/InstallSP.sln b/trunk/tools/ndinstall/user/InstallSP.sln deleted file mode 100644 index 9c8f2cb0..00000000 --- a/trunk/tools/ndinstall/user/InstallSP.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InstallSP", "InstallSP.vcproj", "{B3A2B7A0-1906-413E-A457-8AD2FC5E88BB}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {B3A2B7A0-1906-413E-A457-8AD2FC5E88BB}.Debug.ActiveCfg = Debug|Win32 - {B3A2B7A0-1906-413E-A457-8AD2FC5E88BB}.Debug.Build.0 = Debug|Win32 - {B3A2B7A0-1906-413E-A457-8AD2FC5E88BB}.Release.ActiveCfg = Release|Win32 - {B3A2B7A0-1906-413E-A457-8AD2FC5E88BB}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/trunk/tools/ndinstall/user/SOURCES b/trunk/tools/ndinstall/user/SOURCES index 5914a25d..9bcc2e49 100644 --- a/trunk/tools/ndinstall/user/SOURCES +++ b/trunk/tools/ndinstall/user/SOURCES @@ -1,18 +1,18 @@ -TARGETNAME=installsp +TARGETNAME=ndinstall TARGETPATH=..\..\..\bin\user\obj$(BUILD_ALT_DIR) TARGETTYPE=PROGRAM UMTYPE=console USE_MSVCRT=1 INCLUDES=..\..\..\inc;\ - ..\..\..\inc\user;\ - $(PLATFORM_SDK_PATH)\include; + ..\..\..\inc\user; SOURCES= \ installsp.rc \ installsp.c -USER_C_FLAGS=$(USER_C_FLAGS) -DPERFMON_ENABLED +USER_C_FLAGS=$(USER_C_FLAGS) +#-DPERFMON_ENABLED TARGETLIBS=\ $(SDK_LIB_PATH)\ws2_32.lib \ diff --git a/trunk/tools/ndinstall/user/installsp.c b/trunk/tools/ndinstall/user/installsp.c index e0cba2e8..3d55d0d9 100644 --- a/trunk/tools/ndinstall/user/installsp.c +++ b/trunk/tools/ndinstall/user/installsp.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2005 SilverStorm Technologies. All rights reserved. + * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved. * * This software is available to you under the OpenIB.org BSD license * below: @@ -31,10 +32,10 @@ /* * Module Name: installsp.c - * Description: This module installs/removes a winsock service provider for infiniband. + * Description: This module installs/removes the NetworkDirect provider for infiniband. * execute: * To install the service provider - * installsp -i + * installsp -i * To remove the service provider * installsp -r */ @@ -42,443 +43,27 @@ #include #include #include -#include +#ifndef PFL_NETWORKDIRECT_PROVIDER +#define PFL_NETWORKDIRECT_PROVIDER 0x00000010 +#endif /* Initialize the LSP's provider path for Infiband Service Provider dll */ -static const WCHAR provider_path[] = L"%SYSTEMROOT%\\system32\\ibwsd.dll"; -static const WCHAR provider_prefix[] =L" Winsock Direct for InfiniBand"; //includes one whitespace -static const char provider_name[] = VER_PROVIDER ;//L"%VER_PROVIDER% Winsock Direct for InfiniBand"; //(VER_PROVIDER ## WINDIR); -static const char winsock_key_path[] = - "System\\CurrentControlSet\\Services\\Winsock\\Parameters\\TCP on SAN"; -static const char openib_key_name[] = IB_COMPANYNAME; +static const WCHAR provider_path[] = L"%SYSTEMROOT%\\system32\\ibndprov.dll"; +static const WCHAR provider_name[] = L"OpenFabrics Network Direct Provider"; +static const char openib_key_name[] = "OpenFabrics Alliance"; /* Unique provider GUID generated with "uuidgen -s" */ static GUID provider_guid = { - /* c943654d-2c84-4db7-af3e-fdf1c5322458 */ - 0xc943654d, 0x2c84, 0x4db7, - { 0xaf, 0x3e, 0xfd, 0xf1, 0xc5, 0x32, 0x24, 0x58 } + /* {52CDAA00-29D0-46be-8FC6-E51D7075C338} */ + 0x52CDAA00, 0x29D0, 0x46be, + { 0x8f, 0xc6, 0xe5, 0x1d, 0x70, 0x75, 0xc3, 0x38 } }; #ifdef _WIN64 #define WSCInstallProvider WSCInstallProvider64_32 #endif /* _WIN64 */ -#ifdef PERFMON_ENABLED -#include -#include "wsd/ibsp_regpath.h" - - -typedef struct _pm_symbol_def -{ - DWORD name_def; - CHAR name_str[40]; - CHAR name_desc[40]; - CHAR help_desc[256]; - -} pm_symbol_def_t; - -static pm_symbol_def_t _pm_symbols[]= -{ - { IBSP_PM_OBJ, - "IBSP_PM_OBJ", - "IB Winsock Direct", - "InfiniBand Windows Sockets Direct Provider." - }, - { IBSP_PM_COUNTER(BYTES_SEND), - "IBSP_PM_BYTES_TX_SEC", - "Send bytes/sec", - "Send bytes/second, excluding RDMA Write." - }, - { IBSP_PM_COUNTER(BYTES_RECV), - "IBSP_PM_BYTES_RX_SEC", - "Recv bytes/sec", - "Receive bytes/second, excluding RDMA Read." - }, - { IBSP_PM_COUNTER(BYTES_WRITE), - "IBSP_PM_RDMA_WR_SEC", - "RDMA Write bytes/sec", - "RDMA Write bytes/second." - }, - { IBSP_PM_COUNTER(BYTES_READ), - "IBSP_PM_RDMA_RD_SEC", - "RDMA Read bytes/sec", - "RDMA Read bytes/second." - }, - { IBSP_PM_COUNTER(BYTES_TOTAL), - "IBSP_PM_BYTES_SEC", - "Total bytes/sec", - "Total bytes transmitted per second, including send, " - "receive, RDMA Write, and RDMA Read." - }, - { IBSP_PM_COUNTER(COMP_SEND), - "IBSP_PM_SEND_COMPLETIONS_SEC", - "Send Completions/sec", - "Send and RDMA Write Completions/sec." - }, - { IBSP_PM_COUNTER(COMP_RECV), - "IBSP_PM_RECV_COMPLETIONS_SEC", - "Recv Completions/sec", - "Recv and RDMA Read Completions/sec." - }, - { IBSP_PM_COUNTER(COMP_TOTAL), - "IBSP_PM_COMPLETIONS_SEC", - "Total Completions/sec", - "Total Completions processed per second." - }, - { IBSP_PM_COUNTER(INTR_TOTAL), - "IBSP_PM_COMPLETIONS_INTR", - "Total Interrupts/sec", - "Completion Queue events per second." - } -}; - -#define IBSP_PM_NUM_SYMBOLS (sizeof(_pm_symbols)/sizeof(pm_symbol_def_t)) -#define IBSP_PM_LANGUAGE "009" /* good for English */ - -static CHAR * -_IBSPGenerateFileName(char *header, char *file ) -{ - DWORD size1, size; - CHAR *full_file_name; - int header_len = header == NULL ? 0 : strlen(header); - - size = GetTempPath(0, NULL); - if (size == 0) - { - fprintf( stderr, "GetTempPath failed\n" ); - return NULL; - } - size1 = size + strlen(file) + header_len; - full_file_name = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, size1); - if ( full_file_name == NULL ) - { - fprintf( stderr, "GetTempPath failed\n" ); - return NULL; - } - size1 = GetTempPath(size, full_file_name + header_len); - if (size != size1 + 1) - { - fprintf( stderr, "Very strange, GetTempPath returned something different\n" ); - HeapFree (GetProcessHeap (), 0, full_file_name); - return NULL; - } - if (header_len != 0) - { - memcpy(full_file_name, header, header_len); - } - strcat(full_file_name, file); - return full_file_name; -} - - -static DWORD -_IBSPPerfmonIniFilesGenerate( void ) -{ - FILE *f_handle; - DWORD num; - DWORD ret = ERROR_SUCCESS; - char *ibsp_pm_sym_file = NULL; - char *ibsp_pm_ini_file = NULL; - - /* create ".h" file first */ - ibsp_pm_sym_file = _IBSPGenerateFileName(NULL, IBSP_PM_SYM_H_FILE); - if( !ibsp_pm_sym_file ) - { - fprintf( stderr, "_IBSPGenerateFileName failed\n" ); - ret = ERROR_NOT_ENOUGH_MEMORY; - goto Cleanup; - } - - f_handle = fopen( ibsp_pm_sym_file, "w+" ); - - if( !f_handle ) - { - fprintf( stderr, "Create Header file %s failed\n", ibsp_pm_sym_file ); - ret = ERROR_FILE_INVALID; - goto Cleanup; - } - - fprintf( - f_handle, "/* %s Generated by program */ \r\n", ibsp_pm_sym_file ); - - - for( num = 0; num < IBSP_PM_NUM_SYMBOLS; num++ ) - { - fprintf( f_handle, "#define\t%s\t%d\r\n", - _pm_symbols[num].name_str, _pm_symbols[num].name_def ); - } - - fflush( f_handle ); - fclose( f_handle ); - - /* create 'ini' file next */ - ibsp_pm_ini_file = _IBSPGenerateFileName(NULL, IBSP_PM_INI_FILE); - if( !ibsp_pm_sym_file ) - { - fprintf( stderr, "_IBSPGenerateFileName failed\n" ); - ret = ERROR_NOT_ENOUGH_MEMORY; - goto Cleanup; - } - f_handle = fopen( ibsp_pm_ini_file, "w+" ); - - if( !f_handle ) - { - fprintf( stderr, "Create INI file %s failed\n", ibsp_pm_ini_file ); - ret = ERROR_FILE_INVALID; - goto Cleanup; - } - - fprintf( f_handle, "[info]\r\ndrivername=" IBSP_PM_SUBKEY_NAME - "\r\nsymbolfile=%s\r\n\r\n", ibsp_pm_sym_file ); - fprintf( f_handle,"[languages]\r\n" IBSP_PM_LANGUAGE - "=language" IBSP_PM_LANGUAGE "\r\n\r\n" ); - - fprintf( f_handle, - "[objects]\r\n%s_" IBSP_PM_LANGUAGE "_NAME=%s\r\n\r\n[text]\r\n", - _pm_symbols[0].name_str, _pm_symbols[0].name_desc ); - - for( num = 0; num < IBSP_PM_NUM_SYMBOLS; num++ ) - { - fprintf( f_handle,"%s_" IBSP_PM_LANGUAGE "_NAME=%s\r\n", - _pm_symbols[num].name_str, _pm_symbols[num].name_desc ); - fprintf( f_handle,"%s_" IBSP_PM_LANGUAGE "_HELP=%s\r\n", - _pm_symbols[num].name_str, _pm_symbols[num].help_desc ); - } - - fflush( f_handle ); - fclose( f_handle ); - -Cleanup: - if ( ibsp_pm_sym_file ) - { - HeapFree (GetProcessHeap (), 0, ibsp_pm_sym_file); - } - if ( ibsp_pm_ini_file ) - { - HeapFree (GetProcessHeap (), 0, ibsp_pm_ini_file); - } - return ret; -} - - -static void -_IBSPPerfmonIniFilesRemove( void ) -{ - char *ibsp_pm_sym_file = NULL; - char *ibsp_pm_ini_file = NULL; - - ibsp_pm_sym_file = _IBSPGenerateFileName(NULL, IBSP_PM_SYM_H_FILE); - if( !ibsp_pm_sym_file ) - { - fprintf( stderr, "_IBSPGenerateFileName failed\n" ); - goto Cleanup; - } - - ibsp_pm_ini_file = _IBSPGenerateFileName(NULL, IBSP_PM_INI_FILE); - if( !ibsp_pm_sym_file ) - { - fprintf( stderr, "_IBSPGenerateFileName failed\n" ); - goto Cleanup; - } - - if( !DeleteFile( ibsp_pm_ini_file ) ) - { - fprintf( stderr, "Delete file %s failed status %d\n", - ibsp_pm_ini_file, GetLastError() ); - } - if( !DeleteFile( ibsp_pm_sym_file ) ) - { - fprintf( stderr,"Delete file %s failed status %d\n", - ibsp_pm_sym_file, GetLastError() ); - } - -Cleanup: - if ( ibsp_pm_sym_file ) - { - HeapFree (GetProcessHeap (), 0, ibsp_pm_sym_file); - } - if ( ibsp_pm_ini_file ) - { - HeapFree (GetProcessHeap (), 0, ibsp_pm_ini_file); - } - -} - - -/* Try to create IB WSD Performance Register Keys */ -static LONG -_IBSPPerfmonRegisterKeys( void ) -{ - LONG reg_status; - HKEY pm_hkey; - DWORD typesSupp = 7; - - reg_status = RegCreateKeyEx( HKEY_LOCAL_MACHINE, - IBSP_PM_REGISTRY_PATH IBSP_PM_SUBKEY_PERF, 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &pm_hkey, NULL ); - - if( reg_status != ERROR_SUCCESS ) - { - fprintf( stderr, - "_IBSPPerfmonRegisterKeys Create Key %s failed with %d\n", - IBSP_PM_REGISTRY_PATH IBSP_PM_SUBKEY_PERF, reg_status ); - return reg_status; - } - - /* create/assign values to the key */ - RegSetValueExW( pm_hkey, L"Library", 0, REG_EXPAND_SZ, - (LPBYTE)provider_path, sizeof(provider_path) ); - - RegSetValueEx( pm_hkey, TEXT("Open"), 0, REG_SZ, - (LPBYTE)TEXT("IBSPPmOpen"), sizeof(TEXT("IBSPPmOpen")) ); - - RegSetValueEx( pm_hkey, TEXT("Collect"), 0, REG_SZ, - (LPBYTE)TEXT("IBSPPmCollectData"), sizeof(TEXT("IBSPPmCollectData")) ); - - RegSetValueEx( pm_hkey, TEXT("Close"), 0, REG_SZ, - (LPBYTE)TEXT("IBSPPmClose"), sizeof(TEXT("IBSPPmClose")) ); - - RegFlushKey( pm_hkey ); - RegCloseKey( pm_hkey ); - - reg_status = RegCreateKeyEx( HKEY_LOCAL_MACHINE, - IBSP_PM_EVENTLOG_PATH, 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &pm_hkey, NULL ); - - if( reg_status != ERROR_SUCCESS ) - { - fprintf(stderr, "Create EventLog Key failed with %d\n", reg_status ); - return reg_status; - } - - /* create/assign values to the key */ - RegSetValueExW( pm_hkey, L"EventMessageFile", 0, REG_EXPAND_SZ,\ - (LPBYTE)provider_path, sizeof(provider_path) ); - - RegSetValueEx( pm_hkey, TEXT("TypesSupported"), 0, REG_DWORD, - (LPBYTE)&typesSupp, sizeof(typesSupp) ); - - RegFlushKey( pm_hkey ); - RegCloseKey( pm_hkey ); - - return reg_status; -} - - -/* Try to destroy IB WSD Performance Register Keys */ -static LONG -_IBSPPerfmonDeregisterKeys( void ) -{ - LONG reg_status; - - reg_status = RegDeleteKeyEx( HKEY_LOCAL_MACHINE, - IBSP_PM_REGISTRY_PATH IBSP_PM_SUBKEY_PERF, - (KEY_WOW64_32KEY | KEY_WOW64_64KEY), 0 ); - - if( reg_status != ERROR_SUCCESS ) - { - fprintf( stderr, - "_IBSPPerfmonRegisterKeys Remove SubKey failed with %d\n", - GetLastError() ); - } - - reg_status = RegDeleteKeyEx( HKEY_LOCAL_MACHINE, - IBSP_PM_REGISTRY_PATH, (KEY_WOW64_32KEY | KEY_WOW64_64KEY), 0 ); - - if( reg_status != ERROR_SUCCESS ) - { - fprintf( stderr, - "_IBSPPerfmonRegisterKeys Remove SubKey failed with %d\n", - GetLastError() ); - } - - reg_status = RegDeleteKeyEx( HKEY_LOCAL_MACHINE, - IBSP_PM_EVENTLOG_PATH, (KEY_WOW64_32KEY | KEY_WOW64_64KEY), 0 ); - - if( reg_status != ERROR_SUCCESS ) - { - fprintf( stderr, - "_IBSPPerfmonRegisterKeys Remove SubKey failed with %d\n", - GetLastError() ); - } - - return reg_status; -} - - -/* - * functions will try to register performance counters - * definitions with PerfMon application. - * API externally called by lodctr.exe/unlodctr.exe utilities. - */ -static DWORD -_IBSPPerfmonRegisterCounters( void ) -{ - DWORD status; - char *ibsp_pm_ini_file = NULL; - - ibsp_pm_ini_file = _IBSPGenerateFileName("unused ", IBSP_PM_INI_FILE); - if( !ibsp_pm_ini_file ) - { - fprintf( stderr, "_IBSPGenerateFileName failed\n" ); - status = ERROR_NOT_ENOUGH_MEMORY; - goto Cleanup; - } - - /* - * format commandline string, as per SDK : - * Pointer to a null-terminated string that consists of one or more - * arbitrary letters, a space, and then the name of the initialization - * file. - */ - status = LoadPerfCounterTextStrings( ibsp_pm_ini_file, TRUE ); - if( status != ERROR_SUCCESS ) - { - status = GetLastError(); - fprintf( stderr, - "IBSPPerfmonRegisterCounters install failed status %d\n", status ); - } -Cleanup: - if ( ibsp_pm_ini_file ) - { - HeapFree (GetProcessHeap (), 0, ibsp_pm_ini_file); - } - - return status; -} - - -/* - * functions will try to unregister performance counters - * definitions with PerfMon application. - * API externally called by lodctr.exe/unlodctr.exe utilities. - */ -static DWORD -_IBSPPerfmonDeregisterCounters( void ) -{ - DWORD status; - - /* - * format commandline string, as per SDK : - * Pointer to a null-terminated string that consists of one or more - * arbitrary letters, a space, and then the name of the initialization - * file. - */ - status = UnloadPerfCounterTextStrings( - TEXT("unused ") TEXT(IBSP_PM_SUBKEY_NAME), TRUE ); - if( status != ERROR_SUCCESS ) - { - fprintf( stderr, - "IBSPPerfmonDeregisterCounters remove failed status %d\n", - status ); - } - return status; -} - -#endif /* PERFMON_ENABLED */ - - /* * Function: usage * Description: Prints usage information. @@ -487,10 +72,10 @@ static void usage (char *progname) { printf ("usage: %s [-i/-r [-p]]\n", progname); - printf (" -i Install the service provider\n" - " -r Remove the %s service provider\n" + printf (" -i Install the OpenFabrics NetworkDirect service provider\n" + " -r Remove the OpenFabrics NetworkDirect service provider\n" " -r Remove the specified service provider\n" - " -l List service providers\n",VER_PROVIDER); + " -l List service providers\n"); } @@ -561,69 +146,32 @@ static void install_provider(void) LONG reg_error; WSAPROTOCOL_INFOW provider; HKEY hkey; - size_t res; - size_t st_len; - - /* Now setup the key. */ - reg_error = RegCreateKeyExA( HKEY_LOCAL_MACHINE, winsock_key_path, - 0, NULL, REG_OPTION_NON_VOLATILE, (KEY_WRITE | KEY_READ), NULL, - &hkey, NULL ); - if( reg_error == ERROR_SUCCESS ) - { - reg_error = RegSetValueExA( hkey, openib_key_name, 0, REG_BINARY, - (PBYTE)&provider_guid, sizeof(GUID) ); - if( reg_error == ERROR_SUCCESS ) - { - /* Force the system to write the new key now. */ - RegFlushKey(hkey); - } - else - { - fprintf(stderr, "RegSetValueEx failed with %d\n", GetLastError()); - } - - RegCloseKey(hkey); - } - else - { - fprintf(stderr, "Could not get a handle on Winsock registry (%d)\n", GetLastError()); - } /* Setup the values in PROTOCOL_INFO */ provider.dwServiceFlags1 = XP1_GUARANTEED_DELIVERY | XP1_GUARANTEED_ORDER | XP1_MESSAGE_ORIENTED | - XP1_GRACEFUL_CLOSE; + XP1_CONNECT_DATA; /*XP1_GRACEFUL_CLOSE;*/ provider.dwServiceFlags2 = 0; /* Reserved */ provider.dwServiceFlags3 = 0; /* Reserved */ provider.dwServiceFlags4 = 0; /* Reserved */ - provider.dwProviderFlags = PFL_HIDDEN; + provider.dwProviderFlags = PFL_HIDDEN | PFL_NETWORKDIRECT_PROVIDER; provider.ProviderId = provider_guid; /* Service Provider ID provided by vendor. Need to be changed later */ provider.dwCatalogEntryId = 0; provider.ProtocolChain.ChainLen = 1; /* Base Protocol Service Provider */ - provider.iVersion = 2; /* don't know what it is */ + provider.iVersion = 1; provider.iAddressFamily = AF_INET; provider.iMaxSockAddr = 16; provider.iMinSockAddr = 16; - provider.iSocketType = SOCK_STREAM; - provider.iProtocol = IPPROTO_TCP; + provider.iSocketType = -1; + provider.iProtocol = 0; provider.iProtocolMaxOffset = 0; provider.iNetworkByteOrder = BIGENDIAN; provider.iSecurityScheme = SECURITY_PROTOCOL_NONE; provider.dwMessageSize = 0xFFFFFFFF; /* IB supports 32-bit lengths for data transfers on RC */ provider.dwProviderReserved = 0; - - st_len = strlen(provider_name); - rc = mbstowcs(provider.szProtocol, provider_name,st_len); //do not count \0 - // We can't use there mbstowcs_s - //rc = mbstowcs_s(&convertedChars, provider.szProtocol, sizeof(provider_name), provider_name, ); - if (rc != st_len) { - printf(" Can't convert string %s to WCHAR\n",provider_name); - printf("Converted %d from %d\n", rc, st_len); - } - wcscpy( provider.szProtocol + st_len, provider_prefix); - //wprintf(L"provider.szProtocol = %s\n",provider.szProtocol); + wcscpy( provider.szProtocol, provider_name ); rc = WSCInstallProvider( &provider_guid, provider_path, &provider, 1, &err_no ); @@ -647,25 +195,6 @@ static void remove_provider( const char* const provider_name ) LONG reg_error; HKEY hkey; - /* Remove our key */ - reg_error = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - winsock_key_path, - 0, - (KEY_WRITE | KEY_READ), - &hkey); - if (reg_error == ERROR_SUCCESS) { - - reg_error = RegDeleteValueA(hkey, provider_name); - if (reg_error == ERROR_SUCCESS) { - /* Force the system to remove the key now. */ - RegFlushKey(hkey); - } else { - fprintf(stderr, "RegDeleteValue failed with %d\n", GetLastError()); - } - - RegCloseKey(hkey); - } - /* Remove from the catalog */ rc = WSCDeinstallProvider(&provider_guid, &err_no); if (rc == SOCKET_ERROR) { diff --git a/trunk/tools/ndinstall/user/installsp.exe.manifest b/trunk/tools/ndinstall/user/installsp.exe.manifest deleted file mode 100644 index d5e574e6..00000000 --- a/trunk/tools/ndinstall/user/installsp.exe.manifest +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/trunk/tools/ndinstall/user/installsp.rc b/trunk/tools/ndinstall/user/installsp.rc index 51a73c81..afac7a57 100644 --- a/trunk/tools/ndinstall/user/installsp.rc +++ b/trunk/tools/ndinstall/user/installsp.rc @@ -1,5 +1,6 @@ /* * Copyright (c) 2005 SilverStorm Technologies. All rights reserved. + * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved. * * This software is available to you under the OpenIB.org BSD license * below: @@ -36,12 +37,12 @@ #define VER_FILESUBTYPE VFT2_UNKNOWN #ifdef _DEBUG_ -#define VER_FILEDESCRIPTION_STR "Winsock Direct for InfiniBand installer (Debug)" +#define VER_FILEDESCRIPTION_STR "NetworkDirect for InfiniBand installer (Debug)" #else -#define VER_FILEDESCRIPTION_STR "Winsock Direct for InfiniBand installer" +#define VER_FILEDESCRIPTION_STR "NetworkDirect for InfiniBand installer" #endif -#define VER_INTERNALNAME_STR "installsp.exe" -#define VER_ORIGINALFILENAME_STR "installsp.exe" +#define VER_INTERNALNAME_STR "ndinstall.exe" +#define VER_ORIGINALFILENAME_STR "ndinstall.exe" #include