1 files changed, 42 insertions, 38 deletions
diff --git a/lib/chef/win32/api/net.rb b/lib/chef/win32/api/net.rb
index a7e20d0aeb..90154e7661 100644
--- a/lib/chef/win32/api/net.rb
+++ b/lib/chef/win32/api/net.rb
@@ -59,37 +59,7 @@ class Chef
 
         ffi_lib "netapi32"
 
-        class USER_INFO_3 < FFI::Struct
-          layout :usri3_name, :LPWSTR,
-            :usri3_password, :LPWSTR,
-            :usri3_password_age, :DWORD,
-            :usri3_priv, :DWORD,
-            :usri3_home_dir, :LPWSTR,
-            :usri3_comment, :LPWSTR,
-            :usri3_flags, :DWORD,
-            :usri3_script_path, :LPWSTR,
-            :usri3_auth_flags, :DWORD,
-            :usri3_full_name, :LPWSTR,
-            :usri3_usr_comment, :LPWSTR,
-            :usri3_parms, :LPWSTR,
-            :usri3_workstations, :LPWSTR,
-            :usri3_last_logon, :DWORD,
-            :usri3_last_logoff, :DWORD,
-            :usri3_acct_expires, :DWORD,
-            :usri3_max_storage, :DWORD,
-            :usri3_units_per_week, :DWORD,
-            :usri3_logon_hours, :PBYTE,
-            :usri3_bad_pw_count, :DWORD,
-            :usri3_num_logons, :DWORD,
-            :usri3_logon_server, :LPWSTR,
-            :usri3_country_code, :DWORD,
-            :usri3_code_page, :DWORD,
-            :usri3_user_id, :DWORD,
-            :usri3_primary_group_id, :DWORD,
-            :usri3_profile, :LPWSTR,
-            :usri3_home_dir_drive, :LPWSTR,
-            :usri3_password_expired, :DWORD
-
+        module StructHelpers
           def set(key, val)
             val = if val.is_a? String
               encoded = if val.encoding == Encoding::UTF_16LE
@@ -121,6 +91,47 @@ class Chef
             end
           end
 
+          def as_ruby
+            members.inject({}) do |memo, key|
+              memo[key] = get(key)
+              memo
+            end
+          end
+        end
+
+
+        class USER_INFO_3 < FFI::Struct
+          include StructHelpers
+          layout :usri3_name, :LPWSTR,
+            :usri3_password, :LPWSTR,
+            :usri3_password_age, :DWORD,
+            :usri3_priv, :DWORD,
+            :usri3_home_dir, :LPWSTR,
+            :usri3_comment, :LPWSTR,
+            :usri3_flags, :DWORD,
+            :usri3_script_path, :LPWSTR,
+            :usri3_auth_flags, :DWORD,
+            :usri3_full_name, :LPWSTR,
+            :usri3_usr_comment, :LPWSTR,
+            :usri3_parms, :LPWSTR,
+            :usri3_workstations, :LPWSTR,
+            :usri3_last_logon, :DWORD,
+            :usri3_last_logoff, :DWORD,
+            :usri3_acct_expires, :DWORD,
+            :usri3_max_storage, :DWORD,
+            :usri3_units_per_week, :DWORD,
+            :usri3_logon_hours, :PBYTE,
+            :usri3_bad_pw_count, :DWORD,
+            :usri3_num_logons, :DWORD,
+            :usri3_logon_server, :LPWSTR,
+            :usri3_country_code, :DWORD,
+            :usri3_code_page, :DWORD,
+            :usri3_user_id, :DWORD,
+            :usri3_primary_group_id, :DWORD,
+            :usri3_profile, :LPWSTR,
+            :usri3_home_dir_drive, :LPWSTR,
+            :usri3_password_expired, :DWORD
+
           def usri3_logon_hours
             val = self[:usri3_logon_hours]
             if !val.nil? && !val.null?
@@ -129,13 +140,6 @@ class Chef
               nil
             end
           end
-
-          def as_ruby
-            members.inject({}) do |memo, key|
-              memo[key] = get(key)
-              memo
-            end
-          end
         end
 
         class LOCALGROUP_MEMBERS_INFO_0 < FFI::Struct