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
540dc761
Commit
540dc761
authored
Jun 08, 2022
by
Jacek Caban
Committed by
Alexandre Julliard
Jun 09, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win32u: Move SetWindowContextHelpId implementation from user32.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
parent
b2db69ef
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
10 deletions
+25
-10
win.c
dlls/user32/win.c
+1
-10
window.c
dlls/win32u/window.c
+18
-0
ntuser.h
include/ntuser.h
+6
-0
No files found.
dlls/user32/win.c
View file @
540dc761
...
@@ -1475,16 +1475,7 @@ DWORD WINAPI GetWindowContextHelpId( HWND hwnd )
...
@@ -1475,16 +1475,7 @@ DWORD WINAPI GetWindowContextHelpId( HWND hwnd )
*/
*/
BOOL
WINAPI
SetWindowContextHelpId
(
HWND
hwnd
,
DWORD
id
)
BOOL
WINAPI
SetWindowContextHelpId
(
HWND
hwnd
,
DWORD
id
)
{
{
WND
*
wnd
=
WIN_GetPtr
(
hwnd
);
return
NtUserSetWindowContextHelpId
(
hwnd
,
id
);
if
(
!
wnd
||
wnd
==
WND_DESKTOP
)
return
FALSE
;
if
(
wnd
==
WND_OTHER_PROCESS
)
{
if
(
IsWindow
(
hwnd
))
FIXME
(
"not supported on other process window %p
\n
"
,
hwnd
);
return
FALSE
;
}
wnd
->
helpContext
=
id
;
WIN_ReleasePtr
(
wnd
);
return
TRUE
;
}
}
...
...
dlls/win32u/window.c
View file @
540dc761
...
@@ -4539,6 +4539,21 @@ static DWORD get_window_context_help_id( HWND hwnd )
...
@@ -4539,6 +4539,21 @@ static DWORD get_window_context_help_id( HWND hwnd )
return
retval
;
return
retval
;
}
}
/* see SetWindowContextHelpId */
static
BOOL
set_window_context_help_id
(
HWND
hwnd
,
DWORD
id
)
{
WND
*
win
=
get_win_ptr
(
hwnd
);
if
(
!
win
||
win
==
WND_DESKTOP
)
return
FALSE
;
if
(
win
==
WND_OTHER_PROCESS
)
{
if
(
is_window
(
hwnd
))
FIXME
(
"not supported on other process window %p
\n
"
,
hwnd
);
return
FALSE
;
}
win
->
helpContext
=
id
;
release_win_ptr
(
win
);
return
TRUE
;
}
/***********************************************************************
/***********************************************************************
* send_destroy_message
* send_destroy_message
*/
*/
...
@@ -5432,6 +5447,9 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code )
...
@@ -5432,6 +5447,9 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code )
case
NtUserCallHwndParam_SetForegroundWindow
:
case
NtUserCallHwndParam_SetForegroundWindow
:
return
set_foreground_window
(
hwnd
,
param
);
return
set_foreground_window
(
hwnd
,
param
);
case
NtUserCallHwndParam_SetWindowContextHelpId
:
return
set_window_context_help_id
(
hwnd
,
param
);
case
NtUserCallHwndParam_SetWindowPixelFormat
:
case
NtUserCallHwndParam_SetWindowPixelFormat
:
return
set_window_pixel_format
(
hwnd
,
param
);
return
set_window_pixel_format
(
hwnd
,
param
);
...
...
include/ntuser.h
View file @
540dc761
...
@@ -1021,6 +1021,7 @@ enum
...
@@ -1021,6 +1021,7 @@ enum
NtUserCallHwndParam_MonitorFromWindow
,
NtUserCallHwndParam_MonitorFromWindow
,
NtUserCallHwndParam_ScreenToClient
,
NtUserCallHwndParam_ScreenToClient
,
NtUserCallHwndParam_SetForegroundWindow
,
NtUserCallHwndParam_SetForegroundWindow
,
NtUserCallHwndParam_SetWindowContextHelpId
,
NtUserCallHwndParam_SetWindowPixelFormat
,
NtUserCallHwndParam_SetWindowPixelFormat
,
NtUserCallHwndParam_ShowOwnedPopups
,
NtUserCallHwndParam_ShowOwnedPopups
,
/* temporary exports */
/* temporary exports */
...
@@ -1171,6 +1172,11 @@ static inline BOOL NtUserSetForegroundWindow( HWND hwnd, BOOL mouse )
...
@@ -1171,6 +1172,11 @@ static inline BOOL NtUserSetForegroundWindow( HWND hwnd, BOOL mouse )
return
NtUserCallHwndParam
(
hwnd
,
mouse
,
NtUserCallHwndParam_SetForegroundWindow
);
return
NtUserCallHwndParam
(
hwnd
,
mouse
,
NtUserCallHwndParam_SetForegroundWindow
);
}
}
static
inline
BOOL
NtUserSetWindowContextHelpId
(
HWND
hwnd
,
DWORD
id
)
{
return
NtUserCallHwndParam
(
hwnd
,
id
,
NtUserCallHwndParam_SetWindowContextHelpId
);
}
static
inline
BOOL
NtUserSetWindowPixelFormat
(
HWND
hwnd
,
int
format
)
static
inline
BOOL
NtUserSetWindowPixelFormat
(
HWND
hwnd
,
int
format
)
{
{
return
NtUserCallHwndParam
(
hwnd
,
format
,
NtUserCallHwndParam_SetWindowPixelFormat
);
return
NtUserCallHwndParam
(
hwnd
,
format
,
NtUserCallHwndParam_SetWindowPixelFormat
);
...
...
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