Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
ae984f63
Commit
ae984f63
authored
Nov 28, 2022
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 29, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win32u: Move NtUserValidateRect implementation from user32.
parent
8bdfe2be
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
30 additions
and
23 deletions
+30
-23
icontitle.c
dlls/user32/icontitle.c
+1
-1
painting.c
dlls/user32/painting.c
+0
-20
user32.spec
dlls/user32/user32.spec
+1
-1
dce.c
dlls/win32u/dce.c
+16
-0
syscall.c
dlls/win32u/syscall.c
+1
-0
win32u.spec
dlls/win32u/win32u.spec
+1
-1
syscall.h
dlls/wow64win/syscall.h
+1
-0
user.c
dlls/wow64win/user.c
+8
-0
ntuser.h
include/ntuser.h
+1
-0
No files found.
dlls/user32/icontitle.c
View file @
ae984f63
...
...
@@ -176,7 +176,7 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg,
else
lParam
=
(
owner
==
GetActiveWindow
());
if
(
ICONTITLE_Paint
(
hWnd
,
owner
,
(
HDC
)
wParam
,
(
BOOL
)
lParam
)
)
ValidateRect
(
hWnd
,
NULL
);
NtUser
ValidateRect
(
hWnd
,
NULL
);
return
1
;
}
return
DefWindowProcW
(
hWnd
,
msg
,
wParam
,
lParam
);
...
...
dlls/user32/painting.c
View file @
ae984f63
...
...
@@ -52,26 +52,6 @@ BOOL WINAPI ValidateRgn( HWND hwnd, HRGN hrgn )
}
/***********************************************************************
* ValidateRect (USER32.@)
*
* MSDN: if hwnd parameter is NULL, ValidateRect invalidates and redraws
* all windows and sends WM_ERASEBKGND and WM_NCPAINT.
*/
BOOL
WINAPI
ValidateRect
(
HWND
hwnd
,
const
RECT
*
rect
)
{
UINT
flags
=
RDW_VALIDATE
;
if
(
!
hwnd
)
{
flags
=
RDW_ALLCHILDREN
|
RDW_INVALIDATE
|
RDW_FRAME
|
RDW_ERASE
|
RDW_ERASENOW
;
rect
=
NULL
;
}
return
NtUserRedrawWindow
(
hwnd
,
rect
,
0
,
flags
);
}
/*************************************************************************
* ScrollWindow (USER32.@)
*
...
...
dlls/user32/user32.spec
View file @
ae984f63
...
...
@@ -807,7 +807,7 @@
@ stdcall UserSignalProc(long long long long)
# @ stub VRipOutput
# @ stub VTagOutput
@ stdcall ValidateRect(long ptr)
@ stdcall ValidateRect(long ptr)
NtUserValidateRect
@ stdcall ValidateRgn(long long)
@ stdcall VkKeyScanA(long)
@ stdcall VkKeyScanExA(long long)
...
...
dlls/win32u/dce.c
View file @
ae984f63
...
...
@@ -1508,6 +1508,22 @@ BOOL WINAPI NtUserRedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT fla
}
/***********************************************************************
* NtUserValidateRect (win32u.@)
*/
BOOL
WINAPI
NtUserValidateRect
(
HWND
hwnd
,
const
RECT
*
rect
)
{
UINT
flags
=
RDW_VALIDATE
;
if
(
!
hwnd
)
{
flags
=
RDW_ALLCHILDREN
|
RDW_INVALIDATE
|
RDW_FRAME
|
RDW_ERASE
|
RDW_ERASENOW
;
rect
=
NULL
;
}
return
NtUserRedrawWindow
(
hwnd
,
rect
,
0
,
flags
);
}
/***********************************************************************
* NtUserGetUpdateRgn (win32u.@)
*/
INT
WINAPI
NtUserGetUpdateRgn
(
HWND
hwnd
,
HRGN
hrgn
,
BOOL
erase
)
...
...
dlls/win32u/syscall.c
View file @
ae984f63
...
...
@@ -302,6 +302,7 @@ static void * const syscalls[] =
NtUserUnregisterClass
,
NtUserUnregisterHotKey
,
NtUserUpdateInputContext
,
NtUserValidateRect
,
NtUserVkKeyScanEx
,
NtUserWaitForInputIdle
,
NtUserWindowFromDC
,
...
...
dlls/win32u/win32u.spec
View file @
ae984f63
...
...
@@ -1300,7 +1300,7 @@
@ stub NtUserUpdateWindowInputSinkHints
@ stub NtUserUpdateWindowTrackingInfo
@ stub NtUserUserHandleGrantAccess
@ st
ub NtUserValidateRect
@ st
dcall -syscall NtUserValidateRect(long ptr)
@ stub NtUserValidateTimerCallback
@ stdcall -syscall NtUserVkKeyScanEx(long long)
@ stub NtUserWOWCleanup
...
...
dlls/wow64win/syscall.h
View file @
ae984f63
...
...
@@ -288,6 +288,7 @@
SYSCALL_ENTRY( NtUserUnregisterClass ) \
SYSCALL_ENTRY( NtUserUnregisterHotKey ) \
SYSCALL_ENTRY( NtUserUpdateInputContext ) \
SYSCALL_ENTRY( NtUserValidateRect ) \
SYSCALL_ENTRY( NtUserVkKeyScanEx ) \
SYSCALL_ENTRY( NtUserWaitForInputIdle ) \
SYSCALL_ENTRY( NtUserWindowFromDC ) \
...
...
dlls/wow64win/user.c
View file @
ae984f63
...
...
@@ -4102,6 +4102,14 @@ NTSTATUS WINAPI wow64_NtUserUpdateInputContext( UINT *args )
return
NtUserUpdateInputContext
(
handle
,
attr
,
value
);
}
NTSTATUS
WINAPI
wow64_NtUserValidateRect
(
UINT
*
args
)
{
HWND
hwnd
=
get_handle
(
&
args
);
const
RECT
*
rect
=
get_ptr
(
&
args
);
return
NtUserValidateRect
(
hwnd
,
rect
);
}
NTSTATUS
WINAPI
wow64_NtUserVkKeyScanEx
(
UINT
*
args
)
{
WCHAR
chr
=
get_ulong
(
&
args
);
...
...
include/ntuser.h
View file @
ae984f63
...
...
@@ -892,6 +892,7 @@ BOOL WINAPI NtUserUpdateInputContext( HIMC handle, UINT attr, UINT_PTR value
BOOL
WINAPI
NtUserUpdateLayeredWindow
(
HWND
hwnd
,
HDC
hdc_dst
,
const
POINT
*
pts_dst
,
const
SIZE
*
size
,
HDC
hdc_src
,
const
POINT
*
pts_src
,
COLORREF
key
,
const
BLENDFUNCTION
*
blend
,
DWORD
flags
,
const
RECT
*
dirty
);
BOOL
WINAPI
NtUserValidateRect
(
HWND
hwnd
,
const
RECT
*
rect
);
WORD
WINAPI
NtUserVkKeyScanEx
(
WCHAR
chr
,
HKL
layout
);
DWORD
WINAPI
NtUserWaitForInputIdle
(
HANDLE
process
,
DWORD
timeout
,
BOOL
wow
);
HWND
WINAPI
NtUserWindowFromDC
(
HDC
hdc
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment