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
c4629e5a
Commit
c4629e5a
authored
Jun 16, 2014
by
Akihiro Sagawa
Committed by
Alexandre Julliard
Jun 16, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winmm: Memory file buffer is available even if we just allocate memory.
parent
09a1f81c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
20 deletions
+5
-20
mmio.c
dlls/winmm/mmio.c
+1
-4
mmio.c
dlls/winmm/tests/mmio.c
+4
-16
No files found.
dlls/winmm/mmio.c
View file @
c4629e5a
...
...
@@ -574,7 +574,7 @@ static MMRESULT MMIO_SetBuffer(WINE_MMIO* wm, void* pchBuffer, LONG cchBuffer,
wm
->
info
.
pchEndRead
=
wm
->
info
.
pchBuffer
;
wm
->
info
.
pchEndWrite
=
wm
->
info
.
pchBuffer
+
cchBuffer
;
wm
->
info
.
lBufOffset
=
wm
->
info
.
lDiskOffset
;
wm
->
bBufferLoaded
=
FALSE
;
wm
->
bBufferLoaded
=
(
wm
->
info
.
fccIOProc
==
FOURCC_MEM
)
;
return
MMSYSERR_NOERROR
;
}
...
...
@@ -660,9 +660,6 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags,
goto
error1
;
}
if
(
wm
->
info
.
fccIOProc
==
FOURCC_MEM
&&
!
(
wm
->
info
.
dwFlags
&
MMIO_ALLOCBUF
))
wm
->
bBufferLoaded
=
TRUE
;
/* see mmioDosIOProc for that one */
memcpy
(
wm
->
info
.
adwInfo
,
refmminfo
->
adwInfo
,
sizeof
(
wm
->
info
.
adwInfo
)
);
...
...
dlls/winmm/tests/mmio.c
View file @
c4629e5a
...
...
@@ -347,10 +347,7 @@ static void test_mmioOpen(char *fname)
ok
(
mmio
.
lDiskOffset
==
0
,
"expected 0, got %d
\n
"
,
mmio
.
lDiskOffset
);
ret
=
mmioSeek
(
hmmio
,
0
,
SEEK_CUR
);
if
(
fname
)
ok
(
ret
==
0
,
"expected 0, got %d
\n
"
,
ret
);
else
todo_wine
ok
(
ret
==
0
,
"expected 0, got %d
\n
"
,
ret
);
ok
(
ret
==
0
,
"expected 0, got %d
\n
"
,
ret
);
mmioClose
(
hmmio
,
0
);
...
...
@@ -408,10 +405,7 @@ static void test_mmioOpen(char *fname)
ok
(
mmio
.
lDiskOffset
==
0
,
"expected 0, got %d
\n
"
,
mmio
.
lDiskOffset
);
ret
=
mmioSeek
(
hmmio
,
0
,
SEEK_CUR
);
if
(
fname
)
ok
(
ret
==
0
,
"expected 0, got %d
\n
"
,
ret
);
else
todo_wine
ok
(
ret
==
0
,
"expected 0, got %d
\n
"
,
ret
);
ok
(
ret
==
0
,
"expected 0, got %d
\n
"
,
ret
);
mmioClose
(
hmmio
,
0
);
...
...
@@ -440,10 +434,7 @@ static void test_mmioOpen(char *fname)
ok
(
mmio
.
lDiskOffset
==
0
,
"expected 0, got %d
\n
"
,
mmio
.
lDiskOffset
);
ret
=
mmioSeek
(
hmmio
,
0
,
SEEK_CUR
);
if
(
fname
)
ok
(
ret
==
0
,
"expected 0, got %d
\n
"
,
ret
);
else
todo_wine
ok
(
ret
==
0
,
"expected 0, got %d
\n
"
,
ret
);
ok
(
ret
==
0
,
"expected 0, got %d
\n
"
,
ret
);
mmioClose
(
hmmio
,
0
);
...
...
@@ -607,10 +598,7 @@ static void test_mmioSetBuffer(char *fname)
ok
(
mmio
.
lDiskOffset
==
0
,
"expected 0, got %d
\n
"
,
mmio
.
lDiskOffset
);
ret
=
mmioSeek
(
hmmio
,
0
,
SEEK_CUR
);
if
(
fname
)
ok
(
ret
==
0
,
"expected 0, got %d
\n
"
,
ret
);
else
todo_wine
ok
(
ret
==
0
,
"expected 0, got %d
\n
"
,
ret
);
ok
(
ret
==
0
,
"expected 0, got %d
\n
"
,
ret
);
mmioClose
(
hmmio
,
0
);
}
...
...
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