Module: wine Branch: refs/heads/master Commit: 4cf14960ba12d0108c7f2e693431478ad22df99d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4cf14960ba12d0108c7f2e69...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Jul 14 12:38:20 2006 +0200
msiexec: Invert the return values of the boolean functions so that their names make more sense.
---
programs/msiexec/msiexec.c | 72 ++++++++++++++++++++++---------------------- 1 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index e63727b..0d273f2 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -219,21 +219,21 @@ static BOOL msi_strequal(LPCWSTR str1, L
len = MultiByteToWideChar( CP_ACP, 0, str2, -1, NULL, 0); if( !len ) - return TRUE; + return FALSE; if( lstrlenW(str1) != (len-1) ) - return TRUE; + return FALSE; strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len, strW, len); HeapFree(GetProcessHeap(), 0, strW); - return (ret != CSTR_EQUAL); + return (ret == CSTR_EQUAL); }
/* prefix is hyphen or dash, and str1 is the same as str2, ignoring case */ static BOOL msi_option_equal(LPCWSTR str1, LPCSTR str2) { if (str1[0] != '/' && str1[0] != '-') - return TRUE; + return FALSE;
/* skip over the hyphen or slash */ return msi_strequal(str1 + 1, str2); @@ -247,21 +247,21 @@ static BOOL msi_strprefix(LPCWSTR str1,
len = MultiByteToWideChar( CP_ACP, 0, str2, -1, NULL, 0); if( !len ) - return TRUE; + return FALSE; if( lstrlenW(str1) < (len-1) ) - return TRUE; + return FALSE; strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len-1, strW, len-1); HeapFree(GetProcessHeap(), 0, strW); - return (ret != CSTR_EQUAL); + return (ret == CSTR_EQUAL); }
/* prefix is hyphen or dash, and str2 is at the beginning of str1, ignoring case */ static BOOL msi_option_prefix(LPCWSTR str1, LPCSTR str2) { if (str1[0] != '/' && str1[0] != '-') - return TRUE; + return FALSE;
/* skip over the hyphen or slash */ return msi_strprefix(str1 + 1, str2); @@ -401,7 +401,7 @@ int main(int argc, char **argv) * We do that before starting to process the real commandline, * then overwrite the commandline again. */ - if(!msi_option_equal(argvW[1], "@")) + if(msi_option_equal(argvW[1], "@")) { if(!process_args_from_reg( argvW[2], &argc, &argvW )) return 1; @@ -411,15 +411,15 @@ int main(int argc, char **argv) { WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
- if (!msi_option_equal(argvW[i], "regserver")) + if (msi_option_equal(argvW[i], "regserver")) { FunctionRegServer = TRUE; } - else if (!msi_option_equal(argvW[i], "unregserver") || !msi_option_equal(argvW[i], "unregister")) + else if (msi_option_equal(argvW[i], "unregserver") || msi_option_equal(argvW[i], "unregister")) { FunctionUnregServer = TRUE; } - else if(!msi_option_prefix(argvW[i], "i")) + else if(msi_option_prefix(argvW[i], "i")) { LPWSTR argvWi = argvW[i]; FunctionInstall = TRUE; @@ -435,7 +435,7 @@ int main(int argc, char **argv) } PackageName = argvWi; } - else if(!msi_option_equal(argvW[i], "a")) + else if(msi_option_equal(argvW[i], "a")) { FunctionInstall = TRUE; FunctionInstallAdmin = TRUE; @@ -447,7 +447,7 @@ int main(int argc, char **argv) PackageName = argvW[i]; StringListAppend(&property_list, ActionAdmin); } - else if(!msi_option_prefix(argvW[i], "f")) + else if(msi_option_prefix(argvW[i], "f")) { int j; int len = lstrlenW(argvW[i]); @@ -515,7 +515,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(!msi_option_equal(argvW[i], "x")) + else if(msi_option_equal(argvW[i], "x")) { FunctionInstall = TRUE; i++; @@ -525,7 +525,7 @@ int main(int argc, char **argv) PackageName = argvW[i]; StringListAppend(&property_list, RemoveAll); } - else if(!msi_option_prefix(argvW[i], "j")) + else if(msi_option_prefix(argvW[i], "j")) { int j; int len = lstrlenW(argvW[i]); @@ -553,7 +553,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(!msi_strequal(argvW[i], "u")) + else if(msi_strequal(argvW[i], "u")) { FunctionAdvertise = TRUE; AdvertiseMode = ADVERTISEFLAGS_USERASSIGN; @@ -563,7 +563,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(!msi_strequal(argvW[i], "m")) + else if(msi_strequal(argvW[i], "m")) { FunctionAdvertise = TRUE; AdvertiseMode = ADVERTISEFLAGS_MACHINEASSIGN; @@ -573,7 +573,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(!msi_option_equal(argvW[i], "t")) + else if(msi_option_equal(argvW[i], "t")) { i++; if(i >= argc) @@ -581,7 +581,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); StringListAppend(&transform_list, argvW[i]); } - else if(!msi_option_equal(argvW[i], "g")) + else if(msi_option_equal(argvW[i], "g")) { i++; if(i >= argc) @@ -589,7 +589,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); Language = msi_atou(argvW[i]); } - else if(!msi_option_prefix(argvW[i], "l")) + else if(msi_option_prefix(argvW[i], "l")) { int j; int len = lstrlenW(argvW[i]); @@ -680,7 +680,7 @@ int main(int argc, char **argv) ExitProcess(1); } } - else if(!msi_option_equal(argvW[i], "p")) + else if(msi_option_equal(argvW[i], "p")) { FunctionPatch = TRUE; i++; @@ -689,37 +689,37 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PatchFileName = argvW[i]; } - else if(!msi_option_prefix(argvW[i], "q")) + else if(msi_option_prefix(argvW[i], "q")) { - if(lstrlenW(argvW[i]) == 2 || !msi_strequal(argvW[i]+2, "n")) + if(lstrlenW(argvW[i]) == 2 || msi_strequal(argvW[i]+2, "n")) { InstallUILevel = INSTALLUILEVEL_NONE; } - else if(!msi_strequal(argvW[i]+2, "b")) + else if(msi_strequal(argvW[i]+2, "b")) { InstallUILevel = INSTALLUILEVEL_BASIC; } - else if(!msi_strequal(argvW[i]+2, "r")) + else if(msi_strequal(argvW[i]+2, "r")) { InstallUILevel = INSTALLUILEVEL_REDUCED; } - else if(!msi_strequal(argvW[i]+2, "f")) + else if(msi_strequal(argvW[i]+2, "f")) { InstallUILevel = INSTALLUILEVEL_FULL|INSTALLUILEVEL_ENDDIALOG; } - else if(!msi_strequal(argvW[i]+2, "n+")) + else if(msi_strequal(argvW[i]+2, "n+")) { InstallUILevel = INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG; } - else if(!msi_strequal(argvW[i]+2, "b+")) + else if(msi_strequal(argvW[i]+2, "b+")) { InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; } - else if(!msi_strequal(argvW[i]+2, "b-")) + else if(msi_strequal(argvW[i]+2, "b-")) { InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY; } - else if(!msi_strequal(argvW[i]+2, "b+!")) + else if(msi_strequal(argvW[i]+2, "b+!")) { InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; WINE_FIXME("Unknown modifier: !\n"); @@ -730,7 +730,7 @@ int main(int argc, char **argv) wine_dbgstr_w(argvW[i]+2)); } } - else if(!msi_option_equal(argvW[i], "y")) + else if(msi_option_equal(argvW[i], "y")) { FunctionDllRegisterServer = TRUE; i++; @@ -739,7 +739,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); DllName = argvW[i]; } - else if(!msi_option_equal(argvW[i], "z")) + else if(msi_option_equal(argvW[i], "z")) { FunctionDllUnregisterServer = TRUE; i++; @@ -748,16 +748,16 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); DllName = argvW[i]; } - else if(!msi_option_equal(argvW[i], "h") || !msi_option_equal(argvW[i], "?")) + else if(msi_option_equal(argvW[i], "h") || msi_option_equal(argvW[i], "?")) { ShowUsage(0); } - else if(!msi_option_equal(argvW[i], "m")) + else if(msi_option_equal(argvW[i], "m")) { FunctionUnknown = TRUE; WINE_FIXME("Unknown parameter /m\n"); } - else if(!msi_option_equal(argvW[i], "D")) + else if(msi_option_equal(argvW[i], "D")) { FunctionUnknown = TRUE; WINE_FIXME("Unknown parameter /D\n");