Ros-diffs August 2018

ros-diffs@reactos.org

32 participants
304 discussions

02/04: [NTOSKRNL] Add a check commented out for now.
by Pierre Schweitzer 16 Aug '18

16 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8281f4baa6f8422a0c5cb… commit 8281f4baa6f8422a0c5cb08cbaf059fea07ea016 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Aug 16 18:49:55 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Aug 16 18:49:55 2018 +0200 [NTOSKRNL] Add a check commented out for now. It's to be enabled once page file handling is moved to ARM3 --- ntoskrnl/mm/pagefile.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 9019beef90..14c558e9f9 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -690,6 +690,17 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, /* DACL is no longer needed, free it */ ExFreePoolWithTag(Dacl, 'lcaD'); + /* FIXME: To enable once page file managment is moved to ARM3 */ +#if 0 + /* Check we won't overflow commit limit with the page file */ + if (MmTotalCommitLimitMaximum + (SafeMaximumSize.QuadPart >> PAGE_SHIFT) <= MmTotalCommitLimitMaximum) + { + ZwClose(FileHandle); + ExFreePoolWithTag(Buffer, TAG_MM); + return STATUS_INVALID_PARAMETER_3; + } +#endif + /* Set its end of file to minimal size */ Status = ZwSetInformationFile(FileHandle, &IoStatus,

1 0

01/04: [NTOSKRNL] MmTotalCommitLimit and MmTotalCommitLimitMaximum are in pages, not bytes
by Pierre Schweitzer 16 Aug '18

16 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f0ad923d2931bcaec6aa… commit 7f0ad923d2931bcaec6aa2295ba38b5c133675b4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Aug 16 18:40:23 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Aug 16 18:40:23 2018 +0200 [NTOSKRNL] MmTotalCommitLimit and MmTotalCommitLimitMaximum are in pages, not bytes --- ntoskrnl/mm/ARM3/mminit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index e8cf1dc001..217aa6569d 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -2256,7 +2256,7 @@ MmArmInitSystem(IN ULONG Phase, ExInitializePushLock(&MmSystemCacheWs.WorkingSetMutex); /* Set commit limit */ - MmTotalCommitLimit = 2 * _1GB; + MmTotalCommitLimit = (2 * _1GB) >> PAGE_SHIFT; MmTotalCommitLimitMaximum = MmTotalCommitLimit; /* Has the allocation fragment been setup? */

1 0

01/01: [CONFIGURE] Added support for new VS 19.15.x
by Oleksandr Shaposhnikov 16 Aug '18

16 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8d51bb87a92457f7356f… commit c8d51bb87a92457f7356fb6cd3488cd0db3b4b5c Author: Oleksandr Shaposhnikov <sanchaez(a)hotmail.com> AuthorDate: Thu Aug 16 18:11:53 2018 +0300 Commit: Oleksandr Shaposhnikov <sanchaez(a)hotmail.com> CommitDate: Thu Aug 16 18:13:54 2018 +0300 [CONFIGURE] Added support for new VS 19.15.x --- configure.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.cmd b/configure.cmd index 70b0f48211..bacc75a743 100755 --- a/configure.cmd +++ b/configure.cmd @@ -71,6 +71,7 @@ if defined ROS_ARCH ( cl 2>&1 | find "19.12." > NUL && set VS_VERSION=15 cl 2>&1 | find "19.13." > NUL && set VS_VERSION=15 cl 2>&1 | find "19.14." > NUL && set VS_VERSION=15 + cl 2>&1 | find "19.15." > NUL && set VS_VERSION=15 if not defined VS_VERSION ( echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed. goto quit

1 0

01/01: [NTOS:MM] Make SLIST handling for kernel stacks portable
by Timo Kreuzer 16 Aug '18

16 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd73d1b6d414660a42d07… commit dd73d1b6d414660a42d07598ad040357fd40019d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 4 13:30:47 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 16 16:52:02 2018 +0200 [NTOS:MM] Make SLIST handling for kernel stacks portable Kernel stacks that re freed, can be placed on an SLIST for quick reuse. The old code was using a member of the PFN of the last stack page as the SLIST_ENTRY. This relies on the following (non-portable) assumptions: - A stack always has a PTE associated with it. - This PTE has a PFN associated with it. - The PFN has an empty field that can be re-used as an SLIST_ENTRY. - The PFN has another field that points back to the PTE, which then can be used to get the stack base. Specifically: On x64 the PFN field is not 16 bytes aligned, so it cannot be used as an SLIST_ENTRY. (In a "usermode kernel" the other assumptions are also invalid). The new code does what Windows does (and which seems absolutely obvious to do): Place the SLIST_ENTRY directly on the stack. --- ntoskrnl/mm/ARM3/procsup.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index 009168eba9..51502b9a5d 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -175,6 +175,7 @@ MmDeleteKernelStack(IN PVOID StackBase, PMMPFN Pfn1, Pfn2; ULONG i; KIRQL OldIrql; + PSLIST_ENTRY SListEntry; // // This should be the guard page, so decrement by one @@ -189,9 +190,8 @@ MmDeleteKernelStack(IN PVOID StackBase, { if (ExQueryDepthSList(&MmDeadStackSListHead) < MmMaximumDeadKernelStacks) { - Pfn1 = MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber); - InterlockedPushEntrySList(&MmDeadStackSListHead, - (PSLIST_ENTRY)&Pfn1->u1.NextStackPfn); + SListEntry = ((PSLIST_ENTRY)StackBase) - 1; + InterlockedPushEntrySList(&MmDeadStackSListHead, SListEntry); return; } } @@ -265,7 +265,7 @@ MmCreateKernelStack(IN BOOLEAN GuiStack, KIRQL OldIrql; PFN_NUMBER PageFrameIndex; ULONG i; - PMMPFN Pfn1; + PSLIST_ENTRY SListEntry; // // Calculate pages needed @@ -286,11 +286,10 @@ MmCreateKernelStack(IN BOOLEAN GuiStack, // if (ExQueryDepthSList(&MmDeadStackSListHead)) { - Pfn1 = (PMMPFN)InterlockedPopEntrySList(&MmDeadStackSListHead); - if (Pfn1) + SListEntry = InterlockedPopEntrySList(&MmDeadStackSListHead); + if (SListEntry != NULL) { - PointerPte = Pfn1->PteAddress; - BaseAddress = MiPteToAddress(++PointerPte); + BaseAddress = (SListEntry + 1); return BaseAddress; } }

1 0

01/01: [NTOS:SE] Fix SeSetSecurityDescriptorInfoEx to prevent pool corruption on x64
by Timo Kreuzer 16 Aug '18

16 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c154c06254218a5e9d8b… commit 6c154c06254218a5e9d8bd9f406e43c789cecea4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 4 20:07:17 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 16 16:32:49 2018 +0200 [NTOS:SE] Fix SeSetSecurityDescriptorInfoEx to prevent pool corruption on x64 --- ntoskrnl/se/sd.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/se/sd.c b/ntoskrnl/se/sd.c index a6b082993f..ab10515e79 100644 --- a/ntoskrnl/se/sd.c +++ b/ntoskrnl/se/sd.c @@ -916,13 +916,9 @@ SeSetSecurityDescriptorInfoEx( return STATUS_INSUFFICIENT_RESOURCES; } - RtlCreateSecurityDescriptor(NewSd, - SECURITY_DESCRIPTOR_REVISION1); + RtlCreateSecurityDescriptorRelative(NewSd, SECURITY_DESCRIPTOR_REVISION1); - /* We always build a self-relative descriptor */ - NewSd->Control = Control | SE_SELF_RELATIVE; - - Current = sizeof(SECURITY_DESCRIPTOR); + Current = sizeof(SECURITY_DESCRIPTOR_RELATIVE); if (OwnerLength != 0) {

1 0

01/01: [ADVAPI32][SHELL32][DESK.CPL] Kill copy-paste of RegLoadMUIString. (#748)
by Getequ 16 Aug '18

16 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d559ca9c982f9766acc5d… commit d559ca9c982f9766acc5db3ea887ef2bc27acdff Author: Getequ <Getequ(a)users.noreply.github.com> AuthorDate: Thu Aug 16 21:10:41 2018 +0700 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 16 16:10:41 2018 +0200 [ADVAPI32][SHELL32][DESK.CPL] Kill copy-paste of RegLoadMUIString. (#748) RegLoadMUIStringW/A is part of advapi32.dll . shell32.dll and desk.cpl contained exact line-by-line copy of that function. --- dll/cpl/desk/CMakeLists.txt | 6 +- dll/cpl/desk/desk.h | 9 - dll/cpl/desk/muireg.c | 144 ---------------- dll/win32/advapi32/CMakeLists.txt | 2 +- dll/win32/advapi32/advapi32.spec | 2 + dll/win32/advapi32/reg/reg.c | 191 --------------------- dll/win32/advapi32_vista/CMakeLists.txt | 2 + .../vista.c => advapi32_vista/RegLoadMUIString.c} | 29 +--- dll/win32/advapi32_vista/advapi32_vista.spec | 2 + dll/win32/shell32/CMakeLists.txt | 3 +- 10 files changed, 14 insertions(+), 376 deletions(-) diff --git a/dll/cpl/desk/CMakeLists.txt b/dll/cpl/desk/CMakeLists.txt index ae7fb83825..24d9bb1e60 100644 --- a/dll/cpl/desk/CMakeLists.txt +++ b/dll/cpl/desk/CMakeLists.txt @@ -2,6 +2,9 @@ add_definitions(-D_WIN32) spec2def(desk.cpl desk.spec) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + list(APPEND SOURCE advmon.c appearance.c @@ -20,7 +23,6 @@ list(APPEND SOURCE general.c draw.c theme.c - muireg.c desk.h) file(GLOB desk_rc_deps resources/*.*) @@ -34,6 +36,6 @@ add_library(desk SHARED set_module_type(desk cpl UNICODE) target_link_libraries(desk uuid) -add_importlibs(desk user32 advapi32 gdi32 comctl32 comdlg32 ole32 setupapi shell32 shlwapi uxtheme gdiplus msvcrt kernel32 ntdll) +add_importlibs(desk user32 advapi32 advapi32_vista gdi32 comctl32 comdlg32 ole32 setupapi shell32 shlwapi uxtheme gdiplus msvcrt kernel32 ntdll) add_pch(desk desk.h SOURCE) add_cd_file(TARGET desk DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/desk/desk.h b/dll/cpl/desk/desk.h index 3c479251cf..3bb02f3a74 100644 --- a/dll/cpl/desk/desk.h +++ b/dll/cpl/desk/desk.h @@ -122,13 +122,4 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*); INT_PTR CALLBACK AdvGeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -LONG -RegLoadMUIStringW(IN HKEY hKey, - IN LPCWSTR pszValue OPTIONAL, - OUT LPWSTR pszOutBuf, - IN DWORD cbOutBuf, - OUT LPDWORD pcbData OPTIONAL, - IN DWORD Flags, - IN LPCWSTR pszDirectory OPTIONAL); - #endif /* _DESK_H */ diff --git a/dll/cpl/desk/muireg.c b/dll/cpl/desk/muireg.c deleted file mode 100644 index 8754b43655..0000000000 --- a/dll/cpl/desk/muireg.c +++ /dev/null @@ -1,144 +0,0 @@ -#include "desk.h" - -/****************************************************************************** - * load_string [Internal] - * - * This is basically a copy of user32/resource.c's LoadStringW. Necessary to - * avoid importing user32, which is higher level than advapi32. Helper for - * RegLoadMUIString. - */ -static int load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMaxChars) -{ - HGLOBAL hMemory; - HRSRC hResource; - WCHAR *pString; - int idxString; - - /* Negative values have to be inverted. */ - if (HIWORD(resId) == 0xffff) - resId = (UINT)(-((INT)resId)); - - /* Load the resource into memory and get a pointer to it. */ - hResource = FindResourceW(hModule, MAKEINTRESOURCEW(LOWORD(resId >> 4) + 1), (LPWSTR)RT_STRING); - if (!hResource) return 0; - hMemory = LoadResource(hModule, hResource); - if (!hMemory) return 0; - pString = LockResource(hMemory); - - /* Strings are length-prefixed. Lowest nibble of resId is an index. */ - idxString = resId & 0xf; - while (idxString--) pString += *pString + 1; - - /* If no buffer is given, return length of the string. */ - if (!pwszBuffer) return *pString; - - /* Else copy over the string, respecting the buffer size. */ - cMaxChars = (*pString < cMaxChars) ? *pString : (cMaxChars - 1); - if (cMaxChars >= 0) - { - memcpy(pwszBuffer, pString+1, cMaxChars * sizeof(WCHAR)); - pwszBuffer[cMaxChars] = L'\0'; - } - - return cMaxChars; -} - - -/************************************************************************ - * RegLoadMUIStringW - * - * @implemented - */ -LONG -RegLoadMUIStringW(IN HKEY hKey, - IN LPCWSTR pszValue OPTIONAL, - OUT LPWSTR pszOutBuf, - IN DWORD cbOutBuf, - OUT LPDWORD pcbData OPTIONAL, - IN DWORD Flags, - IN LPCWSTR pszDirectory OPTIONAL) -{ - DWORD dwValueType, cbData; - LPWSTR pwszTempBuffer = NULL, pwszExpandedBuffer = NULL; - LONG result; - - /* Parameter sanity checks. */ - if (!hKey || !pszOutBuf) - return ERROR_INVALID_PARAMETER; - - if (pszDirectory && *pszDirectory) - { - //FIXME("BaseDir parameter not yet supported!\n"); - return ERROR_INVALID_PARAMETER; - } - - /* Check for value existence and correctness of it's type, allocate a buffer and load it. */ - result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, NULL, &cbData); - if (result != ERROR_SUCCESS) goto cleanup; - if (!(dwValueType == REG_SZ || dwValueType == REG_EXPAND_SZ) || !cbData) - { - result = ERROR_FILE_NOT_FOUND; - goto cleanup; - } - pwszTempBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); - if (!pwszTempBuffer) - { - result = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, (LPBYTE)pwszTempBuffer, &cbData); - if (result != ERROR_SUCCESS) goto cleanup; - - /* Expand environment variables, if appropriate, or copy the original string over. */ - if (dwValueType == REG_EXPAND_SZ) - { - cbData = ExpandEnvironmentStringsW(pwszTempBuffer, NULL, 0) * sizeof(WCHAR); - if (!cbData) goto cleanup; - pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); - if (!pwszExpandedBuffer) - { - result = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - ExpandEnvironmentStringsW(pwszTempBuffer, pwszExpandedBuffer, cbData); - } - else - { - pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); - memcpy(pwszExpandedBuffer, pwszTempBuffer, cbData); - } - - /* If the value references a resource based string, parse the value and load the string. - * Else just copy over the original value. */ - result = ERROR_SUCCESS; - if (*pwszExpandedBuffer != L'@') /* '@' is the prefix for resource based string entries. */ - { - lstrcpynW(pszOutBuf, pwszExpandedBuffer, cbOutBuf / sizeof(WCHAR)); - } - else - { - WCHAR *pComma = wcsrchr(pwszExpandedBuffer, L','); - UINT uiStringId; - HMODULE hModule; - - /* Format of the expanded value is 'path_to_dll,-resId' */ - if (!pComma || pComma[1] != L'-') - { - result = ERROR_BADKEY; - goto cleanup; - } - - uiStringId = _wtoi(pComma+2); - *pComma = L'\0'; - - hModule = LoadLibraryExW(pwszExpandedBuffer + 1, NULL, LOAD_LIBRARY_AS_DATAFILE); - if (!hModule || !load_string(hModule, uiStringId, pszOutBuf, cbOutBuf / sizeof(WCHAR))) - result = ERROR_BADKEY; - FreeLibrary(hModule); - } - -cleanup: - HeapFree(GetProcessHeap(), 0, pwszTempBuffer); - HeapFree(GetProcessHeap(), 0, pwszExpandedBuffer); - return result; -} diff --git a/dll/win32/advapi32/CMakeLists.txt b/dll/win32/advapi32/CMakeLists.txt index 196e67ee71..ff7961c492 100644 --- a/dll/win32/advapi32/CMakeLists.txt +++ b/dll/win32/advapi32/CMakeLists.txt @@ -62,6 +62,6 @@ add_library(advapi32 SHARED set_module_type(advapi32 win32dll UNICODE ENTRYPOINT DllMain 12) target_link_libraries(advapi32 cryptlib wine ${PSEH_LIB}) add_delay_importlibs(advapi32 secur32) -add_importlibs(advapi32 rpcrt4 kernel32 ntdll) +add_importlibs(advapi32 advapi32_vista rpcrt4 kernel32 ntdll) add_pch(advapi32 advapi32.h SOURCE) add_cd_file(TARGET advapi32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/advapi32/advapi32.spec b/dll/win32/advapi32/advapi32.spec index d30aa734fb..3414463328 100644 --- a/dll/win32/advapi32/advapi32.spec +++ b/dll/win32/advapi32/advapi32.spec @@ -682,3 +682,5 @@ 682 stub WmiSetSingleItemW 683 stub Wow64Win32ApiEntry 684 stdcall WriteEncryptedFileRaw(ptr ptr ptr) +685 stdcall -version=0x600+ RegLoadMUIStringW(ptr wstr wstr long ptr long wstr) advapi32_vista.RegLoadMUIStringW +686 stdcall -version=0x600+ RegLoadMUIStringA(ptr str str long ptr long str) advapi32_vista.RegLoadMUIStringA diff --git a/dll/win32/advapi32/reg/reg.c b/dll/win32/advapi32/reg/reg.c index 61845636ca..37ac117de6 100644 --- a/dll/win32/advapi32/reg/reg.c +++ b/dll/win32/advapi32/reg/reg.c @@ -5151,195 +5151,4 @@ RegUnLoadKeyW(HKEY hKey, return ERROR_SUCCESS; } - -/****************************************************************************** - * load_string [Internal] - * - * This is basically a copy of user32/resource.c's LoadStringW. Necessary to - * avoid importing user32, which is higher level than advapi32. Helper for - * RegLoadMUIString. - */ -static int load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMaxChars) -{ - HGLOBAL hMemory; - HRSRC hResource; - WCHAR *pString; - int idxString; - - /* Negative values have to be inverted. */ - if (HIWORD(resId) == 0xffff) - resId = (UINT)(-((INT)resId)); - - /* Load the resource into memory and get a pointer to it. */ - hResource = FindResourceW(hModule, MAKEINTRESOURCEW(LOWORD(resId >> 4) + 1), (LPWSTR)RT_STRING); - if (!hResource) return 0; - hMemory = LoadResource(hModule, hResource); - if (!hMemory) return 0; - pString = LockResource(hMemory); - - /* Strings are length-prefixed. Lowest nibble of resId is an index. */ - idxString = resId & 0xf; - while (idxString--) pString += *pString + 1; - - /* If no buffer is given, return length of the string. */ - if (!pwszBuffer) return *pString; - - /* Else copy over the string, respecting the buffer size. */ - cMaxChars = (*pString < cMaxChars) ? *pString : (cMaxChars - 1); - if (cMaxChars >= 0) - { - memcpy(pwszBuffer, pString+1, cMaxChars * sizeof(WCHAR)); - pwszBuffer[cMaxChars] = L'\0'; - } - - return cMaxChars; -} - - -/************************************************************************ - * RegLoadMUIStringW - * - * @implemented - */ -LONG WINAPI -RegLoadMUIStringW(IN HKEY hKey, - IN LPCWSTR pszValue OPTIONAL, - OUT LPWSTR pszOutBuf, - IN DWORD cbOutBuf, - OUT LPDWORD pcbData OPTIONAL, - IN DWORD Flags, - IN LPCWSTR pszDirectory OPTIONAL) -{ - DWORD dwValueType, cbData; - LPWSTR pwszTempBuffer = NULL, pwszExpandedBuffer = NULL; - LONG result; - - /* Parameter sanity checks. */ - if (!hKey || !pszOutBuf) - return ERROR_INVALID_PARAMETER; - - if (pszDirectory && *pszDirectory) - { - FIXME("BaseDir parameter not yet supported!\n"); - return ERROR_INVALID_PARAMETER; - } - - /* Check for value existence and correctness of it's type, allocate a buffer and load it. */ - result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, NULL, &cbData); - if (result != ERROR_SUCCESS) goto cleanup; - if (!(dwValueType == REG_SZ || dwValueType == REG_EXPAND_SZ) || !cbData) - { - result = ERROR_FILE_NOT_FOUND; - goto cleanup; - } - pwszTempBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); - if (!pwszTempBuffer) - { - result = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, (LPBYTE)pwszTempBuffer, &cbData); - if (result != ERROR_SUCCESS) goto cleanup; - - /* Expand environment variables, if appropriate, or copy the original string over. */ - if (dwValueType == REG_EXPAND_SZ) - { - cbData = ExpandEnvironmentStringsW(pwszTempBuffer, NULL, 0) * sizeof(WCHAR); - if (!cbData) goto cleanup; - pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); - if (!pwszExpandedBuffer) - { - result = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - ExpandEnvironmentStringsW(pwszTempBuffer, pwszExpandedBuffer, cbData); - } - else - { - pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); - memcpy(pwszExpandedBuffer, pwszTempBuffer, cbData); - } - - /* If the value references a resource based string, parse the value and load the string. - * Else just copy over the original value. */ - result = ERROR_SUCCESS; - if (*pwszExpandedBuffer != L'@') /* '@' is the prefix for resource based string entries. */ - { - lstrcpynW(pszOutBuf, pwszExpandedBuffer, cbOutBuf / sizeof(WCHAR)); - } - else - { - WCHAR *pComma = wcsrchr(pwszExpandedBuffer, L','); - UINT uiStringId; - HMODULE hModule; - - /* Format of the expanded value is 'path_to_dll,-resId' */ - if (!pComma || pComma[1] != L'-') - { - result = ERROR_BADKEY; - goto cleanup; - } - - uiStringId = _wtoi(pComma+2); - *pComma = L'\0'; - - hModule = LoadLibraryExW(pwszExpandedBuffer + 1, NULL, LOAD_LIBRARY_AS_DATAFILE); - if (!hModule || !load_string(hModule, uiStringId, pszOutBuf, cbOutBuf / sizeof(WCHAR))) - result = ERROR_BADKEY; - FreeLibrary(hModule); - } - -cleanup: - HeapFree(GetProcessHeap(), 0, pwszTempBuffer); - HeapFree(GetProcessHeap(), 0, pwszExpandedBuffer); - return result; -} - - -/************************************************************************ - * RegLoadMUIStringA - * - * @implemented - */ -LONG WINAPI -RegLoadMUIStringA(IN HKEY hKey, - IN LPCSTR pszValue OPTIONAL, - OUT LPSTR pszOutBuf, - IN DWORD cbOutBuf, - OUT LPDWORD pcbData OPTIONAL, - IN DWORD Flags, - IN LPCSTR pszDirectory OPTIONAL) -{ - UNICODE_STRING valueW, baseDirW; - WCHAR *pwszBuffer; - DWORD cbData = cbOutBuf * sizeof(WCHAR); - LONG result; - - valueW.Buffer = baseDirW.Buffer = pwszBuffer = NULL; - if (!RtlCreateUnicodeStringFromAsciiz(&valueW, pszValue) || - !RtlCreateUnicodeStringFromAsciiz(&baseDirW, pszDirectory) || - !(pwszBuffer = HeapAlloc(GetProcessHeap(), 0, cbData))) - { - result = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - - result = RegLoadMUIStringW(hKey, valueW.Buffer, pwszBuffer, cbData, NULL, Flags, - baseDirW.Buffer); - - if (result == ERROR_SUCCESS) - { - cbData = WideCharToMultiByte(CP_ACP, 0, pwszBuffer, -1, pszOutBuf, cbOutBuf, NULL, NULL); - if (pcbData) - *pcbData = cbData; - } - -cleanup: - HeapFree(GetProcessHeap(), 0, pwszBuffer); - RtlFreeUnicodeString(&baseDirW); - RtlFreeUnicodeString(&valueW); - - return result; -} - /* EOF */ diff --git a/dll/win32/advapi32_vista/CMakeLists.txt b/dll/win32/advapi32_vista/CMakeLists.txt index 4ba2a0a537..34fc459a13 100644 --- a/dll/win32/advapi32_vista/CMakeLists.txt +++ b/dll/win32/advapi32_vista/CMakeLists.txt @@ -9,10 +9,12 @@ list(APPEND SOURCE DllMain.c RegDeleteTree.c RegSetKeyValue.c + RegLoadMUIString.c ${CMAKE_CURRENT_BINARY_DIR}/advapi32_vista.def) add_library(advapi32_vista SHARED ${SOURCE}) set_module_type(advapi32_vista win32dll ENTRYPOINT DllMain 12) +target_link_libraries(advapi32_vista wine) add_importlibs(advapi32_vista advapi32 kernel32 ntdll) add_dependencies(advapi32_vista psdk) add_cd_file(TARGET advapi32_vista DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/shell32/vista.c b/dll/win32/advapi32_vista/RegLoadMUIString.c similarity index 88% rename from dll/win32/shell32/vista.c rename to dll/win32/advapi32_vista/RegLoadMUIString.c index 93ec06c07b..8d80949660 100644 --- a/dll/win32/shell32/vista.c +++ b/dll/win32/advapi32_vista/RegLoadMUIString.c @@ -1,35 +1,10 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: Copied from advapi32/reg/reg.c - * PURPOSE: Registry functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) - * Thomas Weidenmueller <w3seek(a)reactos.com> - * UPDATE HISTORY: - * Created 01/11/98 - * 19990309 EA Stubs - * 20050502 Fireball imported some stuff from WINE - */ - -/* FIXME: This file should go away once we properly handle Vista+ APIs */ - -#include <stdarg.h> +#include "advapi32_vista.h" -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> #include <winuser.h> -#define NTOS_MODE_USER -#include <ndk/rtlfuncs.h> - #include <wine/debug.h> #include <wine/unicode.h> -WINE_DEFAULT_DEBUG_CHANNEL(shell); +WINE_DEFAULT_DEBUG_CHANNEL(reg); /****************************************************************************** * load_string [Internal] diff --git a/dll/win32/advapi32_vista/advapi32_vista.spec b/dll/win32/advapi32_vista/advapi32_vista.spec index a3a38a65b7..969207292f 100644 --- a/dll/win32/advapi32_vista/advapi32_vista.spec +++ b/dll/win32/advapi32_vista/advapi32_vista.spec @@ -2,3 +2,5 @@ @ stdcall RegDeleteTreeA(long str) @ stdcall RegDeleteTreeW(long wstr) @ stdcall RegSetKeyValueW(long wstr wstr long ptr long) +@ stdcall RegLoadMUIStringW(ptr wstr wstr long ptr long wstr) +@ stdcall RegLoadMUIStringA(ptr str str long ptr long str) diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 65d5f0e3b8..c5d247abba 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -100,7 +100,6 @@ add_library(shell32 SHARED wine/shellstring.c wine/shlmenu.c wine/shpolicy.c - vista.c shell32.rc ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) @@ -112,7 +111,7 @@ set_source_files_properties(shell32.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT set_module_type(shell32 win32dll UNICODE) target_link_libraries(shell32 shellmenu shelldesktop atlnew wine uuid recyclebin) add_delay_importlibs(shell32 powrprof shdocvw devmgr winspool.drv winmm mpr uxtheme ole32 oleaut32 userenv browseui version fmifs) -add_importlibs(shell32 advapi32 gdi32 user32 comctl32 comdlg32 shlwapi msvcrt kernel32 ntdll) +add_importlibs(shell32 advapi32 advapi32_vista gdi32 user32 comctl32 comdlg32 shlwapi msvcrt kernel32 ntdll) add_dependencies(shell32 stdole2) # shell32_shldisp.tlb needs stdole2.tlb add_pch(shell32 precomp.h SOURCE) add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all)

1 0

01/01: [NTOS:MM] Update a DPRINT string (#760)
by Serge Gautherie 16 Aug '18

16 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=20d4b2cfac12184c27eee… commit 20d4b2cfac12184c27eeee8b6840e6e3fd7345aa Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Aug 16 15:10:24 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 16 15:10:24 2018 +0200 [NTOS:MM] Update a DPRINT string (#760) CORE-12729 --- ntoskrnl/mm/marea.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/marea.c b/ntoskrnl/mm/marea.c index 9cf006f804..537c17b0dd 100644 --- a/ntoskrnl/mm/marea.c +++ b/ntoskrnl/mm/marea.c @@ -375,7 +375,7 @@ MmFreeMemoryArea( #endif ExFreePoolWithTag(MemoryArea, TAG_MAREA); - DPRINT("MmFreeMemoryAreaByNode() succeeded\n"); + DPRINT("MmFreeMemoryArea() succeeded\n"); return STATUS_SUCCESS; }

1 0

01/01: [FONT][WIN32SS] Support MS symbol encoding (#759)
by Katayama Hirofumi MZ 16 Aug '18

16 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b89e663af7e5e23c46cd… commit 5b89e663af7e5e23c46cde20705f3c75dbd5de0b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 16 21:38:46 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 16 14:38:46 2018 +0200 [FONT][WIN32SS] Support MS symbol encoding (#759) This commit adds support for the MS symbol encoding (FT_ENCODING_MS_SYMBOL) in our font engine. It also fixes the display of the Anastasia font. And replacing our Marlett font with Windows' Marlett font is also fixed. CORE-13269, CORE-14907 --- win32ss/gdi/ntgdi/freetype.c | 116 +++++++++++++++++++++++++++---------------- 1 file changed, 73 insertions(+), 43 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 31d68a1615..118b7444e4 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1536,8 +1536,11 @@ static BOOL face_has_symbol_charmap(FT_Face ft_face) for(i = 0; i < ft_face->num_charmaps; i++) { - if(ft_face->charmaps[i]->encoding == FT_ENCODING_MS_SYMBOL) + if (ft_face->charmaps[i]->platform_id == TT_PLATFORM_MICROSOFT && + ft_face->charmaps[i]->encoding == FT_ENCODING_MS_SYMBOL) + { return TRUE; + } } return FALSE; } @@ -3155,19 +3158,31 @@ TextIntUpdateSize(PDC dc, for (n = 0; n < face->num_charmaps; n++) { charmap = face->charmaps[n]; - DPRINT("Found charmap encoding: %i\n", charmap->encoding); - if (charmap->encoding != 0) + if (charmap->encoding == FT_ENCODING_UNICODE) { found = charmap; break; } } if (!found) + { + for (n = 0; n < face->num_charmaps; n++) + { + charmap = face->charmaps[n]; + if (charmap->encoding == FT_ENCODING_MS_SYMBOL) + { + found = charmap; + break; + } + } + } + if (!found) { DPRINT1("WARNING: Could not find desired charmap!\n"); } else { + DPRINT("Found charmap encoding: %i\n", found->encoding); error = FT_Set_Charmap(face, found); if (error) { @@ -3192,6 +3207,49 @@ TextIntUpdateSize(PDC dc, return TRUE; } +static inline FT_UInt FASTCALL +get_glyph_index_symbol(FT_Face ft_face, UINT glyph) +{ + FT_UInt ret; + + if (glyph < 0x100) glyph += 0xf000; + /* there are a number of old pre-Unicode "broken" TTFs, which + do have symbols at U+00XX instead of U+f0XX */ + if (!(ret = FT_Get_Char_Index(ft_face, glyph))) + ret = FT_Get_Char_Index(ft_face, glyph - 0xf000); + + return ret; +} + +static inline FT_UInt FASTCALL +get_glyph_index(FT_Face ft_face, UINT glyph) +{ + FT_UInt ret; + + if (face_has_symbol_charmap(ft_face)) + { + ret = get_glyph_index_symbol(ft_face, glyph); + if (ret != 0) + return ret; + } + + return FT_Get_Char_Index(ft_face, glyph); +} + +static inline FT_UInt FASTCALL +get_glyph_index_flagged(FT_Face face, FT_ULong code, DWORD indexed_flag, DWORD flags) +{ + FT_UInt glyph_index; + if (flags & indexed_flag) + { + glyph_index = code; + } + else + { + glyph_index = get_glyph_index(face, code); + } + return glyph_index; +} /* * Based on WineEngGetGlyphOutline @@ -3280,12 +3338,8 @@ ftGdiGetGlyphOutline( TEXTOBJ_UnlockText(TextObj); - if (iFormat & GGO_GLYPH_INDEX) - { - glyph_index = wch; - iFormat &= ~GGO_GLYPH_INDEX; - } - else glyph_index = FT_Get_Char_Index(ft_face, wch); + glyph_index = get_glyph_index_flagged(ft_face, wch, GGO_GLYPH_INDEX, iFormat); + iFormat &= ~GGO_GLYPH_INDEX; if (orientation || (iFormat != GGO_METRICS && iFormat != GGO_BITMAP) || aveWidth || pmat2) load_flags |= FT_LOAD_NO_BITMAP; @@ -3727,10 +3781,7 @@ TextIntGetTextExtentPoint(PDC dc, for (i = 0; i < Count; i++) { - if (fl & GTEF_INDICES) - glyph_index = *String; - else - glyph_index = FT_Get_Char_Index(face, *String); + glyph_index = get_glyph_index_flagged(face, *String, GTEF_INDICES, fl); if (EmuBold || EmuItalic) realglyph = NULL; @@ -5503,10 +5554,7 @@ GreExtTextOutW( for (i = iStart; i < Count; i++) { - if (fuOptions & ETO_GLYPH_INDEX) - glyph_index = *TempText; - else - glyph_index = FT_Get_Char_Index(face, *TempText); + glyph_index = get_glyph_index_flagged(face, *TempText, ETO_GLYPH_INDEX, fuOptions); if (EmuBold || EmuItalic) realglyph = NULL; @@ -5608,10 +5656,7 @@ GreExtTextOutW( BackgroundLeft = (RealXStart + 32) >> 6; for (i = 0; i < Count; ++i) { - if (fuOptions & ETO_GLYPH_INDEX) - glyph_index = String[i]; - else - glyph_index = FT_Get_Char_Index(face, String[i]); + glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions); error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) @@ -5726,10 +5771,7 @@ GreExtTextOutW( BackgroundLeft = (RealXStart + 32) >> 6; for (i = 0; i < Count; ++i) { - if (fuOptions & ETO_GLYPH_INDEX) - glyph_index = String[i]; - else - glyph_index = FT_Get_Char_Index(face, String[i]); + glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions); if (EmuBold || EmuItalic) realglyph = NULL; @@ -6271,17 +6313,11 @@ NtGdiGetCharABCWidthsW( if (Safepwch) { - if (fl & GCABCW_INDICES) - glyph_index = Safepwch[i - FirstChar]; - else - glyph_index = FT_Get_Char_Index(face, Safepwch[i - FirstChar]); + glyph_index = get_glyph_index_flagged(face, Safepwch[i - FirstChar], GCABCW_INDICES, fl); } else { - if (fl & GCABCW_INDICES) - glyph_index = i; - else - glyph_index = FT_Get_Char_Index(face, i); + glyph_index = get_glyph_index_flagged(face, i, GCABCW_INDICES, fl); } FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); @@ -6465,17 +6501,11 @@ NtGdiGetCharWidthW( { if (Safepwc) { - if (fl & GCW_INDICES) - glyph_index = Safepwc[i - FirstChar]; - else - glyph_index = FT_Get_Char_Index(face, Safepwc[i - FirstChar]); + glyph_index = get_glyph_index_flagged(face, Safepwc[i - FirstChar], GCW_INDICES, fl); } else { - if (fl & GCW_INDICES) - glyph_index = i; - else - glyph_index = FT_Get_Char_Index(face, i); + glyph_index = get_glyph_index_flagged(face, i, GCW_INDICES, fl); } FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (!fl) @@ -6587,7 +6617,7 @@ NtGdiGetGlyphIndicesW( if (FT_IS_SFNT(Face)) { TT_OS2 *pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2); - DefChar = (pOS2->usDefaultChar ? FT_Get_Char_Index(Face, pOS2->usDefaultChar) : 0); + DefChar = (pOS2->usDefaultChar ? get_glyph_index(Face, pOS2->usDefaultChar) : 0); } else { @@ -6631,7 +6661,7 @@ NtGdiGetGlyphIndicesW( for (i = 0; i < cwc; i++) { - Buffer[i] = FT_Get_Char_Index(FontGDI->SharedFace->Face, Safepwc[i]); + Buffer[i] = get_glyph_index(FontGDI->SharedFace->Face, Safepwc[i]); if (Buffer[i] == 0) { Buffer[i] = DefChar;

1 0

06/06: [USBPORT] Fix 64 bit warnings.
by Thomas Faber 16 Aug '18

16 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5403094339e9aaaf4cdd6… commit 5403094339e9aaaf4cdd624b7d26ab22969c90bf Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Aug 16 14:10:35 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Aug 16 14:14:42 2018 +0200 [USBPORT] Fix 64 bit warnings. --- drivers/usb/usbport/pnp.c | 2 +- drivers/usb/usbport/usbport.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/usb/usbport/pnp.c b/drivers/usb/usbport/pnp.c index 5033cc1d92..4e7a545b27 100644 --- a/drivers/usb/usbport/pnp.c +++ b/drivers/usb/usbport/pnp.c @@ -1709,7 +1709,7 @@ USBPORT_PdoPnP(IN PDEVICE_OBJECT PdoDevice, L"USB\\ROOT_HUB"); } - Length = (wcslen(Buffer) + 1); + Length = (LONG)(wcslen(Buffer) + 1); Id = ExAllocatePoolWithTag(PagedPool, Length * sizeof(WCHAR), diff --git a/drivers/usb/usbport/usbport.c b/drivers/usb/usbport/usbport.c index 29c9ff9e27..f37adb85b0 100644 --- a/drivers/usb/usbport/usbport.c +++ b/drivers/usb/usbport/usbport.c @@ -1844,9 +1844,11 @@ USBPORT_AddDevice(IN PDRIVER_OBJECT DriverObject, RtlInitUnicodeString(&DeviceName, CharDeviceName); - Length = sizeof(USBPORT_DEVICE_EXTENSION) + - MiniPortInterface->Packet.MiniPortExtensionSize + - sizeof(USB2_HC_EXTENSION); + ASSERT(MiniPortInterface->Packet.MiniPortExtensionSize <= + MAXULONG - sizeof(USBPORT_DEVICE_EXTENSION) - sizeof(USB2_HC_EXTENSION)); + Length = (ULONG)(sizeof(USBPORT_DEVICE_EXTENSION) + + MiniPortInterface->Packet.MiniPortExtensionSize + + sizeof(USB2_HC_EXTENSION)); /* Create device */ Status = IoCreateDevice(DriverObject,

1 0

05/06: [USBPORT] Specify the correct length for the root hub's hub descriptor.
by Thomas Faber 16 Aug '18

16 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd4529b7174e1bcee4146… commit bd4529b7174e1bcee41464a431dd4acbc40b0817 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Aug 16 14:10:15 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Aug 16 14:14:31 2018 +0200 [USBPORT] Specify the correct length for the root hub's hub descriptor. --- drivers/usb/usbport/roothub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/usbport/roothub.c b/drivers/usb/usbport/roothub.c index 984569f406..5808b42cfa 100644 --- a/drivers/usb/usbport/roothub.c +++ b/drivers/usb/usbport/roothub.c @@ -786,7 +786,7 @@ USBPORT_RootHubCreateDevice(IN PDEVICE_OBJECT FdoDevice, Packet->RH_GetRootHubData(FdoExtension->MiniPortExt, &RootHubData); ASSERT(RootHubData.NumberOfPorts != 0); - NumMaskByte = ((RootHubData.NumberOfPorts - 1) >> 3) + 1; + NumMaskByte = (RootHubData.NumberOfPorts - 1) / 8 + 1; DescriptorsLength = sizeof(USB_DEVICE_DESCRIPTOR) + sizeof(USB_CONFIGURATION_DESCRIPTOR) + @@ -859,7 +859,7 @@ USBPORT_RootHubCreateDevice(IN PDEVICE_OBJECT FdoDevice, RH_HubDescriptor = &PdoExtension->RootHubDescriptors->Descriptor; - RH_HubDescriptor->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR) + 2 * NumMaskByte; + RH_HubDescriptor->bDescriptorLength = FIELD_OFFSET(USB_HUB_DESCRIPTOR, bRemoveAndPowerMask) + 2 * NumMaskByte; if (Packet->MiniPortVersion == USB_MINIPORT_VERSION_OHCI || Packet->MiniPortVersion == USB_MINIPORT_VERSION_UHCI ||

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
31
Older →

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 August 2018