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
387b359a
Commit
387b359a
authored
Dec 15, 2010
by
Jörg Höhle
Committed by
Alexandre Julliard
Jan 04, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mciseq: wNotifyDeviceID is redundant.
parent
3ae829d1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
8 deletions
+3
-8
mcimidi.c
dlls/mciseq/mcimidi.c
+3
-8
No files found.
dlls/mciseq/mcimidi.c
View file @
387b359a
...
@@ -61,7 +61,6 @@ typedef struct tagWINE_MCIMIDI {
...
@@ -61,7 +61,6 @@ typedef struct tagWINE_MCIMIDI {
UINT
wDevID
;
/* the MCI one */
UINT
wDevID
;
/* the MCI one */
HMIDI
hMidi
;
HMIDI
hMidi
;
int
nUseCount
;
/* Incremented for each shared open */
int
nUseCount
;
/* Incremented for each shared open */
MCIDEVICEID
wNotifyDeviceID
;
/* MCI device ID with a pending notification */
HANDLE
hCallback
;
/* Callback handle for pending notification */
HANDLE
hCallback
;
/* Callback handle for pending notification */
HMMIO
hFile
;
/* mmio file handle open as Element */
HMMIO
hFile
;
/* mmio file handle open as Element */
LPWSTR
lpstrElementName
;
/* Name of file (if any) */
LPWSTR
lpstrElementName
;
/* Name of file (if any) */
...
@@ -219,7 +218,7 @@ static void MIDI_mciNotify(DWORD_PTR hWndCallBack, WINE_MCIMIDI* wmm, UINT wStat
...
@@ -219,7 +218,7 @@ static void MIDI_mciNotify(DWORD_PTR hWndCallBack, WINE_MCIMIDI* wmm, UINT wStat
/* We simply save one parameter by not passing the wDevID local
/* We simply save one parameter by not passing the wDevID local
* to the command. They are the same (via mciGetDriverData).
* to the command. They are the same (via mciGetDriverData).
*/
*/
MCIDEVICEID
wDevID
=
wmm
->
w
NotifyDevice
ID
;
MCIDEVICEID
wDevID
=
wmm
->
w
Dev
ID
;
HANDLE
old
=
InterlockedExchangePointer
(
&
wmm
->
hCallback
,
NULL
);
HANDLE
old
=
InterlockedExchangePointer
(
&
wmm
->
hCallback
,
NULL
);
if
(
old
)
mciDriverNotify
(
old
,
wDevID
,
MCI_NOTIFY_SUPERSEDED
);
if
(
old
)
mciDriverNotify
(
old
,
wDevID
,
MCI_NOTIFY_SUPERSEDED
);
mciDriverNotify
(
HWND_32
(
LOWORD
(
hWndCallBack
)),
wDevID
,
wStatus
);
mciDriverNotify
(
HWND_32
(
LOWORD
(
hWndCallBack
)),
wDevID
,
wStatus
);
...
@@ -767,7 +766,6 @@ static DWORD MIDI_mciOpen(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_OPEN_PARMSW lp
...
@@ -767,7 +766,6 @@ static DWORD MIDI_mciOpen(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_OPEN_PARMSW lp
wmm
->
lpstrCopyright
=
NULL
;
wmm
->
lpstrCopyright
=
NULL
;
wmm
->
lpstrName
=
NULL
;
wmm
->
lpstrName
=
NULL
;
wmm
->
wNotifyDeviceID
=
wmm
->
wDevID
;
wmm
->
dwStatus
=
MCI_MODE_NOT_READY
;
/* while loading file contents */
wmm
->
dwStatus
=
MCI_MODE_NOT_READY
;
/* while loading file contents */
/* spec says it should be the default format from the MIDI file... */
/* spec says it should be the default format from the MIDI file... */
wmm
->
dwMciTimeFormat
=
MCI_FORMAT_MILLISECONDS
;
wmm
->
dwMciTimeFormat
=
MCI_FORMAT_MILLISECONDS
;
...
@@ -1563,11 +1561,8 @@ static DWORD MIDI_mciSeek(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_SEEK_PARMS lpP
...
@@ -1563,11 +1561,8 @@ static DWORD MIDI_mciSeek(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_SEEK_PARMS lpP
TRACE
(
"Seeking to position=%u ms
\n
"
,
wmm
->
dwPositionMS
);
TRACE
(
"Seeking to position=%u ms
\n
"
,
wmm
->
dwPositionMS
);
if
(
dwFlags
&
MCI_NOTIFY
)
{
if
(
dwFlags
&
MCI_NOTIFY
)
TRACE
(
"MCI_NOTIFY_SUCCESSFUL %08lX !
\n
"
,
lpParms
->
dwCallback
);
MIDI_mciNotify
(
lpParms
->
dwCallback
,
wmm
,
MCI_NOTIFY_SUCCESSFUL
);
mciDriverNotify
(
HWND_32
(
LOWORD
(
lpParms
->
dwCallback
)),
wmm
->
wNotifyDeviceID
,
MCI_NOTIFY_SUCCESSFUL
);
}
}
}
return
ret
;
return
ret
;
}
}
...
...
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