Wine Staging a11594e, wine-tkg-git 30d8e19.

ps0110-p0002-server-Added-get_console_process_list-to-the-protocol.mypatch

@@ -67,8 +67,8 @@ index a0acbf9deb7..de9fdcf0347 100644
 
  /* ### protocol_version begin ### */
 
--#define SERVER_PROTOCOL_VERSION 678
-+#define SERVER_PROTOCOL_VERSION 679
+-#define SERVER_PROTOCOL_VERSION 685
++#define SERVER_PROTOCOL_VERSION 686
 
  /* ### protocol_version end ### */
 

ps0110-p0004-kernel32-Added-real-GetConsoleProcessList-implementation.mypatch

@@ -10,13 +10,21 @@ Signed-off-by: Roman Pišl <rpisl@seznam.cz>
 ---
  dlls/kernel32/console.c       | 16 ++++++++++++++--
  dlls/kernel32/tests/console.c |  5 -----
- 2 files changed, 14 insertions(+), 7 deletions(-)
+ 2 files changed, 15 insertions(+), 7 deletions(-)
 
 diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
 index 4b74c1183ca..f393e84b1a8 100644
 --- a/dlls/kernel32/console.c
 +++ b/dlls/kernel32/console.c
-@@ -266,7 +266,8 @@ DWORD WINAPI GetConsoleAliasW(LPWSTR lpSource, LPWSTR lpTargetBuffer,
+@@ -38,6 +38,7 @@
+ #include "winerror.h"
+ #include "wincon.h"
+ #include "wine/condrv.h"
++#include "wine/server.h"
+ #include "wine/exception.h"
+ #include "wine/debug.h"
+ #include "excpt.h"
+@@ -266,7 +267,8 @@ DWORD WINAPI GetConsoleAliasW(LPWSTR lpSource, LPWSTR lpTargetBuffer,
   */
  DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount)
  {
@@ -26,7 +34,7 @@ index 4b74c1183ca..f393e84b1a8 100644
 
      if (!processlist || processcount < 1)
      {
-@@ -274,7 +275,18 @@ DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount)
+@@ -274,7 +276,18 @@ DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount)
          return 0;
      }
 

ps0127-wuaueng-Add-stub-DllRegisterServer-and-DllUnregisterServer-functi.mypatch

@@ -15,18 +15,56 @@ Subject: [PATCH] wuaueng: Add stub DllRegisterServer and DllUnregisterServer
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49459
 Signed-off-by: Vijay Kiran Kamuju <infyquest@gmail.com>
 ---
+ dlls/xpssvcs/Makefile.in  |  5 ++++-
  dlls/wuaueng/main.c       | 12 ++++++++++++
  dlls/wuaueng/wuaueng.spec |  4 ++--
- 2 files changed, 14 insertions(+), 2 deletions(-)
+ 3 files changed, 43 insertions(+), 3 deletions(-)
 
-diff --git a/dlls/wuaueng/main.c b/dlls/wuaueng/main.c
-index d49d3b05d02..a09ea775372 100644
---- a/dlls/wuaueng/main.c
+diff --git a/dlls/xpssvcs/Makefile.in b/dlls/xpssvcs/Makefile.in
+index bb41d26d557..364a9d210a9 100644
+--- a/dlls/wuaueng/Makefile.in
++++ b/dlls/wuaueng/Makefile.in
+@@ -1,5 +1,8 @@
+ MODULE = wuaueng.dll
+
+-EXTRADLLFLAGS = -Wb,--prefer-native
++EXTRADLLFLAGS = -Wb,--prefer-native -mno-cygwin
++
++C_SRCS = \
++	main.c
+
+ RC_SRCS = version.rc
+diff --git /dev/null b/dlls/wuaueng/main.c
+new file mode 100644
+index 00000000000..a09ea775372 100644
+--- /dev/null
 +++ b/dlls/wuaueng/main.c
-@@ -42,3 +42,15 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
-     }
-     return TRUE;
- }
+@@ -42,0 +42,37 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
++/*
++ * Copyright 2009 Louis Lenders
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
++ */
++
++#include <stdarg.h>
++
++#include "windef.h"
++#include "winbase.h"
++#include "wine/debug.h"
++
++WINE_DEFAULT_DEBUG_CHANNEL(wuaueng);
 +
 +HRESULT WINAPI DllRegisterServer(void)
 +{

ps0139-p0003-ntoskrnl.exe-Implement-KeInsertQueueApc.mypatch

@@ -331,13 +331,13 @@ index ab46d0edec4..b4fcaf96e2d 100644
      free( thread->req_data );
      free( thread->reply_data );
 @@ -611,6 +615,7 @@ static int thread_apc_signaled( struct object *obj, struct wait_queue_entry *ent
- static void thread_apc_destroy( struct object *obj )
  {
      struct thread_apc *apc = (struct thread_apc *)obj;
+
 +    if (apc->callee) release_object( apc->callee);
      if (apc->caller) release_object( apc->caller );
-     if (apc->owner) release_object( apc->owner );
- }
+     if (apc->owner)
+     {
 @@ -624,6 +629,7 @@ static struct thread_apc *create_apc( struct object *owner, const apc_call_t *ca
      {
          apc->call        = *call_data;
@@ -453,7 +453,7 @@ index ab46d0edec4..b4fcaf96e2d 100644
 -    if (thread)
 +    if (!thread && !process)
      {
--        if (!queue_apc( NULL, thread, apc )) set_error( STATUS_THREAD_IS_TERMINATING );
+-        if (!queue_apc( NULL, thread, apc )) set_error( STATUS_UNSUCCESSFUL );
 -        release_object( thread );
 +        release_object(apc);
 +        return;
@@ -490,7 +490,7 @@ index ab46d0edec4..b4fcaf96e2d 100644
 +        else
 +        {
 +            close_handle( current->process, apc_handle );
-+            set_error( thread ? STATUS_THREAD_IS_TERMINATING : STATUS_PROCESS_IS_TERMINATING );
++            set_error( STATUS_UNSUCCESSFUL );
          }
 -        release_object( process );
 +        release_object( thread ? (void*) thread : (void*) process );