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
3ef1d6bc
Commit
3ef1d6bc
authored
Jan 26, 2015
by
Stefan Dösinger
Committed by
Alexandre Julliard
Jan 28, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass WM_SYSCOMMAND(SC_RESTORE) to DefWindowProc.
parent
4d05cfe5
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
8 deletions
+19
-8
directx.c
dlls/d3d8/directx.c
+1
-1
device.c
dlls/d3d8/tests/device.c
+2
-2
directx.c
dlls/d3d9/directx.c
+1
-1
d3d9ex.c
dlls/d3d9/tests/d3d9ex.c
+2
-2
device.c
dlls/d3d9/tests/device.c
+2
-2
device.c
dlls/wined3d/device.c
+10
-0
wined3d.h
include/wine/wined3d.h
+1
-0
No files found.
dlls/d3d8/directx.c
View file @
3ef1d6bc
...
...
@@ -404,7 +404,7 @@ static const struct IDirect3D8Vtbl d3d8_vtbl =
BOOL
d3d8_init
(
struct
d3d8
*
d3d8
)
{
DWORD
flags
=
WINED3D_LEGACY_DEPTH_BIAS
|
WINED3D_VIDMEM_ACCOUNTING
;
DWORD
flags
=
WINED3D_LEGACY_DEPTH_BIAS
|
WINED3D_VIDMEM_ACCOUNTING
|
WINED3D_HANDLE_RESTORE
;
d3d8
->
IDirect3D8_iface
.
lpVtbl
=
&
d3d8_vtbl
;
d3d8
->
refcount
=
1
;
...
...
dlls/d3d8/tests/device.c
View file @
3ef1d6bc
...
...
@@ -2622,7 +2622,7 @@ static void test_wndproc(void)
expect_messages
=
sc_restore_messages
;
SendMessageA
(
focus_window
,
WM_SYSCOMMAND
,
SC_RESTORE
,
0
);
todo_wine
ok
(
!
expect_messages
->
message
,
"Expected message %#x for window %#x, but didn't receive it.
\n
"
,
ok
(
!
expect_messages
->
message
,
"Expected message %#x for window %#x, but didn't receive it.
\n
"
,
expect_messages
->
message
,
expect_messages
->
window
);
expect_messages
=
NULL
;
flush_events
();
...
...
@@ -2699,7 +2699,7 @@ static void test_wndproc(void)
expect_messages
=
sc_restore_messages
;
SendMessageA
(
focus_window
,
WM_SYSCOMMAND
,
SC_RESTORE
,
0
);
todo_wine
ok
(
!
expect_messages
->
message
,
"Expected message %#x for window %#x, but didn't receive it.
\n
"
,
ok
(
!
expect_messages
->
message
,
"Expected message %#x for window %#x, but didn't receive it.
\n
"
,
expect_messages
->
message
,
expect_messages
->
window
);
expect_messages
=
NULL
;
flush_events
();
...
...
dlls/d3d9/directx.c
View file @
3ef1d6bc
...
...
@@ -636,7 +636,7 @@ static const struct IDirect3D9ExVtbl d3d9_vtbl =
BOOL
d3d9_init
(
struct
d3d9
*
d3d9
,
BOOL
extended
)
{
DWORD
flags
=
WINED3D_PRESENT_CONVERSION
;
DWORD
flags
=
WINED3D_PRESENT_CONVERSION
|
WINED3D_HANDLE_RESTORE
;
if
(
!
extended
)
flags
|=
WINED3D_VIDMEM_ACCOUNTING
;
...
...
dlls/d3d9/tests/d3d9ex.c
View file @
3ef1d6bc
...
...
@@ -2172,7 +2172,7 @@ static void test_wndproc(void)
expect_messages
=
sc_restore_messages
;
SendMessageA
(
focus_window
,
WM_SYSCOMMAND
,
SC_RESTORE
,
0
);
todo_wine
ok
(
!
expect_messages
->
message
,
"Expected message %#x for window %#x, but didn't receive it, i=%u.
\n
"
,
ok
(
!
expect_messages
->
message
,
"Expected message %#x for window %#x, but didn't receive it, i=%u.
\n
"
,
expect_messages
->
message
,
expect_messages
->
window
,
i
);
expect_messages
=
NULL
;
flush_events
();
...
...
@@ -2249,7 +2249,7 @@ static void test_wndproc(void)
expect_messages
=
sc_restore_messages
;
SendMessageA
(
focus_window
,
WM_SYSCOMMAND
,
SC_RESTORE
,
0
);
todo_wine
ok
(
!
expect_messages
->
message
,
"Expected message %#x for window %#x, but didn't receive it, i=%u.
\n
"
,
ok
(
!
expect_messages
->
message
,
"Expected message %#x for window %#x, but didn't receive it, i=%u.
\n
"
,
expect_messages
->
message
,
expect_messages
->
window
,
i
);
expect_messages
=
NULL
;
flush_events
();
...
...
dlls/d3d9/tests/device.c
View file @
3ef1d6bc
...
...
@@ -3606,7 +3606,7 @@ static void test_wndproc(void)
expect_messages
=
sc_restore_messages
;
SendMessageA
(
focus_window
,
WM_SYSCOMMAND
,
SC_RESTORE
,
0
);
todo_wine
ok
(
!
expect_messages
->
message
,
"Expected message %#x for window %#x, but didn't receive it, i=%u.
\n
"
,
ok
(
!
expect_messages
->
message
,
"Expected message %#x for window %#x, but didn't receive it, i=%u.
\n
"
,
expect_messages
->
message
,
expect_messages
->
window
,
i
);
expect_messages
=
NULL
;
flush_events
();
...
...
@@ -3690,7 +3690,7 @@ static void test_wndproc(void)
expect_messages
=
sc_restore_messages
;
SendMessageA
(
focus_window
,
WM_SYSCOMMAND
,
SC_RESTORE
,
0
);
todo_wine
ok
(
!
expect_messages
->
message
,
"Expected message %#x for window %#x, but didn't receive it, i=%u.
\n
"
,
ok
(
!
expect_messages
->
message
,
"Expected message %#x for window %#x, but didn't receive it, i=%u.
\n
"
,
expect_messages
->
message
,
expect_messages
->
window
,
i
);
expect_messages
=
NULL
;
flush_events
();
...
...
dlls/wined3d/device.c
View file @
3ef1d6bc
...
...
@@ -5018,6 +5018,16 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
device
->
device_parent
->
ops
->
activate
(
device
->
device_parent
,
wparam
);
}
else
if
(
message
==
WM_SYSCOMMAND
)
{
if
(
wparam
==
SC_RESTORE
&&
device
->
wined3d
->
flags
&
WINED3D_HANDLE_RESTORE
)
{
if
(
unicode
)
DefWindowProcW
(
window
,
message
,
wparam
,
lparam
);
else
DefWindowProcA
(
window
,
message
,
wparam
,
lparam
);
}
}
if
(
unicode
)
return
CallWindowProcW
(
proc
,
window
,
message
,
wparam
,
lparam
);
...
...
include/wine/wined3d.h
View file @
3ef1d6bc
...
...
@@ -1243,6 +1243,7 @@ enum wined3d_display_rotation
#define WINED3D_PRESENT_CONVERSION 0x00000008
#define WINED3D_RESTORE_MODE_ON_ACTIVATE 0x00000010
#define WINED3D_FOCUS_MESSAGES 0x00000020
#define WINED3D_HANDLE_RESTORE 0x00000040
#define WINED3D_RESZ_CODE 0x7fa05000
...
...
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