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
cc7eaa32
Commit
cc7eaa32
authored
Mar 28, 2010
by
Mikhail Maroukhine
Committed by
Alexandre Julliard
Mar 29, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Fix compiler warnings with flag -Wcast-qual.
parent
dc525dab
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
25 deletions
+26
-25
debughlp.c
dlls/shell32/debughlp.c
+22
-22
shlexec.c
dlls/shell32/shlexec.c
+3
-2
trash.c
dlls/shell32/trash.c
+1
-1
No files found.
dlls/shell32/debughlp.c
View file @
cc7eaa32
...
...
@@ -35,7 +35,7 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
pidl
);
static
LPITEMIDLIST
_dbg_ILGetNext
(
LPCITEMIDLIST
pidl
)
LP
C
ITEMIDLIST
_dbg_ILGetNext
(
LPCITEMIDLIST
pidl
)
{
WORD
len
;
...
...
@@ -44,7 +44,7 @@ LPITEMIDLIST _dbg_ILGetNext(LPCITEMIDLIST pidl)
len
=
pidl
->
mkid
.
cb
;
if
(
len
)
{
return
(
LP
ITEMIDLIST
)
(((
LPBYTE
)
pidl
)
+
len
);
return
(
LP
CITEMIDLIST
)
(((
const
BYTE
*
)
pidl
)
+
len
);
}
}
return
NULL
;
...
...
@@ -57,17 +57,17 @@ BOOL _dbg_ILIsDesktop(LPCITEMIDLIST pidl)
}
static
LPPIDLDATA
_dbg_ILGetDataPointer
(
LPCITEMIDLIST
pidl
)
const
PIDLDATA
*
_dbg_ILGetDataPointer
(
LPCITEMIDLIST
pidl
)
{
if
(
pidl
&&
pidl
->
mkid
.
cb
!=
0x00
)
return
(
LPPIDLDATA
)
pidl
->
mkid
.
abID
;
return
(
const
PIDLDATA
*
)
pidl
->
mkid
.
abID
;
return
NULL
;
}
static
LPSTR
_dbg_ILGetTextPointer
(
LPCITEMIDLIST
pidl
)
LP
C
STR
_dbg_ILGetTextPointer
(
LPCITEMIDLIST
pidl
)
{
LPPIDLDATA
pdata
=
_dbg_ILGetDataPointer
(
pidl
);
const
PIDLDATA
*
pdata
=
_dbg_ILGetDataPointer
(
pidl
);
if
(
pdata
)
{
...
...
@@ -103,9 +103,9 @@ LPSTR _dbg_ILGetTextPointer(LPCITEMIDLIST pidl)
}
static
LPWSTR
_dbg_ILGetTextPointerW
(
LPCITEMIDLIST
pidl
)
LP
C
WSTR
_dbg_ILGetTextPointerW
(
LPCITEMIDLIST
pidl
)
{
LPPIDLDATA
pdata
=
_dbg_ILGetDataPointer
(
pidl
);
const
PIDLDATA
*
pdata
=
_dbg_ILGetDataPointer
(
pidl
);
if
(
pdata
)
{
...
...
@@ -140,7 +140,7 @@ LPWSTR _dbg_ILGetTextPointerW(LPCITEMIDLIST pidl)
return
NULL
;
case
PT_VALUEW
:
return
(
LPWSTR
)
pdata
->
u
.
file
.
szNames
;
return
(
LP
C
WSTR
)
pdata
->
u
.
file
.
szNames
;
}
}
return
NULL
;
...
...
@@ -148,9 +148,9 @@ LPWSTR _dbg_ILGetTextPointerW(LPCITEMIDLIST pidl)
static
LPSTR
_dbg_ILGetSTextPointer
(
LPCITEMIDLIST
pidl
)
LP
C
STR
_dbg_ILGetSTextPointer
(
LPCITEMIDLIST
pidl
)
{
LPPIDLDATA
pdata
=
_dbg_ILGetDataPointer
(
pidl
);
const
PIDLDATA
*
pdata
=
_dbg_ILGetDataPointer
(
pidl
);
if
(
pdata
)
{
...
...
@@ -170,9 +170,9 @@ LPSTR _dbg_ILGetSTextPointer(LPCITEMIDLIST pidl)
}
static
LPWSTR
_dbg_ILGetSTextPointerW
(
LPCITEMIDLIST
pidl
)
LP
C
WSTR
_dbg_ILGetSTextPointerW
(
LPCITEMIDLIST
pidl
)
{
LPPIDLDATA
pdata
=
_dbg_ILGetDataPointer
(
pidl
);
const
PIDLDATA
*
pdata
=
_dbg_ILGetDataPointer
(
pidl
);
if
(
pdata
)
{
...
...
@@ -190,7 +190,7 @@ LPWSTR _dbg_ILGetSTextPointerW(LPCITEMIDLIST pidl)
return
NULL
;
case
PT_VALUEW
:
return
(
LP
WSTR
)(
pdata
->
u
.
file
.
szNames
+
lstrlenW
((
LP
WSTR
)
pdata
->
u
.
file
.
szNames
)
+
1
);
return
(
LP
CWSTR
)(
pdata
->
u
.
file
.
szNames
+
lstrlenW
((
LPC
WSTR
)
pdata
->
u
.
file
.
szNames
)
+
1
);
}
}
return
NULL
;
...
...
@@ -218,8 +218,8 @@ IID* _dbg_ILGetGUIDPointer(LPCITEMIDLIST pidl)
static
void
_dbg_ILSimpleGetText
(
LPCITEMIDLIST
pidl
,
LPSTR
szOut
,
UINT
uOutSize
)
{
LPSTR
szSrc
;
LPWSTR
szSrcW
;
LP
C
STR
szSrc
;
LP
C
WSTR
szSrcW
;
GUID
const
*
riid
;
if
(
!
pidl
)
return
;
...
...
@@ -277,10 +277,10 @@ void pdump (LPCITEMIDLIST pidl)
if
(
_ILIsUnicode
(
pidltemp
))
{
DWORD
dwAttrib
=
0
;
LPPIDLDATA
pData
=
_dbg_ILGetDataPointer
(
pidltemp
);
const
PIDLDATA
*
pData
=
_dbg_ILGetDataPointer
(
pidltemp
);
DWORD
type
=
pData
?
pData
->
type
:
0
;
LPWSTR
szLongName
=
_dbg_ILGetTextPointerW
(
pidltemp
);
LPWSTR
szShortName
=
_dbg_ILGetSTextPointerW
(
pidltemp
);
LP
C
WSTR
szLongName
=
_dbg_ILGetTextPointerW
(
pidltemp
);
LP
C
WSTR
szShortName
=
_dbg_ILGetSTextPointerW
(
pidltemp
);
char
szName
[
MAX_PATH
];
_dbg_ILSimpleGetText
(
pidltemp
,
szName
,
MAX_PATH
);
...
...
@@ -294,10 +294,10 @@ void pdump (LPCITEMIDLIST pidl)
else
{
DWORD
dwAttrib
=
0
;
LPPIDLDATA
pData
=
_dbg_ILGetDataPointer
(
pidltemp
);
const
PIDLDATA
*
pData
=
_dbg_ILGetDataPointer
(
pidltemp
);
DWORD
type
=
pData
?
pData
->
type
:
0
;
LPSTR
szLongName
=
_dbg_ILGetTextPointer
(
pidltemp
);
LPSTR
szShortName
=
_dbg_ILGetSTextPointer
(
pidltemp
);
LP
C
STR
szLongName
=
_dbg_ILGetTextPointer
(
pidltemp
);
LP
C
STR
szShortName
=
_dbg_ILGetSTextPointer
(
pidltemp
);
char
szName
[
MAX_PATH
];
_dbg_ILSimpleGetText
(
pidltemp
,
szName
,
MAX_PATH
);
...
...
dlls/shell32/shlexec.c
View file @
cc7eaa32
...
...
@@ -809,8 +809,9 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
}
else
{
LPWSTR
p
,
space
;
for
(
p
=
(
LPWSTR
)
start
;
(
space
=
strchrW
(
p
,
' '
));
p
=
space
+
1
)
LPCWSTR
p
;
LPWSTR
space
;
for
(
p
=
start
;
(
space
=
strchrW
(
p
,
' '
));
p
=
space
+
1
)
{
int
idx
=
space
-
start
;
memcpy
(
command
,
start
,
idx
*
sizeof
(
WCHAR
));
...
...
dlls/shell32/trash.c
View file @
cc7eaa32
...
...
@@ -358,7 +358,7 @@ HRESULT TRASH_UnpackItemID(LPCSHITEMID id, WIN32_FIND_DATAW *data)
return
E_INVALIDARG
;
if
(
data
!=
NULL
)
*
data
=
*
(
WIN32_FIND_DATAW
*
)(
id
->
abID
+
1
);
*
data
=
*
(
const
WIN32_FIND_DATAW
*
)(
id
->
abID
+
1
);
return
S_OK
;
}
...
...
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