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
d05a511d
Commit
d05a511d
authored
Dec 20, 2007
by
Andrew Talbot
Committed by
Alexandre Julliard
Dec 21, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mapi32: Remove unneeded casts.
parent
ca6003b8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
imalloc.c
dlls/mapi32/imalloc.c
+4
-4
prop.c
dlls/mapi32/prop.c
+3
-3
No files found.
dlls/mapi32/imalloc.c
View file @
d05a511d
...
...
@@ -127,9 +127,9 @@ static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb)
return
LocalAlloc
(
LMEM_FIXED
,
cb
);
if
(
cb
)
return
LocalReAlloc
(
(
HANDLE
)
pv
,
cb
,
LMEM_MOVEABLE
);
return
LocalReAlloc
(
pv
,
cb
,
LMEM_MOVEABLE
);
LocalFree
(
(
HANDLE
)
pv
);
LocalFree
(
pv
);
return
NULL
;
}
...
...
@@ -139,7 +139,7 @@ static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb)
static
void
WINAPI
IMAPIMalloc_fnFree
(
LPMALLOC
iface
,
LPVOID
pv
)
{
TRACE
(
"(%p)->(%p)
\n
"
,
iface
,
pv
);
LocalFree
(
(
HANDLE
)
pv
);
LocalFree
(
pv
);
}
/**************************************************************************
...
...
@@ -148,7 +148,7 @@ static void WINAPI IMAPIMalloc_fnFree(LPMALLOC iface, LPVOID pv)
static
DWORD
WINAPI
IMAPIMalloc_fnGetSize
(
LPMALLOC
iface
,
LPVOID
pv
)
{
TRACE
(
"(%p)->(%p)
\n
"
,
iface
,
pv
);
return
LocalSize
(
(
HANDLE
)
pv
);
return
LocalSize
(
pv
);
}
/**************************************************************************
...
...
dlls/mapi32/prop.c
View file @
d05a511d
...
...
@@ -928,7 +928,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld,
LPVOID
lpNew
,
ULONG
*
lpCount
)
{
static
const
BOOL
bBadPtr
=
TRUE
;
/* Windows bug - Assumes source is bad */
LPSPropValue
lpDest
=
(
LPSPropValue
)
lpProps
;
LPSPropValue
lpDest
=
lpProps
;
ULONG
ulCount
=
cValues
*
sizeof
(
SPropValue
);
ULONG
ulLen
,
i
;
int
iter
;
...
...
@@ -964,7 +964,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld,
break
;
case
PT_STRING8
:
ulLen
=
bBadPtr
?
0
:
lstrlenA
(
lpDest
->
Value
.
lpszA
)
+
1u
;
lpDest
->
Value
.
lpszA
=
(
LPSTR
)
RELOC_PTR
(
lpDest
->
Value
.
lpszA
);
lpDest
->
Value
.
lpszA
=
RELOC_PTR
(
lpDest
->
Value
.
lpszA
);
if
(
bBadPtr
)
ulLen
=
lstrlenA
(
lpDest
->
Value
.
lpszA
)
+
1u
;
ulCount
+=
ulLen
;
...
...
@@ -999,7 +999,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld,
{
ULONG
ulStrLen
=
bBadPtr
?
0
:
lstrlenA
(
lpDest
->
Value
.
MVszA
.
lppszA
[
i
])
+
1u
;
lpDest
->
Value
.
MVszA
.
lppszA
[
i
]
=
(
LPSTR
)
RELOC_PTR
(
lpDest
->
Value
.
MVszA
.
lppszA
[
i
]);
lpDest
->
Value
.
MVszA
.
lppszA
[
i
]
=
RELOC_PTR
(
lpDest
->
Value
.
MVszA
.
lppszA
[
i
]);
if
(
bBadPtr
)
ulStrLen
=
lstrlenA
(
lpDest
->
Value
.
MVszA
.
lppszA
[
i
])
+
1u
;
ulCount
+=
ulStrLen
;
...
...
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