diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2014-03-26 19:21:20 +0000 |
|---|---|---|
| committer | <> | 2014-05-08 15:03:54 +0000 |
| commit | fb123f93f9f5ce42c8e5785d2f8e0edaf951740e (patch) | |
| tree | c2103d76aec5f1f10892cd1d3a38e24f665ae5db /src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp | |
| parent | 58ed4748338f9466599adfc8a9171280ed99e23f (diff) | |
| download | VirtualBox-master.tar.gz | |
Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master
Diffstat (limited to 'src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp')
| -rw-r--r-- | src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp b/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp index 6929eb7e..21d97de8 100644 --- a/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp +++ b/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp @@ -1087,7 +1087,7 @@ static RTEXITCODE DoCleanup(int argc, char **argv) char *pszMarker = strstr(Entry.szName, "-_-"); if ( pszMarker && ( !strcmp(pszMarker, "-_-uninst") - || !strncmp(pszMarker, "-_-inst", sizeof("-_-inst") - 1))) + || !strncmp(pszMarker, RT_STR_TUPLE("-_-inst")))) fCandidate = VBoxExtPackIsValidMangledName(Entry.szName, pszMarker - &Entry.szName[0]); if (fCandidate) { @@ -1767,7 +1767,11 @@ int main(int argc, char **argv) /* * Initialize IPRT and check that we're correctly installed. */ +#ifdef RT_OS_WINDOWS + int rc = RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_UTF8_ARGV); /* WinMain gives us UTF-8, see below. */ +#else int rc = RTR3InitExe(argc, &argv, 0); +#endif if (RT_FAILURE(rc)) return RTMsgInitFailure(rc); |