Rebase against 215e2d7fed58ccd7c5e55ad536fb311608b51d26.

patches/ntdll-WinSqm/0001-ntdll-Add-stubs-for-WinSqmStartSession-WinSqmEndSess.patch

@@ -1,4 +1,4 @@
-From d02606aaa6cbdbb1939cfe99b6d5f013af5c48a6 Mon Sep 17 00:00:00 2001
+From 851ba4dda4a21cbd8f18cf1748e0a8192662fe35 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Thu, 25 Dec 2014 12:36:28 -0700
 Subject: ntdll: Add stubs for WinSqmStartSession / WinSqmEndSession.
@@ -11,7 +11,7 @@ Based on a patch by Detlef Riekenberg.
  3 files changed, 76 insertions(+)
 
 diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
-index 5469116..4517aec 100644
+index b087319..0d52b67 100644
 --- a/dlls/ntdll/misc.c
 +++ b/dlls/ntdll/misc.c
 @@ -27,6 +27,8 @@
@@ -20,10 +20,10 @@ index 5469116..4517aec 100644
  
 +#include "ntstatus.h"
 +#define WIN32_NO_STATUS
- #include "windows.h"
- #include "wmistr.h"
- #include "evntrace.h"
-@@ -332,6 +334,15 @@ void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb,
+ #include "wine/library.h"
+ #include "wine/debug.h"
+ #include "ntdll_misc.h"
+@@ -331,6 +333,15 @@ void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb,
  }
  
  /*********************************************************************
@@ -39,7 +39,7 @@ index 5469116..4517aec 100644
   *                  WinSqmIsOptedIn   (NTDLL.@)
   */
  BOOL WINAPI WinSqmIsOptedIn(void)
-@@ -341,6 +352,15 @@ BOOL WINAPI WinSqmIsOptedIn(void)
+@@ -340,6 +351,15 @@ BOOL WINAPI WinSqmIsOptedIn(void)
  }
  
  /*********************************************************************
@@ -56,10 +56,10 @@ index 5469116..4517aec 100644
   */
  ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle )
 diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index d6ded19..0c23514 100644
+index 1a3b724..c353acf 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -1011,7 +1011,9 @@
+@@ -1012,7 +1012,9 @@
  @ stdcall TpWaitForWait(ptr long)
  @ stdcall TpWaitForWork(ptr long)
  @ stdcall -ret64 VerSetConditionMask(int64 long long)
@@ -70,7 +70,7 @@ index d6ded19..0c23514 100644
  @ stdcall ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck
  @ stdcall ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm
 diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
-index 94a22ac..d382691 100644
+index fc0d4b4..8cfb106 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
 @@ -62,6 +62,9 @@ static inline USHORT __my_ushort_swap(USHORT s)
@@ -83,7 +83,7 @@ index 94a22ac..d382691 100644
  static SIZE_T    (WINAPI  *pRtlCompareMemory)(LPCVOID,LPCVOID,SIZE_T);
  static SIZE_T    (WINAPI  *pRtlCompareMemoryUlong)(PULONG, SIZE_T, ULONG);
  static NTSTATUS  (WINAPI  *pRtlDeleteTimer)(HANDLE, HANDLE, HANDLE);
-@@ -115,6 +118,9 @@ static void InitFunctionPtrs(void)
+@@ -116,6 +119,9 @@ static void InitFunctionPtrs(void)
      hntdll = LoadLibraryA("ntdll.dll");
      ok(hntdll != 0, "LoadLibrary failed\n");
      if (hntdll) {
@@ -93,7 +93,7 @@ index 94a22ac..d382691 100644
  	pRtlCompareMemory = (void *)GetProcAddress(hntdll, "RtlCompareMemory");
  	pRtlCompareMemoryUlong = (void *)GetProcAddress(hntdll, "RtlCompareMemoryUlong");
          pRtlDeleteTimer = (void *)GetProcAddress(hntdll, "RtlDeleteTimer");
-@@ -161,6 +167,48 @@ static void InitFunctionPtrs(void)
+@@ -163,6 +169,48 @@ static void InitFunctionPtrs(void)
      ok(strlen(src) == 15, "Source must be 16 bytes long!\n");
  }
  
@@ -142,7 +142,7 @@ index 94a22ac..d382691 100644
  #define COMP(str1,str2,cmplen,len) size = pRtlCompareMemory(str1, str2, cmplen); \
    ok(size == len, "Expected %ld, got %ld\n", size, (SIZE_T)len)
  
-@@ -2060,6 +2108,12 @@ START_TEST(rtl)
+@@ -2096,6 +2144,12 @@ START_TEST(rtl)
  {
      InitFunctionPtrs();
  
@@ -156,5 +156,5 @@ index 94a22ac..d382691 100644
      test_RtlCompareMemoryUlong();
      test_RtlMoveMemory();
 -- 
-2.6.4
+2.7.1