Minor style improvements in multiple patches.

patches/ntdll-NtQueryEaFile/0001-ntdll-Improve-stub-of-NtQueryEaFile.patch

@@ -1,4 +1,4 @@
-From 1914529dbe74c405c9ab0a947b8b065286ebc8a2 Mon Sep 17 00:00:00 2001
+From a735fc035bb548fb1d452fc8e1772bd4c3296097 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 6 Jun 2015 07:03:33 +0800
 Subject: ntdll: Improve stub of NtQueryEaFile.
@@ -10,7 +10,7 @@ Based on a patch by Qian Hong.
  2 files changed, 98 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index d081750..8503dd8 100644
+index d081750..6b8f0e4 100644
 --- a/dlls/ntdll/file.c
 +++ b/dlls/ntdll/file.c
 @@ -3191,14 +3191,25 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
@@ -36,7 +36,7 @@ index d081750..8503dd8 100644
 +        return status;
 +
 +    if (buffer && length)
-+        memset(buffer, 0, length);
++        memset( buffer, 0, length );
 +
 +    if (needs_close) close( fd );
 +    return STATUS_NO_EAS_ON_FILE;
@@ -44,7 +44,7 @@ index d081750..8503dd8 100644
  
  
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index 2df0edc..3696124 100644
+index 86a4516..4bf5f23 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
 @@ -78,6 +78,7 @@ static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, PVOI
@@ -55,7 +55,7 @@ index 2df0edc..3696124 100644
  
  static inline BOOL is_signaled( HANDLE obj )
  {
-@@ -2785,6 +2786,86 @@ static void test_read_write(void)
+@@ -2802,6 +2803,86 @@ static void test_read_write(void)
      CloseHandle(hfile);
  }
  
@@ -126,7 +126,7 @@ index 2df0edc..3696124 100644
 +    U(io).Status = 0xdeadbeef;
 +    io.Information = 0xdeadbeef;
 +    memset(buffer, 0xcc, EA_BUFFER_SIZE);
-+    buffer_len = 4096;
++    buffer_len = EA_BUFFER_SIZE - 1;
 +    status = pNtQueryEaFile(handle, &io, buffer, buffer_len, TRUE, NULL, 0, NULL, FALSE);
 +    ok(status == STATUS_NO_EAS_ON_FILE, "expected STATUS_NO_EAS_ON_FILE, got %x\n", status);
 +    ok(U(io).Status == 0xdeadbeef, "expected 0xdeadbeef, got %x\n", U(io).Status);
@@ -142,7 +142,7 @@ index 2df0edc..3696124 100644
  START_TEST(file)
  {
      HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
-@@ -2820,6 +2901,7 @@ START_TEST(file)
+@@ -2837,6 +2918,7 @@ START_TEST(file)
      pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile");
      pNtQueryDirectoryFile   = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile");
      pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile");
@@ -150,7 +150,7 @@ index 2df0edc..3696124 100644
  
      test_read_write();
      test_NtCreateFile();
-@@ -2839,4 +2921,5 @@ START_TEST(file)
+@@ -2856,4 +2938,5 @@ START_TEST(file)
      test_file_disposition_information();
      test_query_volume_information_file();
      test_query_attribute_information_file();

patches/wineboot-MachineGuid/0001-wineboot-Create-MachineGuid-registry-value.patch

@@ -1,12 +1,12 @@
-From bfd906bdc1ca3af99ed62166a8ed2dbc4335e56d Mon Sep 17 00:00:00 2001
+From 0c883377270217830a782ba89958c39b25f81da0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 3 May 2015 18:47:30 +0200
 Subject: wineboot: Create MachineGuid registry value.
 
 ---
  programs/wineboot/Makefile.in |  2 +-
- programs/wineboot/wineboot.c  | 35 +++++++++++++++++++++++++++++++++++
- 2 files changed, 36 insertions(+), 1 deletion(-)
+ programs/wineboot/wineboot.c  | 33 +++++++++++++++++++++++++++++++++
+ 2 files changed, 34 insertions(+), 1 deletion(-)
 
 diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in
 index f6da0f9..525abde 100644
@@ -22,10 +22,10 @@ index f6da0f9..525abde 100644
  C_SRCS = \
  	shutdown.c \
 diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
-index a20b4e1..3b6abe4 100644
+index 4d70ea9..24bc872 100644
 --- a/programs/wineboot/wineboot.c
 +++ b/programs/wineboot/wineboot.c
-@@ -354,6 +354,40 @@ static void create_environment_registry_keys( void )
+@@ -361,6 +361,38 @@ static void create_environment_registry_keys( void )
      RegCloseKey( env_key );
  }
  
@@ -52,11 +52,9 @@ index a20b4e1..3b6abe4 100644
 +    if (RegQueryValueExW( crypt_key, MachineGuidW, NULL, NULL, NULL, NULL ))
 +    {
 +        UuidCreate( &uuid );
-+        wsprintfW(buffer, formatW, uuid.Data1, uuid.Data2,
-+            uuid.Data3, uuid.Data4[0], uuid.Data4[1],
-+            uuid.Data4[2], uuid.Data4[3], uuid.Data4[4],
-+            uuid.Data4[5], uuid.Data4[6], uuid.Data4[7]);
-+
++        wsprintfW( buffer, formatW, uuid.Data1, uuid.Data2, uuid.Data3,
++                   uuid.Data4[0], uuid.Data4[1], uuid.Data4[2], uuid.Data4[3],
++                   uuid.Data4[4], uuid.Data4[5], uuid.Data4[6], uuid.Data4[7] );
 +        RegSetValueExW( crypt_key, MachineGuidW, 0, REG_SZ, (BYTE *)buffer, sizeof(buffer) );
 +    }
 +
@@ -66,7 +64,7 @@ index a20b4e1..3b6abe4 100644
  static void create_volatile_environment_registry_key(void)
  {
      static const WCHAR VolatileEnvW[] = {'V','o','l','a','t','i','l','e',' ','E','n','v','i','r','o','n','m','e','n','t',0};
-@@ -1229,6 +1263,7 @@ int main( int argc, char *argv[] )
+@@ -1236,6 +1268,7 @@ int main( int argc, char *argv[] )
      create_hardware_registry_keys();
      create_dynamic_registry_keys();
      create_environment_registry_keys();
@@ -75,5 +73,5 @@ index a20b4e1..3b6abe4 100644
      pendingRename();
  
 -- 
-2.3.5
+2.4.2