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
7321bfa0
Commit
7321bfa0
authored
Aug 15, 2001
by
Eric Pouech
Committed by
Alexandre Julliard
Aug 15, 2001
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed error message and return value in case of bogus 'open all' mci
string command. Minor 32/16 optimizations and cosmetic fixes.
parent
542f7753
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
8 deletions
+15
-8
mci.c
dlls/winmm/mci.c
+15
-8
No files found.
dlls/winmm/mci.c
View file @
7321bfa0
...
...
@@ -511,11 +511,18 @@ static DWORD MCI_LoadMciDriver(LPWINE_MM_IDATA iData, LPCSTR _strDevTyp,
modp
.
lpstrParams
=
NULL
;
if
(
!
MCI_OpenMciDriver
(
wmd
,
strDevTyp
,
(
LPARAM
)
&
modp
))
{
FIXME
(
"Couldn't load driver for type %s.
\n
"
"If you don't have a windows installation accessible from Wine,
\n
"
"you perhaps forgot to create a [mci] section in system.ini
\n
"
,
strDevTyp
);
dwRet
=
MCIERR_DEVICE_NOT_INSTALLED
;
/* silence warning if all is used... some bogus program use commands like
* 'open all'...
*/
if
(
strcasecmp
(
strDevTyp
,
"all"
)
!=
0
)
{
dwRet
=
MCIERR_CANNOT_USE_ALL
;
}
else
{
FIXME
(
"Couldn't load driver for type %s.
\n
"
"If you don't have a windows installation accessible from Wine,
\n
"
"you perhaps forgot to create a [mci] section in system.ini
\n
"
,
strDevTyp
);
dwRet
=
MCIERR_DEVICE_NOT_INSTALLED
;
}
goto
errCleanUp
;
}
...
...
@@ -690,7 +697,7 @@ static DWORD MCI_ParseOptArgs(LPDWORD data, int _offset, LPCSTR lpCmd,
flg
=
*
(
LPDWORD
)
lmem
;
eid
=
*
(
LPWORD
)(
lmem
+
sizeof
(
DWORD
));
lmem
+=
sizeof
(
DWORD
)
+
sizeof
(
WORD
);
/* EPP TRACE("\tcmd='%s' inCst=%
s\n", str, inCst ? "Y" : "N"
); */
/* EPP TRACE("\tcmd='%s' inCst=%
c eid=%04x\n", str, inCst ? 'Y' : 'N', eid
); */
switch
(
eid
)
{
case
MCI_CONSTANT
:
...
...
@@ -1077,7 +1084,7 @@ DWORD WINAPI mciExecute(LPCSTR lpstrCommand)
TRACE
(
"(%s)!
\n
"
,
lpstrCommand
);
ret
=
mciSendString
16
(
lpstrCommand
,
strRet
,
sizeof
(
strRet
),
0
);
ret
=
mciSendString
A
(
lpstrCommand
,
strRet
,
sizeof
(
strRet
),
0
);
if
(
ret
!=
0
)
{
if
(
!
mciGetErrorStringA
(
ret
,
strRet
,
sizeof
(
strRet
)))
{
sprintf
(
strRet
,
"Unknown MCI error (%ld)"
,
ret
);
...
...
@@ -1193,7 +1200,7 @@ BOOL WINAPI mciFreeCommandResource(UINT uTable)
{
TRACE
(
"(%08x)!
\n
"
,
uTable
);
return
mciFreeCommandResource16
(
uTable
);
return
MCI_DeleteCommandTable
(
uTable
);
}
/**************************************************************************
...
...
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