[ros-diffs] [reactos] 03/04: [UBTRFS] Update to 1.0.1

[Pierre Schweitzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed263291d1a6acbf1b885ff68807018e47aa77f8

commit ed263291d1a6acbf1b885ff68807018e47aa77f8
Author: Pierre Schweitzer <pie...@reactos.org>
AuthorDate: Mon Oct 16 20:26:16 2017 +0200

    [UBTRFS] Update to 1.0.1
    
    CORE-13896
---
 dll/win32/ubtrfs/ubtrfs.rc        | 20 +++++++++-----------
 sdk/lib/fslib/btrfslib/btrfslib.c |  7 +++++++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/dll/win32/ubtrfs/ubtrfs.rc b/dll/win32/ubtrfs/ubtrfs.rc
index 6651280b23..cf70d78b56 100644
--- a/dll/win32/ubtrfs/ubtrfs.rc
+++ b/dll/win32/ubtrfs/ubtrfs.rc
@@ -7,19 +7,17 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "winres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.K.) resources
+// English (United Kingdom) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 #pragma code_page(1252)
-#endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -34,7 +32,7 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxres.h""\r\n"
+    "#include ""winres.h""\r\n"
     "\0"
 END
 
@@ -53,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION 1,0,1,0
+ PRODUCTVERSION 1,0,1,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,12 +68,12 @@ BEGIN
         BLOCK "080904b0"
         BEGIN
             VALUE "FileDescription", "Btrfs utility DLL"
-            VALUE "FileVersion", "0.8"
+            VALUE "FileVersion", "1.0.1"
             VALUE "InternalName", "ubtrfs"
-            VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016"
+            VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016-17"
             VALUE "OriginalFilename", "ubtrfs.dll"
             VALUE "ProductName", "WinBtrfs"
-            VALUE "ProductVersion", "0.8"
+            VALUE "ProductVersion", "1.0.1"
         END
     END
     BLOCK "VarFileInfo"
@@ -84,7 +82,7 @@ BEGIN
     END
 END
 
-#endif    // English (U.K.) resources
+#endif    // English (United Kingdom) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/sdk/lib/fslib/btrfslib/btrfslib.c 
b/sdk/lib/fslib/btrfslib/btrfslib.c
index 7677fbea59..9999f2c51b 100644
--- a/sdk/lib/fslib/btrfslib/btrfslib.c
+++ b/sdk/lib/fslib/btrfslib/btrfslib.c
@@ -1454,6 +1454,7 @@ NTSTATUS NTAPI BtrfsFormatEx(PUNICODE_STRING DriveRoot, 
FMIFS_MEDIA_FLAG MediaFl
     LUID luid;
 #endif
     UINT64 incompat_flags;
+    UNICODE_STRING empty_label;
 
     static WCHAR btrfs[] = L"\\Btrfs";
 
@@ -1543,6 +1544,12 @@ NTSTATUS NTAPI BtrfsFormatEx(PUNICODE_STRING DriveRoot, 
FMIFS_MEDIA_FLAG MediaFl
     incompat_flags = def_incompat_flags;
     incompat_flags |= BTRFS_INCOMPAT_FLAGS_MIXED_BACKREF | 
BTRFS_INCOMPAT_FLAGS_BIG_METADATA;
 
+    if (!Label) {
+        empty_label.Buffer = NULL;
+        empty_label.Length = empty_label.MaximumLength = 0;
+        Label = &empty_label;
+    }
+
     Status = write_btrfs(h, gli.Length.QuadPart, Label, sector_size, 
node_size, incompat_flags);
 
     NtFsControlFile(h, NULL, NULL, NULL, &iosb, FSCTL_DISMOUNT_VOLUME, NULL, 
0, NULL, 0);