diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 941ab8f51bc..68a7e52aa4e 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -888,7 +888,7 @@ static int TIME_GetTimeZoneInfoFromReg(RTL_TIME_ZONE_INFORMATION *tzinfo) if (!NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, KpInfo,\ sizeof(buf), &size )) { \ if( size >= (sizeof((tofield)) + \ - offsetof(KEY_VALUE_PARTIAL_INFORMATION,Data))); { \ + offsetof(KEY_VALUE_PARTIAL_INFORMATION,Data))) { \ memcpy(&(tofield), \ KpInfo->Data, sizeof(tofield)); \ } \ diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 8b26f59ec08..d470de735fd 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3687,16 +3687,25 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation( if(pBstrName) { if (This->Name) - if(!(*pBstrName = SysAllocString(This->Name))) goto memerr1;else; + { + if(!(*pBstrName = SysAllocString(This->Name))) + goto memerr1; + } else *pBstrName = NULL; } if(pBstrDocString) { if (This->DocString) - if(!(*pBstrDocString = SysAllocString(This->DocString))) goto memerr2;else; + { + if(!(*pBstrDocString = SysAllocString(This->DocString))) + goto memerr2; + } else if (This->Name) - if(!(*pBstrDocString = SysAllocString(This->Name))) goto memerr2;else; + { + if(!(*pBstrDocString = SysAllocString(This->Name))) + goto memerr2; + } else *pBstrDocString = NULL; } @@ -3707,7 +3716,10 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation( if(pBstrHelpFile) { if (This->HelpFile) - if(!(*pBstrHelpFile = SysAllocString(This->HelpFile))) goto memerr3;else; + { + if(!(*pBstrHelpFile = SysAllocString(This->HelpFile))) + goto memerr3; + } else *pBstrHelpFile = NULL; } diff --git a/dlls/user/text.c b/dlls/user/text.c index be4f0ccd498..c05d008358d 100644 --- a/dlls/user/text.c +++ b/dlls/user/text.c @@ -472,9 +472,10 @@ static void TEXT_SkipChars (int *new_count, const WCHAR **new_str, assert (max >= n); max -= n; while (n--) + { if (*start_str++ == PREFIX && max--) start_str++; - else; + } start_count -= (start_str - str_on_entry); } else @@ -532,7 +533,6 @@ static int TEXT_Reprefix (const WCHAR *str, unsigned int ns, str++; ns--; } - else; i++; } return result; diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 4adb3cf2ef2..baa702ed627 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -776,7 +776,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bAgain ) { LPITEMIDLIST pidl = NULL; IShellLinkW_GetIDList( sl, &pidl ); - if( pidl && SHGetPathFromIDListW( pidl, szPath ) ); + if( pidl && SHGetPathFromIDListW( pidl, szPath ) ) WINE_TRACE("pidl path : %s\n", wine_dbgstr_w(szPath)); }