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
ed928dc4
Commit
ed928dc4
authored
Nov 08, 2021
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 08, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win32u: Move NtUserRemoveProp implementation from user32.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
32ea3ec7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
42 additions
and
13 deletions
+42
-13
property.c
dlls/user32/property.c
+1
-12
syscall.c
dlls/win32u/syscall.c
+1
-0
win32u.c
dlls/win32u/tests/win32u.c
+6
-0
win32u.spec
dlls/win32u/win32u.spec
+1
-1
window.c
dlls/win32u/window.c
+24
-0
syscall.h
dlls/wow64win/syscall.h
+1
-0
user.c
dlls/wow64win/user.c
+8
-0
No files found.
dlls/user32/property.c
View file @
ed928dc4
...
@@ -170,18 +170,7 @@ HANDLE WINAPI RemovePropA( HWND hwnd, LPCSTR str )
...
@@ -170,18 +170,7 @@ HANDLE WINAPI RemovePropA( HWND hwnd, LPCSTR str )
*/
*/
HANDLE
WINAPI
RemovePropW
(
HWND
hwnd
,
LPCWSTR
str
)
HANDLE
WINAPI
RemovePropW
(
HWND
hwnd
,
LPCWSTR
str
)
{
{
ULONG_PTR
ret
=
0
;
return
NtUserRemoveProp
(
hwnd
,
str
);
SERVER_START_REQ
(
remove_window_property
)
{
req
->
window
=
wine_server_user_handle
(
hwnd
);
if
(
IS_INTRESOURCE
(
str
))
req
->
atom
=
LOWORD
(
str
);
else
wine_server_add_data
(
req
,
str
,
lstrlenW
(
str
)
*
sizeof
(
WCHAR
)
);
if
(
!
wine_server_call_err
(
req
))
ret
=
reply
->
data
;
}
SERVER_END_REQ
;
return
(
HANDLE
)
ret
;
}
}
...
...
dlls/win32u/syscall.c
View file @
ed928dc4
...
@@ -113,6 +113,7 @@ static void * const syscalls[] =
...
@@ -113,6 +113,7 @@ static void * const syscalls[] =
NtUserOpenDesktop
,
NtUserOpenDesktop
,
NtUserOpenInputDesktop
,
NtUserOpenInputDesktop
,
NtUserOpenWindowStation
,
NtUserOpenWindowStation
,
NtUserRemoveProp
,
NtUserSetObjectInformation
,
NtUserSetObjectInformation
,
NtUserSetProcessWindowStation
,
NtUserSetProcessWindowStation
,
NtUserSetProp
,
NtUserSetProp
,
...
...
dlls/win32u/tests/win32u.c
View file @
ed928dc4
...
@@ -52,6 +52,12 @@ static void test_window_props(void)
...
@@ -52,6 +52,12 @@ static void test_window_props(void)
prop
=
NtUserGetProp
(
hwnd
,
UlongToPtr
(
atom
)
);
prop
=
NtUserGetProp
(
hwnd
,
UlongToPtr
(
atom
)
);
ok
(
prop
==
UlongToHandle
(
0xdeadbeef
),
"prop = %p
\n
"
,
prop
);
ok
(
prop
==
UlongToHandle
(
0xdeadbeef
),
"prop = %p
\n
"
,
prop
);
prop
=
NtUserRemoveProp
(
hwnd
,
UlongToPtr
(
atom
)
);
ok
(
prop
==
UlongToHandle
(
0xdeadbeef
),
"prop = %p
\n
"
,
prop
);
prop
=
GetPropW
(
hwnd
,
L"test"
);
ok
(
!
prop
,
"prop = %p
\n
"
,
prop
);
GlobalDeleteAtom
(
atom
);
GlobalDeleteAtom
(
atom
);
DestroyWindow
(
hwnd
);
DestroyWindow
(
hwnd
);
}
}
...
...
dlls/win32u/win32u.spec
View file @
ed928dc4
...
@@ -1148,7 +1148,7 @@
...
@@ -1148,7 +1148,7 @@
@ stub NtUserRemoveClipboardFormatListener
@ stub NtUserRemoveClipboardFormatListener
@ stub NtUserRemoveInjectionDevice
@ stub NtUserRemoveInjectionDevice
@ stub NtUserRemoveMenu
@ stub NtUserRemoveMenu
@ st
ub NtUserRemoveProp
@ st
dcall -syscall NtUserRemoveProp(long wstr)
@ stub NtUserRemoveVisualIdentifier
@ stub NtUserRemoveVisualIdentifier
@ stub NtUserReportInertia
@ stub NtUserReportInertia
@ stub NtUserRequestMoveSizeOperation
@ stub NtUserRequestMoveSizeOperation
...
...
dlls/win32u/window.c
View file @
ed928dc4
...
@@ -70,6 +70,30 @@ BOOL WINAPI NtUserSetProp( HWND hwnd, const WCHAR *str, HANDLE handle )
...
@@ -70,6 +70,30 @@ BOOL WINAPI NtUserSetProp( HWND hwnd, const WCHAR *str, HANDLE handle )
return
ret
;
return
ret
;
}
}
/***********************************************************************
* NtUserRemoveProp (win32u.@)
*
* NOTE Native allows only ATOMs as the second argument. We allow strings
* to save extra server call in RemovePropW.
*/
HANDLE
WINAPI
NtUserRemoveProp
(
HWND
hwnd
,
const
WCHAR
*
str
)
{
ULONG_PTR
ret
=
0
;
SERVER_START_REQ
(
remove_window_property
)
{
req
->
window
=
wine_server_user_handle
(
hwnd
);
if
(
IS_INTRESOURCE
(
str
))
req
->
atom
=
LOWORD
(
str
);
else
wine_server_add_data
(
req
,
str
,
lstrlenW
(
str
)
*
sizeof
(
WCHAR
)
);
if
(
!
wine_server_call_err
(
req
))
ret
=
reply
->
data
;
}
SERVER_END_REQ
;
return
(
HANDLE
)
ret
;
}
/*****************************************************************************
/*****************************************************************************
* NtUserGetLayeredWindowAttributes (win32u.@)
* NtUserGetLayeredWindowAttributes (win32u.@)
*/
*/
...
...
dlls/wow64win/syscall.h
View file @
ed928dc4
...
@@ -100,6 +100,7 @@
...
@@ -100,6 +100,7 @@
SYSCALL_ENTRY( NtUserOpenDesktop ) \
SYSCALL_ENTRY( NtUserOpenDesktop ) \
SYSCALL_ENTRY( NtUserOpenInputDesktop ) \
SYSCALL_ENTRY( NtUserOpenInputDesktop ) \
SYSCALL_ENTRY( NtUserOpenWindowStation ) \
SYSCALL_ENTRY( NtUserOpenWindowStation ) \
SYSCALL_ENTRY( NtUserRemoveProp ) \
SYSCALL_ENTRY( NtUserSetObjectInformation ) \
SYSCALL_ENTRY( NtUserSetObjectInformation ) \
SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \
SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \
SYSCALL_ENTRY( NtUserSetProp ) \
SYSCALL_ENTRY( NtUserSetProp ) \
...
...
dlls/wow64win/user.c
View file @
ed928dc4
...
@@ -173,6 +173,14 @@ NTSTATUS WINAPI wow64_NtUserSetProp( UINT *args )
...
@@ -173,6 +173,14 @@ NTSTATUS WINAPI wow64_NtUserSetProp( UINT *args )
return
NtUserSetProp
(
hwnd
,
str
,
handle
);
return
NtUserSetProp
(
hwnd
,
str
,
handle
);
}
}
NTSTATUS
WINAPI
wow64_NtUserRemoveProp
(
UINT
*
args
)
{
HWND
hwnd
=
get_handle
(
&
args
);
const
WCHAR
*
str
=
get_ptr
(
&
args
);
return
HandleToUlong
(
NtUserRemoveProp
(
hwnd
,
str
));
}
NTSTATUS
WINAPI
wow64_NtUserGetLayeredWindowAttributes
(
UINT
*
args
)
NTSTATUS
WINAPI
wow64_NtUserGetLayeredWindowAttributes
(
UINT
*
args
)
{
{
HWND
hwnd
=
get_handle
(
&
args
);
HWND
hwnd
=
get_handle
(
&
args
);
...
...
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