ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small fixes.

This commit is contained in:
Juergen Schmied 1998-12-18 14:52:08 +00:00 committed by Alexandre Julliard
parent e304228fe2
commit dd2e59c913
7 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/shell32/classes.c
View File

@ -14,7 +14,7 @@
#include "shell32_main.h"
BOOL32 HCR_MapTypeToValue ( LPSTR szExtension, LPSTR szFileType, DWORD len)
BOOL32 HCR_MapTypeToValue ( LPCSTR szExtension, LPSTR szFileType, DWORD len)
{ HKEY hkey;
TRACE(shell, "%s %p\n",szExtension, szFileType );

1
dlls/shell32/dataobject.c
View File

@ -6,6 +6,7 @@
* Copyright 1998 <juergen.schmied@metronet.de>
*/
#include "debug.h"
#include "wintypes.h"
#include "shlobj.h"
#include "pidl.h"
#include "winerror.h"

6
dlls/shell32/iconcache.c
View File

@ -512,7 +512,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;
@ -643,7 +643,7 @@ DWORD WINAPI SHMapPIDLToSystemImageListIndex(LPSHELLFOLDER sh,LPITEMIDLIST pidl,
DWORD dwNr, ret = INVALID_INDEX;
LPITEMIDLIST pidltemp = ILFindLastID(pidl);
WARN(shell,"(SF=%p,pidl=%p,%08lx)\n",sh,pidl,z);
WARN(shell,"(SF=%p,pidl=%p,0x%08x)\n",sh,pidl,z);
pdump(pidl);
if (_ILIsDesktop(pidltemp))
@ -652,7 +652,7 @@ DWORD WINAPI SHMapPIDLToSystemImageListIndex(LPSHELLFOLDER sh,LPITEMIDLIST pidl,
else if (_ILIsMyComputer(pidltemp))
{ if (HCR_GetDefaultIcon("CLSID\\{20D04FE0-3AEA-1069-A2D8-08002B30309D}", sTemp, 64, &dwNr))
{ ret = SIC_GetIconIndex(sTemp, dwNr);
return (( INVALID_INDEX == ret) ? 20 : ret);
return (( INVALID_INDEX == ret) ? 15 : ret);
}
}
else if (_ILIsDrive (pidltemp))

11
dlls/shell32/shell32_main.h
View File

@ -33,11 +33,20 @@ extern LPVOID (CALLBACK* pDPA_GetPtr) (const HDPA, INT32);
extern BOOL32 (CALLBACK* pDPA_Destroy) (const HDPA);
extern INT32 (CALLBACK* pDPA_Search) (const HDPA, LPVOID, INT32, PFNDPACOMPARE, LPARAM, UINT32);
LPITEMIDLIST WINAPI ILClone (LPCITEMIDLIST pidl);
LPITEMIDLIST WINAPI ILGetNext(LPITEMIDLIST pidl);
LPITEMIDLIST WINAPI ILCombine(LPCITEMIDLIST iil1,LPCITEMIDLIST iil2);
LPITEMIDLIST WINAPI ILFindLastID(LPITEMIDLIST pidl);
DWORD WINAPI ILGetSize(LPITEMIDLIST pidl);
LPITEMIDLIST WINAPI ILCreateFromPath(LPVOID path);
/* Iconcache */
#define INVALID_INDEX -1
BOOL32 SIC_Initialize(void);
INT32 SIC_GetIconIndex (LPCSTR sSourceFile, INT32 dwSourceIndex );
/* Classes Root */
BOOL32 HCR_MapTypeToValue ( LPSTR szExtension, LPSTR szFileType, DWORD len);
BOOL32 HCR_MapTypeToValue ( LPCSTR szExtension, LPSTR szFileType, DWORD len);
BOOL32 HCR_GetExecuteCommand ( LPCSTR szClass, LPCSTR szVerb, LPSTR szDest, DWORD len );
BOOL32 HCR_GetDefaultIcon (LPCSTR szClass, LPSTR szDest, DWORD len, LPDWORD dwNr);

8
dlls/shell32/shlfolder.c
View File

@ -225,7 +225,7 @@ static HRESULT WINAPI IShellFolder_ParseDisplayName(
LPITEMIDLIST pidlFull=NULL, pidlTemp = NULL, pidlOld = NULL;
LPSTR pszTemp, pszNext=NULL;
CHAR szElement[MAX_PATH];
BOOL32 bType;
BOOL32 bIsFile;
DWORD dwChars;
TRACE(shell,"(%p)->(HWND=0x%08x,%p,%p=%s,%p,pidl=%p,%p)\n",
@ -250,9 +250,9 @@ static HRESULT WINAPI IShellFolder_ParseDisplayName(
{ pidlFull = _ILCreateMyComputer();
/* check if the lpszDisplayName is Folder or File*/
bType = ! (GetFileAttributes32A(pszNext) & FILE_ATTRIBUTE_DIRECTORY);
bIsFile = ! (GetFileAttributes32A(pszTemp) & FILE_ATTRIBUTE_DIRECTORY);
pszNext = GetNextElement(pszTemp, szElement, MAX_PATH);
pidlTemp = _ILCreateDrive(szElement);
pidlOld = pidlFull;
pidlFull = ILCombine(pidlFull,pidlTemp);
@ -260,7 +260,7 @@ static HRESULT WINAPI IShellFolder_ParseDisplayName(
if(pidlFull)
{ while((pszNext=GetNextElement(pszNext, szElement, MAX_PATH)))
{ if(!*pszNext && bType)
{ if(!*pszNext && bIsFile)
{ pidlTemp = _ILCreateValue(szElement);
}
else

6
include/shell.h
View File

@ -130,12 +130,6 @@ typedef struct
} ITEMIDLIST,*LPITEMIDLIST,*LPCITEMIDLIST;
#pragma pack(4)
LPITEMIDLIST WINAPI ILClone (LPCITEMIDLIST pidl);
LPITEMIDLIST WINAPI ILGetNext(LPITEMIDLIST pidl);
LPITEMIDLIST WINAPI ILCombine(LPCITEMIDLIST iil1,LPCITEMIDLIST iil2);
LPITEMIDLIST WINAPI ILFindLastID(LPITEMIDLIST pidl);
DWORD WINAPI ILGetSize(LPITEMIDLIST pidl);
DWORD WINAPI SHGetPathFromIDList32A (LPCITEMIDLIST pidl,LPSTR pszPath);
DWORD WINAPI SHGetPathFromIDList32W (LPCITEMIDLIST pidl,LPWSTR pszPath);
#define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList)

4
relay32/shell32.spec
View File

@ -13,7 +13,7 @@ init Shell32LibMain
5 stub SHChangeNotifyUpdateEntryList@16
6 stub CheckEscapesW@8
7 stdcall CommandLineToArgvW(wstr ptr) CommandLineToArgvW
8 stub Control_FillCache_RunDLL@16
8 stdcall Control_FillCache_RunDLL (long long long long) Control_FillCache_RunDLL
9 stub PifMgr_OpenProperties@16
10 stub PifMgr_GetProperties@20
11 stub PifMgr_SetProperties@20
@ -63,7 +63,7 @@ init Shell32LibMain
55 stdcall PathQuoteSpaces (ptr) PathQuoteSpaces32AW
56 stdcall PathUnquoteSpaces(str) PathUnquoteSpaces
57 stdcall PathGetDriveNumber (str) PathGetDriveNumber32
58 stdcall ParseField(str long str long) ParseField32A
58 stdcall ParseField(str long ptr long) ParseField32A
59 stub RestartDialog@12
60 stdcall ExitWindowsDialog(long) ExitWindowsDialog
61 stdcall RunFileDlg(long long long str str long) RunFileDlg