14 Oct
2015
14 Oct
'15
11:56 a.m.
Author: fireball
Date: Wed Oct 14 11:56:49 2015
New Revision: 69525
URL: http://svn.reactos.org/svn/reactos?rev=69525&view=rev
Log:
[ARWINSS]
- Use Wine's winternl.h instead of PSDK's one (same to what was done to gdi32)
- Introduce a csr_shared.h which defines structs used for CSR communication.
- Slightly fix user32/csr.c ExitWindowsEx code.
Added:
branches/arwinss/arwinss/include/csr_shared.h (with props)
Modified:
branches/arwinss/arwinss/client/user32/caret.c
branches/arwinss/arwinss/client/user32/combo.c
branches/arwinss/arwinss/client/user32/csr.c
branches/arwinss/arwinss/client/user32/hook.c
branches/arwinss/arwinss/client/user32/input.c
branches/arwinss/arwinss/client/user32/menu.c
branches/arwinss/arwinss/client/user32/message.c
branches/arwinss/arwinss/client/user32/misc.c
branches/arwinss/arwinss/client/user32/msgbox.c
branches/arwinss/arwinss/client/user32/painting.c
branches/arwinss/arwinss/client/user32/property.c
branches/arwinss/arwinss/client/user32/resource.c
branches/arwinss/arwinss/client/user32/user_private.h
branches/arwinss/arwinss/client/user32/win.c
branches/arwinss/arwinss/client/user32/winpos.c
branches/arwinss/arwinss/client/user32/winstation.c
Modified: branches/arwinss/arwinss/client/user32/caret.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/c…
==============================================================================
--- branches/arwinss/arwinss/client/user32/caret.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/caret.c [iso-8859-1] Wed Oct 14 11:56:49 2015
@@ -30,7 +30,7 @@
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
-#include "winternl.h"
+#include "wine/winternl.h"
#include "wine/server.h"
#include "wine/debug.h"
Modified: branches/arwinss/arwinss/client/user32/combo.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/c…
==============================================================================
--- branches/arwinss/arwinss/client/user32/combo.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/combo.c [iso-8859-1] Wed Oct 14 11:56:49 2015
@@ -45,7 +45,7 @@
#include "user_private.h"
#include "win.h"
#include "controls.h"
-#include "winternl.h"
+#include "wine/winternl.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(combo);
Modified: branches/arwinss/arwinss/client/user32/csr.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/c…
==============================================================================
--- branches/arwinss/arwinss/client/user32/csr.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/csr.c [iso-8859-1] Wed Oct 14 11:56:49 2015
@@ -28,6 +28,7 @@
/* CSRSS Headers */
#include <subsys/csr/csr.h>
+#include <csr_shared.h>
#include <subsys/win/winmsg.h>
#include "wine/debug.h"
@@ -44,9 +45,10 @@
{
NTSTATUS Status;
USER_API_MESSAGE ApiMessage;
+ PUSER_EXIT_REACTOS ExitReactOSRequest = &ApiMessage.Data.ExitReactOSRequest;
- ApiMessage.Data.ExitReactosRequest.Flags = uFlags;
- ApiMessage.Data.ExitReactosRequest.Reserved = dwReserved;
+ ExitReactOSRequest->Flags = uFlags;
+ //ExitReactOSRequest->Reserved = dwReserved;
Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
NULL,
@@ -55,6 +57,7 @@
if (!NT_SUCCESS(Status))
{
SetLastError(RtlNtStatusToDosError(Status));
+ ExitReactOSRequest->Success = FALSE;
return FALSE;
}
Modified: branches/arwinss/arwinss/client/user32/hook.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/h…
==============================================================================
--- branches/arwinss/arwinss/client/user32/hook.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/hook.c [iso-8859-1] Wed Oct 14 11:56:49 2015
@@ -78,7 +78,7 @@
#include "wine/server.h"
#include "wine/unicode.h"
#include "wine/debug.h"
-#include "winternl.h"
+#include "wine/winternl.h"
WINE_DEFAULT_DEBUG_CHANNEL(hook);
WINE_DECLARE_DEBUG_CHANNEL(relay);
Modified: branches/arwinss/arwinss/client/user32/input.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/i…
==============================================================================
--- branches/arwinss/arwinss/client/user32/input.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/input.c [iso-8859-1] Wed Oct 14 11:56:49 2015
@@ -39,7 +39,7 @@
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
-#include "winternl.h"
+#include "wine/winternl.h"
#include "winerror.h"
#include "win.h"
#include "user_private.h"
Modified: branches/arwinss/arwinss/client/user32/menu.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/m…
==============================================================================
--- branches/arwinss/arwinss/client/user32/menu.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/menu.c [iso-8859-1] Wed Oct 14 11:56:49 2015
@@ -51,7 +51,7 @@
#include "winbase.h"
#include "wingdi.h"
#include "winnls.h"
-#include "winternl.h"
+#include "wine/winternl.h"
#include "wine/server.h"
#include "wine/unicode.h"
#include "wine/exception.h"
Modified: branches/arwinss/arwinss/client/user32/message.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/m…
==============================================================================
--- branches/arwinss/arwinss/client/user32/message.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/message.c [iso-8859-1] Wed Oct 14 11:56:49
2015
@@ -38,7 +38,7 @@
#include "imm.h"
#include "ddk/imm.h"
#include "wine/unicode.h"
-#include "winternl.h"
+#include "wine/winternl.h"
#include "wine/server.h"
#include "user_private.h"
#include "win.h"
Modified: branches/arwinss/arwinss/client/user32/misc.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/m…
==============================================================================
--- branches/arwinss/arwinss/client/user32/misc.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/misc.c [iso-8859-1] Wed Oct 14 11:56:49 2015
@@ -28,7 +28,7 @@
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
-#include "winternl.h"
+#include "wine/winternl.h"
#include "user_private.h"
#include "wine/unicode.h"
Modified: branches/arwinss/arwinss/client/user32/msgbox.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/m…
==============================================================================
--- branches/arwinss/arwinss/client/user32/msgbox.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/msgbox.c [iso-8859-1] Wed Oct 14 11:56:49 2015
@@ -25,7 +25,7 @@
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
-#include "winternl.h"
+#include "wine/winternl.h"
#include "dlgs.h"
#include "user_private.h"
#include "wine/debug.h"
Modified: branches/arwinss/arwinss/client/user32/painting.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/p…
==============================================================================
--- branches/arwinss/arwinss/client/user32/painting.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/painting.c [iso-8859-1] Wed Oct 14 11:56:49
2015
@@ -32,7 +32,7 @@
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
-#include "winternl.h"
+#include "wine/winternl.h"
#include "wine/server.h"
#include "win.h"
#include "user_private.h"
Modified: branches/arwinss/arwinss/client/user32/property.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/p…
==============================================================================
--- branches/arwinss/arwinss/client/user32/property.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/property.c [iso-8859-1] Wed Oct 14 11:56:49
2015
@@ -28,7 +28,7 @@
#include "winbase.h"
#include "winuser.h"
#include "wine/unicode.h"
-#include "winternl.h"
+#include "wine/winternl.h"
#include "user_private.h"
#include "wine/server.h"
Modified: branches/arwinss/arwinss/client/user32/resource.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/r…
==============================================================================
--- branches/arwinss/arwinss/client/user32/resource.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/resource.c [iso-8859-1] Wed Oct 14 11:56:49
2015
@@ -24,7 +24,7 @@
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-#include "winternl.h"
+#include "wine/winternl.h"
#include "winnls.h"
#include "wine/debug.h"
#include "user_private.h"
Modified: branches/arwinss/arwinss/client/user32/user_private.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/u…
==============================================================================
--- branches/arwinss/arwinss/client/user32/user_private.h [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/user_private.h [iso-8859-1] Wed Oct 14 11:56:49
2015
@@ -28,7 +28,7 @@
#include "winuser.h"
#include "winreg.h"
#include <windowsx.h>
-#include "winternl.h"
+#include "wine/winternl.h"
#define GET_WORD(ptr) (*(const WORD *)(ptr))
#define GET_DWORD(ptr) (*(const DWORD *)(ptr))
Modified: branches/arwinss/arwinss/client/user32/win.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/w…
==============================================================================
--- branches/arwinss/arwinss/client/user32/win.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/win.c [iso-8859-1] Wed Oct 14 11:56:49 2015
@@ -28,7 +28,7 @@
#include "windef.h"
#include "winbase.h"
#include "winver.h"
-#include "winternl.h"
+#include "wine/winternl.h"
#include "wine/server.h"
#include "wine/unicode.h"
#include "win.h"
Modified: branches/arwinss/arwinss/client/user32/winpos.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/w…
==============================================================================
--- branches/arwinss/arwinss/client/user32/winpos.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/winpos.c [iso-8859-1] Wed Oct 14 11:56:49 2015
@@ -30,7 +30,7 @@
#include "winbase.h"
#include "wingdi.h"
#include "winerror.h"
-#include "winternl.h"
+#include "wine/winternl.h"
#include "wine/server.h"
#include "controls.h"
#include "user_private.h"
Modified: branches/arwinss/arwinss/client/user32/winstation.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/w…
==============================================================================
--- branches/arwinss/arwinss/client/user32/winstation.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/winstation.c [iso-8859-1] Wed Oct 14 11:56:49
2015
@@ -28,7 +28,7 @@
#include "winerror.h"
#include "wingdi.h"
#include "winuser.h"
-#include "winternl.h"
+#include "wine/winternl.h"
#include "wine/server.h"
#include "wine/unicode.h"
#include "wine/debug.h"
Added: branches/arwinss/arwinss/include/csr_shared.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/include/csr_sha…
==============================================================================
--- branches/arwinss/arwinss/include/csr_shared.h (added)
+++ branches/arwinss/arwinss/include/csr_shared.h [iso-8859-1] Wed Oct 14 11:56:49 2015
@@ -0,0 +1,72 @@
+#pragma once
+
+/* FNID's for NtUserSetWindowFNID, NtUserMessageCall */
+#define FNID_FIRST 0x029A
+#define FNID_SCROLLBAR 0x029A
+#define FNID_ICONTITLE 0x029B
+#define FNID_MENU 0x029C
+#define FNID_DESKTOP 0x029D
+#define FNID_DEFWINDOWPROC 0x029E
+#define FNID_MESSAGEWND 0x029F
+#define FNID_SWITCH 0x02A0
+#define FNID_BUTTON 0x02A1
+#define FNID_COMBOBOX 0x02A2
+#define FNID_COMBOLBOX 0x02A3
+#define FNID_DIALOG 0x02A4
+#define FNID_EDIT 0x02A5
+#define FNID_LISTBOX 0x02A6
+#define FNID_MDICLIENT 0x02A7
+#define FNID_STATIC 0x02A8
+#define FNID_IME 0x02A9
+#define FNID_GHOST 0x02AA
+#define FNID_CALLWNDPROC 0x02AB
+#define FNID_CALLWNDPROCRET 0x02AC
+#define FNID_HKINLPCWPEXSTRUCT 0x02AD
+#define FNID_HKINLPCWPRETEXSTRUCT 0x02AE
+#define FNID_MB_DLGPROC 0x02AF
+#define FNID_MDIACTIVATEDLGPROC 0x02B0
+#define FNID_SENDMESSAGE 0x02B1
+#define FNID_SENDMESSAGEFF 0x02B2
+/* Kernel has option to use TimeOut or normal msg send, based on type of msg. */
+#define FNID_SENDMESSAGEWTOOPTION 0x02B3
+#define FNID_SENDMESSAGECALLPROC 0x02B4
+#define FNID_BROADCASTSYSTEMMESSAGE 0x02B5
+#define FNID_TOOLTIPS 0x02B6
+#define FNID_SENDNOTIFYMESSAGE 0x02B7
+#define FNID_SENDMESSAGECALLBACK 0x02B8
+#define FNID_LAST 0x02B9
+
+typedef struct _WNDMSG
+{
+ DWORD maxMsgs;
+ PINT abMsgs;
+} WNDMSG, *PWNDMSG;
+
+typedef PVOID PSERVERINFO;
+
+typedef struct _SHAREDINFO
+{
+ PSERVERINFO psi; /* global Server Info */
+ PVOID aheList; /* Handle Entry List */
+ PVOID pDispInfo; /* global PDISPLAYINFO pointer */
+ ULONG_PTR ulSharedDelta; /* Heap delta */
+ WNDMSG awmControl[FNID_LAST - FNID_FIRST];
+ WNDMSG DefWindowMsgs;
+ WNDMSG DefWindowSpecMsgs;
+} SHAREDINFO, *PSHAREDINFO;
+
+/* See also the USERSRV_API_CONNECTINFO #define in include/reactos/subsys/win/winmsg.h
*/
+typedef struct _USERCONNECT
+{
+ ULONG ulVersion;
+ ULONG ulCurrentVersion;
+ DWORD dwDispatchCount;
+ SHAREDINFO siClient;
+} USERCONNECT, *PUSERCONNECT;
+
+/* WinNT 5.0 compatible user32 / win32k */
+#define USER_VERSION MAKELONG(0x0000, 0x0005)
+
+#if defined(_M_IX86)
+C_ASSERT(sizeof(USERCONNECT) == 0x124);
+#endif
Propchange: branches/arwinss/arwinss/include/csr_shared.h
------------------------------------------------------------------------------
svn:eol-style = native