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
7f6554b7
Commit
7f6554b7
authored
Aug 18, 2005
by
Felix Nawothnig
Committed by
Alexandre Julliard
Aug 18, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make string elements of MCI_OPEN_PARMS const to match the SDK headers.
parent
c01c579f
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
13 deletions
+13
-13
mcimidi.c
dlls/mciseq/mcimidi.c
+1
-1
mci.c
dlls/winmm/mci.c
+3
-3
message16.c
dlls/winmm/message16.c
+3
-3
mmsystem.h
include/mmsystem.h
+6
-6
No files found.
dlls/mciseq/mcimidi.c
View file @
7f6554b7
...
...
@@ -738,7 +738,7 @@ static DWORD MIDI_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpParms)
if
(
dwFlags
&
MCI_OPEN_ELEMENT
)
{
TRACE
(
"MCI_OPEN_ELEMENT %s!
\n
"
,
debugstr_w
(
lpParms
->
lpstrElementName
));
if
(
lpParms
->
lpstrElementName
&&
strlenW
(
lpParms
->
lpstrElementName
)
>
0
)
{
wmm
->
hFile
=
mmioOpenW
(
lpParms
->
lpstrElementName
,
NULL
,
wmm
->
hFile
=
mmioOpenW
(
(
LPWSTR
)
lpParms
->
lpstrElementName
,
NULL
,
MMIO_ALLOCBUF
|
MMIO_READ
|
MMIO_DENYWRITE
);
if
(
wmm
->
hFile
==
0
)
{
WARN
(
"Can't find file %s!
\n
"
,
debugstr_w
(
lpParms
->
lpstrElementName
));
...
...
dlls/winmm/mci.c
View file @
7f6554b7
...
...
@@ -456,15 +456,15 @@ static DWORD MCI_UnmapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR dwParam2,
if
(
dwParam1
&
MCI_OPEN_TYPE
)
{
if
(
!
(
dwParam1
&
MCI_OPEN_TYPE_ID
))
HeapFree
(
GetProcessHeap
(),
0
,
mci_openW
->
lpstrDeviceType
);
HeapFree
(
GetProcessHeap
(),
0
,
(
LPWSTR
)
mci_openW
->
lpstrDeviceType
);
}
if
(
dwParam1
&
MCI_OPEN_ELEMENT
)
{
if
(
!
(
dwParam1
&
MCI_OPEN_ELEMENT_ID
))
HeapFree
(
GetProcessHeap
(),
0
,
mci_openW
->
lpstrElementName
);
HeapFree
(
GetProcessHeap
(),
0
,
(
LPWSTR
)
mci_openW
->
lpstrElementName
);
}
if
(
dwParam1
&
MCI_OPEN_ALIAS
)
HeapFree
(
GetProcessHeap
(),
0
,
mci_openW
->
lpstrAlias
);
HeapFree
(
GetProcessHeap
(),
0
,
(
LPWSTR
)
mci_openW
->
lpstrAlias
);
HeapFree
(
GetProcessHeap
(),
0
,
ptr
);
}
break
;
...
...
dlls/winmm/message16.c
View file @
7f6554b7
...
...
@@ -2808,11 +2808,11 @@ static WINMM_MapType MCI_UnMapMsg16To32W(WORD uDevType, WORD wMsg, DWORD dwFlag
mop16
->
wDeviceID
=
mop32w
->
wDeviceID
;
if
(
(
dwFlags
&
(
MCI_OPEN_TYPE
|
MCI_OPEN_TYPE_ID
))
==
MCI_OPEN_TYPE
)
HeapFree
(
GetProcessHeap
(),
0
,
mop32w
->
lpstrDeviceType
);
HeapFree
(
GetProcessHeap
(),
0
,
(
LPWSTR
)
mop32w
->
lpstrDeviceType
);
if
(
(
dwFlags
&
(
MCI_OPEN_ELEMENT
|
MCI_OPEN_ELEMENT_ID
))
==
MCI_OPEN_ELEMENT
)
HeapFree
(
GetProcessHeap
(),
0
,
mop32w
->
lpstrElementName
);
HeapFree
(
GetProcessHeap
(),
0
,
(
LPWSTR
)
mop32w
->
lpstrElementName
);
if
(
(
dwFlags
&
MCI_OPEN_ALIAS
))
HeapFree
(
GetProcessHeap
(),
0
,
mop32w
->
lpstrAlias
);
HeapFree
(
GetProcessHeap
(),
0
,
(
LPWSTR
)
mop32w
->
lpstrAlias
);
if
(
!
HeapFree
(
GetProcessHeap
(),
0
,
(
LPVOID
)(
lParam
-
sizeof
(
LPMCI_OPEN_PARMS16
))))
FIXME
(
"bad free line=%d
\n
"
,
__LINE__
);
}
...
...
include/mmsystem.h
View file @
7f6554b7
...
...
@@ -1942,17 +1942,17 @@ typedef struct tagMCI_GENERIC_PARMS {
typedef
struct
tagMCI_OPEN_PARMSA
{
DWORD_PTR
dwCallback
;
MCIDEVICEID
wDeviceID
;
LPSTR
lpstrDeviceType
;
LPSTR
lpstrElementName
;
LPSTR
lpstrAlias
;
LP
C
STR
lpstrDeviceType
;
LP
C
STR
lpstrElementName
;
LP
C
STR
lpstrAlias
;
}
MCI_OPEN_PARMSA
,
*
LPMCI_OPEN_PARMSA
;
typedef
struct
tagMCI_OPEN_PARMSW
{
DWORD_PTR
dwCallback
;
MCIDEVICEID
wDeviceID
;
LPWSTR
lpstrDeviceType
;
LPWSTR
lpstrElementName
;
LPWSTR
lpstrAlias
;
LP
C
WSTR
lpstrDeviceType
;
LP
C
WSTR
lpstrElementName
;
LP
C
WSTR
lpstrAlias
;
}
MCI_OPEN_PARMSW
,
*
LPMCI_OPEN_PARMSW
;
DECL_WINELIB_TYPE_AW
(
MCI_OPEN_PARMS
)
...
...
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