Skip to content

Commit aa7af46

Browse files
braginbragin
committed
[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. svn path=/branches/arwinss/; revision=69525
1 parent b94a7e2 commit aa7af46

17 files changed

+92
-17
lines changed

‎arwinss/client/user32/caret.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "winbase.h"
3131
#include "wingdi.h"
3232
#include "winuser.h"
33-
#include "winternl.h"
33+
#include "wine/winternl.h"
3434
#include "wine/server.h"
3535
#include "wine/debug.h"
3636

‎arwinss/client/user32/combo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#include "user_private.h"
4646
#include "win.h"
4747
#include "controls.h"
48-
#include "winternl.h"
48+
#include "wine/winternl.h"
4949
#include "wine/debug.h"
5050

5151
WINE_DEFAULT_DEBUG_CHANNEL(combo);

‎arwinss/client/user32/csr.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
/* CSRSS Headers */
3030
#include <subsys/csr/csr.h>
31+
#include <csr_shared.h>
3132
#include <subsys/win/winmsg.h>
3233

3334
#include "wine/debug.h"
@@ -44,9 +45,10 @@ BOOL WINAPI ExitWindowsEx( UINT uFlags, DWORD dwReserved )
4445
{
4546
NTSTATUS Status;
4647
USER_API_MESSAGE ApiMessage;
48+
PUSER_EXIT_REACTOS ExitReactOSRequest = &ApiMessage.Data.ExitReactOSRequest;
4749

48-
ApiMessage.Data.ExitReactosRequest.Flags = uFlags;
49-
ApiMessage.Data.ExitReactosRequest.Reserved = dwReserved;
50+
ExitReactOSRequest->Flags = uFlags;
51+
//ExitReactOSRequest->Reserved = dwReserved;
5052

5153
Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
5254
NULL,
@@ -55,6 +57,7 @@ BOOL WINAPI ExitWindowsEx( UINT uFlags, DWORD dwReserved )
5557
if (!NT_SUCCESS(Status))
5658
{
5759
SetLastError(RtlNtStatusToDosError(Status));
60+
ExitReactOSRequest->Success = FALSE;
5861
return FALSE;
5962
}
6063

‎arwinss/client/user32/hook.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
#include "wine/server.h"
7979
#include "wine/unicode.h"
8080
#include "wine/debug.h"
81-
#include "winternl.h"
81+
#include "wine/winternl.h"
8282

8383
WINE_DEFAULT_DEBUG_CHANNEL(hook);
8484
WINE_DECLARE_DEBUG_CHANNEL(relay);

‎arwinss/client/user32/input.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include "wingdi.h"
4040
#include "winuser.h"
4141
#include "winnls.h"
42-
#include "winternl.h"
42+
#include "wine/winternl.h"
4343
#include "winerror.h"
4444
#include "win.h"
4545
#include "user_private.h"

‎arwinss/client/user32/menu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
#include "winbase.h"
5252
#include "wingdi.h"
5353
#include "winnls.h"
54-
#include "winternl.h"
54+
#include "wine/winternl.h"
5555
#include "wine/server.h"
5656
#include "wine/unicode.h"
5757
#include "wine/exception.h"

‎arwinss/client/user32/message.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "imm.h"
3939
#include "ddk/imm.h"
4040
#include "wine/unicode.h"
41-
#include "winternl.h"
41+
#include "wine/winternl.h"
4242
#include "wine/server.h"
4343
#include "user_private.h"
4444
#include "win.h"

‎arwinss/client/user32/misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "wingdi.h"
2929
#include "winuser.h"
3030
#include "winnls.h"
31-
#include "winternl.h"
31+
#include "wine/winternl.h"
3232
#include "user_private.h"
3333

3434
#include "wine/unicode.h"

‎arwinss/client/user32/msgbox.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "windef.h"
2626
#include "winbase.h"
2727
#include "wingdi.h"
28-
#include "winternl.h"
28+
#include "wine/winternl.h"
2929
#include "dlgs.h"
3030
#include "user_private.h"
3131
#include "wine/debug.h"

‎arwinss/client/user32/painting.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "winbase.h"
3333
#include "wingdi.h"
3434
#include "winuser.h"
35-
#include "winternl.h"
35+
#include "wine/winternl.h"
3636
#include "wine/server.h"
3737
#include "win.h"
3838
#include "user_private.h"

‎arwinss/client/user32/property.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "winbase.h"
2929
#include "winuser.h"
3030
#include "wine/unicode.h"
31-
#include "winternl.h"
31+
#include "wine/winternl.h"
3232
#include "user_private.h"
3333
#include "wine/server.h"
3434

‎arwinss/client/user32/resource.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "windef.h"
2525
#include "winbase.h"
2626
#include "winerror.h"
27-
#include "winternl.h"
27+
#include "wine/winternl.h"
2828
#include "winnls.h"
2929
#include "wine/debug.h"
3030
#include "user_private.h"

‎arwinss/client/user32/user_private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "winuser.h"
2929
#include "winreg.h"
3030
#include <windowsx.h>
31-
#include "winternl.h"
31+
#include "wine/winternl.h"
3232

3333
#define GET_WORD(ptr) (*(const WORD *)(ptr))
3434
#define GET_DWORD(ptr) (*(const DWORD *)(ptr))

‎arwinss/client/user32/win.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "windef.h"
2929
#include "winbase.h"
3030
#include "winver.h"
31-
#include "winternl.h"
31+
#include "wine/winternl.h"
3232
#include "wine/server.h"
3333
#include "wine/unicode.h"
3434
#include "win.h"

‎arwinss/client/user32/winpos.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "winbase.h"
3131
#include "wingdi.h"
3232
#include "winerror.h"
33-
#include "winternl.h"
33+
#include "wine/winternl.h"
3434
#include "wine/server.h"
3535
#include "controls.h"
3636
#include "user_private.h"

‎arwinss/client/user32/winstation.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "winerror.h"
2929
#include "wingdi.h"
3030
#include "winuser.h"
31-
#include "winternl.h"
31+
#include "wine/winternl.h"
3232
#include "wine/server.h"
3333
#include "wine/unicode.h"
3434
#include "wine/debug.h"

‎arwinss/include/csr_shared.h

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
#pragma once
2+
3+
/* FNID's for NtUserSetWindowFNID, NtUserMessageCall */
4+
#define FNID_FIRST 0x029A
5+
#define FNID_SCROLLBAR 0x029A
6+
#define FNID_ICONTITLE 0x029B
7+
#define FNID_MENU 0x029C
8+
#define FNID_DESKTOP 0x029D
9+
#define FNID_DEFWINDOWPROC 0x029E
10+
#define FNID_MESSAGEWND 0x029F
11+
#define FNID_SWITCH 0x02A0
12+
#define FNID_BUTTON 0x02A1
13+
#define FNID_COMBOBOX 0x02A2
14+
#define FNID_COMBOLBOX 0x02A3
15+
#define FNID_DIALOG 0x02A4
16+
#define FNID_EDIT 0x02A5
17+
#define FNID_LISTBOX 0x02A6
18+
#define FNID_MDICLIENT 0x02A7
19+
#define FNID_STATIC 0x02A8
20+
#define FNID_IME 0x02A9
21+
#define FNID_GHOST 0x02AA
22+
#define FNID_CALLWNDPROC 0x02AB
23+
#define FNID_CALLWNDPROCRET 0x02AC
24+
#define FNID_HKINLPCWPEXSTRUCT 0x02AD
25+
#define FNID_HKINLPCWPRETEXSTRUCT 0x02AE
26+
#define FNID_MB_DLGPROC 0x02AF
27+
#define FNID_MDIACTIVATEDLGPROC 0x02B0
28+
#define FNID_SENDMESSAGE 0x02B1
29+
#define FNID_SENDMESSAGEFF 0x02B2
30+
/* Kernel has option to use TimeOut or normal msg send, based on type of msg. */
31+
#define FNID_SENDMESSAGEWTOOPTION 0x02B3
32+
#define FNID_SENDMESSAGECALLPROC 0x02B4
33+
#define FNID_BROADCASTSYSTEMMESSAGE 0x02B5
34+
#define FNID_TOOLTIPS 0x02B6
35+
#define FNID_SENDNOTIFYMESSAGE 0x02B7
36+
#define FNID_SENDMESSAGECALLBACK 0x02B8
37+
#define FNID_LAST 0x02B9
38+
39+
typedef struct _WNDMSG
40+
{
41+
DWORD maxMsgs;
42+
PINT abMsgs;
43+
} WNDMSG, *PWNDMSG;
44+
45+
typedef PVOID PSERVERINFO;
46+
47+
typedef struct _SHAREDINFO
48+
{
49+
PSERVERINFO psi; /* global Server Info */
50+
PVOID aheList; /* Handle Entry List */
51+
PVOID pDispInfo; /* global PDISPLAYINFO pointer */
52+
ULONG_PTR ulSharedDelta; /* Heap delta */
53+
WNDMSG awmControl[FNID_LAST - FNID_FIRST];
54+
WNDMSG DefWindowMsgs;
55+
WNDMSG DefWindowSpecMsgs;
56+
} SHAREDINFO, *PSHAREDINFO;
57+
58+
/* See also the USERSRV_API_CONNECTINFO #define in include/reactos/subsys/win/winmsg.h */
59+
typedef struct _USERCONNECT
60+
{
61+
ULONG ulVersion;
62+
ULONG ulCurrentVersion;
63+
DWORD dwDispatchCount;
64+
SHAREDINFO siClient;
65+
} USERCONNECT, *PUSERCONNECT;
66+
67+
/* WinNT 5.0 compatible user32 / win32k */
68+
#define USER_VERSION MAKELONG(0x0000, 0x0005)
69+
70+
#if defined(_M_IX86)
71+
C_ASSERT(sizeof(USERCONNECT) == 0x124);
72+
#endif

0 commit comments

Comments
 (0)