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

shlwapi: Avoid FALSE:TRUE conditional expressions.

This commit is contained in:
Michael Stefaniuc 2012-08-08 21:35:53 +02:00 committed by Alexandre Julliard
parent 915e12e59f
commit 8d24dd49ee
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/shlwapi/path.c
View File

@ -1714,7 +1714,7 @@ BOOL WINAPI PathFileExistsA(LPCSTR lpszPath)
iPrevErrMode = SetErrorMode(SEM_FAILCRITICALERRORS); iPrevErrMode = SetErrorMode(SEM_FAILCRITICALERRORS);
dwAttr = GetFileAttributesA(lpszPath); dwAttr = GetFileAttributesA(lpszPath);
SetErrorMode(iPrevErrMode); SetErrorMode(iPrevErrMode);
return dwAttr == INVALID_FILE_ATTRIBUTES ? FALSE : TRUE; return dwAttr != INVALID_FILE_ATTRIBUTES;
} }
/************************************************************************* /*************************************************************************
@ -1735,7 +1735,7 @@ BOOL WINAPI PathFileExistsW(LPCWSTR lpszPath)
iPrevErrMode = SetErrorMode(SEM_FAILCRITICALERRORS); iPrevErrMode = SetErrorMode(SEM_FAILCRITICALERRORS);
dwAttr = GetFileAttributesW(lpszPath); dwAttr = GetFileAttributesW(lpszPath);
SetErrorMode(iPrevErrMode); SetErrorMode(iPrevErrMode);
return dwAttr == INVALID_FILE_ATTRIBUTES ? FALSE : TRUE; return dwAttr != INVALID_FILE_ATTRIBUTES;
} }
/************************************************************************* /*************************************************************************

16
dlls/shlwapi/reg.c
View File

@ -1890,17 +1890,14 @@ DWORD WINAPI SHGetValueGoodBootW(HKEY hkey, LPCWSTR pSubKey, LPCWSTR pValue,
*/ */
BOOL WINAPI RegisterMIMETypeForExtensionA(LPCSTR lpszSubKey, LPCSTR lpszValue) BOOL WINAPI RegisterMIMETypeForExtensionA(LPCSTR lpszSubKey, LPCSTR lpszValue)
{ {
DWORD dwRet;
if (!lpszValue) if (!lpszValue)
{ {
WARN("Invalid lpszValue would crash under Win32!\n"); WARN("Invalid lpszValue would crash under Win32!\n");
return FALSE; return FALSE;
} }
dwRet = SHSetValueA(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeA, return !SHSetValueA(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeA,
REG_SZ, lpszValue, strlen(lpszValue)); REG_SZ, lpszValue, strlen(lpszValue));
return dwRet ? FALSE : TRUE;
} }
/************************************************************************* /*************************************************************************
@ -1910,17 +1907,14 @@ BOOL WINAPI RegisterMIMETypeForExtensionA(LPCSTR lpszSubKey, LPCSTR lpszValue)
*/ */
BOOL WINAPI RegisterMIMETypeForExtensionW(LPCWSTR lpszSubKey, LPCWSTR lpszValue) BOOL WINAPI RegisterMIMETypeForExtensionW(LPCWSTR lpszSubKey, LPCWSTR lpszValue)
{ {
DWORD dwRet;
if (!lpszValue) if (!lpszValue)
{ {
WARN("Invalid lpszValue would crash under Win32!\n"); WARN("Invalid lpszValue would crash under Win32!\n");
return FALSE; return FALSE;
} }
dwRet = SHSetValueW(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeW, return !SHSetValueW(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeW,
REG_SZ, lpszValue, strlenW(lpszValue)); REG_SZ, lpszValue, strlenW(lpszValue));
return dwRet ? FALSE : TRUE;
} }
/************************************************************************* /*************************************************************************
@ -1937,8 +1931,7 @@ BOOL WINAPI RegisterMIMETypeForExtensionW(LPCWSTR lpszSubKey, LPCWSTR lpszValue)
*/ */
BOOL WINAPI UnregisterMIMETypeForExtensionA(LPCSTR lpszSubKey) BOOL WINAPI UnregisterMIMETypeForExtensionA(LPCSTR lpszSubKey)
{ {
HRESULT ret = SHDeleteValueA(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeA); return !SHDeleteValueA(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeA);
return ret ? FALSE : TRUE;
} }
/************************************************************************* /*************************************************************************
@ -1948,8 +1941,7 @@ BOOL WINAPI UnregisterMIMETypeForExtensionA(LPCSTR lpszSubKey)
*/ */
BOOL WINAPI UnregisterMIMETypeForExtensionW(LPCWSTR lpszSubKey) BOOL WINAPI UnregisterMIMETypeForExtensionW(LPCWSTR lpszSubKey)
{ {
HRESULT ret = SHDeleteValueW(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeW); return !SHDeleteValueW(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeW);
return ret ? FALSE : TRUE;
} }
/************************************************************************* /*************************************************************************

2
dlls/shlwapi/thread.c
View File

@ -365,7 +365,7 @@ BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE pfnThreadProc, VOID *pData,
ti.pfnThreadProc = pfnThreadProc; ti.pfnThreadProc = pfnThreadProc;
ti.pfnCallback = pfnCallback; ti.pfnCallback = pfnCallback;
ti.pData = pData; ti.pData = pData;
ti.bInitCom = dwFlags & CTF_COINIT ? TRUE : FALSE; ti.bInitCom = (dwFlags & CTF_COINIT) != 0;
ti.hEvent = CreateEventW(NULL,FALSE,FALSE,NULL); ti.hEvent = CreateEventW(NULL,FALSE,FALSE,NULL);
/* Hold references to the current thread and IE process, if desired */ /* Hold references to the current thread and IE process, if desired */