Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
f88d00a2
Commit
f88d00a2
authored
22 years ago
by
Jeff Smith
Committed by
Alexandre Julliard
22 years ago
Browse files
Options
Downloads
Patches
Plain Diff
MMDRV_GetDescription32 fix + a few cosmetic improvements.
parent
b42b9ddb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/winmm/lolvldrv.c
+7
-7
7 additions, 7 deletions
dlls/winmm/lolvldrv.c
dlls/winmm/wineoss/midi.c
+8
-2
8 additions, 2 deletions
dlls/winmm/wineoss/midi.c
with
15 additions
and
9 deletions
dlls/winmm/lolvldrv.c
+
7
−
7
View file @
f88d00a2
...
...
@@ -121,7 +121,7 @@ static BOOL MMDRV_GetDescription32(const char* fname, char* buf, int buflen)
goto
theEnd
;
if
(
!
(
pGetFileVersionInfoA
=
GetProcAddress
(
hmodule
,
"GetFileVersionInfoA"
)))
goto
theEnd
;
if
(
!
(
pVerQueryValueA
=
GetProcAddress
(
hmodule
,
"
p
VerQueryValueA"
)))
if
(
!
(
pVerQueryValueA
=
GetProcAddress
(
hmodule
,
"VerQueryValueA"
)))
goto
theEnd
;
if
(
!
(
dw
=
pGetFileVersionInfoSizeA
(
ofs
.
szPathName
,
&
h
)))
E
((
"Can't get FVIS
\n
"
));
...
...
@@ -166,7 +166,7 @@ UINT MMDRV_GetNum(UINT type)
}
/**************************************************************************
*
WINE
_Message [internal]
*
MMDRV
_Message [internal]
*/
DWORD
MMDRV_Message
(
LPWINE_MLD
mld
,
WORD
wMsg
,
DWORD
dwParam1
,
DWORD
dwParam2
,
BOOL
bFrom32
)
...
...
@@ -178,7 +178,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1,
WINMM_MapType
map
;
int
devID
;
TRACE
(
"(%s %u %u 0x%08lx 0x%08lx 0x%08lx %c)
!
\n
"
,
TRACE
(
"(%s %u %u 0x%08lx 0x%08lx 0x%08lx %c)
\n
"
,
llTypes
[
mld
->
type
].
typestr
,
mld
->
uDeviceID
,
wMsg
,
mld
->
dwDriverInstance
,
dwParam1
,
dwParam2
,
bFrom32
?
'Y'
:
'N'
);
...
...
@@ -212,7 +212,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1,
assert
(
part
->
u
.
fnMessage32
);
if
(
bFrom32
)
{
TRACE
(
"Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx
\n
"
,
TRACE
(
"Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx
)
\n
"
,
mld
->
uDeviceID
,
wMsg
,
mld
->
dwDriverInstance
,
dwParam1
,
dwParam2
);
ret
=
part
->
u
.
fnMessage32
(
mld
->
uDeviceID
,
wMsg
,
mld
->
dwDriverInstance
,
dwParam1
,
dwParam2
);
TRACE
(
"=> %lu
\n
"
,
ret
);
...
...
@@ -228,7 +228,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1,
break
;
case
WINMM_MAP_OK
:
case
WINMM_MAP_OKMEM
:
TRACE
(
"Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx
\n
"
,
TRACE
(
"Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx
)
\n
"
,
mld
->
uDeviceID
,
wMsg
,
mld
->
dwDriverInstance
,
dwParam1
,
dwParam2
);
ret
=
part
->
u
.
fnMessage32
(
mld
->
uDeviceID
,
wMsg
,
mld
->
dwDriverInstance
,
dwParam1
,
dwParam2
);
...
...
@@ -257,7 +257,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1,
break
;
case
WINMM_MAP_OK
:
case
WINMM_MAP_OKMEM
:
TRACE
(
"Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx
\n
"
,
TRACE
(
"Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx
)
\n
"
,
mld
->
uDeviceID
,
wMsg
,
mld
->
dwDriverInstance
,
dwParam1
,
dwParam2
);
ret
=
pFnCallMMDrvFunc16
((
FARPROC16
)
part
->
u
.
fnMessage16
,
mld
->
uDeviceID
,
wMsg
,
mld
->
dwDriverInstance
,
...
...
@@ -272,7 +272,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1,
break
;
}
}
else
{
TRACE
(
"Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx
\n
"
,
TRACE
(
"Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx
)
\n
"
,
mld
->
uDeviceID
,
wMsg
,
mld
->
dwDriverInstance
,
dwParam1
,
dwParam2
);
ret
=
pFnCallMMDrvFunc16
((
FARPROC16
)
part
->
u
.
fnMessage16
,
mld
->
uDeviceID
,
wMsg
,
mld
->
dwDriverInstance
,
...
...
This diff is collapsed.
Click to expand it.
dlls/winmm/wineoss/midi.c
+
8
−
2
View file @
f88d00a2
...
...
@@ -102,7 +102,7 @@ static int midiOpenSeq(void);
static
int
midiCloseSeq
(
void
);
/**************************************************************************
* unixToWindowsDeviceType [internal]
*
MIDI_
unixToWindowsDeviceType [internal]
*
* return the Windows equivalent to a Unix Device Type
*
...
...
@@ -432,6 +432,9 @@ SEQ_DEFINEBUF(1024);
*/
/**************************************************************************
* seqbuf_dump [internal]
*
* Used by SEQ_DUMPBUF to flush the buffer.
*
*/
void
seqbuf_dump
(
void
)
{
...
...
@@ -448,6 +451,9 @@ void seqbuf_dump(void)
}
}
/**************************************************************************
* midRecieveChar [internal]
*/
static
void
midReceiveChar
(
WORD
wDevID
,
unsigned
char
value
,
DWORD
dwTime
)
{
DWORD
toSend
=
0
;
...
...
@@ -1496,7 +1502,7 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
return
MMSYSERR_NOTENABLED
;
}
/* MS doc says t
a
ht dwFlags must be set to zero, but (kinda funny) MS mciseq drivers
/* MS doc says th
a
t dwFlags must be set to zero, but (kinda funny) MS mciseq drivers
* asks to prepare MIDIHDR which dwFlags != 0.
* So at least check for the inqueue flag
*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment