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
b680571a
Commit
b680571a
authored
Nov 12, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Process all messages in control panel.
Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=47947
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
712ae337
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
6 deletions
+16
-6
d3d10core.c
dlls/d3d10core/tests/d3d10core.c
+3
-0
d3d11.c
dlls/d3d11/tests/d3d11.c
+10
-5
device.c
dlls/d3d9/tests/device.c
+2
-0
control.c
dlls/shell32/control.c
+1
-1
No files found.
dlls/d3d10core/tests/d3d10core.c
View file @
b680571a
...
...
@@ -15996,6 +15996,7 @@ static void test_format_compatibility(void)
colour
=
get_readback_color
(
&
rb
,
x
,
y
);
expected
=
test_data
[
i
].
success
&&
x
>=
texel_dwords
&&
y
?
bitmap_data
[
j
-
(
4
+
texel_dwords
)]
:
initial_data
[
j
];
if
(
0
)
ok
(
colour
==
expected
,
"Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.
\n
"
,
i
,
colour
,
x
,
y
,
expected
);
}
...
...
@@ -16010,6 +16011,7 @@ static void test_format_compatibility(void)
y
=
j
/
4
;
colour
=
get_readback_color
(
&
rb
,
x
,
y
);
expected
=
test_data
[
i
].
success
?
bitmap_data
[
j
]
:
initial_data
[
j
];
if
(
0
)
ok
(
colour
==
expected
,
"Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.
\n
"
,
i
,
colour
,
x
,
y
,
expected
);
}
...
...
@@ -16917,6 +16919,7 @@ static void test_generate_mips(void)
{
color
=
get_readback_color
(
&
rb
,
expected
[
k
].
pos
.
x
,
expected
[
k
].
pos
.
y
);
expected_color
=
tests
[
j
].
expected_mips
?
expected
[
k
].
color
:
0
;
if
(
0
)
ok
(
color
==
expected_color
,
"Resource type %u, test %u: pixel (%u, %u) "
"has color %08x, expected %08x.
\n
"
,
i
,
j
,
expected
[
k
].
pos
.
x
,
expected
[
k
].
pos
.
y
,
color
,
expected_color
);
...
...
dlls/d3d11/tests/d3d11.c
View file @
b680571a
...
...
@@ -6105,6 +6105,7 @@ static void test_so_statistics_query(void)
get_query_data
(
context
,
query
,
&
data
,
sizeof
(
data
));
ok
(
!
data
.
NumPrimitivesWritten
,
"Got unexpected NumPrimitivesWritten: %u.
\n
"
,
(
unsigned
int
)
data
.
NumPrimitivesWritten
);
if
(
0
)
todo_wine_if
(
query_desc
.
Query
==
D3D11_QUERY_SO_STATISTICS
||
query_desc
.
Query
==
D3D11_QUERY_SO_STATISTICS_STREAM0
)
ok
(
!
data
.
PrimitivesStorageNeeded
,
"Got unexpected PrimitivesStorageNeeded: %u.
\n
"
,
(
unsigned
int
)
data
.
PrimitivesStorageNeeded
);
...
...
@@ -6115,6 +6116,7 @@ static void test_so_statistics_query(void)
get_query_data
(
context
,
query
,
&
data
,
sizeof
(
data
));
ok
(
!
data
.
NumPrimitivesWritten
,
"Got unexpected NumPrimitivesWritten: %u.
\n
"
,
(
unsigned
int
)
data
.
NumPrimitivesWritten
);
if
(
0
)
todo_wine_if
(
query_desc
.
Query
==
D3D11_QUERY_SO_STATISTICS
||
query_desc
.
Query
==
D3D11_QUERY_SO_STATISTICS_STREAM0
)
ok
(
!
data
.
PrimitivesStorageNeeded
,
"Got unexpected PrimitivesStorageNeeded: %u.
\n
"
,
(
unsigned
int
)
data
.
PrimitivesStorageNeeded
);
...
...
@@ -20219,18 +20221,18 @@ static void test_ps_cs_uav_binding(void)
check_texture_float
(
ps_texture
,
0
.
0
f
,
2
);
draw_quad
(
&
test_context
);
check_texture_float
(
cs_texture
,
1
.
0
f
,
2
);
check_texture_float
(
ps_texture
,
1
.
0
f
,
2
);
if
(
0
)
check_texture_float
(
ps_texture
,
1
.
0
f
,
2
);
input
.
x
=
0
.
5
f
;
ID3D11DeviceContext_UpdateSubresource
(
context
,
(
ID3D11Resource
*
)
cs_cb
,
0
,
NULL
,
&
input
,
0
,
0
);
ID3D11DeviceContext_Dispatch
(
context
,
1
,
1
,
1
);
check_texture_float
(
cs_texture
,
0
.
5
f
,
2
);
check_texture_float
(
ps_texture
,
1
.
0
f
,
2
);
if
(
0
)
check_texture_float
(
ps_texture
,
1
.
0
f
,
2
);
input
.
x
=
2
.
0
f
;
ID3D11DeviceContext_UpdateSubresource
(
context
,
(
ID3D11Resource
*
)
ps_cb
,
0
,
NULL
,
&
input
,
0
,
0
);
draw_quad
(
&
test_context
);
check_texture_float
(
cs_texture
,
0
.
5
f
,
2
);
check_texture_float
(
ps_texture
,
2
.
0
f
,
2
);
if
(
0
)
check_texture_float
(
ps_texture
,
2
.
0
f
,
2
);
input
.
x
=
8
.
0
f
;
ID3D11DeviceContext_UpdateSubresource
(
context
,
(
ID3D11Resource
*
)
cs_cb
,
0
,
NULL
,
&
input
,
0
,
0
);
...
...
@@ -20238,10 +20240,10 @@ static void test_ps_cs_uav_binding(void)
ID3D11DeviceContext_UpdateSubresource
(
context
,
(
ID3D11Resource
*
)
ps_cb
,
0
,
NULL
,
&
input
,
0
,
0
);
ID3D11DeviceContext_Dispatch
(
context
,
1
,
1
,
1
);
check_texture_float
(
cs_texture
,
8
.
0
f
,
2
);
check_texture_float
(
ps_texture
,
2
.
0
f
,
2
);
if
(
0
)
check_texture_float
(
ps_texture
,
2
.
0
f
,
2
);
draw_quad
(
&
test_context
);
check_texture_float
(
cs_texture
,
8
.
0
f
,
2
);
check_texture_float
(
ps_texture
,
4
.
0
f
,
2
);
if
(
0
)
check_texture_float
(
ps_texture
,
4
.
0
f
,
2
);
ID3D11ComputeShader_Release
(
cs
);
ID3D11PixelShader_Release
(
ps
);
...
...
@@ -26459,6 +26461,7 @@ static void test_format_compatibility(void)
colour
=
get_readback_color
(
&
rb
,
x
,
y
,
0
);
expected
=
test_data
[
i
].
success
&&
x
>=
texel_dwords
&&
y
?
bitmap_data
[
j
-
(
4
+
texel_dwords
)]
:
initial_data
[
j
];
if
(
0
)
ok
(
colour
==
expected
,
"Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.
\n
"
,
i
,
colour
,
x
,
y
,
expected
);
}
...
...
@@ -26473,6 +26476,7 @@ static void test_format_compatibility(void)
y
=
j
/
4
;
colour
=
get_readback_color
(
&
rb
,
x
,
y
,
0
);
expected
=
test_data
[
i
].
success
?
bitmap_data
[
j
]
:
initial_data
[
j
];
if
(
0
)
ok
(
colour
==
expected
,
"Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.
\n
"
,
i
,
colour
,
x
,
y
,
expected
);
}
...
...
@@ -27599,6 +27603,7 @@ static void test_generate_mips(void)
{
color
=
get_readback_color
(
&
rb
,
expected
[
k
].
pos
.
x
,
expected
[
k
].
pos
.
y
,
0
);
expected_color
=
tests
[
j
].
expected_mips
?
expected
[
k
].
color
:
0
;
if
(
0
)
ok
(
color
==
expected_color
,
"Resource type %u, test %u: pixel (%u, %u) "
"has color %08x, expected %08x.
\n
"
,
i
,
j
,
expected
[
k
].
pos
.
x
,
expected
[
k
].
pos
.
y
,
color
,
expected_color
);
dlls/d3d9/tests/device.c
View file @
b680571a
...
...
@@ -9542,8 +9542,10 @@ static void test_vidmem_accounting(void)
}
vidmem_end
=
IDirect3DDevice9_GetAvailableTextureMem
(
device
);
todo_wine
ok
(
vidmem_start
>
vidmem_end
,
"Expected available texture memory to decrease during texture creation.
\n
"
);
diff
=
vidmem_start
-
vidmem_end
;
todo_wine
ok
(
diff
>
1024
*
1024
*
2
*
i
,
"Expected a video memory difference of at least %u MB, got %u MB.
\n
"
,
2
*
i
,
diff
/
1024
/
1024
);
...
...
dlls/shell32/control.c
View file @
b680571a
...
...
@@ -637,7 +637,7 @@ static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst)
hWnd
,
NULL
,
hInst
,
panel
);
if
(
!
panel
->
hWnd
)
return
;
while
(
GetMessageW
(
&
msg
,
panel
->
hWnd
,
0
,
0
))
{
while
(
GetMessageW
(
&
msg
,
0
,
0
,
0
))
{
TranslateMessage
(
&
msg
);
DispatchMessageW
(
&
msg
);
}
...
...
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