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
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
Zsolt Vadász
wine
Commits
cc7eaa32
Commit
cc7eaa32
authored
15 years ago
by
Mikhail Maroukhine
Committed by
Alexandre Julliard
14 years ago
Browse files
Options
Downloads
Patches
Plain Diff
shell32: Fix compiler warnings with flag -Wcast-qual.
parent
dc525dab
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/shell32/debughlp.c
+22
-22
22 additions, 22 deletions
dlls/shell32/debughlp.c
dlls/shell32/shlexec.c
+3
-2
3 additions, 2 deletions
dlls/shell32/shlexec.c
dlls/shell32/trash.c
+1
-1
1 addition, 1 deletion
dlls/shell32/trash.c
with
26 additions
and
25 deletions
dlls/shell32/debughlp.c
+
22
−
22
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
(
LPITEMIDLIST
)
(((
LP
BYTE
)
pidl
)
+
len
);
return
(
LP
C
ITEMIDLIST
)
(((
const
BYTE
*
)
pidl
)
+
len
);
}
}
return
NULL
;
...
...
@@ -57,17 +57,17 @@ BOOL _dbg_ILIsDesktop(LPCITEMIDLIST pidl)
}
static
LP
PIDLDATA
_dbg_ILGetDataPointer
(
LPCITEMIDLIST
pidl
)
const
PIDLDATA
*
_dbg_ILGetDataPointer
(
LPCITEMIDLIST
pidl
)
{
if
(
pidl
&&
pidl
->
mkid
.
cb
!=
0x00
)
return
(
LP
PIDLDATA
)
pidl
->
mkid
.
abID
;
return
(
const
PIDLDATA
*
)
pidl
->
mkid
.
abID
;
return
NULL
;
}
static
LPSTR
_dbg_ILGetTextPointer
(
LPCITEMIDLIST
pidl
)
LP
C
STR
_dbg_ILGetTextPointer
(
LPCITEMIDLIST
pidl
)
{
LP
PIDLDATA
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
)
{
LP
PIDLDATA
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
)
{
LP
PIDLDATA
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
)
{
LP
PIDLDATA
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
(
LPWSTR
)(
pdata
->
u
.
file
.
szNames
+
lstrlenW
((
LPWSTR
)
pdata
->
u
.
file
.
szNames
)
+
1
);
return
(
LP
C
WSTR
)(
pdata
->
u
.
file
.
szNames
+
lstrlenW
((
LP
C
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
;
LP
PIDLDATA
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
;
LP
PIDLDATA
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
);
...
...
This diff is collapsed.
Click to expand it.
dlls/shell32/shlexec.c
+
3
−
2
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
));
...
...
This diff is collapsed.
Click to expand it.
dlls/shell32/trash.c
+
1
−
1
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
;
}
...
...
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