fix some code styles, prepare next release

git-svn-id: http://dokan.googlecode.com/svn/trunk@122 53ea604a-054e-0410-8546-456bafaea6b0
zy26 · Mar 25, 2010 · 27e4a4f · 27e4a4f
1 parent a506410
commit 27e4a4f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/dokan/create.c b/dokan/create.c
@@ -168,7 +168,7 @@ DispatchCreate(
 
 		DbgPrint("CreateFile status = %d\n", status);
 		if (EventContext->Flags & SL_OPEN_TARGET_DIRECTORY) {
-			DokanDbgPrint("SL_OPEN_TARGET_DIRECTORY spcefied\n");
+			DbgPrint("SL_OPEN_TARGET_DIRECTORY spcefied\n");
 		}
 		eventInfo->Create.Information = FILE_DOES_NOT_EXIST;
 

diff --git a/dokan_install/install.nsi b/dokan_install/install.nsi
@@ -1,4 +1,4 @@
-!define VERSION "0.5.1"
+!define VERSION "0.5.2"
 
 !include LogicLib.nsh
 !include x64.nsh

diff --git a/sys/create.c b/sys/create.c
@@ -58,10 +58,10 @@ DokanAllocateFCB(
 
 
 	fcb->AdvancedFCBHeader.ValidDataLength.LowPart = 0xffffffff;
-    fcb->AdvancedFCBHeader.ValidDataLength.HighPart = 0x7fffffff;
+	fcb->AdvancedFCBHeader.ValidDataLength.HighPart = 0x7fffffff;
 
 	fcb->AdvancedFCBHeader.Resource = &fcb->MainResource;
-    fcb->AdvancedFCBHeader.PagingIoResource = &fcb->PagingIoResource;
+	fcb->AdvancedFCBHeader.PagingIoResource = &fcb->PagingIoResource;
 
 	fcb->AdvancedFCBHeader.AllocationSize.QuadPart = 4096;
 	fcb->AdvancedFCBHeader.FileSize.QuadPart = 4096;

diff --git a/sys/dokan.c b/sys/dokan.c
@@ -44,7 +44,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 
-ULONG g_Debug = 1;
+ULONG g_Debug = DOKAN_DEBUG_DEFAULT;
 
 #if _WIN32_WINNT < 0x0501
 	PFN_FSRTLTEARDOWNPERSTREAMCONTEXTS DokanFsRtlTeardownPerStreamContexts;

diff --git a/sys/dokan.h b/sys/dokan.h
@@ -36,6 +36,9 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
 // DEFINES
 //
 
+#define DOKAN_DEBUG_DEFAULT 0
+//#define USE_DBGPRINT 1
+
 int __cdecl swprintf(wchar_t *, const wchar_t *, ...);
 extern ULONG g_Debug;
 
@@ -61,8 +64,6 @@ extern ULONG g_Debug;
 
 #define DOKAN_KEEPALIVE_TIMEOUT		(1000 * 15) // in millisecond
 
-#define USE_DBGPRINT 1
-
 #ifdef USE_DBGPRINT
 	#define DDbgPrint(...) \
 	if (g_Debug) { DbgPrint("[DokanFS] " __VA_ARGS__); }

diff --git a/sys/volume.c b/sys/volume.c
@@ -90,7 +90,7 @@ DokanDispatchQueryVolumeInformation(
 				device = (PFILE_FS_DEVICE_INFORMATION)Irp->AssociatedIrp.SystemBuffer;
 				if (irpSp->Parameters.QueryVolume.Length < sizeof(FILE_FS_DEVICE_INFORMATION)) {
 					status = STATUS_BUFFER_TOO_SMALL;
-					info = 0;
+					info = sizeof(FILE_FS_DEVICE_INFORMATION);
 					__leave;
 				}
 				device->DeviceType = dcb->DeviceType;