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
f5c82753
Commit
f5c82753
authored
Dec 08, 2022
by
Jacek Caban
Committed by
Alexandre Julliard
Dec 08, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win32u: Move NtUserGetInternalWindowPos implementation from user32.
parent
02670002
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
28 additions
and
21 deletions
+28
-21
user32.spec
dlls/user32/user32.spec
+1
-1
winpos.c
dlls/user32/winpos.c
+0
-19
syscall.c
dlls/win32u/syscall.c
+1
-0
win32u.spec
dlls/win32u/win32u.spec
+1
-1
window.c
dlls/win32u/window.c
+14
-0
syscall.h
dlls/wow64win/syscall.h
+1
-0
user.c
dlls/wow64win/user.c
+9
-0
ntuser.h
include/ntuser.h
+1
-0
No files found.
dlls/user32/user32.spec
View file @
f5c82753
...
@@ -314,7 +314,7 @@
...
@@ -314,7 +314,7 @@
@ stdcall GetIconInfoExW(long ptr)
@ stdcall GetIconInfoExW(long ptr)
@ stub GetInputDesktop
@ stub GetInputDesktop
@ stdcall GetInputState()
@ stdcall GetInputState()
@ stdcall GetInternalWindowPos(long ptr ptr)
@ stdcall GetInternalWindowPos(long ptr ptr)
NtUserGetInternalWindowPos
@ stdcall GetKBCodePage()
@ stdcall GetKBCodePage()
@ stdcall GetKeyNameTextA(long ptr long)
@ stdcall GetKeyNameTextA(long ptr long)
@ stdcall GetKeyNameTextW(long ptr long) NtUserGetKeyNameText
@ stdcall GetKeyNameTextW(long ptr long) NtUserGetKeyNameText
...
...
dlls/user32/winpos.c
View file @
f5c82753
...
@@ -196,25 +196,6 @@ BOOL WINAPI BringWindowToTop( HWND hwnd )
...
@@ -196,25 +196,6 @@ BOOL WINAPI BringWindowToTop( HWND hwnd )
/***********************************************************************
/***********************************************************************
* GetInternalWindowPos (USER32.@)
*/
UINT
WINAPI
GetInternalWindowPos
(
HWND
hwnd
,
LPRECT
rectWnd
,
LPPOINT
ptIcon
)
{
WINDOWPLACEMENT
wndpl
;
wndpl
.
length
=
sizeof
(
wndpl
);
if
(
NtUserGetWindowPlacement
(
hwnd
,
&
wndpl
))
{
if
(
rectWnd
)
*
rectWnd
=
wndpl
.
rcNormalPosition
;
if
(
ptIcon
)
*
ptIcon
=
wndpl
.
ptMinPosition
;
return
wndpl
.
showCmd
;
}
return
0
;
}
/***********************************************************************
* AnimateWindow (USER32.@)
* AnimateWindow (USER32.@)
* Shows/Hides a window with an animation
* Shows/Hides a window with an animation
* NO ANIMATION YET
* NO ANIMATION YET
...
...
dlls/win32u/syscall.c
View file @
f5c82753
...
@@ -178,6 +178,7 @@ static void * const syscalls[] =
...
@@ -178,6 +178,7 @@ static void * const syscalls[] =
NtUserGetGUIThreadInfo
,
NtUserGetGUIThreadInfo
,
NtUserGetIconInfo
,
NtUserGetIconInfo
,
NtUserGetIconSize
,
NtUserGetIconSize
,
NtUserGetInternalWindowPos
,
NtUserGetKeyNameText
,
NtUserGetKeyNameText
,
NtUserGetKeyState
,
NtUserGetKeyState
,
NtUserGetKeyboardLayout
,
NtUserGetKeyboardLayout
,
...
...
dlls/win32u/win32u.spec
View file @
f5c82753
...
@@ -943,7 +943,7 @@
...
@@ -943,7 +943,7 @@
@ stub NtUserGetInteractiveControlDeviceInfo
@ stub NtUserGetInteractiveControlDeviceInfo
@ stub NtUserGetInteractiveControlInfo
@ stub NtUserGetInteractiveControlInfo
@ stub NtUserGetInteractiveCtrlSupportedWaveforms
@ stub NtUserGetInteractiveCtrlSupportedWaveforms
@ st
ub NtUserGetInternalWindowPos
@ st
dcall -syscall NtUserGetInternalWindowPos(long ptr ptr)
@ stdcall -syscall NtUserGetKeyNameText(long ptr long)
@ stdcall -syscall NtUserGetKeyNameText(long ptr long)
@ stdcall -syscall NtUserGetKeyState(long)
@ stdcall -syscall NtUserGetKeyState(long)
@ stdcall -syscall NtUserGetKeyboardLayout(long)
@ stdcall -syscall NtUserGetKeyboardLayout(long)
...
...
dlls/win32u/window.c
View file @
f5c82753
...
@@ -2495,6 +2495,20 @@ static void make_rect_onscreen( RECT *rect )
...
@@ -2495,6 +2495,20 @@ static void make_rect_onscreen( RECT *rect )
}
}
}
}
/***********************************************************************
* NtUserGetInternalWindowPos (win32u.@)
*/
UINT
WINAPI
NtUserGetInternalWindowPos
(
HWND
hwnd
,
RECT
*
rect
,
POINT
*
pt
)
{
WINDOWPLACEMENT
placement
;
placement
.
length
=
sizeof
(
placement
);
if
(
!
NtUserGetWindowPlacement
(
hwnd
,
&
placement
))
return
0
;
if
(
rect
)
*
rect
=
placement
.
rcNormalPosition
;
if
(
pt
)
*
pt
=
placement
.
ptMinPosition
;
return
placement
.
showCmd
;
}
/* make sure the specified point is visible on screen */
/* make sure the specified point is visible on screen */
static
void
make_point_onscreen
(
POINT
*
pt
)
static
void
make_point_onscreen
(
POINT
*
pt
)
{
{
...
...
dlls/wow64win/syscall.h
View file @
f5c82753
...
@@ -164,6 +164,7 @@
...
@@ -164,6 +164,7 @@
SYSCALL_ENTRY( NtUserGetGUIThreadInfo ) \
SYSCALL_ENTRY( NtUserGetGUIThreadInfo ) \
SYSCALL_ENTRY( NtUserGetIconInfo ) \
SYSCALL_ENTRY( NtUserGetIconInfo ) \
SYSCALL_ENTRY( NtUserGetIconSize ) \
SYSCALL_ENTRY( NtUserGetIconSize ) \
SYSCALL_ENTRY( NtUserGetInternalWindowPos ) \
SYSCALL_ENTRY( NtUserGetKeyNameText ) \
SYSCALL_ENTRY( NtUserGetKeyNameText ) \
SYSCALL_ENTRY( NtUserGetKeyState ) \
SYSCALL_ENTRY( NtUserGetKeyState ) \
SYSCALL_ENTRY( NtUserGetKeyboardLayout ) \
SYSCALL_ENTRY( NtUserGetKeyboardLayout ) \
...
...
dlls/wow64win/user.c
View file @
f5c82753
...
@@ -2050,6 +2050,15 @@ NTSTATUS WINAPI wow64_NtUserGetIconSize( UINT *args )
...
@@ -2050,6 +2050,15 @@ NTSTATUS WINAPI wow64_NtUserGetIconSize( UINT *args )
return
NtUserGetIconSize
(
handle
,
step
,
width
,
height
);
return
NtUserGetIconSize
(
handle
,
step
,
width
,
height
);
}
}
NTSTATUS
WINAPI
wow64_NtUserGetInternalWindowPos
(
UINT
*
args
)
{
HWND
hwnd
=
get_handle
(
&
args
);
RECT
*
rect
=
get_ptr
(
&
args
);
POINT
*
pt
=
get_ptr
(
&
args
);
return
NtUserGetInternalWindowPos
(
hwnd
,
rect
,
pt
);
}
NTSTATUS
WINAPI
wow64_NtUserGetKeyNameText
(
UINT
*
args
)
NTSTATUS
WINAPI
wow64_NtUserGetKeyNameText
(
UINT
*
args
)
{
{
LONG
lparam
=
get_ulong
(
&
args
);
LONG
lparam
=
get_ulong
(
&
args
);
...
...
include/ntuser.h
View file @
f5c82753
...
@@ -744,6 +744,7 @@ BOOL WINAPI NtUserGetGUIThreadInfo( DWORD id, GUITHREADINFO *info );
...
@@ -744,6 +744,7 @@ BOOL WINAPI NtUserGetGUIThreadInfo( DWORD id, GUITHREADINFO *info );
BOOL
WINAPI
NtUserGetIconInfo
(
HICON
icon
,
ICONINFO
*
info
,
UNICODE_STRING
*
module
,
BOOL
WINAPI
NtUserGetIconInfo
(
HICON
icon
,
ICONINFO
*
info
,
UNICODE_STRING
*
module
,
UNICODE_STRING
*
res_name
,
DWORD
*
bpp
,
LONG
unk
);
UNICODE_STRING
*
res_name
,
DWORD
*
bpp
,
LONG
unk
);
BOOL
WINAPI
NtUserGetIconSize
(
HICON
handle
,
UINT
step
,
LONG
*
width
,
LONG
*
height
);
BOOL
WINAPI
NtUserGetIconSize
(
HICON
handle
,
UINT
step
,
LONG
*
width
,
LONG
*
height
);
UINT
WINAPI
NtUserGetInternalWindowPos
(
HWND
hwnd
,
RECT
*
rect
,
POINT
*
pt
);
INT
WINAPI
NtUserGetKeyNameText
(
LONG
lparam
,
WCHAR
*
buffer
,
INT
size
);
INT
WINAPI
NtUserGetKeyNameText
(
LONG
lparam
,
WCHAR
*
buffer
,
INT
size
);
SHORT
WINAPI
NtUserGetKeyState
(
INT
vkey
);
SHORT
WINAPI
NtUserGetKeyState
(
INT
vkey
);
HKL
WINAPI
NtUserGetKeyboardLayout
(
DWORD
thread_id
);
HKL
WINAPI
NtUserGetKeyboardLayout
(
DWORD
thread_id
);
...
...
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