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
387a5f63
Commit
387a5f63
authored
Dec 22, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 23, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Fix the title and class name for the auto ddraw device window.
parent
3e631305
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
14 deletions
+14
-14
ddraw.c
dlls/ddraw/ddraw.c
+1
-1
ddraw_private.h
dlls/ddraw/ddraw_private.h
+1
-1
ddraw1.c
dlls/ddraw/tests/ddraw1.c
+3
-3
ddraw2.c
dlls/ddraw/tests/ddraw2.c
+3
-3
ddraw4.c
dlls/ddraw/tests/ddraw4.c
+3
-3
ddraw7.c
dlls/ddraw/tests/ddraw7.c
+3
-3
No files found.
dlls/ddraw/ddraw.c
View file @
387a5f63
...
...
@@ -831,7 +831,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd,
return
DDERR_NOFOCUSWINDOW
;
}
device_window
=
CreateWindowExA
(
0
,
DDRAW_WINDOW_CLASS_NAME
,
"D
Draw device window
"
,
device_window
=
CreateWindowExA
(
0
,
DDRAW_WINDOW_CLASS_NAME
,
"D
irectDrawDeviceWnd
"
,
WS_POPUP
,
0
,
0
,
GetSystemMetrics
(
SM_CXSCREEN
),
GetSystemMetrics
(
SM_CYSCREEN
),
NULL
,
NULL
,
NULL
,
NULL
);
if
(
!
device_window
)
...
...
dlls/ddraw/ddraw_private.h
View file @
387a5f63
...
...
@@ -120,7 +120,7 @@ struct IDirectDrawImpl
UINT
numConvertedDecls
,
declArraySize
;
};
#define DDRAW_WINDOW_CLASS_NAME "
ddraw_wc
"
#define DDRAW_WINDOW_CLASS_NAME "
DirectDrawDeviceWnd
"
HRESULT
ddraw_init
(
IDirectDrawImpl
*
ddraw
,
enum
wined3d_device_type
device_type
)
DECLSPEC_HIDDEN
;
void
ddraw_destroy_swapchain
(
IDirectDrawImpl
*
ddraw
)
DECLSPEC_HIDDEN
;
...
...
dlls/ddraw/tests/ddraw1.c
View file @
387a5f63
...
...
@@ -91,7 +91,7 @@ static void test_coop_level_create_device_window(void)
|
DDSCL_CREATEDEVICEWINDOW
|
DDSCL_EXCLUSIVE
|
DDSCL_FULLSCREEN
);
ok
(
hr
==
DDERR_NOHWND
,
"Got unexpected hr %#x.
\n
"
,
hr
);
device_window
=
FindWindowA
(
"DirectDrawDeviceWnd"
,
"DirectDrawDeviceWnd"
);
todo_wine
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
hr
=
IDirectDraw_SetCooperativeLevel
(
ddraw
,
NULL
,
DDSCL_NORMAL
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
...
...
@@ -101,7 +101,7 @@ static void test_coop_level_create_device_window(void)
|
DDSCL_CREATEDEVICEWINDOW
|
DDSCL_EXCLUSIVE
|
DDSCL_FULLSCREEN
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
device_window
=
FindWindowA
(
"DirectDrawDeviceWnd"
,
"DirectDrawDeviceWnd"
);
todo_wine
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
hr
=
IDirectDraw_SetCooperativeLevel
(
ddraw
,
NULL
,
DDSCL_NORMAL
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
...
...
@@ -118,7 +118,7 @@ static void test_coop_level_create_device_window(void)
hr
=
IDirectDraw_SetCooperativeLevel
(
ddraw
,
NULL
,
DDSCL_CREATEDEVICEWINDOW
|
DDSCL_EXCLUSIVE
|
DDSCL_FULLSCREEN
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
device_window
=
FindWindowA
(
"DirectDrawDeviceWnd"
,
"DirectDrawDeviceWnd"
);
todo_wine
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
IDirectDraw_Release
(
ddraw
);
DestroyWindow
(
focus_window
);
...
...
dlls/ddraw/tests/ddraw2.c
View file @
387a5f63
...
...
@@ -98,7 +98,7 @@ static void test_coop_level_create_device_window(void)
|
DDSCL_CREATEDEVICEWINDOW
|
DDSCL_EXCLUSIVE
|
DDSCL_FULLSCREEN
);
ok
(
hr
==
DDERR_NOHWND
,
"Got unexpected hr %#x.
\n
"
,
hr
);
device_window
=
FindWindowA
(
"DirectDrawDeviceWnd"
,
"DirectDrawDeviceWnd"
);
todo_wine
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
hr
=
IDirectDraw2_SetCooperativeLevel
(
ddraw
,
NULL
,
DDSCL_NORMAL
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
...
...
@@ -108,7 +108,7 @@ static void test_coop_level_create_device_window(void)
|
DDSCL_CREATEDEVICEWINDOW
|
DDSCL_EXCLUSIVE
|
DDSCL_FULLSCREEN
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
device_window
=
FindWindowA
(
"DirectDrawDeviceWnd"
,
"DirectDrawDeviceWnd"
);
todo_wine
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
hr
=
IDirectDraw2_SetCooperativeLevel
(
ddraw
,
NULL
,
DDSCL_NORMAL
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
...
...
@@ -125,7 +125,7 @@ static void test_coop_level_create_device_window(void)
hr
=
IDirectDraw2_SetCooperativeLevel
(
ddraw
,
NULL
,
DDSCL_CREATEDEVICEWINDOW
|
DDSCL_EXCLUSIVE
|
DDSCL_FULLSCREEN
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
device_window
=
FindWindowA
(
"DirectDrawDeviceWnd"
,
"DirectDrawDeviceWnd"
);
todo_wine
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
IDirectDraw2_Release
(
ddraw
);
DestroyWindow
(
focus_window
);
...
...
dlls/ddraw/tests/ddraw4.c
View file @
387a5f63
...
...
@@ -394,7 +394,7 @@ static void test_coop_level_create_device_window(void)
|
DDSCL_CREATEDEVICEWINDOW
|
DDSCL_EXCLUSIVE
|
DDSCL_FULLSCREEN
);
ok
(
hr
==
DDERR_NOHWND
,
"Got unexpected hr %#x.
\n
"
,
hr
);
device_window
=
FindWindowA
(
"DirectDrawDeviceWnd"
,
"DirectDrawDeviceWnd"
);
todo_wine
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
hr
=
IDirectDraw4_SetCooperativeLevel
(
ddraw
,
NULL
,
DDSCL_NORMAL
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
...
...
@@ -404,7 +404,7 @@ static void test_coop_level_create_device_window(void)
|
DDSCL_CREATEDEVICEWINDOW
|
DDSCL_EXCLUSIVE
|
DDSCL_FULLSCREEN
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
device_window
=
FindWindowA
(
"DirectDrawDeviceWnd"
,
"DirectDrawDeviceWnd"
);
todo_wine
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
hr
=
IDirectDraw4_SetCooperativeLevel
(
ddraw
,
NULL
,
DDSCL_NORMAL
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
...
...
@@ -421,7 +421,7 @@ static void test_coop_level_create_device_window(void)
hr
=
IDirectDraw4_SetCooperativeLevel
(
ddraw
,
NULL
,
DDSCL_CREATEDEVICEWINDOW
|
DDSCL_EXCLUSIVE
|
DDSCL_FULLSCREEN
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
device_window
=
FindWindowA
(
"DirectDrawDeviceWnd"
,
"DirectDrawDeviceWnd"
);
todo_wine
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
IDirectDraw4_Release
(
ddraw
);
DestroyWindow
(
focus_window
);
...
...
dlls/ddraw/tests/ddraw7.c
View file @
387a5f63
...
...
@@ -387,7 +387,7 @@ static void test_coop_level_create_device_window(void)
|
DDSCL_CREATEDEVICEWINDOW
|
DDSCL_EXCLUSIVE
|
DDSCL_FULLSCREEN
);
ok
(
hr
==
DDERR_NOHWND
,
"Got unexpected hr %#x.
\n
"
,
hr
);
device_window
=
FindWindowA
(
"DirectDrawDeviceWnd"
,
"DirectDrawDeviceWnd"
);
todo_wine
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
hr
=
IDirectDraw7_SetCooperativeLevel
(
ddraw
,
NULL
,
DDSCL_NORMAL
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
...
...
@@ -397,7 +397,7 @@ static void test_coop_level_create_device_window(void)
|
DDSCL_CREATEDEVICEWINDOW
|
DDSCL_EXCLUSIVE
|
DDSCL_FULLSCREEN
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
device_window
=
FindWindowA
(
"DirectDrawDeviceWnd"
,
"DirectDrawDeviceWnd"
);
todo_wine
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
hr
=
IDirectDraw7_SetCooperativeLevel
(
ddraw
,
NULL
,
DDSCL_NORMAL
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
...
...
@@ -414,7 +414,7 @@ static void test_coop_level_create_device_window(void)
hr
=
IDirectDraw7_SetCooperativeLevel
(
ddraw
,
NULL
,
DDSCL_CREATEDEVICEWINDOW
|
DDSCL_EXCLUSIVE
|
DDSCL_FULLSCREEN
);
ok
(
hr
==
DD_OK
,
"Got unexpected hr %#x.
\n
"
,
hr
);
device_window
=
FindWindowA
(
"DirectDrawDeviceWnd"
,
"DirectDrawDeviceWnd"
);
todo_wine
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
ok
(
!!
device_window
,
"Device window not found.
\n
"
);
IDirectDraw7_Release
(
ddraw
);
DestroyWindow
(
focus_window
);
...
...
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