Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
c2c9112b
Commit
c2c9112b
authored
Jun 02, 2023
by
Tatsuyuki Ishi
Committed by
Alexandre Julliard
Jun 12, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win32u: Move QueryDisplayConfig from user32.
Signed-off-by:
Tatsuyuki Ishi
<
ishitatsuyuki@gmail.com
>
parent
af902c18
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
243 additions
and
2 deletions
+243
-2
sysparams.c
dlls/user32/sysparams.c
+0
-0
user32.spec
dlls/user32/user32.spec
+1
-1
syscall.c
dlls/win32u/syscall.c
+1
-0
sysparams.c
dlls/win32u/sysparams.c
+224
-0
win32u.spec
dlls/win32u/win32u.spec
+1
-1
syscall.h
dlls/wow64win/syscall.h
+1
-0
user.c
dlls/wow64win/user.c
+12
-0
ntuser.h
include/ntuser.h
+3
-0
No files found.
dlls/user32/sysparams.c
View file @
c2c9112b
This diff is collapsed.
Click to expand it.
dlls/user32/user32.spec
View file @
c2c9112b
...
@@ -587,7 +587,7 @@
...
@@ -587,7 +587,7 @@
# @ stub PrivateSetDbgTag
# @ stub PrivateSetDbgTag
# @ stub PrivateSetRipFlags
# @ stub PrivateSetRipFlags
@ stdcall PtInRect(ptr int64)
@ stdcall PtInRect(ptr int64)
@ stdcall QueryDisplayConfig(long ptr ptr ptr ptr ptr)
@ stdcall QueryDisplayConfig(long ptr ptr ptr ptr ptr)
NtUserQueryDisplayConfig
@ stub QuerySendMessage
@ stub QuerySendMessage
# @ stub QueryUserCounters
# @ stub QueryUserCounters
@ stdcall RealChildWindowFromPoint(long int64)
@ stdcall RealChildWindowFromPoint(long int64)
...
...
dlls/win32u/syscall.c
View file @
c2c9112b
...
@@ -355,6 +355,7 @@ static void * const syscalls[] =
...
@@ -355,6 +355,7 @@ static void * const syscalls[] =
NtUserPostMessage
,
NtUserPostMessage
,
NtUserPostThreadMessage
,
NtUserPostThreadMessage
,
NtUserPrintWindow
,
NtUserPrintWindow
,
NtUserQueryDisplayConfig
,
NtUserQueryInputContext
,
NtUserQueryInputContext
,
NtUserRealChildWindowFromPoint
,
NtUserRealChildWindowFromPoint
,
NtUserRedrawWindow
,
NtUserRedrawWindow
,
...
...
dlls/win32u/sysparams.c
View file @
c2c9112b
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
#define WIN32_NO_STATUS
#define WIN32_NO_STATUS
#include "ntgdi_private.h"
#include "ntgdi_private.h"
#include "ntuser_private.h"
#include "ntuser_private.h"
#include "d3dkmdt.h"
#include "devpropdef.h"
#include "devpropdef.h"
#include "cfgmgr32.h"
#include "cfgmgr32.h"
#include "d3dkmdt.h"
#include "d3dkmdt.h"
...
@@ -2161,6 +2162,229 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_in
...
@@ -2161,6 +2162,229 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_in
return
ERROR_SUCCESS
;
return
ERROR_SUCCESS
;
}
}
static
DISPLAYCONFIG_ROTATION
get_dc_rotation
(
const
DEVMODEW
*
devmode
)
{
if
(
devmode
->
dmFields
&
DM_DISPLAYORIENTATION
)
return
devmode
->
dmDisplayOrientation
+
1
;
else
return
DISPLAYCONFIG_ROTATION_IDENTITY
;
}
static
DISPLAYCONFIG_SCANLINE_ORDERING
get_dc_scanline_ordering
(
const
DEVMODEW
*
devmode
)
{
if
(
!
(
devmode
->
dmFields
&
DM_DISPLAYFLAGS
))
return
DISPLAYCONFIG_SCANLINE_ORDERING_UNSPECIFIED
;
else
if
(
devmode
->
dmDisplayFlags
&
DM_INTERLACED
)
return
DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED
;
else
return
DISPLAYCONFIG_SCANLINE_ORDERING_PROGRESSIVE
;
}
static
DISPLAYCONFIG_PIXELFORMAT
get_dc_pixelformat
(
DWORD
dmBitsPerPel
)
{
if
((
dmBitsPerPel
==
8
)
||
(
dmBitsPerPel
==
16
)
||
(
dmBitsPerPel
==
24
)
||
(
dmBitsPerPel
==
32
))
return
dmBitsPerPel
/
8
;
else
return
DISPLAYCONFIG_PIXELFORMAT_NONGDI
;
}
static
void
set_mode_target_info
(
DISPLAYCONFIG_MODE_INFO
*
info
,
const
LUID
*
gpu_luid
,
UINT32
target_id
,
UINT32
flags
,
const
DEVMODEW
*
devmode
)
{
DISPLAYCONFIG_TARGET_MODE
*
mode
=
&
info
->
targetMode
;
info
->
infoType
=
DISPLAYCONFIG_MODE_INFO_TYPE_TARGET
;
info
->
adapterId
=
*
gpu_luid
;
info
->
id
=
target_id
;
/* FIXME: Populate pixelRate/hSyncFreq/totalSize with real data */
mode
->
targetVideoSignalInfo
.
pixelRate
=
devmode
->
dmDisplayFrequency
*
devmode
->
dmPelsWidth
*
devmode
->
dmPelsHeight
;
mode
->
targetVideoSignalInfo
.
hSyncFreq
.
Numerator
=
devmode
->
dmDisplayFrequency
*
devmode
->
dmPelsWidth
;
mode
->
targetVideoSignalInfo
.
hSyncFreq
.
Denominator
=
1
;
mode
->
targetVideoSignalInfo
.
vSyncFreq
.
Numerator
=
devmode
->
dmDisplayFrequency
;
mode
->
targetVideoSignalInfo
.
vSyncFreq
.
Denominator
=
1
;
mode
->
targetVideoSignalInfo
.
activeSize
.
cx
=
devmode
->
dmPelsWidth
;
mode
->
targetVideoSignalInfo
.
activeSize
.
cy
=
devmode
->
dmPelsHeight
;
if
(
flags
&
QDC_DATABASE_CURRENT
)
{
mode
->
targetVideoSignalInfo
.
totalSize
.
cx
=
0
;
mode
->
targetVideoSignalInfo
.
totalSize
.
cy
=
0
;
}
else
{
mode
->
targetVideoSignalInfo
.
totalSize
.
cx
=
devmode
->
dmPelsWidth
;
mode
->
targetVideoSignalInfo
.
totalSize
.
cy
=
devmode
->
dmPelsHeight
;
}
mode
->
targetVideoSignalInfo
.
videoStandard
=
D3DKMDT_VSS_OTHER
;
mode
->
targetVideoSignalInfo
.
scanLineOrdering
=
get_dc_scanline_ordering
(
devmode
);
}
static
void
set_path_target_info
(
DISPLAYCONFIG_PATH_TARGET_INFO
*
info
,
const
LUID
*
gpu_luid
,
UINT32
target_id
,
UINT32
mode_index
,
const
DEVMODEW
*
devmode
)
{
info
->
adapterId
=
*
gpu_luid
;
info
->
id
=
target_id
;
info
->
modeInfoIdx
=
mode_index
;
info
->
outputTechnology
=
DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL
;
info
->
rotation
=
get_dc_rotation
(
devmode
);
info
->
scaling
=
DISPLAYCONFIG_SCALING_IDENTITY
;
info
->
refreshRate
.
Numerator
=
devmode
->
dmDisplayFrequency
;
info
->
refreshRate
.
Denominator
=
1
;
info
->
scanLineOrdering
=
get_dc_scanline_ordering
(
devmode
);
info
->
targetAvailable
=
TRUE
;
info
->
statusFlags
=
DISPLAYCONFIG_TARGET_IN_USE
;
}
static
void
set_mode_source_info
(
DISPLAYCONFIG_MODE_INFO
*
info
,
const
LUID
*
gpu_luid
,
UINT32
source_id
,
const
DEVMODEW
*
devmode
)
{
DISPLAYCONFIG_SOURCE_MODE
*
mode
=
&
(
info
->
sourceMode
);
info
->
infoType
=
DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE
;
info
->
adapterId
=
*
gpu_luid
;
info
->
id
=
source_id
;
mode
->
width
=
devmode
->
dmPelsWidth
;
mode
->
height
=
devmode
->
dmPelsHeight
;
mode
->
pixelFormat
=
get_dc_pixelformat
(
devmode
->
dmBitsPerPel
);
if
(
devmode
->
dmFields
&
DM_POSITION
)
{
mode
->
position
=
devmode
->
dmPosition
;
}
else
{
mode
->
position
.
x
=
0
;
mode
->
position
.
y
=
0
;
}
}
static
void
set_path_source_info
(
DISPLAYCONFIG_PATH_SOURCE_INFO
*
info
,
const
LUID
*
gpu_luid
,
UINT32
source_id
,
UINT32
mode_index
)
{
info
->
adapterId
=
*
gpu_luid
;
info
->
id
=
source_id
;
info
->
modeInfoIdx
=
mode_index
;
info
->
statusFlags
=
DISPLAYCONFIG_SOURCE_IN_USE
;
}
static
BOOL
source_mode_exists
(
const
DISPLAYCONFIG_MODE_INFO
*
modeinfo
,
UINT32
num_modes
,
UINT32
source_id
,
UINT32
*
found_mode_index
)
{
UINT32
i
;
for
(
i
=
0
;
i
<
num_modes
;
i
++
)
{
if
(
modeinfo
[
i
].
infoType
==
DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE
&&
modeinfo
[
i
].
id
==
source_id
)
{
*
found_mode_index
=
i
;
return
TRUE
;
}
}
return
FALSE
;
}
/***********************************************************************
* NtUserQueryDisplayConfig (win32u.@)
*/
LONG
WINAPI
NtUserQueryDisplayConfig
(
UINT32
flags
,
UINT32
*
numpathelements
,
DISPLAYCONFIG_PATH_INFO
*
pathinfo
,
UINT32
*
numinfoelements
,
DISPLAYCONFIG_MODE_INFO
*
modeinfo
,
DISPLAYCONFIG_TOPOLOGY_ID
*
topologyid
)
{
ULONG
adapter_index
;
LONG
ret
;
UINT32
output_id
,
source_mode_index
,
path_index
=
0
,
mode_index
=
0
;
const
LUID
*
gpu_luid
;
DEVMODEW
devmode
;
struct
monitor
*
monitor
;
FIXME
(
"(%08x %p %p %p %p %p): semi-stub
\n
"
,
flags
,
numpathelements
,
pathinfo
,
numinfoelements
,
modeinfo
,
topologyid
);
if
(
!
numpathelements
||
!
numinfoelements
)
return
ERROR_INVALID_PARAMETER
;
if
(
!*
numpathelements
||
!*
numinfoelements
)
return
ERROR_INVALID_PARAMETER
;
if
(
flags
!=
QDC_ALL_PATHS
&&
flags
!=
QDC_ONLY_ACTIVE_PATHS
&&
flags
!=
QDC_DATABASE_CURRENT
)
return
ERROR_INVALID_PARAMETER
;
if
(((
flags
==
QDC_DATABASE_CURRENT
)
&&
!
topologyid
)
||
((
flags
!=
QDC_DATABASE_CURRENT
)
&&
topologyid
))
return
ERROR_INVALID_PARAMETER
;
if
(
flags
!=
QDC_ONLY_ACTIVE_PATHS
)
FIXME
(
"only returning active paths
\n
"
);
if
(
topologyid
)
{
FIXME
(
"setting toplogyid to DISPLAYCONFIG_TOPOLOGY_INTERNAL
\n
"
);
*
topologyid
=
DISPLAYCONFIG_TOPOLOGY_INTERNAL
;
}
if
(
!
lock_display_devices
())
return
ERROR_GEN_FAILURE
;
ret
=
ERROR_GEN_FAILURE
;
LIST_FOR_EACH_ENTRY
(
monitor
,
&
monitors
,
struct
monitor
,
entry
)
{
if
(
!
(
monitor
->
dev
.
state_flags
&
DISPLAY_DEVICE_ACTIVE
))
continue
;
adapter_index
=
monitor
->
adapter
->
id
;
gpu_luid
=
&
monitor
->
adapter
->
gpu_luid
;
output_id
=
monitor
->
output_id
;
memset
(
&
devmode
,
0
,
sizeof
(
devmode
)
);
devmode
.
dmSize
=
sizeof
(
devmode
);
if
(
!
adapter_get_current_settings
(
monitor
->
adapter
,
&
devmode
))
{
goto
done
;
}
if
(
path_index
==
*
numpathelements
||
mode_index
==
*
numinfoelements
)
{
ret
=
ERROR_INSUFFICIENT_BUFFER
;
goto
done
;
}
pathinfo
[
path_index
].
flags
=
DISPLAYCONFIG_PATH_ACTIVE
;
set_mode_target_info
(
&
modeinfo
[
mode_index
],
gpu_luid
,
output_id
,
flags
,
&
devmode
);
set_path_target_info
(
&
(
pathinfo
[
path_index
].
targetInfo
),
gpu_luid
,
output_id
,
mode_index
,
&
devmode
);
mode_index
++
;
if
(
mode_index
==
*
numinfoelements
)
{
ret
=
ERROR_INSUFFICIENT_BUFFER
;
goto
done
;
}
/* Multiple targets can be driven by the same source, ensure a mode
* hasn't already been added for this source.
*/
if
(
!
source_mode_exists
(
modeinfo
,
mode_index
,
adapter_index
,
&
source_mode_index
))
{
set_mode_source_info
(
&
modeinfo
[
mode_index
],
gpu_luid
,
adapter_index
,
&
devmode
);
source_mode_index
=
mode_index
;
mode_index
++
;
}
set_path_source_info
(
&
(
pathinfo
[
path_index
].
sourceInfo
),
gpu_luid
,
adapter_index
,
source_mode_index
);
path_index
++
;
}
*
numpathelements
=
path_index
;
*
numinfoelements
=
mode_index
;
ret
=
ERROR_SUCCESS
;
done:
unlock_display_devices
();
return
ret
;
}
/* display_lock mutex must be held */
/* display_lock mutex must be held */
static
struct
display_device
*
find_monitor_device
(
struct
display_device
*
adapter
,
UINT
index
)
static
struct
display_device
*
find_monitor_device
(
struct
display_device
*
adapter
,
UINT
index
)
{
{
...
...
dlls/win32u/win32u.spec
View file @
c2c9112b
...
@@ -1112,7 +1112,7 @@
...
@@ -1112,7 +1112,7 @@
@ stub NtUserPromotePointer
@ stub NtUserPromotePointer
@ stub NtUserQueryActivationObject
@ stub NtUserQueryActivationObject
@ stub NtUserQueryBSDRWindow
@ stub NtUserQueryBSDRWindow
@ st
ub NtUserQueryDisplayConfig
@ st
dcall -syscall NtUserQueryDisplayConfig(long ptr ptr ptr ptr ptr)
@ stub NtUserQueryInformationThread
@ stub NtUserQueryInformationThread
@ stdcall -syscall NtUserQueryInputContext(long long)
@ stdcall -syscall NtUserQueryInputContext(long long)
@ stub NtUserQuerySendMessage
@ stub NtUserQuerySendMessage
...
...
dlls/wow64win/syscall.h
View file @
c2c9112b
...
@@ -341,6 +341,7 @@
...
@@ -341,6 +341,7 @@
SYSCALL_ENTRY( NtUserPostMessage ) \
SYSCALL_ENTRY( NtUserPostMessage ) \
SYSCALL_ENTRY( NtUserPostThreadMessage ) \
SYSCALL_ENTRY( NtUserPostThreadMessage ) \
SYSCALL_ENTRY( NtUserPrintWindow ) \
SYSCALL_ENTRY( NtUserPrintWindow ) \
SYSCALL_ENTRY( NtUserQueryDisplayConfig ) \
SYSCALL_ENTRY( NtUserQueryInputContext ) \
SYSCALL_ENTRY( NtUserQueryInputContext ) \
SYSCALL_ENTRY( NtUserRealChildWindowFromPoint ) \
SYSCALL_ENTRY( NtUserRealChildWindowFromPoint ) \
SYSCALL_ENTRY( NtUserRedrawWindow ) \
SYSCALL_ENTRY( NtUserRedrawWindow ) \
...
...
dlls/wow64win/user.c
View file @
c2c9112b
...
@@ -3318,6 +3318,18 @@ NTSTATUS WINAPI wow64_NtUserPrintWindow( UINT *args )
...
@@ -3318,6 +3318,18 @@ NTSTATUS WINAPI wow64_NtUserPrintWindow( UINT *args )
return
NtUserPrintWindow
(
hwnd
,
hdc
,
flags
);
return
NtUserPrintWindow
(
hwnd
,
hdc
,
flags
);
}
}
NTSTATUS
WINAPI
wow64_NtUserQueryDisplayConfig
(
UINT
*
args
)
{
UINT32
flags
=
get_ulong
(
&
args
);
UINT32
*
paths_count
=
get_ptr
(
&
args
);
DISPLAYCONFIG_PATH_INFO
*
paths
=
get_ptr
(
&
args
);
UINT32
*
modes_count
=
get_ptr
(
&
args
);
DISPLAYCONFIG_MODE_INFO
*
modes
=
get_ptr
(
&
args
);
DISPLAYCONFIG_TOPOLOGY_ID
*
topology_id
=
get_ptr
(
&
args
);
return
NtUserQueryDisplayConfig
(
flags
,
paths_count
,
paths
,
modes_count
,
modes
,
topology_id
);
}
NTSTATUS
WINAPI
wow64_NtUserQueryInputContext
(
UINT
*
args
)
NTSTATUS
WINAPI
wow64_NtUserQueryInputContext
(
UINT
*
args
)
{
{
HIMC
handle
=
get_handle
(
&
args
);
HIMC
handle
=
get_handle
(
&
args
);
...
...
include/ntuser.h
View file @
c2c9112b
...
@@ -843,6 +843,9 @@ BOOL WINAPI NtUserPerMonitorDPIPhysicalToLogicalPoint( HWND hwnd, POINT *pt )
...
@@ -843,6 +843,9 @@ BOOL WINAPI NtUserPerMonitorDPIPhysicalToLogicalPoint( HWND hwnd, POINT *pt )
BOOL
WINAPI
NtUserPostMessage
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wparam
,
LPARAM
lparam
);
BOOL
WINAPI
NtUserPostMessage
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wparam
,
LPARAM
lparam
);
BOOL
WINAPI
NtUserPostThreadMessage
(
DWORD
thread
,
UINT
msg
,
WPARAM
wparam
,
LPARAM
lparam
);
BOOL
WINAPI
NtUserPostThreadMessage
(
DWORD
thread
,
UINT
msg
,
WPARAM
wparam
,
LPARAM
lparam
);
BOOL
WINAPI
NtUserPrintWindow
(
HWND
hwnd
,
HDC
hdc
,
UINT
flags
);
BOOL
WINAPI
NtUserPrintWindow
(
HWND
hwnd
,
HDC
hdc
,
UINT
flags
);
LONG
WINAPI
NtUserQueryDisplayConfig
(
UINT32
flags
,
UINT32
*
numpathelements
,
DISPLAYCONFIG_PATH_INFO
*
pathinfo
,
UINT32
*
numinfoelements
,
DISPLAYCONFIG_MODE_INFO
*
modeinfo
,
DISPLAYCONFIG_TOPOLOGY_ID
*
topologyid
);
UINT_PTR
WINAPI
NtUserQueryInputContext
(
HIMC
handle
,
UINT
attr
);
UINT_PTR
WINAPI
NtUserQueryInputContext
(
HIMC
handle
,
UINT
attr
);
HWND
WINAPI
NtUserRealChildWindowFromPoint
(
HWND
parent
,
LONG
x
,
LONG
y
);
HWND
WINAPI
NtUserRealChildWindowFromPoint
(
HWND
parent
,
LONG
x
,
LONG
y
);
BOOL
WINAPI
NtUserRedrawWindow
(
HWND
hwnd
,
const
RECT
*
rect
,
HRGN
hrgn
,
UINT
flags
);
BOOL
WINAPI
NtUserRedrawWindow
(
HWND
hwnd
,
const
RECT
*
rect
,
HRGN
hrgn
,
UINT
flags
);
...
...
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