Skip to content

The path to the driver is now resolved from %SystemRoot% #101 #104

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

Merged
Liryna merged 1 commit into from
Nov 10, 2015
Merged

The path to the driver is now resolved from %SystemRoot% #101 #104

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
8 changes: 8 additions & 0 deletions dokan_control/dokan_control.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
<AdditionalLibraryDirectories>../debug</AdditionalLibraryDirectories>
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Win32'">
Expand All @@ -190,6 +191,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
<AdditionalLibraryDirectories>../debug</AdditionalLibraryDirectories>
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -206,6 +208,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
<AdditionalLibraryDirectories>../debug</AdditionalLibraryDirectories>
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">
Expand All @@ -222,6 +225,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
<AdditionalLibraryDirectories>../debug</AdditionalLibraryDirectories>
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -239,6 +243,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">
Expand All @@ -256,6 +261,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -273,6 +279,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">
Expand All @@ -290,6 +297,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down
34 changes: 29 additions & 5 deletions dokan_control/dokanctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,16 @@ THE SOFTWARE.
*/

#include <windows.h>
#include <Shlwapi.h>
#include <stdio.h>
#include <stdlib.h>
#include <locale.h>

#include "../dokan/dokan.h"
#include "../dokan/dokanc.h"

#define DOKAN_DRIVER_FULL_PATH L"%SystemRoot%\\system32\\drivers\\dokan.sys"

int ShowMountList()
{
DOKAN_CONTROL control;
Expand Down Expand Up @@ -142,11 +145,9 @@ wmain(int argc, PWCHAR argv[])
wcscat_s(mounterFullPath, MAX_PATH, L"\\mounter.exe");
fwprintf(stderr, L"mounter path %s\n", mounterFullPath);

GetSystemDirectory(driverFullPath, MAX_PATH);
wcscat_s(driverFullPath, MAX_PATH, L"\\drivers\\dokan.sys");
ExpandEnvironmentStringsW(DOKAN_DRIVER_FULL_PATH, driverFullPath, MAX_PATH);

fwprintf(stderr, L"driver path %s\n", driverFullPath);


if (GetOption(argc, argv, 1) == L'v') {
fprintf(stderr, "dokanctl : %s %s\n", __DATE__, __TIME__);
Expand All @@ -173,14 +174,26 @@ wmain(int argc, PWCHAR argv[])
switch(towlower(argv[1][1])) {
case L'i':
if (type == L'd') {

if(!PathFileExistsW(driverFullPath)) {
fprintf_s(stderr, "driver installation failed, the file does not exist.\n");
return EXIT_FAILURE;
}

if (DokanServiceInstall(DOKAN_DRIVER_SERVICE,
SERVICE_FILE_SYSTEM_DRIVER,
driverFullPath))
DOKAN_DRIVER_FULL_PATH))
fprintf(stderr, "driver install ok\n");
else
fprintf(stderr, "driver install failed\n");

} else if (type == L's') {

if(!PathFileExistsW(mounterFullPath)) {
fprintf_s(stderr, "mounter installation failed, the file does not exist.\n");
return EXIT_FAILURE;
}

if (DokanServiceInstall(DOKAN_MOUNTER_SERVICE,
SERVICE_WIN32_OWN_PROCESS,
mounterFullPath))
Expand All @@ -189,9 +202,20 @@ wmain(int argc, PWCHAR argv[])
fprintf(stderr, "mounter install failed\n");

} else if (type == L'a') {

if(!PathFileExistsW(driverFullPath)) {
fprintf_s(stderr, "driver installation failed, the file does not exist.\n");
return EXIT_FAILURE;
}

if(!PathFileExistsW(mounterFullPath)) {
fprintf_s(stderr, "mounter installation failed, the file does not exist.\n");
return EXIT_FAILURE;
}

if (DokanServiceInstall(DOKAN_DRIVER_SERVICE,
SERVICE_FILE_SYSTEM_DRIVER,
driverFullPath))
DOKAN_DRIVER_FULL_PATH))
fprintf(stderr, "driver install ok\n");
else
fprintf(stderr, "driver install failed\n");
Expand Down