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
60f6a37f
Commit
60f6a37f
authored
May 14, 2021
by
Rémi Bernon
Committed by
Alexandre Julliard
May 17, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Add a default ShowWindow implementation.
Signed-off-by:
Rémi Bernon
<
rbernon@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
07b9f3f6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
driver.c
dlls/user32/driver.c
+1
-1
winpos.c
dlls/user32/winpos.c
+10
-1
No files found.
dlls/user32/driver.c
View file @
60f6a37f
...
@@ -356,7 +356,7 @@ static void CDECL nulldrv_SetWindowText( HWND hwnd, LPCWSTR text )
...
@@ -356,7 +356,7 @@ static void CDECL nulldrv_SetWindowText( HWND hwnd, LPCWSTR text )
static
UINT
CDECL
nulldrv_ShowWindow
(
HWND
hwnd
,
INT
cmd
,
RECT
*
rect
,
UINT
swp
)
static
UINT
CDECL
nulldrv_ShowWindow
(
HWND
hwnd
,
INT
cmd
,
RECT
*
rect
,
UINT
swp
)
{
{
return
swp
;
return
~
0
;
/* use default implementation */
}
}
static
LRESULT
CDECL
nulldrv_SysCommand
(
HWND
hwnd
,
WPARAM
wparam
,
LPARAM
lparam
)
static
LRESULT
CDECL
nulldrv_SysCommand
(
HWND
hwnd
,
WPARAM
wparam
,
LPARAM
lparam
)
...
...
dlls/user32/winpos.c
View file @
60f6a37f
...
@@ -1118,7 +1118,16 @@ static BOOL show_window( HWND hwnd, INT cmd )
...
@@ -1118,7 +1118,16 @@ static BOOL show_window( HWND hwnd, INT cmd )
}
}
if
(
IsRectEmpty
(
&
newPos
))
new_swp
=
swp
;
if
(
IsRectEmpty
(
&
newPos
))
new_swp
=
swp
;
else
new_swp
=
USER_Driver
->
pShowWindow
(
hwnd
,
cmd
,
&
newPos
,
swp
);
else
if
((
new_swp
=
USER_Driver
->
pShowWindow
(
hwnd
,
cmd
,
&
newPos
,
swp
))
==
~
0
)
{
if
(
GetWindowLongW
(
hwnd
,
GWL_STYLE
)
&
WS_CHILD
)
new_swp
=
swp
;
else
if
(
IsIconic
(
hwnd
)
&&
(
newPos
.
left
!=
-
32000
||
newPos
.
top
!=
-
32000
))
{
OffsetRect
(
&
newPos
,
-
32000
-
newPos
.
left
,
-
32000
-
newPos
.
top
);
new_swp
=
swp
&
~
(
SWP_NOMOVE
|
SWP_NOCLIENTMOVE
);
}
else
new_swp
=
swp
;
}
swp
=
new_swp
;
swp
=
new_swp
;
parent
=
GetAncestor
(
hwnd
,
GA_PARENT
);
parent
=
GetAncestor
(
hwnd
,
GA_PARENT
);
...
...
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