fix some string functions

git-svn-id: http://dokan.googlecode.com/svn/trunk@138 53ea604a-054e-0410-8546-456bafaea6b0
zy26 · Apr 3, 2010 · 3338140 · 3338140
1 parent e5dceb8
commit 3338140
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/dokan/dokan.c b/dokan/dokan.c
@@ -225,7 +225,8 @@ DokanMain(PDOKAN_OPTIONS DokanOptions, PDOKAN_OPERATIONS DokanOperations)
 LPCWSTR
 GetRawDeviceName(LPCWSTR	DeviceName)
 {
-	static WCHAR rawDeviceName[MAX_PATH] = L"\\\\.";
+	static WCHAR rawDeviceName[MAX_PATH];
+	wcscpy_s(rawDeviceName, MAX_PATH, L"\\\\.");
 	wcscat_s(rawDeviceName, MAX_PATH, DeviceName);
 	return rawDeviceName;
 }

diff --git a/dokan_mount/mount.c b/dokan_mount/mount.c
@@ -173,7 +173,7 @@ CreateDriveLetter(
 
 	dosDevice[4] = DriveLetter;
 	driveName[0] = DriveLetter;
-	wcscpy_s(rawDeviceName, MAX_PATH, DeviceName);
+	wcscat_s(rawDeviceName, MAX_PATH, DeviceName);
 
 	DbgPrintW(L"DriveLetter: %c, DeviceName %s\n", DriveLetter, rawDeviceName);
 

diff --git a/sys/init.c b/sys/init.c
@@ -396,6 +396,8 @@ FreeUnicodeString(
 }
 
 
+//#define DOKAN_NET_PROVIDER
+
 NTSTATUS
 DokanCreateDiskDevice(
 	__in PDRIVER_OBJECT DriverObject,
@@ -477,7 +479,7 @@ DokanCreateDiskDevice(
 		DDbgPrint("  IoCreateDevice (DISK_DEVICE) failed: 0x%x\n", status);
 		return status;
 	}
-	DDbgPrint("DokanDiksDevice: %wZ created\n", &diskDeviceName);
+	DDbgPrint("DokanDiskDevice: %wZ created\n", &diskDeviceName);
 
 	//
 	// Initialize the device extension.
@@ -607,8 +609,6 @@ DokanCreateDiskDevice(
 	diskDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING;
 	fsDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING;
 
-	IoRegisterFileSystem(fsDeviceObject);
-
 	if (isNetworkFileSystem) {
 		// Run FsRtlRegisterUncProvider in System thread.
 		HANDLE handle;
@@ -629,6 +629,9 @@ DokanCreateDiskDevice(
 			ObDereferenceObject(thread);
 		}
 	}
+
+	IoRegisterFileSystem(fsDeviceObject);
+
 	//DokanRegisterMountedDeviceInterface(diskDeviceObject, dcb);
 
 	dcb->Mounted = 1;