Small fixes.
This commit is contained in:
Juergen Schmied
Alexandre Julliard
parent
26ff83dfed
commit
cb23d48715
|
|
@ -105,7 +105,7 @@ static HRESULT WINAPI IEnumIDList_QueryInterface(
|
|||
* IEnumIDList_AddRef
|
||||
*/
|
||||
static ULONG WINAPI IEnumIDList_AddRef(LPENUMIDLIST this)
|
||||
{ TRACE(shell,"(%p)->(%u)\n",this,this->ref);
|
||||
{ TRACE(shell,"(%p)->(%lu)\n",this,this->ref);
|
||||
|
||||
shell32_ObjCount++;
|
||||
return ++(this->ref);
|
||||
|
|
@ -114,7 +114,7 @@ static ULONG WINAPI IEnumIDList_AddRef(LPENUMIDLIST this)
|
|||
* IEnumIDList_Release
|
||||
*/
|
||||
static ULONG WINAPI IEnumIDList_Release(LPENUMIDLIST this)
|
||||
{ TRACE(shell,"(%p)->(%u)\n",this,this->ref);
|
||||
{ TRACE(shell,"(%p)->(%lu)\n",this,this->ref);
|
||||
|
||||
shell32_ObjCount--;
|
||||
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ static HGLOBAL16 ICO_GetIconDirectory(HINSTANCE32 hInst, HFILE32 hFile, LPicoICO
|
|||
#define ICO_INVALID_FILE 1
|
||||
#define ICO_NO_ICONS 0
|
||||
|
||||
HGLOBAL32 WINAPI ICO_ExtractIconEx(LPCSTR lpszExeFileName, HICON32* RetPtr, UINT32 nIconIndex, UINT32 n, UINT32 cxDesired, UINT32 cyDesired )
|
||||
HGLOBAL32 WINAPI ICO_ExtractIconEx(LPCSTR lpszExeFileName, HICON32 * RetPtr, UINT32 nIconIndex, UINT32 n, UINT32 cxDesired, UINT32 cyDesired )
|
||||
{ HGLOBAL32 hRet = ICO_NO_ICONS;
|
||||
LPBYTE pData;
|
||||
OFSTRUCT ofs;
|
||||
|
|
@ -375,7 +375,7 @@ HGLOBAL32 WINAPI ICO_ExtractIconEx(LPCSTR lpszExeFileName, HICON32* RetPtr, UINT
|
|||
{ WARN(shell,"no matching real address for icongroup!\n");
|
||||
goto end_4; /* failure */
|
||||
}
|
||||
RetPtr[i] = pLookupIconIdFromDirectoryEx32(igdata, TRUE, cxDesired, cyDesired, LR_DEFAULTCOLOR);
|
||||
RetPtr[i] = (HICON32)pLookupIconIdFromDirectoryEx32(igdata, TRUE, cxDesired, cyDesired, LR_DEFAULTCOLOR);
|
||||
}
|
||||
|
||||
if (!(iconresdir=GetResDirEntryW(rootresdir,RT_ICON32W,(DWORD)rootresdir,FALSE)))
|
||||
|
|
@ -403,7 +403,7 @@ HGLOBAL32 WINAPI ICO_ExtractIconEx(LPCSTR lpszExeFileName, HICON32* RetPtr, UINT
|
|||
RetPtr[i]=0;
|
||||
continue;
|
||||
}
|
||||
RetPtr[i] = pCreateIconFromResourceEx32(idata,idataent->Size,TRUE,0x00030000, cxDesired, cyDesired, LR_DEFAULTCOLOR);
|
||||
RetPtr[i] = (HICON32) pCreateIconFromResourceEx32(idata,idataent->Size,TRUE,0x00030000, cxDesired, cyDesired, LR_DEFAULTCOLOR);
|
||||
}
|
||||
hRet = RetPtr[0]; /* return first icon */
|
||||
goto end_3; /* sucess */
|
||||
|
|
@ -506,7 +506,7 @@ static INT32 SIC_LoadIcon (LPCSTR sSourceFile, INT32 dwSourceIndex)
|
|||
* look in the cache for a proper icon. if not available the icon is taken
|
||||
* from the file and cached
|
||||
*/
|
||||
static INT32 SIC_GetIconIndex (LPCSTR sSourceFile, INT32 dwSourceIndex )
|
||||
INT32 SIC_GetIconIndex (LPCSTR sSourceFile, INT32 dwSourceIndex )
|
||||
{ SIC_ENTRY sice;
|
||||
INT32 index = INVALID_INDEX;
|
||||
|
||||
|
|
@ -612,13 +612,13 @@ BOOL32 SIC_Initialize(void)
|
|||
* imglist[1|2] [OUT] pointer which recive imagelist handles
|
||||
*
|
||||
*/
|
||||
DWORD WINAPI Shell_GetImageList(HIMAGELIST * imglist1,HIMAGELIST * imglist2)
|
||||
{ TRACE(shell,"(%p,%p)\n",imglist1,imglist2);
|
||||
if (imglist1)
|
||||
{ *imglist1=ShellBigIconList;
|
||||
DWORD WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList)
|
||||
{ TRACE(shell,"(%p,%p)\n",lpBigList,lpSmallList);
|
||||
if (lpBigList)
|
||||
{ *lpBigList = ShellBigIconList;
|
||||
}
|
||||
if (imglist2)
|
||||
{ *imglist2=ShellSmallIconList;
|
||||
if (lpSmallList)
|
||||
{ *lpSmallList = ShellSmallIconList;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
|
|
|||
|
|
@ -346,14 +346,6 @@ UINT32 WINAPI SHAppBarMessage32(DWORD msg, PAPPBARDATA data)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
* SHBrowseForFolderA [SHELL32.209]
|
||||
*
|
||||
*/
|
||||
LPITEMIDLIST WINAPI SHBrowseForFolder32A (LPBROWSEINFO32A lpbi)
|
||||
{ FIXME (shell, "(%lx,%s) empty stub!\n", (DWORD)lpbi, lpbi->lpszTitle);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
* SHGetDesktopFolder [SHELL32.216]
|
||||
|
|
@ -678,11 +670,6 @@ ShellExecute32W(
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
* AboutDlgProc32 (not an exported API function)
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ extern INT32 (WINAPI* pDPA_Search) (const HDPA, LPVOID, INT32, PFNDPACOMPARE, LP
|
|||
extern HICON32* (WINAPI *pLookupIconIdFromDirectoryEx32)(LPBYTE dir, BOOL32 bIcon, INT32 width, INT32 height, UINT32 cFlag);
|
||||
extern HICON32* (WINAPI *pCreateIconFromResourceEx32)(LPBYTE bits,UINT32 cbSize, BOOL32 bIcon, DWORD dwVersion, INT32 width, INT32 height,UINT32 cFlag);
|
||||
|
||||
/* undocumented WINAPI functions not globaly exported */
|
||||
LPITEMIDLIST WINAPI ILClone (LPCITEMIDLIST pidl);
|
||||
LPITEMIDLIST WINAPI ILGetNext(LPITEMIDLIST pidl);
|
||||
LPITEMIDLIST WINAPI ILCombine(LPCITEMIDLIST iil1,LPCITEMIDLIST iil2);
|
||||
|
|
@ -43,6 +44,9 @@ LPITEMIDLIST WINAPI ILFindLastID(LPITEMIDLIST pidl);
|
|||
DWORD WINAPI ILGetSize(LPITEMIDLIST pidl);
|
||||
LPITEMIDLIST WINAPI ILCreateFromPath(LPVOID path);
|
||||
|
||||
DWORD WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList);
|
||||
HRESULT WINAPI StrRetToStrN (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl);
|
||||
|
||||
/* Iconcache */
|
||||
#define INVALID_INDEX -1
|
||||
BOOL32 SIC_Initialize(void);
|
||||
|
|
|
|||
|
|
@ -853,8 +853,6 @@ HRESULT WINAPI IsUserAdmin(void)
|
|||
* converts a STRRET to a normal string
|
||||
*
|
||||
* NOTES
|
||||
* FIXME the string handling is to simple (different STRRET choices)
|
||||
* at the moment only CSTR
|
||||
* the pidl is for STRRET OFFSET
|
||||
*/
|
||||
HRESULT WINAPI StrRetToStrN (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
|
||||
|
|
|
|||
|
|
@ -622,7 +622,8 @@ static HRESULT WINAPI IShellFolder_GetDisplayNameOf( LPSHELLFOLDER this, LPCITEM
|
|||
szSpecial[0]=0x00;
|
||||
szDrive[0]=0x00;
|
||||
szText[0]=0x00;
|
||||
|
||||
szTemp[0]=0x00;
|
||||
|
||||
/* test if simple(relative) or complex(absolute) pidl */
|
||||
pidlTemp = ILGetNext(pidl);
|
||||
if (pidlTemp && pidlTemp->mkid.cb==0x00)
|
||||
|
|
|
|||
|
|
@ -27,3 +27,16 @@ BEGIN
|
|||
MENUITEM "Lin&e up Icons", FCIDM_SHVIEW_SNAPTOGRID
|
||||
END
|
||||
END
|
||||
|
||||
SHBRSFORFOLDER_MSGBOX DIALOG 15, 40, 128, 152
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Choose a Directory:"
|
||||
FONT 8, "Helv"
|
||||
{
|
||||
DEFPUSHBUTTON "OK", 1, 4, 132, 50, 12
|
||||
PUSHBUTTON "Cancel", 2, 58, 132, 50, 12
|
||||
CONTROL "Tree1",99,"SysTreeView32",
|
||||
TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |
|
||||
WS_BORDER | WS_TABSTOP,
|
||||
4, 4, 120, 120
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue