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
c05c4452
Commit
c05c4452
authored
Dec 05, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
Dec 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
strmbase: Create the video window with the correct styles.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
cb6d6f5d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
13 deletions
+14
-13
videorenderer.c
dlls/quartz/tests/videorenderer.c
+4
-4
vmr7.c
dlls/quartz/tests/vmr7.c
+4
-4
vmr9.c
dlls/quartz/tests/vmr9.c
+4
-4
window.c
dlls/strmbase/window.c
+2
-1
No files found.
dlls/quartz/tests/videorenderer.c
View file @
c05c4452
...
...
@@ -1391,11 +1391,11 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw
hr
=
IVideoWindow_get_WindowStyle
(
window
,
&
style
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
todo_wine
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
|
WS_OVERLAPPEDWINDOW
),
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
style
=
GetWindowLongA
(
hwnd
,
GWL_STYLE
);
todo_wine
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
|
WS_OVERLAPPEDWINDOW
),
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
hr
=
IVideoWindow_put_WindowStyle
(
window
,
style
|
WS_DISABLED
);
...
...
@@ -1414,10 +1414,10 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw
hr
=
IVideoWindow_get_WindowStyle
(
window
,
&
style
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
todo_wine
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
style
=
GetWindowLongA
(
hwnd
,
GWL_STYLE
);
todo_wine
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
ok
(
GetActiveWindow
()
==
our_hwnd
,
"Got active window %p.
\n
"
,
GetActiveWindow
());
...
...
dlls/quartz/tests/vmr7.c
View file @
c05c4452
...
...
@@ -1525,11 +1525,11 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw
hr
=
IVideoWindow_get_WindowStyle
(
window
,
&
style
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
todo_wine
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
|
WS_OVERLAPPEDWINDOW
),
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
style
=
GetWindowLongA
(
hwnd
,
GWL_STYLE
);
todo_wine
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
|
WS_OVERLAPPEDWINDOW
),
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
hr
=
IVideoWindow_put_WindowStyle
(
window
,
style
|
WS_DISABLED
);
...
...
@@ -1548,10 +1548,10 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw
hr
=
IVideoWindow_get_WindowStyle
(
window
,
&
style
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
todo_wine
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
style
=
GetWindowLongA
(
hwnd
,
GWL_STYLE
);
todo_wine
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
ok
(
GetActiveWindow
()
==
our_hwnd
,
"Got active window %p.
\n
"
,
GetActiveWindow
());
...
...
dlls/quartz/tests/vmr9.c
View file @
c05c4452
...
...
@@ -1525,11 +1525,11 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw
hr
=
IVideoWindow_get_WindowStyle
(
window
,
&
style
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
todo_wine
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
|
WS_OVERLAPPEDWINDOW
),
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
style
=
GetWindowLongA
(
hwnd
,
GWL_STYLE
);
todo_wine
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
|
WS_OVERLAPPEDWINDOW
),
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
hr
=
IVideoWindow_put_WindowStyle
(
window
,
style
|
WS_DISABLED
);
...
...
@@ -1548,10 +1548,10 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw
hr
=
IVideoWindow_get_WindowStyle
(
window
,
&
style
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
todo_wine
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
style
=
GetWindowLongA
(
hwnd
,
GWL_STYLE
);
todo_wine
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
ok
(
style
==
(
WS_CLIPSIBLINGS
|
WS_OVERLAPPEDWINDOW
),
"Got style %#x.
\n
"
,
style
);
ok
(
GetActiveWindow
()
==
our_hwnd
,
"Got active window %p.
\n
"
,
GetActiveWindow
());
...
...
dlls/strmbase/window.c
View file @
c05c4452
...
...
@@ -118,7 +118,8 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This)
return
E_FAIL
;
}
This
->
hWnd
=
CreateWindowExW
(
0
,
class_nameW
,
windownameW
,
WS_SIZEBOX
,
This
->
hWnd
=
CreateWindowExW
(
0
,
class_nameW
,
windownameW
,
WS_OVERLAPPEDWINDOW
|
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
,
CW_USEDEFAULT
,
CW_USEDEFAULT
,
CW_USEDEFAULT
,
CW_USEDEFAULT
,
NULL
,
NULL
,
NULL
,
NULL
);
...
...
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