Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 73093: [MPR] Implement saved connections restoration. This is a bit hackish for now: it should only be attempted once, when the DLL is loaded on session login. Right now, it's attempt...
by pschweitzer＠svn.reactos.org 31 Oct '16

31 Oct '16

Author: pschweitzer Date: Mon Oct 31 21:27:02 2016 New Revision: 73093 URL: http://svn.reactos.org/svn/reactos?rev=73093&view=rev Log: [MPR] Implement saved connections restoration. This is a bit hackish for now: it should only be attempted once, when the DLL is loaded on session login. Right now, it's attempt each time the DLL is loaded (ie, even when a program linking to it is started). This is to be fixed later on. So far, it brings the intended feature. Now, you can create a connection with net use, save it, and reboot: it will be restored on the session opening. CORE-11757 Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_ros.diff… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] Mon Oct 31 21:27:02 2016 @@ -69,7 +69,158 @@ TRACE("NPAddConnection %p\n", provider->addConnection); TRACE("NPAddConnection3 %p\n", provider->addConnection3); TRACE("NPCancelConnection %p\n", provider->cancelConnection); -@@ -1870,6 +1866,43 @@ +@@ -251,6 +247,85 @@ + debugstr_w(provider)); + } + ++#ifdef __REACTOS__ ++static void _restoreSavedConnection(HKEY connection, WCHAR * local) ++{ ++ NETRESOURCEW net; ++ DWORD type, prov, index, size; ++ ++ net.lpProvider = NULL; ++ net.lpRemoteName = NULL; ++ net.lpLocalName = NULL; ++ ++ TRACE("Restoring: %S\n", local); ++ ++ size = sizeof(DWORD); ++ if (RegQueryValueExW(connection, L"ConnectionType", NULL, &type, (BYTE *)&net.dwType, &size) != ERROR_SUCCESS) ++ return; ++ ++ if (type != REG_DWORD || size != sizeof(DWORD)) ++ return; ++ ++ if (RegQueryValueExW(connection, L"ProviderName", NULL, &type, NULL, &size) != ERROR_SUCCESS) ++ return; ++ ++ if (type != REG_SZ) ++ return; ++ ++ net.lpProvider = HeapAlloc(GetProcessHeap(), 0, size); ++ if (!net.lpProvider) ++ return; ++ ++ if (RegQueryValueExW(connection, L"ProviderName", NULL, NULL, (BYTE *)net.lpProvider, &size) != ERROR_SUCCESS) ++ goto cleanup; ++ ++ size = sizeof(DWORD); ++ if (RegQueryValueExW(connection, L"ProviderType", NULL, &type, (BYTE *)&prov, &size) != ERROR_SUCCESS) ++ goto cleanup; ++ ++ if (type != REG_DWORD || size != sizeof(DWORD)) ++ goto cleanup; ++ ++ index = _findProviderIndexW(net.lpProvider); ++ if (index == BAD_PROVIDER_INDEX) ++ goto cleanup; ++ ++ if (providerTable->table[index].dwNetType != prov) ++ goto cleanup; ++ ++ if (RegQueryValueExW(connection, L"RemotePath", NULL, &type, NULL, &size) != ERROR_SUCCESS) ++ goto cleanup; ++ ++ if (type != REG_SZ) ++ goto cleanup; ++ ++ net.lpRemoteName = HeapAlloc(GetProcessHeap(), 0, size); ++ if (!net.lpRemoteName) ++ goto cleanup; ++ ++ if (RegQueryValueExW(connection, L"RemotePath", NULL, NULL, (BYTE *)net.lpRemoteName, &size) != ERROR_SUCCESS) ++ goto cleanup; ++ ++ size = strlenW(local); ++ net.lpLocalName = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR) + 2 * sizeof(WCHAR)); ++ if (!net.lpLocalName) ++ goto cleanup; ++ ++ strcpyW(net.lpLocalName, local); ++ net.lpLocalName[size] = ':'; ++ net.lpLocalName[size + 1] = 0; ++ ++ TRACE("Attempting connection\n"); ++ ++ WNetAddConnection2W(&net, NULL, NULL, 0); ++ ++cleanup: ++ HeapFree(GetProcessHeap(), 0, net.lpProvider); ++ HeapFree(GetProcessHeap(), 0, net.lpRemoteName); ++ HeapFree(GetProcessHeap(), 0, net.lpLocalName); ++} ++#endif ++ + void wnetInit(HINSTANCE hInstDll) + { + static const WCHAR providerOrderKey[] = { 'S','y','s','t','e','m','\\', +@@ -329,6 +404,64 @@ + } + RegCloseKey(hKey); + } ++ ++#ifdef __REACTOS__ ++ if (providerTable) ++ { ++ HKEY user_profile; ++ ++ if (RegOpenCurrentUser(KEY_ALL_ACCESS, &user_profile) == ERROR_SUCCESS) ++ { ++ HKEY network; ++ WCHAR subkey[8] = {'N', 'e', 't', 'w', 'o', 'r', 'k', 0}; ++ ++ if (RegOpenKeyExW(user_profile, subkey, 0, KEY_READ, &network) == ERROR_SUCCESS) ++ { ++ DWORD size, max; ++ ++ TRACE("Enumerating remembered connections\n"); ++ ++ if (RegQueryInfoKey(network, NULL, NULL, NULL, &max, &size, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) ++ { ++ WCHAR *local; ++ ++ TRACE("There are %lu connections\n", max); ++ ++ local = HeapAlloc(GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR)); ++ if (local) ++ { ++ DWORD index; ++ ++ for (index = 0; index < max; ++index) ++ { ++ DWORD len = size + 1; ++ HKEY connection; ++ ++ TRACE("Trying connection %lu\n", index); ++ ++ if (RegEnumKeyExW(network, index, local, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) ++ continue; ++ ++ TRACE("It is %S\n", local); ++ ++ if (RegOpenKeyExW(network, local, 0, KEY_READ, &connection) != ERROR_SUCCESS) ++ continue; ++ ++ _restoreSavedConnection(connection, local); ++ RegCloseKey(connection); ++ } ++ ++ HeapFree(GetProcessHeap(), 0, local); ++ } ++ } ++ ++ RegCloseKey(network); ++ } ++ ++ RegCloseKey(user_profile); ++ } ++ } ++#endif + } + + void wnetFree(void) +@@ -1870,6 +2003,43 @@ } } @@ -113,7 +264,7 @@ return ret; } -@@ -2061,6 +2094,37 @@ +@@ -2061,6 +2231,37 @@ } } } @@ -151,7 +302,7 @@ return ret; } -@@ -2188,6 +2252,7 @@ +@@ -2188,6 +2389,7 @@ /* find the network connection for a given drive; helper for WNetGetConnection */ static DWORD get_drive_connection( WCHAR letter, LPWSTR remote, LPDWORD size ) { @@ -159,7 +310,7 @@ char buffer[1024]; struct mountmgr_unix_drive *data = (struct mountmgr_unix_drive *)buffer; HANDLE mgr; -@@ -2230,6 +2295,32 @@ +@@ -2230,6 +2432,32 @@ } CloseHandle( mgr ); return ret; Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Mon Oct 31 21:27:02 2016 @@ -247,6 +247,85 @@ debugstr_w(provider)); } +#ifdef __REACTOS__ +static void _restoreSavedConnection(HKEY connection, WCHAR * local) +{ + NETRESOURCEW net; + DWORD type, prov, index, size; + + net.lpProvider = NULL; + net.lpRemoteName = NULL; + net.lpLocalName = NULL; + + TRACE("Restoring: %S\n", local); + + size = sizeof(DWORD); + if (RegQueryValueExW(connection, L"ConnectionType", NULL, &type, (BYTE *)&net.dwType, &size) != ERROR_SUCCESS) + return; + + if (type != REG_DWORD || size != sizeof(DWORD)) + return; + + if (RegQueryValueExW(connection, L"ProviderName", NULL, &type, NULL, &size) != ERROR_SUCCESS) + return; + + if (type != REG_SZ) + return; + + net.lpProvider = HeapAlloc(GetProcessHeap(), 0, size); + if (!net.lpProvider) + return; + + if (RegQueryValueExW(connection, L"ProviderName", NULL, NULL, (BYTE *)net.lpProvider, &size) != ERROR_SUCCESS) + goto cleanup; + + size = sizeof(DWORD); + if (RegQueryValueExW(connection, L"ProviderType", NULL, &type, (BYTE *)&prov, &size) != ERROR_SUCCESS) + goto cleanup; + + if (type != REG_DWORD || size != sizeof(DWORD)) + goto cleanup; + + index = _findProviderIndexW(net.lpProvider); + if (index == BAD_PROVIDER_INDEX) + goto cleanup; + + if (providerTable->table[index].dwNetType != prov) + goto cleanup; + + if (RegQueryValueExW(connection, L"RemotePath", NULL, &type, NULL, &size) != ERROR_SUCCESS) + goto cleanup; + + if (type != REG_SZ) + goto cleanup; + + net.lpRemoteName = HeapAlloc(GetProcessHeap(), 0, size); + if (!net.lpRemoteName) + goto cleanup; + + if (RegQueryValueExW(connection, L"RemotePath", NULL, NULL, (BYTE *)net.lpRemoteName, &size) != ERROR_SUCCESS) + goto cleanup; + + size = strlenW(local); + net.lpLocalName = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR) + 2 * sizeof(WCHAR)); + if (!net.lpLocalName) + goto cleanup; + + strcpyW(net.lpLocalName, local); + net.lpLocalName[size] = ':'; + net.lpLocalName[size + 1] = 0; + + TRACE("Attempting connection\n"); + + WNetAddConnection2W(&net, NULL, NULL, 0); + +cleanup: + HeapFree(GetProcessHeap(), 0, net.lpProvider); + HeapFree(GetProcessHeap(), 0, net.lpRemoteName); + HeapFree(GetProcessHeap(), 0, net.lpLocalName); +} +#endif + void wnetInit(HINSTANCE hInstDll) { static const WCHAR providerOrderKey[] = { 'S','y','s','t','e','m','\\', @@ -325,6 +404,64 @@ } RegCloseKey(hKey); } + +#ifdef __REACTOS__ + if (providerTable) + { + HKEY user_profile; + + if (RegOpenCurrentUser(KEY_ALL_ACCESS, &user_profile) == ERROR_SUCCESS) + { + HKEY network; + WCHAR subkey[8] = {'N', 'e', 't', 'w', 'o', 'r', 'k', 0}; + + if (RegOpenKeyExW(user_profile, subkey, 0, KEY_READ, &network) == ERROR_SUCCESS) + { + DWORD size, max; + + TRACE("Enumerating remembered connections\n"); + + if (RegQueryInfoKey(network, NULL, NULL, NULL, &max, &size, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + WCHAR *local; + + TRACE("There are %lu connections\n", max); + + local = HeapAlloc(GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR)); + if (local) + { + DWORD index; + + for (index = 0; index < max; ++index) + { + DWORD len = size + 1; + HKEY connection; + + TRACE("Trying connection %lu\n", index); + + if (RegEnumKeyExW(network, index, local, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + continue; + + TRACE("It is %S\n", local); + + if (RegOpenKeyExW(network, local, 0, KEY_READ, &connection) != ERROR_SUCCESS) + continue; + + _restoreSavedConnection(connection, local); + RegCloseKey(connection); + } + + HeapFree(GetProcessHeap(), 0, local); + } + } + + RegCloseKey(network); + } + + RegCloseKey(user_profile); + } + } +#endif } void wnetFree(void)

1 0

[pschweitzer] 73092: [MPR] Delete saved connection on disconnection if asked (even though the resource wasn't connected). This allows net use to properly remove connections it may have created. COR...
by pschweitzer＠svn.reactos.org 31 Oct '16

31 Oct '16

Author: pschweitzer Date: Mon Oct 31 21:20:32 2016 New Revision: 73092 URL: http://svn.reactos.org/svn/reactos?rev=73092&view=rev Log: [MPR] Delete saved connection on disconnection if asked (even though the resource wasn't connected). This allows net use to properly remove connections it may have created. CORE-11757 Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_ros.diff… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] Mon Oct 31 21:20:32 2016 @@ -113,7 +113,45 @@ return ret; } -@@ -2188,6 +2221,7 @@ +@@ -2061,6 +2094,37 @@ + } + } + } ++#ifdef __REACTOS__ ++ ++ if (dwFlags & CONNECT_UPDATE_PROFILE) ++ { ++ HKEY user_profile; ++ WCHAR *coma = strchrW(lpName, ':'); ++ ++ if (coma && RegOpenCurrentUser(KEY_ALL_ACCESS, &user_profile) == ERROR_SUCCESS) ++ { ++ WCHAR *subkey; ++ DWORD len; ++ ++ len = (ULONG_PTR)coma - (ULONG_PTR)lpName + sizeof(L"Network\\"); ++ subkey = HeapAlloc(GetProcessHeap(), 0, len); ++ if (subkey) ++ { ++ strcpyW(subkey, L"Network\\"); ++ memcpy(subkey + (sizeof(L"Network\\") / sizeof(WCHAR)) - 1, lpName, (ULONG_PTR)coma - (ULONG_PTR)lpName); ++ subkey[len / sizeof(WCHAR) - 1] = 0; ++ ++ TRACE("Removing: %S\n", subkey); ++ ++ RegDeleteKeyW(user_profile, subkey); ++ HeapFree(GetProcessHeap(), 0, subkey); ++ } ++ ++ RegCloseKey(user_profile); ++ } ++ } ++ ++#endif + return ret; + } + +@@ -2188,6 +2252,7 @@ /* find the network connection for a given drive; helper for WNetGetConnection */ static DWORD get_drive_connection( WCHAR letter, LPWSTR remote, LPDWORD size ) { @@ -121,7 +159,7 @@ char buffer[1024]; struct mountmgr_unix_drive *data = (struct mountmgr_unix_drive *)buffer; HANDLE mgr; -@@ -2230,6 +2264,32 @@ +@@ -2230,6 +2295,32 @@ } CloseHandle( mgr ); return ret; Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Mon Oct 31 21:20:32 2016 @@ -2094,6 +2094,37 @@ } } } +#ifdef __REACTOS__ + + if (dwFlags & CONNECT_UPDATE_PROFILE) + { + HKEY user_profile; + WCHAR *coma = strchrW(lpName, ':'); + + if (coma && RegOpenCurrentUser(KEY_ALL_ACCESS, &user_profile) == ERROR_SUCCESS) + { + WCHAR *subkey; + DWORD len; + + len = (ULONG_PTR)coma - (ULONG_PTR)lpName + sizeof(L"Network\\"); + subkey = HeapAlloc(GetProcessHeap(), 0, len); + if (subkey) + { + strcpyW(subkey, L"Network\\"); + memcpy(subkey + (sizeof(L"Network\\") / sizeof(WCHAR)) - 1, lpName, (ULONG_PTR)coma - (ULONG_PTR)lpName); + subkey[len / sizeof(WCHAR) - 1] = 0; + + TRACE("Removing: %S\n", subkey); + + RegDeleteKeyW(user_profile, subkey); + HeapFree(GetProcessHeap(), 0, subkey); + } + + RegCloseKey(user_profile); + } + } + +#endif return ret; }

1 0

[pschweitzer] 73091: [MPR] Allow saving connections when using WNetUseConnection(), WNetAddConnection2(). It makes the "net use /persistent" switch working (ie, saving connection - not restoring co...
by pschweitzer＠svn.reactos.org 31 Oct '16

31 Oct '16

Author: pschweitzer Date: Mon Oct 31 21:17:46 2016 New Revision: 73091 URL: http://svn.reactos.org/svn/reactos?rev=73091&view=rev Log: [MPR] Allow saving connections when using WNetUseConnection(), WNetAddConnection2(). It makes the "net use /persistent" switch working (ie, saving connection - not restoring connections). CORE-11757 Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_ros.diff… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] Mon Oct 31 21:17:46 2016 @@ -49,27 +49,71 @@ =================================================================== --- wnet.c (revision 71983) +++ wnet.c (working copy) -@@ -48,6 +48,9 @@ - PF_NPGetResourceInformation getResourceInformation; +@@ -60,6 +50,9 @@ PF_NPAddConnection addConnection; PF_NPAddConnection3 addConnection3; + PF_NPCancelConnection cancelConnection; +#ifdef __REACTOS__ + PF_NPGetConnection getConnection; +#endif } WNetProvider, *PWNetProvider; typedef struct _WNetProviderTable -@@ -196,6 +199,9 @@ - } +@@ -214,6 +207,9 @@ provider->addConnection = MPR_GETPROC(NPAddConnection); provider->addConnection3 = MPR_GETPROC(NPAddConnection3); + provider->cancelConnection = MPR_GETPROC(NPCancelConnection); +#ifdef __REACTOS__ + provider->getConnection = MPR_GETPROC(NPGetConnection); +#endif TRACE("NPAddConnection %p\n", provider->addConnection); TRACE("NPAddConnection3 %p\n", provider->addConnection3); - providerTable->numProviders++; -@@ -1949,6 +1955,7 @@ + TRACE("NPCancelConnection %p\n", provider->cancelConnection); +@@ -1870,6 +1866,43 @@ + } + } + ++#ifdef __REACTOS__ ++ if (ret == WN_SUCCESS && ctxt->flags & CONNECT_UPDATE_PROFILE) ++ { ++ HKEY user_profile; ++ ++ if (netres.dwType == RESOURCETYPE_PRINT) ++ { ++ FIXME("Persistent connection are not supported for printers\n"); ++ return ret; ++ } ++ ++ if (RegOpenCurrentUser(KEY_ALL_ACCESS, &user_profile) == ERROR_SUCCESS) ++ { ++ 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) ++ { ++ DWORD dword_arg = RESOURCETYPE_DISK; ++ DWORD len = (strlenW(provider->name) + 1) * sizeof(WCHAR); ++ ++ 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)); ++ 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); ++ RegCloseKey(network); ++ } ++ ++ RegCloseKey(user_profile); ++ } ++ } ++#endif ++ + return ret; + } + +@@ -2188,6 +2221,7 @@ /* find the network connection for a given drive; helper for WNetGetConnection */ static DWORD get_drive_connection( WCHAR letter, LPWSTR remote, LPDWORD size ) { @@ -77,7 +121,7 @@ char buffer[1024]; struct mountmgr_unix_drive *data = (struct mountmgr_unix_drive *)buffer; HANDLE mgr; -@@ -1991,6 +1998,32 @@ +@@ -2230,6 +2264,32 @@ } CloseHandle( mgr ); return ret; Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Mon Oct 31 21:17:46 2016 @@ -1866,6 +1866,43 @@ } } +#ifdef __REACTOS__ + if (ret == WN_SUCCESS && ctxt->flags & CONNECT_UPDATE_PROFILE) + { + HKEY user_profile; + + if (netres.dwType == RESOURCETYPE_PRINT) + { + FIXME("Persistent connection are not supported for printers\n"); + return ret; + } + + if (RegOpenCurrentUser(KEY_ALL_ACCESS, &user_profile) == ERROR_SUCCESS) + { + 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) + { + DWORD dword_arg = RESOURCETYPE_DISK; + DWORD len = (strlenW(provider->name) + 1) * sizeof(WCHAR); + + 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)); + 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); + RegCloseKey(network); + } + + RegCloseKey(user_profile); + } + } +#endif + return ret; }

1 0

[janderwald] 73090: [USBAUDIO] - initialize pin with correct flags - enumerate all dataranges for an input / output terminal
by janderwald＠svn.reactos.org 31 Oct '16

31 Oct '16

Author: janderwald Date: Mon Oct 31 20:45:23 2016 New Revision: 73090 URL: http://svn.reactos.org/svn/reactos?rev=73090&view=rev Log: [USBAUDIO] - initialize pin with correct flags - enumerate all dataranges for an input / output terminal Modified: trunk/reactos/drivers/usb/usbaudio/filter.c Modified: trunk/reactos/drivers/usb/usbaudio/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/filte… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/filter.c [iso-8859-1] Mon Oct 31 20:45:23 2016 @@ -1110,8 +1110,39 @@ PUSB_INTERFACE_DESCRIPTOR Descriptor; PKSDATARANGE_AUDIO DataRangeAudio; PKSDATARANGE *DataRangeAudioArray; - ULONG NumFrequency; - + ULONG NumFrequency, DataRangeCount, DataRangeIndex; + + /* count all data ranges */ + DataRangeCount = 0; + for (Descriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, ConfigurationDescriptor, -1, -1, USB_DEVICE_CLASS_AUDIO, -1, -1); + Descriptor != NULL; + Descriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, (PVOID)((ULONG_PTR)Descriptor + Descriptor->bLength), -1, -1, USB_DEVICE_CLASS_AUDIO, -1, -1)) + { + if (Descriptor->bInterfaceSubClass == 0x02) /* AUDIO_STREAMING */ + { + StreamingInterfaceDescriptor = (PUSB_AUDIO_STREAMING_INTERFACE_DESCRIPTOR)USBD_ParseDescriptors(ConfigurationDescriptor, ConfigurationDescriptor->wTotalLength, Descriptor, USB_AUDIO_CONTROL_TERMINAL_DESCRIPTOR_TYPE); + if (StreamingInterfaceDescriptor != NULL) + { + ASSERT(StreamingInterfaceDescriptor->bDescriptorSubtype == 0x01); + ASSERT(StreamingInterfaceDescriptor->wFormatTag == WAVE_FORMAT_PCM); + if (StreamingInterfaceDescriptor->bTerminalLink == bTerminalID) + { + DataRangeCount++; + DPRINT1("StreamingInterfaceDescriptor %p TerminalID %x\n", StreamingInterfaceDescriptor, bTerminalID); + } + } + Descriptor = (PUSB_INTERFACE_DESCRIPTOR)StreamingInterfaceDescriptor; + } + } + + DataRangeAudioArray = AllocFunction(sizeof(PVOID) * DataRangeCount); + if (DataRangeAudioArray == NULL) + { + /* no memory */ + return; + } + + DataRangeIndex = 0; for (Descriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, ConfigurationDescriptor, -1, -1, USB_DEVICE_CLASS_AUDIO, -1, -1); Descriptor != NULL; Descriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, (PVOID)((ULONG_PTR)Descriptor + Descriptor->bLength), -1, -1, USB_DEVICE_CLASS_AUDIO, -1, -1)) @@ -1141,27 +1172,23 @@ DataRangeAudio->DataRange.MajorFormat = KSDATAFORMAT_TYPE_AUDIO; DataRangeAudio->DataRange.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; DataRangeAudio->DataRange.Specifier = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX; - DataRangeAudio->MaximumChannels = 1; + DataRangeAudio->MaximumChannels = StreamingFormatDescriptor->bNrChannels; DataRangeAudio->MinimumBitsPerSample = StreamingFormatDescriptor->bBitResolution; DataRangeAudio->MaximumBitsPerSample = StreamingFormatDescriptor->bBitResolution; NumFrequency = StreamingFormatDescriptor->bSamFreqType - 1; DataRangeAudio->MinimumSampleFrequency = StreamingFormatDescriptor->tSamFreq[0] | StreamingFormatDescriptor->tSamFreq[1] << 8 | StreamingFormatDescriptor->tSamFreq[2] << 16; DataRangeAudio->MaximumSampleFrequency = StreamingFormatDescriptor->tSamFreq[NumFrequency*3] | StreamingFormatDescriptor->tSamFreq[NumFrequency * 3+1] << 8 | StreamingFormatDescriptor->tSamFreq[NumFrequency * 3+2]<<16; - DataRangeAudioArray = AllocFunction(sizeof(PKSDATARANGE_AUDIO)); - if (DataRangeAudioArray == NULL) - { - /* no memory */ - FreeFunction(DataRangeAudio); - return; - } - DataRangeAudioArray[0] = (PKSDATARANGE)DataRangeAudio; - *OutDataRanges = DataRangeAudioArray; - *OutDataRangesCount = 1; - return; + + DataRangeAudioArray[DataRangeIndex] = (PKSDATARANGE)DataRangeAudio; + DataRangeIndex++; } } + Descriptor = (PUSB_INTERFACE_DESCRIPTOR)StreamingInterfaceDescriptor; } } + + *OutDataRanges = DataRangeAudioArray; + *OutDataRangesCount = DataRangeCount; } @@ -1213,18 +1240,21 @@ { Pins[Index].PinDescriptor.Communication = KSPIN_COMMUNICATION_BOTH; Pins[Index].PinDescriptor.DataFlow = KSPIN_DATAFLOW_OUT; + + /* pin flags */ + Pins[Index].Flags = KSPIN_FLAG_PROCESS_IN_RUN_STATE_ONLY | KSFILTER_FLAG_CRITICAL_PROCESSING; } else if (TerminalDescriptor->bDescriptorSubtype == USB_AUDIO_INPUT_TERMINAL) { Pins[Index].PinDescriptor.Communication = KSPIN_COMMUNICATION_SINK; Pins[Index].PinDescriptor.DataFlow = KSPIN_DATAFLOW_IN; + + /* pin flags */ + Pins[Index].Flags = KSPIN_FLAG_PROCESS_IN_RUN_STATE_ONLY | KSPIN_FLAG_GENERATE_EOS_EVENTS; } /* data intersect handler */ Pins[Index].IntersectHandler = UsbAudioPinDataIntersect; - - /* pin flags */ - Pins[Index].Flags = KSPIN_FLAG_PROCESS_IN_RUN_STATE_ONLY | KSFILTER_FLAG_CRITICAL_PROCESSING; /* irp sinks / sources can be instantiated */ Pins[Index].InstancesPossible = 1;

1 0

[jgardou] 73089: [KERNEL32_WINETEST] - Guard page and ATL thunks tests work fine. Enable them. ROSTESTS-155 #resolve
by jgardou＠svn.reactos.org 31 Oct '16

31 Oct '16

Author: jgardou Date: Mon Oct 31 11:51:50 2016 New Revision: 73089 URL: http://svn.reactos.org/svn/reactos?rev=73089&view=rev Log: [KERNEL32_WINETEST] - Guard page and ATL thunks tests work fine. Enable them. ROSTESTS-155 #resolve Modified: trunk/rostests/winetests/kernel32/virtual.c Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua… ============================================================================== --- trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] Mon Oct 31 11:51:50 2016 @@ -4166,19 +4166,10 @@ #if defined(__i386__) || defined(__x86_64__) test_stack_commit(); #endif -#ifdef __i386__ - if (!winetest_interactive) - { - skip("ROSTESTS-155: Skipping virtual guard page tests due to Mm assertion failure.\n"); - } - else - { - test_guard_page(); - /* The following tests should be executed as a last step, and in exactly this - * order, since ATL thunk emulation cannot be enabled anymore on Windows. */ - test_atl_thunk_emulation( MEM_EXECUTE_OPTION_ENABLE ); - test_atl_thunk_emulation( MEM_EXECUTE_OPTION_DISABLE ); - test_atl_thunk_emulation( MEM_EXECUTE_OPTION_DISABLE | MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION ); - } -#endif + test_guard_page(); + /* The following tests should be executed as a last step, and in exactly this + * order, since ATL thunk emulation cannot be enabled anymore on Windows. */ + test_atl_thunk_emulation( MEM_EXECUTE_OPTION_ENABLE ); + test_atl_thunk_emulation( MEM_EXECUTE_OPTION_DISABLE ); + test_atl_thunk_emulation( MEM_EXECUTE_OPTION_DISABLE | MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION ); }

1 0

[jimtabor] 73088: [User32] - Leave Dialog Procedure calls protected with SEH, the same as windows. - See CORE-12182, CORE-12111 and related issues.
by jimtabor＠svn.reactos.org 31 Oct '16

31 Oct '16

Author: jimtabor Date: Mon Oct 31 01:18:43 2016 New Revision: 73088 URL: http://svn.reactos.org/svn/reactos?rev=73088&view=rev Log: [User32] - Leave Dialog Procedure calls protected with SEH, the same as windows. - See CORE-12182, CORE-12111 and related issues. Modified: trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Mon Oct 31 01:18:43 2016 @@ -934,6 +934,7 @@ /* Ansi string might contain MBCS chars so we need 2 * the number of chars */ AnsiMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, UnicodeMsg->wParam * 2); //ERR("WM_GETTEXT U2A Size %d\n",AnsiMsg->wParam); + if (!AnsiMsg->lParam) return FALSE; break; } @@ -1463,7 +1464,20 @@ if (PreResult) goto Exit; + if (!Dialog) Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); + else + { + _SEH2_TRY + { + Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); + } + _SEH2_END; + } if (Hook && MsgOverride) { @@ -1504,7 +1518,20 @@ if (PreResult) goto Exit; + if (!Dialog) Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); + else + { + _SEH2_TRY + { + Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); + } + _SEH2_END; + } if (Hook && MsgOverride) { @@ -1584,7 +1611,20 @@ if (PreResult) goto Exit; + if (!Dialog) Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); + else + { + _SEH2_TRY + { + Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); + } + _SEH2_END; + } if (Hook && MsgOverride) { @@ -1632,7 +1672,20 @@ if (PreResult) goto Exit; + if (!Dialog) Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); + else + { + _SEH2_TRY + { + Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); + } + _SEH2_END; + } if (Hook && MsgOverride) {

1 0

[tfaber] 73087: [0.4.2] - Tag the release
by tfaber＠svn.reactos.org 30 Oct '16

30 Oct '16

Author: tfaber Date: Sun Oct 30 20:38:02 2016 New Revision: 73087 URL: http://svn.reactos.org/svn/reactos?rev=73087&view=rev Log: [0.4.2] - Tag the release Added: tags/ReactOS-0.4.2/ (props changed) - copied from r73086, branches/ros-branch-0_4_2/ Removed: branches/ros-branch-0_4_2/ Propchange: tags/ReactOS-0.4.2/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk:72020-72022,72026,72028

1 0

[tfaber] 73086: [0.4.3] - Merge the fastfat fix for Chrome committed in r73072 CORE-12132
by tfaber＠svn.reactos.org 30 Oct '16

30 Oct '16

Author: tfaber Date: Sun Oct 30 20:32:02 2016 New Revision: 73086 URL: http://svn.reactos.org/svn/reactos?rev=73086&view=rev Log: [0.4.3] - Merge the fastfat fix for Chrome committed in r73072 CORE-12132 Modified: branches/ros-branch-0_4_3/ (props changed) branches/ros-branch-0_4_3/reactos/ (props changed) branches/ros-branch-0_4_3/reactos/drivers/filesystems/fastfat/rw.c Propchange: branches/ros-branch-0_4_3/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 30 20:32:02 2016 @@ -1 +1 @@ -/trunk:73043,73075,73077 +/trunk:73043,73072,73075,73077 Propchange: branches/ros-branch-0_4_3/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 30 20:32:02 2016 @@ -21,4 +21,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:73043,73075,73077 +/trunk/reactos:73043,73072,73075,73077 Modified: branches/ros-branch-0_4_3/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/driver… ============================================================================== --- branches/ros-branch-0_4_3/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Sun Oct 30 20:32:02 2016 @@ -656,11 +656,6 @@ } Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO)); - Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoWriteAccess); - if (!NT_SUCCESS(Status)) - { - goto ByeBye; - } if (!(IrpContext->Irp->Flags & (IRP_NOCACHE|IRP_PAGING_IO)) && !(Fcb->Flags & (FCB_IS_PAGE_FILE|FCB_IS_VOLUME))) @@ -711,6 +706,12 @@ else { // non cached read + Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoWriteAccess); + if (!NT_SUCCESS(Status)) + { + goto ByeBye; + } + if (ByteOffset.QuadPart + Length > ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector)) { Length = (ULONG)(ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart); @@ -921,12 +922,6 @@ } Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO)); - Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoReadAccess); - if (!NT_SUCCESS(Status)) - { - Status = STATUS_INVALID_USER_BUFFER; - goto ByeBye; - } if (!(Fcb->Flags & (FCB_IS_FAT|FCB_IS_VOLUME)) && !(IrpContext->Irp->Flags & IRP_PAGING_IO) && @@ -987,6 +982,12 @@ else { // non cached write + Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoReadAccess); + if (!NT_SUCCESS(Status)) + { + Status = STATUS_INVALID_USER_BUFFER; + goto ByeBye; + } if (ByteOffset.QuadPart > OldFileSize.QuadPart) {

1 0

[hbelusca] 73085: [NTVDM]: Properly fixes build. Addendum to r73082, supersedes r73084. CORE-10340
by hbelusca＠svn.reactos.org 30 Oct '16

30 Oct '16

Author: hbelusca Date: Sun Oct 30 20:27:05 2016 New Revision: 73085 URL: http://svn.reactos.org/svn/reactos?rev=73085&view=rev Log: [NTVDM]: Properly fixes build. Addendum to r73082, supersedes r73084. CORE-10340 Removed: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/CMak… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] Sun Oct 30 20:27:05 2016 @@ -70,7 +70,8 @@ ntvdm.h ${CMAKE_CURRENT_BINARY_DIR}/ntvdm.def) -add_rc_deps(ntvdm.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/ntvdm.ico) +file(GLOB ntvdm_rc_deps res/*.*) +add_rc_deps(ntvdm.rc ${ntvdm_rc_deps}) add_executable(ntvdm ${SOURCE} ntvdm.rc) add_pch(ntvdm ntvdm.h SOURCE) set_module_type(ntvdm win32cui UNICODE IMAGEBASE 0x0F000000) Removed: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== Binary file - no diff available.

1 0

[mjansen] 73084: Addendum to r73082
by mjansen＠svn.reactos.org 30 Oct '16

30 Oct '16

Author: mjansen Date: Sun Oct 30 19:52:53 2016 New Revision: 73084 URL: http://svn.reactos.org/svn/reactos?rev=73084&view=rev Log: Addendum to r73082 Added: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico (with props) Added: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs