https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e8ec64489b934b77020068d794f56510d9e9b7a
commit 3e8ec64489b934b77020068d794f56510d9e9b7a Author: Pierre Schweitzer <[email protected]> AuthorDate: Thu Dec 6 22:42:46 2018 +0100 Commit: Pierre Schweitzer <[email protected]> CommitDate: Thu Dec 6 22:42:46 2018 +0100 [MPR] Import Wine commit: 23a232fce8899a24e76207518175235b7b0f00cd Implement support for making connections persistent. --- dll/win32/mpr/wnet.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dll/win32/mpr/wnet.c b/dll/win32/mpr/wnet.c index 6c9d7cd631..b16ec98165 100644 --- a/dll/win32/mpr/wnet.c +++ b/dll/win32/mpr/wnet.c @@ -2012,6 +2012,9 @@ static DWORD wnet_use_provider( struct use_connection_context *ctxt, NETRESOURCE return ret; } +static const WCHAR providerType[] = { 'P','r','o','v','i','d','e','r','T','y','p','e',0 }; +static const WCHAR userName[] = { 'U','s','e','r','N','a','m','e',0 }; + static DWORD wnet_use_connection( struct use_connection_context *ctxt ) { WNetProvider *provider; @@ -2068,7 +2071,6 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) } } -#ifdef __REACTOS__ if (ret == WN_SUCCESS && ctxt->flags & CONNECT_UPDATE_PROFILE) { HKEY user_profile; @@ -2084,26 +2086,26 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) HKEY network; WCHAR subkey[10] = {'N', 'e', 't', 'w', 'o', 'r', 'k', '\\', netres.lpLocalName[0], 0}; - if (RegCreateKeyExW(user_profile, subkey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &network, NULL) == ERROR_SUCCESS) + if (RegCreateKeyExW(user_profile, subkey, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, NULL, &network, NULL) == ERROR_SUCCESS) { DWORD dword_arg = RESOURCETYPE_DISK; DWORD len = (strlenW(provider->name) + 1) * sizeof(WCHAR); + static const WCHAR empty[1] = {0}; - RegSetValueExW(network, L"ConnectionType", 0, REG_DWORD, (const BYTE *)&dword_arg, sizeof(DWORD)); - RegSetValueExW(network, L"ProviderName", 0, REG_SZ, (const BYTE *)provider->name, len); - dword_arg = provider->dwNetType; - RegSetValueExW(network, L"ProviderType", 0, REG_DWORD, (const BYTE *)&dword_arg, sizeof(DWORD)); + RegSetValueExW(network, connectionType, 0, REG_DWORD, (const BYTE *)&dword_arg, sizeof(DWORD)); + RegSetValueExW(network, providerName, 0, REG_SZ, (const BYTE *)provider->name, len); + RegSetValueExW(network, providerType, 0, REG_DWORD, (const BYTE *)&provider->dwNetType, sizeof(DWORD)); len = (strlenW(netres.lpRemoteName) + 1) * sizeof(WCHAR); - RegSetValueExW(network, L"RemotePath", 0, REG_SZ, (const BYTE *)netres.lpRemoteName, len); - len = 0; - RegSetValueExW(network, L"UserName", 0, REG_SZ, (const BYTE *)netres.lpRemoteName, len); + RegSetValueExW(network, remotePath, 0, REG_SZ, (const BYTE *)netres.lpRemoteName, len); + len = sizeof(empty); + RegSetValueExW(network, userName, 0, REG_SZ, (const BYTE *)empty, len); RegCloseKey(network); } RegCloseKey(user_profile); } } -#endif return ret; }
