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
Releases
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
Sam Joan Roque-Worcel
wine
Commits
9aa8960f
Commit
9aa8960f
authored
25 years ago
by
Eric Pouech
Committed by
Alexandre Julliard
25 years ago
Browse files
Options
Downloads
Patches
Plain Diff
The adwInfo[0] field was no longer used on mmioOpen (may contain file
handle).
parent
76cc171f
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/winmm/mmio.c
+36
-40
36 additions, 40 deletions
dlls/winmm/mmio.c
with
36 additions
and
40 deletions
dlls/winmm/mmio.c
+
36
−
40
View file @
9aa8960f
...
...
@@ -250,9 +250,7 @@ static LRESULT mmioMemIOProc(LPMMIOINFO16 lpmmioinfo, UINT16 uMessage, LPARAM lP
/**************************************************************************
* MMIO_Open [internal]
*/
static
HMMIO16
MMIO_Open
(
LPSTR
szFileName
,
FOURCC
fccIOProc
,
LPMMIOPROC16
pIOProc
,
HPSTR
pchBuffer
,
LONG
cchBuffer
,
DWORD
dwOpenFlags
,
LPUINT
lpRet
,
int
use16
)
static
HMMIO16
MMIO_Open
(
LPSTR
szFileName
,
MMIOINFO
*
refmminfo
,
DWORD
dwOpenFlags
,
int
use16
)
{
LPMMIOINFO16
lpmminfo
;
HMMIO16
hmmio
;
...
...
@@ -275,43 +273,45 @@ static HMMIO16 MMIO_Open(LPSTR szFileName, FOURCC fccIOProc, LPMMIOPROC16 pIOPro
memset
(
lpmminfo
,
0
,
sizeof
(
MMIOINFO16
));
/* assume DOS file if not otherwise specified */
if
(
fccIOProc
==
0
&&
pIOProc
==
NULL
)
{
if
(
refmminfo
->
fccIOProc
==
0
&&
refmminfo
->
pIOProc
==
NULL
)
{
lpmminfo
->
fccIOProc
=
FOURCC_DOS
;
lpmminfo
->
pIOProc
=
(
LPMMIOPROC16
)
mmioDosIOProc
;
}
/* if just the four character code is present, look up IO proc */
else
if
(
pIOProc
==
NULL
)
{
else
if
(
refmminfo
->
pIOProc
==
NULL
)
{
lpmminfo
->
fccIOProc
=
fccIOProc
;
lpmminfo
->
pIOProc
=
mmioInstallIOProc16
(
fccIOProc
,
NULL
,
MMIO_FINDPROC
);
lpmminfo
->
fccIOProc
=
refmminfo
->
fccIOProc
;
lpmminfo
->
pIOProc
=
mmioInstallIOProc16
(
refmminfo
->
fccIOProc
,
NULL
,
MMIO_FINDPROC
);
}
/* if IO proc specified, use it and specified four character code */
else
{
lpmminfo
->
fccIOProc
=
fccIOProc
;
lpmminfo
->
pIOProc
=
pIOProc
;
lpmminfo
->
fccIOProc
=
refmminfo
->
fccIOProc
;
lpmminfo
->
pIOProc
=
(
LPMMIOPROC16
)
refmminfo
->
pIOProc
;
}
if
(
dwOpenFlags
&
MMIO_ALLOCBUF
)
{
if
((
*
lp
Ret
=
mmioSetBuffer16
(
hmmio
,
NULL
,
MMIO_DEFAULTBUFFER
,
0
)))
{
if
((
refmminfo
->
wError
Ret
=
mmioSetBuffer16
(
hmmio
,
NULL
,
MMIO_DEFAULTBUFFER
,
0
)))
{
return
0
;
}
}
else
if
(
lpmminfo
->
fccIOProc
==
FOURCC_MEM
)
{
if
((
*
lp
Ret
=
mmioSetBuffer16
(
hmmio
,
pchBuffer
,
cchBuffer
,
0
)))
{
if
((
refmminfo
->
wError
Ret
=
mmioSetBuffer16
(
hmmio
,
refmminfo
->
pchBuffer
,
refmminfo
->
cchBuffer
,
0
)))
{
return
0
;
}
}
/* see mmioDosIOProc for that one */
lpmminfo
->
adwInfo
[
0
]
=
refmminfo
->
adwInfo
[
0
];
lpmminfo
->
dwFlags
=
dwOpenFlags
;
lpmminfo
->
hmmio
=
hmmio
;
/* call IO proc to actually open file */
*
lp
Ret
=
(
UINT16
)
mmioSendMessage
(
hmmio
,
MMIOM_OPEN
,
(
LPARAM
)
szFileName
,
(
LPARAM
)
use16
);
refmminfo
->
wError
Ret
=
(
UINT16
)
mmioSendMessage
(
hmmio
,
MMIOM_OPEN
,
(
LPARAM
)
szFileName
,
(
LPARAM
)
use16
);
GlobalUnlock16
(
hmmio
);
if
(
*
lp
Ret
!=
0
)
{
if
(
refmminfo
->
wError
Ret
!=
0
)
{
GlobalFree16
(
hmmio
);
return
0
;
}
...
...
@@ -322,22 +322,12 @@ static HMMIO16 MMIO_Open(LPSTR szFileName, FOURCC fccIOProc, LPMMIOPROC16 pIOPro
/**************************************************************************
* mmioOpenW [WINMM.123]
*/
HMMIO
WINAPI
mmioOpenW
(
LPWSTR
szFileName
,
MMIOINFO
*
lpmmioinfo
,
HMMIO
WINAPI
mmioOpenW
(
LPWSTR
szFileName
,
MMIOINFO
*
lpmmioinfo
,
DWORD
dwOpenFlags
)
{
LPSTR
szFn
=
HEAP_strdupWtoA
(
GetProcessHeap
(),
0
,
szFileName
);
HMMIO
ret
;
if
(
lpmmioinfo
)
{
ret
=
MMIO_Open
(
szFn
,
lpmmioinfo
->
fccIOProc
,
(
LPMMIOPROC16
)
lpmmioinfo
->
pIOProc
,
lpmmioinfo
->
pchBuffer
,
lpmmioinfo
->
cchBuffer
,
dwOpenFlags
,
&
lpmmioinfo
->
wErrorRet
,
FALSE
);
}
else
{
UINT
res
;
ret
=
MMIO_Open
(
szFn
,
0
,
NULL
,
NULL
,
0
,
dwOpenFlags
,
&
res
,
FALSE
);
}
HMMIO
ret
=
mmioOpenA
(
szFn
,
lpmmioinfo
,
dwOpenFlags
);
HeapFree
(
GetProcessHeap
(),
0
,
szFn
);
return
ret
;
}
...
...
@@ -349,15 +339,18 @@ HMMIO WINAPI mmioOpenA(LPSTR szFileName, MMIOINFO* lpmmioinfo,
DWORD
dwOpenFlags
)
{
HMMIO
ret
;
UINT
res
;
if
(
lpmmioinfo
)
{
ret
=
MMIO_Open
(
szFileName
,
lpmmioinfo
->
fccIOProc
,
(
LPMMIOPROC16
)
lpmmioinfo
->
pIOProc
,
lpmmioinfo
->
pchBuffer
,
lpmmioinfo
->
cchBuffer
,
dwOpenFlags
,
&
lpmmioinfo
->
wErrorRet
,
FALSE
);
ret
=
MMIO_Open
(
szFileName
,
lpmmioinfo
,
dwOpenFlags
,
FALSE
);
}
else
{
ret
=
MMIO_Open
(
szFileName
,
0
,
NULL
,
NULL
,
0
,
dwOpenFlags
,
&
res
,
FALSE
);
MMIOINFO
mmioinfo
;
mmioinfo
.
fccIOProc
=
0
;
mmioinfo
.
pIOProc
=
NULL
;
mmioinfo
.
pchBuffer
=
NULL
;
mmioinfo
.
cchBuffer
=
0
;
ret
=
MMIO_Open
(
szFileName
,
&
mmioinfo
,
dwOpenFlags
,
FALSE
);
}
return
ret
;
}
...
...
@@ -368,16 +361,19 @@ HMMIO WINAPI mmioOpenA(LPSTR szFileName, MMIOINFO* lpmmioinfo,
HMMIO16
WINAPI
mmioOpen16
(
LPSTR
szFileName
,
MMIOINFO16
*
lpmmioinfo
,
DWORD
dwOpenFlags
)
{
HMMIO
ret
;
UINT
res
;
HMMIO
ret
;
MMIOINFO
mmio
;
if
(
lpmmioinfo
)
{
ret
=
MMIO_Open
(
szFileName
,
lpmmioinfo
->
fccIOProc
,
lpmmioinfo
->
pIOProc
,
PTR_SEG_TO_LIN
(
lpmmioinfo
->
pchBuffer
),
lpmmioinfo
->
cchBuffer
,
dwOpenFlags
,
&
res
,
FALSE
);
lpmmioinfo
->
wErrorRet
=
res
;
mmio
.
fccIOProc
=
lpmmioinfo
->
fccIOProc
;
mmio
.
pIOProc
=
(
LPMMIOPROC
)
lpmmioinfo
->
pIOProc
;
mmio
.
pchBuffer
=
PTR_SEG_TO_LIN
(
lpmmioinfo
->
pchBuffer
);
mmio
.
cchBuffer
=
lpmmioinfo
->
cchBuffer
;
mmio
.
adwInfo
[
0
]
=
lpmmioinfo
->
adwInfo
[
0
];
ret
=
MMIO_Open
(
szFileName
,
&
mmio
,
dwOpenFlags
,
FALSE
);
lpmmioinfo
->
wErrorRet
=
mmio
.
wErrorRet
;
}
else
{
ret
=
MMIO_
Open
(
szFileName
,
0
,
NULL
,
NULL
,
0
,
dwOpenFlags
,
&
res
,
TRUE
);
return
mmio
Open
A
(
szFileName
,
NULL
,
dwOpenFlags
);
}
return
ret
;
}
...
...
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