Ros-diffs October 2020

ros-diffs@reactos.org

22 participants
156 discussions

[reactos] 07/08: [RAPPS] Fix certificate pinning error displaying garbage

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12caaece255b216b45207… commit 12caaece255b216b452072d82faecfa98430d4b6 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Sep 30 19:24:10 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 11 17:01:06 2020 +0200 [RAPPS] Fix certificate pinning error displaying garbage --- base/applications/rapps/loaddlg.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index ec1ee2a8e6b..7ad7de1d32f 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -629,7 +629,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) // do we have a final slash separator? if (!p) { - MessageBox_LoadString(hMainWnd, IDS_UNABLE_PATH); + MessageBox_LoadString(hMainWnd, IDS_UNABLE_PATH); goto end; } @@ -811,7 +811,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) (InfoArray[iAppId].DLType == DLTYPE_DBUPDATE)) { CLocalPtr<char> subjectName, issuerName; - CStringW szMsgText; + CStringA szMsgText; bool bAskQuestion = false; if (!CertGetSubjectAndIssuer(hFile, subjectName, issuerName)) { @@ -830,7 +830,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) if (bAskQuestion) { - if (MessageBoxW(hMainWnd, szMsgText.GetString(), NULL, MB_YESNO | MB_ICONERROR) != IDYES) + if (MessageBoxA(hMainWnd, szMsgText.GetString(), NULL, MB_YESNO | MB_ICONERROR) != IDYES) { goto end; }

4 years, 2 months

[reactos] 06/08: [RAPPS] Bump the rapps user agent version

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12489f691b0e0024543d5… commit 12489f691b0e0024543d52330e4b09c80e88e0f7 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Sep 30 19:23:55 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 11 17:01:06 2020 +0200 [RAPPS] Bump the rapps user agent version --- base/applications/rapps/loaddlg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index c845257428e..ec1ee2a8e6b 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -563,7 +563,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) HANDLE hOut = INVALID_HANDLE_VALUE; unsigned char lpBuffer[4096]; - LPCWSTR lpszAgent = L"RApps/1.0"; + LPCWSTR lpszAgent = L"RApps/1.1"; URL_COMPONENTSW urlComponents; size_t urlLength, filenameLength;

4 years, 2 months

[reactos] 05/08: [RAPPS] Update rapps DB location to the new database

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d564b4afc393fb0a98e61… commit d564b4afc393fb0a98e61d9c23f689daf8bfbd90 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 20 22:12:19 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 11 17:01:06 2020 +0200 [RAPPS] Update rapps DB location to the new database --- base/applications/rapps/available.cpp | 2 +- base/applications/rapps/include/defines.h | 3 ++- base/applications/rapps/loaddlg.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 89f4ec5a255..d32e5f8d74a 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -308,7 +308,7 @@ AvailableStrings::AvailableStrings() PathAppendW(szAppsPath.GetBuffer(MAX_PATH), L"rapps"); szAppsPath.ReleaseBuffer(); - szCabName = L"rappmgr.cab"; + szCabName = APPLICATION_DATABASE_NAME; szCabDir = szPath; szCabPath = szCabDir; PathAppendW(szCabPath.GetBuffer(MAX_PATH), szCabName); diff --git a/base/applications/rapps/include/defines.h b/base/applications/rapps/include/defines.h index cf045923e39..d5247963725 100644 --- a/base/applications/rapps/include/defines.h +++ b/base/applications/rapps/include/defines.h @@ -30,7 +30,8 @@ #include "resource.h" #include "winmain.h" -#define APPLICATION_DATABASE_URL L"https://rapps.reactos.org/rappmgr.cab" +#define APPLICATION_DATABASE_URL L"https://rapps.reactos.org/rappmgr2.cab" +#define APPLICATION_DATABASE_NAME L"rappmgr2.cab" #define MAX_STR_LEN 256 enum AppsCategories diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 22f47597c38..c845257428e 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -658,7 +658,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) { case DLTYPE_DBUPDATE: case DLTYPE_DBUPDATE_UNOFFICIAL: - PathAppendW(Path.GetBuffer(), L"rappmgr.cab"); // whatever the URL is, use the file name L"rappmgr.cab" + PathAppendW(Path.GetBuffer(), APPLICATION_DATABASE_NAME); break; case DLTYPE_APPLICATION: PathAppendW(Path.GetBuffer(), (LPWSTR)(p + 1)); // use the filename retrieved from URL

4 years, 2 months

[reactos] 04/08: [RAPPS] Delete icons and temp screenshot when cleaning up the db

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26da451ba5c0581f33f9d… commit 26da451ba5c0581f33f9d6c0226f604253c782be Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 6 23:14:37 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 11 17:01:05 2020 +0200 [RAPPS] Delete icons and temp screenshot when cleaning up the db --- base/applications/rapps/available.cpp | 50 ++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 897251321f6..89f4ec5a255 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -342,26 +342,52 @@ VOID CAvailableApps::FreeCachedEntries() m_InfoList.RemoveAll(); } -VOID CAvailableApps::DeleteCurrentAppsDB() +static void DeleteWithWildcard(const CStringW& DirWithFilter) { HANDLE hFind = INVALID_HANDLE_VALUE; WIN32_FIND_DATAW FindFileData; - hFind = FindFirstFileW(m_Strings.szSearchPath.GetString(), &FindFileData); + hFind = FindFirstFileW(DirWithFilter, &FindFileData); - if (hFind != INVALID_HANDLE_VALUE) + if (hFind == INVALID_HANDLE_VALUE) + return; + + CStringW Dir = DirWithFilter; + PathRemoveFileSpecW(Dir.GetBuffer(MAX_PATH)); + Dir.ReleaseBuffer(); + + do { - ATL::CStringW szTmp; - do + ATL::CStringW szTmp = Dir + L"\\"; + szTmp += FindFileData.cFileName; + + if (!(FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { - szTmp = m_Strings.szAppsPath; - PathAppendW(szTmp.GetBuffer(MAX_PATH), FindFileData.cFileName); - szTmp.ReleaseBuffer(); - DeleteFileW(szTmp.GetString()); - } while (FindNextFileW(hFind, &FindFileData) != 0); - FindClose(hFind); - } + DeleteFileW(szTmp); + } + } while (FindNextFileW(hFind, &FindFileData) != 0); + FindClose(hFind); +} + +VOID CAvailableApps::DeleteCurrentAppsDB() +{ + // Delete icons + ATL::CStringW IconPath = m_Strings.szAppsPath; + PathAppendW(IconPath.GetBuffer(MAX_PATH), L"icons"); + IconPath.ReleaseBuffer(); + DeleteWithWildcard(IconPath + L"\\*.ico"); + + // Delete leftover screenshots + ATL::CStringW ScrnshotFolder = m_Strings.szAppsPath; + PathAppendW(ScrnshotFolder.GetBuffer(MAX_PATH), L"screenshots"); + ScrnshotFolder.ReleaseBuffer(); + DeleteWithWildcard(IconPath + L"\\*.tmp"); + + // Delete data base files (*.txt) + DeleteWithWildcard(m_Strings.szSearchPath); + RemoveDirectoryW(IconPath); + RemoveDirectoryW(ScrnshotFolder); RemoveDirectoryW(m_Strings.szAppsPath); RemoveDirectoryW(m_Strings.szPath); }

4 years, 2 months

[reactos] 03/08: [RAPPS] Add directory extraction capabilities for the .cab file

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3a12271e1092cfaf68e7… commit a3a12271e1092cfaf68e7fb94553501480a857d7 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 6 23:14:11 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 11 17:01:05 2020 +0200 [RAPPS] Add directory extraction capabilities for the .cab file --- base/applications/rapps/cabinet.cpp | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/base/applications/rapps/cabinet.cpp b/base/applications/rapps/cabinet.cpp index e10d64f84c5..8b4d8a19be5 100644 --- a/base/applications/rapps/cabinet.cpp +++ b/base/applications/rapps/cabinet.cpp @@ -5,6 +5,7 @@ * COPYRIGHT: Copyright 2018 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ #include "rapps.h" +#include <debug.h> #include <fdi.h> #include <fcntl.h> @@ -178,18 +179,42 @@ FNFDINOTIFY(fnNotify) { case fdintCOPY_FILE: { - ATL::CStringW szNewFileName, szExtractDir, szCabFileName; - ATL::CStringA szFilePathUTF8; + CStringW szExtractDir, szCabFileName; // Append the destination directory to the file name. MultiByteToWide((LPCSTR) pfdin->pv, szExtractDir, CP_UTF8); MultiByteToWide(pfdin->psz1, szCabFileName, CP_ACP); - szNewFileName = szExtractDir + L"\\" + szCabFileName; + if (szCabFileName.Find('\\') >= 0) + { + CStringW szNewDirName = szExtractDir; + int nTokenPos = 0; + // We do not want to interpret the filename as directory, + // so bail out before the last token! + while (szCabFileName.Find('\\', nTokenPos) >= 0) + { + CStringW token = szCabFileName.Tokenize(L"\\", nTokenPos); + if (token.IsEmpty()) + break; + + szNewDirName += L"\\" + token; + if (!CreateDirectoryW(szNewDirName, NULL)) + { + DWORD dwErr = GetLastError(); + if (dwErr != ERROR_ALREADY_EXISTS) + { + DPRINT1("ERROR: Unable to create directory %S (err %lu)\n", szNewDirName.GetString(), dwErr); + } + } + } + } + + CStringW szNewFileName = szExtractDir + L"\\" + szCabFileName; + CStringA szFilePathUTF8; WideToMultiByte(szNewFileName, szFilePathUTF8, CP_UTF8); - // Copy file + // Open the file iResult = fnFileOpen((LPSTR) szFilePathUTF8.GetString(), _O_WRONLY | _O_CREAT, 0);

4 years, 2 months

[reactos] 02/08: [RAPPS] Add support for a rapps db with the file:/// scheme This makes it easier to test locally

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f25a47677b375a0b87ea… commit 4f25a47677b375a0b87eab829973fdba096a5b33 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 6 23:13:21 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 11 17:01:05 2020 +0200 [RAPPS] Add support for a rapps db with the file:/// scheme This makes it easier to test locally --- base/applications/rapps/include/misc.h | 6 +++++ base/applications/rapps/loaddlg.cpp | 42 ++++++++++++++++++++++++++------- base/applications/rapps/settingsdlg.cpp | 1 + 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/base/applications/rapps/include/misc.h b/base/applications/rapps/include/misc.h index 58890958f3d..86456b0871b 100644 --- a/base/applications/rapps/include/misc.h +++ b/base/applications/rapps/include/misc.h @@ -58,3 +58,9 @@ INT GetSystemColorDepth(); void UnixTimeToFileTime(DWORD dwUnixTime, LPFILETIME pFileTime); BOOL SearchPatternMatch(LPCWSTR szHaystack, LPCWSTR szNeedle); + +template<class T> +class CLocalPtr : public CHeapPtr<T, CLocalAllocator> +{ +}; + diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 505e48643d7..22f47597c38 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -305,9 +305,7 @@ public: }; #ifdef USE_CERT_PINNING -typedef CHeapPtr<char, CLocalAllocator> CLocalPtr; - -static BOOL CertGetSubjectAndIssuer(HINTERNET hFile, CLocalPtr& subjectInfo, CLocalPtr& issuerInfo) +static BOOL CertGetSubjectAndIssuer(HINTERNET hFile, CLocalPtr<char>& subjectInfo, CLocalPtr<char>& issuerInfo) { DWORD certInfoLength; INTERNET_CERTIFICATE_INFOA certInfo; @@ -528,7 +526,7 @@ VOID ShowLastError( HWND hWndOwner, DWORD dwLastError) { - LPWSTR lpMsg; + CLocalPtr<WCHAR> lpMsg; if (!FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | @@ -543,7 +541,6 @@ VOID ShowLastError( } MessageBoxW(hWndOwner, lpMsg, NULL, MB_OK | MB_ICONERROR); - LocalFree(lpMsg); } unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) @@ -724,7 +721,8 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) dwContentLen = 0; - if (urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) + if (urlComponents.nScheme == INTERNET_SCHEME_HTTP || + urlComponents.nScheme == INTERNET_SCHEME_HTTPS) { hFile = InternetOpenUrlW(hOpen, InfoArray[iAppId].szUrl.GetString(), NULL, 0, dwUrlConnectFlags, @@ -754,7 +752,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) else if (urlComponents.nScheme == INTERNET_SCHEME_FTP) { // force passive mode on FTP - hFile = InternetOpenUrlW(hOpen, InfoArray[iAppId].szUrl.GetString(), NULL, 0, + hFile = InternetOpenUrlW(hOpen, InfoArray[iAppId].szUrl, NULL, 0, dwUrlConnectFlags | INTERNET_FLAG_PASSIVE, 0); if (!hFile) @@ -765,6 +763,31 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) dwContentLen = FtpGetFileSize(hFile, &dwStatus); } + else if (urlComponents.nScheme == INTERNET_SCHEME_FILE) + { + // Add support for the file scheme so testing locally is simpler + WCHAR LocalFilePath[MAX_PATH]; + DWORD cchPath = _countof(LocalFilePath); + // Ideally we would use PathCreateFromUrlAlloc here, but that is not exported (yet) + HRESULT hr = PathCreateFromUrlW(InfoArray[iAppId].szUrl, LocalFilePath, &cchPath, 0); + if (SUCCEEDED(hr)) + { + if (CopyFileW(LocalFilePath, Path, FALSE)) + { + goto run; + } + else + { + ShowLastError(hMainWnd, GetLastError()); + goto end; + } + } + else + { + ShowLastError(hMainWnd, hr); + goto end; + } + } if (!dwContentLen) { @@ -787,7 +810,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && (InfoArray[iAppId].DLType == DLTYPE_DBUPDATE)) { - CLocalPtr subjectName, issuerName; + CLocalPtr<char> subjectName, issuerName; CStringW szMsgText; bool bAskQuestion = false; if (!CertGetSubjectAndIssuer(hFile, subjectName, issuerName)) @@ -932,7 +955,8 @@ end: if (hOut != INVALID_HANDLE_VALUE) CloseHandle(hOut); - InternetCloseHandle(hFile); + if (hFile) + InternetCloseHandle(hFile); InternetCloseHandle(hOpen); if (bTempfile) diff --git a/base/applications/rapps/settingsdlg.cpp b/base/applications/rapps/settingsdlg.cpp index d1f36519d9a..50f69faf55e 100644 --- a/base/applications/rapps/settingsdlg.cpp +++ b/base/applications/rapps/settingsdlg.cpp @@ -66,6 +66,7 @@ BOOL IsUrlValid(const WCHAR * Url) case INTERNET_SCHEME_HTTP: case INTERNET_SCHEME_HTTPS: case INTERNET_SCHEME_FTP: + case INTERNET_SCHEME_FILE: // supported return TRUE;

4 years, 2 months

[reactos] 01/08: [PSDK] Add some argument names

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a7c1f9a014045d357059d… commit a7c1f9a014045d357059d8a9bdc1b7140e09e142 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 6 17:50:29 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 11 17:00:59 2020 +0200 [PSDK] Add some argument names --- sdk/include/psdk/shlwapi.h | 8 ++++---- sdk/include/psdk/winbase.h | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk/include/psdk/shlwapi.h b/sdk/include/psdk/shlwapi.h index 6c796acfc38..14083c5ad23 100644 --- a/sdk/include/psdk/shlwapi.h +++ b/sdk/include/psdk/shlwapi.h @@ -885,14 +885,14 @@ PathCreateFromUrlA( HRESULT WINAPI PathCreateFromUrlW( - _In_ LPCWSTR, - _Out_writes_to_(*pcchPath, *pcchPath) LPWSTR, + _In_ LPCWSTR pszUrl, + _Out_writes_to_(*pcchPath, *pcchPath) LPWSTR pszPath, _Inout_ LPDWORD pcchPath, - DWORD); + DWORD dwFlags); #define PathCreateFromUrl WINELIB_NAME_AW(PathCreateFromUrl) -HRESULT WINAPI PathCreateFromUrlAlloc(_In_ LPCWSTR, _Outptr_ LPWSTR*, DWORD); +HRESULT WINAPI PathCreateFromUrlAlloc(_In_ LPCWSTR pszUrl, _Outptr_ LPWSTR* pszPath, DWORD dwReserved); BOOL WINAPI PathFileExistsA(_In_ LPCSTR); BOOL WINAPI PathFileExistsW(_In_ LPCWSTR); diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 0f653ea835f..1e683eeb37f 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -1639,7 +1639,7 @@ BOOL WINAPI ConvertFiberToThread(void); #endif _Ret_maybenull_ PVOID WINAPI ConvertThreadToFiber(_In_opt_ PVOID); BOOL WINAPI CopyFileA(_In_ LPCSTR, _In_ LPCSTR, _In_ BOOL); -BOOL WINAPI CopyFileW(_In_ LPCWSTR, _In_ LPCWSTR, _In_ BOOL); +BOOL WINAPI CopyFileW(_In_ LPCWSTR lpExistingFileName, _In_ LPCWSTR lpNewFileName, _In_ BOOL bFailIfExists); BOOL WINAPI CopyFileExA(_In_ LPCSTR, _In_ LPCSTR, _In_opt_ LPPROGRESS_ROUTINE, _In_opt_ LPVOID, _In_opt_ LPBOOL, _In_ DWORD); BOOL WINAPI CopyFileExW(_In_ LPCWSTR, _In_ LPCWSTR, _In_opt_ LPPROGRESS_ROUTINE, _In_opt_ LPVOID, _In_opt_ LPBOOL, _In_ DWORD); #define MoveMemory RtlMoveMemory @@ -1652,8 +1652,8 @@ BOOL WINAPI CopySid(DWORD,PSID,PSID); HANDLE WINAPI CreateActCtxA(_In_ PCACTCTXA); HANDLE WINAPI CreateActCtxW(_In_ PCACTCTXW); #endif -BOOL WINAPI CreateDirectoryA(LPCSTR,LPSECURITY_ATTRIBUTES); -BOOL WINAPI CreateDirectoryW(LPCWSTR,LPSECURITY_ATTRIBUTES); +BOOL WINAPI CreateDirectoryA(LPCSTR lpPathName,LPSECURITY_ATTRIBUTES lpSecurityAttributes); +BOOL WINAPI CreateDirectoryW(LPCWSTR lpPathName,LPSECURITY_ATTRIBUTES lpSecurityAttributes); BOOL WINAPI CreateDirectoryExA(_In_ LPCSTR, _In_ LPCSTR, _In_opt_ LPSECURITY_ATTRIBUTES); BOOL WINAPI CreateDirectoryExW(_In_ LPCWSTR, _In_ LPCWSTR, _In_opt_ LPSECURITY_ATTRIBUTES); HANDLE WINAPI CreateEventA(_In_opt_ LPSECURITY_ATTRIBUTES lpEventAttributes, _In_ BOOL bManualReset, _In_ BOOL bInitialState, _In_opt_ LPCSTR lpName); @@ -1976,8 +1976,8 @@ DWORD WINAPI FlsAlloc(PFLS_CALLBACK_FUNCTION); PVOID WINAPI FlsGetValue(DWORD); BOOL WINAPI FlsSetValue(DWORD,PVOID); BOOL WINAPI FlsFree(DWORD); -DWORD WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,DWORD,va_list*); -DWORD WINAPI FormatMessageW(DWORD,LPCVOID,DWORD,DWORD,LPWSTR,DWORD,va_list*); +DWORD WINAPI FormatMessageA(DWORD dwFlags, LPCVOID lpSource, DWORD dwMessageId, DWORD dwLanguageId, LPSTR lpBuffer, DWORD nSize, va_list* Arguments); +DWORD WINAPI FormatMessageW(DWORD dwFlags, LPCVOID lpSource, DWORD dwMessageId, DWORD dwLanguageId, LPWSTR lpBuffer, DWORD nSize, va_list* Arguments); BOOL WINAPI FreeEnvironmentStringsA(LPSTR); BOOL WINAPI FreeEnvironmentStringsW(LPWSTR); BOOL WINAPI FreeLibrary(HMODULE);

4 years, 2 months

[reactos] 01/01: [GDI32] Prevent double initialization in GdiProcessSetup Found with Application Verifier :)

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ed0f25b64932f079dfdf… commit 7ed0f25b64932f079dfdfd68e9ad1675fa606114 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Oct 9 14:28:32 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 11 16:30:39 2020 +0200 [GDI32] Prevent double initialization in GdiProcessSetup Found with Application Verifier :) --- win32ss/gdi/gdi32/main/dllmain.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/win32ss/gdi/gdi32/main/dllmain.c b/win32ss/gdi/gdi32/main/dllmain.c index b59dfbe4210..322fc156435 100644 --- a/win32ss/gdi/gdi32/main/dllmain.c +++ b/win32ss/gdi/gdi32/main/dllmain.c @@ -4,6 +4,7 @@ #include <precomp.h> +static BOOL gbInitialized = FALSE; extern HGDIOBJ stock_objects[]; BOOL SetStockObjects = FALSE; PDEVCAPS GdiDevCaps = NULL; @@ -40,18 +41,22 @@ VOID WINAPI GdiProcessSetup(VOID) { - hProcessHeap = GetProcessHeap(); - - /* map the gdi handle table to user space */ - GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; - GdiSharedHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; - GdiDevCaps = &GdiSharedHandleTable->DevCaps; - CurrentProcessId = NtCurrentTeb()->ClientId.UniqueProcess; - GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; - GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; - RtlInitializeCriticalSection(&semLocal); - InitializeCriticalSection(&gcsClientObjLinks); - GdiInitializeLanguagePack(0); + if (!gbInitialized) + { + gbInitialized = TRUE; + hProcessHeap = GetProcessHeap(); + + /* map the gdi handle table to user space */ + GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + GdiSharedHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + GdiDevCaps = &GdiSharedHandleTable->DevCaps; + CurrentProcessId = NtCurrentTeb()->ClientId.UniqueProcess; + GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; + GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; + RtlInitializeCriticalSection(&semLocal); + InitializeCriticalSection(&gcsClientObjLinks); + GdiInitializeLanguagePack(0); + } } VOID

4 years, 2 months

[reactos] 01/01: [README] Improving the readability of the stability warning (#3287)

by Alexander Rechitskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49a8816a82eaa381401d8… commit 49a8816a82eaa381401d81690b8b529c543c2ae6 Author: Alexander Rechitskiy <rechitskiy(a)reactos.org> AuthorDate: Sun Oct 11 02:40:48 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Oct 11 02:40:48 2020 +0300 [README] Improving the readability of the stability warning (#3287) Now the warning looks and reads better than a huge chunk of text in bold and italics at once. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a8afba3214..bb0a9a603a0 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,9 @@ The ReactOS project, although currently focused on Windows Server 2003 compatibi The code of ReactOS is licensed under [GNU GPL 2.0](https://github.com/reactos/reactos/blob/master/COPYING). -***ReactOS is currently an Alpha quality operating system. This means that ReactOS is under heavy development, things may not work well and it can corrupt the data present on your hard disk. It is recommended to test ReactOS on a virtual machine or on a computer with no sensitive or critical data!*** +### Product quality warning + +**ReactOS is currently an Alpha quality operating system.** This means that ReactOS is under heavy development and you have to be ready to encounter some problems. Different things may not work well and it can corrupt the data present on your hard disk. It is HIGHLY recommended to test ReactOS on a virtual machine or on a computer with no sensitive or critical data! ## Building

4 years, 2 months

[reactos] 01/01: [PSDK] dsrole.h: Define DSROLE_PRIMARY_DS_READONLY (#3288)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05347f7168639df6c95a3… commit 05347f7168639df6c95a3a1036eff6f3e11acc82 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Oct 10 22:27:07 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 10 22:27:07 2020 +0200 [PSDK] dsrole.h: Define DSROLE_PRIMARY_DS_READONLY (#3288) --- sdk/include/psdk/dsrole.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/include/psdk/dsrole.h b/sdk/include/psdk/dsrole.h index 75f2756213e..0e3ef252159 100644 --- a/sdk/include/psdk/dsrole.h +++ b/sdk/include/psdk/dsrole.h @@ -24,6 +24,7 @@ #define DSROLE_PRIMARY_DS_RUNNING 0x00000001 #define DSROLE_PRIMARY_DS_MIXED_MODE 0x00000002 #define DSROLE_UPGRADE_IN_PROGRESS 0x00000004 +#define DSROLE_PRIMARY_DS_READONLY 0x00000008 #define DSROLE_PRIMARY_DOMAIN_GUID_PRESENT 0x01000000 typedef enum _DSROLE_PRIMARY_DOMAIN_INFO_LEVEL

4 years, 2 months

← Newer
1
...
9
10
11
12
13
14
15
16
Older →

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 October 2020