Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix LSP sample to install correctly on 64-bit machines #304

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix LSP sample to install correctly on 64-bit machines #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion Samples/Win7Samples/netds/winsock/lsp/install/instlsp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ int _cdecl main(int argc, char *argv[])
case 'd': // Full path and filename to LSP
if ( i+1 >= argc )
goto cleanup;
if (_strnicmp(argv[i], "-d32", 4))
if (!_strnicmp(argv[i], "-d32", 4))
lpszLspPathAndFile32 = argv[ ++i ];
else
lpszLspPathAndFile = argv[ ++i ];
Expand Down Expand Up @@ -341,6 +341,22 @@ int _cdecl main(int argc, char *argv[])
goto cleanup;
}

printf("lpszLspPathAndFile = %hs\n", lpszLspPathAndFile);
printf("lpszLspPathAndFile32 = %hs\n", lpszLspPathAndFile32);

#ifdef _WIN64
if (lpszLspPathAndFile && lpszLspPathAndFile32)
{
eCatalog = LspCatalogBoth;
}
else
{
fprintf( stderr, "\n\nError! Please specify both 64-bit and 32-bit paths of LSP!\n\n");
bArgsOkay = FALSE;
goto cleanup;
}
#endif

if ( TRUE == bInstallOverAll )
{
// Make sure user didn't specify '-a' and '-o' flags
Expand Down
6 changes: 3 additions & 3 deletions Samples/Win7Samples/netds/winsock/lsp/install/lspadd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,7 +1322,7 @@ InstallProviderVista(
#ifdef _WIN64
if ( ( eCatalog == LspCatalog32Only ) || ( eCatalog == LspCatalog64Only ) )
{
fprintf(stderr, "New install API always installs into both catalogs!\n");
fprintf(stderr, "New install API always installs into both catalogs - -d and -d32 flags are required!\n");
goto cleanup;
}
else
Expand Down Expand Up @@ -1365,7 +1365,7 @@ InstallProviderVista(
providerGuid,
lpszLspPathAndFile,
#ifdef _WIN64
(lpszLspPathAndFile32[0] == '\0' ? lpszLspPathAndFile : lpszLspPathAndFile32),
lpszLspPathAndFile32,
#endif
lpszLspName,
( IfsProvider ? XP1_IFS_HANDLES : 0 ),
Expand Down Expand Up @@ -1422,7 +1422,7 @@ InstallProviderVista(
providerGuid,
lpszLspPathAndFile,
#ifdef _WIN64
lpszLspPathAndFile,
lpszLspPathAndFile32,
#endif
lpszLspName,
( IfsProvider ? XP1_IFS_HANDLES : 0 ),
Expand Down