Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 02/02: [README] Add "open in Gitpod" button

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf0dc6adb289fe778c124… commit bf0dc6adb289fe778c124ef4d7130c5ed61e4047 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Mar 23 09:41:00 2020 +0000 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Apr 2 18:03:18 2020 +0200 [README] Add "open in Gitpod" button --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 88cb3a01ff9..710d23917ff 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,6 @@ [ReactOS Git mirror](https://git.reactos.org) • [Testman](https://reactos.org/testman/) - ## What is ReactOS? ReactOS™ is an Open Source effort to develop a quality operating system that is compatible with applications and drivers written for the Microsoft® Windows™ NT family of operating systems (NT4, 2000, XP, 2003, Vista, Seven). @@ -91,7 +90,7 @@ See ["File Bugs"](https://www.reactos.org/wiki/File_Bugs) for a guide. __NOTE:__ The bug tracker is _not_ for discussions. Please use `#reactos` Freenode IRC channel or our [forum](https://reactos.org/forum). -## Contributing ![prwelcome.badge] +## Contributing [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#ht… • ![prwelcome.badge] We are always looking for developers! Check [how to contribute](CONTRIBUTING.md) if you are willing to participate.

4 years, 8 months

[reactos] 01/02: [GITPOD]Add gitpod config

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04d0d95b8a0d28a44afe4… commit 04d0d95b8a0d28a44afe448fb278ce5e8bf57327 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Mar 17 11:53:18 2020 +0000 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Apr 2 18:03:18 2020 +0200 [GITPOD]Add gitpod config this commit adds support for Gitpod.io, a free automated dev environment that makes contributing and generally working on GitHub projects much easier. It allows anyone to start a ready-to-code dev environment for any branch, issue and pull request with a single click. --- .gitpod.Dockerfile | 23 +++++++++++++ .gitpod.yml | 18 +++++++++++ .theia/launch.json | 29 +++++++++++++++++ .theia/settings.json | 10 ++++++ .theia/tasks.json | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 171 insertions(+) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile new file mode 100644 index 00000000000..5e090eb7cdf --- /dev/null +++ b/.gitpod.Dockerfile @@ -0,0 +1,23 @@ +FROM gitpod/workspace-full-vnc + +USER gitpod + +# Install custom tools, runtime, etc. using apt-get +# For example, the command below would install "bastet" - a command line tetris clone: +# +# RUN sudo apt-get -q update && # sudo apt-get install -yq bastet && # sudo rm -rf /var/lib/apt/lists/* +# +# More information: https://www.gitpod.io/docs/config-docker/ +RUN sudo apt-get -q update && \ + sudo apt-get -yq upgrade && \ + sudo apt-get -yq install qemu-system-x86 qemu-utils gdb-mingw-w64 && \ + sudo rm -rf /var/lib/apt/lists/* + +RUN wget https://svn.reactos.org/amine/RosBEBinFull.tar.gz && \ + sudo tar -xzf RosBEBinFull.tar.gz -C /usr/local && \ + sudo mv /usr/local/RosBEBinFull /usr/local/RosBE && \ + rm -f RosBEBinFull.tar.gz + +RUN echo 'export PATH=/usr/local/RosBE/i386/bin:$PATH' >> /home/gitpod/.profile + +RUN qemu-img create -f qcow2 reactos_hdd.qcow 10G diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 00000000000..9eb9fb144fc --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,18 @@ +tasks: + - before: > + brew install cmake ninja + init: > + mkdir -p /workspace/reactos/build && + cd /workspace/reactos/build && + cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DGDB:BOOL=TRUE -DSEPARATE_DBG:BOOL=TRUE -D_WINKD_:BOOL=TRUE -DKDBG:BOOL=FALSE -DENABLE_ROSTESTS:BOOL=TRUE -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -G "Ninja" && + ninja xdk psdk + command: > + cd /workspace/reactos/build && + ninja all + +image: + file: .gitpod.Dockerfile + +vscode: + extensions: + - ms-vscode.cpptools@0.27.0-insiders3:Djj3Csw0GXjmueWAPWvTsg== diff --git a/.theia/launch.json b/.theia/launch.json new file mode 100644 index 00000000000..8a7abb7111b --- /dev/null +++ b/.theia/launch.json @@ -0,0 +1,29 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + "version": "0.2.0", + "configurations": [ + { + "type": "cppdbg", + "request": "launch", + "name": "livecd (qemu)", + "preLaunchTask": "launch livecd", + "miDebuggerServerAddress": "localhost:9091", + "miDebuggerArgs": "-l 15 -ex 'set sysroot ${workspaceRoot}/build/symbols'", + "program": "${workspaceRoot}/build/ntoskrnl/ntoskrnl.exe", + "cwd": "${workspaceRoot}/build", + "miDebuggerPath": "i686-w64-mingw32-gdb" + }, + { + "type": "cppdbg", + "request": "launch", + "name": "bootcd (qemu)", + "preLaunchTask": "launch bootcd", + "miDebuggerServerAddress": "localhost:9091", + "miDebuggerArgs": "-l 15 -ex 'set sysroot ${workspaceRoot}/build/symbols'", + "program": "${workspaceRoot}/build/ntoskrnl/ntoskrnl.exe", + "cwd": "${workspaceRoot}/build", + "miDebuggerPath": "i686-w64-mingw32-gdb" + } + ] +} diff --git a/.theia/settings.json b/.theia/settings.json new file mode 100644 index 00000000000..4f270f4945c --- /dev/null +++ b/.theia/settings.json @@ -0,0 +1,10 @@ +{ + "cpp.buildConfigurations": [ + { + "name": "build", + "directory": "${workspaceFolder}/build" + } + ], + "cpp.clangdArgs": "--background-index", + "C_Cpp.intelliSenseEngine": "Disabled", +} diff --git a/.theia/tasks.json b/.theia/tasks.json new file mode 100644 index 00000000000..58d78516f95 --- /dev/null +++ b/.theia/tasks.json @@ -0,0 +1,91 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "build livecd", + "type": "shell", + "command": "ninja livecd", + "options": { + "cwd": "${workspaceFolder}/build" + }, + "group": "build", + "problemMatcher": [ + { + "owner": "cpp", + "fileLocation": ["relative", "${workspaceFolder}/build"], + "pattern": { + "regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$", + "file": 1, + "line": 2, + "column": 3, + "severity": 4, + "message": 5 + } + } + ] + }, + { + "label": "build bootcd", + "type": "shell", + "command": "ninja bootcd", + "options": { + "cwd": "${workspaceFolder}/build" + }, + "group": "build", + "problemMatcher": [ + { + "base": "$gcc", + "fileLocation": ["relative", "${workspaceFolder}/build"], + }, + ] + }, + { + "label": "launch livecd", + "type": "process", + "options": { + "cwd": "${workspaceFolder}/build" + }, + "dependsOn": [ + "build livecd" + ], + "dependsOrder": "sequence", + "command": "qemu-system-i386", + "args": [ + "-cdrom", "livecd.iso", + "-chardev", "socket,port=9091,host=localhost,server,nowait,id=char0", + "-serial", "chardev:char0", + "-nic", "user,model=e1000", + "-boot", "d", + "-chardev", "socket,path=/tmp/livecd_dbg,server,nowait,id=char1", "-serial", "chardev:char1", + "-daemonize" + ], + "problemMatcher": [] + }, + { + "label": "launch bootcd", + "type": "process", + "options": { + "cwd": "${workspaceFolder}/build" + }, + "dependsOn": [ + "build bootcd" + ], + "dependsOrder": "sequence", + "command": "qemu-system-i386", + "args": [ + "-cdrom", "bootcd.iso", + "-hda", "${env:HOME}/reactos_hdd.qcow", + "-boot", "d", + "-m", "1024", + "-chardev", "socket,port=9091,host=localhost,server,nowait,id=char0", + "-serial", "chardev:char0", + "-nic", "user,model=e1000", + "-chardev", "socket,path=/tmp/bootcd_dbg,server,nowait,id=char1", "-serial", "chardev:char1", + "-daemonize" + ], + "problemMatcher": [] + }, + ], +}

4 years, 8 months

[reactos] 01/01: [RDBSS] Avoid CORE-13938

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45b5ec8e7bf4e95c3a182… commit 45b5ec8e7bf4e95c3a1826f7b13e2b225d8f81bc Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Feb 17 20:28:15 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Thu Apr 2 15:09:46 2020 +0200 [RDBSS] Avoid CORE-13938 Pierre recommended this workaround for 0.4.8rls before. Avoids "GetVolumeInformation now fails on NFS volume" This workaround was recurrently applied for all releases 0.4.8, 0.4.9, 0.4.10, 0.4.11, 0.4.12, 0.4.13. I never got any reply in the regression-ticket and recurrently applying this over and over again is a waste of time. So I decided to commit to master today, but will leave the ticket unresolved, so when a proper fix will arrive in the future, the existing ticket will remind us to undo this workaround. Please note that I replaced #if 0 with #if 1 as discussed with Pierre. That's different to the patch in ticket. --- sdk/lib/drivers/rdbsslib/rdbss.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sdk/lib/drivers/rdbsslib/rdbss.c b/sdk/lib/drivers/rdbsslib/rdbss.c index 851b0f543a3..4fe01867172 100644 --- a/sdk/lib/drivers/rdbsslib/rdbss.c +++ b/sdk/lib/drivers/rdbsslib/rdbss.c @@ -8319,6 +8319,16 @@ RxQueryNameInfo( return STATUS_BUFFER_OVERFLOW; } +#if 1 // CORE-13938, rfb: please note I replaced 0 with 1 here + if (NodeType(Fcb) == RDBSS_NTC_STORAGE_TYPE_DIRECTORY && + RxContext->Info.LengthRemaining >= sizeof(WCHAR)) + { + NameInfo->FileName[NameInfo->FileNameLength / sizeof(WCHAR)] = L'\\'; + NameInfo->FileNameLength += sizeof(WCHAR); + RxContext->Info.LengthRemaining -= sizeof(WCHAR); + } +#endif + /* All correct */ return STATUS_SUCCESS; }

4 years, 8 months

[reactos] 01/01: [NTOS:MM] Using the macro MiIsPteOnPdeBoundary(). (#2496)

by Vadim Galyant

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b78cb36d910dd2e881844… commit b78cb36d910dd2e881844e96fd3e2c11cacd32cd Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Thu Apr 2 13:15:33 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 2 12:15:33 2020 +0200 [NTOS:MM] Using the macro MiIsPteOnPdeBoundary(). (#2496) The SYSTEM_PD_SIZE constant should not be used to determine the page boundary for page tables. It is better to use the portable MiIsPteOnPdeBoundary() macro for this. --- ntoskrnl/mm/ARM3/section.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index abac73207cd..7d4e45c4af8 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -647,7 +647,7 @@ MiSegmentDelete(IN PSEGMENT Segment) while (PointerPte < LastPte) { /* Check if it's time to switch master PTEs if we passed a PDE boundary */ - if (!((ULONG_PTR)PointerPte & (PD_SIZE - 1)) && + if (MiIsPteOnPdeBoundary(PointerPte) && (PointerPte != Subsection->SubsectionBase)) { /* Check if the master PTE is invalid */ @@ -2150,7 +2150,7 @@ MiSetProtectionOnSection(IN PEPROCESS Process, // // Check if we've crossed a PDE boundary and make the new PDE valid too // - if ((((ULONG_PTR)PointerPte) & (SYSTEM_PD_SIZE - 1)) == 0) + if (MiIsPteOnPdeBoundary(PointerPte)) { PointerPde = MiPteToPde(PointerPte); MiMakePdeExistAndMakeValid(PointerPde, Process, MM_NOIRQL);

4 years, 8 months

[reactos] 01/01: [STOBJECT] Change eject hardware dialog buttons from OK/Cancel to just OK. (#2493)

by Jared Smudde

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5a725ae5745c89ce9e75… commit a5a725ae5745c89ce9e7591c69e0714e648a9830 Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Wed Apr 1 04:42:24 2020 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 1 11:42:24 2020 +0200 [STOBJECT] Change eject hardware dialog buttons from OK/Cancel to just OK. (#2493) It's just an information dialog that needs one button, it's not actually doing different actions based on user input. --- dll/shellext/stobject/hotplug.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/shellext/stobject/hotplug.cpp b/dll/shellext/stobject/hotplug.cpp index a57976a9c89..a8968818236 100644 --- a/dll/shellext/stobject/hotplug.cpp +++ b/dll/shellext/stobject/hotplug.cpp @@ -200,11 +200,11 @@ static void _ShowContextMenu(CSysTray * pSysTray) { WCHAR strInfo[128]; swprintf(strInfo, L"Problem Ejecting %wS", g_strMenuSel); - MessageBox(0, L"The device cannot be stopped right now! Try stopping it again later!", strInfo, MB_OKCANCEL | MB_ICONEXCLAMATION); + MessageBox(0, L"The device cannot be stopped right now! Try stopping it again later!", strInfo, MB_OK | MB_ICONEXCLAMATION); } else { - //MessageBox(0, L"Device ejected successfully!! You can safely remove the device now!", L"Safely Remove Hardware", MB_OKCANCEL | MB_ICONINFORMATION); + //MessageBox(0, L"Device ejected successfully!! You can safely remove the device now!", L"Safely Remove Hardware", MB_OK | MB_ICONINFORMATION); g_IsRemoving = TRUE; g_devList.RemoveAt(id); /* thing is.. even after removing id at this point, the devnode_change occurs after some seconds of sucessful removal and since pendrive is still plugged in it gets enumerated, if problem number is not filtered.

4 years, 8 months

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