Index: C:/ROS/reactos/dll/win32/netapi32/user.c
===================================================================
--- dll/win32/netapi32/user.c	(revision 63745)
+++ dll/win32/netapi32/user.c	(working copy)
@@ -476,8 +476,7 @@
             if (UserInfo->ScriptPath.Length > 0)
                 Size += UserInfo->ScriptPath.Length + sizeof(WCHAR);
 
-            if (UserInfo->FullName.Length > 0)
-                Size += UserInfo->FullName.Length + sizeof(WCHAR);
+            Size += UserInfo->FullName.Length + sizeof(WCHAR);
 
             if (UserInfo->UserComment.Length > 0)
                 Size += UserInfo->UserComment.Length + sizeof(WCHAR);
@@ -508,8 +507,7 @@
             if (UserInfo->ScriptPath.Length > 0)
                 Size += UserInfo->ScriptPath.Length + sizeof(WCHAR);
 
-            if (UserInfo->FullName.Length > 0)
-                Size += UserInfo->FullName.Length + sizeof(WCHAR);
+            Size += UserInfo->FullName.Length + sizeof(WCHAR);
 
             if (UserInfo->UserComment.Length > 0)
                 Size += UserInfo->UserComment.Length + sizeof(WCHAR);
@@ -546,8 +544,7 @@
             if (UserInfo->ScriptPath.Length > 0)
                 Size += UserInfo->ScriptPath.Length + sizeof(WCHAR);
 
-            if (UserInfo->FullName.Length > 0)
-                Size += UserInfo->FullName.Length + sizeof(WCHAR);
+            Size += UserInfo->FullName.Length + sizeof(WCHAR);
 
             if (UserInfo->UserComment.Length > 0)
                 Size += UserInfo->UserComment.Length + sizeof(WCHAR);
@@ -583,8 +580,7 @@
             if (UserInfo->UserComment.Length > 0)
                 Size += UserInfo->UserComment.Length + sizeof(WCHAR);
 
-            if (UserInfo->FullName.Length > 0)
-                Size += UserInfo->FullName.Length + sizeof(WCHAR);
+            Size += UserInfo->FullName.Length + sizeof(WCHAR);
             break;
 
         case 11:
@@ -597,8 +593,7 @@
             if (UserInfo->UserComment.Length > 0)
                 Size += UserInfo->UserComment.Length + sizeof(WCHAR);
 
-            if (UserInfo->FullName.Length > 0)
-                Size += UserInfo->FullName.Length + sizeof(WCHAR);
+            Size += UserInfo->FullName.Length + sizeof(WCHAR);
 
             if (UserInfo->HomeDirectory.Length > 0)
                 Size += UserInfo->HomeDirectory.Length + sizeof(WCHAR);
@@ -620,8 +615,7 @@
             Size = sizeof(USER_INFO_20) +
                    UserInfo->UserName.Length + sizeof(WCHAR);
 
-            if (UserInfo->FullName.Length > 0)
-                Size += UserInfo->FullName.Length + sizeof(WCHAR);
+            Size += UserInfo->FullName.Length + sizeof(WCHAR);
 
             if (UserInfo->AdminComment.Length > 0)
                 Size += UserInfo->AdminComment.Length + sizeof(WCHAR);
@@ -631,8 +625,7 @@
             Size = sizeof(USER_INFO_23) +
                    UserInfo->UserName.Length + sizeof(WCHAR);
 
-            if (UserInfo->FullName.Length > 0)
-                Size += UserInfo->FullName.Length + sizeof(WCHAR);
+            Size += UserInfo->FullName.Length + sizeof(WCHAR);
 
             if (UserInfo->AdminComment.Length > 0)
                 Size += UserInfo->AdminComment.Length + sizeof(WCHAR);
@@ -782,17 +775,14 @@
 
             /* FIXME: usri2_auth_flags */
 
-            if (UserInfo->FullName.Length > 0)
-            {
-                UserInfo2->usri2_full_name = Ptr;
+            UserInfo2->usri2_full_name = Ptr;
 
-                memcpy(UserInfo2->usri2_full_name,
-                       UserInfo->FullName.Buffer,
-                       UserInfo->FullName.Length);
-                UserInfo2->usri2_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
+            memcpy(UserInfo2->usri2_full_name,
+                   UserInfo->FullName.Buffer,
+                   UserInfo->FullName.Length);
+            UserInfo2->usri2_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
 
-                Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
-            }
+            Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
 
             if (UserInfo->UserComment.Length > 0)
             {
@@ -931,17 +921,14 @@
 
             /* FIXME: usri3_auth_flags */
 
-            if (UserInfo->FullName.Length > 0)
-            {
-                UserInfo3->usri3_full_name = Ptr;
+            UserInfo3->usri3_full_name = Ptr;
 
-                memcpy(UserInfo3->usri3_full_name,
-                       UserInfo->FullName.Buffer,
-                       UserInfo->FullName.Length);
-                UserInfo3->usri3_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
+            memcpy(UserInfo3->usri3_full_name,
+                   UserInfo->FullName.Buffer,
+                   UserInfo->FullName.Length);
+            UserInfo3->usri3_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
 
-                Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
-            }
+            Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
 
             if (UserInfo->UserComment.Length > 0)
             {
@@ -1109,17 +1096,14 @@
 
             /* FIXME: usri4_auth_flags */
 
-            if (UserInfo->FullName.Length > 0)
-            {
-                UserInfo4->usri4_full_name = Ptr;
+            UserInfo4->usri4_full_name = Ptr;
 
-                memcpy(UserInfo4->usri4_full_name,
-                       UserInfo->FullName.Buffer,
-                       UserInfo->FullName.Length);
-                UserInfo4->usri4_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
+            memcpy(UserInfo4->usri4_full_name,
+                   UserInfo->FullName.Buffer,
+                   UserInfo->FullName.Length);
+            UserInfo4->usri4_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
 
-                Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
-            }
+            Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
 
             if (UserInfo->UserComment.Length > 0)
             {
@@ -1267,17 +1251,14 @@
                 Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserComment.Length + sizeof(WCHAR));
             }
 
-            if (UserInfo->FullName.Length > 0)
-            {
-                UserInfo10->usri10_full_name = Ptr;
+            UserInfo10->usri10_full_name = Ptr;
 
-                memcpy(UserInfo10->usri10_full_name,
-                       UserInfo->FullName.Buffer,
-                       UserInfo->FullName.Length);
-                UserInfo10->usri10_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
+            memcpy(UserInfo10->usri10_full_name,
+                   UserInfo->FullName.Buffer,
+                   UserInfo->FullName.Length);
+            UserInfo10->usri10_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
 
-                Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
-            }
+            Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
             break;
 
         case 11:
@@ -1318,17 +1299,14 @@
                 Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserComment.Length + sizeof(WCHAR));
             }
 
-            if (UserInfo->FullName.Length > 0)
-            {
-                UserInfo11->usri11_full_name = Ptr;
+            UserInfo11->usri11_full_name = Ptr;
 
-                memcpy(UserInfo11->usri11_full_name,
-                       UserInfo->FullName.Buffer,
-                       UserInfo->FullName.Length);
-                UserInfo11->usri11_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
+            memcpy(UserInfo11->usri11_full_name,
+                   UserInfo->FullName.Buffer,
+                   UserInfo->FullName.Length);
+            UserInfo11->usri11_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
 
-                Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
-            }
+            Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
 
             /* FIXME: usri11_priv */
             /* FIXME: usri11_auth_flags */
@@ -1425,17 +1403,14 @@
 
             Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserName.Length + sizeof(WCHAR));
 
-            if (UserInfo->FullName.Length > 0)
-            {
-                UserInfo20->usri20_full_name = Ptr;
+            UserInfo20->usri20_full_name = Ptr;
 
-                memcpy(UserInfo20->usri20_full_name,
-                       UserInfo->FullName.Buffer,
-                       UserInfo->FullName.Length);
-                UserInfo20->usri20_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
+            memcpy(UserInfo20->usri20_full_name,
+                   UserInfo->FullName.Buffer,
+                   UserInfo->FullName.Length);
+            UserInfo20->usri20_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
 
-                Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
-            }
+            Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
 
             if (UserInfo->AdminComment.Length > 0)
             {
@@ -1469,17 +1444,14 @@
 
             Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserName.Length + sizeof(WCHAR));
 
-            if (UserInfo->FullName.Length > 0)
-            {
-                UserInfo23->usri23_full_name = Ptr;
+            UserInfo23->usri23_full_name = Ptr;
 
-                memcpy(UserInfo23->usri23_full_name,
-                       UserInfo->FullName.Buffer,
-                       UserInfo->FullName.Length);
-                UserInfo23->usri23_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
+            memcpy(UserInfo23->usri23_full_name,
+                   UserInfo->FullName.Buffer,
+                   UserInfo->FullName.Length);
+            UserInfo23->usri23_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
 
-                Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
-            }
+            Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
 
             if (UserInfo->AdminComment.Length > 0)
             {