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

Fixes crash when running without external shell32.dll.

This commit is contained in:
Juergen Schmied 1998-12-24 14:33:29 +00:00 committed by Alexandre Julliard
parent bf6ee621d1
commit df3c5cfdd4
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/shell32/iconcache.c
View File

@ -462,14 +462,6 @@ static INT32 SIC_IconAppend (LPCSTR sSourceFile, INT32 dwSourceIndex, HICON32 hS
lpsice->sSourceFile = HEAP_strdupA (GetProcessHeap(),0,sSourceFile); lpsice->sSourceFile = HEAP_strdupA (GetProcessHeap(),0,sSourceFile);
lpsice->dwSourceIndex = dwSourceIndex; lpsice->dwSourceIndex = dwSourceIndex;
/* index = pDPA_Search (hdpa, lpsice, -1, SIC_CompareEntrys, 0, 0);
if ( INVALID_INDEX != index )
{ TRACE(shell, "-- allready inserted\n");
SHFree(lpsice);
return index;
}
*/
index = pDPA_InsertPtr(hdpa, 0x7fff, lpsice); index = pDPA_InsertPtr(hdpa, 0x7fff, lpsice);
if ( INVALID_INDEX == index ) if ( INVALID_INDEX == index )
{ SHFree(lpsice); { SHFree(lpsice);
@ -512,16 +504,18 @@ static INT32 SIC_LoadIcon (LPCSTR sSourceFile, INT32 dwSourceIndex)
* look in the cache for a proper icon. if not available the icon is taken * look in the cache for a proper icon. if not available the icon is taken
* from the file and cached * from the file and cached
*/ */
INT32 SIC_GetIconIndex (LPCSTR sSourceFile, INT32 dwSourceIndex ) static INT32 SIC_GetIconIndex (LPCSTR sSourceFile, INT32 dwSourceIndex )
{ SIC_ENTRY sice; { SIC_ENTRY sice;
INT32 index; INT32 index = INVALID_INDEX;
TRACE(shell,"%s %i\n", sSourceFile, dwSourceIndex); TRACE(shell,"%s %i\n", sSourceFile, dwSourceIndex);
sice.sSourceFile = sSourceFile; sice.sSourceFile = sSourceFile;
sice.dwSourceIndex = dwSourceIndex; sice.dwSourceIndex = dwSourceIndex;
index = pDPA_Search (hdpa, &sice, -1, SIC_CompareEntrys, 0, 0); if (NULL != pDPA_GetPtr (hdpa, 0))
{ index = pDPA_Search (hdpa, &sice, -1L, SIC_CompareEntrys, 0, 0);
}
if ( INVALID_INDEX == index ) if ( INVALID_INDEX == index )
{ return SIC_LoadIcon (sSourceFile, dwSourceIndex); { return SIC_LoadIcon (sSourceFile, dwSourceIndex);