Author: pschweitzer Date: Tue Jan 5 22:56:20 2016 New Revision: 70500 URL: http://svn.reactos.org/svn/reactos?rev=70500&view=rev Log: [ROSVBOXMGMT] Add a new feature to the tool: Let it auto start VBox Shared folders and to browse all the available shares in order to create shell links on desktop. The purpose is to workaround the missing network shares discovery feature in ReactOS while keeping the VBox shared folders usage 'user-friendly'.
It has been designed specifically for the coming 0.4.0 release: just put it on autostart for the default user. If there are shares (even new ones), it will create links, if there are no shares, no guest additions, no VBox, it will just exit. See it in action: https://twitter.com/HeisSpiter/status/684506579555741696 CORE-10032 ROSAPPS-303 Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt?rev=70500&r1=70499&r2=70500&view=diff ============================================================================== --- trunk/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt [iso-8859-1] Tue Jan 5 22:56:20 2016 @@ -1,4 +1,6 @@ add_executable(rosvboxmgmt rosvboxmgmt.c rosvboxmgmt.rc) set_module_type(rosvboxmgmt win32cui UNICODE) -add_importlibs(rosvboxmgmt msvcrt kernel32) +target_link_libraries(rosvboxmgmt uuid) +add_delay_importlibs(rosvboxmgmt shell32) +add_importlibs(rosvboxmgmt msvcrt kernel32 user32 ole32) add_cd_file(TARGET rosvboxmgmt DESTINATION reactos/bin FOR all) Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c?rev=70500&r1=70499&r2=70500&view=diff ============================================================================== --- trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] Tue Jan 5 22:56:20 2016 @@ -9,6 +9,9 @@ #include <stdio.h> #include <wchar.h> #include <windows.h> +#include <shlobj.h> +#include <shobjidl.h> +#include <shlwapi.h> /* DON'T CHANGE ORDER!!!! */ PCWSTR devices[3] = { L"\\\\.\\VBoxMiniRdrDN", L"\\??\\VBoxMiniRdrDN", L"\\Device\\VBoxMiniRdr" }; @@ -123,7 +126,7 @@ return 0; } -PWSTR getGlobalConn(CHAR id) +PCWSTR getGlobalConn(CHAR id) { BOOL ret; static WCHAR name[MAX_LEN]; @@ -157,7 +160,7 @@ { CHAR id = outputBuffer[i]; BOOL active = ((id & 0x80) == 0x80); - PWSTR name = NULL; + PCWSTR name = NULL; if (active) { @@ -169,6 +172,90 @@ } wprintf(L"%c: %s (%s)%c", 'A' + i, (active ? L"Active" : L"Inactive"), name, (i & 1 ? '\n' : '\t')); + } + + return 0; +} + +BOOL CreateUNCShortcut(PCWSTR share) +{ + HRESULT res; + IShellLink *link; + IPersistFile *persist; + WCHAR path[MAX_PATH]; + WCHAR linkPath[MAX_PATH]; + + res = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLink, (void**)&link); + if (FAILED(res)) + { + return FALSE; + } + + res = link->lpVtbl->QueryInterface(link, &IID_IPersistFile, (void **)&persist); + if (FAILED(res)) + { + link->lpVtbl->Release(link); + return FALSE; + } + + wcscpy(path, L"\\\\vboxsvr\\"); + wcscat(path, share); + link->lpVtbl->SetPath(link, path); + + res = SHGetFolderPathW(NULL, CSIDL_DESKTOPDIRECTORY, NULL, 0, path); + if (FAILED(res)) + { + persist->lpVtbl->Release(persist); + link->lpVtbl->Release(link); + return FALSE; + } + + wsprintf(linkPath, L"%s\\Browse %s (VBox).lnk", path, share); + res = persist->lpVtbl->Save(persist, linkPath, TRUE); + + persist->lpVtbl->Release(persist); + link->lpVtbl->Release(link); + + return SUCCEEDED(res); +} + +int autoStart(void) +{ + short i; + BOOL ret; + DWORD outputBufferSize; + char outputBuffer[_MRX_MAX_DRIVE_LETTERS]; + + if (startVBoxSrv() != 0) + { + return 1; + } + + outputBufferSize = sizeof(outputBuffer); + memset(outputBuffer, 0, outputBufferSize); + ret = performDevIoCtl(IOCTL_MRX_VBOX_GETGLOBALLIST, NULL, 0, &outputBuffer, outputBufferSize); + if (ret == FALSE) + { + return 1; + } + + CoInitialize(NULL); + for (i = 0; i < _MRX_MAX_DRIVE_LETTERS; ++i) + { + CHAR id = outputBuffer[i]; + BOOL active = ((id & 0x80) == 0x80); + PCWSTR name = NULL; + + if (active) + { + name = getGlobalConn(id); + } + if (name == NULL) + { + continue; + } + + CreateUNCShortcut(name); } return 0; @@ -181,6 +268,7 @@ wprintf(L"\taddconn <letter> <share name>: add a connection\n"); wprintf(L"\tgetlist: list connections\n"); wprintf(L"\tgetgloballist: list available shares\n"); + wprintf(L"\tauto: automagically configure the VBox Shared folders and creates desktop folders\n"); } int wmain(int argc, wchar_t *argv[]) @@ -217,6 +305,10 @@ { return getGlobalList(); } + else if (_wcsicmp(cmd, L"auto") == 0) + { + return autoStart(); + } else { printUsage();
