Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[pschweitzer] 72088: [NET] Implement the "net use" usage of the net command. This allows connecting remote resources to local system with assigning them a local name, to enumerate such connected re...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Aug 2 10:10:25 2016 New Revision: 72088 URL: http://svn.reactos.org/svn/reactos?rev=72088&view=rev Log: [NET] Implement the "net use" usage of the net command. This allows connecting remote resources to local system with assigning them a local name, to enumerate such connected resources and to delete them. This obsoletes the hackssign application. The implementation is a bit... raw. It is mainly here to demonstrate what's doable in ReactOS now. And to help using features we were lacking up to now. For instance, you can make use of 'net use * \\vmware-host\Shared Folders\{YOURSHARE}' to assign a local letter to your VMware shared folders. ROSAPPS-303 Added: trunk/reactos/base/applications/network/net/cmdUse.c (with props) Modified: trunk/reactos/base/applications/network/net/CMakeLists.txt trunk/reactos/base/applications/network/net/main.c trunk/reactos/base/applications/network/net/net.h Modified: trunk/reactos/base/applications/network/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] Tue Aug 2 10:10:25 2016 @@ -10,12 +10,13 @@ cmdPause.c cmdStart.c cmdStop.c + cmdUse.c cmdUser.c help.c net.h) add_executable(net ${SOURCE} net.rc) set_module_type(net win32cui UNICODE) -add_importlibs(net advapi32 netapi32 msvcrt kernel32 user32 ntdll) +add_importlibs(net advapi32 netapi32 msvcrt kernel32 user32 ntdll mpr) add_pch(net net.h SOURCE) add_cd_file(TARGET net DESTINATION reactos/system32 FOR all) Added: trunk/reactos/base/applications/network/net/cmdUse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUse.c (added) +++ trunk/reactos/base/applications/network/net/cmdUse.c [iso-8859-1] Tue Aug 2 10:10:25 2016 @@ -0,0 +1,191 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: base/applications/network/net/cmdUse.c + * PURPOSE: + * + * PROGRAMMERS: Pierre Schweitzer + */ + +#include "net.h" + +static +DWORD +EnumerateConnections(LPCWSTR Local) +{ + DWORD dRet; + HANDLE hEnum; + LPNETRESOURCE lpRes; + DWORD dSize = 0x1000; + DWORD dCount = -1; + LPNETRESOURCE lpCur; + + printf("%S\t\t\t%S\t\t\t\t%S\n", L"Local", L"Remote", L"Provider"); + + dRet = WNetOpenEnum(RESOURCE_CONNECTED, RESOURCETYPE_DISK, 0, NULL, &hEnum); + if (dRet != WN_SUCCESS) + { + return 1; + } + + lpRes = HeapAlloc(GetProcessHeap(), 0, dSize); + if (!lpRes) + { + WNetCloseEnum(hEnum); + return 1; + } + + do + { + dSize = 0x1000; + dCount = -1; + + memset(lpRes, 0, dSize); + dRet = WNetEnumResource(hEnum, &dCount, lpRes, &dSize); + if (dRet == WN_SUCCESS || dRet == WN_MORE_DATA) + { + lpCur = lpRes; + for (; dCount; dCount--) + { + if (!Local || wcsicmp(lpCur->lpLocalName, Local) == 0) + { + printf("%S\t\t\t%S\t\t%S\n", lpCur->lpLocalName, lpCur->lpRemoteName, lpCur->lpProvider); + } + + lpCur++; + } + } + } while (dRet != WN_NO_MORE_ENTRIES); + + HeapFree(GetProcessHeap(), 0, lpRes); + WNetCloseEnum(hEnum); + + return 0; +} + +INT +cmdUse( + INT argc, + WCHAR **argv) +{ + DWORD Status, Len; + + if (argc == 2) + { + Status = EnumerateConnections(NULL); + printf("Status: %lu\n", Status); + return 0; + } + else if (argc == 3) + { + Len = wcslen(argv[2]); + if (Len != 2) + { + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"DeviceName"); + return 1; + } + + if (!iswalpha(argv[2][0]) || argv[2][1] != L':') + { + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"DeviceName"); + return 1; + } + + Status = EnumerateConnections(argv[2]); + printf("Status: %lu\n", Status); + return 0; + } + + Len = wcslen(argv[2]); + if (Len != 1 && Len != 2) + { + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"DeviceName"); + printf("Len: %lu\n", Len); + return 1; + } + + if (Len == 2 && argv[2][1] != L':') + { + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"DeviceName"); + return 1; + } + + if (argv[2][0] != L'*' && !iswalpha(argv[2][0])) + { + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"DeviceName"); + return 1; + } + + if (wcsicmp(argv[3], L"/DELETE") == 0) + { + if (argv[2][0] == L'*') + { + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"DeviceName"); + return 1; + } + + return WNetCancelConnection(argv[2], FALSE); + } + else + { + BOOL Persist = FALSE; + NETRESOURCE lpNet; + + Len = wcslen(argv[3]); + if (Len < 4) + { + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"Name"); + return 1; + } + + if (argv[3][0] != L'\\' || argv[3][1] != L'\\') + { + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"Name"); + return 1; + } + + if (argc > 4) + { + LPWSTR Cpy; + Len = wcslen(argv[4]); + if (Len > 12) + { + Cpy = HeapAlloc(GetProcessHeap(), 0, (Len + 1) * sizeof(WCHAR)); + if (Cpy) + { + INT i; + for (i = 0; i < Len; ++i) + Cpy[i] = towupper(argv[4][i]); + + if (wcsstr(Cpy, L"/PERSISTENT:") == Cpy) + { + LPWSTR Arg = Cpy + 12; + if (Len == 14 && Arg[0] == 'N' && Arg[1] == 'O') + { + Persist = FALSE; + } + else if (Len == 15 && Arg[0] == 'Y' && Arg[1] == 'E' && Arg[2] == 'S') + { + Persist = TRUE; + } + else + { + HeapFree(GetProcessHeap(), 0, Cpy); + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"Persistent"); + return 1; + } + } + HeapFree(GetProcessHeap(), 0, Cpy); + } + } + + } + + lpNet.dwType = RESOURCETYPE_DISK; + lpNet.lpLocalName = (argv[2][0] != L'*') ? argv[2] : NULL; + lpNet.lpRemoteName = argv[3]; + lpNet.lpProvider = NULL; + + return WNetAddConnection2(&lpNet, NULL, NULL, CONNECT_REDIRECT | (Persist ? CONNECT_UPDATE_PROFILE : 0)); + } +} Propchange: trunk/reactos/base/applications/network/net/cmdUse.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/main.c [iso-8859-1] Tue Aug 2 10:10:25 2016 @@ -39,7 +39,7 @@ {L"statistics", unimplemented}, {L"stop", cmdStop}, {L"time", unimplemented}, - {L"use", unimplemented}, + {L"use", cmdUse}, {L"user", cmdUser}, {L"view", unimplemented}, {NULL, NULL} Modified: trunk/reactos/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/net.h [iso-8859-1] Tue Aug 2 10:10:25 2016 @@ -17,6 +17,7 @@ #include <wincon.h> #include <winuser.h> #include <winsvc.h> +#include <winnetwk.h> #include <stdio.h> #include <stdlib.h> #include <limits.h> @@ -66,6 +67,7 @@ INT cmdPause(INT argc, WCHAR **argv); INT cmdStart(INT argc, WCHAR **argv); INT cmdStop(INT argc, WCHAR **argv); +INT cmdUse(INT argc, WCHAR **argv); INT cmdUser(INT argc, WCHAR **argv); #endif /* _NET_PCH_ */

8 years, 4 months

[pschweitzer] 72087: [MPR] Implement connected resources enumeration To be sent upstream. Patch 6/6 CORE-11757 ROSAPPS-303

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Aug 2 10:04:19 2016 New Revision: 72087 URL: http://svn.reactos.org/svn/reactos?rev=72087&view=rev Log: [MPR] Implement connected resources enumeration To be sent upstream. Patch 6/6 CORE-11757 ROSAPPS-303 Modified: trunk/reactos/dll/win32/mpr/wnet.c 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] Tue Aug 2 10:04:19 2016 @@ -90,7 +90,7 @@ DWORD dwScope; DWORD dwType; DWORD dwUsage; - LPNETRESOURCEW lpNet; + LPVOID lpBuffer; } WNetEnumerator, *PWNetEnumerator; #define BAD_PROVIDER_INDEX (DWORD)0xffffffff @@ -416,7 +416,7 @@ ret->dwScope = dwScope; ret->dwType = dwType; ret->dwUsage = dwUsage; - ret->lpNet = _copyNetResourceForEnumW(lpNet); + ret->lpBuffer = _copyNetResourceForEnumW(lpNet); } return ret; } @@ -456,6 +456,28 @@ ret->dwScope = dwScope; ret->dwType = dwType; ret->dwUsage = dwUsage; + } + return ret; +} + +static PWNetEnumerator _createConnectedEnumerator(DWORD dwScope, DWORD dwType, + DWORD dwUsage) +{ + PWNetEnumerator ret = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, sizeof(WNetEnumerator)); + + if (ret) + { + ret->enumType = WNET_ENUMERATOR_TYPE_CONNECTED; + ret->dwScope = dwScope; + ret->dwType = dwType; + ret->dwUsage = dwUsage; + ret->lpBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HANDLE) * providerTable->numProviders); + if (!ret->lpBuffer) + { + HeapFree(GetProcessHeap(), 0, ret); + ret = NULL; + } } return ret; } @@ -821,8 +843,11 @@ ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; break; case RESOURCE_REMEMBERED: + *lphEnum = _createNullEnumerator(); + ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; + break; case RESOURCE_CONNECTED: - *lphEnum = _createNullEnumerator(); + *lphEnum = _createConnectedEnumerator(dwScope, dwType, dwUsage); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; break; default: @@ -1048,7 +1073,7 @@ { ret = providerTable->table[enumerator->providerIndex]. openEnum(enumerator->dwScope, enumerator->dwType, - enumerator->dwUsage, enumerator->lpNet, + enumerator->dwUsage, enumerator->lpBuffer, &enumerator->handle); if (ret == WN_SUCCESS) { @@ -1086,7 +1111,7 @@ switch (enumerator->dwScope) { case RESOURCE_GLOBALNET: - if (enumerator->lpNet) + if (enumerator->lpBuffer) ret = _enumerateGlobalPassthroughW(enumerator, lpcCount, lpBuffer, lpBufferSize); else @@ -1203,6 +1228,143 @@ *lpBufferSize = bytesNeeded; } } + TRACE("Returning %d\n", ret); + return ret; +} + +static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, LPDWORD lpcCount, + LPVOID lpBuffer, LPDWORD lpBufferSize) +{ + DWORD ret, index, count, size, i, len, left; + PVOID end; + LPNETRESOURCEW curr, buffer; + PHANDLE handles; + + if (!enumerator) + return WN_BAD_POINTER; + if (enumerator->enumType != WNET_ENUMERATOR_TYPE_CONNECTED) + return WN_BAD_VALUE; + if (!lpcCount) + return WN_BAD_POINTER; + if (!lpBuffer) + return WN_BAD_POINTER; + if (!lpBufferSize) + return WN_BAD_POINTER; + if (!providerTable) + return WN_NO_NETWORK; + + handles = enumerator->lpBuffer; + left = *lpBufferSize; + size = *lpBufferSize; + buffer = HeapAlloc(GetProcessHeap(), 0, *lpBufferSize); + if (!buffer) + return WN_NO_NETWORK; + + curr = lpBuffer; + end = (PVOID)((ULONG_PTR)lpBuffer + size); + count = *lpcCount; + + + for (index = 0; index < providerTable->numProviders; index++) + { + if (providerTable->table[index].dwEnumScopes) + { + if (handles[index] == 0) + { + ret = providerTable->table[index].openEnum(enumerator->dwScope, + enumerator->dwType, + enumerator->dwUsage, + NULL, &handles[index]); + if (ret != WN_SUCCESS) + continue; + } + + ret = providerTable->table[index].enumResource(handles[index], + &count, + buffer, + &size); + + if (ret == WN_MORE_DATA) + { + + break; + } + + if (ret == WN_SUCCESS) + { + for (i = 0; i < count; ++i) + { + if (left < sizeof(NETRESOURCEW)) + { + ret = WN_MORE_DATA; + break; + } + + memcpy(curr, &buffer[i], sizeof(NETRESOURCEW)); + left -= sizeof(NETRESOURCEW); + + len = WideCharToMultiByte(CP_ACP, 0, buffer[i].lpLocalName, -1, NULL, 0, NULL, NULL); + len *= sizeof(WCHAR); + if (left < len) + { + ret = WN_MORE_DATA; + break; + } + + end = (PVOID)((ULONG_PTR)end - len); + curr->lpLocalName = end; + memcpy(end, buffer[i].lpLocalName, len); + left -= len; + + len = WideCharToMultiByte(CP_ACP, 0, buffer[i].lpRemoteName, -1, NULL, 0, NULL, NULL); + len *= sizeof(WCHAR); + if (left < len) + { + ret = WN_MORE_DATA; + break; + } + + end = (PVOID)((ULONG_PTR)end - len); + curr->lpRemoteName = end; + memcpy(end, buffer[i].lpRemoteName, len); + left -= len; + + len = WideCharToMultiByte(CP_ACP, 0, buffer[i].lpProvider, -1, NULL, 0, NULL, NULL); + len *= sizeof(WCHAR); + if (left < len) + { + ret = WN_MORE_DATA; + break; + } + + end = (PVOID)((ULONG_PTR)end - len); + curr->lpProvider = end; + memcpy(end, buffer[i].lpProvider, len); + left -= len; + + ++curr; + } + + count = *lpcCount - count; + size = left; + } + + if (ret != WN_SUCCESS || count == 0) + { + break; + } + } + } + + if (count == 0) + ret = WN_NO_MORE_ENTRIES; + + *lpcCount = *lpcCount - count; + if (ret != WN_MORE_DATA && ret != WN_NO_MORE_ENTRIES) + ret = WN_SUCCESS; + + HeapFree(GetProcessHeap(), 0, buffer); + TRACE("Returning %d\n", ret); return ret; } @@ -1251,6 +1413,10 @@ ret = _enumerateContextW(enumerator, lpcCount, lpBuffer, lpBufferSize); break; + case WNET_ENUMERATOR_TYPE_CONNECTED: + ret = _enumerateConnectedW(enumerator, lpcCount, lpBuffer, + lpBufferSize); + break; default: WARN("bogus enumerator type!\n"); ret = WN_NO_NETWORK; @@ -1267,7 +1433,8 @@ */ DWORD WINAPI WNetCloseEnum( HANDLE hEnum ) { - DWORD ret; + DWORD ret, index; + PHANDLE handles; TRACE( "(%p)\n", hEnum ); @@ -1277,12 +1444,21 @@ switch (enumerator->enumType) { + case WNET_ENUMERATOR_TYPE_CONNECTED: + handles = enumerator->lpBuffer; + for (index = 0; index < providerTable->numProviders; index++) + { + if (providerTable->table[index].dwEnumScopes && handles[index] != 0) + providerTable->table[index].closeEnum(handles[index]); + } + HeapFree(GetProcessHeap(), 0, handles); + ret = WN_SUCCESS; case WNET_ENUMERATOR_TYPE_NULL: ret = WN_SUCCESS; break; case WNET_ENUMERATOR_TYPE_GLOBAL: - if (enumerator->lpNet) - _freeEnumNetResource(enumerator->lpNet); + if (enumerator->lpBuffer) + _freeEnumNetResource(enumerator->lpBuffer); if (enumerator->handle) providerTable->table[enumerator->providerIndex]. closeEnum(enumerator->handle);

8 years, 4 months

[pschweitzer] 72086: [MPR] Set the CONNECT_LOCALDRIVE on successful local redirection To be sent upstream. Patch 5/6 CORE-11757 ROSAPPS-303

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Aug 2 09:57:24 2016 New Revision: 72086 URL: http://svn.reactos.org/svn/reactos?rev=72086&view=rev Log: [MPR] Set the CONNECT_LOCALDRIVE on successful local redirection To be sent upstream. Patch 5/6 CORE-11757 ROSAPPS-303 Modified: trunk/reactos/dll/win32/mpr/wnet.c 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] Tue Aug 2 09:57:24 2016 @@ -1612,6 +1612,8 @@ WCHAR *accessname = ctxt->accessname; if (ctxt->resource->lpLocalName) strcpyW(accessname, ctxt->resource->lpLocalName); + if (ctxt->result) + *ctxt->result = CONNECT_LOCALDRIVE; else strcpyW(accessname, ctxt->resource->lpRemoteName); } @@ -1808,6 +1810,8 @@ char *accessname = ctxt->accessname; if (ctxt->resourceA->lpLocalName) strcpy(accessname, ctxt->resourceA->lpLocalName); + if (ctxt->result) + *ctxt->result = CONNECT_LOCALDRIVE; else strcpy(accessname, ctxt->resourceA->lpRemoteName); }

8 years, 4 months

[pschweitzer] 72085: [MPR] Implement WNetCancelConnectionA(), WNetCancelConnectionW(), WNetCancelConnection2A() Already sent upstream. Patch 4/6 CORE-11757 ROSAPPS-303

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Aug 2 09:54:51 2016 New Revision: 72085 URL: http://svn.reactos.org/svn/reactos?rev=72085&view=rev Log: [MPR] Implement WNetCancelConnectionA(), WNetCancelConnectionW(), WNetCancelConnection2A() Already sent upstream. Patch 4/6 CORE-11757 ROSAPPS-303 Modified: trunk/reactos/dll/win32/mpr/wnet.c 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] Tue Aug 2 09:54:51 2016 @@ -1886,9 +1886,7 @@ */ DWORD WINAPI WNetCancelConnectionA( LPCSTR lpName, BOOL fForce ) { - FIXME( "(%s, %d), stub\n", debugstr_a(lpName), fForce ); - - return WN_SUCCESS; + return WNetCancelConnection2A(lpName, 0, fForce); } /********************************************************************* @@ -1896,9 +1894,7 @@ */ DWORD WINAPI WNetCancelConnectionW( LPCWSTR lpName, BOOL fForce ) { - FIXME( "(%s, %d), stub\n", debugstr_w(lpName), fForce ); - - return WN_SUCCESS; + return WNetCancelConnection2W(lpName, 0, fForce); } /********************************************************************* @@ -1906,9 +1902,15 @@ */ DWORD WINAPI WNetCancelConnection2A( LPCSTR lpName, DWORD dwFlags, BOOL fForce ) { - FIXME( "(%s, %08X, %d), stub\n", debugstr_a(lpName), dwFlags, fForce ); - - return WN_SUCCESS; + DWORD ret; + WCHAR * name = strdupAtoW(lpName); + if (!name) + return ERROR_NOT_CONNECTED; + + ret = WNetCancelConnection2W(name, dwFlags, fForce); + HeapFree(GetProcessHeap(), 0, name); + + return ret; } /*********************************************************************

8 years, 4 months

[pschweitzer] 72084: [MPR] Implement WNetCancelConnection2W() Already sent upstream. Patch 3/6 CORE-11757 ROSAPPS-303

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Aug 2 09:53:54 2016 New Revision: 72084 URL: http://svn.reactos.org/svn/reactos?rev=72084&view=rev Log: [MPR] Implement WNetCancelConnection2W() Already sent upstream. Patch 3/6 CORE-11757 ROSAPPS-303 Modified: trunk/reactos/dll/win32/mpr/wnet.c 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] Tue Aug 2 09:53:54 2016 @@ -48,6 +48,7 @@ PF_NPGetResourceInformation getResourceInformation; PF_NPAddConnection addConnection; PF_NPAddConnection3 addConnection3; + PF_NPCancelConnection cancelConnection; #ifdef __REACTOS__ PF_NPGetConnection getConnection; #endif @@ -199,11 +200,13 @@ } 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); + TRACE("NPCancelConnection %p\n", provider->cancelConnection); providerTable->numProviders++; } else @@ -1913,9 +1916,26 @@ */ DWORD WINAPI WNetCancelConnection2W( LPCWSTR lpName, DWORD dwFlags, BOOL fForce ) { - FIXME( "(%s, %08X, %d), stub\n", debugstr_w(lpName), dwFlags, fForce ); - - return WN_SUCCESS; + DWORD ret = WN_NO_NETWORK; + DWORD index; + + if (providerTable != NULL) + { + for (index = 0; index < providerTable->numProviders; index++) + { + if(providerTable->table[index].getCaps(WNNC_CONNECTION) & + WNNC_CON_GETCONNECTIONS) + { + if (providerTable->table[index].cancelConnection) + ret = providerTable->table[index].cancelConnection((LPWSTR)lpName, fForce); + else + ret = WN_NO_NETWORK; + if (ret == WN_SUCCESS || ret == WN_OPEN_FILES) + break; + } + } + } + return ret; } /*****************************************************************

8 years, 4 months

[pschweitzer] 72083: [MPR] Implement provider automatic selection for WNetUseConnection. That means you don't need anylonger to provider the network provider handling the remote name to establish a...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Aug 2 09:51:09 2016 New Revision: 72083 URL: http://svn.reactos.org/svn/reactos?rev=72083&view=rev Log: [MPR] Implement provider automatic selection for WNetUseConnection. That means you don't need anylonger to provider the network provider handling the remote name to establish a connection to the resource. Already sent upstream. Patch 2/6 CORE-11757 ROSAPPS-303 Modified: trunk/reactos/dll/win32/mpr/wnet.c 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] Tue Aug 2 09:51:09 2016 @@ -1613,11 +1613,52 @@ strcpyW(accessname, ctxt->resource->lpRemoteName); } +static WCHAR * select_provider(struct use_connection_context *ctxt) +{ + DWORD ret, prov_size = 0x1000, len; + LPNETRESOURCEW provider; + WCHAR * system; + + provider = HeapAlloc(GetProcessHeap(), 0, prov_size); + if (!provider) + { + return NULL; + } + + ret = WNetGetResourceInformationW(ctxt->resource, provider, &prov_size, &system); + if (ret == ERROR_MORE_DATA) + { + HeapFree(GetProcessHeap(), 0, provider); + provider = HeapAlloc(GetProcessHeap(), 0, prov_size); + if (!provider) + { + return NULL; + } + + ret = WNetGetResourceInformationW(ctxt->resource, provider, &prov_size, &system); + } + + if (ret != NO_ERROR) + { + HeapFree(GetProcessHeap(), 0, provider); + return NULL; + } + + len = WideCharToMultiByte(CP_ACP, 0, provider->lpProvider, -1, NULL, 0, NULL, NULL); + ctxt->resource->lpProvider = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (ctxt->resource->lpProvider) + memcpy(ctxt->resource->lpProvider, provider->lpProvider, len * sizeof(WCHAR)); + + HeapFree(GetProcessHeap(), 0, provider); + + return ctxt->resource->lpProvider; +} + static DWORD wnet_use_connection( struct use_connection_context *ctxt ) { WNetProvider *provider; DWORD index, ret, caps; - BOOLEAN redirect = FALSE; + BOOLEAN redirect = FALSE, prov = FALSE; WCHAR letter[3] = {'z', ':', 0}; if (!providerTable || providerTable->numProviders == 0) @@ -1643,17 +1684,22 @@ ctxt->resource->lpLocalName = letter; } - if (!ctxt->resource->lpProvider) - { - FIXME("Networking provider selection is not implemented.\n"); - ret = WN_NO_NETWORK; - goto done; - } - if (ctxt->flags & CONNECT_INTERACTIVE) { ret = ERROR_BAD_NET_NAME; goto done; + } + + if (!ctxt->resource->lpProvider) + { + ctxt->resource->lpProvider = select_provider(ctxt); + if (!ctxt->resource->lpProvider) + { + ret = ERROR_NO_NET_OR_BAD_PATH; + goto done; + } + + prov = TRUE; } index = _findProviderIndexW(ctxt->resource->lpProvider); @@ -1692,6 +1738,12 @@ ctxt->set_accessname(ctxt); done: + if (prov) + { + HeapFree(GetProcessHeap(), 0, ctxt->resource->lpProvider); + ctxt->resource->lpProvider = NULL; + } + if (redirect) ctxt->resource->lpLocalName = NULL;

8 years, 4 months

[pschweitzer] 72082: [MPR] Time to react (again!). Implement automatic local name redirection for new connection. This implements the behavior of the CONNECT_REDIRECT flag of WNetUseConnection. Alr...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Aug 2 09:49:20 2016 New Revision: 72082 URL: http://svn.reactos.org/svn/reactos?rev=72082&view=rev Log: [MPR] Time to react (again!). Implement automatic local name redirection for new connection. This implements the behavior of the CONNECT_REDIRECT flag of WNetUseConnection. Already sent upstream. Patch 1/6 CORE-11757 ROSAPPS-303 Modified: trunk/reactos/dll/win32/mpr/wnet.c 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] Tue Aug 2 09:49:20 2016 @@ -1617,6 +1617,8 @@ { WNetProvider *provider; DWORD index, ret, caps; + BOOLEAN redirect = FALSE; + WCHAR letter[3] = {'z', ':', 0}; if (!providerTable || providerTable->numProviders == 0) return WN_NO_NETWORK; @@ -1624,41 +1626,74 @@ if (!ctxt->resource) return ERROR_INVALID_PARAMETER; + if (!ctxt->resource->lpLocalName && (ctxt->flags & CONNECT_REDIRECT)) + { + if (ctxt->resource->dwType != RESOURCETYPE_DISK && ctxt->resource->dwType != RESOURCETYPE_PRINT) + { + return ERROR_BAD_DEV_TYPE; + } + + if (ctxt->resource->dwType == RESOURCETYPE_PRINT) + { + FIXME("Locale device selection is not implemented for printers.\n"); + return WN_NO_NETWORK; + } + + redirect = TRUE; + ctxt->resource->lpLocalName = letter; + } + if (!ctxt->resource->lpProvider) { FIXME("Networking provider selection is not implemented.\n"); - return WN_NO_NETWORK; - } - - if (!ctxt->resource->lpLocalName && (ctxt->flags & CONNECT_REDIRECT)) - { - FIXME("Locale device selection is not implemented.\n"); - return WN_NO_NETWORK; + ret = WN_NO_NETWORK; + goto done; } if (ctxt->flags & CONNECT_INTERACTIVE) - return ERROR_BAD_NET_NAME; + { + ret = ERROR_BAD_NET_NAME; + goto done; + } index = _findProviderIndexW(ctxt->resource->lpProvider); if (index == BAD_PROVIDER_INDEX) - return ERROR_BAD_PROVIDER; + { + ret = ERROR_BAD_PROVIDER; + goto done; + } provider = &providerTable->table[index]; caps = provider->getCaps(WNNC_CONNECTION); if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) - return ERROR_BAD_PROVIDER; + { + ret = ERROR_BAD_PROVIDER; + goto done; + } if ((ret = ctxt->pre_set_accessname(ctxt))) - return ret; + { + goto done; + } ret = WN_ACCESS_DENIED; - if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) - ret = provider->addConnection3(ctxt->hwndOwner, ctxt->resource, ctxt->password, ctxt->userid, ctxt->flags); - else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) - ret = provider->addConnection(ctxt->resource, ctxt->password, ctxt->userid); + do + { + if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) + ret = provider->addConnection3(ctxt->hwndOwner, ctxt->resource, ctxt->password, ctxt->userid, ctxt->flags); + else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) + ret = provider->addConnection(ctxt->resource, ctxt->password, ctxt->userid); + + if (redirect) + letter[0] -= 1; + } while (redirect && ret == WN_ALREADY_CONNECTED && letter[0] >= 'c'); if (ret == WN_SUCCESS && ctxt->accessname) ctxt->set_accessname(ctxt); + +done: + if (redirect) + ctxt->resource->lpLocalName = NULL; return ret; }

8 years, 4 months

[akhaldi] 72081: [TRANSLATIONS] Russian translation update by Sergey Stopkin and co, with some fixes by me. CORE-11752

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Aug 2 09:16:16 2016 New Revision: 72081 URL: http://svn.reactos.org/svn/reactos?rev=72081&view=rev Log: [TRANSLATIONS] Russian translation update by Sergey Stopkin and co, with some fixes by me. CORE-11752 Added: trunk/reactos/base/applications/clipbrd/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/charmap/lang/ru-RU.rc trunk/reactos/base/applications/clipbrd/clipbrd.rc trunk/reactos/base/applications/cmdutils/clip/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/taskkill/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc trunk/reactos/base/applications/games/spider/lang/ru-RU.rc trunk/reactos/base/applications/magnify/lang/ru-RU.rc trunk/reactos/base/applications/mmc/lang/ru-RU.rc trunk/reactos/base/applications/mplay32/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/mstsc/lang/ru-RU.rc trunk/reactos/base/applications/network/ping/lang/ru-RU.rc trunk/reactos/base/applications/network/telnet/lang/ru-RU.rc trunk/reactos/base/applications/osk/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc trunk/reactos/base/applications/winhlp32/lang/Ru.rc trunk/reactos/base/applications/wordpad/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/system/diskpart/lang/ru-RU.rc trunk/reactos/base/system/subst/lang/ru-RU.rc trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/wined3dcfg/lang/ru-RU.rc trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Ru.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Ru.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msi/msi_Ru.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc trunk/reactos/dll/win32/shdoclc/lang/Ru.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/clipbrd/clipbrd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Added: trunk/reactos/base/applications/clipbrd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Modified: trunk/reactos/base/applications/cmdutils/clip/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/taskkill/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/games/spider/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/magnify/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mmc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/network/ping/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/telnet/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/osk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/winhlp32/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/wordpad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… Modified: trunk/reactos/base/system/diskpart/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… Modified: trunk/reactos/base/system/subst/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/ru-… Modified: trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/r… Modified: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/ru… Modified: trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… Modified: trunk/reactos/dll/win32/msi/msi_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Ru.rc?re… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/shdoclc/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/lang/Ru.… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-…

8 years, 4 months

[jimtabor] 72080: [NtUser] - Fix crash while mouse cursor is moving over stress test window (RegEdit). This fixes VLC too. Tested SeaMonkey and it did not crash. See CORE-9169 and CORE-9836.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Aug 2 04:05:16 2016 New Revision: 72080 URL: http://svn.reactos.org/svn/reactos?rev=72080&view=rev Log: [NtUser] - Fix crash while mouse cursor is moving over stress test window (RegEdit). This fixes VLC too. Tested SeaMonkey and it did not crash. See CORE-9169 and CORE-9836. Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c trunk/reactos/win32ss/user/ntuser/cursoricon.h trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Tue Aug 2 04:05:16 2016 @@ -224,6 +224,15 @@ ASSERT(CurIcon->head.cLockObj >= 1); return CurIcon; +} + +PCURICON_OBJECT +IntSystemSetCursor(PCURICON_OBJECT pcurNew) +{ + PCURICON_OBJECT pcurOld = UserSetCursor(pcurNew, FALSE); + UserReferenceObject(pcurNew); + if (pcurOld) UserDereferenceObject(pcurOld); + return pcurOld; } BOOL UserSetCursorPos( INT x, INT y, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook) @@ -1062,9 +1071,12 @@ } pcurOld = UserSetCursor(pcurNew, FALSE); - if (pcurOld) - { - hOldCursor = pcurOld->head.h; + + // If returning an old cursor than validate it, Justin Case! + if ( pcurOld && + (pcurOld = UserGetObjectNoErr(gHandleTable, UserHMGetHandle(pcurOld), TYPE_CURSOR))) + { + hOldCursor = UserHMGetHandle(pcurOld); /* Problem: @@ -1078,12 +1090,12 @@ { TRACE("Returning Global Cursor hcur %p\n",hOldCursor); - if (pcurOld->head.cLockObj > 2) // Throttle down to 2. + /*if (pcurOld->head.cLockObj > 2) // Throttle down to 2. { UserDereferenceObject(pcurOld); } - goto leave; + goto leave;*/ } /* See if it was destroyed in the meantime */ Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.h [iso-8859-1] Tue Aug 2 04:05:16 2016 @@ -140,8 +140,6 @@ BOOL UserSetCursorPos( INT x, INT y, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook); BOOL APIENTRY UserClipCursor(RECTL *prcl); PSYSTEM_CURSORINFO IntGetSysCursorInfo(VOID); - -#define IntReleaseCurIconObject(CurIconObj) \ - UserDereferenceObject(CurIconObj) +PCURICON_OBJECT IntSystemSetCursor(PCURICON_OBJECT); /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Tue Aug 2 04:05:16 2016 @@ -307,7 +307,7 @@ { if (pWnd->pcls->spcur) { - UserSetCursor(pWnd->pcls->spcur, FALSE); + IntSystemSetCursor(pWnd->pcls->spcur); } return FALSE; } @@ -319,7 +319,7 @@ { break; } - UserSetCursor(SYSTEMCUR(SIZEWE), FALSE); + IntSystemSetCursor(SYSTEMCUR(SIZEWE)); return TRUE; } @@ -330,7 +330,7 @@ { break; } - UserSetCursor(SYSTEMCUR(SIZENS), FALSE); + IntSystemSetCursor(SYSTEMCUR(SIZENS)); return TRUE; } @@ -341,7 +341,7 @@ { break; } - UserSetCursor(SYSTEMCUR(SIZENWSE), FALSE); + IntSystemSetCursor(SYSTEMCUR(SIZENWSE)); return TRUE; } @@ -352,11 +352,11 @@ { break; } - UserSetCursor(SYSTEMCUR(SIZENESW), FALSE); + IntSystemSetCursor(SYSTEMCUR(SIZENESW)); return TRUE; } } - UserSetCursor(SYSTEMCUR(ARROW), FALSE); + IntSystemSetCursor(SYSTEMCUR(ARROW)); return FALSE; } Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Tue Aug 2 04:05:16 2016 @@ -1516,7 +1516,7 @@ if (pwndMsg == NULL || pwndMsg->head.pti->MessageQueue != MessageQueue) { // Crossing a boundary, so set cursor. See default message queue cursor. - UserSetCursor(SYSTEMCUR(ARROW), FALSE); + IntSystemSetCursor(SYSTEMCUR(ARROW)); /* Remove and ignore the message */ *RemoveMessages = TRUE; return FALSE;

8 years, 4 months

[hbelusca] 72079: [EVENTVWR] - Reorganize the header inclusions; add a PCH. - Transform the event details dialog into a control that can be embedded: * in a resizable dialog, * or in a pane below t...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Aug 1 23:29:55 2016 New Revision: 72079 URL: http://svn.reactos.org/svn/reactos?rev=72079&view=rev Log: [EVENTVWR] - Reorganize the header inclusions; add a PCH. - Transform the event details dialog into a control that can be embedded: * in a resizable dialog, * or in a pane below the window listing the events. CORE-11637 Added: trunk/reactos/base/applications/mscutils/eventvwr/evtdetctl.c (with props) trunk/reactos/base/applications/mscutils/eventvwr/evtdetctl.h (with props) Modified: trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.h trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/evtdetctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/evtdetctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…

8 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2016