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
2ba20dd7
Commit
2ba20dd7
authored
Jan 23, 2006
by
Robert Reif
Committed by
Alexandre Julliard
Jan 23, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winearts: Try to keep winecfg from crashing by recovering from an arts
library crash.
parent
53496f83
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
4 deletions
+18
-4
Makefile.in
dlls/winmm/winearts/Makefile.in
+1
-1
audio.c
dlls/winmm/winearts/audio.c
+17
-3
No files found.
dlls/winmm/winearts/Makefile.in
View file @
2ba20dd7
...
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
...
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR
=
@srcdir@
SRCDIR
=
@srcdir@
VPATH
=
@srcdir@
VPATH
=
@srcdir@
MODULE
=
winearts.drv
MODULE
=
winearts.drv
IMPORTS
=
winmm user32 kernel32
IMPORTS
=
winmm user32 kernel32
ntdll
EXTRAINCL
=
@ARTSINCL@
EXTRAINCL
=
@ARTSINCL@
EXTRALIBS
=
@ARTSLIBS@
-ldxguid
-luuid
EXTRALIBS
=
@ARTSLIBS@
-ldxguid
-luuid
...
...
dlls/winmm/winearts/audio.c
View file @
2ba20dd7
...
@@ -57,6 +57,7 @@
...
@@ -57,6 +57,7 @@
#include "dsdriver.h"
#include "dsdriver.h"
#include "arts.h"
#include "arts.h"
#include "wine/unicode.h"
#include "wine/unicode.h"
#include "wine/exception.h"
#include "wine/debug.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL
(
wave
);
WINE_DEFAULT_DEBUG_CHANNEL
(
wave
);
...
@@ -392,14 +393,27 @@ LONG ARTS_WaveInit(void)
...
@@ -392,14 +393,27 @@ LONG ARTS_WaveInit(void)
{
{
int
i
;
int
i
;
int
errorcode
;
int
errorcode
;
LONG
ret
=
0
;
TRACE
(
"called
\n
"
);
TRACE
(
"called
\n
"
);
if
((
errorcode
=
ARTS_Init
())
<
0
)
__TRY
{
{
WARN
(
"arts_init() failed (%d)
\n
"
,
errorcode
);
if
((
errorcode
=
ARTS_Init
())
<
0
)
return
-
1
;
{
WARN
(
"arts_init() failed (%d)
\n
"
,
errorcode
);
ret
=
-
1
;
}
}
}
__EXCEPT_PAGE_FAULT
{
ERR
(
"arts_init() crashed
\n
"
);
ret
=
-
1
;
}
__ENDTRY
if
(
ret
)
return
ret
;
/* initialize all device handles to -1 */
/* initialize all device handles to -1 */
for
(
i
=
0
;
i
<
MAX_WAVEOUTDRV
;
++
i
)
for
(
i
=
0
;
i
<
MAX_WAVEOUTDRV
;
++
i
)
...
...
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