Ros-diffs October 2019

ros-diffs@reactos.org

23 participants
180 discussions

[reactos] 02/02: [HALXBOX] Implement shutdown, reboot, and power cycle routines
by Stanislav Motylkov 05 Oct '19

05 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4ede03e192ae492b796e… commit d4ede03e192ae492b796ee7c8d6c9c71409ec56a Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Oct 4 22:04:51 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 5 17:42:28 2019 +0200 [HALXBOX] Implement shutdown, reboot, and power cycle routines CORE-16216 --- hal/halx86/xbox.cmake | 2 +- hal/halx86/xbox/halxbox.h | 28 +++++++++-- hal/halx86/xbox/reboot.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 6 deletions(-) diff --git a/hal/halx86/xbox.cmake b/hal/halx86/xbox.cmake index a259df7a57c..c3604e70dfe 100644 --- a/hal/halx86/xbox.cmake +++ b/hal/halx86/xbox.cmake @@ -15,7 +15,6 @@ list(APPEND HAL_XBOX_SOURCE generic/memory.c generic/misc.c generic/pic.c - generic/reboot.c generic/sysinfo.c generic/usage.c generic/bios.c @@ -34,6 +33,7 @@ list(APPEND HAL_XBOX_SOURCE generic/timer.c xbox/part_xbox.c xbox/halinit_xbox.c + xbox/reboot.c up/pic.c) add_asm_files(lib_hal_xbox_asm ${HAL_XBOX_ASM_SOURCE}) diff --git a/hal/halx86/xbox/halxbox.h b/hal/halx86/xbox/halxbox.h index b27c6e31c23..5e4a5228800 100644 --- a/hal/halx86/xbox/halxbox.h +++ b/hal/halx86/xbox/halxbox.h @@ -1,11 +1,14 @@ /* - * COPYRIGHT: See COPYING in the top level directory * PROJECT: Xbox HAL - * FILE: hal/halx86/xbox/halxbox.h + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Xbox specific routines - * PROGRAMMER: Ge van Geldorp (gvg(a)reactos.com) - * UPDATE HISTORY: - * Created 2004/12/02 + * COPYRIGHT: Copyright 2004 Gé van Geldorp (gvg(a)reactos.com) + * Copyright 2019 Stanislav Motylkov (x86corez(a)gmail.com) + * + * REFERENCES: https://xboxdevwiki.net/SMBus + * https://github.com/XboxDev/cromwell/blob/master/drivers/pci/i2cio.c + * https://github.com/torvalds/linux/blob/master/drivers/i2c/busses/i2c-amd756… + * https://github.com/xqemu/xqemu/blob/master/hw/xbox/smbus_xbox_smc.c */ #ifndef HALXBOX_H_INCLUDED @@ -14,6 +17,21 @@ #include <hal.h> #include <ntdddisk.h> +#define SMB_IO_BASE 0xC000 + +#define SMB_GLOBAL_STATUS (0 + SMB_IO_BASE) +#define SMB_GLOBAL_ENABLE (2 + SMB_IO_BASE) +#define SMB_HOST_ADDRESS (4 + SMB_IO_BASE) +#define SMB_HOST_DATA (6 + SMB_IO_BASE) +#define SMB_HOST_COMMAND (8 + SMB_IO_BASE) + +#define SMB_DEVICE_SMC_PIC16LC 0x10 + +#define SMC_REG_POWER 0x02 +#define SMC_REG_POWER_RESET 0x01 +#define SMC_REG_POWER_CYCLE 0x40 +#define SMC_REG_POWER_SHUTDOWN 0x80 + VOID HalpXboxInitPciBus(PBUS_HANDLER BusHandler); VOID HalpXboxInitPartIo(VOID); diff --git a/hal/halx86/xbox/reboot.c b/hal/halx86/xbox/reboot.c new file mode 100644 index 00000000000..1f2dec387c1 --- /dev/null +++ b/hal/halx86/xbox/reboot.c @@ -0,0 +1,115 @@ +/* + * PROJECT: Xbox HAL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Xbox reboot functions + * COPYRIGHT: Copyright 2004 Lehner Franz (franz(a)caos.at) + * Copyright 2019 Stanislav Motylkov (x86corez(a)gmail.com) + * + * REFERENCES: https://xboxdevwiki.net/SMBus + * https://github.com/XboxDev/cromwell/blob/master/drivers/pci/i2cio.c + * https://github.com/torvalds/linux/blob/master/drivers/i2c/busses/i2c-amd756… + * https://github.com/xqemu/xqemu/blob/master/hw/xbox/smbus_xbox_smc.c + */ + +/* INCLUDES ******************************************************************/ + +#include "halxbox.h" + +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +SMBusWriteByte(UCHAR Address, UCHAR Register, UCHAR Data) +{ + INT Retries = 50; + + /* Wait while bus is busy with any master traffic */ + while (READ_PORT_USHORT((PUSHORT)SMB_GLOBAL_STATUS) & 0x800) + { + NOTHING; + } + + while (Retries--) + { + UCHAR b; + + WRITE_PORT_UCHAR((PUCHAR)SMB_HOST_ADDRESS, Address << 1); + WRITE_PORT_UCHAR((PUCHAR)SMB_HOST_COMMAND, Register); + + WRITE_PORT_UCHAR((PUCHAR)SMB_HOST_DATA, Data); + + /* Clear down all preexisting errors */ + WRITE_PORT_USHORT((PUSHORT)SMB_GLOBAL_STATUS, READ_PORT_USHORT((PUSHORT)SMB_GLOBAL_STATUS)); + + /* Let I2C SMBus know we're sending a single byte here */ + WRITE_PORT_UCHAR((PUCHAR)SMB_GLOBAL_ENABLE, 0x1A); + + b = 0; + + while (!(b & 0x36)) + { + b = READ_PORT_UCHAR((PUCHAR)SMB_GLOBAL_STATUS); + } + + if (b & 0x10) + { + return; + } + + KeStallExecutionProcessor(1); + } +} + +VOID +DECLSPEC_NORETURN +NTAPI +HalpXboxPowerAction(IN UCHAR Action) +{ + SMBusWriteByte(SMB_DEVICE_SMC_PIC16LC, SMC_REG_POWER, Action); + + /* Halt the CPU */ + __halt(); + + while (TRUE); /* 'noreturn' function */ +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +VOID +NTAPI +HalReturnToFirmware(IN FIRMWARE_REENTRY Action) +{ + /* Check what kind of action this is */ + switch (Action) + { + /* All recognized actions */ + case HalPowerDownRoutine: + { + /* Call the internal power function */ + HalpXboxPowerAction(SMC_REG_POWER_SHUTDOWN); + } + case HalRestartRoutine: + { + HalpXboxPowerAction(SMC_REG_POWER_CYCLE); + } + case HalRebootRoutine: + { + HalpXboxPowerAction(SMC_REG_POWER_RESET); + } + /* Anything else */ + default: + { + /* Print message and break */ + DbgPrint("HalReturnToFirmware(%d) called!\n", Action); + DbgBreakPoint(); + } + } +} + +/* EOF */

1 0

[reactos] 01/02: [HALXBOX][CMAKE] Merge generic module with xbox module for modification
by Stanislav Motylkov 05 Oct '19

05 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c36050972478df0bad86b… commit c36050972478df0bad86bd48cfa7cbf9f83f556a Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Oct 4 20:42:16 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 5 17:42:28 2019 +0200 [HALXBOX][CMAKE] Merge generic module with xbox module for modification --- hal/halx86/CMakeLists.txt | 2 +- hal/halx86/xbox.cmake | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index 7ed08815974..b95b69b7723 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -63,7 +63,7 @@ if(ARCH STREQUAL "i386") add_hal(halacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up pic) add_hal(halapic SOURCES acpi/halacpi.rc COMPONENTS generic legacy up apic) add_hal(halaacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up apic) - add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS generic up xbox) + add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS xbox up) #add_hal(halmps SOURCES up/halup.rc COMPONENTS generic legacy smp pic) #add_hal(halmacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi smp pic) diff --git a/hal/halx86/xbox.cmake b/hal/halx86/xbox.cmake index d21cb602894..a259df7a57c 100644 --- a/hal/halx86/xbox.cmake +++ b/hal/halx86/xbox.cmake @@ -2,9 +2,24 @@ list(APPEND HAL_XBOX_ASM_SOURCE generic/systimer.S generic/trap.S + generic/v86.S up/pic.S) list(APPEND HAL_XBOX_SOURCE + generic/beep.c + generic/cmos.c + generic/display.c + generic/dma.c + generic/drive.c + generic/halinit.c + generic/memory.c + generic/misc.c + generic/pic.c + generic/reboot.c + generic/sysinfo.c + generic/usage.c + generic/bios.c + generic/portio.c legacy/bus/bushndlr.c legacy/bus/cmosbus.c legacy/bus/isabus.c

1 0

[reactos] 01/01: Shell Find Improvements to make Search Item general and Show Sub-directories (#1927)
by Doug Lyons 05 Oct '19

05 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6b7bda44328c9fd5d9c1… commit b6b7bda44328c9fd5d9c1e94a9042723209b80c2 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Oct 5 09:32:49 2019 -0500 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Oct 5 16:32:49 2019 +0200 Shell Find Improvements to make Search Item general and Show Sub-directories (#1927) * Shell Find Improvement to make Search Item general by adding asterisks before and after before search and show sub-directories in find listing. CORE-16152 --- dll/win32/browseui/shellfind/CFindFolder.cpp | 6 ++++++ dll/win32/browseui/shellfind/CSearchBar.cpp | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index 0a2aec890ac..4db35f633b3 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -260,6 +260,12 @@ static UINT RecursiveFind(LPCWSTR lpPath, _SearchData *pSearchData) if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { CStringW status; + if ((pSearchData->szFileName.IsEmpty() || PathMatchSpecW(FindData.cFileName, pSearchData->szFileName)) + && (pSearchData->szQueryA.IsEmpty() || SearchFile(szPath, pSearchData))) + { + PostMessageW(pSearchData->hwnd, WM_SEARCH_ADD_RESULT, 0, (LPARAM) StrDupW(szPath)); + uTotalFound++; + } status.Format(IDS_SEARCH_FOLDER, FindData.cFileName); PostMessageW(pSearchData->hwnd, WM_SEARCH_UPDATE_STATUS, 0, (LPARAM) StrDupW(status.GetBuffer())); diff --git a/dll/win32/browseui/shellfind/CSearchBar.cpp b/dll/win32/browseui/shellfind/CSearchBar.cpp index 6d486cec370..5e7117193d4 100644 --- a/dll/win32/browseui/shellfind/CSearchBar.cpp +++ b/dll/win32/browseui/shellfind/CSearchBar.cpp @@ -122,6 +122,10 @@ HRESULT CSearchBar::GetSearchResultsFolder(IShellBrowser **ppShellBrowser, HWND LRESULT CSearchBar::OnSearchButtonClicked(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + size_t len = 0; + WCHAR endchar; + WCHAR startchar; + CComHeapPtr<SearchStart> pSearchStart(static_cast<SearchStart *>(CoTaskMemAlloc(sizeof(SearchStart)))); GetDlgItemText(IDC_SEARCH_FILENAME, pSearchStart->szFileName, _countof(pSearchStart->szFileName)); GetDlgItemText(IDC_SEARCH_QUERY, pSearchStart->szQuery, _countof(pSearchStart->szQuery)); @@ -131,6 +135,30 @@ LRESULT CSearchBar::OnSearchButtonClicked(WORD wNotifyCode, WORD wID, HWND hWndC return 0; } + // See if we have an szFileName by testing for its entry lenth > 0 and our searched FileName does not contain + // an asterisk or a question mark. If so, then prepend and append an asterisk to the searched FileName. + // (i.e. it's equivalent to searching for *<the_file_name>* ) + if (FAILED (StringCchLengthW (pSearchStart->szFileName, MAX_PATH, &len))) return 0; + if ((len > 0) && !wcspbrk(pSearchStart->szFileName, L"*?")) + { + endchar = pSearchStart->szFileName[len - 1]; + startchar = pSearchStart->szFileName[0]; + if ((len < MAX_PATH - 1) && (startchar != L'*')) + { + memmove(&pSearchStart->szFileName[1], &pSearchStart->szFileName[0], + len * sizeof(WCHAR) + sizeof(WCHAR)); + len = len + 1; + pSearchStart->szFileName[0] = L'*'; + } + + // See if our last character is an asterisk and if not and we have room then add one + if ((len < MAX_PATH - 1) && (endchar != L'*')) + StringCchCatW(pSearchStart->szFileName, MAX_PATH, L"*"); + } + + // Print our final search string for szFileName + TRACE("Searched szFileName is '%S'.\n", pSearchStart->szFileName); + CComPtr<IShellBrowser> pShellBrowser; HRESULT hr = IUnknown_QueryService(m_pSite, SID_SShellBrowser, IID_PPV_ARG(IShellBrowser, &pShellBrowser)); if (FAILED_UNEXPECTEDLY(hr))

1 0

[reactos] 01/01: [D3DCOMPILER_43] Addendum to last commit CORE-14955 & CORE-15652
by Joachim Henze 03 Oct '19

03 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36d9e80add6c295ce05a3… commit 36d9e80add6c295ce05a3655eb23b1efd1f3fff7 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Thu Oct 3 21:16:39 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Thu Oct 3 21:16:39 2019 +0200 [D3DCOMPILER_43] Addendum to last commit CORE-14955 & CORE-15652 GCC Linux build had no issues with the last commit but MSVC x86 & x64 v18.0.31101.0 choked on it with error C4133: 'function' : incompatible types - from 'D3D_PRIMITIVE *' to 'DWORD *' and similar. I could not retest with that exact version of MSVC, but the mentioned problems vanished for me when compiling locally with MSVC 16.0.40219.1 x86. Fingers crossed, that this makes the builders happy again! --- dll/directx/wine/d3dcompiler_43/reflection.c | 41 ++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dll/directx/wine/d3dcompiler_43/reflection.c b/dll/directx/wine/d3dcompiler_43/reflection.c index 5a59c64f94d..e04c5c2dfb8 100644 --- a/dll/directx/wine/d3dcompiler_43/reflection.c +++ b/dll/directx/wine/d3dcompiler_43/reflection.c @@ -1107,10 +1107,18 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c skip_dword_unknown(&ptr, 1); +#ifdef __REACTOS__ /* DWORD* cast added */ + read_dword(&ptr, (DWORD*)&r->input_primitive); +#else read_dword(&ptr, &r->input_primitive); +#endif TRACE("InputPrimitive: %x\n", r->input_primitive); +#ifdef __REACTOS__ /* DWORD* cast added */ + read_dword(&ptr, (DWORD*)&r->gs_output_topology); +#else read_dword(&ptr, &r->gs_output_topology); +#endif TRACE("GSOutputTopology: %x\n", r->gs_output_topology); read_dword(&ptr, &r->gs_max_output_vertex_count); @@ -1126,13 +1134,25 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c read_dword(&ptr, &r->c_control_points); TRACE("cControlPoints: %u\n", r->c_control_points); +#ifdef __REACTOS__ /* DWORD* cast added */ + read_dword(&ptr, (DWORD*)&r->hs_output_primitive); +#else read_dword(&ptr, &r->hs_output_primitive); +#endif TRACE("HSOutputPrimitive: %x\n", r->hs_output_primitive); +#ifdef __REACTOS__ /* DWORD* cast added */ + read_dword(&ptr, (DWORD*)&r->hs_prtitioning); +#else read_dword(&ptr, &r->hs_prtitioning); +#endif TRACE("HSPartitioning: %x\n", r->hs_prtitioning); +#ifdef __REACTOS__ /* DWORD* cast added */ + read_dword(&ptr, (DWORD*)&r->tessellator_domain); +#else read_dword(&ptr, &r->tessellator_domain); +#endif TRACE("TessellatorDomain: %x\n", r->tessellator_domain); skip_dword_unknown(&ptr, 3); @@ -1438,13 +1458,25 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c desc->Name = string_data + (offset - string_data_offset); TRACE("Input bind Name: %s\n", debugstr_a(desc->Name)); +#ifdef __REACTOS__ /* DWORD* cast added */ + read_dword(&ptr, (DWORD*)&desc->Type); +#else read_dword(&ptr, &desc->Type); +#endif TRACE("Input bind Type: %#x\n", desc->Type); +#ifdef __REACTOS__ /* DWORD* cast added */ + read_dword(&ptr, (DWORD*)&desc->ReturnType); +#else read_dword(&ptr, &desc->ReturnType); +#endif TRACE("Input bind ReturnType: %#x\n", desc->ReturnType); +#ifdef __REACTOS__ /* DWORD* cast added */ + read_dword(&ptr, (DWORD*)&desc->Dimension); +#else read_dword(&ptr, &desc->Dimension); +#endif TRACE("Input bind Dimension: %#x\n", desc->Dimension); read_dword(&ptr, &desc->NumSamples); @@ -1507,7 +1539,11 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c read_dword(&ptr, &cb->flags); TRACE("Cbuffer flags: %u\n", cb->flags); +#ifdef __REACTOS__ /* DWORD* cast added */ + read_dword(&ptr, (DWORD*)&cb->type); +#else read_dword(&ptr, &cb->type); +#endif TRACE("Cbuffer type: %#x\n", cb->type); } } @@ -1603,8 +1639,13 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * read_dword(&ptr, &name_offset); d[i].SemanticName = string_data + (name_offset - string_data_offset); read_dword(&ptr, &d[i].SemanticIndex); +#ifdef __REACTOS__ /* DWORD* casts added */ + read_dword(&ptr, (DWORD*)&d[i].SystemValueType); + read_dword(&ptr, (DWORD*)&d[i].ComponentType); +#else read_dword(&ptr, &d[i].SystemValueType); read_dword(&ptr, &d[i].ComponentType); +#endif read_dword(&ptr, &d[i].Register); read_dword(&ptr, &mask); d[i].ReadWriteMask = (mask >> 8) & 0xff;

1 0

[reactos] 01/01: [MEDIA][FONTS] Replace 'Verdana' fonts CORE-16400 (#1948)
by Katayama Hirofumi MZ 03 Oct '19

03 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f45dd6577321355752e29… commit f45dd6577321355752e29ccd5f49039cfdaa761e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 3 22:36:05 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 3 22:36:05 2019 +0900 [MEDIA][FONTS] Replace 'Verdana' fonts CORE-16400 (#1948) CORE-16400 - Replace "Verdana", "Verdana Bold", "Verdana Bold Italic" and "Verdana Italic" fonts by duplicating "DejaVu Sans" fonts and renaming them. - Replace LICENSE file. I made these font files by using FontForge. Their family name is "Verdana". Their display names are "Verdana", "Verdana Bold", "Verdana Bold Italic" and "Verdana Italic". Their font filenames are verdana.ttf, verdanab.ttf, verdanaz.ttf and verdanai.ttf. The Underline Positions are hacked by adding an integer value for workaround of FontForge's bug. --- media/fonts/doc/Verdana/COPYRIGHT.TXT | 124 ---------------------- media/fonts/doc/Verdana/LICENSE.txt | 187 ++++++++++++++++++++++++++++++++++ media/fonts/doc/Verdana/README.txt | 4 +- media/fonts/verdana.ttf | Bin 38412 -> 571444 bytes media/fonts/verdanab.ttf | Bin 36204 -> 564632 bytes media/fonts/verdanai.ttf | Bin 34016 -> 524184 bytes media/fonts/verdanaz.ttf | Bin 37124 -> 534876 bytes 7 files changed, 189 insertions(+), 126 deletions(-) diff --git a/media/fonts/doc/Verdana/COPYRIGHT.TXT b/media/fonts/doc/Verdana/COPYRIGHT.TXT deleted file mode 100644 index e651be1c4fe..00000000000 --- a/media/fonts/doc/Verdana/COPYRIGHT.TXT +++ /dev/null @@ -1,124 +0,0 @@ -Bitstream Vera Fonts Copyright - -The fonts have a generous copyright, allowing derivative works (as -long as "Bitstream" or "Vera" are not in the names), and full -redistribution (so long as they are not *sold* by themselves). They -can be be bundled, redistributed and sold with any software. - -The fonts are distributed under the following copyright: - -Copyright -========= - -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream -Vera is a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the fonts accompanying this license ("Fonts") and associated -documentation files (the "Font Software"), to reproduce and distribute -the Font Software, including without limitation the rights to use, -copy, merge, publish, distribute, and/or sell copies of the Font -Software, and to permit persons to whom the Font Software is furnished -to do so, subject to the following conditions: - -The above copyright and trademark notices and this permission notice -shall be included in all copies of one or more of the Font Software -typefaces. - -The Font Software may be modified, altered, or added to, and in -particular the designs of glyphs or characters in the Fonts may be -modified and additional glyphs or characters may be added to the -Fonts, only if the fonts are renamed to names not containing either -the words "Bitstream" or the word "Vera". - -This License becomes null and void to the extent applicable to Fonts -or Font Software that has been modified and is distributed under the -"Bitstream Vera" names. - -The Font Software may be sold as part of a larger software package but -no copy of one or more of the Font Software typefaces may be sold by -itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL -BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, -OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT -SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. - -Except as contained in this notice, the names of Gnome, the Gnome -Foundation, and Bitstream Inc., shall not be used in advertising or -otherwise to promote the sale, use or other dealings in this Font -Software without prior written authorization from the Gnome Foundation -or Bitstream Inc., respectively. For further information, contact: -fonts at gnome dot org. - -Copyright FAQ -============= - - 1. I don't understand the resale restriction... What gives? - - Bitstream is giving away these fonts, but wishes to ensure its - competitors can't just drop the fonts as is into a font sale system - and sell them as is. It seems fair that if Bitstream can't make money - from the Bitstream Vera fonts, their competitors should not be able to - do so either. You can sell the fonts as part of any software package, - however. - - 2. I want to package these fonts separately for distribution and - sale as part of a larger software package or system. Can I do so? - - Yes. A RPM or Debian package is a "larger software package" to begin - with, and you aren't selling them independently by themselves. - See 1. above. - - 3. Are derivative works allowed? - Yes! - - 4. Can I change or add to the font(s)? - Yes, but you must change the name(s) of the font(s). - - 5. Under what terms are derivative works allowed? - - You must change the name(s) of the fonts. This is to ensure the - quality of the fonts, both to protect Bitstream and Gnome. We want to - ensure that if an application has opened a font specifically of these - names, it gets what it expects (though of course, using fontconfig, - substitutions could still could have occurred during font - opening). You must include the Bitstream copyright. Additional - copyrights can be added, as per copyright law. Happy Font Hacking! - - 6. If I have improvements for Bitstream Vera, is it possible they might get - adopted in future versions? - - Yes. The contract between the Gnome Foundation and Bitstream has - provisions for working with Bitstream to ensure quality additions to - the Bitstream Vera font family. Please contact us if you have such - additions. Note, that in general, we will want such additions for the - entire family, not just a single font, and that you'll have to keep - both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add - glyphs to the font, they must be stylistically in keeping with Vera's - design. Vera cannot become a "ransom note" font. Jim Lyles will be - providing a document describing the design elements used in Vera, as a - guide and aid for people interested in contributing to Vera. - - 7. I want to sell a software package that uses these fonts: Can I do so? - - Sure. Bundle the fonts with your software and sell your software - with the fonts. That is the intent of the copyright. - - 8. If applications have built the names "Bitstream Vera" into them, - can I override this somehow to use fonts of my choosing? - - This depends on exact details of the software. Most open source - systems and software (e.g., Gnome, KDE, etc.) are now converting to - use fontconfig (see www.fontconfig.org) to handle font configuration, - selection and substitution; it has provisions for overriding font - names and subsituting alternatives. An example is provided by the - supplied local.conf file, which chooses the family Bitstream Vera for - "sans", "serif" and "monospace". Other software (e.g., the XFree86 - core server) has other mechanisms for font substitution. - diff --git a/media/fonts/doc/Verdana/LICENSE.txt b/media/fonts/doc/Verdana/LICENSE.txt new file mode 100644 index 00000000000..df52c1709be --- /dev/null +++ b/media/fonts/doc/Verdana/LICENSE.txt @@ -0,0 +1,187 @@ +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. +Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) + + +Bitstream Vera Fonts Copyright +------------------------------ + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is +a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute the +Font Software, including without limitation the rights to use, copy, merge, +publish, distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to the +following conditions: + +The above copyright and trademark notices and this permission notice shall +be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional glyphs or characters may be added to the Fonts, only if the fonts +are renamed to names not containing either the words "Bitstream" or the word +"Vera". + +This License becomes null and void to the extent applicable to Fonts or Font +Software that has been modified and is distributed under the "Bitstream +Vera" names. + +The Font Software may be sold as part of a larger software package but no +copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING +ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE +FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font Software +without prior written authorization from the Gnome Foundation or Bitstream +Inc., respectively. For further information, contact: fonts at gnome dot +org. + +Arev Fonts Copyright +------------------------------ + +Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and +associated documentation files (the "Font Software"), to reproduce +and distribute the modifications to the Bitstream Vera Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to +the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Tavmjong Bah" or the word "Arev". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Tavmjong Bah Arev" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL +TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the name of Tavmjong Bah shall not +be used in advertising or otherwise to promote the sale, use or other +dealings in this Font Software without prior written authorization +from Tavmjong Bah. For further information, contact: tavmjong @ free +. fr. + +TeX Gyre DJV Math +----------------- +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. + +Math extensions done by B. Jackowski, P. Strzelczyk and P. Pianowski +(on behalf of TeX users groups) are in public domain. + +Letters imported from Euler Fraktur from AMSfonts are (c) American +Mathematical Society (see below). +Bitstream Vera Fonts Copyright +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera +is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license (“Fonts”) and associated +documentation +files (the “Font Software”), to reproduce and distribute the Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, +and/or sell copies of the Font Software, and to permit persons to whom +the Font Software is furnished to do so, subject to the following +conditions: + +The above copyright and trademark notices and this permission notice +shall be +included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional +glyphs or characters may be added to the Fonts, only if the fonts are +renamed +to names not containing either the words “Bitstream” or the word “Vera”. + +This License becomes null and void to the extent applicable to Fonts or +Font Software +that has been modified and is distributed under the “Bitstream Vera” +names. + +The Font Software may be sold as part of a larger software package but +no copy +of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, +SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN +ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR +INABILITY TO USE +THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. +Except as contained in this notice, the names of GNOME, the GNOME +Foundation, +and Bitstream Inc., shall not be used in advertising or otherwise to promote +the sale, use or other dealings in this Font Software without prior written +authorization from the GNOME Foundation or Bitstream Inc., respectively. +For further information, contact: fonts at gnome dot org. + +AMSFonts (v. 2.2) copyright + +The PostScript Type 1 implementation of the AMSFonts produced by and +previously distributed by Blue Sky Research and Y&Y, Inc. are now freely +available for general use. This has been accomplished through the +cooperation +of a consortium of scientific publishers with Blue Sky Research and Y&Y. +Members of this consortium include: + +Elsevier Science IBM Corporation Society for Industrial and Applied +Mathematics (SIAM) Springer-Verlag American Mathematical Society (AMS) + +In order to assure the authenticity of these fonts, copyright will be +held by +the American Mathematical Society. This is not meant to restrict in any way +the legitimate use of the fonts, such as (but not limited to) electronic +distribution of documents containing these fonts, inclusion of these fonts +into other public domain or commercial font collections or computer +applications, use of the outline data to create derivative fonts and/or +faces, etc. However, the AMS does require that the AMS copyright notice be +removed from any derivative versions of the fonts which have been altered in +any way. In addition, to ensure the fidelity of TeX documents using Computer +Modern fonts, Professor Donald Knuth, creator of the Computer Modern faces, +has requested that any alterations which yield different font metrics be +given a different name. + +$Id$ diff --git a/media/fonts/doc/Verdana/README.txt b/media/fonts/doc/Verdana/README.txt index 365bc5eb550..699f1935dfc 100644 --- a/media/fonts/doc/Verdana/README.txt +++ b/media/fonts/doc/Verdana/README.txt @@ -1,3 +1,3 @@ -ReactOS Verdana fonts are based on "Bitstream Vera Sans" fonts. +ReactOS "Verdana" fonts are based on "DejaVu Sans". -See also COPYRIGHT.TXT. +See also LICENSE.txt file. diff --git a/media/fonts/verdana.ttf b/media/fonts/verdana.ttf index 1a55bafcf3c..a23ffa1df93 100644 Binary files a/media/fonts/verdana.ttf and b/media/fonts/verdana.ttf differ diff --git a/media/fonts/verdanab.ttf b/media/fonts/verdanab.ttf index 7b56d8f2783..3a1f9cb279e 100644 Binary files a/media/fonts/verdanab.ttf and b/media/fonts/verdanab.ttf differ diff --git a/media/fonts/verdanai.ttf b/media/fonts/verdanai.ttf index 2b7628696e8..426dda189c4 100644 Binary files a/media/fonts/verdanai.ttf and b/media/fonts/verdanai.ttf differ diff --git a/media/fonts/verdanaz.ttf b/media/fonts/verdanaz.ttf index f1a96c4f128..8db4676d67c 100644 Binary files a/media/fonts/verdanaz.ttf and b/media/fonts/verdanaz.ttf differ

1 0

[reactos] 01/01: [FREELDR] Stop asking people to report bugs on ros-dev@reactos.org
by Pierre Schweitzer 03 Oct '19

03 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17db4217a83e9ea6ce45b… commit 17db4217a83e9ea6ce45b5957f9dfef19c13a149 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Oct 3 02:54:27 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Oct 3 02:55:45 2019 +0200 [FREELDR] Stop asking people to report bugs on ros-dev(a)reactos.org That should be merged to 0.4.13 --- boot/freeldr/freeldr/arch/i386/i386bug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/arch/i386/i386bug.c b/boot/freeldr/freeldr/arch/i386/i386bug.c index 6d42279d1ab..fd89ddf7873 100644 --- a/boot/freeldr/freeldr/arch/i386/i386bug.c +++ b/boot/freeldr/freeldr/arch/i386/i386bug.c @@ -112,7 +112,7 @@ i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGIST i386_ScreenPosY = 0; PrintText("An error occured in " VERSION "\n" - "Report this error to the ReactOS Development mailing list <ros-dev(a)reactos.org>\n\n" + "Report this error on the ReactOS Bug Tracker: https://jira.reactos.org\n\n" "0x%02lx: %s\n", TrapIndex, i386ExceptionDescriptionText[TrapIndex]); #ifdef _M_IX86 PrintText("EAX: %.8lx ESP: %.8lx CR0: %.8lx DR0: %.8lx\n",

1 0

[reactos] 01/01: Updated release version on readme
by Federico Pellegatta 02 Oct '19

02 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b157cf1b7248cdd6b009… commit 3b157cf1b7248cdd6b009e3c9300daf3a80c372d Author: Federico Pellegatta <12744504+federico-pellegatta(a)users.noreply.github.com> AuthorDate: Wed Oct 2 11:01:07 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Oct 2 12:09:43 2019 +0200 Updated release version on readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 70c025ca871..88cb3a01ff9 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ --- <p align=center> - <a href="https://reactos.org/project-news/reactos-0411-released"> - <img alt="ReactOS 0.4.11 Release" src="https://img.shields.io/badge/release-0.4.11-0688CB.svg"> + <a href="https://reactos.org/project-news/reactos-0412-released"> + <img alt="ReactOS 0.4.12 Release" src="https://img.shields.io/badge/release-0.4.12-0688CB.svg"> </a> <a href="https://reactos.org/download"> <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg">

1 0

[reactos] 02/02: [KERNEL32] Fix FIXME by calling appropriate function in GetNativeSystemInfo()
by Pierre Schweitzer 02 Oct '19

02 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ce3941b419e27d2894b2… commit 0ce3941b419e27d2894b227a7a101182f5850cd6 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Oct 2 10:52:00 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Oct 2 10:52:00 2019 +0200 [KERNEL32] Fix FIXME by calling appropriate function in GetNativeSystemInfo() --- dll/win32/kernel32/client/sysinfo.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dll/win32/kernel32/client/sysinfo.c b/dll/win32/kernel32/client/sysinfo.c index 0e588b3e449..ac0ad750efc 100644 --- a/dll/win32/kernel32/client/sysinfo.c +++ b/dll/win32/kernel32/client/sysinfo.c @@ -209,18 +209,16 @@ GetNativeSystemInfo(IN LPSYSTEM_INFO lpSystemInfo) SYSTEM_PROCESSOR_INFORMATION ProcInfo; NTSTATUS Status; - /* FIXME: Should be SystemNativeBasicInformation */ - Status = NtQuerySystemInformation(SystemBasicInformation, - &BasicInfo, - sizeof(BasicInfo), - 0); + Status = RtlGetNativeSystemInformation(SystemBasicInformation, + &BasicInfo, + sizeof(BasicInfo), + 0); if (!NT_SUCCESS(Status)) return; - /* FIXME: Should be SystemNativeProcessorInformation */ - Status = NtQuerySystemInformation(SystemProcessorInformation, - &ProcInfo, - sizeof(ProcInfo), - 0); + Status = RtlGetNativeSystemInformation(SystemProcessorInformation, + &ProcInfo, + sizeof(ProcInfo), + 0); if (!NT_SUCCESS(Status)) return; GetSystemInfoInternal(&BasicInfo, &ProcInfo, lpSystemInfo);

1 0

[reactos] 01/02: [SDK] Define RtlGetNativeSystemInformation()
by Pierre Schweitzer 02 Oct '19

02 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c7b84bb5c623ff8284a5… commit 8c7b84bb5c623ff8284a5e1840dbc0ab69b6b7fb Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Oct 2 10:50:59 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Oct 2 10:50:59 2019 +0200 [SDK] Define RtlGetNativeSystemInformation() --- sdk/include/ndk/rtlfuncs.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index 48e3f7d0432..005d761ae73 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -4739,6 +4739,16 @@ RtlCloneMemoryStream( _Outptr_ struct IStream **ResultStream ); +NTSYSAPI +NTSTATUS +NTAPI +RtlGetNativeSystemInformation( + _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass, + _Out_writes_bytes_to_opt_(SystemInformationLength, *ReturnLength) PVOID SystemInformation, + _In_ ULONG SystemInformationLength, + _Out_opt_ PULONG ReturnLength +); + #endif // NTOS_MODE_USER NTSYSAPI

1 0

[reactos] 01/01: [NTDLL_WINETESTS] Fix the test so that it works on W2K3
by Pierre Schweitzer 01 Oct '19

01 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d055c9f16f85dda5af33f… commit d055c9f16f85dda5af33f8180e15194c9b386c81 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Oct 1 10:10:52 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Oct 1 10:11:39 2019 +0200 [NTDLL_WINETESTS] Fix the test so that it works on W2K3 It's an addendum to ad547c9 --- modules/rostests/winetests/ntdll/info.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/modules/rostests/winetests/ntdll/info.c b/modules/rostests/winetests/ntdll/info.c index 3d2c6318840..e641a8d0ff2 100644 --- a/modules/rostests/winetests/ntdll/info.c +++ b/modules/rostests/winetests/ntdll/info.c @@ -1883,9 +1883,7 @@ static void test_queryvirtualmemory(void) { NTSTATUS status; SIZE_T readcount; -#ifndef __REACTOS__ static const WCHAR windowsW[] = {'w','i','n','d','o','w','s'}; -#endif static const char teststring[] = "test string"; static char datatestbuf[42] = "abc"; static char rwtestbuf[42]; @@ -1893,10 +1891,13 @@ static void test_queryvirtualmemory(void) char stackbuf[42]; HMODULE module; char buffer_name[sizeof(MEMORY_SECTION_NAME) + MAX_PATH * sizeof(WCHAR)]; - MEMORY_SECTION_NAME *msn = (MEMORY_SECTION_NAME *)buffer_name; #ifndef __REACTOS__ + MEMORY_SECTION_NAME *msn = (MEMORY_SECTION_NAME *)buffer_name; +#endif BOOL found; int i; +#ifdef __REACTOS__ + MEMORY_SECTION_NAME *msn = HeapAlloc(GetProcessHeap(), 0, sizeof(buffer_name)); #endif module = GetModuleHandleA( "ntdll.dll" ); @@ -1998,7 +1999,6 @@ static void test_queryvirtualmemory(void) memset(buffer_name, 0x77, sizeof(buffer_name)); readcount = 0; status = pNtQueryVirtualMemory(NtCurrentProcess(), module, MemorySectionName, msn, sizeof(buffer_name), &readcount); -#ifndef __REACTOS__ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount > 0, "Expected readcount to be > 0\n"); trace ("Section Name: %s\n", wine_dbgstr_w(msn->SectionFileName.Buffer)); @@ -2006,18 +2006,17 @@ static void test_queryvirtualmemory(void) for (found = FALSE, i = (msn->SectionFileName.Length - sizeof(windowsW)) / sizeof(WCHAR); i >= 0; i--) found |= !memcmp( &msn->SectionFileName.Buffer[i], windowsW, sizeof(windowsW) ); ok( found, "Section name does not contain \"Windows\"\n"); -#else - /* W2K3 will return this, because the buffer is not ULONG-aligned */ - ok( status == STATUS_DATATYPE_MISALIGNMENT, "Expected STATUS_DATATYPE_MISALIGNMENT, got %08x\n", status); - ok( readcount == 0, "Expected readcount to be 0: %ld\n", readcount); -#endif trace("Check section name of non mapped memory\n"); - memset(msn, 0, sizeof(*msn)); + memset(msn, 0, sizeof(buffer_name)); readcount = 0; status = pNtQueryVirtualMemory(NtCurrentProcess(), &buffer_name, MemorySectionName, msn, sizeof(buffer_name), &readcount); ok( status == STATUS_INVALID_ADDRESS, "Expected STATUS_INVALID_ADDRESS, got %08x\n", status); ok( readcount == 0 || broken(readcount != 0) /* wow64 */, "Expected readcount to be 0\n"); + +#ifdef __REACTOS__ + HeapFree(GetProcessHeap(), 0, msn); +#endif } static void test_affinity(void)

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