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
a0dbd846
Commit
a0dbd846
authored
Mar 26, 2011
by
Jörg Höhle
Committed by
Alexandre Julliard
Mar 30, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winmm: Get rid of psStopEvent which was never used like an event.
parent
ca37dbcf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
playsound.c
dlls/winmm/playsound.c
+4
-3
winmm.c
dlls/winmm/winmm.c
+0
-3
No files found.
dlls/winmm/playsound.c
View file @
a0dbd846
...
@@ -49,6 +49,7 @@ typedef struct tagWINE_PLAYSOUND
...
@@ -49,6 +49,7 @@ typedef struct tagWINE_PLAYSOUND
}
WINE_PLAYSOUND
;
}
WINE_PLAYSOUND
;
static
WINE_PLAYSOUND
*
PlaySoundList
;
static
WINE_PLAYSOUND
*
PlaySoundList
;
static
BOOL
bPlaySoundStop
;
static
HMMIO
get_mmioFromFile
(
LPCWSTR
lpszName
)
static
HMMIO
get_mmioFromFile
(
LPCWSTR
lpszName
)
{
{
...
@@ -426,7 +427,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg)
...
@@ -426,7 +427,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg)
mmioSeek
(
hmmio
,
mmckInfo
.
dwDataOffset
,
SEEK_SET
);
mmioSeek
(
hmmio
,
mmckInfo
.
dwDataOffset
,
SEEK_SET
);
while
(
left
)
while
(
left
)
{
{
if
(
WaitForSingleObject
(
psStopEvent
,
0
)
==
WAIT_OBJECT_0
)
if
(
bPlaySoundStop
)
{
{
waveOutReset
(
hWave
);
waveOutReset
(
hWave
);
wps
->
bLoop
=
FALSE
;
wps
->
bLoop
=
FALSE
;
...
@@ -495,13 +496,13 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo
...
@@ -495,13 +496,13 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo
ResetEvent
(
psLastEvent
);
ResetEvent
(
psLastEvent
);
/* FIXME: doc says we have to stop all instances of pszSound if it's non
/* FIXME: doc says we have to stop all instances of pszSound if it's non
* NULL... as of today, we stop all playing instances */
* NULL... as of today, we stop all playing instances */
SetEvent
(
psStopEvent
)
;
bPlaySoundStop
=
TRUE
;
LeaveCriticalSection
(
&
WINMM_cs
);
LeaveCriticalSection
(
&
WINMM_cs
);
WaitForSingleObject
(
psLastEvent
,
INFINITE
);
WaitForSingleObject
(
psLastEvent
,
INFINITE
);
EnterCriticalSection
(
&
WINMM_cs
);
EnterCriticalSection
(
&
WINMM_cs
);
ResetEvent
(
psStopEvent
)
;
bPlaySoundStop
=
FALSE
;
}
}
if
(
wps
)
wps
->
lpNext
=
PlaySoundList
;
if
(
wps
)
wps
->
lpNext
=
PlaySoundList
;
...
...
dlls/winmm/winmm.c
View file @
a0dbd846
...
@@ -63,7 +63,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm);
...
@@ -63,7 +63,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm);
HINSTANCE
hWinMM32Instance
;
HINSTANCE
hWinMM32Instance
;
HANDLE
psLastEvent
;
HANDLE
psLastEvent
;
HANDLE
psStopEvent
;
static
CRITICAL_SECTION_DEBUG
critsect_debug
=
static
CRITICAL_SECTION_DEBUG
critsect_debug
=
{
{
...
@@ -79,7 +78,6 @@ CRITICAL_SECTION WINMM_cs = { &critsect_debug, -1, 0, 0, 0, 0 };
...
@@ -79,7 +78,6 @@ CRITICAL_SECTION WINMM_cs = { &critsect_debug, -1, 0, 0, 0, 0 };
static
BOOL
WINMM_CreateIData
(
HINSTANCE
hInstDLL
)
static
BOOL
WINMM_CreateIData
(
HINSTANCE
hInstDLL
)
{
{
hWinMM32Instance
=
hInstDLL
;
hWinMM32Instance
=
hInstDLL
;
psStopEvent
=
CreateEventW
(
NULL
,
TRUE
,
FALSE
,
NULL
);
psLastEvent
=
CreateEventW
(
NULL
,
TRUE
,
FALSE
,
NULL
);
psLastEvent
=
CreateEventW
(
NULL
,
TRUE
,
FALSE
,
NULL
);
return
TRUE
;
return
TRUE
;
}
}
...
@@ -93,7 +91,6 @@ static void WINMM_DeleteIData(void)
...
@@ -93,7 +91,6 @@ static void WINMM_DeleteIData(void)
/* FIXME: should also free content and resources allocated
/* FIXME: should also free content and resources allocated
* inside WINMM_IData */
* inside WINMM_IData */
CloseHandle
(
psStopEvent
);
CloseHandle
(
psLastEvent
);
CloseHandle
(
psLastEvent
);
DeleteCriticalSection
(
&
WINMM_cs
);
DeleteCriticalSection
(
&
WINMM_cs
);
}
}
...
...
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