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
95a173a5
Commit
95a173a5
authored
Sep 02, 2005
by
Kevin Koltzau
Committed by
Alexandre Julliard
Sep 02, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix warnings in 64bit.
parent
dacea646
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
69 additions
and
69 deletions
+69
-69
cdlg32.c
dlls/commdlg/cdlg32.c
+2
-2
colordlg.c
dlls/commdlg/colordlg.c
+1
-1
filedlg.c
dlls/commdlg/filedlg.c
+3
-3
fontdlg.c
dlls/commdlg/fontdlg.c
+2
-2
printdlg.c
dlls/commdlg/printdlg.c
+1
-1
encode.c
dlls/crypt32/encode.c
+1
-1
protectdata.c
dlls/crypt32/protectdata.c
+7
-7
brsfolder.c
dlls/shell32/brsfolder.c
+1
-1
control.c
dlls/shell32/control.c
+2
-2
dde.c
dlls/shell32/dde.c
+3
-3
shell32_main.c
dlls/shell32/shell32_main.c
+10
-9
shell32_main.h
dlls/shell32/shell32_main.h
+1
-1
shelllink.c
dlls/shell32/shelllink.c
+1
-1
shellord.c
dlls/shell32/shellord.c
+13
-14
shellpath.c
dlls/shell32/shellpath.c
+1
-1
shlexec.c
dlls/shell32/shlexec.c
+8
-8
shlmenu.c
dlls/shell32/shlmenu.c
+3
-3
shv_bg_cmenu.c
dlls/shell32/shv_bg_cmenu.c
+1
-1
shv_item_cmenu.c
dlls/shell32/shv_item_cmenu.c
+1
-1
commctrl.h
include/commctrl.h
+4
-4
shellapi.h
include/shellapi.h
+2
-2
shobjidl.idl
include/shobjidl.idl
+1
-1
No files found.
dlls/commdlg/cdlg32.c
View file @
95a173a5
...
...
@@ -158,7 +158,7 @@ void COMDLG32_SetCommDlgExtendedError(DWORD err)
if
(
COMDLG32_TlsIndex
==
TLS_OUT_OF_INDEXES
)
COMDLG32_TlsIndex
=
TlsAlloc
();
if
(
COMDLG32_TlsIndex
!=
TLS_OUT_OF_INDEXES
)
TlsSetValue
(
COMDLG32_TlsIndex
,
(
void
*
)
err
);
TlsSetValue
(
COMDLG32_TlsIndex
,
(
LPVOID
)(
DWORD_PTR
)
err
);
else
FIXME
(
"No Tls Space
\n
"
);
}
...
...
@@ -176,7 +176,7 @@ void COMDLG32_SetCommDlgExtendedError(DWORD err)
DWORD
WINAPI
CommDlgExtendedError
(
void
)
{
if
(
COMDLG32_TlsIndex
!=
TLS_OUT_OF_INDEXES
)
return
(
DWORD
)
TlsGetValue
(
COMDLG32_TlsIndex
);
return
(
DWORD
_PTR
)
TlsGetValue
(
COMDLG32_TlsIndex
);
else
return
0
;
/* we never set an error, so there isn't one */
}
dlls/commdlg/colordlg.c
View file @
95a173a5
...
...
@@ -1303,7 +1303,7 @@ BOOL WINAPI ChooseColorW( LPCHOOSECOLORW lpChCol )
}
bRet
=
DialogBoxIndirectParamW
(
COMDLG32_hInstance
,
template
,
lpChCol
->
hwndOwner
,
ColorDlgProc
,
(
DWORD
)
lpChCol
);
ColorDlgProc
,
(
LPARAM
)
lpChCol
);
return
bRet
;
}
...
...
dlls/commdlg/filedlg.c
View file @
95a173a5
...
...
@@ -1091,7 +1091,7 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l
stringId
=
0
;
}
lpdi
->
hinst
=
COMDLG32_hInstance
;
lpdi
->
lpszText
=
(
LPSTR
)
stringId
;
lpdi
->
lpszText
=
MAKEINTRESOURCEA
(
stringId
)
;
}
return
FALSE
;
}
...
...
@@ -2378,7 +2378,7 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd)
lpstrFilter
=
(
LPWSTR
)
CBGetItemDataPtr
(
fodInfos
->
DlgInfos
.
hwndFileTypeCB
,
nFilterIndexCB
);
if
((
INT
)
lpstrFilter
==
CB_ERR
)
/* control is empty */
if
((
INT
_PTR
)
lpstrFilter
==
CB_ERR
)
/* control is empty */
lpstrFilter
=
NULL
;
if
(
lpstrFilter
)
...
...
@@ -2423,7 +2423,7 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode)
lpstrFilter
=
(
LPWSTR
)
CBGetItemDataPtr
(
fodInfos
->
DlgInfos
.
hwndFileTypeCB
,
iItem
);
if
((
int
)
lpstrFilter
!=
CB_ERR
)
if
((
INT_PTR
)
lpstrFilter
!=
CB_ERR
)
{
DWORD
len
;
CharLowerW
(
lpstrFilter
);
/* lowercase */
...
...
dlls/commdlg/fontdlg.c
View file @
95a173a5
...
...
@@ -670,7 +670,7 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
if
(
lpcf
->
Flags
&
CF_INITTOLOGFONTSTRUCT
)
{
/* look for fitting font name in combobox1 */
j
=
SendDlgItemMessageW
(
hDlg
,
cmb1
,
CB_FINDSTRING
,
-
1
,(
L
ONG
)
lpxx
->
lfFaceName
);
j
=
SendDlgItemMessageW
(
hDlg
,
cmb1
,
CB_FINDSTRING
,
-
1
,(
L
PARAM
)
lpxx
->
lfFaceName
);
if
(
j
!=
CB_ERR
)
{
INT
height
=
lpxx
->
lfHeight
<
0
?
-
lpxx
->
lfHeight
:
...
...
@@ -699,7 +699,7 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
}
if
((
lpcf
->
Flags
&
CF_USESTYLE
)
&&
lpcf
->
lpszStyle
)
{
j
=
SendDlgItemMessageW
(
hDlg
,
cmb2
,
CB_FINDSTRING
,
-
1
,(
L
ONG
)
lpcf
->
lpszStyle
);
j
=
SendDlgItemMessageW
(
hDlg
,
cmb2
,
CB_FINDSTRING
,
-
1
,(
L
PARAM
)
lpcf
->
lpszStyle
);
if
(
j
!=
CB_ERR
)
{
j
=
SendDlgItemMessageW
(
hDlg
,
cmb2
,
CB_SETCURSEL
,
j
,
0
);
...
...
dlls/commdlg/printdlg.c
View file @
95a173a5
...
...
@@ -3157,7 +3157,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
pda
->
curdlg
.
ptPaperSize
.
x
=
tmp
;
}
}
else
WARN
(
"GlobalLock(pda->pdlg.hDevMode) fail? hDevMode=%
ld"
,
(
DWORD
)
pda
->
pdlg
.
hDevMode
);
WARN
(
"GlobalLock(pda->pdlg.hDevMode) fail? hDevMode=%
p"
,
pda
->
pdlg
.
hDevMode
);
/* Drawing paper prev */
PRINTDLG_PS_ChangePaperPrev
(
pda
);
return
TRUE
;
...
...
dlls/crypt32/encode.c
View file @
95a173a5
...
...
@@ -190,7 +190,7 @@ static char *CRYPT_GetKeyName(DWORD dwEncodingType, LPCSTR pszFuncName,
*/
if
(
!
HIWORD
(
pszOID
))
{
snprintf
(
numericOID
,
sizeof
(
numericOID
),
"#%d"
,
(
int
)
pszOID
);
snprintf
(
numericOID
,
sizeof
(
numericOID
),
"#%d"
,
LOWORD
(
pszOID
)
);
oid
=
numericOID
;
}
else
...
...
dlls/crypt32/protectdata.c
View file @
95a173a5
...
...
@@ -132,7 +132,7 @@ hex_str(unsigned char *p, int n)
#define TRACE_DATA_BLOB(blob) do { \
TRACE("%s cbData: %u\n", #blob ,(unsigned int)((blob)->cbData)); \
TRACE("%s pbData @
0x%x:%s\n", #blob ,(unsigned int)((blob)->pbData)
, \
TRACE("%s pbData @
%p:%s\n", #blob ,(blob)->pbData
, \
hex_str((blob)->pbData, (blob)->cbData)); \
} while (0)
...
...
@@ -778,14 +778,14 @@ static void
report
(
DATA_BLOB
*
pDataIn
,
DATA_BLOB
*
pOptionalEntropy
,
CRYPTPROTECT_PROMPTSTRUCT
*
pPromptStruct
,
DWORD
dwFlags
)
{
TRACE
(
"pPromptStruct:
0x%x
\n
"
,(
unsigned
int
)
pPromptStruct
);
TRACE
(
"pPromptStruct:
%p
\n
"
,
pPromptStruct
);
if
(
pPromptStruct
)
{
TRACE
(
" cbSize: 0x%x
\n
"
,(
unsigned
int
)
pPromptStruct
->
cbSize
);
TRACE
(
" dwPromptFlags: 0x%x
\n
"
,(
unsigned
int
)
pPromptStruct
->
dwPromptFlags
);
TRACE
(
" hwndApp:
0x%x
\n
"
,(
unsigned
int
)
pPromptStruct
->
hwndApp
);
TRACE
(
" szPrompt:
0x%x
%s
\n
"
,
(
unsigned
int
)
pPromptStruct
->
szPrompt
,
TRACE
(
" hwndApp:
%p
\n
"
,
pPromptStruct
->
hwndApp
);
TRACE
(
" szPrompt:
%p
%s
\n
"
,
pPromptStruct
->
szPrompt
,
pPromptStruct
->
szPrompt
?
debugstr_w
(
pPromptStruct
->
szPrompt
)
:
""
);
}
...
...
@@ -855,7 +855,7 @@ BOOL WINAPI CryptProtectData(DATA_BLOB* pDataIn,
/* debug: show our arguments */
report
(
pDataIn
,
pOptionalEntropy
,
pPromptStruct
,
dwFlags
);
TRACE
(
"
\t
szDataDescr:
0x%x %s
\n
"
,(
unsigned
int
)
szDataDescr
,
TRACE
(
"
\t
szDataDescr:
%p %s
\n
"
,
szDataDescr
,
szDataDescr
?
debugstr_w
(
szDataDescr
)
:
""
);
/* Windows appears to create an empty szDataDescr instead of maintaining
...
...
@@ -1026,7 +1026,7 @@ BOOL WINAPI CryptUnprotectData(DATA_BLOB* pDataIn,
/* debug: show our arguments */
report
(
pDataIn
,
pOptionalEntropy
,
pPromptStruct
,
dwFlags
);
TRACE
(
"
\t
ppszDataDescr:
0x%x
\n
"
,(
unsigned
int
)
ppszDataDescr
);
TRACE
(
"
\t
ppszDataDescr:
%p
\n
"
,
ppszDataDescr
);
/* take apart the opaque blob */
if
(
!
unserialize
(
pDataIn
,
&
protect_data
))
...
...
dlls/shell32/brsfolder.c
View file @
95a173a5
...
...
@@ -316,7 +316,7 @@ static void FillTreeView( browse_info *info, IShellFolder * lpsf,
HRESULT
hr
;
HWND
hwnd
=
GetParent
(
info
->
hwndTreeView
);
TRACE
(
"%p %p %
x %p
\n
"
,
lpsf
,
pidl
,
(
INT
)
hParent
,
lpe
);
TRACE
(
"%p %p %
p %p
\n
"
,
lpsf
,
pidl
,
hParent
,
lpe
);
/* No IEnumIDList -> No children */
if
(
!
lpe
)
return
;
...
...
dlls/shell32/control.c
View file @
95a173a5
...
...
@@ -153,7 +153,7 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTA* cs)
{
CPanel
*
panel
=
(
CPanel
*
)
cs
->
lpCreateParams
;
SetWindowLong
A
(
hWnd
,
0
,
(
LPARAM
)
panel
);
SetWindowLong
PtrA
(
hWnd
,
0
,
(
LONG_PTR
)
panel
);
panel
->
status
=
0
;
panel
->
hWnd
=
hWnd
;
}
...
...
@@ -244,7 +244,7 @@ static LRESULT Control_WndProc_LButton(CPanel* panel, LPARAM lParam, BOOL up)
static
LRESULT
WINAPI
Control_WndProc
(
HWND
hWnd
,
UINT
wMsg
,
WPARAM
lParam1
,
LPARAM
lParam2
)
{
CPanel
*
panel
=
(
CPanel
*
)
GetWindowLongA
(
hWnd
,
0
);
CPanel
*
panel
=
(
CPanel
*
)
GetWindowLong
Ptr
A
(
hWnd
,
0
);
if
(
panel
||
wMsg
==
WM_CREATE
)
{
switch
(
wMsg
)
{
...
...
dlls/shell32/dde.c
View file @
95a173a5
...
...
@@ -104,16 +104,16 @@ static HDDEDATA CALLBACK DdeCallback(
switch
(
uType
)
{
case
XTYP_CONNECT
:
return
(
HDDEDATA
)
Dde_OnConnect
(
hsz1
,
hsz2
);
return
(
HDDEDATA
)
(
DWORD_PTR
)
Dde_OnConnect
(
hsz1
,
hsz2
);
case
XTYP_CONNECT_CONFIRM
:
Dde_OnConnectConfirm
(
hconv
,
hsz1
,
hsz2
);
return
NULL
;
case
XTYP_WILDCONNECT
:
return
(
HDDEDATA
)
Dde_OnWildConnect
(
hsz1
,
hsz2
);
return
(
HDDEDATA
)
(
DWORD_PTR
)
Dde_OnWildConnect
(
hsz1
,
hsz2
);
case
XTYP_REQUEST
:
return
(
HDDEDATA
)
Dde_OnRequest
(
uFmt
,
hconv
,
hsz1
,
hsz2
);
case
XTYP_EXECUTE
:
return
(
HDDEDATA
)
Dde_OnExecute
(
hconv
,
hsz1
,
hdata
);
return
(
HDDEDATA
)
(
DWORD_PTR
)
Dde_OnExecute
(
hconv
,
hsz1
,
hdata
);
case
XTYP_DISCONNECT
:
Dde_OnDisconnect
(
hconv
);
return
NULL
;
...
...
dlls/shell32/shell32_main.c
View file @
95a173a5
...
...
@@ -308,12 +308,13 @@ static DWORD shgfi_get_exe_type(LPCWSTR szFullPath)
* SHGetFileInfoW [SHELL32.@]
*
*/
DWORD
WINAPI
SHGetFileInfoW
(
LPCWSTR
path
,
DWORD
dwFileAttributes
,
SHFILEINFOW
*
psfi
,
UINT
sizeofpsfi
,
UINT
flags
)
DWORD
_PTR
WINAPI
SHGetFileInfoW
(
LPCWSTR
path
,
DWORD
dwFileAttributes
,
SHFILEINFOW
*
psfi
,
UINT
sizeofpsfi
,
UINT
flags
)
{
WCHAR
szLocation
[
MAX_PATH
],
szFullPath
[
MAX_PATH
];
int
iIndex
;
DWORD
ret
=
TRUE
,
dwAttributes
=
0
;
DWORD_PTR
ret
=
TRUE
;
DWORD
dwAttributes
=
0
;
IShellFolder
*
psfParent
=
NULL
;
IExtractIconW
*
pei
=
NULL
;
LPITEMIDLIST
pidlLast
=
NULL
,
pidl
=
NULL
;
...
...
@@ -557,9 +558,9 @@ DWORD WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
if
(
ret
)
{
if
(
flags
&
SHGFI_SMALLICON
)
ret
=
(
DWORD
)
ShellSmallIconList
;
ret
=
(
DWORD
_PTR
)
ShellSmallIconList
;
else
ret
=
(
DWORD
)
ShellBigIconList
;
ret
=
(
DWORD
_PTR
)
ShellBigIconList
;
}
}
...
...
@@ -596,9 +597,9 @@ DWORD WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
/*************************************************************************
* SHGetFileInfoA [SHELL32.@]
*/
DWORD
WINAPI
SHGetFileInfoA
(
LPCSTR
path
,
DWORD
dwFileAttributes
,
SHFILEINFOA
*
psfi
,
UINT
sizeofpsfi
,
UINT
flags
)
DWORD
_PTR
WINAPI
SHGetFileInfoA
(
LPCSTR
path
,
DWORD
dwFileAttributes
,
SHFILEINFOA
*
psfi
,
UINT
sizeofpsfi
,
UINT
flags
)
{
INT
len
;
LPWSTR
temppath
;
...
...
@@ -706,7 +707,7 @@ HICON WINAPI ExtractIconW(HINSTANCE hInstance, LPCWSTR lpszFile, UINT nIconIndex
{
ret
=
PrivateExtractIconsW
(
lpszFile
,
0
,
cx
,
cy
,
NULL
,
NULL
,
0
,
LR_DEFAULTCOLOR
);
if
(
ret
!=
0xFFFFFFFF
&&
ret
)
return
(
HICON
)
ret
;
return
(
HICON
)
(
UINT_PTR
)
ret
;
return
NULL
;
}
else
...
...
dlls/shell32/shell32_main.h
View file @
95a173a5
...
...
@@ -214,7 +214,7 @@ inline static WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source)
#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16))
#define HINSTANCE_16(h32) (LOWORD(h32))
typedef
UINT
(
*
SHELL_ExecuteW32
)(
const
WCHAR
*
lpCmd
,
WCHAR
*
env
,
BOOL
shWait
,
typedef
UINT
_PTR
(
*
SHELL_ExecuteW32
)(
const
WCHAR
*
lpCmd
,
WCHAR
*
env
,
BOOL
shWait
,
LPSHELLEXECUTEINFOW
sei
,
LPSHELLEXECUTEINFOW
sei_out
);
BOOL
WINAPI
ShellExecuteExW32
(
LPSHELLEXECUTEINFOW
sei
,
SHELL_ExecuteW32
execfunc
);
...
...
dlls/shell32/shelllink.c
View file @
95a173a5
...
...
@@ -2384,7 +2384,7 @@ ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici )
}
static
HRESULT
WINAPI
ShellLink_GetCommandString
(
IContextMenu
*
iface
,
UINT
idCmd
,
UINT
uType
,
ShellLink_GetCommandString
(
IContextMenu
*
iface
,
UINT
_PTR
idCmd
,
UINT
uType
,
UINT
*
pwReserved
,
LPSTR
pszName
,
UINT
cchMax
)
{
IShellLinkImpl
*
This
=
impl_from_IContextMenu
(
iface
);
...
...
dlls/shell32/shellord.c
View file @
95a173a5
...
...
@@ -355,16 +355,16 @@ int WINAPIV ShellMessageBoxW(
va_start
(
args
,
uType
);
/* wvsprintfA(buf,fmt, args); */
TRACE
(
"(%
08lx,%08lx
,%p,%p,%08x)
\n
"
,
(
DWORD
)
hInstance
,(
DWORD
)
hWnd
,
lpText
,
lpCaption
,
uType
);
TRACE
(
"(%
p,%p
,%p,%p,%08x)
\n
"
,
hInstance
,
hWnd
,
lpText
,
lpCaption
,
uType
);
if
(
!
HIWORD
(
lpCaption
))
LoadStringW
(
hInstance
,
(
DWORD
)
lpCaption
,
szTitle
,
sizeof
(
szTitle
)
/
sizeof
(
szTitle
[
0
]));
if
(
IS_INTRESOURCE
(
lpCaption
))
LoadStringW
(
hInstance
,
LOWORD
(
lpCaption
)
,
szTitle
,
sizeof
(
szTitle
)
/
sizeof
(
szTitle
[
0
]));
else
pszTitle
=
lpCaption
;
if
(
!
HIWORD
(
lpText
))
LoadStringW
(
hInstance
,
(
DWORD
)
lpText
,
szText
,
sizeof
(
szText
)
/
sizeof
(
szText
[
0
]));
if
(
IS_INTRESOURCE
(
lpText
))
LoadStringW
(
hInstance
,
LOWORD
(
lpText
)
,
szText
,
sizeof
(
szText
)
/
sizeof
(
szText
[
0
]));
else
pszText
=
lpText
;
...
...
@@ -412,16 +412,16 @@ int WINAPIV ShellMessageBoxA(
va_start
(
args
,
uType
);
/* wvsprintfA(buf,fmt, args); */
TRACE
(
"(%
08lx,%08lx
,%p,%p,%08x)
\n
"
,
(
DWORD
)
hInstance
,(
DWORD
)
hWnd
,
lpText
,
lpCaption
,
uType
);
TRACE
(
"(%
p,%p
,%p,%p,%08x)
\n
"
,
hInstance
,
hWnd
,
lpText
,
lpCaption
,
uType
);
if
(
!
HIWORD
(
lpCaption
))
LoadStringA
(
hInstance
,
(
DWORD
)
lpCaption
,
szTitle
,
sizeof
(
szTitle
));
if
(
IS_INTRESOURCE
(
lpCaption
))
LoadStringA
(
hInstance
,
LOWORD
(
lpCaption
)
,
szTitle
,
sizeof
(
szTitle
));
else
pszTitle
=
lpCaption
;
if
(
!
HIWORD
(
lpText
))
LoadStringA
(
hInstance
,
(
DWORD
)
lpText
,
szText
,
sizeof
(
szText
));
if
(
IS_INTRESOURCE
(
lpText
))
LoadStringA
(
hInstance
,
LOWORD
(
lpText
)
,
szText
,
sizeof
(
szText
));
else
pszText
=
lpText
;
...
...
@@ -1004,10 +1004,9 @@ static LPUNKNOWN SHELL32_IExplorerInterface=0;
* NOTES
* Sets the interface
*/
HRESULT
WINAPI
SHSetInstanceExplorer
(
LPUNKNOWN
lpUnknown
)
VOID
WINAPI
SHSetInstanceExplorer
(
LPUNKNOWN
lpUnknown
)
{
TRACE
(
"%p
\n
"
,
lpUnknown
);
SHELL32_IExplorerInterface
=
lpUnknown
;
return
(
HRESULT
)
lpUnknown
;
}
/*************************************************************************
* SHGetInstanceExplorer [SHELL32.@]
...
...
dlls/shell32/shellpath.c
View file @
95a173a5
...
...
@@ -1303,7 +1303,7 @@ static HRESULT _SHGetDefaultValue(BYTE folder, LPWSTR pszPath)
IS_INTRESOURCE
(
CSIDL_Data
[
folder
].
szDefaultPath
))
{
if
(
LoadStringW
(
shell32_hInstance
,
(
UINT
)
CSIDL_Data
[
folder
].
szDefaultPath
,
resourcePath
,
MAX_PATH
))
LOWORD
(
CSIDL_Data
[
folder
].
szDefaultPath
)
,
resourcePath
,
MAX_PATH
))
{
hr
=
S_OK
;
pDefaultPath
=
resourcePath
;
...
...
dlls/shell32/shlexec.c
View file @
95a173a5
...
...
@@ -334,12 +334,12 @@ static HRESULT SHELL_ResolveShortCutW(LPWSTR wcmd, LPWSTR wargs, LPWSTR wdir, HW
* SHELL_ExecuteW [Internal]
*
*/
static
UINT
SHELL_ExecuteW
(
const
WCHAR
*
lpCmd
,
WCHAR
*
env
,
BOOL
shWait
,
static
UINT
_PTR
SHELL_ExecuteW
(
const
WCHAR
*
lpCmd
,
WCHAR
*
env
,
BOOL
shWait
,
LPSHELLEXECUTEINFOW
psei
,
LPSHELLEXECUTEINFOW
psei_out
)
{
STARTUPINFOW
startup
;
PROCESS_INFORMATION
info
;
UINT
retval
=
31
;
UINT
_PTR
retval
=
31
;
UINT
gcdret
=
0
;
WCHAR
curdir
[
MAX_PATH
];
...
...
@@ -864,13 +864,13 @@ static unsigned dde_connect(WCHAR* key, WCHAR* start, WCHAR* ddeexec,
/*************************************************************************
* execute_from_key [Internal]
*/
static
UINT
execute_from_key
(
LPWSTR
key
,
LPCWSTR
lpFile
,
WCHAR
*
env
,
LPCWSTR
szCommandline
,
static
UINT
_PTR
execute_from_key
(
LPWSTR
key
,
LPCWSTR
lpFile
,
WCHAR
*
env
,
LPCWSTR
szCommandline
,
SHELL_ExecuteW32
execfunc
,
LPSHELLEXECUTEINFOW
psei
,
LPSHELLEXECUTEINFOW
psei_out
)
{
WCHAR
cmd
[
1024
];
LONG
cmdlen
=
sizeof
(
cmd
);
UINT
retval
=
31
;
UINT
_PTR
retval
=
31
;
cmd
[
0
]
=
'\0'
;
...
...
@@ -928,7 +928,7 @@ HINSTANCE WINAPI FindExecutableA(LPCSTR lpFile, LPCSTR lpDirectory, LPSTR lpResu
if
(
wDirectory
)
SHFree
(
wDirectory
);
TRACE
(
"returning %s
\n
"
,
lpResult
);
return
(
HINSTANCE
)
retval
;
return
retval
;
}
/*************************************************************************
...
...
@@ -936,7 +936,7 @@ HINSTANCE WINAPI FindExecutableA(LPCSTR lpFile, LPCSTR lpDirectory, LPSTR lpResu
*/
HINSTANCE
WINAPI
FindExecutableW
(
LPCWSTR
lpFile
,
LPCWSTR
lpDirectory
,
LPWSTR
lpResult
)
{
UINT
retval
=
31
;
/* default - 'No association was found' */
UINT
_PTR
retval
=
31
;
/* default - 'No association was found' */
WCHAR
old_dir
[
1024
];
TRACE
(
"File %s, Dir %s
\n
"
,
...
...
@@ -989,7 +989,7 @@ BOOL WINAPI ShellExecuteExW32 (LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfun
WCHAR
*
env
;
WCHAR
lpstrProtocol
[
256
];
LPCWSTR
lpFile
;
UINT
retval
=
31
;
UINT
_PTR
retval
=
31
;
WCHAR
wcmd
[
1024
];
WCHAR
buffer
[
MAX_PATH
];
const
WCHAR
*
ext
;
...
...
@@ -1337,7 +1337,7 @@ BOOL WINAPI ShellExecuteExW32 (LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfun
WCHAR
lpstrTmpFile
[
256
];
strcpyW
(
lpstrTmpFile
,
wHttp
);
strcatW
(
lpstrTmpFile
,
lpFile
);
retval
=
(
UINT
)
ShellExecuteW
(
sei_tmp
.
hwnd
,
sei_tmp
.
lpVerb
,
lpstrTmpFile
,
NULL
,
NULL
,
0
);
retval
=
(
UINT
_PTR
)
ShellExecuteW
(
sei_tmp
.
hwnd
,
sei_tmp
.
lpVerb
,
lpstrTmpFile
,
NULL
,
NULL
,
0
);
}
TRACE
(
"retval %u
\n
"
,
retval
);
...
...
dlls/shell32/shlmenu.c
View file @
95a173a5
...
...
@@ -206,7 +206,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl)
MenuInfo
.
cbSize
=
sizeof
(
MENUINFO
);
MenuInfo
.
fMask
=
MIM_MENUDATA
;
MenuInfo
.
dwMenuData
=
(
DWORD
)
lpFmMi
;
MenuInfo
.
dwMenuData
=
(
ULONG_PTR
)
lpFmMi
;
SetMenuInfo
(
hMenuPopup
,
&
MenuInfo
);
FileMenu_AppendItemW
(
hmenu
,
sTemp
,
uID
,
iIcon
,
hMenuPopup
,
FM_DEFAULT_HEIGHT
);
...
...
@@ -277,7 +277,7 @@ HMENU WINAPI FileMenu_Create (
MenuInfo
.
cbSize
=
sizeof
(
MENUINFO
);
MenuInfo
.
fMask
=
MIM_MENUDATA
;
MenuInfo
.
dwMenuData
=
(
DWORD
)
menudata
;
MenuInfo
.
dwMenuData
=
(
ULONG_PTR
)
menudata
;
SetMenuInfo
(
hMenu
,
&
MenuInfo
);
return
hMenu
;
...
...
@@ -342,7 +342,7 @@ static BOOL FileMenu_AppendItemW(
myItem
->
iIconIndex
=
icon
;
myItem
->
hMenu
=
hMenu
;
mii
.
fMask
=
MIIM_DATA
;
mii
.
dwItemData
=
(
DWORD
)
myItem
;
mii
.
dwItemData
=
(
ULONG_PTR
)
myItem
;
}
if
(
hMenuPopup
)
...
...
dlls/shell32/shv_bg_cmenu.c
View file @
95a173a5
...
...
@@ -400,7 +400,7 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand(
*/
static
HRESULT
WINAPI
ISVBgCm_fnGetCommandString
(
IContextMenu2
*
iface
,
UINT
idCommand
,
UINT
_PTR
idCommand
,
UINT
uFlags
,
UINT
*
lpReserved
,
LPSTR
lpszName
,
...
...
dlls/shell32/shv_item_cmenu.c
View file @
95a173a5
...
...
@@ -452,7 +452,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand(
*/
static
HRESULT
WINAPI
ISvItemCm_fnGetCommandString
(
IContextMenu2
*
iface
,
UINT
idCommand
,
UINT
_PTR
idCommand
,
UINT
uFlags
,
UINT
*
lpReserved
,
LPSTR
lpszName
,
...
...
include/commctrl.h
View file @
95a173a5
...
...
@@ -2658,7 +2658,7 @@ typedef struct tagTVKEYDOWN
#define TreeView_SetImageList(hwnd, himl, iImage) \
(HIMAGELIST)SNDMSGA((hwnd), TVM_SETIMAGELIST, iImage, \
(LPARAM)(
UINT)(
HIMAGELIST)(himl))
(LPARAM)(HIMAGELIST)(himl))
#define TreeView_GetNextItem(hwnd, hitem, code) \
(HTREEITEM)SNDMSGA((hwnd), TVM_GETNEXTITEM, (WPARAM)code,\
...
...
@@ -2691,8 +2691,8 @@ typedef struct tagTVKEYDOWN
#define TreeView_Select(hwnd, hitem, code) \
(
UINT)SNDMSGA((hwnd), TVM_SELECTITEM, (WPARAM)code
, \
(LPARAM)(
UINT
)(hitem))
(
BOOL)SNDMSGA((hwnd), TVM_SELECTITEM, (WPARAM)(code)
, \
(LPARAM)(
HTREEITEM
)(hitem))
#define TreeView_SelectItem(hwnd, hitem) \
...
...
@@ -3663,7 +3663,7 @@ typedef struct NMLVSCROLL
#define ListView_SetBkColor(hwnd,clrBk) \
(BOOL)SNDMSGA((hwnd),LVM_SETBKCOLOR,0,(LPARAM)(COLORREF)(clrBk))
#define ListView_SetImageList(hwnd,himl,iImageList) \
(HIMAGELIST)
(UINT)SNDMSGA((hwnd),LVM_SETIMAGELIST,(WPARAM)(iImageList),(LPARAM)(UINT
)(HIMAGELIST)(himl))
(HIMAGELIST)
SNDMSGA((hwnd),LVM_SETIMAGELIST,(WPARAM)(iImageList),(LPARAM
)(HIMAGELIST)(himl))
#define ListView_GetItemCount(hwnd) \
(INT)SNDMSGA((hwnd),LVM_GETITEMCOUNT,0,0L)
#define ListView_RedrawItems(hwnd,first,last) \
...
...
include/shellapi.h
View file @
95a173a5
...
...
@@ -146,8 +146,8 @@ typedef struct tagSHFILEINFOW
DECL_WINELIB_TYPE_AW
(
SHFILEINFO
)
DWORD
WINAPI
SHGetFileInfoA
(
LPCSTR
,
DWORD
,
SHFILEINFOA
*
,
UINT
,
UINT
);
DWORD
WINAPI
SHGetFileInfoW
(
LPCWSTR
,
DWORD
,
SHFILEINFOW
*
,
UINT
,
UINT
);
DWORD
_PTR
WINAPI
SHGetFileInfoA
(
LPCSTR
,
DWORD
,
SHFILEINFOA
*
,
UINT
,
UINT
);
DWORD
_PTR
WINAPI
SHGetFileInfoW
(
LPCWSTR
,
DWORD
,
SHFILEINFOW
*
,
UINT
,
UINT
);
#define SHGetFileInfo WINELIB_NAME_AW(SHGetFileInfo)
/******************************************
...
...
include/shobjidl.idl
View file @
95a173a5
...
...
@@ -1033,7 +1033,7 @@ cpp_quote("#define CMIC_MASK_NOZONECHECKS SEE_MASK_NOZONECHECKS")
HRESULT InvokeCommand( [in] LPCMINVOKECOMMANDINFO lpici );
HRESULT GetCommandString(
[in] UINT idCmd,
[in] UINT
_PTR
idCmd,
[in] UINT uType,
[out] UINT *pwReserved,
[out, size_is(cchMax)] LPSTR pszName,
...
...
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