Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
998cc567
Commit
998cc567
authored
Jan 20, 2004
by
Francois Gouget
Committed by
Alexandre Julliard
Jan 20, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add trailing '\n's to ok() calls.
parent
dc70553c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
13 deletions
+13
-13
ddrawmodes.c
dlls/ddraw/tests/ddrawmodes.c
+5
-5
capture.c
dlls/dsound/tests/capture.c
+1
-1
dsound.c
dlls/dsound/tests/dsound.c
+7
-7
No files found.
dlls/ddraw/tests/ddrawmodes.c
View file @
998cc567
...
@@ -65,7 +65,7 @@ static void createdirectdraw()
...
@@ -65,7 +65,7 @@ static void createdirectdraw()
SetFocus
(
hwnd
);
SetFocus
(
hwnd
);
rc
=
DirectDrawCreate
(
NULL
,
&
lpDD
,
NULL
);
rc
=
DirectDrawCreate
(
NULL
,
&
lpDD
,
NULL
);
ok
(
rc
==
DD_OK
,
"DirectDrawCreate returned: %lx"
,
rc
);
ok
(
rc
==
DD_OK
,
"DirectDrawCreate returned: %lx
\n
"
,
rc
);
}
}
static
void
add_mode
(
LPDDSURFACEDESC
lpddsd
)
static
void
add_mode
(
LPDDSURFACEDESC
lpddsd
)
...
@@ -107,7 +107,7 @@ void enumdisplaymodes()
...
@@ -107,7 +107,7 @@ void enumdisplaymodes()
rc
=
IDirectDraw_EnumDisplayModes
(
lpDD
,
rc
=
IDirectDraw_EnumDisplayModes
(
lpDD
,
DDEDM_STANDARDVGAMODES
,
&
ddsd
,
0
,
enummodes_callback
);
DDEDM_STANDARDVGAMODES
,
&
ddsd
,
0
,
enummodes_callback
);
ok
(
rc
==
DD_OK
,
"EnumDisplayModes returned: %lx"
,
rc
);
ok
(
rc
==
DD_OK
,
"EnumDisplayModes returned: %lx
\n
"
,
rc
);
}
}
static
void
setdisplaymode_tests
()
static
void
setdisplaymode_tests
()
...
@@ -121,7 +121,7 @@ static void setdisplaymode_tests()
...
@@ -121,7 +121,7 @@ static void setdisplaymode_tests()
{
{
rc
=
IDirectDraw_SetCooperativeLevel
(
lpDD
,
rc
=
IDirectDraw_SetCooperativeLevel
(
lpDD
,
hwnd
,
DDSCL_ALLOWMODEX
|
DDSCL_EXCLUSIVE
|
DDSCL_FULLSCREEN
);
hwnd
,
DDSCL_ALLOWMODEX
|
DDSCL_EXCLUSIVE
|
DDSCL_FULLSCREEN
);
ok
(
rc
==
DD_OK
,
"SetCooperativeLevel returned: %lx"
,
rc
);
ok
(
rc
==
DD_OK
,
"SetCooperativeLevel returned: %lx
\n
"
,
rc
);
if
(
modes
[
i
].
dwFlags
&
DDSD_PIXELFORMAT
)
if
(
modes
[
i
].
dwFlags
&
DDSD_PIXELFORMAT
)
{
{
if
(
modes
[
i
].
ddpfPixelFormat
.
dwFlags
&
DDPF_RGB
)
if
(
modes
[
i
].
ddpfPixelFormat
.
dwFlags
&
DDPF_RGB
)
...
@@ -129,9 +129,9 @@ static void setdisplaymode_tests()
...
@@ -129,9 +129,9 @@ static void setdisplaymode_tests()
rc
=
IDirectDraw_SetDisplayMode
(
lpDD
,
rc
=
IDirectDraw_SetDisplayMode
(
lpDD
,
modes
[
i
].
dwWidth
,
modes
[
i
].
dwHeight
,
modes
[
i
].
dwWidth
,
modes
[
i
].
dwHeight
,
modes
[
i
].
ddpfPixelFormat
.
UNION_MEMBER
(
1
,
dwRGBBitCount
));
modes
[
i
].
ddpfPixelFormat
.
UNION_MEMBER
(
1
,
dwRGBBitCount
));
ok
(
rc
==
DD_OK
,
"SetDisplayMode returned: %lx"
,
rc
);
ok
(
rc
==
DD_OK
,
"SetDisplayMode returned: %lx
\n
"
,
rc
);
rc
=
IDirectDraw_RestoreDisplayMode
(
lpDD
);
rc
=
IDirectDraw_RestoreDisplayMode
(
lpDD
);
ok
(
rc
==
DD_OK
,
"RestoreDisplayMode returned: %lx"
,
rc
);
ok
(
rc
==
DD_OK
,
"RestoreDisplayMode returned: %lx
\n
"
,
rc
);
}
}
}
}
}
}
...
...
dlls/dsound/tests/capture.c
View file @
998cc567
...
@@ -228,7 +228,7 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco,
...
@@ -228,7 +228,7 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco,
rc
=
IDirectSoundCaptureBuffer_GetStatus
(
dscbo
,
&
status
);
rc
=
IDirectSoundCaptureBuffer_GetStatus
(
dscbo
,
&
status
);
ok
(
rc
==
DS_OK
,
"GetStatus failed: 0x%lx
\n
"
,
rc
);
ok
(
rc
==
DS_OK
,
"GetStatus failed: 0x%lx
\n
"
,
rc
);
ok
(
status
==
(
DSCBSTATUS_CAPTURING
|
DSCBSTATUS_LOOPING
),
ok
(
status
==
(
DSCBSTATUS_CAPTURING
|
DSCBSTATUS_LOOPING
),
"GetStatus: bad status: %lx"
,
status
);
"GetStatus: bad status: %lx
\n
"
,
status
);
if
(
rc
!=
DS_OK
)
if
(
rc
!=
DS_OK
)
return
;
return
;
...
...
dlls/dsound/tests/dsound.c
View file @
998cc567
...
@@ -146,7 +146,7 @@ static int buffer_refill(play_state_t* state, DWORD size)
...
@@ -146,7 +146,7 @@ static int buffer_refill(play_state_t* state, DWORD size)
rc
=
IDirectSoundBuffer_Lock
(
state
->
dsbo
,
state
->
offset
,
size
,
rc
=
IDirectSoundBuffer_Lock
(
state
->
dsbo
,
state
->
offset
,
size
,
&
ptr1
,
&
len1
,
&
ptr2
,
&
len2
,
0
);
&
ptr1
,
&
len1
,
&
ptr2
,
&
len2
,
0
);
ok
(
rc
==
DS_OK
,
"Lock: 0x%lx"
,
rc
);
ok
(
rc
==
DS_OK
,
"Lock: 0x%lx
\n
"
,
rc
);
if
(
rc
!=
DS_OK
)
if
(
rc
!=
DS_OK
)
return
-
1
;
return
-
1
;
...
@@ -158,7 +158,7 @@ static int buffer_refill(play_state_t* state, DWORD size)
...
@@ -158,7 +158,7 @@ static int buffer_refill(play_state_t* state, DWORD size)
}
}
state
->
offset
=
state
->
written
%
state
->
buffer_size
;
state
->
offset
=
state
->
written
%
state
->
buffer_size
;
rc
=
IDirectSoundBuffer_Unlock
(
state
->
dsbo
,
ptr1
,
len1
,
ptr2
,
len2
);
rc
=
IDirectSoundBuffer_Unlock
(
state
->
dsbo
,
ptr1
,
len1
,
ptr2
,
len2
);
ok
(
rc
==
DS_OK
,
"Unlock: 0x%lx"
,
rc
);
ok
(
rc
==
DS_OK
,
"Unlock: 0x%lx
\n
"
,
rc
);
if
(
rc
!=
DS_OK
)
if
(
rc
!=
DS_OK
)
return
-
1
;
return
-
1
;
return
size
;
return
size
;
...
@@ -173,7 +173,7 @@ static int buffer_silence(play_state_t* state, DWORD size)
...
@@ -173,7 +173,7 @@ static int buffer_silence(play_state_t* state, DWORD size)
rc
=
IDirectSoundBuffer_Lock
(
state
->
dsbo
,
state
->
offset
,
size
,
rc
=
IDirectSoundBuffer_Lock
(
state
->
dsbo
,
state
->
offset
,
size
,
&
ptr1
,
&
len1
,
&
ptr2
,
&
len2
,
0
);
&
ptr1
,
&
len1
,
&
ptr2
,
&
len2
,
0
);
ok
(
rc
==
DS_OK
,
"Lock: 0x%lx"
,
rc
);
ok
(
rc
==
DS_OK
,
"Lock: 0x%lx
\n
"
,
rc
);
if
(
rc
!=
DS_OK
)
if
(
rc
!=
DS_OK
)
return
-
1
;
return
-
1
;
...
@@ -184,7 +184,7 @@ static int buffer_silence(play_state_t* state, DWORD size)
...
@@ -184,7 +184,7 @@ static int buffer_silence(play_state_t* state, DWORD size)
}
}
state
->
offset
=
(
state
->
offset
+
size
)
%
state
->
buffer_size
;
state
->
offset
=
(
state
->
offset
+
size
)
%
state
->
buffer_size
;
rc
=
IDirectSoundBuffer_Unlock
(
state
->
dsbo
,
ptr1
,
len1
,
ptr2
,
len2
);
rc
=
IDirectSoundBuffer_Unlock
(
state
->
dsbo
,
ptr1
,
len1
,
ptr2
,
len2
);
ok
(
rc
==
DS_OK
,
"Unlock: 0x%lx"
,
rc
);
ok
(
rc
==
DS_OK
,
"Unlock: 0x%lx
\n
"
,
rc
);
if
(
rc
!=
DS_OK
)
if
(
rc
!=
DS_OK
)
return
-
1
;
return
-
1
;
return
size
;
return
size
;
...
@@ -196,7 +196,7 @@ static int buffer_service(play_state_t* state)
...
@@ -196,7 +196,7 @@ static int buffer_service(play_state_t* state)
HRESULT
rc
;
HRESULT
rc
;
rc
=
IDirectSoundBuffer_GetCurrentPosition
(
state
->
dsbo
,
&
play_pos
,
&
write_pos
);
rc
=
IDirectSoundBuffer_GetCurrentPosition
(
state
->
dsbo
,
&
play_pos
,
&
write_pos
);
ok
(
rc
==
DS_OK
,
"GetCurrentPosition: %lx"
,
rc
);
ok
(
rc
==
DS_OK
,
"GetCurrentPosition: %lx
\n
"
,
rc
);
if
(
rc
!=
DS_OK
)
{
if
(
rc
!=
DS_OK
)
{
goto
STOP
;
goto
STOP
;
}
}
...
@@ -249,7 +249,7 @@ STOP:
...
@@ -249,7 +249,7 @@ STOP:
if
(
winetest_debug
>
1
)
if
(
winetest_debug
>
1
)
trace
(
"stopping playback
\n
"
);
trace
(
"stopping playback
\n
"
);
rc
=
IDirectSoundBuffer_Stop
(
state
->
dsbo
);
rc
=
IDirectSoundBuffer_Stop
(
state
->
dsbo
);
ok
(
rc
==
DS_OK
,
"Stop failed: rc=%ld"
,
rc
);
ok
(
rc
==
DS_OK
,
"Stop failed: rc=%ld
\n
"
,
rc
);
return
0
;
return
0
;
}
}
...
@@ -478,7 +478,7 @@ static void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER dsbo,
...
@@ -478,7 +478,7 @@ static void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER dsbo,
rc
=
IDirectSoundBuffer_GetStatus
(
dsbo
,
&
status
);
rc
=
IDirectSoundBuffer_GetStatus
(
dsbo
,
&
status
);
ok
(
rc
==
DS_OK
,
"GetStatus failed: 0x%lx
\n
"
,
rc
);
ok
(
rc
==
DS_OK
,
"GetStatus failed: 0x%lx
\n
"
,
rc
);
ok
(
status
==
(
DSBSTATUS_PLAYING
|
DSBSTATUS_LOOPING
),
ok
(
status
==
(
DSBSTATUS_PLAYING
|
DSBSTATUS_LOOPING
),
"GetStatus: bad status: %lx"
,
status
);
"GetStatus: bad status: %lx
\n
"
,
status
);
if
(
listener
)
{
if
(
listener
)
{
ZeroMemory
(
&
listener_param
,
sizeof
(
listener_param
));
ZeroMemory
(
&
listener_param
,
sizeof
(
listener_param
));
...
...
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