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

Signed/unsigned warnings and some formatting.

This commit is contained in:
Rolf Kalbermatter 2003-09-15 22:13:40 +00:00 committed by Alexandre Julliard
parent 6f9336dd31
commit 9c74339c32
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/shell32/shell32_main.c
View File

@ -399,7 +399,7 @@ DWORD WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes,
psfi->iIcon = iIndex; psfi->iIcon = iIndex;
if(uFlags != GIL_NOTFILENAME) if(uFlags != GIL_NOTFILENAME)
strcpy (psfi->szDisplayName, szLocation); strcpy (psfi->szDisplayName, szLocation);
else else
ret = FALSE; ret = FALSE;
@ -417,7 +417,7 @@ DWORD WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes,
char * szExt; char * szExt;
DWORD dwNr=0; DWORD dwNr=0;
lstrcpynA(sTemp, szFullPath, MAX_PATH); lstrcpynA(sTemp, szFullPath, MAX_PATH);
if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
psfi->iIcon = 2; psfi->iIcon = 2;
@ -430,12 +430,12 @@ DWORD WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes,
{ {
if (!strcmp("%1",sTemp)) /* icon is in the file */ if (!strcmp("%1",sTemp)) /* icon is in the file */
strcpy(sTemp, szFullPath); strcpy(sTemp, szFullPath);
if (flags & SHGFI_SYSICONINDEX) if (flags & SHGFI_SYSICONINDEX)
{ {
psfi->iIcon = SIC_GetIconIndex(sTemp,dwNr); psfi->iIcon = SIC_GetIconIndex(sTemp,dwNr);
if (psfi->iIcon == -1) psfi->iIcon = 0; if (psfi->iIcon == -1) psfi->iIcon = 0;
} }
else else
{ {
IconNotYetLoaded=FALSE; IconNotYetLoaded=FALSE;
@ -450,7 +450,7 @@ DWORD WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes,
} }
else else
{ {
if (!(PidlToSicIndex(psfParent, pidlLast, !(flags & SHGFI_SMALLICON), if (!(PidlToSicIndex(psfParent, pidlLast, !(flags & SHGFI_SMALLICON),
(flags & SHGFI_OPENICON)? GIL_OPENICON : 0, &(psfi->iIcon)))) (flags & SHGFI_OPENICON)? GIL_OPENICON : 0, &(psfi->iIcon))))
{ {
ret = FALSE; ret = FALSE;
@ -458,13 +458,13 @@ DWORD WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes,
} }
if (ret) if (ret)
{ {
ret = (DWORD) ((flags & SHGFI_SMALLICON) ? ShellSmallIconList : ShellBigIconList); ret = (DWORD) ((flags & SHGFI_SMALLICON) ? ShellSmallIconList : ShellBigIconList);
} }
} }
/* icon handle */ /* icon handle */
if (SUCCEEDED(hr) && (flags & SHGFI_ICON) && IconNotYetLoaded) if (SUCCEEDED(hr) && (flags & SHGFI_ICON) && IconNotYetLoaded)
psfi->hIcon = ImageList_GetIcon((flags & SHGFI_SMALLICON) ? ShellSmallIconList:ShellBigIconList, psfi->iIcon, ILD_NORMAL); psfi->hIcon = ImageList_GetIcon((flags & SHGFI_SMALLICON) ? ShellSmallIconList:ShellBigIconList, psfi->iIcon, ILD_NORMAL);
if (flags & (SHGFI_UNKNOWN1 | SHGFI_UNKNOWN2 | SHGFI_UNKNOWN3)) if (flags & (SHGFI_UNKNOWN1 | SHGFI_UNKNOWN2 | SHGFI_UNKNOWN3))
FIXME("unknown attribute!\n"); FIXME("unknown attribute!\n");
@ -505,7 +505,7 @@ DWORD WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
WideCharToMultiByte(CP_ACP, 0, path, -1, temppath, len, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, path, -1, temppath, len, NULL, NULL);
} }
if(psfi && (flags & SHGFI_ATTR_SPECIFIED)) if(psfi && (flags & SHGFI_ATTR_SPECIFIED))
temppsfi.dwAttributes=psfi->dwAttributes; temppsfi.dwAttributes=psfi->dwAttributes;
ret = SHGetFileInfoA(temppath, dwFileAttributes, (psfi == NULL)? NULL : &temppsfi, sizeof(temppsfi), flags); ret = SHGetFileInfoA(temppath, dwFileAttributes, (psfi == NULL)? NULL : &temppsfi, sizeof(temppsfi), flags);
@ -592,7 +592,7 @@ HICON WINAPI ExtractIconW(HINSTANCE hInstance, LPCWSTR lpszFile, UINT nIconIndex
TRACE("%p %s %d\n", hInstance, debugstr_w(lpszFile), nIconIndex); TRACE("%p %s %d\n", hInstance, debugstr_w(lpszFile), nIconIndex);
if (nIconIndex == -1) { if (nIconIndex == 0xFFFFFFFF) {
ret = PrivateExtractIconsW(lpszFile, 0, cx, cy, NULL, NULL, 0, LR_DEFAULTCOLOR); ret = PrivateExtractIconsW(lpszFile, 0, cx, cy, NULL, NULL, 0, LR_DEFAULTCOLOR);
if (ret != 0xFFFFFFFF && ret) if (ret != 0xFFFFFFFF && ret)
return (HICON)ret; return (HICON)ret;

2
dlls/shell32/shellord.c
View File

@ -1111,7 +1111,7 @@ BOOL WINAPI ReadCabinetState(CABINETSTATE *cs, int length)
TRACE("%p %d \n",cs,length); TRACE("%p %d \n",cs,length);
if( (cs == NULL) || (length < sizeof(*cs)) ) if( (cs == NULL) || (length < (int)sizeof(*cs)) )
return FALSE; return FALSE;
r = RegOpenKeyW( HKEY_CURRENT_USER, szwCabLocation, &hkey ); r = RegOpenKeyW( HKEY_CURRENT_USER, szwCabLocation, &hkey );