Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[spetreolle] 70669: [OPENGL] Free the variable arguments in vsnprintf implementation. Patch by Victor Martinez. CORE-10629
by spetreolle＠svn.reactos.org 31 Jan '16

31 Jan '16

Author: spetreolle Date: Sun Jan 31 19:14:24 2016 New Revision: 70669 URL: http://svn.reactos.org/svn/reactos?rev=70669&view=rev Log: [OPENGL] Free the variable arguments in vsnprintf implementation. Patch by Victor Martinez. CORE-10629 Modified: trunk/reactos/dll/opengl/mesa/main/vsnprintf.c Modified: trunk/reactos/dll/opengl/mesa/main/vsnprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/vsnpr… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/vsnprintf.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/vsnprintf.c [iso-8859-1] Sun Jan 31 19:14:24 2016 @@ -150,15 +150,16 @@ va_dcl #endif { + int nchar; va_list ap; #if __STDC__ va_start(ap, fmt); #else va_start(ap); #endif - - return (vsnprintf(str, n, fmt, ap)); + nchar = vsnprintf(str, n, fmt, ap) va_end(ap); + return (nchar); }

1 0

[spetreolle] 70668: cmlib: Fix debug string becoming too big for testbot (doesn't fix successful-but-canceled ntdll:NtDeleteKey) Alex, do we have an actual free-security-descriptor function ?
by spetreolle＠svn.reactos.org 31 Jan '16

31 Jan '16

Author: spetreolle Date: Sun Jan 31 17:42:05 2016 New Revision: 70668 URL: http://svn.reactos.org/svn/reactos?rev=70668&view=rev Log: cmlib: Fix debug string becoming too big for testbot (doesn't fix successful-but-canceled ntdll:NtDeleteKey) Alex, do we have an actual free-security-descriptor function ? 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] Sun Jan 31 17:42:05 2016 @@ -215,7 +215,7 @@ } /* FIXME: This leaks the security desriptor! */ - DPRINT1("Potentially leaking key security descriptor. Please call CmpFreeSecurityDescriptor"); + DPRINT1("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

[hbelusca] 70667: [FOSDEM2016]: FOSDEM is over, tag the branch! I thank Colin for having given me access to a builder for making this ISO.
by hbelusca＠svn.reactos.org 31 Jan '16

31 Jan '16

Author: hbelusca Date: Sun Jan 31 15:08:25 2016 New Revision: 70667 URL: http://svn.reactos.org/svn/reactos?rev=70667&view=rev Log: [FOSDEM2016]: FOSDEM is over, tag the branch! I thank Colin for having given me access to a builder for making this ISO. Added: tags/ReactOS-0.4.0-FOSDEM2016/ (props changed) - copied from r70666, branches/ReactOS-0.4.0-FOSDEM2016/ Removed: branches/ReactOS-0.4.0-FOSDEM2016/ Propchange: tags/ReactOS-0.4.0-FOSDEM2016/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Jan 31 15:08:25 2016 @@ -0,0 +1 @@ +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641,70651

1 0

[hbelusca] 70666: Forgot that we use RosBe 2.1.3
by hbelusca＠svn.reactos.org 31 Jan '16

31 Jan '16

Author: hbelusca Date: Sun Jan 31 02:44:05 2016 New Revision: 70666 URL: http://svn.reactos.org/svn/reactos?rev=70666&view=rev Log: Forgot that we use RosBe 2.1.3 Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/de-DE.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/en-US.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/fr-FR.rc Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/de-DE.rc [iso-8859-1] Sun Jan 31 02:44:05 2016 @@ -51,7 +51,7 @@ BEGIN IDS_TOPICACTION0 "<msg>Sie mÃ¼ssen Ihren Computer mit der ReactOS-CD im Laufwerk neu starten, um die Installation zu starten.\n\nBITTE BEACHTEN SIE: Es wird dringend davon abgeraten, ReactOS auf einem Computer zu installieren, welcher wichtige Daten enthÃ¤lt!" IDS_TOPICACTION1 "\\extras\\ReactOS on QEMU\\ReactOS-040-FOSDEM2016RC-QEMU.7z" - IDS_TOPICACTION2 "\\extras\\ReactOS Build Environment\\RosBE-2.1.1.exe" + IDS_TOPICACTION2 "\\extras\\ReactOS Build Environment\\RosBE-2.1.3.exe" IDS_TOPICACTION3 "\\extras\\ReactOS Source Code\\ReactOS-040-FOSDEM2016RC-Source.7z" IDS_TOPICACTION4 "https://www.reactos.org/" IDS_TOPICACTION5 "explorer.exe" Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/en-US.rc [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/en-US.rc [iso-8859-1] Sun Jan 31 02:44:05 2016 @@ -51,7 +51,7 @@ BEGIN IDS_TOPICACTION0 "<msg>You have to restart your computer with the ReactOS CD in the drive to start the installation.\n\nPLEASE NOTE: You're highly advised to not install ReactOS on a computer that contains important data!" IDS_TOPICACTION1 "\\extras\\ReactOS on QEMU\\ReactOS-040-FOSDEM2016RC-QEMU.7z" - IDS_TOPICACTION2 "\\extras\\ReactOS Build Environment\\RosBE-2.1.1.exe" + IDS_TOPICACTION2 "\\extras\\ReactOS Build Environment\\RosBE-2.1.3.exe" IDS_TOPICACTION3 "\\extras\\ReactOS Source Code\\ReactOS-040-FOSDEM2016RC-Source.7z" IDS_TOPICACTION4 "https://www.reactos.org/" IDS_TOPICACTION5 "explorer.exe" Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/fr-FR.rc [iso-8859-1] Sun Jan 31 02:44:05 2016 @@ -51,7 +51,7 @@ BEGIN IDS_TOPICACTION0 "<msg>Vous ne pouvez pas encore installer ReactOS directement depuis ce CD ! Veuillez redÃ©marrer votre ordinateur depuis ce CD pour pouvoir installer ReactOS." IDS_TOPICACTION1 "\\extras\\ReactOS on QEMU\\ReactOS-040-FOSDEM2016RC-QEMU.7z" - IDS_TOPICACTION2 "\\extras\\ReactOS Build Environment\\RosBE-2.1.1.exe" + IDS_TOPICACTION2 "\\extras\\ReactOS Build Environment\\RosBE-2.1.3.exe" IDS_TOPICACTION3 "\\extras\\ReactOS Source Code\\ReactOS-040-FOSDEM2016RC-Source.7z" IDS_TOPICACTION4 "https://www.reactos.org/" IDS_TOPICACTION5 "explorer.exe"

1 0

[hbelusca] 70665: [FOSDEM2016] Add the optional font (and readme) for the livecd. The other optional 3rd-party files (extra drivers, MFC 4.2 and 7.1 libraries, MS VB 5.0 and 6.0 runtime and MSVC++ ...
by hbelusca＠svn.reactos.org 31 Jan '16

31 Jan '16

Author: hbelusca Date: Sun Jan 31 01:57:09 2016 New Revision: 70665 URL: http://svn.reactos.org/svn/reactos?rev=70665&view=rev Log: [FOSDEM2016] Add the optional font (and readme) for the livecd. The other optional 3rd-party files (extra drivers, MFC 4.2 and 7.1 libraries, MS VB 5.0 and 6.0 runtime and MSVC++ 7.1 runtime can be found in an "optional.7z" archive in IServ. Wine Gecko package is stored elsewhere and is kept up-to-date). Added: branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/ branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/DroidSansFallback.ttf (with props) branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/NOTICE_for_Droid_Font.txt (with props) Added: branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/DroidSansFallback.ttf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/DroidSansFallback.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/NOTICE_for_Droid_Font.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/NOTICE_for_Droid_Font.txt (added) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/NOTICE_for_Droid_Font.txt [iso-8859-1] Sun Jan 31 01:57:09 2016 @@ -0,0 +1,214 @@ + ========================================================================= + == NOTICE file corresponding to the section 4 d of == + == the Apache License, Version 2.0, == + == in this case for the Android-specific code. == + ========================================================================= + +Android Code +Copyright 2005-2009 The Android Open Source Project + +This product includes software developed as part of +The Android Open Source Project (http://source.android.com). + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. Propchange: branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/NOTICE_for_Droid_Font.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 70664: [WALLPAPERS]: Addendum for r70661: Since the FOSDEM wallpaper displays better when not being stretched but centered, use instead centered-style wallpaper.
by hbelusca＠svn.reactos.org 31 Jan '16

31 Jan '16

Author: hbelusca Date: Sun Jan 31 01:02:02 2016 New Revision: 70664 URL: http://svn.reactos.org/svn/reactos?rev=70664&view=rev Log: [WALLPAPERS]: Addendum for r70661: Since the FOSDEM wallpaper displays better when not being stretched but centered, use instead centered-style wallpaper. Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Sun Jan 31 01:02:02 2016 @@ -66,7 +66,7 @@ HKCU,"Control Panel\Desktop","Pattern",2,"(None)" HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Web\Wallpaper\ReactOS_CirclesBlue.bmp" HKCU,"Control Panel\Desktop","TileWallpaper",2,"0" -HKCU,"Control Panel\Desktop","WallpaperStyle",2,"2" +HKCU,"Control Panel\Desktop","WallpaperStyle",2,"0" HKCU,"Control Panel\Desktop","FontSmoothing",0,"1" HKCU,"Control Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","FontSmoothingType",0x00010003,0x00000001

1 0

[spetreolle] 70663: [TASKMGR] Remove hacks for idle time.
by spetreolle＠svn.reactos.org 30 Jan '16

30 Jan '16

Author: spetreolle Date: Sat Jan 30 17:18:08 2016 New Revision: 70663 URL: http://svn.reactos.org/svn/reactos?rev=70663&view=rev Log: [TASKMGR] Remove hacks for idle time. Modified: trunk/reactos/base/applications/taskmgr/perfdata.c Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Sat Jan 30 17:18:08 2016 @@ -302,12 +302,6 @@ /* CurrentCpuUsage% = 100 - (CurrentCpuIdle * 100) / NumberOfProcessors */ dbIdleTime = 100.0 - dbIdleTime * 100.0 / (double)SystemBasicInfo.NumberOfProcessors; /* + 0.5; */ dbKernelTime = 100.0 - dbKernelTime * 100.0 / (double)SystemBasicInfo.NumberOfProcessors; /* + 0.5; */ - - if (dbIdleTime < 0.0) dbIdleTime = 0.0; - if (dbIdleTime > 100.0) dbIdleTime = 100.0; - if (dbKernelTime < 0.0) dbKernelTime = 0.0; - if (dbKernelTime > 100.0) dbKernelTime = 100.0; - } /* Store new CPU's idle and system time */

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