Ros-diffs February 2016

ros-diffs@reactos.org

10 participants
155 discussions

[hbelusca] 70674: [CMLIB]: Demote the DPRINT1 saying that we leak the security block descriptor to a DPRINT. People (Alex & me) working on cmlib already know this. "Fixes" timeout problems of the t...
by hbelusca＠svn.reactos.org 01 Feb '16

01 Feb '16

Author: hbelusca Date: Mon Feb 1 23:10:38 2016 New Revision: 70674 URL: http://svn.reactos.org/svn/reactos?rev=70674&view=rev Log: [CMLIB]: Demote the DPRINT1 saying that we leak the security block descriptor to a DPRINT. People (Alex & me) working on cmlib already know this. "Fixes" timeout problems of the testbots due to spamming this dprint. Modified: trunk/reactos/lib/cmlib/cmkeydel.c Modified: trunk/reactos/lib/cmlib/cmkeydel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmkeydel.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/cmkeydel.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmkeydel.c [iso-8859-1] Mon Feb 1 23:10:38 2016 @@ -215,7 +215,7 @@ } /* FIXME: This leaks the security desriptor! */ - DPRINT1("Potentially leaking key security descriptor. Please call CmpFreeSecurityDescriptor\n"); + DPRINT("Potentially leaking key security descriptor. Please call CmpFreeSecurityDescriptor\n"); /* Free the key body itself, and then return our status */ if (!CmpFreeKeyBody(Hive, Cell)) return STATUS_INSUFFICIENT_RESOURCES;

1 0

[pschweitzer] 70673: [BOOTDATA] Drop last references to rosvboxmgmt! CORE-10032 ROSAPPS-303
by pschweitzer＠svn.reactos.org 01 Feb '16

01 Feb '16

Author: pschweitzer Date: Mon Feb 1 22:18:47 2016 New Revision: 70673 URL: http://svn.reactos.org/svn/reactos?rev=70673&view=rev Log: [BOOTDATA] Drop last references to rosvboxmgmt! CORE-10032 ROSAPPS-303 Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Mon Feb 1 22:18:47 2016 @@ -140,10 +140,6 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","",0x00000000,"cmd /c md ""%programfiles%\Internet Explorer\"" && move %windir%\iexplore.exe ""%programfiles%\Internet Explorer\"" && ""%programfiles%\Internet Explorer\iexplore.exe"" /RegServer" ; Create .NET Framework InstallRoot key, reg_sz & full path HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","InstallRoot.NET",0x00000000,"cmd /c reg add HKLM\SOFTWARE\Microsoft\.NETFramework /v InstallRoot /t REG_SZ /d %SystemRoot%\Microsoft.NET\Framework\" - -; HACK - Start rosvboxmgmt - ROSAPPS-303 -;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","Handle VBox SF",0x00000000,"%windir%\bin\rosvboxmgmt autolink" -;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","Handle VBox SF",0x00000000,"%windir%\bin\rosvboxmgmt autoassign" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu",,0x00000012

1 0

[pschweitzer] 70672: [ROSVBOXMGMT] Drop rosvboxmgmt hack. Thanks, you served us well. But r70670 killed you. Too bad! CORE-10032 ROSAPPS-303
by pschweitzer＠svn.reactos.org 01 Feb '16

01 Feb '16

Author: pschweitzer Date: Mon Feb 1 22:17:43 2016 New Revision: 70672 URL: http://svn.reactos.org/svn/reactos?rev=70672&view=rev Log: [ROSVBOXMGMT] Drop rosvboxmgmt hack. Thanks, you served us well. But r70670 killed you. Too bad! CORE-10032 ROSAPPS-303 Removed: trunk/rosapps/applications/cmdutils/rosvboxmgmt/ Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMak… ============================================================================== --- trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] Mon Feb 1 22:17:43 2016 @@ -3,7 +3,6 @@ add_subdirectory(cat) add_subdirectory(hackssign) add_subdirectory(ntfsinfo) -add_subdirectory(rosvboxmgmt) add_subdirectory(tee) add_subdirectory(touch) add_subdirectory(uptime)

1 0

[pschweitzer] 70671: [SHELL32] Time to (re)act! Step 2/2: continue Giannis' UNC hack in Shell32: - Implement the ILCreateFromNetworkPlaceW() helper, which is just Giannis' code to allow creating a ...
by pschweitzer＠svn.reactos.org 01 Feb '16

01 Feb '16

Author: pschweitzer Date: Mon Feb 1 22:07:55 2016 New Revision: 70671 URL: http://svn.reactos.org/svn/reactos?rev=70671&view=rev Log: [SHELL32] Time to (re)act! Step 2/2: continue Giannis' UNC hack in Shell32: - Implement the ILCreateFromNetworkPlaceW() helper, which is just Giannis' code to allow creating a hacky PIDL for enumeration. - Implement the CNetFolderEnum class, which allows enumerating network places. So far, it's pretty basic (no tree structure) but, it does its job. It would be to improve - Implement the CNetFolder::EnumObjects() function. This commit, in itself, more or less obsoletes hackssign application. Indeed, now, you just need to go to your network places, to be able to browse your network shares (like VMware or VBox shares) provided you installed the VMware/VBox additions in your VM. However, hackssign will remains in rosapps for now: we don't have any other way to assign a drive letter to a network place so far, and VMware doesn't provide such feature. Furthermore, this is a big hack. And until we have a correct implementation, we can keep another hack along ;-). Feel free to decently enjoy your network shares in ReactOS :-). CORE-10032 ROSAPPS-303 Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp trunk/reactos/dll/win32/shell32/precomp.h Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Mon Feb 1 22:07:55 2016 @@ -84,6 +84,6 @@ set_module_type(shell32 win32dll UNICODE) target_link_libraries(shell32 shellmenu shelldesktop atlnew wine uuid recyclebin) add_delay_importlibs(shell32 uxtheme ole32 userenv version fmifs) -add_importlibs(shell32 advapi32 browseui gdi32 user32 powrprof comctl32 comdlg32 shdocvw shlwapi devmgr winspool winmm msvcrt kernel32 ntdll) +add_importlibs(shell32 advapi32 browseui gdi32 user32 powrprof comctl32 comdlg32 shdocvw shlwapi devmgr winspool winmm msvcrt kernel32 ntdll mpr) add_pch(shell32 precomp.h SOURCE) add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Mon Feb 1 22:07:55 2016 @@ -27,9 +27,40 @@ #define HACKY_UNC_PATHS +#ifdef HACKY_UNC_PATHS +LPITEMIDLIST ILCreateFromNetworkPlaceW(LPCWSTR lpNetworkPlace) +{ + int cbData = sizeof(WORD) + sizeof(WCHAR) * (wcslen(lpNetworkPlace)+1); + LPITEMIDLIST pidl = (LPITEMIDLIST)SHAlloc(cbData + sizeof(WORD)); + if (!pidl) + return NULL; + + pidl->mkid.cb = cbData; + wcscpy((WCHAR*)&pidl->mkid.abID[0], lpNetworkPlace); + *(WORD*)((char*)pidl + cbData) = 0; + + return pidl; +} +#endif + /*********************************************************************** * IShellFolder implementation */ + +class CNetFolderEnum : + public CEnumIDListBase +{ + public: + CNetFolderEnum(); + ~CNetFolderEnum(); + HRESULT WINAPI Initialize(HWND hwndOwner, DWORD dwFlags); + BOOL CreateMyCompEnumList(DWORD dwFlags); + BOOL EnumerateRec(LPNETRESOURCE lpNet); + + BEGIN_COM_MAP(CNetFolderEnum) + COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList) + END_COM_MAP() +}; static shvheader NetworkPlacesSFHeader[] = { {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, @@ -45,6 +76,119 @@ #define NETWORKPLACESSHELLVIEWCOLUMNS 4 +CNetFolderEnum::CNetFolderEnum() +{ +} + +CNetFolderEnum::~CNetFolderEnum() +{ +} + +HRESULT WINAPI CNetFolderEnum::Initialize(HWND hwndOwner, DWORD dwFlags) +{ + if (CreateMyCompEnumList(dwFlags) == FALSE) + return E_FAIL; + + return S_OK; +} + +/************************************************************************** + * CDrivesFolderEnum::CreateMyCompEnumList() + */ + +BOOL CNetFolderEnum::EnumerateRec(LPNETRESOURCE lpNet) +{ + BOOL bRet = TRUE; + DWORD dRet; + HANDLE hEnum; + LPNETRESOURCE lpRes; + DWORD dSize = 0x1000; + DWORD dCount = -1; + LPNETRESOURCE lpCur; + + dRet = WNetOpenEnum(RESOURCE_GLOBALNET, RESOURCETYPE_DISK, 0, lpNet, &hEnum); + if (dRet != WN_SUCCESS) + { + ERR("WNetOpenEnum() failed: %x\n", dRet); + return FALSE; + } + + lpRes = (LPNETRESOURCE)CoTaskMemAlloc(dSize); + if (!lpRes) + { + ERR("CoTaskMemAlloc() failed\n"); + WNetCloseEnum(hEnum); + return FALSE; + } + + 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--) + { + TRACE("lpRemoteName: %S\n", lpCur->lpRemoteName); + + if ((lpCur->dwUsage & RESOURCEUSAGE_CONTAINER) == RESOURCEUSAGE_CONTAINER) + { + TRACE("Found provider: %S\n", lpCur->lpProvider); + /* Sounds like a WTF hack.... Is Wine doing correct? */ + if (!wcscmp(lpCur->lpRemoteName, lpCur->lpProvider)) + { + lpCur->lpRemoteName = NULL; + } + EnumerateRec(lpCur); + } + else + { + LPITEMIDLIST pidl; + +#ifdef HACKY_UNC_PATHS + pidl = ILCreateFromNetworkPlaceW(lpCur->lpRemoteName); +#endif + if (pidl != NULL) + bRet = AddToEnumList(pidl); + else + { + ERR("ILCreateFromPathW() failed\n"); + bRet = FALSE; + break; + } + } + + lpCur++; + } + } + } while (dRet != WN_NO_MORE_ENTRIES); + + WNetCloseEnum(hEnum); + + TRACE("Done: %u\n", bRet); + + return bRet; +} + +BOOL CNetFolderEnum::CreateMyCompEnumList(DWORD dwFlags) +{ + BOOL bRet = TRUE; + + TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); + + /* enumerate the folders */ + if (dwFlags & SHCONTF_FOLDERS) + { + bRet = EnumerateRec(NULL); + } + + return bRet; +} + CNetFolder::CNetFolder() { pidlRoot = NULL; @@ -78,17 +222,13 @@ DWORD attrs = GetFileAttributes(lpszDisplayName); if ((attrs & FILE_ATTRIBUTE_DIRECTORY)) { + if (pchEaten) + *pchEaten = 0; /* strange but like the original */ + /* YES WE CAN */ /* Create our hacky pidl */ - int cbData = sizeof(WORD) + sizeof(WCHAR) * (wcslen(lpszDisplayName)+1); - LPITEMIDLIST pidl = (LPITEMIDLIST)SHAlloc(cbData + sizeof(WORD)); - if (!pidl) - return NULL; - - pidl->mkid.cb = cbData; - wcscpy((WCHAR*)&pidl->mkid.abID[0], lpszDisplayName); - *(WORD*)((char*)pidl + cbData) = 0; + LPITEMIDLIST pidl = ILCreateFromNetworkPlaceW(lpszDisplayName); *ppidl = pidl; if (pdwAttributes) @@ -115,14 +255,7 @@ */ HRESULT WINAPI CNetFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { - TRACE("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", this, - hwndOwner, dwFlags, ppEnumIDList); - - *ppEnumIDList = NULL; //IEnumIDList_Constructor(); - - TRACE("-- (%p)->(new ID List: %p)\n", this, *ppEnumIDList); - return S_FALSE; - // return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; + return ShellObjectCreatorInit<CNetFolderEnum>(hwndOwner, dwFlags, IID_IEnumIDList, ppEnumIDList); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Mon Feb 1 22:07:55 2016 @@ -29,6 +29,7 @@ #include <atlcom.h> #include <atlwin.h> #include <powrprof.h> +#include <winnetwk.h> #include <comctl32_undoc.h> #include <shlguid_undoc.h>

1 0

[pschweitzer] 70670: [MPR] Time to (re)act! Step 1/2: - Implement WNetUseConnectionA() as a simple forwarder to WNetUseConnectionW(). This function should make it somehow, somewhen to Wine. Feel fr...
by pschweitzer＠svn.reactos.org 01 Feb '16

01 Feb '16

Author: pschweitzer Date: Mon Feb 1 21:59:47 2016 New Revision: 70670 URL: http://svn.reactos.org/svn/reactos?rev=70670&view=rev Log: [MPR] Time to (re)act! Step 1/2: - Implement WNetUseConnectionA() as a simple forwarder to WNetUseConnectionW(). This function should make it somehow, somewhen to Wine. Feel free to help the process by lighting cierges. - Halplement WNetUseConnectionW() to match a really specific case: it can handle requests from VBoxTray and pass them properly to VBox NP. In its current state, this function isn't to be shared with Wine. Other calls (specifically without local path, nor network provider) aren't handled and will lead to an error. But, in itself, this commit obsoletes rosvboxmgmt by making ReactOS able to autostart (on VBoxTray demand :-)) the VBox shared folders. Furthermore, if you ask for a drive letter to be assigned to your shared folder, it will happen! Now, in order to use VBox shared folders, just configure VBox to assign them a drive letter, install ReactOS, install VBox Guest Additions... Profit! CORE-10032 ROSAPPS-303 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 Feb 1 21:59:47 2016 @@ -45,3 +45,195 @@ 22 stdcall @(long) MPR_Alloc 23 stdcall @(ptr long) MPR_ReAlloc 24 stdcall @(ptr) MPR_Free +Index: wnet.c +=================================================================== +--- wnet.c (rÃ©vision 70645) ++++ wnet.c (copie de travail) +@@ -1549,6 +1549,33 @@ + dwFlags, NULL, 0, NULL); + } + ++/* Convert an ANSI string to wide */ ++static LPWSTR strdupAtoW( LPCSTR str ) ++{ ++ LPWSTR ret; ++ INT len; ++ ++ if (!str) return NULL; ++ len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); ++ ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); ++ if (ret) MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); ++ return ret; ++} ++ ++/* Convert ANSI NETRESOURCE struct to wide structure */ ++static VOID convert_netresourcea_to_w( LPNETRESOURCEA lpNetResourceA, ++ LPNETRESOURCEW lpNetResourceW ) ++{ ++ lpNetResourceW->dwScope = lpNetResourceA->dwScope; ++ lpNetResourceW->dwType = lpNetResourceA->dwType; ++ lpNetResourceW->dwDisplayType = lpNetResourceA->dwDisplayType; ++ lpNetResourceW->dwUsage = lpNetResourceA->dwUsage; ++ lpNetResourceW->lpLocalName = strdupAtoW(lpNetResourceA->lpLocalName); ++ lpNetResourceW->lpRemoteName = strdupAtoW(lpNetResourceA->lpRemoteName); ++ lpNetResourceW->lpComment = strdupAtoW(lpNetResourceA->lpComment); ++ lpNetResourceW->lpProvider = strdupAtoW(lpNetResourceA->lpProvider); ++} ++ + /***************************************************************** + * WNetUseConnectionA [MPR.@] + */ +@@ -1557,12 +1584,67 @@ + LPSTR lpAccessName, LPDWORD lpBufferSize, + LPDWORD lpResult ) + { +- FIXME( "(%p, %p, %p, %s, 0x%08X, %s, %p, %p), stub\n", +- hwndOwner, lpNetResource, lpPassword, debugstr_a(lpUserID), dwFlags, +- debugstr_a(lpAccessName), lpBufferSize, lpResult ); ++ NETRESOURCEW resourcesW, *pRes = NULL; ++ PWSTR passW, userIDW, accessNameW = NULL; ++ DWORD ret = WN_MORE_DATA; ++ DWORD bufferSize = 1; ++ int len; + +- SetLastError(WN_NO_NETWORK); +- return WN_NO_NETWORK; ++ if (lpNetResource) ++ { ++ convert_netresourcea_to_w(lpNetResource, &resourcesW); ++ pRes = &resourcesW; ++ } ++ ++ passW = strdupAtoW(lpPassword); ++ userIDW = strdupAtoW(lpUserID); ++ ++ if (lpAccessName && lpBufferSize && *lpBufferSize) ++ { ++ WCHAR probe; ++ ++ ret = WNetUseConnectionW(hwndOwner, pRes, passW, userIDW, dwFlags, ++ &probe, &bufferSize, lpResult); ++ if (ret == WN_MORE_DATA) ++ accessNameW = HeapAlloc(GetProcessHeap(), 0, bufferSize * sizeof(WCHAR)); ++ } ++ ++ if (ret == WN_MORE_DATA) ++ { ++ ret = WNetUseConnectionW(hwndOwner, pRes, passW, userIDW, dwFlags, ++ accessNameW, &bufferSize, lpResult); ++ if (ret == WN_SUCCESS) ++ { ++ if (lpAccessName && lpBufferSize && *lpBufferSize && accessNameW) ++ { ++ len = WideCharToMultiByte(CP_ACP, 0, accessNameW, -1, NULL, 0, NULL, NULL); ++ if (len) ++ { ++ if (len <= *lpBufferSize) ++ WideCharToMultiByte(CP_ACP, 0, accessNameW, -1, lpAccessName, len, NULL, NULL); ++ else ++ { ++ WNetCancelConnectionW(accessNameW, TRUE); ++ *lpBufferSize = len; ++ ret = WN_MORE_DATA; ++ } ++ } ++ } ++ } ++ } ++ ++ if (lpNetResource) ++ { ++ HeapFree(GetProcessHeap(), 0, resourcesW.lpLocalName); ++ HeapFree(GetProcessHeap(), 0, resourcesW.lpRemoteName); ++ HeapFree(GetProcessHeap(), 0, resourcesW.lpComment); ++ HeapFree(GetProcessHeap(), 0, resourcesW.lpProvider); ++ } ++ HeapFree(GetProcessHeap(), 0, passW); ++ HeapFree(GetProcessHeap(), 0, userIDW); ++ HeapFree(GetProcessHeap(), 0, accessNameW); ++ ++ return ret; + } + + /***************************************************************** +@@ -1573,12 +1655,75 @@ + LPWSTR lpAccessName, LPDWORD lpBufferSize, + LPDWORD lpResult ) + { +- FIXME( "(%p, %p, %p, %s, 0x%08X, %s, %p, %p), stub\n", +- hwndOwner, lpNetResource, lpPassword, debugstr_w(lpUserID), dwFlags, +- debugstr_w(lpAccessName), lpBufferSize, lpResult ); ++ DWORD provider; ++ DWORD cap; ++ char id; ++ DWORD drives; ++ DWORD ret; ++ PF_NPAddConnection3 addConn3; ++ PF_NPAddConnection addConn; + +- SetLastError(WN_NO_NETWORK); +- return WN_NO_NETWORK; ++ if (!providerTable || providerTable->numProviders == 0) { ++ SetLastError(WN_NO_NETWORK); ++ return WN_NO_NETWORK; ++ } ++ ++ if (!lpNetResource) { ++ SetLastError(ERROR_INVALID_PARAMETER); ++ return ERROR_INVALID_PARAMETER; ++ } ++ ++ if (!lpNetResource->lpProvider || !*lpNetResource->lpProvider) { ++ SetLastError(ERROR_BAD_PROVIDER); ++ return ERROR_BAD_PROVIDER; ++ } ++ ++ if (!lpNetResource->lpLocalName || !*lpNetResource->lpLocalName) { ++ SetLastError(ERROR_BAD_DEVICE); ++ return ERROR_BAD_DEVICE; ++ } ++ ++ if ((!(lpNetResource->lpLocalName[0] >= 'a' && lpNetResource->lpLocalName[0] <= 'z') && ++ !(lpNetResource->lpLocalName[0] >= 'A' && lpNetResource->lpLocalName[0] <= 'Z')) || ++ lpNetResource->lpLocalName[1] != ':' || lpNetResource->lpLocalName[2]) { ++ SetLastError(ERROR_BAD_DEVICE); ++ return ERROR_BAD_DEVICE; ++ } ++ ++ id = (lpNetResource->lpLocalName[0] >= 'a') ? lpNetResource->lpLocalName[0] - 'a' : lpNetResource->lpLocalName[0] - 'A'; ++ drives = GetLogicalDrives(); ++ if (drives & (1 << id)) { ++ SetLastError(ERROR_ALREADY_ASSIGNED); ++ return ERROR_ALREADY_ASSIGNED; ++ } ++ ++ provider = _findProviderIndexW(lpNetResource->lpProvider); ++ if (provider == BAD_PROVIDER_INDEX) { ++ SetLastError(ERROR_BAD_PROVIDER); ++ return ERROR_BAD_PROVIDER; ++ } ++ ++ cap = providerTable->table[provider].getCaps(WNNC_CONNECTION); ++ if (!(cap & WNNC_CON_ADDCONNECTION) && !(cap & WNNC_CON_ADDCONNECTION3)) { ++ SetLastError(ERROR_BAD_PROVIDER); ++ return ERROR_BAD_PROVIDER; ++ } ++ ++ ret = WN_ACCESS_DENIED; ++ if (cap & WNNC_CON_ADDCONNECTION3) { ++ addConn3 = (PF_NPAddConnection3)GetProcAddress(providerTable->table[provider].hLib, "NPAddConnection3"); ++ if (addConn3) { ++ ret = addConn3(hwndOwner, lpNetResource, (LPWSTR)lpPassword, (LPWSTR)lpUserID, dwFlags); ++ } ++ } ++ else if (cap & WNNC_CON_ADDCONNECTION) { ++ addConn = (PF_NPAddConnection)GetProcAddress(providerTable->table[provider].hLib, "NPAddConnection"); ++ if (addConn) { ++ ret = addConn(lpNetResource, (LPWSTR)lpPassword, (LPWSTR)lpUserID); ++ } ++ } ++ ++ 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 Feb 1 21:59:47 2016 @@ -1549,6 +1549,33 @@ dwFlags, NULL, 0, NULL); } +/* Convert an ANSI string to wide */ +static LPWSTR strdupAtoW( LPCSTR str ) +{ + LPWSTR ret; + INT len; + + if (!str) return NULL; + len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + if (ret) MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); + return ret; +} + +/* Convert ANSI NETRESOURCE struct to wide structure */ +static VOID convert_netresourcea_to_w( LPNETRESOURCEA lpNetResourceA, + LPNETRESOURCEW lpNetResourceW ) +{ + lpNetResourceW->dwScope = lpNetResourceA->dwScope; + lpNetResourceW->dwType = lpNetResourceA->dwType; + lpNetResourceW->dwDisplayType = lpNetResourceA->dwDisplayType; + lpNetResourceW->dwUsage = lpNetResourceA->dwUsage; + lpNetResourceW->lpLocalName = strdupAtoW(lpNetResourceA->lpLocalName); + lpNetResourceW->lpRemoteName = strdupAtoW(lpNetResourceA->lpRemoteName); + lpNetResourceW->lpComment = strdupAtoW(lpNetResourceA->lpComment); + lpNetResourceW->lpProvider = strdupAtoW(lpNetResourceA->lpProvider); +} + /***************************************************************** * WNetUseConnectionA [MPR.@] */ @@ -1557,12 +1584,67 @@ LPSTR lpAccessName, LPDWORD lpBufferSize, LPDWORD lpResult ) { - FIXME( "(%p, %p, %p, %s, 0x%08X, %s, %p, %p), stub\n", - hwndOwner, lpNetResource, lpPassword, debugstr_a(lpUserID), dwFlags, - debugstr_a(lpAccessName), lpBufferSize, lpResult ); - - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + NETRESOURCEW resourcesW, *pRes = NULL; + PWSTR passW, userIDW, accessNameW = NULL; + DWORD ret = WN_MORE_DATA; + DWORD bufferSize = 1; + int len; + + if (lpNetResource) + { + convert_netresourcea_to_w(lpNetResource, &resourcesW); + pRes = &resourcesW; + } + + passW = strdupAtoW(lpPassword); + userIDW = strdupAtoW(lpUserID); + + if (lpAccessName && lpBufferSize && *lpBufferSize) + { + WCHAR probe; + + ret = WNetUseConnectionW(hwndOwner, pRes, passW, userIDW, dwFlags, + &probe, &bufferSize, lpResult); + if (ret == WN_MORE_DATA) + accessNameW = HeapAlloc(GetProcessHeap(), 0, bufferSize * sizeof(WCHAR)); + } + + if (ret == WN_MORE_DATA) + { + ret = WNetUseConnectionW(hwndOwner, pRes, passW, userIDW, dwFlags, + accessNameW, &bufferSize, lpResult); + if (ret == WN_SUCCESS) + { + if (lpAccessName && lpBufferSize && *lpBufferSize && accessNameW) + { + len = WideCharToMultiByte(CP_ACP, 0, accessNameW, -1, NULL, 0, NULL, NULL); + if (len) + { + if (len <= *lpBufferSize) + WideCharToMultiByte(CP_ACP, 0, accessNameW, -1, lpAccessName, len, NULL, NULL); + else + { + WNetCancelConnectionW(accessNameW, TRUE); + *lpBufferSize = len; + ret = WN_MORE_DATA; + } + } + } + } + } + + if (lpNetResource) + { + HeapFree(GetProcessHeap(), 0, resourcesW.lpLocalName); + HeapFree(GetProcessHeap(), 0, resourcesW.lpRemoteName); + HeapFree(GetProcessHeap(), 0, resourcesW.lpComment); + HeapFree(GetProcessHeap(), 0, resourcesW.lpProvider); + } + HeapFree(GetProcessHeap(), 0, passW); + HeapFree(GetProcessHeap(), 0, userIDW); + HeapFree(GetProcessHeap(), 0, accessNameW); + + return ret; } /***************************************************************** @@ -1573,12 +1655,75 @@ LPWSTR lpAccessName, LPDWORD lpBufferSize, LPDWORD lpResult ) { - FIXME( "(%p, %p, %p, %s, 0x%08X, %s, %p, %p), stub\n", - hwndOwner, lpNetResource, lpPassword, debugstr_w(lpUserID), dwFlags, - debugstr_w(lpAccessName), lpBufferSize, lpResult ); - - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + DWORD provider; + DWORD cap; + char id; + DWORD drives; + DWORD ret; + PF_NPAddConnection3 addConn3; + PF_NPAddConnection addConn; + + if (!providerTable || providerTable->numProviders == 0) { + SetLastError(WN_NO_NETWORK); + return WN_NO_NETWORK; + } + + if (!lpNetResource) { + SetLastError(ERROR_INVALID_PARAMETER); + return ERROR_INVALID_PARAMETER; + } + + if (!lpNetResource->lpProvider || !*lpNetResource->lpProvider) { + SetLastError(ERROR_BAD_PROVIDER); + return ERROR_BAD_PROVIDER; + } + + if (!lpNetResource->lpLocalName || !*lpNetResource->lpLocalName) { + SetLastError(ERROR_BAD_DEVICE); + return ERROR_BAD_DEVICE; + } + + if ((!(lpNetResource->lpLocalName[0] >= 'a' && lpNetResource->lpLocalName[0] <= 'z') && + !(lpNetResource->lpLocalName[0] >= 'A' && lpNetResource->lpLocalName[0] <= 'Z')) || + lpNetResource->lpLocalName[1] != ':' || lpNetResource->lpLocalName[2]) { + SetLastError(ERROR_BAD_DEVICE); + return ERROR_BAD_DEVICE; + } + + id = (lpNetResource->lpLocalName[0] >= 'a') ? lpNetResource->lpLocalName[0] - 'a' : lpNetResource->lpLocalName[0] - 'A'; + drives = GetLogicalDrives(); + if (drives & (1 << id)) { + SetLastError(ERROR_ALREADY_ASSIGNED); + return ERROR_ALREADY_ASSIGNED; + } + + provider = _findProviderIndexW(lpNetResource->lpProvider); + if (provider == BAD_PROVIDER_INDEX) { + SetLastError(ERROR_BAD_PROVIDER); + return ERROR_BAD_PROVIDER; + } + + cap = providerTable->table[provider].getCaps(WNNC_CONNECTION); + if (!(cap & WNNC_CON_ADDCONNECTION) && !(cap & WNNC_CON_ADDCONNECTION3)) { + SetLastError(ERROR_BAD_PROVIDER); + return ERROR_BAD_PROVIDER; + } + + ret = WN_ACCESS_DENIED; + if (cap & WNNC_CON_ADDCONNECTION3) { + addConn3 = (PF_NPAddConnection3)GetProcAddress(providerTable->table[provider].hLib, "NPAddConnection3"); + if (addConn3) { + ret = addConn3(hwndOwner, lpNetResource, (LPWSTR)lpPassword, (LPWSTR)lpUserID, dwFlags); + } + } + else if (cap & WNNC_CON_ADDCONNECTION) { + addConn = (PF_NPAddConnection)GetProcAddress(providerTable->table[provider].hLib, "NPAddConnection"); + if (addConn) { + ret = addConn(lpNetResource, (LPWSTR)lpPassword, (LPWSTR)lpUserID); + } + } + + return ret; } /*********************************************************************

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2016