Skip to content

W
wine-cw
Commit 991fd85d authored by Johan Dahlin's avatar Johan Dahlin Committed by Alexandre Julliard
Browse files
Options

Make shell32 compile with -DSTRICT.

parent d83d2d26
Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 151 deletions
dlls/shell32/Makefile.in
View file @ 991fd85d
EXTRADEFS = -D_SHELL32_ -DWINE_NO_STRICT
EXTRADEFS = -D_SHELL32_
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
......
dlls/shell32/brsfolder.c
View file @ 991fd85d
......@@ -49,7 +49,7 @@ static void InitializeTreeView(HWND hwndParent, LPCITEMIDLIST root)
hwndTreeView = GetDlgItem (hwndParent, IDD_TREEVIEW);
Shell_GetImageList(NULL, &hImageList);
TRACE("dlg=%x tree=%x\n", hwndParent, hwndTreeView );
TRACE("dlg=%p tree=%p\n", hwndParent, hwndTreeView );
if (hImageList && hwndTreeView)
{ TreeView_SetImageList(hwndTreeView, hImageList, 0);
......@@ -203,7 +203,7 @@ static LRESULT MsgNotify(HWND hWnd, UINT CtlID, LPNMHDR lpnmh)
IShellFolder * lpsf2=0;
TRACE("%x %x %p msg=%x\n", hWnd, CtlID, lpnmh, pnmtv->hdr.code);
TRACE("%p %x %p msg=%x\n", hWnd, CtlID, lpnmh, pnmtv->hdr.code);
switch (pnmtv->hdr.idFrom)
{ case IDD_TREEVIEW:
......@@ -257,7 +257,7 @@ static LRESULT MsgNotify(HWND hWnd, UINT CtlID, LPNMHDR lpnmh)
static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
LPARAM lParam )
{
TRACE("hwnd=%08x msg=%04x 0x%08x 0x%08lx\n", hWnd, msg, wParam, lParam );
TRACE("hwnd=%p msg=%04x 0x%08x 0x%08lx\n", hWnd, msg, wParam, lParam );
switch(msg)
{ case WM_INITDIALOG:
......@@ -337,7 +337,7 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
*/
LPITEMIDLIST WINAPI SHBrowseForFolderA (LPBROWSEINFOA lpbi)
{
TRACE("(%p{lpszTitle=%s,owner=%i})\n",
TRACE("(%p{lpszTitle=%s,owner=%p})\n",
lpbi, debugstr_a(lpbi->lpszTitle), lpbi->hwndOwner);
return (LPITEMIDLIST) DialogBoxParamA( shell32_hInstance,
......@@ -354,7 +354,7 @@ LPITEMIDLIST WINAPI SHBrowseForFolderW (LPBROWSEINFOW lpbi)
char szDisplayName[MAX_PATH], szTitle[MAX_PATH];
BROWSEINFOA bi;
TRACE("((%p->{lpszTitle=%s,owner=%i})\n", lpbi,
TRACE("((%p->{lpszTitle=%s,owner=%p})\n", lpbi,
lpbi ? debugstr_w(lpbi->lpszTitle): NULL, lpbi ? lpbi->hwndOwner: 0);
if (!lpbi)
......
dlls/shell32/changenotify.c
View file @ 991fd85d
......@@ -161,7 +161,7 @@ SHChangeNotifyRegister(
item = SHAlloc(sizeof(NOTIFICATIONLIST));
TRACE("(0x%04x,0x%08lx,0x%08lx,0x%08lx,0x%08x,%p) item=%p\n",
TRACE("(%p,0x%08lx,0x%08lx,0x%08lx,0x%08x,%p) item=%p\n",
hwnd,dwFlags,wEventMask,uMsg,cItems,lpItems,item);
item->next = NULL;
......@@ -188,7 +188,7 @@ BOOL WINAPI
SHChangeNotifyDeregister(
HANDLE hNotify)
{
TRACE("(0x%08x)\n",hNotify);
TRACE("(%p)\n",hNotify);
return DeleteNode((LPNOTIFICATIONLIST)hNotify);
}
......@@ -321,7 +321,7 @@ DWORD WINAPI NTSHChangeNotifyRegister(
int count,
LPNOTIFYREGISTER idlist)
{
FIXME("(0x%04x,0x%08lx,0x%08lx,0x%08lx,0x%08x,%p):stub.\n",
FIXME("(%p,0x%08lx,0x%08lx,0x%08lx,0x%08x,%p):stub.\n",
hwnd,events1,events2,msg,count,idlist);
return 0;
}
......@@ -357,4 +357,3 @@ DWORD WINAPI NTSHChangeNotifyDeregister(LONG x1)
FIXME("(0x%08lx):stub.\n",x1);
return 0;
}
dlls/shell32/control.c
View file @ 991fd85d
......@@ -378,7 +378,7 @@ void WINAPI Control_RunDLL(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdSho
{
CPanel panel;
TRACE("(0x%08x, 0x%08lx, %s, 0x%08lx)\n",
TRACE("(%p, 0x%08lx, %s, 0x%08lx)\n",
hWnd, (DWORD)hInst, debugstr_a(cmd), nCmdShow);
memset(&panel, 0, sizeof(panel));
......@@ -396,7 +396,7 @@ void WINAPI Control_RunDLL(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdSho
*/
HRESULT WINAPI Control_FillCache_RunDLL(HWND hWnd, HANDLE hModule, DWORD w, DWORD x)
{
FIXME("0x%04x 0x%04x 0x%04lx 0x%04lx stub\n",hWnd, hModule, w, x);
FIXME("%p %p 0x%04lx 0x%04lx stub\n", hWnd, hModule, w, x);
return 0;
}
......@@ -419,6 +419,6 @@ HRESULT WINAPI RunDLL_CallEntry16(DWORD v, DWORD w, DWORD x, DWORD y, DWORD z)
*/
DWORD WINAPI CallCPLEntry16(HMODULE hMod, FARPROC pFunc, DWORD dw3, DWORD dw4, DWORD dw5, DWORD dw6)
{
FIXME("(%04x, %p, %08lx, %08lx, %08lx, %08lx): stub.\n", hMod, pFunc, dw3, dw4, dw5, dw6);
FIXME("(%p, %p, %08lx, %08lx, %08lx, %08lx): stub.\n", hMod, pFunc, dw3, dw4, dw5, dw6);
return 0x0deadbee;
}
dlls/shell32/dialogs.c
View file @ 991fd85d
......@@ -60,7 +60,7 @@ BOOL WINAPI PickIconDlg(
DWORD nMaxFile,
LPDWORD lpdwIconIndex)
{
FIXME("(%08x,%s,%08lx,%p):stub.\n",
FIXME("(%p,%s,%08lx,%p):stub.\n",
hwndOwner, lpstrFile, nMaxFile,lpdwIconIndex);
return 0xffffffff;
}
......@@ -103,8 +103,9 @@ void WINAPI RunFileDlg(
return;
}
DialogBoxIndirectParamA(GetWindowLongA( hwndOwner, GWL_HINSTANCE ),
template, hwndOwner, RunDlgProc, (LPARAM)&rfdp);
DialogBoxIndirectParamA((HINSTANCE)GetWindowLongA( hwndOwner,
GWL_HINSTANCE ),
template, hwndOwner, RunDlgProc, (LPARAM)&rfdp);
}
......@@ -373,7 +374,7 @@ void FillList (HWND hCb, char *pszLatest)
*/
void WINAPI ExitWindowsDialog (HWND hWndOwner)
{
TRACE("(0x%08x)\n", hWndOwner);
TRACE("(%p)\n", hWndOwner);
if (MessageBoxA( hWndOwner, "Do you want to exit WINE?", "Shutdown", MB_YESNO|MB_ICONQUESTION) == IDYES)
{
SendMessageA ( hWndOwner, WM_QUIT, 0, 0);
......
dlls/shell32/dragdrophelper.c
View file @ 991fd85d
......@@ -137,7 +137,7 @@ static HRESULT WINAPI IDropTargetHelper_fnDragEnter (
DWORD dwEffect)
{
ICOM_THIS (IDropTargetHelperImpl, iface);
FIXME ("(%p)->(0x%x %p %p 0x%08lx)\n", This,hwndTarget, pDataObject, ppt, dwEffect);
FIXME ("(%p)->(%p %p %p 0x%08lx)\n", This,hwndTarget, pDataObject, ppt, dwEffect);
return E_NOTIMPL;
}
......
dlls/shell32/iconcache.c
View file @ 991fd85d
......@@ -87,7 +87,7 @@ static INT SIC_IconAppend (LPCSTR sSourceFile, INT dwSourceIndex, HICON hSmallIc
{ LPSIC_ENTRY lpsice;
INT ret, index, index1;
char *path;
TRACE("%s %i %x %x\n", sSourceFile, dwSourceIndex, hSmallIcon ,hBigIcon);
TRACE("%s %i %p %p\n", sSourceFile, dwSourceIndex, hSmallIcon ,hBigIcon);
lpsice = (LPSIC_ENTRY) SHAlloc (sizeof (SIC_ENTRY));
......@@ -136,7 +136,7 @@ static INT SIC_LoadIcon (LPCSTR sSourceFile, INT dwSourceIndex)
if ( !hiconLarge || !hiconSmall)
{
WARN("failure loading icon %i from %s (%x %x)\n", dwSourceIndex, sSourceFile, hiconLarge, hiconSmall);
WARN("failure loading icon %i from %s (%p %p)\n", dwSourceIndex, sSourceFile, hiconLarge, hiconSmall);
return -1;
}
return SIC_IconAppend (sSourceFile, dwSourceIndex, hiconSmall, hiconLarge);
......@@ -491,7 +491,7 @@ HICON WINAPI ExtractAssociatedIconA(HINSTANCE hInst, LPSTR lpIconPath, LPWORD lp
else
*lpiIcon = 6; /* generic icon - found nothing */
GetModuleFileName16(hInst, lpIconPath, 0x80);
GetModuleFileNameA(hInst, lpIconPath, 0x80);
hIcon = LoadIconA( hInst, MAKEINTRESOURCEA(*lpiIcon));
}
return hIcon;
......
dlls/shell32/memorystream.c
View file @ 991fd85d
......@@ -94,9 +94,9 @@ HRESULT CreateStreamOnFile (LPCSTR pszFilename, IStream ** ppstm)
fstr = (ISHFileStream*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ISHFileStream));
fstr->lpvtst=&stvt;
fstr->ref = 1;
fstr->dwLength = GetFileSize (hFile, NULL);
fstr->dwLength = GetFileSize ((HANDLE)hFile, NULL);
if (!(fstr->hMapping = CreateFileMappingA(hFile,NULL,PAGE_READONLY|SEC_COMMIT,0,0,NULL)))
if (!(fstr->hMapping = CreateFileMappingA((HANDLE)hFile,NULL,PAGE_READONLY|SEC_COMMIT,0,0,NULL)))
{
WARN("failed to create filemap.\n");
goto end_2;
......
dlls/shell32/pidl.c
View file @ 991fd85d
......@@ -283,7 +283,7 @@ HRESULT WINAPI SHILCreateFromPathAW (LPCVOID path, LPITEMIDLIST * ppidl, DWORD *
*/
LPITEMIDLIST WINAPI SHCloneSpecialIDList(HWND hwndOwner,DWORD nFolder,DWORD x3)
{ LPITEMIDLIST ppidl;
WARN_(shell)("(hwnd=0x%x,csidl=0x%lx,0x%lx):semi-stub.\n",
WARN_(shell)("(hwnd=%p,csidl=0x%lx,0x%lx):semi-stub.\n",
hwndOwner,nFolder,x3);
SHGetSpecialFolderLocation(hwndOwner, nFolder, &ppidl);
......@@ -747,7 +747,7 @@ HRESULT WINAPI SHGetSpecialFolderLocation(
CHAR szPath[MAX_PATH];
HRESULT hr = E_INVALIDARG;
TRACE_(shell)("(%04x,0x%x,%p)\n", hwndOwner,nFolder,ppidl);
TRACE_(shell)("(%p,0x%x,%p)\n", hwndOwner,nFolder,ppidl);
if (ppidl)
{
......@@ -807,7 +807,7 @@ HRESULT WINAPI SHGetFolderLocation(
DWORD dwFlags,
LPITEMIDLIST *ppidl)
{
FIXME("0x%04x 0x%08x 0x%08x 0x%08lx %p\n",
FIXME("%p 0x%08x %p 0x%08lx %p\n",
hwnd, csidl, hToken, dwFlags, ppidl);
return SHGetSpecialFolderLocation(hwnd, csidl, ppidl);
}
......
dlls/shell32/shell.c
View file @ 991fd85d
......@@ -191,10 +191,9 @@ BOOL16 WINAPI DragQueryPoint16(HDROP16 hDrop, POINT16 *p)
*/
HINSTANCE16 WINAPI FindExecutable16( LPCSTR lpFile, LPCSTR lpDirectory,
LPSTR lpResult )
{ return (HINSTANCE16)FindExecutableA( lpFile, lpDirectory, lpResult );
{ return HINSTANCE_16(FindExecutableA( lpFile, lpDirectory, lpResult ));
}
/*************************************************************************
* AboutDlgProc (SHELL.33)
*/
......@@ -238,9 +237,9 @@ HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16 hInstance,
if (hFile == HFILE_ERROR)
{ /* not found - load from builtin module if available */
HINSTANCE hInst = (HINSTANCE)LoadLibrary16(lpszExeFileName);
HINSTANCE hInst = HINSTANCE_32(LoadLibrary16(lpszExeFileName));
if (hInst < 32) /* hmm, no Win16 module - try Win32 :-) */
if ((int)hInst < 32) /* hmm, no Win16 module - try Win32 :-) */
hInst = LoadLibraryA(lpszExeFileName);
if (hInst)
{
......@@ -628,10 +627,11 @@ DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD index, LPSTR name, DWORD name_len )
/*************************************************************************
* SHELL_Execute16 [Internal]
*/
static HINSTANCE SHELL_Execute16(char *lpCmd, LPSHELLEXECUTEINFOA sei, BOOL shWait)
static UINT SHELL_Execute16(char *lpCmd, LPSHELLEXECUTEINFOA sei, BOOL shWait)
{
sei->hInstApp = WinExec16(lpCmd, sei->nShow);
return sei->hInstApp;
UINT ret = WinExec16(lpCmd, sei->nShow);
sei->hInstApp = HINSTANCE_32(ret);
return ret;
}
/*************************************************************************
......@@ -659,5 +659,5 @@ HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation,
sei.hProcess = hProcess;
ShellExecuteExA32 (&sei, SHELL_Execute16);
return (HINSTANCE16)sei.hInstApp;
return HINSTANCE_16(sei.hInstApp);
}
dlls/shell32/shell32_main.c
View file @ 991fd85d
......@@ -457,7 +457,7 @@ DWORD WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes,
if(pidlLast) SHFree(pidlLast);
#ifdef MORE_DEBUG
TRACE ("icon=0x%08x index=0x%08x attr=0x%08lx name=%s type=%s ret=0x%08lx\n",
TRACE ("icon=%p index=0x%08x attr=0x%08lx name=%s type=%s ret=0x%08lx\n",
psfi->hIcon, psfi->iIcon, psfi->dwAttributes, psfi->szDisplayName, psfi->szTypeName, ret);
#endif
return ret;
......@@ -524,7 +524,7 @@ HICON WINAPI DuplicateIcon( HINSTANCE hInstance, HICON hIcon)
ICONINFO IconInfo;
HICON hDupIcon = 0;
TRACE("(%04x, %04x)\n", hInstance, hIcon);
TRACE("(%p, %p)\n", hInstance, hIcon);
if(GetIconInfo(hIcon, &IconInfo))
{
......@@ -538,7 +538,6 @@ HICON WINAPI DuplicateIcon( HINSTANCE hInstance, HICON hIcon)
return hDupIcon;
}
/*************************************************************************
* ExtractIconA [SHELL32.@]
*
......@@ -547,7 +546,7 @@ HICON WINAPI DuplicateIcon( HINSTANCE hInstance, HICON hIcon)
*/
HICON WINAPI ExtractIconA( HINSTANCE hInstance, LPCSTR lpszExeFileName,
UINT nIconIndex )
{ HGLOBAL16 handle = InternalExtractIcon16(hInstance,lpszExeFileName,nIconIndex, 1);
{ HGLOBAL16 handle = InternalExtractIcon16(HINSTANCE_16(hInstance),lpszExeFileName,nIconIndex, 1);
TRACE("\n");
if( handle )
{
......@@ -712,7 +711,7 @@ INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
SystemParametersInfoA( SPI_GETICONTITLELOGFONT, 0, &logFont, 0 );
hIconTitleFont = CreateFontIndirectA( &logFont );
}
SendMessageA( hWndCtl, WM_SETFONT, hIconTitleFont, 0 );
SendMessageA( hWndCtl, WM_SETFONT, HICON_16(hIconTitleFont), 0 );
while (*pstr)
{ SendMessageA( hWndCtl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)*pstr );
pstr++;
......@@ -845,7 +844,7 @@ BOOL WINAPI ShellAboutA( HWND hWnd, LPCSTR szApp, LPCSTR szOtherStuff,
info.szOtherStuff = szOtherStuff;
info.hIcon = hIcon;
if (!hIcon) info.hIcon = LoadIconA( 0, IDI_WINLOGOA );
return DialogBoxIndirectParamA( GetWindowLongA( hWnd, GWL_HINSTANCE ),
return DialogBoxIndirectParamA( (HINSTANCE)GetWindowLongA( hWnd, GWL_HINSTANCE ),
template, hWnd, AboutDlgProc, (LPARAM)&info );
}
......@@ -871,7 +870,7 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff,
info.szOtherStuff = HEAP_strdupWtoA( GetProcessHeap(), 0, szOtherStuff );
info.hIcon = hIcon;
if (!hIcon) info.hIcon = LoadIconA( 0, IDI_WINLOGOA );
ret = DialogBoxIndirectParamA( GetWindowLongA( hWnd, GWL_HINSTANCE ),
ret = DialogBoxIndirectParamA((HINSTANCE)GetWindowLongA( hWnd, GWL_HINSTANCE ),
template, hWnd, AboutDlgProc, (LPARAM)&info );
HeapFree( GetProcessHeap(), 0, (LPSTR)info.szApp );
HeapFree( GetProcessHeap(), 0, (LPSTR)info.szOtherStuff );
......@@ -952,7 +951,7 @@ HIMAGELIST ShellBigIconList = 0;
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
{
TRACE("0x%x 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
switch (fdwReason)
{
......
dlls/shell32/shell32_main.h
View file @ 991fd85d
......@@ -201,8 +201,9 @@ inline static void __SHCloneStrWtoA(char ** target, const WCHAR * source)
#define HICON_16(h32) (LOWORD(h32))
#define HICON_32(h16) ((HICON)(ULONG_PTR)(h16))
#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16))
#define HINSTANCE_16(h32) (LOWORD(h32))
typedef HINSTANCE (*SHELL_ExecuteA1632)(char *lpCmd, LPSHELLEXECUTEINFOA sei, BOOL shWait);
typedef UINT (*SHELL_ExecuteA1632)(char *lpCmd, LPSHELLEXECUTEINFOA sei, BOOL shWait);
BOOL WINAPI ShellExecuteExA32 (LPSHELLEXECUTEINFOA sei, SHELL_ExecuteA1632 execfunc);
#endif
dlls/shell32/shelllink.c
View file @ 991fd85d
......@@ -391,13 +391,15 @@ static int ExtractFromEXEDLL(const char *szFileName, int nIndex, const char *szX
if (nIndex < 0)
{
hResInfo = FindResourceA(hModule, MAKEINTRESOURCEA(-nIndex), RT_GROUP_ICONA);
TRACE("FindResourceA (%s) called, return 0x%x, error %ld\n", szFileName, hResInfo, GetLastError());
TRACE("FindResourceA (%s) called, return %p, error %ld\n", szFileName, hResInfo, GetLastError());
}
else
{
sEnumRes.pResInfo = &hResInfo;
sEnumRes.nIndex = nIndex;
if (EnumResourceNamesA(hModule, RT_GROUP_ICONA, &EnumResNameProc, (LONG) &sEnumRes))
if (EnumResourceNamesA(hModule, RT_GROUP_ICONA,
(ENUMRESNAMEPROCA)&EnumResNameProc,
(LONG) &sEnumRes))
{
TRACE("EnumResourceNamesA failed, error %ld\n", GetLastError());
goto error2;
......@@ -1305,7 +1307,7 @@ static HRESULT WINAPI IShellLinkA_fnResolve(IShellLinkA * iface, HWND hwnd, DWOR
{
ICOM_THIS(IShellLinkImpl, iface);
FIXME("(%p)->(hwnd=%x flags=%lx)\n",This, hwnd, fFlags);
FIXME("(%p)->(hwnd=%p flags=%lx)\n",This, hwnd, fFlags);
return NOERROR;
}
static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA * iface, LPCSTR pszFile)
......@@ -1565,7 +1567,7 @@ static HRESULT WINAPI IShellLinkW_fnResolve(IShellLinkW * iface, HWND hwnd, DWOR
{
_ICOM_THIS_From_IShellLinkW(IShellLinkImpl, iface);
FIXME("(%p)->(hwnd=%x flags=%lx)\n",This, hwnd, fFlags);
FIXME("(%p)->(hwnd=%p flags=%lx)\n",This, hwnd, fFlags);
return NOERROR;
}
......
dlls/shell32/shellole.c
View file @ 991fd85d
......@@ -709,7 +709,7 @@ UINT WINAPI DragQueryFileA(
UINT i = 0;
DROPFILES *lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop);
TRACE("(%08x, %x, %p, %u)\n", hDrop,lFile,lpszFile,lLength);
TRACE("(%p, %x, %p, %u)\n", hDrop,lFile,lpszFile,lLength);
if(!lpDropFileStruct) goto end;
......@@ -766,7 +766,7 @@ UINT WINAPI DragQueryFileW(
UINT i = 0;
DROPFILES *lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop);
TRACE("(%08x, %x, %p, %u)\n", hDrop,lFile,lpszwFile,lLength);
TRACE("(%p, %x, %p, %u)\n", hDrop,lFile,lpszwFile,lLength);
if(!lpDropFileStruct) goto end;
......
dlls/shell32/shellord.c
View file @ 991fd85d
......@@ -141,7 +141,7 @@ BOOL WINAPI GetFileNameFromBrowse(
OPENFILENAMEA ofn;
BOOL ret;
TRACE("%04x, %s, %ld, %s, %s, %s, %s)\n",
TRACE("%p, %s, %ld, %s, %s, %s, %s)\n",
hwndOwner, lpstrFile, nMaxFile, lpstrInitialDir, lpstrDefExt,
lpstrFilter, lpstrTitle);
......@@ -256,7 +256,7 @@ int WINAPI SHShellFolderView_Message(
DWORD dwMessage,
DWORD dwParam)
{
FIXME("%04x %08lx %08lx stub\n",hwndCabinet, dwMessage, dwParam);
FIXME("%p %08lx %08lx stub\n",hwndCabinet, dwMessage, dwParam);
return 0;
}
......@@ -274,7 +274,7 @@ BOOL WINAPI RegisterShellHook(
HWND hWnd,
DWORD dwType)
{
FIXME("(0x%08x,0x%08lx):stub.\n",hWnd, dwType);
FIXME("(%p,0x%08lx):stub.\n",hWnd, dwType);
return TRUE;
}
/*************************************************************************
......@@ -379,7 +379,7 @@ HRESULT WINAPI SHRegisterDragDrop(
HWND hWnd,
LPDROPTARGET pDropTarget)
{
FIXME("(0x%08x,%p):stub.\n", hWnd, pDropTarget);
FIXME("(%p,%p):stub.\n", hWnd, pDropTarget);
if (GetShellOle()) return pRegisterDragDrop(hWnd, pDropTarget);
return 0;
}
......@@ -392,7 +392,7 @@ HRESULT WINAPI SHRegisterDragDrop(
*/
HRESULT WINAPI SHRevokeDragDrop(HWND hWnd)
{
FIXME("(0x%08x):stub.\n",hWnd);
FIXME("(%p):stub.\n",hWnd);
return 0;
}
......@@ -409,7 +409,7 @@ HRESULT WINAPI SHDoDragDrop(
DWORD dwOKEffect,
LPDWORD pdwEffect)
{
FIXME("(0x%04x %p %p 0x%08lx %p):stub.\n",
FIXME("(%p %p %p 0x%08lx %p):stub.\n",
hWnd, lpDataObject, lpDropSource, dwOKEffect, pdwEffect);
return 0;
}
......@@ -425,7 +425,7 @@ WORD WINAPI ArrangeWindows(
WORD cKids,
CONST HWND * lpKids)
{
FIXME("(0x%08x 0x%08lx %p 0x%04x %p):stub.\n",
FIXME("(%p 0x%08lx %p 0x%04x %p):stub.\n",
hwndParent, dwReserved, lpRect, cKids, lpKids);
return 0;
}
......@@ -979,7 +979,7 @@ void WINAPI SHFreeUnusedLibraries (void)
*/
DWORD WINAPI DAD_AutoScroll(HWND hwnd, LPSCROLLSAMPLES samples, LPPOINT pt)
{
FIXME("hwnd = %04x %p %p\n",hwnd,samples,pt);
FIXME("hwnd = %p %p %p\n",hwnd,samples,pt);
return 0;
}
/*************************************************************************
......@@ -988,7 +988,7 @@ DWORD WINAPI DAD_AutoScroll(HWND hwnd, LPSCROLLSAMPLES samples, LPPOINT pt)
*/
BOOL WINAPI DAD_DragEnter(HWND hwnd)
{
FIXME("hwnd = %04x\n",hwnd);
FIXME("hwnd = %p\n",hwnd);
return FALSE;
}
/*************************************************************************
......@@ -997,7 +997,7 @@ BOOL WINAPI DAD_DragEnter(HWND hwnd)
*/
BOOL WINAPI DAD_DragEnterEx(HWND hwnd, POINT p)
{
FIXME("hwnd = %04x (%ld,%ld)\n",hwnd,p.x,p.y);
FIXME("hwnd = %p (%ld,%ld)\n",hwnd,p.x,p.y);
return FALSE;
}
/*************************************************************************
......@@ -1115,7 +1115,7 @@ HGLOBAL WINAPI SHAllocShared(LPVOID psrc, DWORD size, DWORD procID)
* the return value seems to be a memory address
*/
LPVOID WINAPI SHLockShared(HANDLE hmem, DWORD procID)
{ TRACE("handle=0x%04x procID=0x%04lx\n",hmem,procID);
{ TRACE("handle=%p procID=0x%04lx\n",hmem,procID);
return GlobalLock(hmem);
}
/*************************************************************************
......@@ -1140,15 +1140,15 @@ BOOL WINAPI SHFreeShared(
HANDLE hMem,
DWORD pid)
{
TRACE("handle=0x%04x 0x%04lx\n",hMem,pid);
return GlobalFree(hMem);
TRACE("handle=%p 0x%04lx\n",hMem,pid);
return (BOOL)GlobalFree(hMem);
}
/*************************************************************************
* SetAppStartingCursor [SHELL32.99]
*/
HRESULT WINAPI SetAppStartingCursor(HWND u, DWORD v)
{ FIXME("hwnd=0x%04x 0x%04lx stub\n",u,v );
{ FIXME("hwnd=%p 0x%04lx stub\n",u,v );
return 0;
}
/*************************************************************************
......@@ -1184,7 +1184,7 @@ int WINAPI SHOutOfMemoryMessageBox(
LPCSTR lpCaption,
UINT uType)
{
FIXME("0x%04x %s 0x%08x stub\n",hwndOwner, lpCaption, uType);
FIXME("%p %s 0x%08x stub\n",hwndOwner, lpCaption, uType);
return 0;
}
/*************************************************************************
......
dlls/shell32/shellpath.c
View file @ 991fd85d
......@@ -1015,7 +1015,7 @@ BOOL WINAPI SHGetSpecialFolderPathA (
DWORD folder = csidl & CSIDL_FOLDER_MASK;
CHAR *p;
TRACE("0x%04x,%p,csidl=%lu,0x%04x\n", hwndOwner,szPath,csidl,bCreate);
TRACE("%p,%p,csidl=%lu,0x%04x\n", hwndOwner,szPath,csidl,bCreate);
if ((folder > CSIDL_COMPUTERSNEARME) || (CSIDL_Data[folder].hRootKey == 0))
{
......@@ -1164,7 +1164,7 @@ BOOL WINAPI SHGetSpecialFolderPathW (
szPath[MAX_PATH-1] = 0;
}
TRACE("0x%04x,%p,csidl=%lu,0x%04x\n", hwndOwner,szPath,csidl,bCreate);
TRACE("%p,%p,csidl=%lu,0x%04x\n", hwndOwner,szPath,csidl,bCreate);
return TRUE;
}
......
dlls/shell32/shellreg.c
View file @ 991fd85d
......@@ -46,7 +46,7 @@ HRESULT WINAPI SHRegOpenKeyA(
LPSTR lpSubKey,
PHKEY phkResult)
{
TRACE("(0x%08x, %s, %p)\n", hKey, debugstr_a(lpSubKey), phkResult);
TRACE("(%p, %s, %p)\n", hKey, debugstr_a(lpSubKey), phkResult);
return RegOpenKeyA(hKey, lpSubKey, phkResult);
}
......@@ -59,7 +59,7 @@ HRESULT WINAPI SHRegOpenKeyW (
LPCWSTR lpszSubKey,
PHKEY retkey)
{
WARN("0x%04x %s %p\n",hkey,debugstr_w(lpszSubKey),retkey);
WARN("%p %s %p\n",hkey,debugstr_w(lpszSubKey),retkey);
return RegOpenKeyW( hkey, lpszSubKey, retkey );
}
......@@ -75,7 +75,7 @@ HRESULT WINAPI SHRegQueryValueExA(
LPBYTE lpData,
LPDWORD lpcbData)
{
TRACE("0x%04x %s %p %p %p %p\n", hkey, lpValueName, lpReserved, lpType, lpData, lpcbData);
TRACE("%p %s %p %p %p %p\n", hkey, lpValueName, lpReserved, lpType, lpData, lpcbData);
return RegQueryValueExA (hkey, lpValueName, lpReserved, lpType, lpData, lpcbData);
}
......@@ -89,7 +89,7 @@ HRESULT WINAPI SHRegQueryValueW(
LPWSTR lpszData,
LPDWORD lpcbData )
{
WARN("0x%04x %s %p %p semi-stub\n",
WARN("%p %s %p %p semi-stub\n",
hkey, debugstr_w(lpszSubKey), lpszData, lpcbData);
return RegQueryValueW( hkey, lpszSubKey, lpszData, lpcbData );
}
......@@ -110,7 +110,7 @@ HRESULT WINAPI SHRegQueryValueExW (
LPDWORD pcbData)
{
DWORD ret;
WARN("0x%04x %s %p %p %p %p semi-stub\n",
WARN("%p %s %p %p %p %p semi-stub\n",
hkey, debugstr_w(pszValue), pdwReserved, pdwType, pvData, pcbData);
ret = RegQueryValueExW ( hkey, pszValue, pdwReserved, pdwType, pvData, pcbData);
return ret;
......@@ -123,7 +123,7 @@ HRESULT WINAPI SHRegDeleteKeyA(
HKEY hkey,
LPCSTR pszSubKey)
{
FIXME("hkey=0x%08x, %s\n", hkey, debugstr_a(pszSubKey));
FIXME("hkey=%p, %s\n", hkey, debugstr_a(pszSubKey));
return 0;
}
......@@ -134,7 +134,7 @@ HRESULT WINAPI SHRegDeleteKeyW(
HKEY hkey,
LPCWSTR pszSubKey)
{
FIXME("hkey=0x%08x, %s\n", hkey, debugstr_w(pszSubKey));
FIXME("hkey=%p, %s\n", hkey, debugstr_w(pszSubKey));
return 0;
}
......@@ -144,6 +144,6 @@ HRESULT WINAPI SHRegDeleteKeyW(
*/
HRESULT WINAPI SHRegCloseKey (HKEY hkey)
{
TRACE("0x%04x\n",hkey);
TRACE("%p\n",hkey);
return RegCloseKey( hkey );
}
dlls/shell32/shfldr_desktop.c
View file @ 991fd85d
......@@ -198,7 +198,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
HRESULT hr = E_OUTOFMEMORY;
CLSID clsid;
TRACE ("(%p)->(HWND=0x%08x,%p,%p=%s,%p,pidl=%p,%p)\n",
TRACE ("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n",
This, hwndOwner, pbcReserved, lpszDisplayName, debugstr_w (lpszDisplayName), pchEaten, ppidl, pdwAttributes);
*ppidl = 0;
......@@ -252,7 +252,7 @@ static HRESULT WINAPI ISF_Desktop_fnEnumObjects (IShellFolder2 * iface,
{
ICOM_THIS (IGenericSFImpl, iface);
TRACE ("(%p)->(HWND=0x%08x flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList);
TRACE ("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList);
*ppEnumIDList = NULL;
*ppEnumIDList = IEnumIDList_Constructor (NULL, dwFlags, EIDL_DESK);
......@@ -320,7 +320,7 @@ static HRESULT WINAPI ISF_Desktop_fnCreateViewObject (IShellFolder2 * iface,
LPSHELLVIEW pShellView;
HRESULT hr = E_INVALIDARG;
TRACE ("(%p)->(hwnd=0x%x,%s,%p)\n", This, hwndOwner, shdebugstr_guid (riid), ppvOut);
TRACE ("(%p)->(hwnd=%p,%s,%p)\n", This, hwndOwner, shdebugstr_guid (riid), ppvOut);
if (ppvOut) {
*ppvOut = NULL;
......@@ -394,7 +394,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface,
IUnknown *pObj = NULL;
HRESULT hr = E_INVALIDARG;
TRACE ("(%p)->(0x%04x,%u,apidl=%p,%s,%p,%p)\n",
TRACE ("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n",
This, hwndOwner, cidl, apidl, shdebugstr_guid (riid), prgfInOut, ppvOut);
if (ppvOut) {
......@@ -536,7 +536,7 @@ static HRESULT WINAPI ISF_Desktop_fnSetNameOf (IShellFolder2 * iface, HWND hwndO
{
ICOM_THIS (IGenericSFImpl, iface);
FIXME ("(%p)->(%u,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut);
FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut);
return E_FAIL;
}
......
dlls/shell32/shfldr_fs.c
View file @ 991fd85d
......@@ -326,7 +326,7 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface,
szPath[MAX_PATH];
LPITEMIDLIST pidlTemp = NULL;
TRACE ("(%p)->(HWND=0x%08x,%p,%p=%s,%p,pidl=%p,%p)\n",
TRACE ("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n",
This, hwndOwner, pbcReserved, lpszDisplayName, debugstr_w (lpszDisplayName), pchEaten, ppidl, pdwAttributes);
if (!lpszDisplayName || !ppidl)
......@@ -384,7 +384,7 @@ IShellFolder_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner, DWORD dwFlags
{
_ICOM_THIS_From_IShellFolder2 (IGenericSFImpl, iface)
TRACE ("(%p)->(HWND=0x%08x flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList);
TRACE ("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList);
*ppEnumIDList = IEnumIDList_Constructor (This->sPathTarget, dwFlags, EIDL_FILE);
......@@ -458,7 +458,7 @@ IShellFolder_fnCreateViewObject (IShellFolder2 * iface, HWND hwndOwner, REFIID r
LPSHELLVIEW pShellView;
HRESULT hr = E_INVALIDARG;
TRACE ("(%p)->(hwnd=0x%x,%s,%p)\n", This, hwndOwner, shdebugstr_guid (riid), ppvOut);
TRACE ("(%p)->(hwnd=%p,%s,%p)\n", This, hwndOwner, shdebugstr_guid (riid), ppvOut);
if (ppvOut) {
*ppvOut = NULL;
......@@ -545,7 +545,7 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface,
IUnknown *pObj = NULL;
HRESULT hr = E_INVALIDARG;
TRACE ("(%p)->(0x%04x,%u,apidl=%p,%s,%p,%p)\n",
TRACE ("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n",
This, hwndOwner, cidl, apidl, shdebugstr_guid (riid), prgfInOut, ppvOut);
if (ppvOut) {
......@@ -680,7 +680,7 @@ static HRESULT WINAPI IShellFolder_fnSetNameOf (IShellFolder2 * iface, HWND hwnd
int len;
BOOL bIsFolder = _ILIsFolder (ILFindLastID (pidl));
TRACE ("(%p)->(%u,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut);
TRACE ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut);
/* build source path */
if (dwFlags & SHGDN_INFOLDER) {
......
dlls/shell32/shfldr_mycomp.c
View file @ 991fd85d
......@@ -200,7 +200,7 @@ ISF_MyComputer_fnParseDisplayName (IShellFolder2 * iface,
CHAR szTempA[MAX_PATH];
LPITEMIDLIST pidlTemp;
TRACE ("(%p)->(HWND=0x%08x,%p,%p=%s,%p,pidl=%p,%p)\n",
TRACE ("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n",
This, hwndOwner, pbcReserved, lpszDisplayName, debugstr_w (lpszDisplayName), pchEaten, ppidl, pdwAttributes);
*ppidl = 0;
......@@ -237,7 +237,7 @@ ISF_MyComputer_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner, DWORD dwFla
{
ICOM_THIS (IGenericSFImpl, iface);
TRACE ("(%p)->(HWND=0x%08x flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList);
TRACE ("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList);
*ppEnumIDList = IEnumIDList_Constructor (NULL, dwFlags, EIDL_MYCOMP);
......@@ -303,7 +303,7 @@ ISF_MyComputer_fnCreateViewObject (IShellFolder2 * iface, HWND hwndOwner, REFIID
LPSHELLVIEW pShellView;
HRESULT hr = E_INVALIDARG;
TRACE ("(%p)->(hwnd=0x%x,%s,%p)\n", This, hwndOwner, shdebugstr_guid (riid), ppvOut);
TRACE ("(%p)->(hwnd=%p,%s,%p)\n", This, hwndOwner, shdebugstr_guid (riid), ppvOut);
if (ppvOut) {
*ppvOut = NULL;
......@@ -375,7 +375,7 @@ ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface,
IUnknown *pObj = NULL;
HRESULT hr = E_INVALIDARG;
TRACE ("(%p)->(0x%04x,%u,apidl=%p,%s,%p,%p)\n",
TRACE ("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n",
This, hwndOwner, cidl, apidl, shdebugstr_guid (riid), prgfInOut, ppvOut);
if (ppvOut) {
......@@ -495,7 +495,7 @@ static HRESULT WINAPI ISF_MyComputer_fnSetNameOf (IShellFolder2 * iface, HWND hw
LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut)
{
ICOM_THIS (IGenericSFImpl, iface);
FIXME ("(%p)->(%u,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut);
FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut);
return E_FAIL;
}
......
dlls/shell32/shlexec.c
View file @ 991fd85d
......@@ -108,11 +108,11 @@ static BOOL argify(char* res, int len, const char* fmt, const char* lpFile)
* SHELL_ExecuteA [Internal]
*
*/
static HINSTANCE SHELL_ExecuteA(char *lpCmd, LPSHELLEXECUTEINFOA sei, BOOL shWait)
static UINT SHELL_ExecuteA(char *lpCmd, LPSHELLEXECUTEINFOA sei, BOOL shWait)
{
STARTUPINFOA startup;
PROCESS_INFORMATION info;
HINSTANCE retval = 31;
UINT retval = 31;
TRACE("Execute %s from directory %s\n", lpCmd, sei->lpDirectory);
ZeroMemory(&startup,sizeof(STARTUPINFOA));
......@@ -127,20 +127,20 @@ static HINSTANCE SHELL_ExecuteA(char *lpCmd, LPSHELLEXECUTEINFOA sei, BOOL shWai
if (shWait)
if (WaitForInputIdle( info.hProcess, 30000 ) == -1)
WARN("WaitForInputIdle failed: Error %ld\n", GetLastError() );
retval = (HINSTANCE)33;
retval = 33;
if(sei->fMask & SEE_MASK_NOCLOSEPROCESS)
sei->hProcess = info.hProcess;
else
CloseHandle( info.hProcess );
CloseHandle( info.hThread );
}
else if ((retval = GetLastError()) >= (HINSTANCE)32)
else if ((retval = GetLastError()) >= 32)
{
FIXME("Strange error set by CreateProcess: %d\n", retval);
retval = (HINSTANCE)ERROR_BAD_FORMAT;
retval = ERROR_BAD_FORMAT;
}
sei->hInstApp = retval;
sei->hInstApp = (HINSTANCE)retval;
return retval;
}
......@@ -158,8 +158,8 @@ static HINSTANCE SHELL_ExecuteA(char *lpCmd, LPSHELLEXECUTEINFOA sei, BOOL shWai
* command (it'll be used afterwards for more information
* on the operation)
*/
static HINSTANCE SHELL_FindExecutable(LPCSTR lpPath, LPCSTR lpFile, LPCSTR lpOperation,
LPSTR lpResult, LPSTR key)
static UINT SHELL_FindExecutable(LPCSTR lpPath, LPCSTR lpFile, LPCSTR lpOperation,
LPSTR lpResult, LPSTR key)
{
char *extension = NULL; /* pointer to file extension */
char tmpext[5]; /* local copy to mung as we please */
......@@ -168,7 +168,7 @@ static HINSTANCE SHELL_FindExecutable(LPCSTR lpPath, LPCSTR lpFile, LPCSTR lpOpe
char command[256]; /* command from registry */
LONG commandlen = 256; /* This is the most DOS can handle :) */
char buffer[256]; /* Used to GetProfileString */
HINSTANCE retval = 31; /* default - 'No association was found' */
UINT retval = 31; /* default - 'No association was found' */
char *tok; /* token pointer */
int i; /* random counter */
char xlpFile[256] = ""; /* result of SearchPath */
......@@ -418,11 +418,11 @@ static unsigned dde_connect(char* key, char* start, char* ddeexec,
/*************************************************************************
* execute_from_key [Internal]
*/
static HINSTANCE execute_from_key(LPSTR key, LPCSTR lpFile, LPSHELLEXECUTEINFOA sei, SHELL_ExecuteA1632 execfunc)
static UINT execute_from_key(LPSTR key, LPCSTR lpFile, LPSHELLEXECUTEINFOA sei, SHELL_ExecuteA1632 execfunc)
{
char cmd[1024] = "";
LONG cmdlen = sizeof(cmd);
HINSTANCE retval = 31;
UINT retval = 31;
/* Get the application for the registry */
if (RegQueryValueA(HKEY_CLASSES_ROOT, key, cmd, &cmdlen) == ERROR_SUCCESS)
......@@ -460,7 +460,7 @@ static HINSTANCE execute_from_key(LPSTR key, LPCSTR lpFile, LPSHELLEXECUTEINFOA
*/
HINSTANCE WINAPI FindExecutableA(LPCSTR lpFile, LPCSTR lpDirectory, LPSTR lpResult)
{
HINSTANCE retval = 31; /* default - 'No association was found' */
UINT retval = 31; /* default - 'No association was found' */
char old_dir[1024];
TRACE("File %s, Dir %s\n",
......@@ -472,7 +472,7 @@ HINSTANCE WINAPI FindExecutableA(LPCSTR lpFile, LPCSTR lpDirectory, LPSTR lpResu
if ((lpFile == NULL) || (lpResult == NULL))
{
/* FIXME - should throw a warning, perhaps! */
return 2; /* File not found. Close enough, I guess. */
return (HINSTANCE)2; /* File not found. Close enough, I guess. */
}
if (lpDirectory)
......@@ -486,7 +486,7 @@ HINSTANCE WINAPI FindExecutableA(LPCSTR lpFile, LPCSTR lpDirectory, LPSTR lpResu
TRACE("returning %s\n", lpResult);
if (lpDirectory)
SetCurrentDirectoryA(old_dir);
return retval;
return (HINSTANCE)retval;
}
/*************************************************************************
......@@ -495,7 +495,7 @@ HINSTANCE WINAPI FindExecutableA(LPCSTR lpFile, LPCSTR lpDirectory, LPSTR lpResu
HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpResult)
{
FIXME("(%p,%p,%p): stub\n", lpFile, lpDirectory, lpResult);
return 31; /* default - 'No association was found' */
return (HINSTANCE)31; /* default - 'No association was found' */
}
/*************************************************************************
......@@ -508,11 +508,11 @@ BOOL WINAPI ShellExecuteExA32 (LPSHELLEXECUTEINFOA sei, SHELL_ExecuteA1632 execf
int gap, len;
char lpstrProtocol[256];
LPCSTR lpFile,lpOperation;
HINSTANCE retval = 31;
UINT retval = 31;
char cmd[1024];
BOOL done;
TRACE("mask=0x%08lx hwnd=0x%04x verb=%s file=%s parm=%s dir=%s show=0x%08x class=%s\n",
TRACE("mask=0x%08lx hwnd=%p verb=%s file=%s parm=%s dir=%s show=0x%08x class=%s\n",
sei->fMask, sei->hwnd, debugstr_a(sei->lpVerb),
debugstr_a(sei->lpFile), debugstr_a(sei->lpParameters),
debugstr_a(sei->lpDirectory), sei->nShow,
......@@ -656,16 +656,16 @@ BOOL WINAPI ShellExecuteExA32 (LPSHELLEXECUTEINFOA sei, SHELL_ExecuteA1632 execf
/* if so, append lpFile http:// and call ShellExecute */
char lpstrTmpFile[256] = "http://" ;
strcat(lpstrTmpFile, lpFile);
retval = ShellExecuteA(sei->hwnd, lpOperation, lpstrTmpFile, NULL, NULL, 0);
retval = (UINT)ShellExecuteA(sei->hwnd, lpOperation, lpstrTmpFile, NULL, NULL, 0);
}
if (retval <= 32)
{
sei->hInstApp = retval;
sei->hInstApp = (HINSTANCE)retval;
return FALSE;
}
sei->hInstApp = 33;
sei->hInstApp = (HINSTANCE)33;
return TRUE;
}
......
dlls/shell32/shlmenu.c
View file @ 991fd85d
......@@ -134,7 +134,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPITEMIDLIST pAlternatePidl)
MENUINFO MenuInfo;
LPFMINFO menudata;
TRACE("0x%04x %p\n", hmenu, pAlternatePidl);
TRACE("%p %p\n", hmenu, pAlternatePidl);
MenuInfo.cbSize = sizeof(MENUINFO);
MenuInfo.fMask = MIM_MENUDATA;
......@@ -254,7 +254,7 @@ HMENU WINAPI FileMenu_Create (
HMENU hMenu = CreatePopupMenu();
TRACE("0x%08lx 0x%08x 0x%08x 0x%08x 0x%08x hMenu=0x%08x\n",
TRACE("0x%08lx 0x%08x %p 0x%08x 0x%08x hMenu=%p\n",
crBorderColor, nBorderWidth, hBorderBmp, nSelHeight, uFlags, hMenu);
menudata = (LPFMINFO)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FMINFO));
......@@ -280,7 +280,7 @@ void WINAPI FileMenu_Destroy (HMENU hmenu)
{
LPFMINFO menudata;
TRACE("0x%08x\n", hmenu);
TRACE("%p\n", hmenu);
FileMenu_DeleteAllItems (hmenu);
......@@ -313,7 +313,7 @@ static BOOL FileMenu_AppendItemA(
MENUINFO MenuInfo;
TRACE("0x%08x %s 0x%08x 0x%08x 0x%08x 0x%08x\n",
TRACE("%p %s 0x%08x 0x%08x %p 0x%08x\n",
hMenu, (lpszText!=FM_SEPARATOR) ? lpText: NULL,
uID, icon, hMenuPopup, nItemHeight);
......@@ -410,7 +410,7 @@ int WINAPI FileMenu_InsertUsingPidl (
UINT uEnumFlags,
LPFNFMCALLBACK lpfnCallback)
{
TRACE("0x%08x 0x%08x %p 0x%08x 0x%08x %p\n",
TRACE("%p 0x%08x %p 0x%08x 0x%08x %p\n",
hmenu, uID, pidl, uFlags, uEnumFlags, lpfnCallback);
pdump (pidl);
......@@ -434,7 +434,7 @@ int WINAPI FileMenu_ReplaceUsingPidl(
UINT uEnumFlags,
LPFNFMCALLBACK lpfnCallback)
{
TRACE("0x%08x 0x%08x %p 0x%08x %p\n",
TRACE("%p 0x%08x %p 0x%08x %p\n",
hmenu, uID, pidl, uEnumFlags, lpfnCallback);
FileMenu_DeleteAllItems (hmenu);
......@@ -449,7 +449,7 @@ int WINAPI FileMenu_ReplaceUsingPidl(
*/
void WINAPI FileMenu_Invalidate (HMENU hMenu)
{
FIXME("0x%08x\n",hMenu);
FIXME("%p\n",hMenu);
}
/*************************************************************************
......@@ -459,7 +459,7 @@ HMENU WINAPI FileMenu_FindSubMenuByPidl(
HMENU hMenu,
LPCITEMIDLIST pidl)
{
FIXME("0x%08x %p\n",hMenu, pidl);
FIXME("%p %p\n",hMenu, pidl);
return 0;
}
......@@ -482,7 +482,7 @@ int WINAPI FileMenu_AppendFilesForPidl(
if (bAddSeperator)
FileMenu_AppendItemA (hmenu, FM_SEPARATOR, 0, 0, 0, FM_DEFAULT_HEIGHT);
TRACE("0x%08x %p 0x%08x\n",hmenu, pidl,bAddSeperator);
TRACE("%p %p 0x%08x\n",hmenu, pidl,bAddSeperator);
return 0;
}
......@@ -501,7 +501,7 @@ int WINAPI FileMenu_AddFilesForPidl (
UINT uEnumFlags,
LPFNFMCALLBACK lpfnCallback)
{
TRACE("0x%08x 0x%08x 0x%08x %p 0x%08x 0x%08x %p\n",
TRACE("%p 0x%08x 0x%08x %p 0x%08x 0x%08x %p\n",
hmenu, uReserved, uID, pidl, uFlags, uEnumFlags, lpfnCallback);
return FileMenu_InsertUsingPidl ( hmenu, uID, pidl, uFlags, uEnumFlags, lpfnCallback);
......@@ -520,7 +520,7 @@ BOOL WINAPI FileMenu_TrackPopupMenuEx (
HWND hWnd,
LPTPMPARAMS lptpm)
{
TRACE("0x%08x 0x%08x 0x%x 0x%x 0x%08x %p\n",
TRACE("%p 0x%08x 0x%x 0x%x %p %p\n",
hMenu, uFlags, x, y, hWnd, lptpm);
return TrackPopupMenuEx(hMenu, uFlags, x, y, hWnd, lptpm);
}
......@@ -555,7 +555,7 @@ LRESULT WINAPI FileMenu_MeasureItem(
SIZE size;
LPFMINFO menuinfo;
TRACE("0x%08x %p %s\n", hWnd, lpmis, pMyItem->szItemText);
TRACE("%p %p %s\n", hWnd, lpmis, pMyItem->szItemText);
GetTextExtentPoint32A(hdc, pMyItem->szItemText, pMyItem->cchItemText, &size);
......@@ -585,7 +585,7 @@ LRESULT WINAPI FileMenu_DrawItem(
RECT TextRect, BorderRect;
LPFMINFO menuinfo;
TRACE("0x%08x %p %s\n", hWnd, lpdis, pMyItem->szItemText);
TRACE("%p %p %s\n", hWnd, lpdis, pMyItem->szItemText);
if (lpdis->itemState & ODS_SELECTED)
{
......@@ -650,7 +650,7 @@ LRESULT WINAPI FileMenu_HandleMenuChar(
HMENU hMenu,
WPARAM wParam)
{
FIXME("0x%08x 0x%08x\n",hMenu,wParam);
FIXME("%p 0x%08x\n",hMenu,wParam);
return 0;
}
......@@ -667,7 +667,7 @@ BOOL WINAPI FileMenu_DeleteAllItems (HMENU hmenu)
int i;
TRACE("0x%08x\n", hmenu);
TRACE("%p\n", hmenu);
ZeroMemory ( &mii, sizeof(MENUITEMINFOA));
mii.cbSize = sizeof(MENUITEMINFOA);
......@@ -700,7 +700,7 @@ BOOL WINAPI FileMenu_DeleteItemByCmd (HMENU hMenu, UINT uID)
{
MENUITEMINFOA mii;
TRACE("0x%08x 0x%08x\n", hMenu, uID);
TRACE("%p 0x%08x\n", hMenu, uID);
ZeroMemory ( &mii, sizeof(MENUITEMINFOA));
mii.cbSize = sizeof(MENUITEMINFOA);
......@@ -723,7 +723,7 @@ BOOL WINAPI FileMenu_DeleteItemByIndex ( HMENU hMenu, UINT uPos)
{
MENUITEMINFOA mii;
TRACE("0x%08x 0x%08x\n", hMenu, uPos);
TRACE("%p 0x%08x\n", hMenu, uPos);
ZeroMemory ( &mii, sizeof(MENUITEMINFOA));
mii.cbSize = sizeof(MENUITEMINFOA);
......@@ -746,7 +746,7 @@ BOOL WINAPI FileMenu_DeleteItemByFirstID(
HMENU hMenu,
UINT uID)
{
TRACE("0x%08x 0x%08x\n", hMenu, uID);
TRACE("%p 0x%08x\n", hMenu, uID);
return 0;
}
......@@ -755,7 +755,7 @@ BOOL WINAPI FileMenu_DeleteItemByFirstID(
*/
BOOL WINAPI FileMenu_DeleteSeparator(HMENU hMenu)
{
TRACE("0x%08x\n", hMenu);
TRACE("%p\n", hMenu);
return 0;
}
......@@ -767,7 +767,7 @@ BOOL WINAPI FileMenu_EnableItemByCmd(
UINT uID,
BOOL bEnable)
{
TRACE("0x%08x 0x%08x 0x%08x\n", hMenu, uID,bEnable);
TRACE("%p 0x%08x 0x%08x\n", hMenu, uID,bEnable);
return 0;
}
......@@ -780,7 +780,7 @@ BOOL WINAPI FileMenu_EnableItemByCmd(
DWORD WINAPI FileMenu_GetItemExtent (HMENU hMenu, UINT uPos)
{ RECT rect;
FIXME("0x%08x 0x%08x\n", hMenu, uPos);
FIXME("%p 0x%08x\n", hMenu, uPos);
if (GetMenuItemRect(0, hMenu, uPos, &rect))
{ FIXME("0x%04x 0x%04x 0x%04x 0x%04x\n",
......@@ -814,7 +814,7 @@ void WINAPI FileMenu_AbortInitMenu (void)
* or NULL at failure.
*/
LPVOID WINAPI SHFind_InitMenuPopup (HMENU hMenu, HWND hWndParent, DWORD w, DWORD x)
{ FIXME("hmenu=0x%08x hwnd=0x%08x 0x%08lx 0x%08lx stub\n",
{ FIXME("hmenu=%p hwnd=%p 0x%08lx 0x%08lx stub\n",
hMenu,hWndParent,w,x);
return NULL; /* this is supposed to be a pointer */
}
......@@ -853,7 +853,7 @@ HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uI
char szName[256];
UINT uTemp, uIDMax = uIDAdjust;
TRACE("hmenu1=0x%04x hmenu2=0x%04x 0x%04x 0x%04x 0x%04x 0x%04lx\n",
TRACE("hmenu1=%p hmenu2=%p 0x%04x 0x%04x 0x%04x 0x%04lx\n",
hmDst, hmSrc, uInsert, uIDAdjust, uIDAdjustMax, uFlags);
if (!hmDst || !hmSrc)
......@@ -986,4 +986,3 @@ HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uI
}
return(uIDMax);
}
dlls/shell32/shlview.c
View file @ 991fd85d
......@@ -705,14 +705,14 @@ static HMENU ShellView_BuildFileMenu(IShellViewImpl * This)
InsertMenuItemA(hSubMenu, (UINT)-1, TRUE, &mii);
}
}
TRACE("-- return (menu=0x%x)\n",hSubMenu);
TRACE("-- return (menu=%p)\n",hSubMenu);
return hSubMenu;
}
/**********************************************************
* ShellView_MergeFileMenu()
*/
static void ShellView_MergeFileMenu(IShellViewImpl * This, HMENU hSubMenu)
{ TRACE("(%p)->(submenu=0x%08x) stub\n",This,hSubMenu);
{ TRACE("(%p)->(submenu=%p) stub\n",This,hSubMenu);
if(hSubMenu)
{ /*insert This item at the beginning of the menu */
......@@ -730,7 +730,7 @@ static void ShellView_MergeFileMenu(IShellViewImpl * This, HMENU hSubMenu)
static void ShellView_MergeViewMenu(IShellViewImpl * This, HMENU hSubMenu)
{ MENUITEMINFOA mii;
TRACE("(%p)->(submenu=0x%08x)\n",This,hSubMenu);
TRACE("(%p)->(submenu=%p)\n",This,hSubMenu);
if(hSubMenu)
{ /*add a separator at the correct position in the menu*/
......@@ -1057,7 +1057,7 @@ static LRESULT ShellView_OnKillFocus(IShellViewImpl * This)
*/
static LRESULT ShellView_OnCommand(IShellViewImpl * This,DWORD dwCmdID, DWORD dwCmd, HWND hwndCmd)
{
TRACE("(%p)->(0x%08lx 0x%08lx 0x%08x) stub\n",This, dwCmdID, dwCmd, hwndCmd);
TRACE("(%p)->(0x%08lx 0x%08lx %p) stub\n",This, dwCmdID, dwCmd, hwndCmd);
switch(dwCmdID)
{
......@@ -1399,7 +1399,7 @@ static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wPara
IShellViewImpl * pThis = (IShellViewImpl*)GetWindowLongA(hWnd, GWL_USERDATA);
LPCREATESTRUCTA lpcs;
TRACE("(hwnd=%x msg=%x wparm=%x lparm=%lx)\n",hWnd, uMessage, wParam, lParam);
TRACE("(hwnd=%p msg=%x wparm=%x lparm=%lx)\n",hWnd, uMessage, wParam, lParam);
switch (uMessage)
{
......
dlls/shell32/shv_bg_cmenu.c
View file @ 991fd85d
......@@ -151,7 +151,7 @@ static HRESULT WINAPI ISVBgCm_fnQueryContextMenu(
ICOM_THIS(BgCmImpl, iface);
TRACE("(%p)->(hmenu=%x indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",
TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",
This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
......@@ -320,7 +320,7 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand(
LPSHELLVIEW lpSV;
HWND hWndSV;
TRACE("(%p)->(invcom=%p verb=%p wnd=%x)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd);
TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd);
/* get the active IShellView */
if((lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER,0,0)))
......
dlls/shell32/shv_item_cmenu.c
View file @ 991fd85d
......@@ -219,7 +219,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu(
{
ICOM_THIS(ItemCmImpl, iface);
TRACE("(%p)->(hmenu=%x indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
if(!(CMF_DEFAULTONLY & uFlags))
{
......@@ -312,7 +312,7 @@ static void DoRename(
LPSHELLBROWSER lpSB;
LPSHELLVIEW lpSV;
TRACE("(%p)->(wnd=%x)\n",This, hwnd);
TRACE("(%p)->(wnd=%p)\n",This, hwnd);
/* get the active IShellView */
if ((lpSB = (LPSHELLBROWSER)SendMessageA(hwnd, CWM_GETISHELLBROWSER,0,0)))
......@@ -361,7 +361,7 @@ static BOOL DoCopyOrCut(
LPSHELLVIEW lpSV;
LPDATAOBJECT lpDo;
TRACE("(%p)->(wnd=0x%04x,bCut=0x%08x)\n",This, hwnd, bCut);
TRACE("(%p)->(wnd=%p,bCut=0x%08x)\n",This, hwnd, bCut);
if(GetShellOle())
{
......@@ -429,7 +429,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand(
{
ICOM_THIS(ItemCmImpl, iface);
TRACE("(%p)->(invcom=%p verb=%p wnd=%x)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd);
TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd);
if(LOWORD(lpcmi->lpVerb) > FCIDM_SHVIEWLAST) return E_INVALIDARG;
......
dlls/shell32/systray.c
View file @ 991fd85d
......@@ -83,7 +83,7 @@ static LRESULT CALLBACK SYSTRAY_WndProc(HWND hWnd, UINT message, WPARAM wParam,
GetClientRect(hWnd, &rc);
if (!DrawIconEx(hdc, rc.left+ICON_BORDER, rc.top+ICON_BORDER, ptrayItem->notifyIcon.hIcon,
ICON_SIZE, ICON_SIZE, 0, 0, DI_DEFAULTSIZE|DI_NORMAL)) {
ERR("Paint(SystrayWindow 0x%08x) failed -> removing SystrayItem %p\n", hWnd, ptrayItem);
ERR("Paint(SystrayWindow %p) failed -> removing SystrayItem %p\n", hWnd, ptrayItem);
SYSTRAY_Delete(&ptrayItem->notifyIcon);
}
}
......@@ -134,7 +134,7 @@ static LRESULT CALLBACK SYSTRAY_WndProc(HWND hWnd, UINT message, WPARAM wParam,
if (ptrayItem->notifyIcon.hWnd && ptrayItem->notifyIcon.uCallbackMessage) {
if (!PostMessageA(ptrayItem->notifyIcon.hWnd, ptrayItem->notifyIcon.uCallbackMessage,
(WPARAM)ptrayItem->notifyIcon.uID, (LPARAM)message)) {
ERR("PostMessage(SystrayWindow 0x%08x) failed -> removing SystrayItem %p\n", hWnd, ptrayItem);
ERR("PostMessage(SystrayWindow %p) failed -> removing SystrayItem %p\n", hWnd, ptrayItem);
SYSTRAY_Delete(&ptrayItem->notifyIcon);
}
}
......@@ -292,7 +292,7 @@ static BOOL SYSTRAY_Add(PNOTIFYICONDATAA pnid)
SYSTRAY_ItemSetMessage(*ptrayItem, (pnid->uFlags&NIF_MESSAGE)?pnid->uCallbackMessage:0);
SYSTRAY_ItemSetTip (*ptrayItem, (pnid->uFlags&NIF_TIP) ?pnid->szTip :"", FALSE);
TRACE("%p: 0x%08x %s\n", (*ptrayItem), (*ptrayItem)->notifyIcon.hWnd,
TRACE("%p: %p %s\n", (*ptrayItem), (*ptrayItem)->notifyIcon.hWnd,
(*ptrayItem)->notifyIcon.szTip);
return TRUE;
}
......@@ -311,7 +311,7 @@ static BOOL SYSTRAY_Modify(PNOTIFYICONDATAA pnid)
if (pnid->uFlags & NIF_TIP)
SYSTRAY_ItemSetTip(ptrayItem, pnid->szTip, TRUE);
TRACE("%p: 0x%08x %s\n", ptrayItem, ptrayItem->notifyIcon.hWnd, ptrayItem->notifyIcon.szTip);
TRACE("%p: %p %s\n", ptrayItem, ptrayItem->notifyIcon.hWnd, ptrayItem->notifyIcon.szTip);
return TRUE;
}
ptrayItem = ptrayItem->nextTrayItem;
......@@ -327,7 +327,7 @@ static BOOL SYSTRAY_Delete(PNOTIFYICONDATAA pnid)
while (*ptrayItem) {
if (SYSTRAY_ItemIsEqual(pnid, &(*ptrayItem)->notifyIcon)) {
SystrayItem *next = (*ptrayItem)->nextTrayItem;
TRACE("%p: 0x%08x %s\n", *ptrayItem, (*ptrayItem)->notifyIcon.hWnd, (*ptrayItem)->notifyIcon.szTip);
TRACE("%p: %p %s\n", *ptrayItem, (*ptrayItem)->notifyIcon.hWnd, (*ptrayItem)->notifyIcon.szTip);
SYSTRAY_ItemTerm(*ptrayItem);
free(*ptrayItem);
......@@ -356,7 +356,7 @@ BOOL SYSTRAY_Init(void)
BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid )
{
BOOL flag=FALSE;
TRACE("enter %d %d %ld\n", pnid->hWnd, pnid->uID, dwMessage);
TRACE("enter %p %d %ld\n", pnid->hWnd, pnid->uID, dwMessage);
switch(dwMessage) {
case NIM_ADD:
flag = SYSTRAY_Add(pnid);
......@@ -368,7 +368,7 @@ BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid )
flag = SYSTRAY_Delete(pnid);
break;
}
TRACE("leave %d %d %ld=%d\n", pnid->hWnd, pnid->uID, dwMessage, flag);
TRACE("leave %p %d %ld=%d\n", pnid->hWnd, pnid->uID, dwMessage, flag);
return flag;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment