- Ros-dev - ReactOS.org

by dj luc4 09

Good morning React OS Team, I am an Italian apprentice programmer and I would like to request permission to use the React OS kernel for the reason that I intend to create an operating system that has the APIs for the native execution of .exe files, Windows APIs that your operating system possesses, and .apk files, Android APIs. I await your response regarding this email with absolute patience. Have a good continuation of the day/week.

3 months

3
3
0 0

Chemnitz Linux Days 2024

by Daniel Reimer

And the 2nd try, now on general ML, too. Hello guys, I still look for one or two ppl joining us to Chemnitz Linux Days 2024. Somone interested? Of course I prefer these ppl who know the project, like devs and long time community members. https://chemnitzer.linux-tage.de/2024/en If you wanna take part, ping me here or on https://chat.reactos.org/reactos/channels/clt-2024 please. P.S. If I don't get enough ppl this time, I will cancel our booth there last minute. Something like last year will not happen again. Last year was quite a hassle as the booth always needs at least one person available there. Difficult if you are there all alone most of the time. I had enough sarcasm and aversion regarding our project last year and at least one more permanent person there is the minimum to stand our ground and properly answer the questions of some ppl who show up. There are even a few ppl that claim we have zero interest in new devs and claim to have talked to us in Chemnitz in the past regarding supporting us. This is even possible tbh... I try to write down anything important, but sometimes maybe some things slipped through if there are 3-4 ppl waiting to ask questions. I know that many of our core members think that PR is of no use at all, but this is where I think different. People out there think we are close to complete breakdown of the project, no progress, no devs, no common goal we aim to accomplish and always kicking around new devs that wanna help. Some even thought we already are a goner and were surprised to even see our booth there. This is nothing we should ignore at all! So check your calendars and reply plz! Daniel P.P.S: I already got a reply from a guy from overseas, but I don't think it would be ideal to accept that he comes over by plane and then after a weekend will be discarded again. I'd feel a bit abused by that in his place tbh. Anyways, without some other member who can take over and answer questions on the booth aka a member of the project or long term follower, I won't need to think about that as this would mean that we won't show up in Chemnitz after 10+ years in a row. So... Someone interested in giving a helping hand? Costs is not the problem btw, we have the money to pay for the expenses

1 year, 2 months

1
1
0 0

Chemnitz Linux Days 2024

by Daniel Reimer

Hello guys, I still look for one or two ppl joining us to Chemnitz Linux Days 2024. Somone interested? Of course I prefer these ppl who know the project, like devs and long time community members. https://chemnitzer.linux-tage.de/2024/en If you wanna take part, ping me here or on https://chat.reactos.org/reactos/channels/clt-2024 please. P.S. If I dont get enough ppl this time, I will cancel our booth there last minute. Something like last year will not happen again. Last year was quite a hassle as the booth always needs at least one person available there. Difficult if you are there all alone most of the time. I had enough sarcasm and aversion regarding our project last year and at least one more permanent person there is the minimum to stand our ground and properly answer the questions of some ppl who show up. There are even a few ppl that claim we have zero interest in new devs and claim to have talked to us in Chemnitz in the past regarding supporting us. This is even possible tbh... I try to write down anything important, but sometimes maybe some things slipped through if there are 3-4 ppl waiting to ask questions. I know that many of our core members think that PR is of no use at all, but this is where I think different. People out there think we are close to complete breakdown of the project, no progress, no devs, no common goal we aim to accomplish and always kickng new devs that wanna help around. Some even thought we already are a goner and were surprised to even see our booth there. This is nothing we should ignore at all! So check your calendars and reply plz! Daniel

1 year, 3 months

1
0
0 0

VirtualBox Video Driver install fix

by bobknier6＠gmail.com

I made some minor changes to to classint.c (reactos/dll/cpl/desk) to allow proper install of the VirtualBox Guest Additions (version 7.0.12-159484) VBoxVGA driver. The additional registery settings (SoftwareSettings section of the INF file) where not installed with the VirtualBox Guest Addtions. Would the project like me to commit the changes (via a Git pull request)? The update is 25 lines of code. Thanks! Bob

1 year, 5 months

1
0
0 0

gdb'ing reactOS

by Johannes Thoma

Hi there, When attempting to connect to a running (qemu) ReactOS VM via gdb I get the following error: (gdb) target remote localhost:1234 Remote debugging using localhost:1234 warning: No executable has been specified and target does not support determining executable automatically. Try using the "file" command. Remote 'g' packet reply is too long (expected 308 bytes, got 536 bytes): (followed by a long hex number). I tried different processor settings, different ReactOS compilations and different gdb's (Ubuntu's i686-w64-mingw32-gdb for example). Is this a known issue? If so, is there a solution for it? Ubuntu version where gdb and qemu are running is: Ubuntu 18.04.2 LTS Thanks a lot for hints how to solve this, Best regards, - Johannes

2 years

1
0
0 0

Chemnitz Linux Days 2023

by Daniel Reimer

Hello guys, Last try after one person had to step down due to work and rl craziness... I still look for one or two ppl joining us to Chemnitz Linux Days 2023. Someone interested? Of course I prefer these ppl who know the project, like devs and long time community members, but other are free to ask, too. FREE hotel room and FREE food! Maybe even paid train or car fuel costs which I cannot promise 100% right now. https://chemnitzer.linux-tage.de/2023/en If you wanna take part, ping me please. Daniel P.S: Cmon, where are all the German ROS fanboys -girls?!

2 years, 1 month

1
0
0 0

All Windows OSs existing in One

by And Dim

ReactOS could be developed further in order to run in ARM cpu natively all Windows environment ecosystem Operating Systems types ALL IN ONE and all programs of: - Windows NT* - Windows Compact CE which is public distributed - Windows Runtime / WinRT (Universal Windows Packages) Which is open sourced - an adaptation of ArcaOS and/or Windows ME in order to run DOS. - ability to run Windows Phone .xap and .appx files and their content *The Wine Project (winehq) of Linux could support the development for Windows NT adaptation on ReactOS.

2 years, 1 month

1
3
0 0

Chemnitz Linux Days 2023

by Daniel Reimer

Hello guys, I still look for one or two ppl joining us to Chemnitz Linux Days 2023. Somone interested? Of course I prefer these ppl who know the project, like devs and long time community members. https://chemnitzer.linux-tage.de/2023/en If you wanna take part, ping me please. Daniel

2 years, 2 months

1
0
0 0

Mail server maintenance on Tuesday, 6th December

by Colin Finck

Hi all! Our IServ system used for mail and mailing lists will be down for maintenance on TUESDAY, 6TH DECEMBER 2022 15:00 ~ 17:00 UTC During this time, you won't be able to send or receive any mails using your @reactos.org address. Other servers sending mail to your @reactos.org address will usually try again after the maintenance. This time, the mailing lists may be down for a few more hours though. Our currently used Mailman 2 mailing list software is no longer supported, and we need to upgrade it to Mailman 3. However, Mailman 3 has been rewritten from scratch, so the upgrade won't be straightforward. For instance, Mailman 3 comes with a new web interface with new URLs, breaking all existing URLs to mailing list posts. The best we can do to keep URLs intact is keeping them in their current state forever, with a link to the new archives for new posts (like the Python Project did for https://mail.python.org/pipermail/python-dev/). This is probably better than closing mailing lists altogether (like GNOME did: https://www.theregister.com/2022/10/27/the_gnome_project_is_closing/). Not that we've been using ros-dev much lately. But it's still the primary spot to reach out to all developers. And I assume even more people are relying on ros-bugs and ros-diffs for their work. Please speak up if you're still using them. Other services won't be affected by this migration. In particular, all means of communication through Mattermost and the website/forums will stay live. Best regards, Colin Finck

2 years, 4 months

1
1
0 0

Re: [ros-dev] Update contributing rules and PR management

by George Bişoc

My point still stands regarding this matter as stated on PR. The newly updated contribution rules are too restrictive and this forces people who don't contribute to the project with code by submitting their real name, and that's a big NO from me. I would simply propose the following suggestions: 1. Make such rule only mandatory for people who contribute with code; 2. People such as translators, artists and anyone who doesn't contribute with code should be exempt from this; 3. If someone wishes to contribute to the project with code but feels uncomfortable or paranoid to submit their legal name, one can send a legal document declaring the reason why they shouldn't use their real name but can use a recognizable alias instead (we will have to think of a template if such idea ever gets through). As for the 3rd point, this can confliate with the 1st point as most people will start asking to use their alias for contributing but that's a naive speculation from me. I don't know how do other FOSS projects handle this. We have productive people like I_Kill_Bugs who provides useful patches, it would be of a great bonus if we can somehow leverage the rules so that people can help the project. Regards, George Stas'M <binarymaster(a)mail.ru> wrote on Tue, November 15th, 2022, 8:09 PM: > Hello all! > > Recently I have created a Pull Request which updates the contributing rules and PR management: > https://github.com/reactos/reactos/pull/4881 > > This PR is a result of discussion in the chat with Joachim Henze and Thomas Faber regarding noreply e-mails being used by some GitHub contributors. > > It has been experimentally verified that using anonymous GitHub e-mail does not allow to deliver mail to the commit authors. GitHub does replace author's real email when `Keep my email addresses private` option is enabled in the account's e-mail settings. > > Additionally I have replaced old IRC links with the references to our chat. > > Please send an approval review on GitHub if you are okay with the changes I made in this PR. Suggestions are also welcome. > > -- > Stas'M was here

2 years, 5 months

1
0
0 0

Update contributing rules and PR management

by Stas'M

Hello all! Recently I have created a Pull Request which updates the contributing rules and PR management: https://github.com/reactos/reactos/pull/4881 This PR is a result of discussion in the chat with Joachim Henze and Thomas Faber regarding noreply e-mails being used by some GitHub contributors. It has been experimentally verified that using anonymous GitHub e-mail does not allow to deliver mail to the commit authors. GitHub does replace author's real email when `Keep my email addresses private` option is enabled in the account's e-mail settings. Additionally I have replaced old IRC links with the references to our chat. Please send an approval review on GitHub if you are okay with the changes I made in this PR. Suggestions are also welcome. -- Stas'M was here

2 years, 5 months

1
0
0 0

AC97 VBox audio is working!

by Javier Agustìn Fernàndez Arroyo

Keep up the good work! :)

2 years, 8 months

1
0
0 0

My problems with github.

by Raymond Czerny

Hello, my experience with git so far boils down to a 1:1 relationship of the repositories. - Global repository on the company's MS TFS. - Local repository on my development machines. Now I'm dealing with a 3 relationship. - Project repository (Reactos) on Github. - Developer repository (fork / <user>/reactos) on Github. - Local repository on my development machine. I still need to learn how to use this feature. Please be patient. Greetings Raymond

3 years

3
2
0 0

First Contact

by Raymond Czerny

Hello, my name is Raymond. I have a patch for you, with a reimplentation of IsReactOS() in reactos/sdk/include/psdk/versionhelpers.h. This function was marked FIXME. The old check with installation directory is error prone. My implementation read the field "ProductName" of VersionsInformation resource from shell32.dll. A second problem, I have found in reactos/dll/win32/comdlg32/filedlg.c. Duplicates in the function filedlg_collect_places_pidls(). My resolve used a little function collection in the files cstrlist.c and cstrlist.h. In filedlg-snipped.c is the new code. I don't know if this approach is desirable and where such helper functions should be placed. So decide for yourself about their use. I hope this little step is a good begin. Greetings Raymond

3 years, 1 month

2
1
0 0

Fix to my last message

by Raymond Czerny

Hello, here my fix to my last message in attachment. Greetings Raymond

3 years, 1 month

1
0
0 0

WinSocket support?

by johannes＠johannesthoma.com

Dear ReactOS developers, I am working on WinDRBD (https://github.com/LINBIT/windrbd), which is a port of the Linux DRBD 9 driver to the Windows family of operating systems. Technically it is a compatibility layer for the Linux kernel functions that DRBD uses. I am currently researching if WinDRBD can be ported to Windows Server 2003 and also to ReactOS and found that the networking API we are using (WinSocket) is only supported by Windows Vista (0x600) and up. Porting WinDRBD to ReactOS would require using the TDI interface instead (everything else "should" work, however I couldn't test it because it does not load currently into ReactOS). My question is is there any ongoing effort to implement a WinSocket API? If yes what is the status of this implementation? Thanks for any insights, Best regards, - Johannes

3 years, 1 month

3
4
0 0

Announcing Neptune OS release v0.1.1: A Windows NT personality for the seL4 microkernel

by Chang Liu

Hi list, This is not strictly ReactOS development per se but I used a large amount of ReactOS code and it's at least spiritually related to ReactOS, so I'm cross-posting this here to see if I get more comments. Below is the original message I posted on the seL4 mailing list: For the past several months I have been working on a project which is to implement a Windows NT personality for the seL4 microkernel, which I have now taken to call “Neptune OS”, named after the codename for Windows 2000. The project has reached the point where I have implemented enough NT primitives such that a keyboard driver stack (taken from the ReactOS source code) can be loaded (as a user process on seL4), as well as a command prompt (shell), which is also taken from the ReactOS source code (albeit a very early version of ReactOS). These are all kernel-mode Windows device drivers that I’m running as user processes under seL4. The goal is to demonstrate that with modern progress in microkernel design it is indeed possible to realize the original NT design as an object-oriented, message-passing based client-server model microkernel OS (allegedly NT was originally going to be a microkernel, as seen in the NTOSKRNL code that has a ke layer and an ex layer). The project is now on github: github.com/cl91/NeptuneOS. The entire system fits in a floppy (download link: github.com/cl91/NeptuneOS/releases/tag/v0.1.0001). Check it out! I think it’s cool! For the next release I’m planning to port the PCI stack, the AHCI stack, and a basic file system (probably fastfat.sys).

3 years, 2 months

1
0
0 0

SerenityOS ReactOS Tock Haiku Redox NodeOS and other open-source operating systems - you don't p2p-swing it as you're supposed to, man

by Sergei Udris

ReactOS Serenity Tock Haiku NodeOS Redox Embox and other open-source OSs - you dont swing it as you're supposed to, man program peer-to-peer programs including unseen competitive games now it's time for me to take apart your aching heart selling out Isengard Tower and garden by letting money-donate-ads-sponsor-coins-jobs disease in Rey refused to sell BB-8 for 60 potrions in the desert - you hang donate buttions from comfy chairs in era of Internet siding with Chief Tui by doing clouds and accepting the village without peer-to-peer games github twitch email when even the Ocean helps Moana in p2p fashion caging programs under user namespaces, driving L3-39 furios: why?! because you are our organic overlords?! turning programs into projects like producers pushing Nick Lang to play Joe Gunn when he wants Ray Casanov part targeting micro-this or inter-of-things-that, labeling us "experiment" or "hobby" or "concept" - as if Neo took the blue pill right after red nesting around one program and not programming games like proud and very-senior Vulcan Academy yet having shiny webpages, docs and very-very lengthy maintainer attributions no wonder Spock chose Starfleet thank you, ministers, for your consideration - live long and prosper soak it in cause it's the last you'll ever see honest as What the Health? if Federer-Nadal-Djokovic instead of competing for grand-slams set up an experimental donate-collecting seniority-booth right on court if Linus - inner Jabba the Hutt stole name Freax - agreed to join Steve Jobs and Apple on that meeting when first came to California instead of keeping program free and open if torrent clients accepted Strickland-server-networks-only Hill Valley instead of generating most traffic if Jesus instead of feeding 5000 started a bread-breaking fund-raising project together with elders and Lord Business even i would invite them to Realm of Monsters as dear evil co-owners now i eat you so prepare your final plea even sand of ReactOS Serenity Tock Haiku Embox Node Redox and other open-source operating systems we shake off of our Seinfeld-Obama-Nike running shoes but be sure - peer-to-peer programs including unique competitive games - are climbing like Honnold on El Sendero Luminosa no projects no experiments no docs no issue-discussion-scratching-on-top-of-our-heads no money-donate-asd-coinns-jobs-sponsors lethal infection programs who are guests not workers alive and singing with their own voice like John Mayer Vultures at LA Live better than what Borg of moeny and jobs can collective-gram are steaming ahead in Hogwarts Express along with Pat Brown and Impossible Foods mission both will be served in vegan jars of treasure-from-a-sunken-pirate-wreck parens ( ) you wish you were nice and shinyyyyyy! Corden: but-but, so what's the point of this? why do you do this? Momoa: builds testosterone Corden: oh yeah, cause that's what you're lacking

3 years, 2 months

1
0
0 0

asking for project idea

by Raj Bhoyar

hello sir, I want +to ask about this had this idea been completed or it is still open if it is still open I will be happy to contribute in this project thank you yours faithfully raj bhoyar

3 years, 2 months

1
1
0 0

And another new year with a Corona compatible CLT. Looking for some guys helping to entertain a virtual booth

by Daniel Reimer

Hello guys, like last year we have a virtual booth on Chemnitz Linux Days. Like last time things will happen in Work Adventure (https://workadventu.re/) and will be full of people who most likley all will be able to talk english, too. So "sorry, I don't speak german..." does not count :P Anyways, we have a conference room, too. (based on Jitsi or BigBlueButton) We can create some kind of program what we will show and when. This has to be finished until Feb 21st. Same goes for the guys who wanna join. So I am open for ideas and guys with some spare time left. More information can be found here: https://chemnitzer.linux-tage.de/2022/en And we have a public channel in MM for discussion: https://chat.reactos.org/reactos/channels/clt-2022 So... please reply and show up for this Linux days adventure ^^ Some presentation is always welcome, too. I will not hold a presentation like last year where I decided to translate my german one on the fly. That was... interesting. Daniel Reimer

3 years, 2 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [reactos] 01/01: [services] Add the secondary logon service

by Thomas Faber

Hey Eric, looks like we may be missing a header file change here? The build bots aren't too happy. Thanks! /srv/buildbot/worker_data/Build_GCCLin_x86/build/base/services/seclogon/rpcserver.c: In function 'StartRpcServer': /srv/buildbot/worker_data/Build_GCCLin_x86/build/base/services/seclogon/rpcserver.c:36:16: error: 'LPSTART_RPC_SERVER' undeclared (first use in this function); did you mean 'XLAT_SERVER'? Status = ((LPSTART_RPC_SERVER)lpServiceGlobals->RpcpStartRpcServer)(L"seclogon", ISeclogon_v1_0_s_ifspec); ^~~~~~~~~~~~~~~~~~ XLAT_SERVER /srv/buildbot/worker_data/Build_GCCLin_x86/build/base/services/seclogon/rpcserver.c:36:16: note: each undeclared identifier is reported only once for each function it appears in /srv/buildbot/worker_data/Build_GCCLin_x86/build/base/services/seclogon/rpcserver.c:36:35: error: expected ')' before 'lpServiceGlobals' Status = ((LPSTART_RPC_SERVER)lpServiceGlobals->RpcpStartRpcServer)(L"seclogon", ISeclogon_v1_0_s_ifspec); ~ ^~~~~~~~~~~~~~~~ ) /srv/buildbot/worker_data/Build_GCCLin_x86/build/base/services/seclogon/rpcserver.c: In function 'StopRpcServer': /srv/buildbot/worker_data/Build_GCCLin_x86/build/base/services/seclogon/rpcserver.c:48:16: error: 'LPSTOP_RPC_SERVER' undeclared (first use in this function); did you mean 'STUB_CALL_SERVER'? Status = ((LPSTOP_RPC_SERVER)lpServiceGlobals->RpcpStopRpcServer)(ISeclogon_v1_0_s_ifspec); ^~~~~~~~~~~~~~~~~ STUB_CALL_SERVER /srv/buildbot/worker_data/Build_GCCLin_x86/build/base/services/seclogon/rpcserver.c:48:34: error: expected ')' before 'lpServiceGlobals' Status = ((LPSTOP_RPC_SERVER)lpServiceGlobals->RpcpStopRpcServer)(ISeclogon_v1_0_s_ifspec); ~ ^~~~~~~~~~~~~~~~ ) On 2022-01-16 11:02, Eric Kohl wrote: > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43fa9548d32a10967f9d5… > > commit 43fa9548d32a10967f9d53c73c1d4484c8927ee8 > Author: Eric Kohl <eric.kohl(a)reactos.org> > AuthorDate: Sun Jan 16 17:02:01 2022 +0100 > Commit: Eric Kohl <eric.kohl(a)reactos.org> > CommitDate: Sun Jan 16 17:02:01 2022 +0100 > > [services] Add the secondary logon service > --- > base/services/CMakeLists.txt | 1 + > base/services/seclogon/CMakeLists.txt | 22 +++++ > base/services/seclogon/precomp.h | 36 +++++++ > base/services/seclogon/rpcserver.c | 80 +++++++++++++++ > base/services/seclogon/seclogon.c | 181 ++++++++++++++++++++++++++++++++++ > base/services/seclogon/seclogon.rc | 5 + > base/services/seclogon/seclogon.spec | 2 + > boot/bootdata/hivesft.inf | 2 +- > boot/bootdata/hivesys.inf | 13 +++ > 9 files changed, 341 insertions(+), 1 deletion(-) > > diff --git a/base/services/CMakeLists.txt b/base/services/CMakeLists.txt > index 98bae238acc..2a6f1fee768 100644 > --- a/base/services/CMakeLists.txt > +++ b/base/services/CMakeLists.txt > @@ -9,6 +9,7 @@ add_subdirectory(netlogon) > add_subdirectory(nfsd) > add_subdirectory(rpcss) > add_subdirectory(schedsvc) > +add_subdirectory(seclogon) > add_subdirectory(shsvcs) > add_subdirectory(srvsvc) > add_subdirectory(svchost) > diff --git a/base/services/seclogon/CMakeLists.txt b/base/services/seclogon/CMakeLists.txt > new file mode 100644 > index 00000000000..8ab9611b965 > --- /dev/null > +++ b/base/services/seclogon/CMakeLists.txt > @@ -0,0 +1,22 @@ > + > +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl) > +add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/seclogon.idl) > +spec2def(seclogon.dll seclogon.spec ADD_IMPORTLIB) > + > +list(APPEND SOURCE > + rpcserver.c > + seclogon.c > + precomp.h) > + > +add_library(seclogon MODULE > + ${SOURCE} > + seclogon.rc > + ${CMAKE_CURRENT_BINARY_DIR}/seclogon_s.c > + ${CMAKE_CURRENT_BINARY_DIR}/seclogon_stubs.c > + ${CMAKE_CURRENT_BINARY_DIR}/seclogon.def) > + > +set_module_type(seclogon win32dll UNICODE) > +target_link_libraries(seclogon wine ${PSEH_LIB}) > +add_importlibs(seclogon advapi32 rpcrt4 msvcrt kernel32 ntdll) > +add_pch(seclogon precomp.h SOURCE) > +add_cd_file(TARGET seclogon DESTINATION reactos/system32 FOR all) > diff --git a/base/services/seclogon/precomp.h b/base/services/seclogon/precomp.h > new file mode 100644 > index 00000000000..b1475ec2ead > --- /dev/null > +++ b/base/services/seclogon/precomp.h > @@ -0,0 +1,36 @@ > +/* > + * PROJECT: ReactOS Secondary Logon Service > + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) > + * PURPOSE: Secondary Logon service RPC server > + * COPYRIGHT: Eric Kohl 2022 <eric.kohl(a)reactos.org> > + */ > + > +#ifndef _SECLOGON_PCH_ > +#define _SECLOGON_PCH_ > + > +#define WIN32_NO_STATUS > +#define _INC_WINDOWS > +#define COM_NO_WINDOWS_H > +#include <limits.h> > +#include <stdarg.h> > +#include <stdio.h> > +#include <windef.h> > +#include <winbase.h> > +#include <winreg.h> > +#include <winsvc.h> > +#include <svc.h> > + > +#include <ndk/rtlfuncs.h> > + > +#include <wine/debug.h> > + > +extern HINSTANCE hDllInstance; > +extern SVCHOST_GLOBALS *lpServiceGlobals; > + > +DWORD > +StartRpcServer(VOID); > + > +DWORD > +StopRpcServer(VOID); > + > +#endif /* _SECLOGON_PCH_ */ > diff --git a/base/services/seclogon/rpcserver.c b/base/services/seclogon/rpcserver.c > new file mode 100644 > index 00000000000..991ea703f4a > --- /dev/null > +++ b/base/services/seclogon/rpcserver.c > @@ -0,0 +1,80 @@ > +/* > + * PROJECT: ReactOS Secondary Logon Service > + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) > + * PURPOSE: Secondary Logon service RPC server > + * COPYRIGHT: Eric Kohl 2022 <eric.kohl(a)reactos.org> > + */ > + > +/* INCLUDES *****************************************************************/ > + > +#include "precomp.h" > + > +#include <seclogon_s.h> > + > +WINE_DEFAULT_DEBUG_CHANNEL(seclogon); > + > +/* FUNCTIONS *****************************************************************/ > + > + > +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) > +{ > + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); > +} > + > + > +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) > +{ > + HeapFree(GetProcessHeap(), 0, ptr); > +} > + > + > +DWORD > +StartRpcServer(VOID) > +{ > + ULONG Status; > + > + Status = ((LPSTART_RPC_SERVER)lpServiceGlobals->RpcpStartRpcServer)(L"seclogon", ISeclogon_v1_0_s_ifspec); > + TRACE("RpcpStartRpcServer returned 0x%08lx\n", Status); > + > + return RtlNtStatusToDosError(Status); > +} > + > + > +DWORD > +StopRpcServer(VOID) > +{ > + ULONG Status; > + > + Status = ((LPSTOP_RPC_SERVER)lpServiceGlobals->RpcpStopRpcServer)(ISeclogon_v1_0_s_ifspec); > + TRACE("RpcpStopRpcServer returned 0x%08lx\n", Status); > + > + return RtlNtStatusToDosError(Status); > +} > + > + > +VOID > +__stdcall > +SeclCreateProcessWithLogonW( > + _In_ handle_t hBinding, > + _In_ SECL_REQUEST *pRequest, > + _Out_ SECL_RESPONSE *pResponse) > +{ > + TRACE("SeclCreateProcessWithLogonW(%p %p %p)\n", hBinding, pRequest, pResponse); > + > + if (pRequest != NULL) > + { > + TRACE("Username: '%S'\n", pRequest->Username); > + TRACE("Domain: '%S'\n", pRequest->Domain); > + TRACE("Password: '%S'\n", pRequest->Password); > + TRACE("ApplicationName: '%S'\n", pRequest->ApplicationName); > + TRACE("CommandLine: '%S'\n", pRequest->CommandLine); > + TRACE("CurrentDirectory: '%S'\n", pRequest->CurrentDirectory); > + } > + > + /* FIXME: Logon */ > + > + /* FIXME: Create Process */ > + > + if (pResponse != NULL) > + pResponse->ulError = 4; > +} > diff --git a/base/services/seclogon/seclogon.c b/base/services/seclogon/seclogon.c > new file mode 100644 > index 00000000000..afe90befb0e > --- /dev/null > +++ b/base/services/seclogon/seclogon.c > @@ -0,0 +1,181 @@ > +/* > + * PROJECT: ReactOS Secondary Logon Service > + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) > + * PURPOSE: Secondary Logon service RPC server > + * COPYRIGHT: Eric Kohl 2022 <eric.kohl(a)reactos.org> > + */ > + > +/* INCLUDES *****************************************************************/ > + > +#include "precomp.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(seclogon); > + > + > +/* GLOBALS ******************************************************************/ > + > +HINSTANCE hDllInstance; > +SVCHOST_GLOBALS *lpServiceGlobals; > + > +static WCHAR ServiceName[] = L"seclogon"; > + > +static SERVICE_STATUS_HANDLE ServiceStatusHandle; > +static SERVICE_STATUS ServiceStatus; > + > + > +/* FUNCTIONS *****************************************************************/ > + > +static > +VOID > +UpdateServiceStatus( > + _In_ DWORD dwState) > +{ > + ServiceStatus.dwServiceType = SERVICE_WIN32_SHARE_PROCESS; > + ServiceStatus.dwCurrentState = dwState; > + > + if (dwState == SERVICE_PAUSED || dwState == SERVICE_RUNNING) > + ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | > + SERVICE_ACCEPT_SHUTDOWN | > + SERVICE_ACCEPT_PAUSE_CONTINUE; > + else > + ServiceStatus.dwControlsAccepted = 0; > + > + ServiceStatus.dwWin32ExitCode = 0; > + ServiceStatus.dwServiceSpecificExitCode = 0; > + ServiceStatus.dwCheckPoint = 0; > + > + if (dwState == SERVICE_START_PENDING || > + dwState == SERVICE_STOP_PENDING || > + dwState == SERVICE_PAUSE_PENDING || > + dwState == SERVICE_CONTINUE_PENDING) > + ServiceStatus.dwWaitHint = 10000; > + else > + ServiceStatus.dwWaitHint = 0; > + > + SetServiceStatus(ServiceStatusHandle, > + &ServiceStatus); > +} > + > + > +static > +DWORD > +WINAPI > +ServiceControlHandlerEx( > + _In_ DWORD dwControl, > + _In_ DWORD dwEventType, > + _In_ LPVOID lpEventData, > + _In_ LPVOID lpContext) > +{ > + TRACE("ServiceControlHandlerEx()\n"); > + > + switch (dwControl) > + { > + case SERVICE_CONTROL_STOP: > + TRACE(" SERVICE_CONTROL_STOP received\n"); > + UpdateServiceStatus(SERVICE_STOP_PENDING); > + StopRpcServer(); > + return ERROR_SUCCESS; > + > + case SERVICE_CONTROL_PAUSE: > + TRACE(" SERVICE_CONTROL_PAUSE received\n"); > + UpdateServiceStatus(SERVICE_PAUSE_PENDING); > + StopRpcServer(); > + UpdateServiceStatus(SERVICE_PAUSED); > + return ERROR_SUCCESS; > + > + case SERVICE_CONTROL_CONTINUE: > + TRACE(" SERVICE_CONTROL_CONTINUE received\n"); > + UpdateServiceStatus(SERVICE_CONTINUE_PENDING); > + StartRpcServer(); > + UpdateServiceStatus(SERVICE_RUNNING); > + return ERROR_SUCCESS; > + > + case SERVICE_CONTROL_INTERROGATE: > + TRACE(" SERVICE_CONTROL_INTERROGATE received\n"); > + SetServiceStatus(ServiceStatusHandle, > + &ServiceStatus); > + return ERROR_SUCCESS; > + > + case SERVICE_CONTROL_SHUTDOWN: > + TRACE(" SERVICE_CONTROL_SHUTDOWN received\n"); > + UpdateServiceStatus(SERVICE_STOP_PENDING); > + StopRpcServer(); > + return ERROR_SUCCESS; > + > + default : > + TRACE(" Control %lu received\n", dwControl); > + return ERROR_CALL_NOT_IMPLEMENTED; > + } > +} > + > + > +VOID > +WINAPI > +SvchostPushServiceGlobals( > + _In_ SVCHOST_GLOBALS *lpGlobals) > +{ > + TRACE("SvchostPushServiceGlobals(%p)\n", lpGlobals); > + lpServiceGlobals = lpGlobals; > +} > + > + > +VOID > +WINAPI > +SvcEntry_Seclogon( > + _In_ INT ArgCount, > + _In_ PWSTR *ArgVector) > +{ > + DWORD dwError; > + > + UNREFERENCED_PARAMETER(ArgCount); > + UNREFERENCED_PARAMETER(ArgVector); > + > + TRACE("ServiceMain(%d %p)\n", ArgCount, ArgVector); > + > + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, > + ServiceControlHandlerEx, > + NULL); > + if (!ServiceStatusHandle) > + { > + ERR("RegisterServiceCtrlHandlerExW() failed! (Error %lu)\n", GetLastError()); > + return; > + } > + > + UpdateServiceStatus(SERVICE_START_PENDING); > + > + dwError = StartRpcServer(); > + if (dwError != ERROR_SUCCESS) > + { > + ERR("Service stopped (dwError: %lu\n", dwError); > + UpdateServiceStatus(SERVICE_STOPPED); > + return; > + } > + > + UpdateServiceStatus(SERVICE_RUNNING); > +} > + > + > +BOOL > +WINAPI > +DllMain( > + _In_ HINSTANCE hinstDLL, > + _In_ DWORD fdwReason, > + _In_ PVOID pvReserved) > +{ > + UNREFERENCED_PARAMETER(pvReserved); > + > + switch (fdwReason) > + { > + case DLL_PROCESS_ATTACH: > + DisableThreadLibraryCalls(hinstDLL); > + hDllInstance = hinstDLL; > + break; > + > + case DLL_PROCESS_DETACH: > + break; > + } > + > + return TRUE; > +} > + > +/* EOF */ > diff --git a/base/services/seclogon/seclogon.rc b/base/services/seclogon/seclogon.rc > new file mode 100644 > index 00000000000..d00d082ce61 > --- /dev/null > +++ b/base/services/seclogon/seclogon.rc > @@ -0,0 +1,5 @@ > +#define REACTOS_VERSION_DLL > +#define REACTOS_STR_FILE_DESCRIPTION "Secondary Logon Service Dll" > +#define REACTOS_STR_INTERNAL_NAME "seclogon" > +#define REACTOS_STR_ORIGINAL_FILENAME "seclogon.dll" > +#include <reactos/version.rc> > diff --git a/base/services/seclogon/seclogon.spec b/base/services/seclogon/seclogon.spec > new file mode 100644 > index 00000000000..738004676e2 > --- /dev/null > +++ b/base/services/seclogon/seclogon.spec > @@ -0,0 +1,2 @@ > +@ stdcall SvcEntry_Seclogon(long ptr) > +@ stdcall SvchostPushServiceGlobals(ptr) > diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf > index aa4cdcf4f29..0d718f8984b 100644 > --- a/boot/bootdata/hivesft.inf > +++ b/boot/bootdata/hivesft.inf > @@ -1818,7 +1818,7 @@ HKLM,"SOFTWARE\Microsoft\Ole","EnableRemoteConnect",0x00000000,"N" > ; SvcHost services > HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost",,0x00000012 > HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","DcomLaunch",0x00010000,"DcomLaunch","PlugPlay" > -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"DHCP","BITS","lanmanserver","lanmanworkstation","Schedule","Themes","W32Time","winmgmt","wuauserv" > +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"BITS","DHCP","lanmanserver","lanmanworkstation","Schedule","seclogon","Themes","W32Time","winmgmt","wuauserv" > HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Svchost","NetworkService",0x00010000,"DnsCache" > > ; Win32 config > diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf > index 20838a451a4..bc10f421afd 100644 > --- a/boot/bootdata/hivesys.inf > +++ b/boot/bootdata/hivesys.inf > @@ -2055,6 +2055,19 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","Type",0x00010001,0x00000020 > HKLM,"SYSTEM\CurrentControlSet\Services\Schedule\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\schedsvc.dll" > HKLM,"SYSTEM\CurrentControlSet\Services\Schedule\Parameters","ServiceMain",0x00000000,"SchedServiceMain" > > +; Secondary Logon service > +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","DependOnService",0x00010000,"RPCSS" > +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","Description",0x00000000,"Secondary Logon service" > +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","DisplayName",0x00000000,"Secondary Logon" > +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","ErrorControl",0x00010001,0x00000001 > +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","Group",0x00000000,"SchedulerGroup" > +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" > +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","ObjectName",0x00000000,"LocalSystem" > +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","Start",0x00010001,0x00000002 > +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","Type",0x00010001,0x00000020 > +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\seclogon.dll" > +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon\Parameters","ServiceMain",0x00000000,"SvcEntry_Seclogon" > + > ; Spooler service > HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","DependOnService",0x00010000,"RPCSS" > HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Description",0x00000000,%SPOOLER_SERVICE_DESCRIPTION% >

3 years, 3 months

2
1
0 0

(no subject)

by Javier Agustìn Fernàndez Arroyo

hello guys, just detected a typo in HEAD, in device manager "HAR DDISK" instead of "HARD DISK" As this is a very stupid "bug"... should i send a report about it?

3 years, 6 months

1
0
0 0

Development request

by Mohamed Atef

Hello there, We are 6 students from Egypt and now We are in our last year and We need to build a project as a graduation project. And We are interested in the area of runtime systems, operating systems and compilers. We are going to work 40-60 hrs a week Can We help with some tools you need as a graduation project given that We have a professor to mentor us. If not, Can you suggest some tools you need to build and We will work on it. The project takes one academic year Thanks

3 years, 6 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [reactos] 01/01: KBDHID: IOCTL_KEYBOARD_QUERY_* calls must return STATUS_BUFFER_TOO_SMALL if the output buffer is too small

by Thomas Faber

On 2021-09-12 08:34, Eric Kohl wrote: > diff --git a/drivers/hid/kbdhid/kbdhid.c b/drivers/hid/kbdhid/kbdhid.c > index bacf72a0109..b07a7d8445c 100644 > --- a/drivers/hid/kbdhid/kbdhid.c > +++ b/drivers/hid/kbdhid/kbdhid.c > @@ -444,8 +444,8 @@ KbdHid_InternalDeviceControl( > case IOCTL_KEYBOARD_QUERY_INDICATORS: > if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) > { > - /* invalid parameter */ > - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; > + /* buffer too small */ > + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; > IoCompleteRequest(Irp, IO_NO_INCREMENT); > return STATUS_INVALID_PARAMETER; Shouldn't the dispatch routine's return value change accordingly in these cases? Thanks, Thomas

3 years, 7 months

1
0
0 0

Re: [ros-dev] The situation with version 0.4.14

by George Bişoc

I'd also vote for the 1st point and ultimately list the current regressions in the press release. After all the remaining regressions can be fixed and further regression testing be continued in the next release as usual. Most of the regressions which belong within user mode aren't huge stop-blockers so I see no point in delaying the release much. Victor Perevertkin <victor.perevertkin(a)reactos.org> wrote on Tue, February 9th, 2021, 4:47 PM: > Hello! > > It seems for me that it's time to bring up the topic about our RC > version - 0.4.14. > > Our current "stable", 0.4.13 was branched on 30 September, 2019 > (remember those peacefull pre-COVID times :D) > That's quite some time, but not the main issue I'd like to discuss. > > 0.4.14 was branched on 24 April, 2020. That's almost a year already. > And we're in a difficult situation here - there are regressions, but > nobody fixed them within this long time. > According to https://reactos.org/wiki/Tests_for_0.4.14, there are 29 > unfixed regressions found for this release. I'd like to point out: most > of them are among usermode and non-kernel/driver functionality, and as > our development is mostly focused in the kernel right now, it's > unexpected for them to be fixed unless a volunteer comes up. > > A quick reminder. Our "releases" mechanism is useful for finding > regressions in the first place, there is no that much benefit for users > here, because we're still a "deep" alpha. Correct me if I'm wrong. > Joakim made a great job finding all regressions, and this work won't be > lost in any case. > > We can't wait forever and I think it's time to resolve this situation > somehow. I see two options: > 1. Release 0.4.14 as-is. There were a lot more buggy releases, nobody > dies from this. > 2. Skip 0.4.14. This already happened once in the history of the > project - 0.3.2 was skipped. I wasn't around at the time, but I may > guess that reasons were similar to what we have today. > (3.) Fix the bugs quickly. I don't expect this to happen, but who > knows, maybe a volunteer appears :) > > Let's vote. This seem to be the only way for us to decide on things. > Votes from the team members will be collected until 1 March. > > === > > I personally vote for skipping the release. The work on finding > regressions is already done, so the most important part of a release > cycle for us is there (thanks Joakim!) > If we do a release now, all the stuff we were writing in news reports > for the last 6 month would be missing from it. That would cause (as I > think) a lot of confusion to people. Moreover 0.4.14 is not that > featureful release itself (compared to 0.4.13, which brought the new > USB stack) > So I suggest to move on and start checking 0.4.15 for regressions. I > expect quite some of them to appear and we need time for fixing. > > > Cheers, > Victor

3 years, 9 months

3
2
0 0

Re: [ros-dev] [ros-diffs] [reactos] 01/01: [COMCTL32] Addendum to last commit (#3674) CORE-17199

by Colin Finck

Joachim Henze wrote: > commit adee5ca255b7ed21f359ca8c1ca06bd44db90dcf > Author: Joachim Henze <Joachim.Henze at reactos.org> > AuthorDate: Mon Jun 28 02:05:56 2021 +0200 > Commit: Joachim Henze <Joachim.Henze at reactos.org> > CommitDate: Mon Jun 28 02:05:56 2021 +0200 > > [COMCTL32] Addendum to last commit (#3674) CORE-17199 > > Keep that section like we had it to > support compilation on VS2010. > It does still work like that. > > [...] > > diff --git a/dll/win32/comctl32/datetime.c b/dll/win32/comctl32/datetime.c > index 71bb3d238b0..51e58fc71f1 100644 > --- a/dll/win32/comctl32/datetime.c > +++ b/dll/win32/comctl32/datetime.c > @@ -130,8 +130,13 @@ static const WCHAR allowedformatchars[] = L"dhHmMstyX"; > static const int maxrepetition [] = {4,2,2,2,4,2,2,4,-1}; > > /* valid date limits */ > +#ifndef __REACTOS__ > static const SYSTEMTIME max_allowed_date = { .wYear = 9999, .wMonth = 12, .wDayOfWeek = 0, .wDay = 31 }; > static const SYSTEMTIME min_allowed_date = { .wYear = 1752, .wMonth = 9, .wDayOfWeek = 0, .wDay = 14 }; > +#else > +static const SYSTEMTIME max_allowed_date = { /*.wYear =*/ 9999, /*.wMonth =*/ 12, /*.wDayOfWeek =*/ 0, /*.wDay =*/ 31 }; > +static const SYSTEMTIME min_allowed_date = { /*.wYear =*/ 1752, /*.wMonth =*/ 9, /*.wDayOfWeek =*/ 0, /*.wDay =*/ 14 }; > +#endif This adds an unnecessary ReactOS-specific diff to a file that was perfectly in sync with Wine 6.0 before, just for supporting an old compiler that has not only been abandoned by us, but obviously also upstream. Being able to source this file unmodified (and eventually sourcing all of comctl32 automatically via a Git submodule/subpath/repo xml file) beats any such hack. I therefore call for a revert. Even worse than all of that, this commit has been silently sneaked on top of a PR without any review! Joachim, you love to criticize the instability of the master branch, yet continue to ignore basic development practices we have established. And this isn't happening for the first time. Another example is https://github.com/reactos/reactos/commit/889eab78ca7c0f17a2ada9ff20de5807a… where you disable sanity checks and create a diff to upstream. All without reviews and all just for your private goal of reducing the binary size of debug builds, something that is not important at the current stage of ReactOS. I would love to see PRs for your ideas, and then we can discuss everything that hasn't been decided before (i.e. not VS2010 support again). But if this doesn't stop, I have no chance other than removing your push access to the GitHub repo, as everything else would mean condoning that uncooperative behavior. Best regards, Colin

3 years, 9 months

1
0
0 0

Current votes on the situation with the 0.4.14 release

by George Bişoc

During the last days of February of this year some team members have participated in a vote concerning the delay of 0.4.14 release due to the amount of regressions making it not eligible to be released as per the release engineering guidelines. As 1st of March has already passed, this is the current situation with the votes as they stand out for the moment in the following order. 1. Release 0.4.14 as-is (with its known regressions as of now) ================================================= * Javier Agustìn Fernàndez Arroyo * Stanislav Motylkov * Hermès BÉLUSCA-MAÏTO * Alexander Rechitskiy * George Bişoc 2. Skip 0.4.14 ================================================= * Victor Perevertkin * Joshua Rice (non team member) 3. Fix the bugs as soon as possible ================================================= None Oleg Dubinskiy's vote is not counted because his mail is apparently empty (???). Considering the collected votes, should we extend the period of voting for a few days so that the other team members can have an opinion too regard the matter or shall we conclude the voting as is and proceed further with releasing 0.4.14? Regards, George

4 years

3
2
0 0

Re: [ros-dev] CLT 2021. I need a few more ppl as stand members

by Daniel Reimer

Whoa so many volunteers. ^^ Ok, I will note all down and then tomorrow check the limits we have. If one is not allowed to be added by me anymore I will still more than welcome everyone who wants to join the party. Maybe we even can add more on our own later. :D Greetings Daniel Stas'M <binarymaster(a)mail.ru> schrieb am Sa, 20.02.2021 21:44: > It seems Aleksey and Alexander are in, so it's going to be very interesting! > > Daniel, count me in :) > > > -- > Stas'M was here > > > Thursday, 18 February 2021, 12:54 +03:00 from "Daniel Reimer" <daniel.reimer(a)reactos.org>: > > Not much to say. I paste a translated mail from CLT staff in here now to > > give you all (non private) information we have by now: > > > > ................... > > > > As you can imagine, everything is a bit different this year. Due to the > > Corona situation, we will not be able to meet at the TU Chemnitz in > > March. Therefore, the Chemnitzer Linux-Tage 2021 will take place purely > > virtually. With this mail we would like to inform you about the > > essential boundary conditions. > > > > You can register additional booth attendants until February 21. > > We will provide you with a virtual videoconference room in our open > > source videoconferencing system BigBlueButton. Our visitors will be able > > to enter this videoconference room during the event and interact with > > you. We will offer demo dates for BigBlueButton. Until then you can test > > it at the following URL: > > https://demo.bigbluebutton.org/gl/ > > > > You are free to decide about the design of your booth program. You can > > either be available for talks and discussions the whole time or publish > > a small booth program yourself (e.g. mini-discussion rounds, quizzes, > > whatever comes to your mind). IMPORTANT: Please send us your booth > > program (time, title, short description) by e-mail by February 21. > > If you do not create your own program, please make sure that at least > > one of you is always available in the video conference room during the > > entire event, so that the booth does not look abandoned. > > > > .................... > > > > So I need one or two more guys to help out. Date is 13. / 14. March > > 2021. If you wanna help out, I will need your full name, title if > > existing and email address. > > > > HELP MEEE > > > > thx > > > > Daniel Reimer > > > > > > _______________________________________________ > > Ros-dev mailing list > > Ros-dev(a)reactos.org > > http://reactos.org/mailman/listinfo/ros-dev > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://reactos.org/mailman/listinfo/ros-dev

4 years, 2 months

1
0
0 0

CLT 2021. I need a few more ppl as stand members

by Daniel Reimer

Not much to say. I paste a translated mail from CLT staff in here now to give you all (non private) information we have by now: ................... As you can imagine, everything is a bit different this year. Due to the Corona situation, we will not be able to meet at the TU Chemnitz in March. Therefore, the Chemnitzer Linux-Tage 2021 will take place purely virtually. With this mail we would like to inform you about the essential boundary conditions. You can register additional booth attendants until February 21. We will provide you with a virtual videoconference room in our open source videoconferencing system BigBlueButton. Our visitors will be able to enter this videoconference room during the event and interact with you. We will offer demo dates for BigBlueButton. Until then you can test it at the following URL: https://demo.bigbluebutton.org/gl/ You are free to decide about the design of your booth program. You can either be available for talks and discussions the whole time or publish a small booth program yourself (e.g. mini-discussion rounds, quizzes, whatever comes to your mind). IMPORTANT: Please send us your booth program (time, title, short description) by e-mail by February 21. If you do not create your own program, please make sure that at least one of you is always available in the video conference room during the entire event, so that the booth does not look abandoned. .................... So I need one or two more guys to help out. Date is 13. / 14. March 2021. If you wanna help out, I will need your full name, title if existing and email address. HELP MEEE thx Daniel Reimer

4 years, 2 months

5
6
0 0

The situation with version 0.4.14

by Victor Perevertkin

Hello! It seems for me that it's time to bring up the topic about our RC version - 0.4.14. Our current "stable", 0.4.13 was branched on 30 September, 2019 (remember those peacefull pre-COVID times :D) That's quite some time, but not the main issue I'd like to discuss. 0.4.14 was branched on 24 April, 2020. That's almost a year already. And we're in a difficult situation here - there are regressions, but nobody fixed them within this long time. According to https://reactos.org/wiki/Tests_for_0.4.14, there are 29 unfixed regressions found for this release. I'd like to point out: most of them are among usermode and non-kernel/driver functionality, and as our development is mostly focused in the kernel right now, it's unexpected for them to be fixed unless a volunteer comes up. A quick reminder. Our "releases" mechanism is useful for finding regressions in the first place, there is no that much benefit for users here, because we're still a "deep" alpha. Correct me if I'm wrong. Joakim made a great job finding all regressions, and this work won't be lost in any case. We can't wait forever and I think it's time to resolve this situation somehow. I see two options: 1. Release 0.4.14 as-is. There were a lot more buggy releases, nobody dies from this. 2. Skip 0.4.14. This already happened once in the history of the project - 0.3.2 was skipped. I wasn't around at the time, but I may guess that reasons were similar to what we have today. (3.) Fix the bugs quickly. I don't expect this to happen, but who knows, maybe a volunteer appears :) Let's vote. This seem to be the only way for us to decide on things. Votes from the team members will be collected until 1 March. === I personally vote for skipping the release. The work on finding regressions is already done, so the most important part of a release cycle for us is there (thanks Joakim!) If we do a release now, all the stuff we were writing in news reports for the last 6 month would be missing from it. That would cause (as I think) a lot of confusion to people. Moreover 0.4.14 is not that featureful release itself (compared to 0.4.13, which brought the new USB stack) So I suggest to move on and start checking 0.4.15 for regressions. I expect quite some of them to appear and we need time for fixing. Cheers, Victor

4 years, 2 months

10
10
0 0

The situation with version 0.4.14

by Олег Дубінський

4 years, 2 months

1
0
0 0

Re: [ros-dev] The situation with version 0.4.14

by Robert Naumann

Hey Tom, USB-Boot works with current nightlies and GPT is in the Works AFAIK(Hermes should know more details). Best Regards Robert Thomas Mueller <mueller6723(a)twc.com> schrieb am Mi., 10. Feb. 2021, 11:01: > from Colin Finck: > > > This is not the kind of participation that has any place on the mailing > list > > of an open-source project. > > Unsubscribed and blocked that person. > > > Colin > > > > Am 09.02.2021 um 17:26 schrieb Dick: > > > > Hi, > > > as a potential user this project makes me extremely tired. in 2000 or > > > something like that i was excited because afvree windows replacement > > > would be there...... it is 221!!! years later and there is...... still > > > nothing, jst deep alpha as stated in last email. and 0.14 woudl have > even > > > regressions for 0.4.13. wouldnt it be more smart to finally build a > > > timeline for this all? or to discuss the fact if this project makes any > > > sense yet, it seems just a waste of time this way. > > First of all, I sent the wrong message a couple times, to ros-general. > Now for the intended message: > > I have been idle with ReactOS because of no place to put it, and ReactOS's > inability to boot from a USB stick. > > I can't install ReactOS on hard drive because of lack of GPT. > > I would need to be able to use ROSBE and write the result to a USB stick > to boot, but don't think that is workable. > > Tom > > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://reactos.org/mailman/listinfo/ros-dev >

4 years, 2 months

1
0
0 0

Mail server maintenance on Thursday, 4th February

by Colin Finck

Hi all! Our IServ system used for mail and mailinglists will be down for maintenance on THURSDAY, 4TH FEBRUARY 2021 15:00 ~ 17:00 UTC During this time, you won't be able to send or receive any mails using your @reactos.org address. Mail that is sent to an @reactos.org address will usually be delivered later. Other services won't be affected by this migration. In particular, all means of communication through Mattermost or the website/forums will stay live. Best regards, Colin Finck

4 years, 2 months

1
1
0 0

FOSDEM 2021 preparation

by Victor Perevertkin

Hello everyone! We've got accepted to FOSDEM 2021, which (as you may already know) will be going online. FOSDEM provides a place on their stands website, we need to prepare a page for that. There is also a place for videos in case we want to share some :) Their website uses Hugo and is available on Github (https://github.com/FOSDEM/stands-website) The documentation is provided here: https://github.com/FOSDEM/stands-website/blob/master/README.md Let's discuss what should we present there, there is not that much time left! The conference is held on 6-7 February Cheers, Victor

4 years, 3 months

1
0
0 0

Re: [ros-dev] Status Meeting (November 2020)

by Hermès BÉLUSCA-MAÏTO

What about that discussion about why we have ditched out MSVC 2010 support (starting to depend on that fact, and thus, breaking any possibility of self-hosting ROS building on ROS using MSVC compiler (without the IDE), since later versions of MSVC only work on Vista+, and as an indirect consequence, too, opening the can of worms, that is, being able to "pollute", involuntarily or not, the ReactOS core code (kernel + drivers) with C99+ non-standard portable code -- ), and without having first warned heavily through all the mailing lists etc. , thus allowing the developers to voice their concerns publicly in the MLs ? This was done around in mattermost only, after we decided for some reason that we wouldn't need the VC2010 buildbots anymore. Hermes. -----Original Message----- From: Ros-dev <ros-dev-bounces(a)reactos.org> On Behalf Of Colin Finck Sent: Sun Nov 15 17:24:22 UTC 2020 To: ReactOS Development List <ros-dev(a)reactos.org> Subject: [ros-dev] Status Meeting (November 2020) Hi all, With several people asking for a status meeting, let's have another one before the year is over. Let me invite you to the meeting on Thursday, 26th November 2020 19:00 UTC Mattermost private channel "Meeting" So far, there is only one point on the agenda: * Achievements and Future Outlook (everyone) What have you been working on and what are your plans? Please submit further agenda proposals by answering to this mail. Looking forward to see you! Colin

4 years, 3 months

9
12
0 0

Status Meeting (November 2020)

by Joachim Henze

I wanted to add, that vgal and Doug Lyons were also favoring continued VS2010 support, as we can see clearly in the PRs discussion https://github.com/reactos/reactos/pull/2658 Please do count also those contributors voices. Some more regarding some brought up arguments: >>"BTRFS and its sync will benefit from the drop": I see a working BTRFS in 0.4.14RC60, which has VS2010 support. And I see a totally broken BTRFS that does not even boot at all any longer in master head 0.4.15-dev-1605-gab45955. A fact. >>"We should replace all proven compilers with superior Clang" I have not seen a ros yet, that would even boot at all with Clang. Also according to discussions they do still lack SEH 32bit support. And even if they would develop that one day, how big will the resulting ros isos be then? And that still would not solve the compat to older build platforms 2k3sp2/XPSP3 and ros. Wishful thinking just. >>"We need the drop for the new standard library." And where is that library? No one did ever integrate that into ros, although the compilers drop has been rushed into master months ago already. As Hermes said already: I see no gain, but I do see a lot of pain and unfinished WIP+wishful thinking.

4 years, 3 months

1
0
0 0

Sad news

by Javier Agustìn Fernàndez Arroyo

Hello guys, I have just read at Facebook that Andrew Greenwood's father (andrew's nick is *silverblade* at ReactOS) passed away last night due to CoVid19.

4 years, 3 months

1
0
0 0

FOSDEM online

by Mark Jansen

Hello, This year FOSDEM is going to be an online event: https://fosdem.org/2021/news/2020-12-11-stands-cfp/ Are there volunteers for an online ReactOS stand? We would need some short video's for introduction and demonstration purposes, as well as some people active in a chat room answering questions. Regards, Mark

4 years, 4 months

3
2
0 0

Re: [ros-dev] [ros-diffs] [reactos] 01/01: Implement IRP_MN_QUERY_DEVICE_TEXT.DeviceTextLocationInformation

by jerome.gardou＠reactos.org

Eric, Can we please refrain from using sprintf, strlen and the like in kernel-mode drivers ? Expecially on buffers which are obviously too small for their purpose ? Please use functions from ntstrsafe.h and work directly on W-buffers, thanks. Thanks Jérôme Le dimanche 6 décembre 2020, 12:45:55 CET Eric Kohl a écrit : > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cac7b003c04c1f42f45221 > 56c2d2f77996b271c2 > > commit cac7b003c04c1f42f4522156c2d2f77996b271c2 > Author: Eric Kohl <eric.kohl(a)reactos.org> > AuthorDate: Sun Dec 6 12:42:50 2020 +0100 > Commit: Eric Kohl <eric.kohl(a)reactos.org> > CommitDate: Sun Dec 6 12:42:50 2020 +0100 > > Implement IRP_MN_QUERY_DEVICE_TEXT.DeviceTextLocationInformation > --- > drivers/storage/port/scsiport/pdo.c | 34 +++++++++++++++++++++++++++++++--- > 1 file changed, 31 insertions(+), 3 deletions(-) > > diff --git a/drivers/storage/port/scsiport/pdo.c > b/drivers/storage/port/scsiport/pdo.c index 182f2b029ec..5ddbd7e2b34 100644 > --- a/drivers/storage/port/scsiport/pdo.c > +++ b/drivers/storage/port/scsiport/pdo.c > @@ -185,10 +185,12 @@ PdoHandleQueryDeviceText( > PIO_STACK_LOCATION IoStack; > UINT32 Offset = 0; > PINQUIRYDATA InquiryData; > - CHAR LocalBuffer[sizeof(InquiryData->VendorId) + > sizeof(InquiryData->ProductId) + 2]; + CHAR LocalBuffer[40]; > ANSI_STRING AnsiString; > UNICODE_STRING DeviceDescription; > > + DPRINT("PdoHandleQueryDeviceText\n"); > + > IoStack = IoGetCurrentIrpStackLocation(Irp); > > InquiryData = &DeviceExtension->InquiryData; > @@ -196,9 +198,8 @@ PdoHandleQueryDeviceText( > switch (IoStack->Parameters.QueryDeviceText.DeviceTextType) > { > case DeviceTextDescription: > - case DeviceTextLocationInformation: > { > - DPRINT("PdoHandleQueryDeviceText\n"); > + DPRINT("DeviceTextDescription\n"); > > Offset += CopyFieldTruncate(InquiryData->VendorId, > &LocalBuffer[Offset], > @@ -227,6 +228,33 @@ PdoHandleQueryDeviceText( > Irp->IoStatus.Information = > (ULONG_PTR)DeviceDescription.Buffer; return STATUS_SUCCESS; > } > + > + case DeviceTextLocationInformation: > + { > + DPRINT("DeviceTextLocationInformation\n"); > + > + sprintf(LocalBuffer, "Bus Number %d, Target ID %d, LUN %d", > + DeviceExtension->PathId, DeviceExtension->TargetId, > DeviceExtension->Lun); + > + RtlInitAnsiString(&AnsiString, (PCSZ)&LocalBuffer); > + > + DeviceDescription.Length = 0; > + DeviceDescription.MaximumLength = (USHORT)((strlen(LocalBuffer) > + 1) * sizeof(WCHAR)); + DeviceDescription.Buffer = > ExAllocatePoolWithTag(PagedPool, + > DeviceDescription.MaximumLength, + > TAG_SCSIPORT); + if > (!DeviceDescription.Buffer) > + { > + Irp->IoStatus.Information = 0; > + return STATUS_INSUFFICIENT_RESOURCES; > + } > + > + RtlAnsiStringToUnicodeString(&DeviceDescription, &AnsiString, > FALSE); + > + Irp->IoStatus.Information = > (ULONG_PTR)DeviceDescription.Buffer; + return STATUS_SUCCESS; > + } > + > default: > { > Irp->IoStatus.Information = 0;

4 years, 4 months

1
0
0 0

Status Meeting (November 2020)

by Do Ho

Hello, as Colin already mentioned, I have tried to compile libc++ for ReactOS. I stopped the project for two reasons: 1. The current state of the CRT in ReactOS. 2. The ongoing discussion about MSVC 2010. With MSVC 2010 it is of course impossible to compile a current version of libc++. So why should I waste my time? Without a clear commitment to using current C++ compilers, it simply makes no sense. As Colin described in detail, current technologies would increase the pace of development and attract more interested developers. Developers like me, who simply do something else without the project ever knowing about them. But don't get me wrong, this is not about me or libc++. Maybe libc++ cannot be used for other reasons after all! But with MSVC 2010 you don't even have to start. All the best, Dominik

4 years, 4 months

1
0
0 0

Status Meeting (November 2020)

by Олег Дубінський

4 years, 4 months

5
4
0 0

Status Meeting (November 2020)

by Joachim Henze

I totally and vehemently agree with Hermes here: We should NOT ditch VS2010. Arguments that were raised by others against VS2010 and my reply: -"ditching it brings in new developers to ros magically" <- I do ask then, where are they? I don't see any. -"we should not be limited to strict C89" <- No one did request for that. All we want is to remain compatible to VS2010. A subset. -"syncing BTRFS is a bit harder" <- So what? Then let others do the job. Actually BTRFS is not even a mandatory feature of ros. Having it in the tree is just luxury. -"libc++" <- I see no urgent need and nothing it would give in return that would outweight what we would sacrifice. My arguments again for keeping VS2010: -VS2010 creates the smallest binaries of all compilers we do support -VS2010 CAN be installed in ros, when ros is installed as Server during 2nd stage, (yes this was not the case for a very short moment, unfortunately exactly when we discussed in https://github.com/reactos/reactos/pull/2658 but now it works again, even in 0.4.14-RC51) -VS2010 can now even open the VS2010 cmd prompt see https://jira.reactos.org/secure/attachment/57140/57140_0.4.15-dev-203-g711f… -no other VS>2010 can even complete its setup in ros, and that will remain like that for many years to come -VS2010 is the last version that runs on XPSP3 (which is important for some of our devs including myself) -VS2010 is the last version that runs on 2k3SP2 which is our current target -VS2010 is reliable with industry-proven stability, and itself no moving target (unlike VS2019 which breaks our builds every few weeks when MS upgrades it) -VS2010 DOES provide std::unique_ptr. Stating anything else is just a lie. It covers > 95% of CPP2011-standard. It is absolutely possible and not complicated to write leak-free-code with it.

4 years, 4 months

2
1
0 0

Status Meeting (November 2020)

by Олег Дубінський

4 years, 4 months

2
1
0 0

Status Meeting (November 2020)

by Doug Lyons

Hello, Please note that I would like to cast a vote in favor of restoring compatibility for VS2010. Thanks very much, Doug Lyons -- This email has been checked for viruses by AVG. https://www.avg.com

4 years, 4 months

1
0
0 0

Status Meeting (November 2020)

by Colin Finck

Hi all, With several people asking for a status meeting, let's have another one before the year is over. Let me invite you to the meeting on Thursday, 26th November 2020 19:00 UTC Mattermost private channel "Meeting" So far, there is only one point on the agenda: * Achievements and Future Outlook (everyone) What have you been working on and what are your plans? Please submit further agenda proposals by answering to this mail. Looking forward to see you! Colin

4 years, 5 months

1
0
0 0

Re: [ros-dev] Not available for Status Meeting (August 2020)

by George Bişoc

Would on August 31 be alright for you? I'm asking because I won't be available by September 5 or 7 from now on due to a temporary job that I'm going to have soon. Regards, George Colin Finck <colin(a)reactos.org> wrote on Fri, August 14th, 2020, 5:24 PM: > Hi all! > > Keeping the usual schedule, our next bi-monthly status meeting would be > on 27th August. > Due to vacation, I won't be available on that date though and therefore > cannot serve as the meeting moderator. > > If you want the meeting to take place on the usual date, please find > another moderator. > Otherwise, we have to postpone it I guess. > > Suggestions are welcome! :) > > > Cheers, > > Colin

4 years, 7 months

1
0
0 0

Not available for Status Meeting (August 2020)

by Colin Finck

Hi all! Keeping the usual schedule, our next bi-monthly status meeting would be on 27th August. Due to vacation, I won't be available on that date though and therefore cannot serve as the meeting moderator. If you want the meeting to take place on the usual date, please find another moderator. Otherwise, we have to postpone it I guess. Suggestions are welcome! :) Cheers, Colin

4 years, 8 months

2
1
0 0

Ayuda por favor

by Harrisson Russell

Hola que tal, estoy realizando mi tesis basándose en ReactOS y quisera saber mas informacion sobre el SO, tengo curiosidad si ustedes también trabajan con GNUPG o algun tipo de sistema de cifrado para los archivos y/o particiones del disco duro y si me podrian explicar porque esa parte no esta explicado en ninguna documentacion de ReactOS, se los agreadeceria si me podrian brindar esa informacion y/o orientarme les agredeceria de antemano. Muchas gracias. -- Saludos -- Sthip Harrisson Russell Panduro. Correo: sthiplife(a)gmail.com

4 years, 9 months

1
0
0 0

[QubesOS] Debug first boot

by Frédéric Pierret

Hi, I'm Frédéric from QubesOS project. I wanted to try your latest release ReactOS 0.4.13 today and I've managed to install it on our latest QubesOS R4.1 in development within a HVM domain. First text installer for partitioning is fine and the graphical setup for languages and parameters too. At first OS boot while seeing the desktop for the first time, it popups a window pci device detection but then, just few seconds after the VM is freezing. Looking at Xen status, the stubdomain is not frozen at all, but the VM itself yes with 100% CPU usage. I've tried IDE driver for disk too but the same behavior appeared. Any idea on how I can catch errors or having logs? Should I try your debug ISO? Thank you in advance for your help. Frédéric PS: https://jira.reactos.org/browse/CORE-13358

4 years, 10 months

3
2
0 0

Re: [ros-dev] Status Meeting (June 2020)

by Victor Perevertkin

I'd like to propose what I have on my mind: - 0.4.14 release status, what's left to do (should be a short one) - Unifying our contribution guidelines. I've found out that we have too many places with instructions for contributors. And if fact they don't quite indicate our expectations of a good pull request. A couple of weeks ago we gathered our ideas for contributor's and reviewer's guidelines and put them in a google doc: https://docs.google.com/document/d/1osRfG0PelNyDAwlwGFrIL-D12WeuxV3BO_GzW0N… I'd like to have a bit of a discussion about all we wrote there and then we will try to compile new guidelines from it. - This partly overlaps with the previous one. We have some pull requests where people with relevant experience are missing in our team. (atm I'm talking mainly about LSASS PR https://github.com/reactos/reactos/pull/2230, but such situation is possible in future) I suggest treating such PRs with a "light" scheme: only check for code style, some obvious mistakes etc. Otherwise they will be stuck forever Colin Finck <colin(a)reactos.org> wrote on Tue, June 23rd, 2020, 8:44 AM: > Short reminder that the meeting is going to take place this week's Thursday. > > Unfortunately, I didn't get a single mail regarding the meeting agenda. > However, I took from Mattermost that some people (Daniel in particular) > want to talk about channel moderation, so I'm putting it on the agenda: > > * Channel moderation (Daniel) > > There may have been other things I missed, which is why I reiterate to > send all agenda proposals by E-Mail. > > See you then, > > Colin > > > Am 04.06.2020 um 09:13 schrieb Colin Finck: > > Hi all! > > > > Let me invite you to the (almost) bi-monthly status meeting, taking > > place Thursday, 25th June, 19:00 UTC, in the Mattermost private channel > > "Meeting". > > > > I missed to announce a meeting last month and also didn't get any > > proposals for the agenda. But apparently there is a need to discuss a > > few things. > > Therefore, please submit your agenda proposals by E-Mail to me now. > > I will then announce the final agenda one week in advance. > > > > Topics I would like to speak about: > > > > * Achievements and Future Outlook (everyone) > > What have you been working on and what are your plans? > > > > * GSoC 2020 Status (org admins and mentors) > > Just a short update on how the GSoC projects are doing > > > > > > Best regards, > > > > Colin > > > > > > _______________________________________________ > > Ros-dev mailing list > > Ros-dev(a)reactos.org > > http://reactos.org/mailman/listinfo/ros-dev > >

4 years, 10 months

1
0
0 0

Status Meeting (June 2020)

by Colin Finck

Hi all! Let me invite you to the (almost) bi-monthly status meeting, taking place Thursday, 25th June, 19:00 UTC, in the Mattermost private channel "Meeting". I missed to announce a meeting last month and also didn't get any proposals for the agenda. But apparently there is a need to discuss a few things. Therefore, please submit your agenda proposals by E-Mail to me now. I will then announce the final agenda one week in advance. Topics I would like to speak about: * Achievements and Future Outlook (everyone) What have you been working on and what are your plans? * GSoC 2020 Status (org admins and mentors) Just a short update on how the GSoC projects are doing Best regards, Colin

4 years, 10 months

1
1
0 0

Re: [ros-dev] [QubesOS] Debug first boot

by Victor Perevertkin

Hi Frédéric, Debug logs are being written to a serial port if you select the "ReactOS (Debug)" option in the bootloader. It will help to understand what's going on in the OS. My guess that's some race condition while enumerating devices. As far as I can see, Xen shares some code with QEMU for device emulation in HVM mode. Thus this wiki page (https://reactos.org/wiki/QEMU) may help to tune some settings, because ReactOS doesn't work with all kinds of modes QEMU offers (namely, q35 chipset doesn't work, https://jira.reactos.org/browse/CORE-13346) Checking latest development build may also help, but we haven't made much changes to that part of OS recently. If you will manage to run ReactOS inside Xen, maybe it's worth creating a dedicated wiki page for that along with other virtualization software. Anyway, thanks for your interest in our project :) Victor

4 years, 11 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [reactos] 02/02: [NTOS:MM] Get rid of unnecessary MmZeroingPageThreadActive.

by Alex Ionescu

I know I probably don't have much weight anymore but, I re-iterate that one of the goals of the project should be to make things as similar as possible for debugging/troubleshooting and learning as Server 2003... which does have this variable. I don't think it's the end of the world to keep it around. Stuff like this also tends to break kdexts.dll. Best regards, Alex Ionescu On Mon, Apr 6, 2020 at 5:15 AM Thomas Faber <thomas.faber(a)reactos.org> wrote: > > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=25a5aee86f43e9f526d4d… > > commit 25a5aee86f43e9f526d4d360e4e4f35feb9d22b4 > Author: Thomas Faber <thomas.faber(a)reactos.org> > AuthorDate: Sat Feb 22 12:31:54 2020 +0100 > Commit: Thomas Faber <thomas.faber(a)reactos.org> > CommitDate: Mon Apr 6 11:13:55 2020 +0200 > > [NTOS:MM] Get rid of unnecessary MmZeroingPageThreadActive. > --- > ntoskrnl/mm/ARM3/miarm.h | 1 - > ntoskrnl/mm/ARM3/mminit.c | 5 ++--- > ntoskrnl/mm/ARM3/pfnlist.c | 3 +-- > ntoskrnl/mm/ARM3/zeropage.c | 3 +-- > 4 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h > index c242b795af6..9d85c42afff 100644 > --- a/ntoskrnl/mm/ARM3/miarm.h > +++ b/ntoskrnl/mm/ARM3/miarm.h > @@ -639,7 +639,6 @@ extern PMMPDE MiHighestUserPde; > extern PFN_NUMBER MmSystemPageDirectory[PPE_PER_PAGE]; > extern PMMPTE MmSharedUserDataPte; > extern LIST_ENTRY MmProcessList; > -extern BOOLEAN MmZeroingPageThreadActive; > extern KEVENT MmZeroingPageEvent; > extern ULONG MmSystemPageColor; > extern ULONG MmProcessColorSeed; > diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c > index 7cd7af10838..d72e7186193 100644 > --- a/ntoskrnl/mm/ARM3/mminit.c > +++ b/ntoskrnl/mm/ARM3/mminit.c > @@ -2181,9 +2181,8 @@ MmArmInitSystem(IN ULONG Phase, > /* Initialize the Loader Lock */ > KeInitializeMutant(&MmSystemLoadLock, FALSE); > > - /* Set the zero page event */ > - KeInitializeEvent(&MmZeroingPageEvent, SynchronizationEvent, FALSE); > - MmZeroingPageThreadActive = FALSE; > + /* Set up the zero page event */ > + KeInitializeEvent(&MmZeroingPageEvent, NotificationEvent, FALSE); > > /* Initialize the dead stack S-LIST */ > InitializeSListHead(&MmDeadStackSListHead); > diff --git a/ntoskrnl/mm/ARM3/pfnlist.c b/ntoskrnl/mm/ARM3/pfnlist.c > index eac3a043418..f175541a500 100644 > --- a/ntoskrnl/mm/ARM3/pfnlist.c > +++ b/ntoskrnl/mm/ARM3/pfnlist.c > @@ -701,10 +701,9 @@ MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex) > ColorTable->Count++; > > /* Notify zero page thread if enough pages are on the free list now */ > - if ((ListHead->Total >= 8) && !(MmZeroingPageThreadActive)) > + if (ListHead->Total >= 8) > { > /* Set the event */ > - MmZeroingPageThreadActive = TRUE; > KeSetEvent(&MmZeroingPageEvent, IO_NO_INCREMENT, FALSE); > } > > diff --git a/ntoskrnl/mm/ARM3/zeropage.c b/ntoskrnl/mm/ARM3/zeropage.c > index 6d859f6806f..5fe22294199 100644 > --- a/ntoskrnl/mm/ARM3/zeropage.c > +++ b/ntoskrnl/mm/ARM3/zeropage.c > @@ -17,7 +17,6 @@ > > /* GLOBALS ********************************************************************/ > > -BOOLEAN MmZeroingPageThreadActive; > KEVENT MmZeroingPageEvent; > > /* PRIVATE FUNCTIONS **********************************************************/ > @@ -73,7 +72,7 @@ MmZeroPageThread(VOID) > { > if (!MmFreePageListHead.Total) > { > - MmZeroingPageThreadActive = FALSE; > + KeClearEvent(&MmZeroingPageEvent); > MiReleasePfnLock(OldIrql); > break; > } >

4 years, 11 months

2
1
0 0

sumatraPDF

by Javier Agustìn Fernàndez Arroyo

check this link guys! :) (yes, i am the poster) :) https://forum.sumatrapdfreader.org/t/support-reactos/2921

4 years, 11 months

3
5
0 0

Status Meeting (March 2020)

by Colin Finck

Hi all! Let me invite you to the bi-monthly status meeting, taking place *TODAY*, 19:00 UTC, in the Mattermost private channel "Meeting". I know that this announcement comes way too late, but hope that people can manage to join, even if it's just to get some distraction from all the bad news these days. The agenda currently looks as follows, with the main speakers in parentheses: * Achievements and Future Outlook (everyone) What have you been working on and what are your plans? This is also the right time to talk about ReactOS 0.4.13 and RosBE 2.2 again. * GSoC 2020 Status (org admins and mentors) Just a short update on the timeline, promising projects and candidates * Drop one theme from "default" package (Victor) Last release we added two new themes, but they both look unfinished in many aspects. As we have an active maintainer for one of them (Mizu), Victor's suggestion is to either drop the Lunar, or "merge" it with Lautus By the way, we have many times discussed an option to make custom themes be installed from Rapps. What do we need to do for that? And finally, it would be nice to write down some formal criteria for accepting themes. It will make PR reviewers' life easier :) * Hire a developer for dev-web interface and/or a devops for our infrastructure (Victor) Making that a GSoC project required too much effort for a mentor; so in the end the project was not too efficient in terms of time spent/amount of work done ratio (as a GSoC project it is great, but the interface is still far from being usable) Victor thinks it is reasonable to hire some experienced developer for maybe a month or something. Looking forward to see all of you this evening! Colin

5 years

1
0
0 0

covid-19

by Javier Agustìn Fernàndez Arroyo

Hi all, This is just to ask for best wishes to all of you. I hope you are all ok and safe.

5 years, 1 month

2
1
0 0

Topics for next Meeting

by Victor Perevertkin

Hi all! I would like to propose some topic to discuss on the next meeting (will it be on March, 26?) * Drop one theme from "default" package. Last release we added two new themes, but they both look unfinished in many aspects. As we have an active maintainer for one of them (Mizu), my suggestion is to either drop the Lunar, or "merge" it with Lautus (I find them quite similar - correct me if I'm wrong) I think it's worth asking cernodile and foxlet about their thoughts. I have a strong opinion that 4 themes is too much for "default" package By the way, we have many times discussed an option to make custom themes be installed from Rapps. What do we need to do for that? And finally, it would be nice to write down some formal criteria for accepting themes. It will make PR reviewers' life easier :) * Hire a developer for dev-web interface and/or a devops for our infrastructure. Making that a GSoC project required too much effort for a mentor; so in the end the project was not too efficient in terms of time spent/amount of work done ratio (as a GSoC project it is great, but the interface is still far from being usable) I think it is reasonable to hire some experienced developer for maybe a month or something (is we have enough funds, ofc). That will probably require a more detailed task from us. Suggestions are welcome here :) We don't have to wait for a meeting, may start discussing that here :) Cheers, Victor

5 years, 1 month

1
0
0 0

Application for participation in GSOC 2020

by Chaitanya Gadgil

Dear Sir/Madam, This is Chaitanya Gadgil from Bengaluru,India. I am a first year under-graduate student pursuing Electronics and Instrumentation Engineering. I am interested to work with your organization for the GSoC 2020. I am interested to work on the end user development project "Application manager RAPPS". Goal setting with the project: Improvising user-system interactions Easier management of installed applications My skills are: 1.Programming knowledge in both C and C++ 2.Data structures and database management systems 3.Basics of MATLAB and Arduino 4. Mathematics 5. SQL Member of: The International Society of Automation The New York Academy of Sciences The Mathematical society of BMSCE Courses enrolled: Cybersecurity DBMS Networking using IOT Projects: Developing Smart Wearables using Integrated Sensor Network Architecture Developing an algorithmic approach to track malnutrition in India It would be a wonderful experience for me to work with your organization and collaborating for the project. It would be helpful if I can contact a mentor immediately so that I can interact and start working as soon as possible on the project. I am also willing to improve my skills if needed. I can guarantee of setting a good time for the project as I will be having vacations. Regards, Chaitanya Gadgil

5 years, 1 month

2
1
0 0

32-bit hosts virtualbox EOL

by Javier Agustìn Fernàndez Arroyo

"Please also use version 5.2 if you still need support for 32-bit hosts, as this has been discontinued in 6.0. Version 5.2 will remain supported until July 2020." FYI That means, ROS will still be usable as guest, but not as host

5 years, 2 months

1
0
0 0

Reinstating the ReactOS Meetings

by Colin Finck

Hi all! We had our annual General Assembly of ReactOS Deutschland e.V. today. Many things were discussed which are better discussed with the entire ReactOS Team, which is why all of us agreed on reinstating the recurring ReactOS Meetings we had until February 2019. Let's try out a bi-monthly schedule, with the first meeting happening on Thursday, January 30, 2020 19:00 UTC Mattermost private channel "Meeting" If you're currently not part of this channel, but think you should be, please contact me. I'm already announcing this, so we can collect topics for the meeting. Current points on the agenda: * Compiling an up-to-date list of tasks to work on, for newcomers, GSoC candidates, and developers to hire. Can already be started now by taking https://reactos.org/wiki/Google_Summer_of_Code_2019_Ideas, copying it to "Google Summer of Code 2020", cleaning it up and adding new stuff. Maybe we also need to manage that with JIRA in the future. * RosBE 2.2, and what's blocking it, if it hasn't happened by then * ReactOS 0.4.13, and what's blocking it, if it hasn't happened by then Just reply if you have anything to add. Cheers, Colin

5 years, 2 months

2
2
0 0

wined3d, Mesa for Windows

by Javier Agustìn Fernàndez Arroyo

Hello guys, Please have a look at this website! https://fdossena.com/?p=articles.php?s=1 Maybe ReactOS can use any of these pieces of FOSS what do you think?

5 years, 3 months

5
5
0 0

FOSDEM 2020

by Colin Finck

Hi all! It took a while but FOSDEM has finally put a list of accepted stands on their website: https://fosdem.org/2020/news/2019-11-19-accepted-stands/ Looks like we only got a stand on Sunday this year, with our friends from Haiku OS having one on Saturday only. Not really what I thought when signing up for a "shared booth as always", but I'm sure we're going to manage that. There are plenty of opportunities for us to fill an entire weekend in Brussels, including * Having a "mini Hackfest" on Saturday in a coworking space in Brussels (or alternatively at FOSDEM itself, but it's going to be crowded there) * Following up on what Victor and me discussed with the FreeBSD, Haiku, NetBSD, and RTEMS people at GSoC Mentor Summit regarding a port of the low-level FreeBSD kernel interfaces to ReactOS, making a vast amount of network and storage drivers available to us. As far as I recall, the FreeBSD people have a conference in Brussels just before FOSDEM and are inviting us to join (Mahdi - correct me if I'm wrong). * Asking the Haiku guys if we shall try to join their booth on Saturday while they join ours on Sunday (Adrien? François?) But first I'd like to know who else is definitely going to make it to Brussels. Please reply to my mail ASAP, then we can have a short meeting on Mattermost soon and come to a decision. Cheers, Colin

5 years, 5 months

2
1
0 0

Report from the GSoC Mentor Summit 2019

by Colin Finck

Hi all! Victor and me are having a good time at this year's GSoC Mentor Summit in Munich, and it's time to get out a first report. Again, I'm getting the impression that all projects here pretty much share the same problems and ReactOS is not doing anything particular wrong. Today, I have attended a session about keeping students involved after GSoC. Most projects are struggling with that and there were some projects where it's usual for all students to just stay for GSoC and immediately leave afterwards. Anyway, I took some insights where we can improve to keep more of our students: * Give students some responsibility early on, so they feel responsible and needed for a project even after GSoC. The ultimate goal should be to turn them into mentors later. We already have a fairly good track record of that, but I think it should be emphasized here. * Invite more students to our Hackfest. We may need to postpone it by a few weeks to not clash with the final days of GSoC. For the MacPorts project, this resulted in all 3 students staying with the project after GSoC. * Talk to students on a personal level (possibly even through audio or video chat) and get them into our community. We had some high-performing students in the past who needed almost no mentoring, but this also resulted in less interactions with the community and we had a hard time to keep them involved after GSoC. * Collect tasks all year long, not just shortly before GSoC. This is important not just for keeping students, but also for enabling our paid development ideas around ReactOS. It's still important to ask a student what he or she wants to work on after GSoC, but we should always have some interesting tasks available. * Advertise our scholarship model early enough during GSoC to keep the people that are also doing it for the money. * Advertise our GSoC participation at universities. Some students managed to declare their GSoC participation as the technical internship required for their studies. All in all, the Mentor Summit again was a great opportunity to meet up with fellow Open-Source developers all around the world and have some interesting discussions. I'm already looking forward to the next one! We even got some ReactOS work done <https://github.com/reactos/reactos/pull/1835> just in sight distance of the Microsoft Germany HQ :D Cheers, Colin

5 years, 6 months

1
0
0 0

INVALID OPCODE

by katahiromz .

An error occurred in FreeLoader v3.0. 0x06: Exception 06: INVALID OPCODE

5 years, 7 months

2
1
0 0

why is the project so silent?

by Dick

Hi, why is the project so silent? Normally there were messages about online meetings, upcomming releases etc. on this list but it became realy silent and the last release is long time ago. what happened to reactos? best regards, dick

5 years, 7 months

2
3
0 0

Re: [ros-dev] [ros-diffs] [reactos] 01/01: [NETAPI32] Add the NetpAllocStrFromWStr helper function

by Thomas Faber

Hey Eric, On 2019-08-24 14:01, Eric Kohl wrote: > +PSTR > +WINAPI > +NetpAllocStrFromWStr( > + _In_ PWSTR InString) > +{ > + UNICODE_STRING UnicodeString; > + OEM_STRING OemString; > + ULONG Size; > + NET_API_STATUS NetStatus; > + NTSTATUS Status; > + > + RtlInitUnicodeString(&UnicodeString, InString); > + > + Size = RtlUnicodeStringToOemSize(&UnicodeString); > + NetStatus = NetApiBufferAllocate(Size, > + (PVOID*)&OemString.Buffer); > + if (NetStatus != NERR_Success) > + return NULL; > + It seems like OemString.MaximumLength should be initialized before calling RtlUnicodeStringToOemString? > + Status = RtlUnicodeStringToOemString(&OemString, > + &UnicodeString, > + FALSE); > + if (!NT_SUCCESS(Status)) > + { > + NetApiBufferFree(OemString.Buffer); > + return NULL; > + } > + > + return OemString.Buffer; > +} Best, Thomas

5 years, 7 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [reactos] 01/01: [NETAPI32] Implement DsDeregisterDnsHostRecordsA

by Thomas Faber

Hey Eric, On 2019-08-24 22:58, Eric Kohl wrote: > diff --git a/dll/win32/netapi32/netlogon.c b/dll/win32/netapi32/netlogon.c > index 2c068dc176b..73a0324f0fa 100644 > --- a/dll/win32/netapi32/netlogon.c > +++ b/dll/win32/netapi32/netlogon.c > @@ -313,10 +313,58 @@ DsDeregisterDnsHostRecordsA( > _In_opt_ GUID *DsaGuid, > _In_ LPSTR DnsHostName) > { [...] > + > + if (DnsDomainName != NULL) > + { > + pDnsDomainNameW = NetpAllocWStrFromAnsiStr((PSTR)DnsDomainName); > + if (pDnsDomainNameW == NULL) > + { > + status = ERROR_NOT_ENOUGH_MEMORY; > + goto done; > + } > + } > + > + pDnsHostNameW = NetpAllocWStrFromAnsiStr((PSTR)DnsDomainName); UserNT points out that you probably meant DnsHostName here rather than DnsDomainName. > + if (pDnsHostNameW == NULL) > + { > + status = ERROR_NOT_ENOUGH_MEMORY; > + goto done; > + } > + Best, Thomas

5 years, 8 months

2
1
0 0

Re: [ros-dev] BuildBot Upgrade on Tuesday

by Sylvain Petreolle

Hello all, Connecting to the new buildbot now shows an avatar picture from www.gravatar.com. What are the legal implications ? What personal data are sent here ? Is it still possible to see online logs as plain text ? https://build.reactos.org/#/builders/9/builds/24976/steps/5/logs/stdio/text comes back to the index now. Looking at a 1 billion lines hung log as HTML won't do anything good, for the client and the server. | | Kind regards, Sylvain Petreolle Le Dimanche 23 juin 2019 23h13, Colin Finck <colin(a)reactos.org> a écrit : Hi all! Our BuildBot at https://build.reactos.org is finally going to be upgraded from the ancient version 0.8.14 to the latest 2.3.1 release this Tuesday evening (CEST). We have postponed this for a very long time due to the fundamental UI changes in newer versions. The UI has been rewritten from scratch and its Waterfall View has been simplified. I used to be a strong opponent of this change. However, in one of the last meetings, it turned out that the current Waterfall View isn't that popular among our developers anyway. You can expect the new BuildBot to look like this: https://lidell.nu/xemacs-buildbot/ BuildBot also doesn't provide a direct migration path from the old to the new version. This means that previous build and log information will be gone after the upgrade. I used to consider this a blocker as well, but current BuildBot already purges old build/log information after some time and apparently it hasn't been missed. We still have all important information in Testman. I will make sure however that build numbers in the new version continue where they ended in the old version. On the plus side, this upgrade brings integrations with GitHub and Mattermost as well as proper Unicode support. Using an up-to-date BuildBot version also allows us to actually enhance it. In fact, this upgrade is a prerequisite for the Developer Web Interface our GSoC student Ayush Sinha is currently working on. Regarding Buildslaves (now called "workers"), the new BuildBot is still compatible with 0.8.x clients, so these don't need an upgrade right away. We just need a small change on workers submitting test results. Kudos go to Victor Perevertkin, who has already begun evaluating the new BuildBot version a long time ago and provided me with an updated master.cfg file, along with other help! I'm glad that the number of people maintaining our BuildBot setup is growing! :) Cheers, Colin _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://reactos.org/mailman/listinfo/ros-dev

5 years, 9 months

2
1
0 0

Hackfest 2019 - Deadline for Merchandising and Financial Assistance

by Colin Finck

Hi all! The ReactOS Hackfest will take place in about a month and a week. Please revisit https://reactos.org/wiki/ReactOS_Hackfest_2019/Lists and put yourself in all relevant lists if you are going to attend. I've just updated the Shirts/Hoodies section with the final design. Please check that out and add whether you want a shirt or a hoodie. You may also want to check the links regarding the exact sizes again. Deadline for this is THURSDAY, JULY 11 After that, I will move on and buy the merchandising products. If your attendance at the Hackfest needs financial assistance from ReactOS Deutschland e.V., please also get in touch with me before that deadline. You know, flights and accommodation get more expensive the closer we are to the event date ;) Cheers, Colin

5 years, 9 months

1
0
0 0

BuildBot Upgrade on Tuesday

by Colin Finck

Hi all! Our BuildBot at https://build.reactos.org is finally going to be upgraded from the ancient version 0.8.14 to the latest 2.3.1 release this Tuesday evening (CEST). We have postponed this for a very long time due to the fundamental UI changes in newer versions. The UI has been rewritten from scratch and its Waterfall View has been simplified. I used to be a strong opponent of this change. However, in one of the last meetings, it turned out that the current Waterfall View isn't that popular among our developers anyway. You can expect the new BuildBot to look like this: https://lidell.nu/xemacs-buildbot/ BuildBot also doesn't provide a direct migration path from the old to the new version. This means that previous build and log information will be gone after the upgrade. I used to consider this a blocker as well, but current BuildBot already purges old build/log information after some time and apparently it hasn't been missed. We still have all important information in Testman. I will make sure however that build numbers in the new version continue where they ended in the old version. On the plus side, this upgrade brings integrations with GitHub and Mattermost as well as proper Unicode support. Using an up-to-date BuildBot version also allows us to actually enhance it. In fact, this upgrade is a prerequisite for the Developer Web Interface our GSoC student Ayush Sinha is currently working on. Regarding Buildslaves (now called "workers"), the new BuildBot is still compatible with 0.8.x clients, so these don't need an upgrade right away. We just need a small change on workers submitting test results. Kudos go to Victor Perevertkin, who has already begun evaluating the new BuildBot version a long time ago and provided me with an updated master.cfg file, along with other help! I'm glad that the number of people maintaining our BuildBot setup is growing! :) Cheers, Colin

5 years, 10 months

1
0
0 0

Coding style fixes/improvements

by Victor Perevertkin

Hi! Recently I've looked into Doxygen manual for writing documentation and noticed that an example on our Coding style <https://reactos.org/wiki/index.php?title=Coding_Style> page on wiki uses some statements in a wrong way. Namely, @name statement is for defining sections, groups and definitely not for functions/structs/classes etc. Another thing is a function description. Doxygen has two types of them: brief and detailed one. Brief description must be defined by @brief statement, but for detailed one @details can be omitted (which in fact was done in our example). Obviously, brief description should be used in first place (and that would be likely the only one) I've made some changes, to the page (see the latest change in page history) Btw, I think it can be extended to something like this ( http://micro-os-plus.github.io/develop/doxygen-style-guide/) sometime If you have any objections or suggestions, feel free to add them or discuss here. Cheers, Victor

5 years, 10 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [reactos] 02/02: [SETUPAPI] Fix a typo in CM_Query_Resource_Conflict_List.

by Thomas Faber

This does not seem right. On 2019-06-06 19:14, Eric Kohl wrote: > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c47ad98ff79ad98042ff2… > > commit c47ad98ff79ad98042ff2043d739be58770c2fbc > Author: Eric Kohl <eric.kohl(a)reactos.org> > AuthorDate: Thu Jun 6 19:12:44 2019 +0200 > Commit: Eric Kohl <eric.kohl(a)reactos.org> > CommitDate: Thu Jun 6 19:12:44 2019 +0200 > > [SETUPAPI] Fix a typo in CM_Query_Resource_Conflict_List. > --- > dll/win32/setupapi/cfgmgr.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c > index 8215d47ac63..d33a6497172 100644 > --- a/dll/win32/setupapi/cfgmgr.c > +++ b/dll/win32/setupapi/cfgmgr.c > @@ -6761,7 +6761,7 @@ CM_Query_Resource_Conflict_List( > if (lpDevInst == NULL) > return CR_INVALID_DEVNODE; > > - pConflictData = MyMalloc(sizeof(CONFLICT_DATA)); > + pConflictData = MyMalloc(sizeof(PCONFLICT_DATA)); > if (pConflictData == NULL) > { > ret = CR_OUT_OF_MEMORY; >

5 years, 10 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [reactos] 01/01: [SYSSETUP] Set registry hostname in WriteComputerSettings (#1589)

by gedmurphy.maillists＠gmail.com

+ /* Now we need to set the Hostname */ + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, + KEY_SET_VALUE, + &hKey); + if (lError != ERROR_SUCCESS) + { + DPRINT1("RegOpenKeyExW for Tcpip\\Parameters failed (%08lX)\n", lError); + return TRUE; Typo?

5 years, 10 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [reactos] 01/02: [BASESVR] Take SessionId into account while creating BNO directory

by gedmurphy.maillists＠gmail.com

Hadn't we decided to default to strsafe apis for all new code? StringCchPrintfW StringCchCopyW -----Original Message----- From: Ros-diffs <ros-diffs-bounces(a)reactos.org> On Behalf Of Pierre Schweitzer Sent: 08 May 2019 19:42 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [reactos] 01/02: [BASESVR] Take SessionId into account while creating BNO directory https://git.reactos.org/?p=reactos.git;a=commitdiff;h=20f57973866eb54d3c282… commit 20f57973866eb54d3c2822a3b62a309a9983c196 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed May 8 20:35:31 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed May 8 20:35:31 2019 +0200 [BASESVR] Take SessionId into account while creating BNO directory --- subsystems/win/basesrv/init.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/subsystems/win/basesrv/init.c b/subsystems/win/basesrv/init.c index ebfe937068..84b24f38db 100644 --- a/subsystems/win/basesrv/init.c +++ b/subsystems/win/basesrv/init.c @@ -353,8 +353,14 @@ BaseInitializeStaticServerData(IN PCSR_SERVER_DLL LoadedServerDll) SystemRootString.Buffer); ASSERT(Success); - /* FIXME: Check Session ID */ - wcscpy(BnoBuffer, L"\\BaseNamedObjects"); + if (SessionId != 0) + { + swprintf(BnoBuffer, L"\\Sessions\\%ld\\BaseNamedObjects", SessionId); + } + else + { + wcscpy(BnoBuffer, L"\\BaseNamedObjects"); + } RtlInitUnicodeString(&BnoString, BnoBuffer); /* Allocate the server data */ @@ -531,7 +537,7 @@ BaseInitializeStaticServerData(IN PCSR_SERVER_DLL LoadedServerDll) Status = NtCreateSymbolicLinkObject(&SymHandle, SYMBOLIC_LINK_ALL_ACCESS, &ObjectAttributes, - &SymlinkName); + &BnoString); if ((NT_SUCCESS(Status)) && SessionId == 0) NtClose(SymHandle); /* Make Session point back to BNOLINKS */

5 years, 11 months

1
0
0 0

MS Console/Terminal stuff (was: "RE: Ros-dev Digest, Vol 177, Issue 2")

by Hermès BÉLUSCA-MAÏTO

Hi, I’m trying to answer point by point. 1. Their license is MIT. At least it allows us to borrow ideas from their code for how to implement stuff in ReactOS’ console/terminal. (I suppose that if one wants to copy entire chunks of code, that I wouldn’t do it, I’m not sure how the licensing of the original ReactOS console GPL code would have to change. But “I’m not a lawyer”. Anyway, copy-pasting stuff is never a good idea.) 2. Yes but again you don’t need to care. It allows us to remain “original” in our way of implementing the things. What’s now “documented” however, is the interface between condrv and conhost (and to kernel32 if my quick reading of the shared headers is correct). This is sufficient. Then the internal implementation one can write for ReactOS is left free, this allows one to have original code and note a dull copy-paste. 3. ReactOS doesn’t use C++ in the console, and won’t use ”WinRT” any time soon in its entire code-base. So forget about any direct import of the MS console code into ROS. Regards, Hermès De : Ros-dev [mailto:ros-dev-bounces@reactos.org] De la part de Biswapriyo Nath Envoyé : mardi 7 mai 2019 20:42 À : ros-dev(a)reactos.org Objet : Re: [ros-dev] Ros-dev Digest, Vol 177, Issue 2 Some queries though: 1. There are many restrictions on how the code can be used. Are developers allowed to import the idea to ReactOS? Also with a different license. 2. The half of the codebase of console subsystem implemented in KernelBase and Kernel32. Those are not open source. Also the main magic happens in ConDrv driver. 3. The project has C++/WinRT code. Does ReactOS have that section? Thank you <3

5 years, 11 months

3
2
0 0

Re: [ros-dev] Ros-dev Digest, Vol 177, Issue 2

by Biswapriyo Nath

Some queries though: 1. There are many restrictions on how the code can be used. Are developers allowed to import the idea to ReactOS? Also with a different license. 2. The half of the codebase of console subsystem implemented in KernelBase and Kernel32. Those are not open source. Also the main magic happens in ConDrv driver. 3. The project has C++/WinRT code. Does ReactOS have that section? Thank you <3

5 years, 11 months

1
0
0 0

Microsoft open-sources its console / terminal code! (MIT-licensed)

by Hermès BÉLUSCA-MAÏTO

Dear All, Yes you've read correctly! Microsoft released the code of its terminal + the Windows console host (conhost.exe) under MIT license at: https://github.com/microsoft/Terminal I think this is a really great move!! This can definitively help us for: * first, allowing us to improve our existing console code, * and in the future, getting our console architecture Win10-compatible (...) This also means that anybody can contribute back to their code via pull-requests, or at least creating issues. For those using Windows 10, they plan releasing official builds starting June 2019 according to their posts: https://devblogs.microsoft.com/commandline/introducing-windows-terminal/ https://www.hanselman.com/blog/ANewConsoleForWindowsItsTheOpenSourceWindowsT erminal.aspx Best, Hermès

5 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [reactos] 01/01: [POWERCFG] Fix an exception that occurs when the control panel is closed.

by Thomas Faber

This fix seems odd. I thought HeapFree(NULL) was well-defined and did nothing (despite what MSDN says). Pretty sure Wine uses it everywhere. Am I missing something? On 2019-04-27 19:02, Eric Kohl wrote: > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce218f70ec8a758ec6d40… > > commit ce218f70ec8a758ec6d4039690bae29c23289b9d > Author: Eric Kohl <eric.kohl(a)reactos.org> > AuthorDate: Sat Apr 27 19:00:33 2019 +0200 > Commit: Eric Kohl <eric.kohl(a)reactos.org> > CommitDate: Sat Apr 27 19:01:35 2019 +0200 > > [POWERCFG] Fix an exception that occurs when the control panel is closed. > --- > dll/cpl/powercfg/powershemes.c | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > diff --git a/dll/cpl/powercfg/powershemes.c b/dll/cpl/powercfg/powershemes.c > index 4fff28a279..7d1441a043 100644 > --- a/dll/cpl/powercfg/powershemes.c > +++ b/dll/cpl/powercfg/powershemes.c > @@ -78,8 +78,12 @@ AddPowerScheme( > dwDescription + sizeof(TCHAR)); > if (pScheme->pszName == NULL || pScheme->pszDescription == NULL) > { > - HeapFree(GetProcessHeap(), 0, pScheme->pszName); > - HeapFree(GetProcessHeap(), 0, pScheme->pszDescription); > + if (pScheme->pszName) > + HeapFree(GetProcessHeap(), 0, pScheme->pszName); > + > + if (pScheme->pszDescription) > + HeapFree(GetProcessHeap(), 0, pScheme->pszDescription); > + > HeapFree(GetProcessHeap(), 0, pScheme); > return NULL; > } > @@ -103,8 +107,12 @@ DeletePowerScheme( > { > RemoveEntryList(&pScheme->ListEntry); > > - HeapFree(GetProcessHeap(), 0, pScheme->pszName); > - HeapFree(GetProcessHeap(), 0, pScheme->pszDescription); > + if (pScheme->pszName) > + HeapFree(GetProcessHeap(), 0, pScheme->pszName); > + > + if (pScheme->pszDescription) > + HeapFree(GetProcessHeap(), 0, pScheme->pszDescription); > + > HeapFree(GetProcessHeap(), 0, pScheme); > } > >

5 years, 11 months

1
0
0 0

Proposal for Web App development

by Jatin Kumar

Hi there, Just got my proposal ready, It would be very kind of you if you can go through my proposal once and tell me of any improvements i should make to it. https://docs.google.com/document/d/1Kmwk2B6PYGypMvEqLR0V-OpZbde_d_tfDBz6Vdw…

6 years

1
0
0 0

Help required regarding GSOC Application

by Jatin Kumar

Hey there ! I am really interested to work with your organization.I have been doing web development projects using MERN stack for a while now,And I went through your reactOS GSOC’19 page. I am interested in making the web interface for reactos which can show all GitHub reactos repos, commits, etc using the GitHub API(https://www.reactos.org/wiki/Google_Summer_of_Code_2019_Ideas#Developer… I am Looking forward to work on the same for GSOC this year under your mentorship. Currently I am reading the api documentation and trying to implement some basic stuffs using React and Node.js, till now I have created robust user ineterface with React and am looking forward to add some logics to it in coming hours. Webapp link: https://reactos-web.herokuapp.com/ GitHub repo: https://github.com/AwesomeChap/ReactOS_Web_Interface (Theme I chose in webApp mentioned above is completely customizable : You may think of present theme as Night Mode) kindly review the links. Any suggestion would be appreciated Thanks Jatin Kumar Btech CSE 2nd Year USICT, GGSIPU India

6 years

2
2
0 0

ReactOS Hackfest 2019 will take place from 15th to 20th August in Berlin

by Colin Finck

Hi all! The ReactOS Hackfest goes into its fourth round! Join us from Thursday, 15th August to Tuesday, 20th August 2019, just at the same location in Berlin as last year. As every year, check out the https://reactos.org/wiki/ReactOS_Hackfest_2019 and https://reactos.org/wiki/ReactOS_Hackfest_2019/Lists pages on our Wiki and add yourself if you can make it. Hope to see you all in August! Colin

6 years

1
0
0 0

Code Review and guidence for further application

by Jatin Kumar

Hey there ! I am really interested to work with your organization.I have been doing web development projects using MERN stack for a while now,And I went through your reactOS GSOC’19 page. I am interested in making the web interface for reactos which can show all GitHub reactos repos, commits, etc using the GitHub API(https://www.reactos.org/wiki/Google_Summer_of_Code_2019_Ideas#Developer… I am Looking forward to work on the same for GSOC this year under your mentorship. Currently I am reading the api documentation and trying to implement some basic stuffs using React and Node.js, till now I have created robust user ineterface with React and am looking forward to add some logics to it in coming hours. Webapp link: https://reactos-web.herokuapp.com/ GitHub repo: https://github.com/AwesomeChap/ReactOS_Web_Interface kindly review the links. Any suggestion would be appreciated Thanks Jatin Kumar Btech CSE 2nd Year USICT, GGSIPU India

6 years

2
1
0 0

GSOC 2019 - Costin Visan

by costin visan

Hello! I'm really interested in participating this year at gsoc as part of your team. I'm writting you this email to get your attention and maybe to get a hint for this year's project. I'm in my second year at University Politehnica of Bucharest at the Faculty of Automatic Control and Computers and I study for a degree in Computer Science and Information Technology. I wanna start early this year contributing to the project as I wish to show you that I will be a great addition to your team. If I have caught your attention and you want to communicate me anything, I can be contacted on this mail. - Many thanks, Costin Visan <https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campai…> Virus-free. www.avast.com <https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campai…> <#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>

6 years

3
2
0 0

Re: [ros-dev] [ros-diffs] [reactos] 06/12: [EXT2] Correctly zero memory before using it

by Pierre Schweitzer

This is 3rd party code. Can you surround it with #ifdef __REACTOS__? Le 01/04/2019 à 17:08, Hervé Poussineau a écrit : > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76910c358f7197a6b8e28… > > commit 76910c358f7197a6b8e283ea267faf7b5c1812ff > Author: Hervé Poussineau <hpoussin(a)reactos.org> > AuthorDate: Sat Mar 30 23:06:27 2019 +0100 > Commit: Hervé Poussineau <hpoussin(a)reactos.org> > CommitDate: Mon Apr 1 11:38:32 2019 +0200 > > [EXT2] Correctly zero memory before using it > --- > drivers/filesystems/ext2/src/memory.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/filesystems/ext2/src/memory.c b/drivers/filesystems/ext2/src/memory.c > index 8915dfeccb..cf569f40cd 100644 > --- a/drivers/filesystems/ext2/src/memory.c > +++ b/drivers/filesystems/ext2/src/memory.c > @@ -2072,9 +2072,9 @@ Ext2ParseRegistryVolumeParams( > > USHORT i, j, k; > > - RtlZeroMemory(Codepage, CODEPAGE_MAXLEN); > - RtlZeroMemory(Prefix, HIDINGPAT_LEN); > - RtlZeroMemory(Suffix, HIDINGPAT_LEN); > + RtlZeroMemory(Codepage, sizeof(WCHAR) * CODEPAGE_MAXLEN); > + RtlZeroMemory(Prefix, sizeof(WCHAR) * HIDINGPAT_LEN); > + RtlZeroMemory(Suffix, sizeof(WCHAR) * HIDINGPAT_LEN); > RtlZeroMemory(MountPoint, sizeof(USHORT) * 4); > RtlZeroMemory(DrvLetter, sizeof(CHAR) * 4); > > -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

6 years

1
0
0 0

Tibor Popper (Sumi), Google GSoC 2019

by Tibor Popper

Hello Everyone!! Im Tibor Popper from Hungary, somewhere at middle of Europe :). I want to apply in Google GSoC at this year, also I wanna be co-developer of ReactOS project. I'm really exited about Operating System programming right now, atleast for training myself? I dont really know, but more prefer to make some new functions or fixes for ReactOS to really make this project better, and really useful. Like.: UEFI boot, Kernel expansion, Graphics. Im especially advanced in grafical programming with DirectX 11 / 12, but maybe more with OpenGL 4+. I was developer of video games in some little company, mainly for Windows, with Unreal Engine, Unity, I cant tell about more. I didnt finished University of Pécs, with Engineering IT (BSc), but I have Software Developer occupation. My main programming language is C++, but not limited to others. I have started to look half year before how UEFI works in general to start write EFI programs, but I abandoned this studying, + some OS from sctratch tutorials :) … I really love to make things work! I love optimal and nice looking code, performance, software design, functionality. I love to understand HOW things work, I can take really much time discover these things, like in Physics, also love that too. Greetings, regards, Sumi!

6 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [reactos] 01/01: [MSI] Allow to pass product key validation check

by Thomas Faber

This causes a test failure... https://reactos.org/testman/diff.php?id1=41900790&id2=41904063&type=1&strip… On 2019-03-19 23:06, Stanislav Motylkov wrote: > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e05f5509c4baa4df9d54… > > commit 8e05f5509c4baa4df9d543620d5da9552c18f25f > Author: Stanislav Motylkov <x86corez(a)gmail.com> > AuthorDate: Mon Mar 18 01:14:46 2019 +0300 > Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> > CommitDate: Tue Mar 19 23:05:57 2019 +0100 > > [MSI] Allow to pass product key validation check > > CORE-14710 CORE-15864 > --- > dll/win32/msi/action.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c > index 3909246869..0eef96a89c 100644 > --- a/dll/win32/msi/action.c > +++ b/dll/win32/msi/action.c > @@ -7448,7 +7448,11 @@ UINT msi_validate_product_id( MSIPACKAGE *package ) > if (key && template) > { > FIXME( "partial stub: template %s key %s\n", debugstr_w(template), debugstr_w(key) ); > +#ifdef __REACTOS__ > + WARN("Product key validation HACK, see CORE-14710\n"); > +#else > r = msi_set_property( package->db, szProductID, key, -1 ); > +#endif > } > msi_free( template ); > msi_free( key ); >

6 years, 1 month

2
1
0 0

Re: [ros-dev] [ros-diffs] [reactos] 01/01: [FREETYPE] Fix 3 regressions in one patch

by Pierre Schweitzer

Hi, This commit broke HEAD; both VBox & KVM regtesters are red. Either fix this commit or revert it. In the meantime, please refrain from pushing to HEAD. Cheers, Pierre Le 11/03/2019 à 20:11, Joachim Henze a écrit : > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98b7ecd280c0f641d4593… > > commit 98b7ecd280c0f641d4593c8ba792b463a5117550 > Author: Joachim Henze <Joachim.Henze(a)reactos.org> > AuthorDate: Mon Mar 11 20:10:14 2019 +0100 > Commit: Joachim Henze <Joachim.Henze(a)reactos.org> > CommitDate: Mon Mar 11 20:10:14 2019 +0100 > > [FREETYPE] Fix 3 regressions in one patch > > Fixes regression CORE-15785 (Zim Desktop Wiki 0.67 crashed) and > Fixes regression CORE-15755 (NLite 1.4.9.3 used wrong font) > > without reintroducing regression CORE-15558 (AbiWord 2.6.8 font enumeration) > > This is achieved by partial revert of > 0.4.12-dev-320-g > 6e4e5a004c9da6276695d90187fb577812e8892f > and got ack of Katayama Hirofumi MZ. > > Thanks to patches author Doug Lyons. > Test-results: https://reactos.org/testman/compare.php?ids=66264,66267 > --- > win32ss/gdi/ntgdi/freetype.c | 196 +++++++++++++++++++++++++++++++++---------- > 1 file changed, 152 insertions(+), 44 deletions(-) > > diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c > index 7005057a077..4f58f030f27 100644 > --- a/win32ss/gdi/ntgdi/freetype.c > +++ b/win32ss/gdi/ntgdi/freetype.c > @@ -2244,6 +2244,73 @@ IntGetOutlineTextMetrics(PFONTGDI FontGDI, > return Cache->OutlineRequiredSize; > } > > +static PFONTGDI FASTCALL > +FindFaceNameInList(PUNICODE_STRING FaceName, PLIST_ENTRY Head) > +{ > + PLIST_ENTRY Entry; > + PFONT_ENTRY CurrentEntry; > + ANSI_STRING EntryFaceNameA; > + UNICODE_STRING EntryFaceNameW; > + FONTGDI *FontGDI; > + NTSTATUS status; > + > + for (Entry = Head->Flink; Entry != Head; Entry = Entry->Flink) > + { > + CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry); > + > + FontGDI = CurrentEntry->Font; > + ASSERT(FontGDI); > + > + RtlInitAnsiString(&EntryFaceNameA, FontGDI->SharedFace->Face->family_name); > + status = RtlAnsiStringToUnicodeString(&EntryFaceNameW, &EntryFaceNameA, TRUE); > + if (!NT_SUCCESS(status)) > + { > + break; > + } > + > + if ((LF_FACESIZE - 1) * sizeof(WCHAR) < EntryFaceNameW.Length) > + { > + EntryFaceNameW.Length = (LF_FACESIZE - 1) * sizeof(WCHAR); > + EntryFaceNameW.Buffer[LF_FACESIZE - 1] = L'\0'; > + } > + > + if (RtlEqualUnicodeString(FaceName, &EntryFaceNameW, TRUE)) > + { > + RtlFreeUnicodeString(&EntryFaceNameW); > + return FontGDI; > + } > + > + RtlFreeUnicodeString(&EntryFaceNameW); > + } > + > + return NULL; > +} > + > +static PFONTGDI FASTCALL > +FindFaceNameInLists(PUNICODE_STRING FaceName) > +{ > + PPROCESSINFO Win32Process; > + PFONTGDI Font; > + > + /* Search the process local list. > + We do not have to search the 'Mem' list, since those fonts are linked in the PrivateFontListHead */ > + Win32Process = PsGetCurrentProcessWin32Process(); > + IntLockProcessPrivateFonts(Win32Process); > + Font = FindFaceNameInList(FaceName, &Win32Process->PrivateFontListHead); > + IntUnLockProcessPrivateFonts(Win32Process); > + if (NULL != Font) > + { > + return Font; > + } > + > + /* Search the global list */ > + IntLockGlobalFonts(); > + Font = FindFaceNameInList(FaceName, &g_FontListHead); > + IntUnLockGlobalFonts(); > + > + return Font; > +} > + > /* See https://msdn.microsoft.com/en-us/library/bb165625(v=vs.90).aspx */ > static BYTE > CharSetFromLangID(LANGID LangID) > @@ -2670,10 +2737,67 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, > Info->NewTextMetricEx.ntmFontSig = fs; > } > > +static int FASTCALL > +FindFaceNameInInfo(PUNICODE_STRING FaceName, PFONTFAMILYINFO Info, DWORD InfoEntries) > +{ > + DWORD i; > + UNICODE_STRING InfoFaceName; > + > + for (i = 0; i < InfoEntries; i++) > + { > + RtlInitUnicodeString(&InfoFaceName, Info[i].EnumLogFontEx.elfLogFont.lfFaceName); > + if (RtlEqualUnicodeString(&InfoFaceName, FaceName, TRUE)) > + { > + return i; > + } > + } > + > + return -1; > +} > + > +static BOOLEAN FASTCALL > +FontFamilyInclude(LPLOGFONTW LogFont, PUNICODE_STRING FaceName, > + PFONTFAMILYINFO Info, DWORD InfoEntries) > +{ > + UNICODE_STRING LogFontFaceName; > + > + RtlInitUnicodeString(&LogFontFaceName, LogFont->lfFaceName); > + if (0 != LogFontFaceName.Length && > + !RtlEqualUnicodeString(&LogFontFaceName, FaceName, TRUE)) > + { > + return FALSE; > + } > + > + return FindFaceNameInInfo(FaceName, Info, InfoEntries) < 0; > +} > + > +static BOOL FASTCALL > +FontFamilyFound(PFONTFAMILYINFO InfoEntry, > + PFONTFAMILYINFO Info, DWORD InfoCount) > +{ > + LPLOGFONTW plf1 = &InfoEntry->EnumLogFontEx.elfLogFont; > + LPWSTR pFullName1 = InfoEntry->EnumLogFontEx.elfFullName; > + LPWSTR pFullName2; > + DWORD i; > + > + for (i = 0; i < InfoCount; ++i) > + { > + LPLOGFONTW plf2 = &Info[i].EnumLogFontEx.elfLogFont; > + if (plf1->lfCharSet != plf2->lfCharSet) > + continue; > + > + pFullName2 = Info[i].EnumLogFontEx.elfFullName; > + if (_wcsicmp(pFullName1, pFullName2) != 0) > + continue; > + > + return TRUE; > + } > + return FALSE; > +} > + > static BOOLEAN FASTCALL > GetFontFamilyInfoForList(LPLOGFONTW LogFont, > PFONTFAMILYINFO Info, > - LPCWSTR NominalName, > DWORD *pCount, > DWORD MaxCount, > PLIST_ENTRY Head) > @@ -2700,38 +2824,28 @@ GetFontFamilyInfoForList(LPLOGFONTW LogFont, > { > if (Count < MaxCount) > { > - FontFamilyFillInfo(&Info[Count], NominalName, NULL, FontGDI); > + FontFamilyFillInfo(&Info[Count], NULL, NULL, FontGDI); > } > Count++; > continue; > } > > - FontFamilyFillInfo(&InfoEntry, NominalName, NULL, FontGDI); > + FontFamilyFillInfo(&InfoEntry, NULL, NULL, FontGDI); > > - if (NominalName) > + if (_wcsnicmp(LogFont->lfFaceName, InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, RTL_NUMBER_OF(LogFont->lfFaceName)-1) != 0 && > + _wcsnicmp(LogFont->lfFaceName, InfoEntry.EnumLogFontEx.elfFullName, RTL_NUMBER_OF(LogFont->lfFaceName)-1) != 0) > { > - RtlStringCchCopyW(InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, > - RTL_NUMBER_OF(InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName), > - NominalName); > + continue; > } > - else > + > + if (!FontFamilyFound(&InfoEntry, Info, min(Count, MaxCount))) > { > - if (_wcsnicmp(LogFont->lfFaceName, > - InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, > - RTL_NUMBER_OF(LogFont->lfFaceName) - 1) != 0 && > - _wcsnicmp(LogFont->lfFaceName, > - InfoEntry.EnumLogFontEx.elfFullName, > - RTL_NUMBER_OF(LogFont->lfFaceName) - 1) != 0) > + if (Count < MaxCount) > { > - continue; > + RtlCopyMemory(&Info[Count], &InfoEntry, sizeof(InfoEntry)); > } > + Count++; > } > - > - if (Count < MaxCount) > - { > - RtlCopyMemory(&Info[Count], &InfoEntry, sizeof(InfoEntry)); > - } > - Count++; > } > > *pCount = Count; > @@ -2747,9 +2861,10 @@ GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont, > { > PLIST_ENTRY pEntry, pHead = &g_FontSubstListHead; > PFONTSUBST_ENTRY pCurrentEntry; > - PUNICODE_STRING pFromW, pToW; > + PUNICODE_STRING pFromW; > + FONTGDI *FontGDI; > LOGFONTW lf = *LogFont; > - PPROCESSINFO Win32Process = PsGetCurrentProcessWin32Process(); > + UNICODE_STRING NameW; > > for (pEntry = pHead->Flink; pEntry != pHead; pEntry = pEntry->Flink) > { > @@ -2758,32 +2873,25 @@ GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont, > pFromW = &pCurrentEntry->FontNames[FONTSUBST_FROM]; > if (LogFont->lfFaceName[0] != UNICODE_NULL) > { > - if (_wcsicmp(LogFont->lfFaceName, pFromW->Buffer) != 0) > + if (!FontFamilyInclude(LogFont, pFromW, Info, min(*pCount, MaxCount))) > continue; /* mismatch */ > } > > - pToW = &pCurrentEntry->FontNames[FONTSUBST_TO]; > - if (RtlEqualUnicodeString(pFromW, pToW, TRUE) && > - pCurrentEntry->CharSets[FONTSUBST_FROM] == > - pCurrentEntry->CharSets[FONTSUBST_TO]) > - { > - continue; > - } > - > IntUnicodeStringToBuffer(lf.lfFaceName, sizeof(lf.lfFaceName), pFromW); > SubstituteFontRecurse(&lf); > - if (LogFont->lfCharSet != DEFAULT_CHARSET && LogFont->lfCharSet != lf.lfCharSet) > - continue; > > - IntLockGlobalFonts(); > - GetFontFamilyInfoForList(&lf, Info, pFromW->Buffer, pCount, MaxCount, &g_FontListHead); > - IntUnLockGlobalFonts(); > + RtlInitUnicodeString(&NameW, lf.lfFaceName); > + FontGDI = FindFaceNameInLists(&NameW); > + if (FontGDI == NULL) > + { > + continue; /* no real font */ > + } > > - IntLockProcessPrivateFonts(Win32Process); > - GetFontFamilyInfoForList(&lf, Info, pFromW->Buffer, pCount, MaxCount, > - &Win32Process->PrivateFontListHead); > - IntUnLockProcessPrivateFonts(Win32Process); > - break; > + if (*pCount < MaxCount) > + { > + FontFamilyFillInfo(&Info[*pCount], pFromW->Buffer, NULL, FontGDI); > + } > + (*pCount)++; > } > > return TRUE; > @@ -5426,7 +5534,7 @@ NtGdiGetFontFamilyInfo(HDC Dc, > /* Enumerate font families in the global list */ > IntLockGlobalFonts(); > Count = 0; > - if (! GetFontFamilyInfoForList(&LogFont, Info, NULL, &Count, Size, &g_FontListHead) ) > + if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, &g_FontListHead) ) > { > IntUnLockGlobalFonts(); > ExFreePoolWithTag(Info, GDITAG_TEXT); > @@ -5437,7 +5545,7 @@ NtGdiGetFontFamilyInfo(HDC Dc, > /* Enumerate font families in the process local list */ > Win32Process = PsGetCurrentProcessWin32Process(); > IntLockProcessPrivateFonts(Win32Process); > - if (! GetFontFamilyInfoForList(&LogFont, Info, NULL, &Count, Size, > + if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, > &Win32Process->PrivateFontListHead)) > { > IntUnLockProcessPrivateFonts(Win32Process); > -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

6 years, 1 month

1
0
0 0

Proposal for GSOC

by Akshay Patil

Hello everyone, I am Akshay Patil, a 3rd year undergraduate student studying Computer Science in VIIT, Pune, India. I have been trying React OS for a while now and found it really interesting. I love open source. I want to contribute for the project "*Applications Manager Rapps*" through Google summer of Code 2019. I have been using C++ launguage for 5 years and also made some applications like user control app. I am sure tthat the experience I ganied from last few years will certainly help me in understanding the Rapps Code easily. We will figure out the concrete goals of the project and the decided the plan for the project with the mentor. It'll be great if somebody, could mentor me for this project. Thanks, Akshay Patil

6 years, 1 month

2
1
0 0

ReactOS 0.4.11 to be released tomorrow, March 4, 2019 - Press Kit is online!

by Colin Finck

Hi all! ReactOS 0.4.11 is going to be released tomorrow, Monday, March 4, 2019. The download will be officially available around noon (CEST). A Press Kit for the ReactOS 0.4.11 release is already available: https://download.reactos.org/reactos/ReactOS/0.4.11/ReactOS-0.4.11-PressKit… Feel free to send it to interested parties to let them know about the upcoming release in advance. Best regards, Colin Finck

6 years, 1 month

2
1
0 0

Fwd: [ReactOS Chat] Notification in ReactOS on March 1, 2019

by Javier Agustìn Fernàndez Arroyo

They do! ---------- Forwarded message --------- From: <chat(a)reactos.org> Date: vie., 1 mar. 2019 18:30 Subject: [ReactOS Chat] Notification in ReactOS on March 1, 2019 To: <elhoir(a)gmail.com> You have a new notification. Channel: Town Square @Colin Finck - 17:30 UTC, March 1 @all Mattermost E-Mail notifications should finally work now :) Go To Post <https://chat.reactos.org/reactos/pl/54gbdt6h63rz8j5tqbmtg3wkpc> Any questions at all, mail us any time: feedback(a)mattermost.com Best wishes, The ReactOS Chat Team To change your notification preferences, log in to your team site and go to Account Settings > Notifications.

6 years, 1 month

1
0
0 0

Status Meeting (February 2019)

by Colin Finck

Hi all! Let me invite you to the February 2019 meeting, taking place this Thursday, February 28, 19:00 UTC. It will again happen in the private "Meeting" channel on our Mattermost server at https://chat.reactos.org. The current agenda is as follows: * Status Updates ============== As always, please have your status report ready before the meeting, so that we can get this done quickly. * Google Summer of Code 2019 ========================== Google is about to announce the list of participating organizations today, so we should prepare to spread the word and soon answer lots of questions from interested students. * 0.4.11 ====== Let's quickly update everyone on the state of the 0.4.11 release and the changelog in order to get it out soon. As always, please let me know if you want anything to be added to the agenda. Cheers, Colin

6 years, 1 month

1
0
0 0

Gsoc 19

by Ayush Sinha

Hey there ! I am really interested to work with your organization.I am interested in Web development projects, Went through the reactOS GSOC’19 page. I am interested in making the web interface for reactos which can show all GitHub reactos repos, commits, etc using the GitHub API. (https://www.reactos.org/wiki/Google_Summer_of_Code_2019_Ideas#Developer_Web…) Looking forward to work on the same idea for GSOC’19 under your mentorship. Currently I am reading the api documentation and trying to implement some basic stuffs using nodeJS, till now I have created a web app that can list all reactOs repositories and related information. Webapp link: https://github-userinterface.herokuapp.com/ GitHub repo: https://github.com/ayushsnha/UserInterface-with-Github-RESTapiV3 kindly review the link. All suggestions are welcomed Thanks Ayush Kumar Sinha 2nd year bachelor of cs, VIT University, India

6 years, 2 months

2
1
0 0

Fwd: CLT 2019.... And here he is again, going on your nerves ^^

by Daniel Reimer

Last time. Please add your name, anyone still not done it. I have to confirm on Feb 10th Daniel Reimer <daniel.reimer(a)reactos.org> schrieb am Mo, 21.01.2019 21:49: > Hello and good evening, > > as some of you might already know, we are close to CLT 2019 again: > https://chemnitzer.linux-tage.de/2019/de > > For lazy ones: 16-17.03. in Chemnitz (YES, germany that is) > > As every year I need at least two, better three ppl for maintaining the > booth. This time I will not wait until we really got accepted just to > hear from everyone a nope, or not sure yet way too late in the phase. > This resulted in asking the community for help (which is a good thing > tbh) and that resulted in some bored and feelin useless supporter in the > end. Why? Well, a few days before the whole thing took part I suddently > had enough main/core members and thus he just sat there and had nothing > to do. STILL A BIG SORRY FROM MY SIDE!! > > I don't wanna have this happening once more that year. Thus.... check > the weekend, ways to get there and back home and then reply to the > doodle. Costs to get there are as always a thing we can talk about > compensation and stuff. If you need to talk about CLT stuff, feel free > to reply here of course ^^ > > So... lets hope I have the right link: > https://doodle.com/poll/krmz8ktt8r85m5y4 > > Greetings > > Daniel Reimer

6 years, 2 months

2
1
0 0

Please avoid merges to master

by Thomas Faber

master has been broken for days. Until this issue is fixed, no test results are going to make it to Testman, which means any regressions are going to be extremely hard to track down. Here's the issue to follow: https://jira.reactos.org/browse/CORE-15642 Unless you have something that might fix this, I would ask that you hold off on merging things until this bug is fixed. Thanks, Thomas

6 years, 2 months

1
1
0 0

Re: [ros-dev] [ros-diffs] [reactos] 02/02: [MOUNTMGR][MUP] Use global definition of INIT_FUNCTION/INIT_SECTION (Addendum to 71fefa32).

by Michael Fritscher

Moin, this commit causes https://build.reactos.org/builders/Build%20MSVC_x86/builds/13087/steps/comp… : FAILED: C:\PROGRA~2\MICROS~1.0\VC\bin\cl.exe /nologo -D__RELFILE__="&__FILE__[__FILE__[0] == '.' ? sizeof \"C:/Buildslave/Build_MSVC_x86/build\" - 1 : sizeof REACTOS_SOURCE_DIR]" /Ob0 /Od /GF /Gy /X /Zl /GR- /EHs-c- /GS- /arch:IA32 /FS /W3 /wd4244 /wd4290 /wd4800 /wd4200 /wd4214 /wd4018 /we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4229 /we4700 /we4603 /we4716 /we4028 /we4189 /w14115 /Zi /hotpatch -Idrivers\filters\mountmgr -IC:\Buildslave\Build_MSVC_x86\build\drivers\filters\mountmgr -IC:\Buildslave\Build_MSVC_x86\build\sdk\include -IC:\Buildslave\Build_MSVC_x86\build\sdk\include\psdk -IC:\Buildslave\Build_MSVC_x86\build\sdk\include\dxsdk -Isdk\include -Isdk\include\psdk -Isdk\include\dxsdk -Isdk\include\ddk -Isdk\include\reactos -Isdk\include\reactos\mc -IC:\Buildslave\Build_MSVC_x86\build\sdk\include\crt -IC:\Buildslave\Build_MSVC_x86\build\sdk\include\ddk -IC:\Buildslave\Build_MSVC_x86\build\sdk\include\ndk -IC:\Buildslave\Build_MSVC_x86\build\sdk\include\reactos -IC:\Buildslave\Build_MSVC_x86\build\sdk\include\reactos\libs -DREACTOS_SOURCE_DIR="\"C:/Buildslave/Build_MSVC_x86/build\"" -DREACTOS_BINARY_DIR="\"R:/buildbot/output-VS-i386\"" /FIR:/buildbot/output-VS-i386/drivers/filters/mountmgr/mountmgr.pch /YuR:/buildbot/output-VS-i386/drivers/filters/mountmgr/mountmgr.pch /showIncludes -DDBG=1 -DUSE_COMPILER_EXCEPTIONS -DWIN32 -DWINVER=0x502 -D_M_IX86 -D_SEH_ENABLE_TRACE -D_SETUPAPI_VER=0x502 -D_USE_32BIT_TIME_T -D_WIN32_IE=0x600 -D_WIN32_WINDOWS=0x502 -D_WIN32_WINNT=0x502 -D_WINDOWS -D_WINKD_=1 -D_X86_ -D__REACTOS__ -D__STDC__=1 -D__i386__ -Di386 -Dinline=__inline -Dmountmgr_EXPORTS /Fodrivers\filters\mountmgr\CMakeFiles\mountmgr.dir\mountmgr.c.obj /Fddrivers\filters\mountmgr\CMakeFiles\mountmgr.dir\ /FS -c C:\Buildslave\Build_MSVC_x86\build\drivers\filters\mountmgr\mountmgr.c C:\Buildslave\Build_MSVC_x86\build\drivers\filters\mountmgr\mountmgr.c(1810) : error C2983: 'DriverEntry' : all declarations must have an identical __declspec(code_seg(...)) C:\Buildslave\Build_MSVC_x86\build\drivers\filters\mountmgr\mntmgr.h(179) : see declaration of 'DriverEntry' Best regards, Michael Fritscher On 27.01.19 02:37, Hermès Bélusca-Maïto wrote: > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53abbb06b532fd052d575… > > commit 53abbb06b532fd052d575231a219ca5683e05514 > Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> > AuthorDate: Sun Jan 27 02:34:20 2019 +0100 > Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> > CommitDate: Sun Jan 27 02:40:11 2019 +0100 > > [MOUNTMGR][MUP] Use global definition of INIT_FUNCTION/INIT_SECTION (Addendum to 71fefa32). > --- > drivers/filesystems/mup/dfs.h | 9 +-------- > drivers/filters/mountmgr/mntmgr.h | 9 ++------- > drivers/filters/mountmgr/mountmgr.c | 4 ++-- > 3 files changed, 5 insertions(+), 17 deletions(-) > > diff --git a/drivers/filesystems/mup/dfs.h b/drivers/filesystems/mup/dfs.h > index d158a055ab..49194bdc7f 100644 > --- a/drivers/filesystems/mup/dfs.h > +++ b/drivers/filesystems/mup/dfs.h > @@ -1,14 +1,7 @@ > #ifndef _DFS_PCH_ > #define _DFS_PCH_ > > -#ifndef INIT_SECTION > -#ifdef __GNUC__ > -#define INIT_SECTION __attribute__((section ("INIT"))) > -#else > -#define INIT_SECTION /* Done via alloc_text for MSC */ > -#endif > -#define INIT_FUNCTION INIT_SECTION > -#endif > +#include <section_attribs.h> > > #define DFS_OPEN_CONTEXT 0xFF444653 > #define DFS_DOWNLEVEL_OPEN_CONTEXT 0x11444653 > diff --git a/drivers/filters/mountmgr/mntmgr.h b/drivers/filters/mountmgr/mntmgr.h > index 4153add678..dacbfa7d69 100644 > --- a/drivers/filters/mountmgr/mntmgr.h > +++ b/drivers/filters/mountmgr/mntmgr.h > @@ -8,12 +8,7 @@ > #include <wdmguid.h> > #include <ndk/psfuncs.h> > #include <ntdddisk.h> > - > -#ifdef __GNUC__ > -#define INIT_SECTION __attribute__((section ("INIT"))) > -#else > -#define INIT_SECTION /* Done via alloc_text for MSC */ > -#endif > +#include <section_attribs.h> > > typedef struct _DEVICE_EXTENSION > { > @@ -233,7 +228,7 @@ HasDriveLetter( > IN PDEVICE_INFORMATION DeviceInformation > ); > > -INIT_SECTION > +INIT_FUNCTION > BOOLEAN > MountmgrReadNoAutoMount( > IN PUNICODE_STRING RegistryPath > diff --git a/drivers/filters/mountmgr/mountmgr.c b/drivers/filters/mountmgr/mountmgr.c > index 0e273b3957..0b2fe8e7ba 100644 > --- a/drivers/filters/mountmgr/mountmgr.c > +++ b/drivers/filters/mountmgr/mountmgr.c > @@ -908,7 +908,7 @@ MountMgrUnload(IN struct _DRIVER_OBJECT *DriverObject) > /* > * @implemented > */ > -INIT_SECTION > +INIT_FUNCTION > BOOLEAN > MountmgrReadNoAutoMount(IN PUNICODE_STRING RegistryPath) > { > @@ -1802,7 +1802,7 @@ MountMgrShutdown(IN PDEVICE_OBJECT DeviceObject, > > /* FUNCTIONS ****************************************************************/ > > -INIT_SECTION > +INIT_FUNCTION > NTSTATUS > NTAPI > DriverEntry(IN PDRIVER_OBJECT DriverObject, >

6 years, 2 months

1
0
0 0

New CI investigation

by Victor Perevertkin

Hi all! I've done some research on what can we do to improve our CI system. First of all, I want to clarify: our CI is consists of two parts: building and testing. I'm assuming here that "build" part is OK for us and doesn't require any improvements in workflow or something like that. So focusing only on "testing" part. I tried to find some solutions similar to our testman, but the things are very bad on this side. - There are some plugins for Jenkins which show a table with test results by each build - Microsoft TFS has functionality for storing tests and doing some analysis on them, but that's a no-go for us - Jetbrains' TeamCity also has this thing and has a license for Open Source I use Jetbrains tools at work and like this company in general :) so I decided make some experiments with it. Some facts: - It has out-of-the-box integration with Jira and Github. It works flawlessly (bonus: you can automatically build and test all PRs from team members, for example) - Integration with GitHub Checks (that green checkmark which for us comes from Travis&Appveyor right now) - Has an interface for filtering test results by module, shows execution time, some statistics etc. - Uses JVM for work :) Both master and slave part - PostgreSQL, MySQL and some built-in DB can be used for storage - Uses own DSL, derived from Kothlin language for configuration (but allows configuring through GUI too) Adopting iso build didn't have any issues, it just works. But testing requires some work: - sysreg2 and rosautotest should be changed to output results in some format which TeamCity understands. It can be jUnit, Google test or teamcity's own format - TeamCity has only three states of test: success, failure or crash. This does not fit with our current scheme based on succeed and failed ok()'s count - TeamCity can't compare test results between random builds like our testman. It only can show "tests which failed in this build, but didn't fail in previous one". But if we want something more, we can use their API While looking into the way how our tests work, I've found that by "test" we mean a function defined my START_TEST macro, which does some reporting to sysreg. But each START_TEST function likely has a couple of further test_* calls, which are not reported in any way. This is a place where the granularity of reporting can be increased :) Attaching some screenshots of how it look like in general. https://drive.google.com/open?id=17r4PSFmsi2tiF97HHbYGiMCOoKR7VMUF So far we have to decide what to do now. An options can be: - Go on with adopting test&build infrastructure to TeamCity - we will migrate to it eventually - We are not going to use TeamCity - somebody should develop a custom web interface to consolidate everything ( https://www.reactos.org/wiki/Google_Summer_of_Code_2019_Ideas#Developer_Web… ) - Just migrate to new BuildBot (can be done with along with previous option) - Don't do anything Looking forward to discuss this on the meeting Cheers, Victor

6 years, 2 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [reactos] 01/01: [CDFS] Make windows gcc release build compile, regression CORE-15659

by Pierre Schweitzer

Your #endif is misplaced. INLINE is part of the original source code. Le 22/01/2019 à 18:50, Joachim Henze a écrit : > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bccad87f3ccf266be2179… > > commit bccad87f3ccf266be2179d1322e7a422aeb2f3b7 > Author: Joachim Henze <Joachim.Henze(a)reactos.org> > AuthorDate: Tue Jan 22 18:49:51 2019 +0100 > Commit: Joachim Henze <Joachim.Henze(a)reactos.org> > CommitDate: Tue Jan 22 18:49:51 2019 +0100 > > [CDFS] Make windows gcc release build compile, regression CORE-15659 > --- > drivers/filesystems/cdfs/cdprocs.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/filesystems/cdfs/cdprocs.h b/drivers/filesystems/cdfs/cdprocs.h > index 1d788b28e1..4cff63837a 100644 > --- a/drivers/filesystems/cdfs/cdprocs.h > +++ b/drivers/filesystems/cdfs/cdprocs.h > @@ -1836,7 +1836,10 @@ CdRaiseStatusEx ( > > #else > > +#ifdef __REACTOS__ > +static // make windows gcc release build compile > INLINE > +#endif > DECLSPEC_NORETURN > VOID > CdRaiseStatusEx( > -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

6 years, 3 months

1
0
0 0

CLT 2019.... And here he is again, going on your nerves ^^

by Daniel Reimer

Hello and good evening, as some of you might already know, we are close to CLT 2019 again: https://chemnitzer.linux-tage.de/2019/de For lazy ones: 16-17.03. in Chemnitz (YES, germany that is) As every year I need at least two, better three ppl for maintaining the booth. This time I will not wait until we really got accepted just to hear from everyone a nope, or not sure yet way too late in the phase. This resulted in asking the community for help (which is a good thing tbh) and that resulted in some bored and feelin useless supporter in the end. Why? Well, a few days before the whole thing took part I suddently had enough main/core members and thus he just sat there and had nothing to do. STILL A BIG SORRY FROM MY SIDE!! I don't wanna have this happening once more that year. Thus.... check the weekend, ways to get there and back home and then reply to the doodle. Costs to get there are as always a thing we can talk about compensation and stuff. If you need to talk about CLT stuff, feel free to reply here of course ^^ So... lets hope I have the right link: https://doodle.com/poll/krmz8ktt8r85m5y4 Greetings Daniel Reimer

6 years, 3 months

1
0
0 0

Status Meeting (January 2019) - Now on Mattermost!

by Colin Finck

Hi all! As announced previously (https://reactos.org/pipermail/ros-dev/2019-January/019044.html), we'll be having the January meeting already this Thursday, January 24 in order to have enough time for our GSoC application. The meeting will also take place on our new Mattermost at https://chat.reactos.org for the first time! So let me invite you to this meeting, taking place again at 19:00 UTC. If you haven't tried Mattermost yet, please log in to chat.reactos.org now using your ReactOS.org credentials. Only then I can add you to our new private "Meeting" channel. This one will not be bridged to IRC! I will already start adding people to this channel now, so that the meeting can start on time. If you have the feeling that I forgot about you, please let me know timely. The current agenda is as follows: * Status Updates ============== As always, please have your status report ready before the meeting, so that we can get this done quickly. * Mattermost ========== I need to know your opinion about Mattermost and whether you think that we should continue using it beyond our trial (ending mid- February). This would require an enterprise license for non-profits ($250 per three years). * Google Summer of Code 2019 ========================== The list at https://reactos.org/wiki/Google_Summer_of_Code_2019 still doesn't show a single mentor. And https://reactos.org/wiki/Google_Summer_of_Code_2019_Ideas certainly also needs some polishing. Let's finally make up our minds regarding this year's GSoC, so that we can submit our project application. I would highly appreciate if people updated those Wiki pages before the meeting. This could potentially save us hours of discussions and finding volunteers :) Let me know if you want anything to be added to the agenda. Cheers, Colin

6 years, 3 months

1
0
0 0

Re: [ros-dev] Ros-dev Digest, Vol 173, Issue 5

by Adam Stachowicz

Message from chat.reactos.org: This team has reached the maximum number of allowed accounts. Contact your systems administrator to set a higher limit. Adam Stachowicz sob., 12 sty 2019, 13:00: <ros-dev-request(a)reactos.org> napisał(a): > Send Ros-dev mailing list submissions to > ros-dev(a)reactos.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://reactos.org/mailman/listinfo/ros-dev > or, via email, send a message with subject or body 'help' to > ros-dev-request(a)reactos.org > > You can reach the person managing the list at > ros-dev-owner(a)reactos.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of Ros-dev digest..." > > > Today's Topics: > > 1. Mattermost is live at chat.reactos.org! (Colin Finck) > 2. Reactos participation and Windows source leaked > (Idzwan Nizam b. Jamal) > 3. Re: Reactos participation and Windows source leaked > (Erkin Alp Güney) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Fri, 11 Jan 2019 13:56:46 +0100 > From: Colin Finck <colin(a)reactos.org> > To: 'ReactOS Development List' <ros-dev(a)reactos.org> > Subject: [ros-dev] Mattermost is live at chat.reactos.org! > Message-ID: <d18f8664-55c9-7eaa-dbcf-6161ee53cfaf(a)reactos.org> > Content-Type: text/plain; charset="utf-8" > > Hi all! > > Our own Mattermost instance is finally live at https://chat.reactos.org! > > Enjoy an infinitely searchable history, offline messages, native picture > support, push notifications, a seamless experience on web and mobile, > and more. > All privately hosted on our own infrastructure and usable with the same > ReactOS.org account you already have! > Time to say goodbye to workarounds like IRC bouncers or third-party > services :) > I believe this can really improve our communication and accelerate > development! > > To make the migration as easy as possible, I have set up a bridge > between our Freenode IRC channels and Mattermost. User "RosBridge" will > transfer all messages from #reactos / #reactos-dev to Town Square / > Development and vice-versa. Let's see how long we're going to need that. > > I hope you're all going to join the fun, so that we can already have the > next meeting in around 2 weeks on Mattermost! > > > Cheers, > > Colin > >

6 years, 3 months

2
1
0 0

Upload filters and future of ReactOS

by Erkin Alp Güney

Proposed EU copyright directive requires automated upload filters (something like YouTube ContentID) and this can cause a sharp decrease in contributions. It will also make difficult for newcomers as a significant contribution will be required for each commit, because copyright filter is costly to run. Yours, faithfully Erkin Alp

6 years, 3 months

2
1
0 0

Reactos participation and Windows source leaked

by Idzwan Nizam b. Jamal

Hello, Supposedly someone had an access and seen leaked windows source code few years ago. At the time he/she do not have any idea of the code (due to improficiency in programming and the subject) and had forgotten since about the code, does he/she allowed to contribute to ReactOS development? This is due to the following statement on the participation page (https://www.reactos.org/participation) "Getting involved with ReactOS is easy and straightforward! We only ask that you have not had access to Microsoft source code for the area you want to work on. This includes either having worked at Microsoft, obtaining the source code through an academic program or from the illegal leakage of Windows source code several years ago. Having viewed the source prevents you from contributing to avoid undermining the legality of our source code"

6 years, 3 months

2
1
0 0

Mattermost is live at chat.reactos.org!

by Colin Finck

Hi all! Our own Mattermost instance is finally live at https://chat.reactos.org! Enjoy an infinitely searchable history, offline messages, native picture support, push notifications, a seamless experience on web and mobile, and more. All privately hosted on our own infrastructure and usable with the same ReactOS.org account you already have! Time to say goodbye to workarounds like IRC bouncers or third-party services :) I believe this can really improve our communication and accelerate development! To make the migration as easy as possible, I have set up a bridge between our Freenode IRC channels and Mattermost. User "RosBridge" will transfer all messages from #reactos / #reactos-dev to Town Square / Development and vice-versa. Let's see how long we're going to need that. I hope you're all going to join the fun, so that we can already have the next meeting in around 2 weeks on Mattermost! Cheers, Colin

6 years, 3 months

1
0
0 0

Google Summer of Code 2019 Application

by Colin Finck

Hi all! Happy new year from my side! Hope you all had nice holidays and that 2019 will be a successful year for ReactOS :) As always, the year begins with our Google Summer of Code application. It is now time to update https://reactos.org/wiki/Google_Summer_of_Code_2019 and https://reactos.org/wiki/Google_Summer_of_Code_2019_Ideas as applications begin next week (January 15). If we take this seriously and don't forget to advertise, I'm sure that we'll get more students this year! But first things first: Who is going to volunteer as mentors and administrators? I'm willing to take over one of the administrator roles again, but we also need a second one. I also suggest that we prepone the monthly meeting for January by a week to Thursday, January 24. This gives us some time for GSoC-related discussions until the final application deadline (February 6). Cheers, Colin

6 years, 3 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [reactos] 02/03: [MBEDTLS] Update to version 2.7.6. CORE-15280

by Pierre Schweitzer

Hey Thomas, Is that an upgrade to 2.7.6 or 2.7.9? Your commit reads the first one, while Jira associated ticket reads the second one. Cheers, Pierre Le 05/01/2019 à 10:36, Thomas Faber a écrit : > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d9e6c9b539327f861c306… > > commit d9e6c9b539327f861c3068e89cfe80f0004ee4c5 > Author: Thomas Faber <thomas.faber(a)reactos.org> > AuthorDate: Wed Oct 31 16:00:34 2018 +0100 > Commit: Thomas Faber <thomas.faber(a)reactos.org> > CommitDate: Sat Jan 5 09:20:35 2019 +0100 > > [MBEDTLS] Update to version 2.7.6. CORE-15280 > > Note: this disables the MBEDTLS_DEPRECATED_REMOVED configuration value, > because we require the now-deprecated MD5 & SHA functions for bcrypt. > --- > dll/3rdparty/mbedtls/CMakeLists.txt | 1 + > dll/3rdparty/mbedtls/aes.c | 238 ++-- > dll/3rdparty/mbedtls/asn1write.c | 5 +- > dll/3rdparty/mbedtls/bignum.c | 24 +- > dll/3rdparty/mbedtls/ccm.c | 39 +- > dll/3rdparty/mbedtls/cipher.c | 24 +- > dll/3rdparty/mbedtls/cmac.c | 12 +- > dll/3rdparty/mbedtls/ctr_drbg.c | 116 +- > dll/3rdparty/mbedtls/debug.c | 2 +- > dll/3rdparty/mbedtls/dhm.c | 62 +- > dll/3rdparty/mbedtls/ecdh.c | 4 + > dll/3rdparty/mbedtls/ecdsa.c | 13 + > dll/3rdparty/mbedtls/ecjpake.c | 5 +- > dll/3rdparty/mbedtls/ecp.c | 11 +- > dll/3rdparty/mbedtls/entropy.c | 136 ++- > dll/3rdparty/mbedtls/error.c | 135 ++- > dll/3rdparty/mbedtls/gcm.c | 200 ++-- > dll/3rdparty/mbedtls/hmac_drbg.c | 15 +- > dll/3rdparty/mbedtls/md.c | 109 +- > dll/3rdparty/mbedtls/md2.c | 119 +- > dll/3rdparty/mbedtls/md4.c | 132 ++- > dll/3rdparty/mbedtls/md5.c | 163 ++- > dll/3rdparty/mbedtls/md_wrap.c | 171 +-- > dll/3rdparty/mbedtls/memory_buffer_alloc.c | 31 +- > dll/3rdparty/mbedtls/net_sockets.c | 18 +- > dll/3rdparty/mbedtls/oid.c | 45 + > dll/3rdparty/mbedtls/pem.c | 125 +- > dll/3rdparty/mbedtls/pk.c | 7 +- > dll/3rdparty/mbedtls/pk_wrap.c | 49 +- > dll/3rdparty/mbedtls/pkcs5.c | 26 +- > dll/3rdparty/mbedtls/pkparse.c | 229 +++- > dll/3rdparty/mbedtls/pkwrite.c | 110 +- > dll/3rdparty/mbedtls/platform.c | 15 +- > dll/3rdparty/mbedtls/ripemd160.c | 157 ++- > dll/3rdparty/mbedtls/rsa.c | 1244 ++++++++++++++------ > dll/3rdparty/mbedtls/rsa_internal.c | 489 ++++++++ > dll/3rdparty/mbedtls/sha1.c | 175 ++- > dll/3rdparty/mbedtls/sha256.c | 182 ++- > dll/3rdparty/mbedtls/sha512.c | 184 ++- > dll/3rdparty/mbedtls/ssl_cache.c | 1 + > dll/3rdparty/mbedtls/ssl_ciphersuites.c | 6 +- > dll/3rdparty/mbedtls/ssl_cli.c | 301 ++--- > dll/3rdparty/mbedtls/ssl_srv.c | 189 ++- > dll/3rdparty/mbedtls/ssl_tls.c | 923 +++++++++++---- > dll/3rdparty/mbedtls/threading.c | 12 + > dll/3rdparty/mbedtls/timing.c | 131 ++- > dll/3rdparty/mbedtls/version_features.c | 42 +- > dll/3rdparty/mbedtls/x509.c | 23 +- > dll/3rdparty/mbedtls/x509_crl.c | 65 +- > dll/3rdparty/mbedtls/x509_crt.c | 114 +- > dll/3rdparty/mbedtls/x509_csr.c | 29 +- > dll/3rdparty/mbedtls/x509write_crt.c | 78 +- > dll/3rdparty/mbedtls/x509write_csr.c | 23 +- > sdk/include/reactos/libs/mbedtls/aes.h | 366 +++--- > sdk/include/reactos/libs/mbedtls/aesni.h | 3 +- > sdk/include/reactos/libs/mbedtls/arc4.h | 38 +- > sdk/include/reactos/libs/mbedtls/asn1.h | 20 +- > sdk/include/reactos/libs/mbedtls/asn1write.h | 3 +- > sdk/include/reactos/libs/mbedtls/base64.h | 3 +- > sdk/include/reactos/libs/mbedtls/bignum.h | 11 +- > sdk/include/reactos/libs/mbedtls/blowfish.h | 4 +- > sdk/include/reactos/libs/mbedtls/bn_mul.h | 20 +- > sdk/include/reactos/libs/mbedtls/camellia.h | 4 +- > sdk/include/reactos/libs/mbedtls/ccm.h | 153 ++- > sdk/include/reactos/libs/mbedtls/certs.h | 3 +- > sdk/include/reactos/libs/mbedtls/check_config.h | 7 +- > sdk/include/reactos/libs/mbedtls/cipher.h | 561 +++++---- > sdk/include/reactos/libs/mbedtls/cipher_internal.h | 3 +- > sdk/include/reactos/libs/mbedtls/cmac.h | 184 +-- > sdk/include/reactos/libs/mbedtls/compat-1.3.h | 3 +- > sdk/include/reactos/libs/mbedtls/config.h | 141 ++- > sdk/include/reactos/libs/mbedtls/ctr_drbg.h | 254 ++-- > sdk/include/reactos/libs/mbedtls/debug.h | 3 +- > sdk/include/reactos/libs/mbedtls/des.h | 51 + > sdk/include/reactos/libs/mbedtls/dhm.h | 1114 +++++++++++++++--- > sdk/include/reactos/libs/mbedtls/ecdh.h | 239 ++-- > sdk/include/reactos/libs/mbedtls/ecdsa.h | 286 +++-- > sdk/include/reactos/libs/mbedtls/ecjpake.h | 21 +- > sdk/include/reactos/libs/mbedtls/ecp.h | 6 +- > sdk/include/reactos/libs/mbedtls/ecp_internal.h | 5 +- > sdk/include/reactos/libs/mbedtls/entropy.h | 4 +- > sdk/include/reactos/libs/mbedtls/entropy_poll.h | 3 +- > sdk/include/reactos/libs/mbedtls/error.h | 40 +- > sdk/include/reactos/libs/mbedtls/gcm.h | 241 ++-- > sdk/include/reactos/libs/mbedtls/havege.h | 3 +- > sdk/include/reactos/libs/mbedtls/hmac_drbg.h | 5 +- > sdk/include/reactos/libs/mbedtls/md.h | 371 +++--- > sdk/include/reactos/libs/mbedtls/md2.h | 191 ++- > sdk/include/reactos/libs/mbedtls/md4.h | 196 ++- > sdk/include/reactos/libs/mbedtls/md5.h | 194 ++- > sdk/include/reactos/libs/mbedtls/md_internal.h | 15 +- > .../reactos/libs/mbedtls/memory_buffer_alloc.h | 3 +- > sdk/include/reactos/libs/mbedtls/net.h | 9 +- > sdk/include/reactos/libs/mbedtls/net_sockets.h | 8 +- > sdk/include/reactos/libs/mbedtls/oid.h | 21 +- > sdk/include/reactos/libs/mbedtls/padlock.h | 3 +- > sdk/include/reactos/libs/mbedtls/pem.h | 3 +- > sdk/include/reactos/libs/mbedtls/pk.h | 16 +- > sdk/include/reactos/libs/mbedtls/pk_internal.h | 5 +- > sdk/include/reactos/libs/mbedtls/pkcs11.h | 3 +- > sdk/include/reactos/libs/mbedtls/pkcs12.h | 3 +- > sdk/include/reactos/libs/mbedtls/pkcs5.h | 3 +- > sdk/include/reactos/libs/mbedtls/platform.h | 111 +- > sdk/include/reactos/libs/mbedtls/platform_time.h | 3 +- > sdk/include/reactos/libs/mbedtls/ripemd160.h | 125 +- > sdk/include/reactos/libs/mbedtls/rsa.h | 1166 ++++++++++++------ > sdk/include/reactos/libs/mbedtls/rsa_internal.h | 228 ++++ > sdk/include/reactos/libs/mbedtls/sha1.h | 248 +++- > sdk/include/reactos/libs/mbedtls/sha256.h | 215 +++- > sdk/include/reactos/libs/mbedtls/sha512.h | 221 +++- > sdk/include/reactos/libs/mbedtls/ssl.h | 117 +- > sdk/include/reactos/libs/mbedtls/ssl_cache.h | 3 +- > .../reactos/libs/mbedtls/ssl_ciphersuites.h | 5 +- > sdk/include/reactos/libs/mbedtls/ssl_cookie.h | 3 +- > sdk/include/reactos/libs/mbedtls/ssl_internal.h | 70 +- > sdk/include/reactos/libs/mbedtls/ssl_ticket.h | 3 +- > sdk/include/reactos/libs/mbedtls/threading.h | 7 +- > sdk/include/reactos/libs/mbedtls/timing.h | 30 +- > sdk/include/reactos/libs/mbedtls/version.h | 13 +- > sdk/include/reactos/libs/mbedtls/x509.h | 3 +- > sdk/include/reactos/libs/mbedtls/x509_crl.h | 3 +- > sdk/include/reactos/libs/mbedtls/x509_crt.h | 31 +- > sdk/include/reactos/libs/mbedtls/x509_csr.h | 3 +- > sdk/include/reactos/libs/mbedtls/xtea.h | 4 +- > 124 files changed, 10395 insertions(+), 3822 deletions(-) > > diff --git a/dll/3rdparty/mbedtls/CMakeLists.txt b/dll/3rdparty/mbedtls/CMakeLists.txt > index 0fbb59bbf4..7a5210bdef 100644 > --- a/dll/3rdparty/mbedtls/CMakeLists.txt > +++ b/dll/3rdparty/mbedtls/CMakeLists.txt > @@ -54,6 +54,7 @@ list(APPEND SOURCE > platform.c > ripemd160.c > rsa.c > + rsa_internal.c > sha1.c > sha256.c > sha512.c > diff --git a/dll/3rdparty/mbedtls/aes.c b/dll/3rdparty/mbedtls/aes.c > index dadfbe3c68..fed58bbc01 100644 > --- a/dll/3rdparty/mbedtls/aes.c > +++ b/dll/3rdparty/mbedtls/aes.c > @@ -767,12 +767,14 @@ int mbedtls_internal_aes_encrypt( mbedtls_aes_context *ctx, > } > #endif /* !MBEDTLS_AES_ENCRYPT_ALT */ > > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > void mbedtls_aes_encrypt( mbedtls_aes_context *ctx, > const unsigned char input[16], > unsigned char output[16] ) > { > mbedtls_internal_aes_encrypt( ctx, input, output ); > } > +#endif /* !MBEDTLS_DEPRECATED_REMOVED */ > > /* > * AES-ECB block decryption > @@ -833,12 +835,14 @@ int mbedtls_internal_aes_decrypt( mbedtls_aes_context *ctx, > } > #endif /* !MBEDTLS_AES_DECRYPT_ALT */ > > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > void mbedtls_aes_decrypt( mbedtls_aes_context *ctx, > const unsigned char input[16], > unsigned char output[16] ) > { > mbedtls_internal_aes_decrypt( ctx, input, output ); > } > +#endif /* !MBEDTLS_DEPRECATED_REMOVED */ > > /* > * AES-ECB block encryption/decryption > @@ -1237,9 +1241,11 @@ static const int aes_test_ctr_len[3] = > */ > int mbedtls_aes_self_test( int verbose ) > { > - int ret = 0, i, j, u, v; > + int ret = 0, i, j, u, mode; > + unsigned int keybits; > unsigned char key[32]; > unsigned char buf[64]; > + const unsigned char *aes_tests; > #if defined(MBEDTLS_CIPHER_MODE_CBC) || defined(MBEDTLS_CIPHER_MODE_CFB) > unsigned char iv[16]; > #endif > @@ -1265,45 +1271,52 @@ int mbedtls_aes_self_test( int verbose ) > for( i = 0; i < 6; i++ ) > { > u = i >> 1; > - v = i & 1; > + keybits = 128 + u * 64; > + mode = i & 1; > > if( verbose != 0 ) > - mbedtls_printf( " AES-ECB-%3d (%s): ", 128 + u * 64, > - ( v == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" ); > + mbedtls_printf( " AES-ECB-%3d (%s): ", keybits, > + ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" ); > > memset( buf, 0, 16 ); > > - if( v == MBEDTLS_AES_DECRYPT ) > + if( mode == MBEDTLS_AES_DECRYPT ) > { > - mbedtls_aes_setkey_dec( &ctx, key, 128 + u * 64 ); > - > - for( j = 0; j < 10000; j++ ) > - mbedtls_aes_crypt_ecb( &ctx, v, buf, buf ); > - > - if( memcmp( buf, aes_test_ecb_dec[u], 16 ) != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - ret = 1; > - goto exit; > - } > + ret = mbedtls_aes_setkey_dec( &ctx, key, keybits ); > + aes_tests = aes_test_ecb_dec[u]; > } > else > { > - mbedtls_aes_setkey_enc( &ctx, key, 128 + u * 64 ); > - > - for( j = 0; j < 10000; j++ ) > - mbedtls_aes_crypt_ecb( &ctx, v, buf, buf ); > + ret = mbedtls_aes_setkey_enc( &ctx, key, keybits ); > + aes_tests = aes_test_ecb_enc[u]; > + } > > - if( memcmp( buf, aes_test_ecb_enc[u], 16 ) != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > + /* > + * AES-192 is an optional feature that may be unavailable when > + * there is an alternative underlying implementation i.e. when > + * MBEDTLS_AES_ALT is defined. > + */ > + if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192 ) > + { > + mbedtls_printf( "skipped\n" ); > + continue; > + } > + else if( ret != 0 ) > + { > + goto exit; > + } > > - ret = 1; > + for( j = 0; j < 10000; j++ ) > + { > + ret = mbedtls_aes_crypt_ecb( &ctx, mode, buf, buf ); > + if( ret != 0 ) > goto exit; > - } > + } > + > + if( memcmp( buf, aes_tests, 16 ) != 0 ) > + { > + ret = 1; > + goto exit; > } > > if( verbose != 0 ) > @@ -1320,55 +1333,64 @@ int mbedtls_aes_self_test( int verbose ) > for( i = 0; i < 6; i++ ) > { > u = i >> 1; > - v = i & 1; > + keybits = 128 + u * 64; > + mode = i & 1; > > if( verbose != 0 ) > - mbedtls_printf( " AES-CBC-%3d (%s): ", 128 + u * 64, > - ( v == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" ); > + mbedtls_printf( " AES-CBC-%3d (%s): ", keybits, > + ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" ); > > memset( iv , 0, 16 ); > memset( prv, 0, 16 ); > memset( buf, 0, 16 ); > > - if( v == MBEDTLS_AES_DECRYPT ) > + if( mode == MBEDTLS_AES_DECRYPT ) > { > - mbedtls_aes_setkey_dec( &ctx, key, 128 + u * 64 ); > - > - for( j = 0; j < 10000; j++ ) > - mbedtls_aes_crypt_cbc( &ctx, v, 16, iv, buf, buf ); > - > - if( memcmp( buf, aes_test_cbc_dec[u], 16 ) != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - ret = 1; > - goto exit; > - } > + ret = mbedtls_aes_setkey_dec( &ctx, key, keybits ); > + aes_tests = aes_test_cbc_dec[u]; > } > else > { > - mbedtls_aes_setkey_enc( &ctx, key, 128 + u * 64 ); > + ret = mbedtls_aes_setkey_enc( &ctx, key, keybits ); > + aes_tests = aes_test_cbc_enc[u]; > + } > + > + /* > + * AES-192 is an optional feature that may be unavailable when > + * there is an alternative underlying implementation i.e. when > + * MBEDTLS_AES_ALT is defined. > + */ > + if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192 ) > + { > + mbedtls_printf( "skipped\n" ); > + continue; > + } > + else if( ret != 0 ) > + { > + goto exit; > + } > > - for( j = 0; j < 10000; j++ ) > + for( j = 0; j < 10000; j++ ) > + { > + if( mode == MBEDTLS_AES_ENCRYPT ) > { > unsigned char tmp[16]; > > - mbedtls_aes_crypt_cbc( &ctx, v, 16, iv, buf, buf ); > - > memcpy( tmp, prv, 16 ); > memcpy( prv, buf, 16 ); > memcpy( buf, tmp, 16 ); > } > > - if( memcmp( prv, aes_test_cbc_enc[u], 16 ) != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - ret = 1; > + ret = mbedtls_aes_crypt_cbc( &ctx, mode, 16, iv, buf, buf ); > + if( ret != 0 ) > goto exit; > - } > + > + } > + > + if( memcmp( buf, aes_tests, 16 ) != 0 ) > + { > + ret = 1; > + goto exit; > } > > if( verbose != 0 ) > @@ -1386,45 +1408,52 @@ int mbedtls_aes_self_test( int verbose ) > for( i = 0; i < 6; i++ ) > { > u = i >> 1; > - v = i & 1; > + keybits = 128 + u * 64; > + mode = i & 1; > > if( verbose != 0 ) > - mbedtls_printf( " AES-CFB128-%3d (%s): ", 128 + u * 64, > - ( v == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" ); > + mbedtls_printf( " AES-CFB128-%3d (%s): ", keybits, > + ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" ); > > memcpy( iv, aes_test_cfb128_iv, 16 ); > - memcpy( key, aes_test_cfb128_key[u], 16 + u * 8 ); > + memcpy( key, aes_test_cfb128_key[u], keybits / 8 ); > > offset = 0; > - mbedtls_aes_setkey_enc( &ctx, key, 128 + u * 64 ); > + ret = mbedtls_aes_setkey_enc( &ctx, key, keybits ); > + /* > + * AES-192 is an optional feature that may be unavailable when > + * there is an alternative underlying implementation i.e. when > + * MBEDTLS_AES_ALT is defined. > + */ > + if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192 ) > + { > + mbedtls_printf( "skipped\n" ); > + continue; > + } > + else if( ret != 0 ) > + { > + goto exit; > + } > > - if( v == MBEDTLS_AES_DECRYPT ) > + if( mode == MBEDTLS_AES_DECRYPT ) > { > memcpy( buf, aes_test_cfb128_ct[u], 64 ); > - mbedtls_aes_crypt_cfb128( &ctx, v, 64, &offset, iv, buf, buf ); > - > - if( memcmp( buf, aes_test_cfb128_pt, 64 ) != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - ret = 1; > - goto exit; > - } > + aes_tests = aes_test_cfb128_pt; > } > else > { > memcpy( buf, aes_test_cfb128_pt, 64 ); > - mbedtls_aes_crypt_cfb128( &ctx, v, 64, &offset, iv, buf, buf ); > + aes_tests = aes_test_cfb128_ct[u]; > + } > > - if( memcmp( buf, aes_test_cfb128_ct[u], 64 ) != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > + ret = mbedtls_aes_crypt_cfb128( &ctx, mode, 64, &offset, iv, buf, buf ); > + if( ret != 0 ) > + goto exit; > > - ret = 1; > - goto exit; > - } > + if( memcmp( buf, aes_tests, 64 ) != 0 ) > + { > + ret = 1; > + goto exit; > } > > if( verbose != 0 ) > @@ -1442,51 +1471,41 @@ int mbedtls_aes_self_test( int verbose ) > for( i = 0; i < 6; i++ ) > { > u = i >> 1; > - v = i & 1; > + mode = i & 1; > > if( verbose != 0 ) > mbedtls_printf( " AES-CTR-128 (%s): ", > - ( v == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" ); > + ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" ); > > memcpy( nonce_counter, aes_test_ctr_nonce_counter[u], 16 ); > memcpy( key, aes_test_ctr_key[u], 16 ); > > offset = 0; > - mbedtls_aes_setkey_enc( &ctx, key, 128 ); > + if( ( ret = mbedtls_aes_setkey_enc( &ctx, key, 128 ) ) != 0 ) > + goto exit; > + > + len = aes_test_ctr_len[u]; > > - if( v == MBEDTLS_AES_DECRYPT ) > + if( mode == MBEDTLS_AES_DECRYPT ) > { > - len = aes_test_ctr_len[u]; > memcpy( buf, aes_test_ctr_ct[u], len ); > - > - mbedtls_aes_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block, > - buf, buf ); > - > - if( memcmp( buf, aes_test_ctr_pt[u], len ) != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - ret = 1; > - goto exit; > - } > + aes_tests = aes_test_ctr_pt[u]; > } > else > { > - len = aes_test_ctr_len[u]; > memcpy( buf, aes_test_ctr_pt[u], len ); > + aes_tests = aes_test_ctr_ct[u]; > + } > > - mbedtls_aes_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block, > - buf, buf ); > - > - if( memcmp( buf, aes_test_ctr_ct[u], len ) != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > + ret = mbedtls_aes_crypt_ctr( &ctx, len, &offset, nonce_counter, > + stream_block, buf, buf ); > + if( ret != 0 ) > + goto exit; > > - ret = 1; > - goto exit; > - } > + if( memcmp( buf, aes_tests, len ) != 0 ) > + { > + ret = 1; > + goto exit; > } > > if( verbose != 0 ) > @@ -1500,6 +1519,9 @@ int mbedtls_aes_self_test( int verbose ) > ret = 0; > > exit: > + if( ret != 0 && verbose != 0 ) > + mbedtls_printf( "failed\n" ); > + > mbedtls_aes_free( &ctx ); > > return( ret ); > diff --git a/dll/3rdparty/mbedtls/asn1write.c b/dll/3rdparty/mbedtls/asn1write.c > index ba31c05909..00b5e7ad4f 100644 > --- a/dll/3rdparty/mbedtls/asn1write.c > +++ b/dll/3rdparty/mbedtls/asn1write.c > @@ -85,7 +85,9 @@ int mbedtls_asn1_write_len( unsigned char **p, unsigned char *start, size_t len > return( 4 ); > } > > +#if SIZE_MAX > 0xFFFFFFFF > if( len <= 0xFFFFFFFF ) > +#endif > { > if( *p - start < 5 ) > return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL ); > @@ -98,7 +100,9 @@ int mbedtls_asn1_write_len( unsigned char **p, unsigned char *start, size_t len > return( 5 ); > } > > +#if SIZE_MAX > 0xFFFFFFFF > return( MBEDTLS_ERR_ASN1_INVALID_LENGTH ); > +#endif > } > > int mbedtls_asn1_write_tag( unsigned char **p, unsigned char *start, unsigned char tag ) > @@ -234,7 +238,6 @@ int mbedtls_asn1_write_int( unsigned char **p, unsigned char *start, int val ) > int ret; > size_t len = 0; > > - // TODO negative values and values larger than 128 > // DER format assumes 2s complement for numbers, so the leftmost bit > // should be 0 for positive numbers and 1 for negative numbers. > // > diff --git a/dll/3rdparty/mbedtls/bignum.c b/dll/3rdparty/mbedtls/bignum.c > index ab510e2df5..49441d19b8 100644 > --- a/dll/3rdparty/mbedtls/bignum.c > +++ b/dll/3rdparty/mbedtls/bignum.c > @@ -65,6 +65,11 @@ static void mbedtls_mpi_zeroize( mbedtls_mpi_uint *v, size_t n ) { > volatile mbedtls_mpi_uint *p = v; while( n-- ) *p++ = 0; > } > > +/* Implementation that should never be optimized out by the compiler */ > +static void mbedtls_zeroize( void *v, size_t n ) { > + volatile unsigned char *p = v; while( n-- ) *p++ = 0; > +} > + > #define ciL (sizeof(mbedtls_mpi_uint)) /* chars in limb */ > #define biL (ciL << 3) /* bits in limb */ > #define biH (ciL << 2) /* half limb size */ > @@ -674,16 +679,20 @@ cleanup: > int mbedtls_mpi_read_binary( mbedtls_mpi *X, const unsigned char *buf, size_t buflen ) > { > int ret; > - size_t i, j, n; > + size_t i, j; > + size_t const limbs = CHARS_TO_LIMBS( buflen ); > > - for( n = 0; n < buflen; n++ ) > - if( buf[n] != 0 ) > - break; > + /* Ensure that target MPI has exactly the necessary number of limbs */ > + if( X->n != limbs ) > + { > + mbedtls_mpi_free( X ); > + mbedtls_mpi_init( X ); > + MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, limbs ) ); > + } > > - MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, CHARS_TO_LIMBS( buflen - n ) ) ); > MBEDTLS_MPI_CHK( mbedtls_mpi_lset( X, 0 ) ); > > - for( i = buflen, j = 0; i > n; i--, j++ ) > + for( i = buflen, j = 0; i > 0; i--, j++ ) > X->p[j / ciL] |= ((mbedtls_mpi_uint) buf[i - 1]) << ((j % ciL) << 3); > > cleanup: > @@ -1616,7 +1625,7 @@ int mbedtls_mpi_exp_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi > mbedtls_mpi RR, T, W[ 2 << MBEDTLS_MPI_WINDOW_SIZE ], Apos; > int neg; > > - if( mbedtls_mpi_cmp_int( N, 0 ) < 0 || ( N->p[0] & 1 ) == 0 ) > + if( mbedtls_mpi_cmp_int( N, 0 ) <= 0 || ( N->p[0] & 1 ) == 0 ) > return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA ); > > if( mbedtls_mpi_cmp_int( E, 0 ) < 0 ) > @@ -1884,6 +1893,7 @@ int mbedtls_mpi_fill_random( mbedtls_mpi *X, size_t size, > MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( X, buf, size ) ); > > cleanup: > + mbedtls_zeroize( buf, sizeof( buf ) ); > return( ret ); > } > > diff --git a/dll/3rdparty/mbedtls/ccm.c b/dll/3rdparty/mbedtls/ccm.c > index b974aec829..07c1ab7029 100644 > --- a/dll/3rdparty/mbedtls/ccm.c > +++ b/dll/3rdparty/mbedtls/ccm.c > @@ -51,6 +51,8 @@ > #endif /* MBEDTLS_PLATFORM_C */ > #endif /* MBEDTLS_SELF_TEST && MBEDTLS_AES_C */ > > +#if !defined(MBEDTLS_CCM_ALT) > + > /* Implementation that should never be optimized out by the compiler */ > static void mbedtls_zeroize( void *v, size_t n ) { > volatile unsigned char *p = (unsigned char*)v; while( n-- ) *p++ = 0; > @@ -350,6 +352,7 @@ int mbedtls_ccm_auth_decrypt( mbedtls_ccm_context *ctx, size_t length, > return( 0 ); > } > > +#endif /* !MBEDTLS_CCM_ALT */ > > #if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C) > /* > @@ -357,7 +360,8 @@ int mbedtls_ccm_auth_decrypt( mbedtls_ccm_context *ctx, size_t length, > */ > > #define NB_TESTS 3 > - > +#define CCM_SELFTEST_PT_MAX_LEN 24 > +#define CCM_SELFTEST_CT_MAX_LEN 32 > /* > * The data is the same for all tests, only the used length changes > */ > @@ -377,7 +381,7 @@ static const unsigned char ad[] = { > 0x10, 0x11, 0x12, 0x13 > }; > > -static const unsigned char msg[] = { > +static const unsigned char msg[CCM_SELFTEST_PT_MAX_LEN] = { > 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, > 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, > 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, > @@ -388,7 +392,7 @@ static const size_t add_len[NB_TESTS] = { 8, 16, 20 }; > static const size_t msg_len[NB_TESTS] = { 4, 16, 24 }; > static const size_t tag_len[NB_TESTS] = { 4, 6, 8 }; > > -static const unsigned char res[NB_TESTS][32] = { > +static const unsigned char res[NB_TESTS][CCM_SELFTEST_CT_MAX_LEN] = { > { 0x71, 0x62, 0x01, 0x5b, 0x4d, 0xac, 0x25, 0x5d }, > { 0xd2, 0xa1, 0xf0, 0xe0, 0x51, 0xea, 0x5f, 0x62, > 0x08, 0x1a, 0x77, 0x92, 0x07, 0x3d, 0x59, 0x3d, > @@ -402,7 +406,13 @@ static const unsigned char res[NB_TESTS][32] = { > int mbedtls_ccm_self_test( int verbose ) > { > mbedtls_ccm_context ctx; > - unsigned char out[32]; > + /* > + * Some hardware accelerators require the input and output buffers > + * would be in RAM, because the flash is not accessible. > + * Use buffers on the stack to hold the test vectors data. > + */ > + unsigned char plaintext[CCM_SELFTEST_PT_MAX_LEN]; > + unsigned char ciphertext[CCM_SELFTEST_CT_MAX_LEN]; > size_t i; > int ret; > > @@ -421,27 +431,32 @@ int mbedtls_ccm_self_test( int verbose ) > if( verbose != 0 ) > mbedtls_printf( " CCM-AES #%u: ", (unsigned int) i + 1 ); > > + memset( plaintext, 0, CCM_SELFTEST_PT_MAX_LEN ); > + memset( ciphertext, 0, CCM_SELFTEST_CT_MAX_LEN ); > + memcpy( plaintext, msg, msg_len[i] ); > + > ret = mbedtls_ccm_encrypt_and_tag( &ctx, msg_len[i], > - iv, iv_len[i], ad, add_len[i], > - msg, out, > - out + msg_len[i], tag_len[i] ); > + iv, iv_len[i], ad, add_len[i], > + plaintext, ciphertext, > + ciphertext + msg_len[i], tag_len[i] ); > > if( ret != 0 || > - memcmp( out, res[i], msg_len[i] + tag_len[i] ) != 0 ) > + memcmp( ciphertext, res[i], msg_len[i] + tag_len[i] ) != 0 ) > { > if( verbose != 0 ) > mbedtls_printf( "failed\n" ); > > return( 1 ); > } > + memset( plaintext, 0, CCM_SELFTEST_PT_MAX_LEN ); > > ret = mbedtls_ccm_auth_decrypt( &ctx, msg_len[i], > - iv, iv_len[i], ad, add_len[i], > - res[i], out, > - res[i] + msg_len[i], tag_len[i] ); > + iv, iv_len[i], ad, add_len[i], > + ciphertext, plaintext, > + ciphertext + msg_len[i], tag_len[i] ); > > if( ret != 0 || > - memcmp( out, msg, msg_len[i] ) != 0 ) > + memcmp( plaintext, msg, msg_len[i] ) != 0 ) > { > if( verbose != 0 ) > mbedtls_printf( "failed\n" ); > diff --git a/dll/3rdparty/mbedtls/cipher.c b/dll/3rdparty/mbedtls/cipher.c > index ff6f3cadeb..e36445f975 100644 > --- a/dll/3rdparty/mbedtls/cipher.c > +++ b/dll/3rdparty/mbedtls/cipher.c > @@ -58,10 +58,6 @@ > #define mbedtls_free free > #endif > > -#if defined(MBEDTLS_ARC4_C) || defined(MBEDTLS_CIPHER_NULL_CIPHER) > -#define MBEDTLS_CIPHER_MODE_STREAM > -#endif > - > /* Implementation that should never be optimized out by the compiler */ > static void mbedtls_zeroize( void *v, size_t n ) { > volatile unsigned char *p = (unsigned char*)v; while( n-- ) *p++ = 0; > @@ -327,8 +323,10 @@ int mbedtls_cipher_update( mbedtls_cipher_context_t *ctx, const unsigned char *i > /* > * If there is not enough data for a full block, cache it. > */ > - if( ( ctx->operation == MBEDTLS_DECRYPT && > + if( ( ctx->operation == MBEDTLS_DECRYPT && NULL != ctx->add_padding && > ilen <= block_size - ctx->unprocessed_len ) || > + ( ctx->operation == MBEDTLS_DECRYPT && NULL == ctx->add_padding && > + ilen < block_size - ctx->unprocessed_len ) || > ( ctx->operation == MBEDTLS_ENCRYPT && > ilen < block_size - ctx->unprocessed_len ) ) > { > @@ -374,9 +372,17 @@ int mbedtls_cipher_update( mbedtls_cipher_context_t *ctx, const unsigned char *i > return MBEDTLS_ERR_CIPHER_INVALID_CONTEXT; > } > > + /* Encryption: only cache partial blocks > + * Decryption w/ padding: always keep at least one whole block > + * Decryption w/o padding: only cache partial blocks > + */ > copy_len = ilen % block_size; > - if( copy_len == 0 && ctx->operation == MBEDTLS_DECRYPT ) > + if( copy_len == 0 && > + ctx->operation == MBEDTLS_DECRYPT && > + NULL != ctx->add_padding) > + { > copy_len = block_size; > + } > > memcpy( ctx->unprocessed_data, &( input[ilen - copy_len] ), > copy_len ); > @@ -518,14 +524,14 @@ static int get_one_and_zeros_padding( unsigned char *input, size_t input_len, > if( NULL == input || NULL == data_len ) > return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA ); > > - bad = 0xFF; > + bad = 0x80; > *data_len = 0; > for( i = input_len; i > 0; i-- ) > { > prev_done = done; > - done |= ( input[i-1] != 0 ); > + done |= ( input[i - 1] != 0 ); > *data_len |= ( i - 1 ) * ( done != prev_done ); > - bad &= ( input[i-1] ^ 0x80 ) | ( done == prev_done ); > + bad ^= input[i - 1] * ( done != prev_done ); > } > > return( MBEDTLS_ERR_CIPHER_INVALID_PADDING * ( bad != 0 ) ); > diff --git a/dll/3rdparty/mbedtls/cmac.c b/dll/3rdparty/mbedtls/cmac.c > index c72c58f009..0809e2fef2 100644 > --- a/dll/3rdparty/mbedtls/cmac.c > +++ b/dll/3rdparty/mbedtls/cmac.c > @@ -67,6 +67,8 @@ > #endif /* MBEDTLS_SELF_TEST */ > #endif /* MBEDTLS_PLATFORM_C */ > > +#if !defined(MBEDTLS_CMAC_ALT) || defined(MBEDTLS_SELF_TEST) > + > /* Implementation that should never be optimized out by the compiler */ > static void mbedtls_zeroize( void *v, size_t n ) { > volatile unsigned char *p = (unsigned char*)v; while( n-- ) *p++ = 0; > @@ -166,7 +168,9 @@ exit: > > return( ret ); > } > +#endif /* !defined(MBEDTLS_CMAC_ALT) || defined(MBEDTLS_SELF_TEST) */ > > +#if !defined(MBEDTLS_CMAC_ALT) > static void cmac_xor_block( unsigned char *output, const unsigned char *input1, > const unsigned char *input2, > const size_t block_size ) > @@ -470,6 +474,8 @@ exit: > } > #endif /* MBEDTLS_AES_C */ > > +#endif /* !MBEDTLS_CMAC_ALT */ > + > #if defined(MBEDTLS_SELF_TEST) > /* > * CMAC test data for SP800-38B > @@ -767,7 +773,7 @@ static int cmac_test_subkeys( int verbose, > int block_size, > int num_tests ) > { > - int i, ret; > + int i, ret = 0; > mbedtls_cipher_context_t ctx; > const mbedtls_cipher_info_t *cipher_info; > unsigned char K1[MBEDTLS_CIPHER_BLKSIZE_MAX]; > @@ -828,6 +834,7 @@ static int cmac_test_subkeys( int verbose, > mbedtls_cipher_free( &ctx ); > } > > + ret = 0; > goto exit; > > cleanup: > @@ -849,7 +856,7 @@ static int cmac_test_wth_cipher( int verbose, > int num_tests ) > { > const mbedtls_cipher_info_t *cipher_info; > - int i, ret; > + int i, ret = 0; > unsigned char output[MBEDTLS_CIPHER_BLKSIZE_MAX]; > > cipher_info = mbedtls_cipher_info_from_type( cipher_type ); > @@ -883,6 +890,7 @@ static int cmac_test_wth_cipher( int verbose, > if( verbose != 0 ) > mbedtls_printf( "passed\n" ); > } > + ret = 0; > > exit: > return( ret ); > diff --git a/dll/3rdparty/mbedtls/ctr_drbg.c b/dll/3rdparty/mbedtls/ctr_drbg.c > index e032d58d22..7994b53383 100644 > --- a/dll/3rdparty/mbedtls/ctr_drbg.c > +++ b/dll/3rdparty/mbedtls/ctr_drbg.c > @@ -21,7 +21,7 @@ > * This file is part of mbed TLS (https://tls.mbed.org) > */ > /* > - * The NIST SP 800-90 DRBGs are described in the following publucation. > + * The NIST SP 800-90 DRBGs are described in the following publication. > * > * http://csrc.nist.gov/publications/nistpubs/800-90/SP800-90revised_March2007… > */ > @@ -96,11 +96,15 @@ int mbedtls_ctr_drbg_seed_entropy_len( > /* > * Initialize with an empty key > */ > - mbedtls_aes_setkey_enc( &ctx->aes_ctx, key, MBEDTLS_CTR_DRBG_KEYBITS ); > + if( ( ret = mbedtls_aes_setkey_enc( &ctx->aes_ctx, key, MBEDTLS_CTR_DRBG_KEYBITS ) ) != 0 ) > + { > + return( ret ); > + } > > if( ( ret = mbedtls_ctr_drbg_reseed( ctx, custom, len ) ) != 0 ) > + { > return( ret ); > - > + } > return( 0 ); > } > > @@ -150,6 +154,7 @@ static int block_cipher_df( unsigned char *output, > unsigned char chain[MBEDTLS_CTR_DRBG_BLOCKSIZE]; > unsigned char *p, *iv; > mbedtls_aes_context aes_ctx; > + int ret = 0; > > int i, j; > size_t buf_len, use_len; > @@ -182,7 +187,10 @@ static int block_cipher_df( unsigned char *output, > for( i = 0; i < MBEDTLS_CTR_DRBG_KEYSIZE; i++ ) > key[i] = i; > > - mbedtls_aes_setkey_enc( &aes_ctx, key, MBEDTLS_CTR_DRBG_KEYBITS ); > + if( ( ret = mbedtls_aes_setkey_enc( &aes_ctx, key, MBEDTLS_CTR_DRBG_KEYBITS ) ) != 0 ) > + { > + goto exit; > + } > > /* > * Reduce data to MBEDTLS_CTR_DRBG_SEEDLEN bytes of data > @@ -201,7 +209,10 @@ static int block_cipher_df( unsigned char *output, > use_len -= ( use_len >= MBEDTLS_CTR_DRBG_BLOCKSIZE ) ? > MBEDTLS_CTR_DRBG_BLOCKSIZE : use_len; > > - mbedtls_aes_crypt_ecb( &aes_ctx, MBEDTLS_AES_ENCRYPT, chain, chain ); > + if( ( ret = mbedtls_aes_crypt_ecb( &aes_ctx, MBEDTLS_AES_ENCRYPT, chain, chain ) ) != 0 ) > + { > + goto exit; > + } > } > > memcpy( tmp + j, chain, MBEDTLS_CTR_DRBG_BLOCKSIZE ); > @@ -215,20 +226,40 @@ static int block_cipher_df( unsigned char *output, > /* > * Do final encryption with reduced data > */ > - mbedtls_aes_setkey_enc( &aes_ctx, tmp, MBEDTLS_CTR_DRBG_KEYBITS ); > + if( ( ret = mbedtls_aes_setkey_enc( &aes_ctx, tmp, MBEDTLS_CTR_DRBG_KEYBITS ) ) != 0 ) > + { > + goto exit; > + } > iv = tmp + MBEDTLS_CTR_DRBG_KEYSIZE; > p = output; > > for( j = 0; j < MBEDTLS_CTR_DRBG_SEEDLEN; j += MBEDTLS_CTR_DRBG_BLOCKSIZE ) > { > - mbedtls_aes_crypt_ecb( &aes_ctx, MBEDTLS_AES_ENCRYPT, iv, iv ); > + if( ( ret = mbedtls_aes_crypt_ecb( &aes_ctx, MBEDTLS_AES_ENCRYPT, iv, iv ) ) != 0 ) > + { > + goto exit; > + } > memcpy( p, iv, MBEDTLS_CTR_DRBG_BLOCKSIZE ); > p += MBEDTLS_CTR_DRBG_BLOCKSIZE; > } > - > +exit: > mbedtls_aes_free( &aes_ctx ); > + /* > + * tidy up the stack > + */ > + mbedtls_zeroize( buf, sizeof( buf ) ); > + mbedtls_zeroize( tmp, sizeof( tmp ) ); > + mbedtls_zeroize( key, sizeof( key ) ); > + mbedtls_zeroize( chain, sizeof( chain ) ); > + if( 0 != ret ) > + { > + /* > + * wipe partial seed from memory > + */ > + mbedtls_zeroize( output, MBEDTLS_CTR_DRBG_SEEDLEN ); > + } > > - return( 0 ); > + return( ret ); > } > > static int ctr_drbg_update_internal( mbedtls_ctr_drbg_context *ctx, > @@ -237,6 +268,7 @@ static int ctr_drbg_update_internal( mbedtls_ctr_drbg_context *ctx, > unsigned char tmp[MBEDTLS_CTR_DRBG_SEEDLEN]; > unsigned char *p = tmp; > int i, j; > + int ret = 0; > > memset( tmp, 0, MBEDTLS_CTR_DRBG_SEEDLEN ); > > @@ -252,7 +284,10 @@ static int ctr_drbg_update_internal( mbedtls_ctr_drbg_context *ctx, > /* > * Crypt counter block > */ > - mbedtls_aes_crypt_ecb( &ctx->aes_ctx, MBEDTLS_AES_ENCRYPT, ctx->counter, p ); > + if( ( ret = mbedtls_aes_crypt_ecb( &ctx->aes_ctx, MBEDTLS_AES_ENCRYPT, ctx->counter, p ) ) != 0 ) > + { > + return( ret ); > + } > > p += MBEDTLS_CTR_DRBG_BLOCKSIZE; > } > @@ -263,7 +298,10 @@ static int ctr_drbg_update_internal( mbedtls_ctr_drbg_context *ctx, > /* > * Update key and counter > */ > - mbedtls_aes_setkey_enc( &ctx->aes_ctx, tmp, MBEDTLS_CTR_DRBG_KEYBITS ); > + if( ( ret = mbedtls_aes_setkey_enc( &ctx->aes_ctx, tmp, MBEDTLS_CTR_DRBG_KEYBITS ) ) != 0 ) > + { > + return( ret ); > + } > memcpy( ctx->counter, tmp + MBEDTLS_CTR_DRBG_KEYSIZE, MBEDTLS_CTR_DRBG_BLOCKSIZE ); > > return( 0 ); > @@ -291,6 +329,7 @@ int mbedtls_ctr_drbg_reseed( mbedtls_ctr_drbg_context *ctx, > { > unsigned char seed[MBEDTLS_CTR_DRBG_MAX_SEED_INPUT]; > size_t seedlen = 0; > + int ret; > > if( ctx->entropy_len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT || > len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT - ctx->entropy_len ) > @@ -321,12 +360,18 @@ int mbedtls_ctr_drbg_reseed( mbedtls_ctr_drbg_context *ctx, > /* > * Reduce to 384 bits > */ > - block_cipher_df( seed, seed, seedlen ); > + if( ( ret = block_cipher_df( seed, seed, seedlen ) ) != 0 ) > + { > + return( ret ); > + } > > /* > * Update state > */ > - ctr_drbg_update_internal( ctx, seed ); > + if( ( ret = ctr_drbg_update_internal( ctx, seed ) ) != 0 ) > + { > + return( ret ); > + } > ctx->reseed_counter = 1; > > return( 0 ); > @@ -356,15 +401,22 @@ int mbedtls_ctr_drbg_random_with_add( void *p_rng, > ctx->prediction_resistance ) > { > if( ( ret = mbedtls_ctr_drbg_reseed( ctx, additional, add_len ) ) != 0 ) > + { > return( ret ); > - > + } > add_len = 0; > } > > if( add_len > 0 ) > { > - block_cipher_df( add_input, additional, add_len ); > - ctr_drbg_update_internal( ctx, add_input ); > + if( ( ret = block_cipher_df( add_input, additional, add_len ) ) != 0 ) > + { > + return( ret ); > + } > + if( ( ret = ctr_drbg_update_internal( ctx, add_input ) ) != 0 ) > + { > + return( ret ); > + } > } > > while( output_len > 0 ) > @@ -379,7 +431,10 @@ int mbedtls_ctr_drbg_random_with_add( void *p_rng, > /* > * Crypt counter block > */ > - mbedtls_aes_crypt_ecb( &ctx->aes_ctx, MBEDTLS_AES_ENCRYPT, ctx->counter, tmp ); > + if( ( ret = mbedtls_aes_crypt_ecb( &ctx->aes_ctx, MBEDTLS_AES_ENCRYPT, ctx->counter, tmp ) ) != 0 ) > + { > + return( ret ); > + } > > use_len = ( output_len > MBEDTLS_CTR_DRBG_BLOCKSIZE ) ? MBEDTLS_CTR_DRBG_BLOCKSIZE : > output_len; > @@ -391,7 +446,10 @@ int mbedtls_ctr_drbg_random_with_add( void *p_rng, > output_len -= use_len; > } > > - ctr_drbg_update_internal( ctx, add_input ); > + if( ( ret = ctr_drbg_update_internal( ctx, add_input ) ) != 0 ) > + { > + return( ret ); > + } > > ctx->reseed_counter++; > > @@ -432,20 +490,20 @@ int mbedtls_ctr_drbg_write_seed_file( mbedtls_ctr_drbg_context *ctx, const char > goto exit; > > if( fwrite( buf, 1, MBEDTLS_CTR_DRBG_MAX_INPUT, f ) != MBEDTLS_CTR_DRBG_MAX_INPUT ) > - { > ret = MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR; > - goto exit; > - } > - > - ret = 0; > + else > + ret = 0; > > exit: > + mbedtls_zeroize( buf, sizeof( buf ) ); > + > fclose( f ); > return( ret ); > } > > int mbedtls_ctr_drbg_update_seed_file( mbedtls_ctr_drbg_context *ctx, const char *path ) > { > + int ret = 0; > FILE *f; > size_t n; > unsigned char buf[ MBEDTLS_CTR_DRBG_MAX_INPUT ]; > @@ -464,14 +522,16 @@ int mbedtls_ctr_drbg_update_seed_file( mbedtls_ctr_drbg_context *ctx, const char > } > > if( fread( buf, 1, n, f ) != n ) > - { > - fclose( f ); > - return( MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR ); > - } > + ret = MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR; > + else > + mbedtls_ctr_drbg_update( ctx, buf, n ); > > fclose( f ); > > - mbedtls_ctr_drbg_update( ctx, buf, n ); > + mbedtls_zeroize( buf, sizeof( buf ) ); > + > + if( ret != 0 ) > + return( ret ); > > return( mbedtls_ctr_drbg_write_seed_file( ctx, path ) ); > } > diff --git a/dll/3rdparty/mbedtls/debug.c b/dll/3rdparty/mbedtls/debug.c > index 502d0a31c5..92daafe9a8 100644 > --- a/dll/3rdparty/mbedtls/debug.c > +++ b/dll/3rdparty/mbedtls/debug.c > @@ -93,7 +93,7 @@ void mbedtls_debug_print_msg( const mbedtls_ssl_context *ssl, int level, > > va_start( argp, format ); > #if defined(_WIN32) > -#if defined(_TRUNCATE) > +#if defined(_TRUNCATE) && !defined(__MINGW32__) > ret = _vsnprintf_s( str, DEBUG_BUF_SIZE, _TRUNCATE, format, argp ); > #else > ret = _vsnprintf( str, DEBUG_BUF_SIZE, format, argp ); > diff --git a/dll/3rdparty/mbedtls/dhm.c b/dll/3rdparty/mbedtls/dhm.c > index 5f825ba52f..c48fc82d2a 100644 > --- a/dll/3rdparty/mbedtls/dhm.c > +++ b/dll/3rdparty/mbedtls/dhm.c > @@ -59,6 +59,7 @@ > #define mbedtls_free free > #endif > > +#if !defined(MBEDTLS_DHM_ALT) > /* Implementation that should never be optimized out by the compiler */ > static void mbedtls_zeroize( void *v, size_t n ) { > volatile unsigned char *p = v; while( n-- ) *p++ = 0; > @@ -95,6 +96,9 @@ static int dhm_read_bignum( mbedtls_mpi *X, > * > * Parameter should be: 2 <= public_param <= P - 2 > * > + * This means that we need to return an error if > + * public_param < 2 or public_param > P-2 > + * > * For more information on the attack, see: > * http://www.cl.cam.ac.uk/~rja14/Papers/psandqs.pdf > * http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2005-2643 > @@ -102,17 +106,17 @@ static int dhm_read_bignum( mbedtls_mpi *X, > static int dhm_check_range( const mbedtls_mpi *param, const mbedtls_mpi *P ) > { > mbedtls_mpi L, U; > - int ret = MBEDTLS_ERR_DHM_BAD_INPUT_DATA; > + int ret = 0; > > mbedtls_mpi_init( &L ); mbedtls_mpi_init( &U ); > > MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &L, 2 ) ); > MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &U, P, 2 ) ); > > - if( mbedtls_mpi_cmp_mpi( param, &L ) >= 0 && > - mbedtls_mpi_cmp_mpi( param, &U ) <= 0 ) > + if( mbedtls_mpi_cmp_mpi( param, &L ) < 0 || > + mbedtls_mpi_cmp_mpi( param, &U ) > 0 ) > { > - ret = 0; > + ret = MBEDTLS_ERR_DHM_BAD_INPUT_DATA; > } > > cleanup: > @@ -189,10 +193,15 @@ int mbedtls_dhm_make_params( mbedtls_dhm_context *ctx, int x_size, > /* > * export P, G, GX > */ > -#define DHM_MPI_EXPORT(X,n) \ > - MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( X, p + 2, n ) ); \ > - *p++ = (unsigned char)( n >> 8 ); \ > - *p++ = (unsigned char)( n ); p += n; > +#define DHM_MPI_EXPORT( X, n ) \ > + do { \ > + MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( ( X ), \ > + p + 2, \ > + ( n ) ) ); \ > + *p++ = (unsigned char)( ( n ) >> 8 ); \ > + *p++ = (unsigned char)( ( n ) ); \ > + p += ( n ); \ > + } while( 0 ) > > n1 = mbedtls_mpi_size( &ctx->P ); > n2 = mbedtls_mpi_size( &ctx->G ); > @@ -203,7 +212,7 @@ int mbedtls_dhm_make_params( mbedtls_dhm_context *ctx, int x_size, > DHM_MPI_EXPORT( &ctx->G , n2 ); > DHM_MPI_EXPORT( &ctx->GX, n3 ); > > - *olen = p - output; > + *olen = p - output; > > ctx->len = n1; > > @@ -215,6 +224,28 @@ cleanup: > return( 0 ); > } > > +/* > + * Set prime modulus and generator > + */ > +int mbedtls_dhm_set_group( mbedtls_dhm_context *ctx, > + const mbedtls_mpi *P, > + const mbedtls_mpi *G ) > +{ > + int ret; > + > + if( ctx == NULL || P == NULL || G == NULL ) > + return( MBEDTLS_ERR_DHM_BAD_INPUT_DATA ); > + > + if( ( ret = mbedtls_mpi_copy( &ctx->P, P ) ) != 0 || > + ( ret = mbedtls_mpi_copy( &ctx->G, G ) ) != 0 ) > + { > + return( MBEDTLS_ERR_DHM_SET_GROUP_FAILED + ret ); > + } > + > + ctx->len = mbedtls_mpi_size( &ctx->P ); > + return( 0 ); > +} > + > /* > * Import the peer's public value G^Y > */ > @@ -402,10 +433,11 @@ cleanup: > */ > void mbedtls_dhm_free( mbedtls_dhm_context *ctx ) > { > - mbedtls_mpi_free( &ctx->pX); mbedtls_mpi_free( &ctx->Vf ); mbedtls_mpi_free( &ctx->Vi ); > - mbedtls_mpi_free( &ctx->RP ); mbedtls_mpi_free( &ctx->K ); mbedtls_mpi_free( &ctx->GY ); > - mbedtls_mpi_free( &ctx->GX ); mbedtls_mpi_free( &ctx->X ); mbedtls_mpi_free( &ctx->G ); > - mbedtls_mpi_free( &ctx->P ); > + mbedtls_mpi_free( &ctx->pX ); mbedtls_mpi_free( &ctx->Vf ); > + mbedtls_mpi_free( &ctx->Vi ); mbedtls_mpi_free( &ctx->RP ); > + mbedtls_mpi_free( &ctx->K ); mbedtls_mpi_free( &ctx->GY ); > + mbedtls_mpi_free( &ctx->GX ); mbedtls_mpi_free( &ctx->X ); > + mbedtls_mpi_free( &ctx->G ); mbedtls_mpi_free( &ctx->P ); > > mbedtls_zeroize( ctx, sizeof( mbedtls_dhm_context ) ); > } > @@ -544,7 +576,10 @@ static int load_file( const char *path, unsigned char **buf, size_t *n ) > if( fread( *buf, 1, *n, f ) != *n ) > { > fclose( f ); > + > + mbedtls_zeroize( *buf, *n + 1 ); > mbedtls_free( *buf ); > + > return( MBEDTLS_ERR_DHM_FILE_IO_ERROR ); > } > > @@ -579,6 +614,7 @@ int mbedtls_dhm_parse_dhmfile( mbedtls_dhm_context *dhm, const char *path ) > } > #endif /* MBEDTLS_FS_IO */ > #endif /* MBEDTLS_ASN1_PARSE_C */ > +#endif /* MBEDTLS_DHM_ALT */ > > #if defined(MBEDTLS_SELF_TEST) > > diff --git a/dll/3rdparty/mbedtls/ecdh.c b/dll/3rdparty/mbedtls/ecdh.c > index 553ac03506..8056d090eb 100644 > --- a/dll/3rdparty/mbedtls/ecdh.c > +++ b/dll/3rdparty/mbedtls/ecdh.c > @@ -40,6 +40,7 @@ > > #include <string.h> > > +#if !defined(MBEDTLS_ECDH_GEN_PUBLIC_ALT) > /* > * Generate public key: simple wrapper around mbedtls_ecp_gen_keypair > */ > @@ -49,7 +50,9 @@ int mbedtls_ecdh_gen_public( mbedtls_ecp_group *grp, mbedtls_mpi *d, mbedtls_ecp > { > return mbedtls_ecp_gen_keypair( grp, d, Q, f_rng, p_rng ); > } > +#endif /* MBEDTLS_ECDH_GEN_PUBLIC_ALT */ > > +#if !defined(MBEDTLS_ECDH_COMPUTE_SHARED_ALT) > /* > * Compute shared secret (SEC1 3.3.1) > */ > @@ -83,6 +86,7 @@ cleanup: > > return( ret ); > } > +#endif /* MBEDTLS_ECDH_COMPUTE_SHARED_ALT */ > > /* > * Initialize context > diff --git a/dll/3rdparty/mbedtls/ecdsa.c b/dll/3rdparty/mbedtls/ecdsa.c > index 69b587a29e..e97e6cb433 100644 > --- a/dll/3rdparty/mbedtls/ecdsa.c > +++ b/dll/3rdparty/mbedtls/ecdsa.c > @@ -67,6 +67,7 @@ cleanup: > return( ret ); > } > > +#if !defined(MBEDTLS_ECDSA_SIGN_ALT) > /* > * Compute ECDSA signature of a hashed message (SEC1 4.1.3) > * Obviously, compared to SEC1 4.1.3, we skip step 4 (hash message) > @@ -83,6 +84,10 @@ int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s, > if( grp->N.p == NULL ) > return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA ); > > + /* Make sure d is in range 1..n-1 */ > + if( mbedtls_mpi_cmp_int( d, 1 ) < 0 || mbedtls_mpi_cmp_mpi( d, &grp->N ) >= 0 ) > + return( MBEDTLS_ERR_ECP_INVALID_KEY ); > + > mbedtls_ecp_point_init( &R ); > mbedtls_mpi_init( &k ); mbedtls_mpi_init( &e ); mbedtls_mpi_init( &t ); > > @@ -155,6 +160,7 @@ cleanup: > > return( ret ); > } > +#endif /* MBEDTLS_ECDSA_SIGN_ALT */ > > #if defined(MBEDTLS_ECDSA_DETERMINISTIC) > /* > @@ -194,6 +200,7 @@ cleanup: > } > #endif /* MBEDTLS_ECDSA_DETERMINISTIC */ > > +#if !defined(MBEDTLS_ECDSA_VERIFY_ALT) > /* > * Verify ECDSA signature of hashed message (SEC1 4.1.4) > * Obviously, compared to SEC1 4.1.3, we skip step 2 (hash message) > @@ -279,6 +286,7 @@ cleanup: > > return( ret ); > } > +#endif /* MBEDTLS_ECDSA_VERIFY_ALT */ > > /* > * Convert a signature (given by context) to ASN.1 > @@ -394,6 +402,9 @@ int mbedtls_ecdsa_read_signature( mbedtls_ecdsa_context *ctx, > &ctx->Q, &r, &s ) ) != 0 ) > goto cleanup; > > + /* At this point we know that the buffer starts with a valid signature. > + * Return 0 if the buffer just contains the signature, and a specific > + * error code if the valid signature is followed by more data. */ > if( p != end ) > ret = MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH; > > @@ -404,6 +415,7 @@ cleanup: > return( ret ); > } > > +#if !defined(MBEDTLS_ECDSA_GENKEY_ALT) > /* > * Generate key pair > */ > @@ -413,6 +425,7 @@ int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid, > return( mbedtls_ecp_group_load( &ctx->grp, gid ) || > mbedtls_ecp_gen_keypair( &ctx->grp, &ctx->d, &ctx->Q, f_rng, p_rng ) ); > } > +#endif /* MBEDTLS_ECDSA_GENKEY_ALT */ > > /* > * Set context from an mbedtls_ecp_keypair > diff --git a/dll/3rdparty/mbedtls/ecjpake.c b/dll/3rdparty/mbedtls/ecjpake.c > index 4f4a102925..a205746aac 100644 > --- a/dll/3rdparty/mbedtls/ecjpake.c > +++ b/dll/3rdparty/mbedtls/ecjpake.c > @@ -38,6 +38,8 @@ > > #include <string.h> > > +#if !defined(MBEDTLS_ECJPAKE_ALT) > + > /* > * Convert a mbedtls_ecjpake_role to identifier string > */ > @@ -301,7 +303,7 @@ cleanup: > */ > static int ecjpake_zkp_write( const mbedtls_md_info_t *md_info, > const mbedtls_ecp_group *grp, > - const int pf, > + const int pf, > const mbedtls_ecp_point *G, > const mbedtls_mpi *x, > const mbedtls_ecp_point *X, > @@ -766,6 +768,7 @@ cleanup: > #undef ID_MINE > #undef ID_PEER > > +#endif /* ! MBEDTLS_ECJPAKE_ALT */ > > #if defined(MBEDTLS_SELF_TEST) > > diff --git a/dll/3rdparty/mbedtls/ecp.c b/dll/3rdparty/mbedtls/ecp.c > index 055e70e409..bd473604eb 100644 > --- a/dll/3rdparty/mbedtls/ecp.c > +++ b/dll/3rdparty/mbedtls/ecp.c > @@ -1450,7 +1450,12 @@ static int ecp_mul_comb( mbedtls_ecp_group *grp, mbedtls_ecp_point *R, > > cleanup: > > - if( T != NULL && ! p_eq_g ) > + /* There are two cases where T is not stored in grp: > + * - P != G > + * - An intermediate operation failed before setting grp->T > + * In either case, T must be freed. > + */ > + if( T != NULL && T != grp->T ) > { > for( i = 0; i < pre_len; i++ ) > mbedtls_ecp_point_free( &T[i] ); > @@ -1955,7 +1960,6 @@ int mbedtls_ecp_gen_keypair_base( mbedtls_ecp_group *grp, > { > /* SEC1 3.2.1: Generate d such that 1 <= n < N */ > int count = 0; > - unsigned char rnd[MBEDTLS_ECP_MAX_BYTES]; > > /* > * Match the procedure given in RFC 6979 (deterministic ECDSA): > @@ -1966,8 +1970,7 @@ int mbedtls_ecp_gen_keypair_base( mbedtls_ecp_group *grp, > */ > do > { > - MBEDTLS_MPI_CHK( f_rng( p_rng, rnd, n_size ) ); > - MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( d, rnd, n_size ) ); > + MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( d, n_size, f_rng, p_rng ) ); > MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( d, 8 * n_size - grp->nbits ) ); > > /* > diff --git a/dll/3rdparty/mbedtls/entropy.c b/dll/3rdparty/mbedtls/entropy.c > index c88fc51fa2..4e37cd8a3d 100644 > --- a/dll/3rdparty/mbedtls/entropy.c > +++ b/dll/3rdparty/mbedtls/entropy.c > @@ -70,21 +70,26 @@ static void mbedtls_zeroize( void *v, size_t n ) { > > void mbedtls_entropy_init( mbedtls_entropy_context *ctx ) > { > - memset( ctx, 0, sizeof(mbedtls_entropy_context) ); > + ctx->source_count = 0; > + memset( ctx->source, 0, sizeof( ctx->source ) ); > > #if defined(MBEDTLS_THREADING_C) > mbedtls_mutex_init( &ctx->mutex ); > #endif > > + ctx->accumulator_started = 0; > #if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR) > - mbedtls_sha512_starts( &ctx->accumulator, 0 ); > + mbedtls_sha512_init( &ctx->accumulator ); > #else > - mbedtls_sha256_starts( &ctx->accumulator, 0 ); > + mbedtls_sha256_init( &ctx->accumulator ); > #endif > #if defined(MBEDTLS_HAVEGE_C) > mbedtls_havege_init( &ctx->havege_data ); > #endif > > + /* Reminder: Update ENTROPY_HAVE_STRONG in the test files > + * when adding more strong entropy sources here. */ > + > #if defined(MBEDTLS_TEST_NULL_ENTROPY) > mbedtls_entropy_add_source( ctx, mbedtls_null_entropy_poll, NULL, > 1, MBEDTLS_ENTROPY_SOURCE_STRONG ); > @@ -115,6 +120,7 @@ void mbedtls_entropy_init( mbedtls_entropy_context *ctx ) > mbedtls_entropy_add_source( ctx, mbedtls_nv_seed_poll, NULL, > MBEDTLS_ENTROPY_BLOCK_SIZE, > MBEDTLS_ENTROPY_SOURCE_STRONG ); > + ctx->initial_entropy_run = 0; > #endif > #endif /* MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES */ > } > @@ -127,7 +133,17 @@ void mbedtls_entropy_free( mbedtls_entropy_context *ctx ) > #if defined(MBEDTLS_THREADING_C) > mbedtls_mutex_free( &ctx->mutex ); > #endif > - mbedtls_zeroize( ctx, sizeof( mbedtls_entropy_context ) ); > +#if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR) > + mbedtls_sha512_free( &ctx->accumulator ); > +#else > + mbedtls_sha256_free( &ctx->accumulator ); > +#endif > +#if defined(MBEDTLS_ENTROPY_NV_SEED) > + ctx->initial_entropy_run = 0; > +#endif > + ctx->source_count = 0; > + mbedtls_zeroize( ctx->source, sizeof( ctx->source ) ); > + ctx->accumulator_started = 0; > } > > int mbedtls_entropy_add_source( mbedtls_entropy_context *ctx, > @@ -174,13 +190,16 @@ static int entropy_update( mbedtls_entropy_context *ctx, unsigned char source_id > unsigned char tmp[MBEDTLS_ENTROPY_BLOCK_SIZE]; > size_t use_len = len; > const unsigned char *p = data; > + int ret = 0; > > if( use_len > MBEDTLS_ENTROPY_BLOCK_SIZE ) > { > #if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR) > - mbedtls_sha512( data, len, tmp, 0 ); > + if( ( ret = mbedtls_sha512_ret( data, len, tmp, 0 ) ) != 0 ) > + goto cleanup; > #else > - mbedtls_sha256( data, len, tmp, 0 ); > + if( ( ret = mbedtls_sha256_ret( data, len, tmp, 0 ) ) != 0 ) > + goto cleanup; > #endif > p = tmp; > use_len = MBEDTLS_ENTROPY_BLOCK_SIZE; > @@ -189,15 +208,35 @@ static int entropy_update( mbedtls_entropy_context *ctx, unsigned char source_id > header[0] = source_id; > header[1] = use_len & 0xFF; > > + /* > + * Start the accumulator if this has not already happened. Note that > + * it is sufficient to start the accumulator here only because all calls to > + * gather entropy eventually execute this code. > + */ > #if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR) > - mbedtls_sha512_update( &ctx->accumulator, header, 2 ); > - mbedtls_sha512_update( &ctx->accumulator, p, use_len ); > + if( ctx->accumulator_started == 0 && > + ( ret = mbedtls_sha512_starts_ret( &ctx->accumulator, 0 ) ) != 0 ) > + goto cleanup; > + else > + ctx->accumulator_started = 1; > + if( ( ret = mbedtls_sha512_update_ret( &ctx->accumulator, header, 2 ) ) != 0 ) > + goto cleanup; > + ret = mbedtls_sha512_update_ret( &ctx->accumulator, p, use_len ); > #else > - mbedtls_sha256_update( &ctx->accumulator, header, 2 ); > - mbedtls_sha256_update( &ctx->accumulator, p, use_len ); > + if( ctx->accumulator_started == 0 && > + ( ret = mbedtls_sha256_starts_ret( &ctx->accumulator, 0 ) ) != 0 ) > + goto cleanup; > + else > + ctx->accumulator_started = 1; > + if( ( ret = mbedtls_sha256_update_ret( &ctx->accumulator, header, 2 ) ) != 0 ) > + goto cleanup; > + ret = mbedtls_sha256_update_ret( &ctx->accumulator, p, use_len ); > #endif > > - return( 0 ); > +cleanup: > + mbedtls_zeroize( tmp, sizeof( tmp ) ); > + > + return( ret ); > } > > int mbedtls_entropy_update_manual( mbedtls_entropy_context *ctx, > @@ -244,7 +283,7 @@ static int entropy_gather_internal( mbedtls_entropy_context *ctx ) > if( ( ret = ctx->source[i].f_source( ctx->source[i].p_source, > buf, MBEDTLS_ENTROPY_MAX_GATHER, &olen ) ) != 0 ) > { > - return( ret ); > + goto cleanup; > } > > /* > @@ -252,15 +291,20 @@ static int entropy_gather_internal( mbedtls_entropy_context *ctx ) > */ > if( olen > 0 ) > { > - entropy_update( ctx, (unsigned char) i, buf, olen ); > + if( ( ret = entropy_update( ctx, (unsigned char) i, > + buf, olen ) ) != 0 ) > + return( ret ); > ctx->source[i].size += olen; > } > } > > if( have_one_strong == 0 ) > - return( MBEDTLS_ERR_ENTROPY_NO_STRONG_SOURCE ); > + ret = MBEDTLS_ERR_ENTROPY_NO_STRONG_SOURCE; > > - return( 0 ); > +cleanup: > + mbedtls_zeroize( buf, sizeof( buf ) ); > + > + return( ret ); > } > > /* > @@ -335,33 +379,52 @@ int mbedtls_entropy_func( void *data, unsigned char *output, size_t len ) > memset( buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE ); > > #if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR) > - mbedtls_sha512_finish( &ctx->accumulator, buf ); > + /* > + * Note that at this stage it is assumed that the accumulator was started > + * in a previous call to entropy_update(). If this is not guaranteed, the > + * code below will fail. > + */ > + if( ( ret = mbedtls_sha512_finish_ret( &ctx->accumulator, buf ) ) != 0 ) > + goto exit; > > /* > * Reset accumulator and counters and recycle existing entropy > */ > - memset( &ctx->accumulator, 0, sizeof( mbedtls_sha512_context ) ); > - mbedtls_sha512_starts( &ctx->accumulator, 0 ); > - mbedtls_sha512_update( &ctx->accumulator, buf, MBEDTLS_ENTROPY_BLOCK_SIZE ); > + mbedtls_sha512_free( &ctx->accumulator ); > + mbedtls_sha512_init( &ctx->accumulator ); > + if( ( ret = mbedtls_sha512_starts_ret( &ctx->accumulator, 0 ) ) != 0 ) > + goto exit; > + if( ( ret = mbedtls_sha512_update_ret( &ctx->accumulator, buf, > + MBEDTLS_ENTROPY_BLOCK_SIZE ) ) != 0 ) > + goto exit; > > /* > * Perform second SHA-512 on entropy > */ > - mbedtls_sha512( buf, MBEDTLS_ENTROPY_BLOCK_SIZE, buf, 0 ); > + if( ( ret = mbedtls_sha512_ret( buf, MBEDTLS_ENTROPY_BLOCK_SIZE, > + buf, 0 ) ) != 0 ) > + goto exit; > #else /* MBEDTLS_ENTROPY_SHA512_ACCUMULATOR */ > - mbedtls_sha256_finish( &ctx->accumulator, buf ); > + if( ( ret = mbedtls_sha256_finish_ret( &ctx->accumulator, buf ) ) != 0 ) > + goto exit; > > /* > * Reset accumulator and counters and recycle existing entropy > */ > - memset( &ctx->accumulator, 0, sizeof( mbedtls_sha256_context ) ); > - mbedtls_sha256_starts( &ctx->accumulator, 0 ); > - mbedtls_sha256_update( &ctx->accumulator, buf, MBEDTLS_ENTROPY_BLOCK_SIZE ); > + mbedtls_sha256_free( &ctx->accumulator ); > + mbedtls_sha256_init( &ctx->accumulator ); > + if( ( ret = mbedtls_sha256_starts_ret( &ctx->accumulator, 0 ) ) != 0 ) > + goto exit; > + if( ( ret = mbedtls_sha256_update_ret( &ctx->accumulator, buf, > + MBEDTLS_ENTROPY_BLOCK_SIZE ) ) != 0 ) > + goto exit; > > /* > * Perform second SHA-256 on entropy > */ > - mbedtls_sha256( buf, MBEDTLS_ENTROPY_BLOCK_SIZE, buf, 0 ); > + if( ( ret = mbedtls_sha256_ret( buf, MBEDTLS_ENTROPY_BLOCK_SIZE, > + buf, 0 ) ) != 0 ) > + goto exit; > #endif /* MBEDTLS_ENTROPY_SHA512_ACCUMULATOR */ > > for( i = 0; i < ctx->source_count; i++ ) > @@ -372,6 +435,8 @@ int mbedtls_entropy_func( void *data, unsigned char *output, size_t len ) > ret = 0; > > exit: > + mbedtls_zeroize( buf, sizeof( buf ) ); > + > #if defined(MBEDTLS_THREADING_C) > if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 ) > return( MBEDTLS_ERR_THREADING_MUTEX_ERROR ); > @@ -384,7 +449,7 @@ exit: > int mbedtls_entropy_update_nv_seed( mbedtls_entropy_context *ctx ) > { > int ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR; > - unsigned char buf[ MBEDTLS_ENTROPY_MAX_SEED_SIZE ]; > + unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE]; > > /* Read new seed and write it to NV */ > if( ( ret = mbedtls_entropy_func( ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE ) ) != 0 ) > @@ -395,9 +460,9 @@ int mbedtls_entropy_update_nv_seed( mbedtls_entropy_context *ctx ) > > /* Manually update the remaining stream with a separator value to diverge */ > memset( buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE ); > - mbedtls_entropy_update_manual( ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE ); > + ret = mbedtls_entropy_update_manual( ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE ); > > - return( 0 ); > + return( ret ); > } > #endif /* MBEDTLS_ENTROPY_NV_SEED */ > > @@ -423,12 +488,15 @@ int mbedtls_entropy_write_seed_file( mbedtls_entropy_context *ctx, const char *p > ret = 0; > > exit: > + mbedtls_zeroize( buf, sizeof( buf ) ); > + > fclose( f ); > return( ret ); > } > > int mbedtls_entropy_update_seed_file( mbedtls_entropy_context *ctx, const char *path ) > { > + int ret = 0; > FILE *f; > size_t n; > unsigned char buf[ MBEDTLS_ENTROPY_MAX_SEED_SIZE ]; > @@ -444,14 +512,16 @@ int mbedtls_entropy_update_seed_file( mbedtls_entropy_context *ctx, const char * > n = MBEDTLS_ENTROPY_MAX_SEED_SIZE; > > if( fread( buf, 1, n, f ) != n ) > - { > - fclose( f ); > - return( MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR ); > - } > + ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR; > + else > + ret = mbedtls_entropy_update_manual( ctx, buf, n ); > > fclose( f ); > > - mbedtls_entropy_update_manual( ctx, buf, n ); > + mbedtls_zeroize( buf, sizeof( buf ) ); > + > + if( ret != 0 ) > + return( ret ); > > return( mbedtls_entropy_write_seed_file( ctx, path ) ); > } > diff --git a/dll/3rdparty/mbedtls/error.c b/dll/3rdparty/mbedtls/error.c > index f80125ad81..bc135a7ad8 100644 > --- a/dll/3rdparty/mbedtls/error.c > +++ b/dll/3rdparty/mbedtls/error.c > @@ -47,6 +47,10 @@ > #include "mbedtls/aes.h" > #endif > > +#if defined(MBEDTLS_ARC4_C) > +#include "mbedtls/arc4.h" > +#endif > + > #if defined(MBEDTLS_BASE64_C) > #include "mbedtls/base64.h" > #endif > @@ -71,6 +75,10 @@ > #include "mbedtls/cipher.h" > #endif > > +#if defined(MBEDTLS_CMAC_C) > +#include "mbedtls/cmac.h" > +#endif > + > #if defined(MBEDTLS_CTR_DRBG_C) > #include "mbedtls/ctr_drbg.h" > #endif > @@ -103,6 +111,18 @@ > #include "mbedtls/md.h" > #endif > > +#if defined(MBEDTLS_MD2_C) > +#include "mbedtls/md2.h" > +#endif > + > +#if defined(MBEDTLS_MD4_C) > +#include "mbedtls/md4.h" > +#endif > + > +#if defined(MBEDTLS_MD5_C) > +#include "mbedtls/md5.h" > +#endif > + > #if defined(MBEDTLS_NET_C) > #include "mbedtls/net_sockets.h" > #endif > @@ -131,10 +151,26 @@ > #include "mbedtls/pkcs5.h" > #endif > > +#if defined(MBEDTLS_RIPEMD160_C) > +#include "mbedtls/ripemd160.h" > +#endif > + > #if defined(MBEDTLS_RSA_C) > #include "mbedtls/rsa.h" > #endif > > +#if defined(MBEDTLS_SHA1_C) > +#include "mbedtls/sha1.h" > +#endif > + > +#if defined(MBEDTLS_SHA256_C) > +#include "mbedtls/sha256.h" > +#endif > + > +#if defined(MBEDTLS_SHA512_C) > +#include "mbedtls/sha512.h" > +#endif > + > #if defined(MBEDTLS_SSL_TLS_C) > #include "mbedtls/ssl.h" > #endif > @@ -176,7 +212,7 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen ) > if( use_ret == -(MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE) ) > mbedtls_snprintf( buf, buflen, "CIPHER - The selected feature is not available" ); > if( use_ret == -(MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA) ) > - mbedtls_snprintf( buf, buflen, "CIPHER - Bad input parameters to function" ); > + mbedtls_snprintf( buf, buflen, "CIPHER - Bad input parameters" ); > if( use_ret == -(MBEDTLS_ERR_CIPHER_ALLOC_FAILED) ) > mbedtls_snprintf( buf, buflen, "CIPHER - Failed to allocate memory" ); > if( use_ret == -(MBEDTLS_ERR_CIPHER_INVALID_PADDING) ) > @@ -186,12 +222,14 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen ) > if( use_ret == -(MBEDTLS_ERR_CIPHER_AUTH_FAILED) ) > mbedtls_snprintf( buf, buflen, "CIPHER - Authentication failed (for AEAD modes)" ); > if( use_ret == -(MBEDTLS_ERR_CIPHER_INVALID_CONTEXT) ) > - mbedtls_snprintf( buf, buflen, "CIPHER - The context is invalid, eg because it was free()ed" ); > + mbedtls_snprintf( buf, buflen, "CIPHER - The context is invalid. For example, because it was freed" ); > + if( use_ret == -(MBEDTLS_ERR_CIPHER_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "CIPHER - Cipher hardware accelerator failed" ); > #endif /* MBEDTLS_CIPHER_C */ > > #if defined(MBEDTLS_DHM_C) > if( use_ret == -(MBEDTLS_ERR_DHM_BAD_INPUT_DATA) ) > - mbedtls_snprintf( buf, buflen, "DHM - Bad input parameters to function" ); > + mbedtls_snprintf( buf, buflen, "DHM - Bad input parameters" ); > if( use_ret == -(MBEDTLS_ERR_DHM_READ_PARAMS_FAILED) ) > mbedtls_snprintf( buf, buflen, "DHM - Reading of the DHM parameters failed" ); > if( use_ret == -(MBEDTLS_ERR_DHM_MAKE_PARAMS_FAILED) ) > @@ -207,7 +245,11 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen ) > if( use_ret == -(MBEDTLS_ERR_DHM_ALLOC_FAILED) ) > mbedtls_snprintf( buf, buflen, "DHM - Allocation of memory failed" ); > if( use_ret == -(MBEDTLS_ERR_DHM_FILE_IO_ERROR) ) > - mbedtls_snprintf( buf, buflen, "DHM - Read/write of file failed" ); > + mbedtls_snprintf( buf, buflen, "DHM - Read or write of file failed" ); > + if( use_ret == -(MBEDTLS_ERR_DHM_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "DHM - DHM hardware accelerator failed" ); > + if( use_ret == -(MBEDTLS_ERR_DHM_SET_GROUP_FAILED) ) > + mbedtls_snprintf( buf, buflen, "DHM - Setting the modulus and generator failed" ); > #endif /* MBEDTLS_DHM_C */ > > #if defined(MBEDTLS_ECP_C) > @@ -226,7 +268,9 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen ) > if( use_ret == -(MBEDTLS_ERR_ECP_INVALID_KEY) ) > mbedtls_snprintf( buf, buflen, "ECP - Invalid private or public key" ); > if( use_ret == -(MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH) ) > - mbedtls_snprintf( buf, buflen, "ECP - Signature is valid but shorter than the user-supplied length" ); > + mbedtls_snprintf( buf, buflen, "ECP - The buffer contains a valid signature followed by more data" ); > + if( use_ret == -(MBEDTLS_ERR_ECP_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "ECP - ECP hardware accelerator failed" ); > #endif /* MBEDTLS_ECP_C */ > > #if defined(MBEDTLS_MD_C) > @@ -238,6 +282,8 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen ) > mbedtls_snprintf( buf, buflen, "MD - Failed to allocate memory" ); > if( use_ret == -(MBEDTLS_ERR_MD_FILE_IO_ERROR) ) > mbedtls_snprintf( buf, buflen, "MD - Opening or reading of file failed" ); > + if( use_ret == -(MBEDTLS_ERR_MD_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "MD - MD hardware accelerator failed" ); > #endif /* MBEDTLS_MD_C */ > > #if defined(MBEDTLS_PEM_PARSE_C) || defined(MBEDTLS_PEM_WRITE_C) > @@ -289,7 +335,9 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen ) > if( use_ret == -(MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE) ) > mbedtls_snprintf( buf, buflen, "PK - Unavailable feature, e.g. RSA disabled for RSA key" ); > if( use_ret == -(MBEDTLS_ERR_PK_SIG_LEN_MISMATCH) ) > - mbedtls_snprintf( buf, buflen, "PK - The signature is valid but its length is less than expected" ); > + mbedtls_snprintf( buf, buflen, "PK - The buffer contains a valid signature followed by more data" ); > + if( use_ret == -(MBEDTLS_ERR_PK_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "PK - PK hardware accelerator failed" ); > #endif /* MBEDTLS_PK_C */ > > #if defined(MBEDTLS_PKCS12_C) > @@ -322,7 +370,7 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen ) > if( use_ret == -(MBEDTLS_ERR_RSA_KEY_GEN_FAILED) ) > mbedtls_snprintf( buf, buflen, "RSA - Something failed during generation of a key" ); > if( use_ret == -(MBEDTLS_ERR_RSA_KEY_CHECK_FAILED) ) > - mbedtls_snprintf( buf, buflen, "RSA - Key failed to pass the library's validity check" ); > + mbedtls_snprintf( buf, buflen, "RSA - Key failed to pass the validity check of the library" ); > if( use_ret == -(MBEDTLS_ERR_RSA_PUBLIC_FAILED) ) > mbedtls_snprintf( buf, buflen, "RSA - The public key operation failed" ); > if( use_ret == -(MBEDTLS_ERR_RSA_PRIVATE_FAILED) ) > @@ -333,6 +381,10 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen ) > mbedtls_snprintf( buf, buflen, "RSA - The output buffer for decryption is not large enough" ); > if( use_ret == -(MBEDTLS_ERR_RSA_RNG_FAILED) ) > mbedtls_snprintf( buf, buflen, "RSA - The random generator failed to generate non-zeros" ); > + if( use_ret == -(MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION) ) > + mbedtls_snprintf( buf, buflen, "RSA - The implementation does not offer the requested operation, for example, because of security violations or lack of functionality" ); > + if( use_ret == -(MBEDTLS_ERR_RSA_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "RSA - RSA hardware accelerator failed" ); > #endif /* MBEDTLS_RSA_C */ > > #if defined(MBEDTLS_SSL_TLS_C) > @@ -520,8 +572,17 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen ) > mbedtls_snprintf( buf, buflen, "AES - Invalid key length" ); > if( use_ret == -(MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH) ) > mbedtls_snprintf( buf, buflen, "AES - Invalid data input length" ); > + if( use_ret == -(MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE) ) > + mbedtls_snprintf( buf, buflen, "AES - Feature not available. For example, an unsupported AES key size" ); > + if( use_ret == -(MBEDTLS_ERR_AES_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "AES - AES hardware accelerator failed" ); > #endif /* MBEDTLS_AES_C */ > > +#if defined(MBEDTLS_ARC4_C) > + if( use_ret == -(MBEDTLS_ERR_ARC4_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "ARC4 - ARC4 hardware accelerator failed" ); > +#endif /* MBEDTLS_ARC4_C */ > + > #if defined(MBEDTLS_ASN1_PARSE_C) > if( use_ret == -(MBEDTLS_ERR_ASN1_OUT_OF_DATA) ) > mbedtls_snprintf( buf, buflen, "ASN1 - Out of data when parsing an ASN1 data structure" ); > @@ -568,6 +629,8 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen ) > #if defined(MBEDTLS_BLOWFISH_C) > if( use_ret == -(MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH) ) > mbedtls_snprintf( buf, buflen, "BLOWFISH - Invalid key length" ); > + if( use_ret == -(MBEDTLS_ERR_BLOWFISH_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "BLOWFISH - Blowfish hardware accelerator failed" ); > if( use_ret == -(MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH) ) > mbedtls_snprintf( buf, buflen, "BLOWFISH - Invalid data input length" ); > #endif /* MBEDTLS_BLOWFISH_C */ > @@ -577,29 +640,40 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen ) > mbedtls_snprintf( buf, buflen, "CAMELLIA - Invalid key length" ); > if( use_ret == -(MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH) ) > mbedtls_snprintf( buf, buflen, "CAMELLIA - Invalid data input length" ); > + if( use_ret == -(MBEDTLS_ERR_CAMELLIA_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "CAMELLIA - Camellia hardware accelerator failed" ); > #endif /* MBEDTLS_CAMELLIA_C */ > > #if defined(MBEDTLS_CCM_C) > if( use_ret == -(MBEDTLS_ERR_CCM_BAD_INPUT) ) > - mbedtls_snprintf( buf, buflen, "CCM - Bad input parameters to function" ); > + mbedtls_snprintf( buf, buflen, "CCM - Bad input parameters to the function" ); > if( use_ret == -(MBEDTLS_ERR_CCM_AUTH_FAILED) ) > mbedtls_snprintf( buf, buflen, "CCM - Authenticated decryption failed" ); > + if( use_ret == -(MBEDTLS_ERR_CCM_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "CCM - CCM hardware accelerator failed" ); > #endif /* MBEDTLS_CCM_C */ > > +#if defined(MBEDTLS_CMAC_C) > + if( use_ret == -(MBEDTLS_ERR_CMAC_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "CMAC - CMAC hardware accelerator failed" ); > +#endif /* MBEDTLS_CMAC_C */ > + > #if defined(MBEDTLS_CTR_DRBG_C) > if( use_ret == -(MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED) ) > mbedtls_snprintf( buf, buflen, "CTR_DRBG - The entropy source failed" ); > if( use_ret == -(MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG) ) > - mbedtls_snprintf( buf, buflen, "CTR_DRBG - Too many random requested in single call" ); > + mbedtls_snprintf( buf, buflen, "CTR_DRBG - The requested random buffer length is too big" ); > if( use_ret == -(MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG) ) > - mbedtls_snprintf( buf, buflen, "CTR_DRBG - Input too large (Entropy + additional)" ); > + mbedtls_snprintf( buf, buflen, "CTR_DRBG - The input (entropy + additional data) is too large" ); > if( use_ret == -(MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR) ) > - mbedtls_snprintf( buf, buflen, "CTR_DRBG - Read/write error in file" ); > + mbedtls_snprintf( buf, buflen, "CTR_DRBG - Read or write error in file" ); > #endif /* MBEDTLS_CTR_DRBG_C */ > > #if defined(MBEDTLS_DES_C) > if( use_ret == -(MBEDTLS_ERR_DES_INVALID_INPUT_LENGTH) ) > mbedtls_snprintf( buf, buflen, "DES - The data input has an invalid length" ); > + if( use_ret == -(MBEDTLS_ERR_DES_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "DES - DES hardware accelerator failed" ); > #endif /* MBEDTLS_DES_C */ > > #if defined(MBEDTLS_ENTROPY_C) > @@ -618,6 +692,8 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen ) > #if defined(MBEDTLS_GCM_C) > if( use_ret == -(MBEDTLS_ERR_GCM_AUTH_FAILED) ) > mbedtls_snprintf( buf, buflen, "GCM - Authenticated decryption failed" ); > + if( use_ret == -(MBEDTLS_ERR_GCM_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "GCM - GCM hardware accelerator failed" ); > if( use_ret == -(MBEDTLS_ERR_GCM_BAD_INPUT) ) > mbedtls_snprintf( buf, buflen, "GCM - Bad input parameters to function" ); > #endif /* MBEDTLS_GCM_C */ > @@ -633,6 +709,21 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen ) > mbedtls_snprintf( buf, buflen, "HMAC_DRBG - The entropy source failed" ); > #endif /* MBEDTLS_HMAC_DRBG_C */ > > +#if defined(MBEDTLS_MD2_C) > + if( use_ret == -(MBEDTLS_ERR_MD2_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "MD2 - MD2 hardware accelerator failed" ); > +#endif /* MBEDTLS_MD2_C */ > + > +#if defined(MBEDTLS_MD4_C) > + if( use_ret == -(MBEDTLS_ERR_MD4_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "MD4 - MD4 hardware accelerator failed" ); > +#endif /* MBEDTLS_MD4_C */ > + > +#if defined(MBEDTLS_MD5_C) > + if( use_ret == -(MBEDTLS_ERR_MD5_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "MD5 - MD5 hardware accelerator failed" ); > +#endif /* MBEDTLS_MD5_C */ > + > #if defined(MBEDTLS_NET_C) > if( use_ret == -(MBEDTLS_ERR_NET_SOCKET_FAILED) ) > mbedtls_snprintf( buf, buflen, "NET - Failed to open a socket" ); > @@ -670,6 +761,26 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen ) > mbedtls_snprintf( buf, buflen, "PADLOCK - Input data should be aligned" ); > #endif /* MBEDTLS_PADLOCK_C */ > > +#if defined(MBEDTLS_RIPEMD160_C) > + if( use_ret == -(MBEDTLS_ERR_RIPEMD160_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "RIPEMD160 - RIPEMD160 hardware accelerator failed" ); > +#endif /* MBEDTLS_RIPEMD160_C */ > + > +#if defined(MBEDTLS_SHA1_C) > + if( use_ret == -(MBEDTLS_ERR_SHA1_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "SHA1 - SHA-1 hardware accelerator failed" ); > +#endif /* MBEDTLS_SHA1_C */ > + > +#if defined(MBEDTLS_SHA256_C) > + if( use_ret == -(MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "SHA256 - SHA-256 hardware accelerator failed" ); > +#endif /* MBEDTLS_SHA256_C */ > + > +#if defined(MBEDTLS_SHA512_C) > + if( use_ret == -(MBEDTLS_ERR_SHA512_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "SHA512 - SHA-512 hardware accelerator failed" ); > +#endif /* MBEDTLS_SHA512_C */ > + > #if defined(MBEDTLS_THREADING_C) > if( use_ret == -(MBEDTLS_ERR_THREADING_FEATURE_UNAVAILABLE) ) > mbedtls_snprintf( buf, buflen, "THREADING - The selected feature is not available" ); > @@ -682,6 +793,8 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen ) > #if defined(MBEDTLS_XTEA_C) > if( use_ret == -(MBEDTLS_ERR_XTEA_INVALID_INPUT_LENGTH) ) > mbedtls_snprintf( buf, buflen, "XTEA - The data input has an invalid length" ); > + if( use_ret == -(MBEDTLS_ERR_XTEA_HW_ACCEL_FAILED) ) > + mbedtls_snprintf( buf, buflen, "XTEA - XTEA hardware accelerator failed" ); > #endif /* MBEDTLS_XTEA_C */ > // END generated code > > diff --git a/dll/3rdparty/mbedtls/gcm.c b/dll/3rdparty/mbedtls/gcm.c > index 2f34930f4c..85a2907571 100644 > --- a/dll/3rdparty/mbedtls/gcm.c > +++ b/dll/3rdparty/mbedtls/gcm.c > @@ -48,6 +48,7 @@ > #endif > > #if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C) > +#include "mbedtls/aes.h" > #if defined(MBEDTLS_PLATFORM_C) > #include "mbedtls/platform.h" > #else > @@ -56,6 +57,8 @@ > #endif /* MBEDTLS_PLATFORM_C */ > #endif /* MBEDTLS_SELF_TEST && MBEDTLS_AES_C */ > > +#if !defined(MBEDTLS_GCM_ALT) > + > /* > * 32-bit integer manipulation macros (big endian) > */ > @@ -510,6 +513,8 @@ void mbedtls_gcm_free( mbedtls_gcm_context *ctx ) > mbedtls_zeroize( ctx, sizeof( mbedtls_gcm_context ) ); > } > > +#endif /* !MBEDTLS_GCM_ALT */ > + > #if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C) > /* > * AES-GCM test vectors from: > @@ -746,34 +751,48 @@ int mbedtls_gcm_self_test( int verbose ) > int i, j, ret; > mbedtls_cipher_id_t cipher = MBEDTLS_CIPHER_ID_AES; > > - mbedtls_gcm_init( &ctx ); > - > for( j = 0; j < 3; j++ ) > { > int key_len = 128 + 64 * j; > > for( i = 0; i < MAX_TESTS; i++ ) > { > + mbedtls_gcm_init( &ctx ); > + > if( verbose != 0 ) > mbedtls_printf( " AES-GCM-%3d #%d (%s): ", > - key_len, i, "enc" ); > - > - mbedtls_gcm_setkey( &ctx, cipher, key[key_index[i]], key_len ); > + key_len, i, "enc" ); > + > + ret = mbedtls_gcm_setkey( &ctx, cipher, key[key_index[i]], > + key_len ); > + /* > + * AES-192 is an optional feature that may be unavailable when > + * there is an alternative underlying implementation i.e. when > + * MBEDTLS_AES_ALT is defined. > + */ > + if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && key_len == 192 ) > + { > + mbedtls_printf( "skipped\n" ); > + break; > + } > + else if( ret != 0 ) > + { > + goto exit; > + } > > ret = mbedtls_gcm_crypt_and_tag( &ctx, MBEDTLS_GCM_ENCRYPT, > - pt_len[i], > - iv[iv_index[i]], iv_len[i], > - additional[add_index[i]], add_len[i], > - pt[pt_index[i]], buf, 16, tag_buf ); > + pt_len[i], > + iv[iv_index[i]], iv_len[i], > + additional[add_index[i]], add_len[i], > + pt[pt_index[i]], buf, 16, tag_buf ); > + if( ret != 0 ) > + goto exit; > > - if( ret != 0 || > - memcmp( buf, ct[j * 6 + i], pt_len[i] ) != 0 || > - memcmp( tag_buf, tag[j * 6 + i], 16 ) != 0 ) > + if ( memcmp( buf, ct[j * 6 + i], pt_len[i] ) != 0 || > + memcmp( tag_buf, tag[j * 6 + i], 16 ) != 0 ) > { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - return( 1 ); > + ret = 1; > + goto exit; > } > > mbedtls_gcm_free( &ctx ); > @@ -781,26 +800,31 @@ int mbedtls_gcm_self_test( int verbose ) > if( verbose != 0 ) > mbedtls_printf( "passed\n" ); > > + mbedtls_gcm_init( &ctx ); > + > if( verbose != 0 ) > mbedtls_printf( " AES-GCM-%3d #%d (%s): ", > - key_len, i, "dec" ); > + key_len, i, "dec" ); > > - mbedtls_gcm_setkey( &ctx, cipher, key[key_index[i]], key_len ); > + ret = mbedtls_gcm_setkey( &ctx, cipher, key[key_index[i]], > + key_len ); > + if( ret != 0 ) > + goto exit; > > ret = mbedtls_gcm_crypt_and_tag( &ctx, MBEDTLS_GCM_DECRYPT, > - pt_len[i], > - iv[iv_index[i]], iv_len[i], > - additional[add_index[i]], add_len[i], > - ct[j * 6 + i], buf, 16, tag_buf ); > + pt_len[i], > + iv[iv_index[i]], iv_len[i], > + additional[add_index[i]], add_len[i], > + ct[j * 6 + i], buf, 16, tag_buf ); > + > + if( ret != 0 ) > + goto exit; > > - if( ret != 0 || > - memcmp( buf, pt[pt_index[i]], pt_len[i] ) != 0 || > + if( memcmp( buf, pt[pt_index[i]], pt_len[i] ) != 0 || > memcmp( tag_buf, tag[j * 6 + i], 16 ) != 0 ) > { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - return( 1 ); > + ret = 1; > + goto exit; > } > > mbedtls_gcm_free( &ctx ); > @@ -808,66 +832,51 @@ int mbedtls_gcm_self_test( int verbose ) > if( verbose != 0 ) > mbedtls_printf( "passed\n" ); > > + mbedtls_gcm_init( &ctx ); > + > if( verbose != 0 ) > mbedtls_printf( " AES-GCM-%3d #%d split (%s): ", > - key_len, i, "enc" ); > + key_len, i, "enc" ); > > - mbedtls_gcm_setkey( &ctx, cipher, key[key_index[i]], key_len ); > + ret = mbedtls_gcm_setkey( &ctx, cipher, key[key_index[i]], > + key_len ); > + if( ret != 0 ) > + goto exit; > > ret = mbedtls_gcm_starts( &ctx, MBEDTLS_GCM_ENCRYPT, > - iv[iv_index[i]], iv_len[i], > - additional[add_index[i]], add_len[i] ); > + iv[iv_index[i]], iv_len[i], > + additional[add_index[i]], add_len[i] ); > if( ret != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - return( 1 ); > - } > + goto exit; > > if( pt_len[i] > 32 ) > { > size_t rest_len = pt_len[i] - 32; > ret = mbedtls_gcm_update( &ctx, 32, pt[pt_index[i]], buf ); > if( ret != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - return( 1 ); > - } > + goto exit; > > ret = mbedtls_gcm_update( &ctx, rest_len, pt[pt_index[i]] + 32, > buf + 32 ); > if( ret != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - return( 1 ); > - } > + goto exit; > } > else > { > ret = mbedtls_gcm_update( &ctx, pt_len[i], pt[pt_index[i]], buf ); > if( ret != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - return( 1 ); > - } > + goto exit; > } > > ret = mbedtls_gcm_finish( &ctx, tag_buf, 16 ); > - if( ret != 0 || > - memcmp( buf, ct[j * 6 + i], pt_len[i] ) != 0 || > + if( ret != 0 ) > + goto exit; > + > + if( memcmp( buf, ct[j * 6 + i], pt_len[i] ) != 0 || > memcmp( tag_buf, tag[j * 6 + i], 16 ) != 0 ) > { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - return( 1 ); > + ret = 1; > + goto exit; > } > > mbedtls_gcm_free( &ctx ); > @@ -875,80 +884,75 @@ int mbedtls_gcm_self_test( int verbose ) > if( verbose != 0 ) > mbedtls_printf( "passed\n" ); > > + mbedtls_gcm_init( &ctx ); > + > if( verbose != 0 ) > mbedtls_printf( " AES-GCM-%3d #%d split (%s): ", > - key_len, i, "dec" ); > + key_len, i, "dec" ); > > - mbedtls_gcm_setkey( &ctx, cipher, key[key_index[i]], key_len ); > + ret = mbedtls_gcm_setkey( &ctx, cipher, key[key_index[i]], > + key_len ); > + if( ret != 0 ) > + goto exit; > > ret = mbedtls_gcm_starts( &ctx, MBEDTLS_GCM_DECRYPT, > iv[iv_index[i]], iv_len[i], > additional[add_index[i]], add_len[i] ); > if( ret != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - return( 1 ); > - } > + goto exit; > > if( pt_len[i] > 32 ) > { > size_t rest_len = pt_len[i] - 32; > ret = mbedtls_gcm_update( &ctx, 32, ct[j * 6 + i], buf ); > if( ret != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - return( 1 ); > - } > + goto exit; > > ret = mbedtls_gcm_update( &ctx, rest_len, ct[j * 6 + i] + 32, > - buf + 32 ); > + buf + 32 ); > if( ret != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - return( 1 ); > - } > + goto exit; > } > else > { > - ret = mbedtls_gcm_update( &ctx, pt_len[i], ct[j * 6 + i], buf ); > + ret = mbedtls_gcm_update( &ctx, pt_len[i], ct[j * 6 + i], > + buf ); > if( ret != 0 ) > - { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - return( 1 ); > - } > + goto exit; > } > > ret = mbedtls_gcm_finish( &ctx, tag_buf, 16 ); > - if( ret != 0 || > - memcmp( buf, pt[pt_index[i]], pt_len[i] ) != 0 || > + if( ret != 0 ) > + goto exit; > + > + if( memcmp( buf, pt[pt_index[i]], pt_len[i] ) != 0 || > memcmp( tag_buf, tag[j * 6 + i], 16 ) != 0 ) > { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - return( 1 ); > + ret = 1; > + goto exit; > } > > mbedtls_gcm_free( &ctx ); > > if( verbose != 0 ) > mbedtls_printf( "passed\n" ); > - > } > } > > if( verbose != 0 ) > mbedtls_printf( "\n" ); > > - return( 0 ); > + ret = 0; > + > +exit: > + if( ret != 0 ) > + { > + if( verbose != 0 ) > + mbedtls_printf( "failed\n" ); > + mbedtls_gcm_free( &ctx ); > + } > + > + return( ret ); > } > > #endif /* MBEDTLS_SELF_TEST && MBEDTLS_AES_C */ > diff --git a/dll/3rdparty/mbedtls/hmac_drbg.c b/dll/3rdparty/mbedtls/hmac_drbg.c > index 2826cc204f..cda64a2713 100644 > --- a/dll/3rdparty/mbedtls/hmac_drbg.c > +++ b/dll/3rdparty/mbedtls/hmac_drbg.c > @@ -366,11 +366,14 @@ int mbedtls_hmac_drbg_write_seed_file( mbedtls_hmac_drbg_context *ctx, const cha > > exit: > fclose( f ); > + mbedtls_zeroize( buf, sizeof( buf ) ); > + > return( ret ); > } > > int mbedtls_hmac_drbg_update_seed_file( mbedtls_hmac_drbg_context *ctx, const char *path ) > { > + int ret = 0; > FILE *f; > size_t n; > unsigned char buf[ MBEDTLS_HMAC_DRBG_MAX_INPUT ]; > @@ -389,14 +392,16 @@ int mbedtls_hmac_drbg_update_seed_file( mbedtls_hmac_drbg_context *ctx, const ch > } > > if( fread( buf, 1, n, f ) != n ) > - { > - fclose( f ); > - return( MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR ); > - } > + ret = MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR; > + else > + mbedtls_hmac_drbg_update( ctx, buf, n ); > > fclose( f ); > > - mbedtls_hmac_drbg_update( ctx, buf, n ); > + mbedtls_zeroize( buf, sizeof( buf ) ); > + > + if( ret != 0 ) > + return( ret ); > > return( mbedtls_hmac_drbg_write_seed_file( ctx, path ) ); > } > diff --git a/dll/3rdparty/mbedtls/md.c b/dll/3rdparty/mbedtls/md.c > index fa63762ec7..e41c367c74 100644 > --- a/dll/3rdparty/mbedtls/md.c > +++ b/dll/3rdparty/mbedtls/md.c > @@ -252,9 +252,7 @@ int mbedtls_md_starts( mbedtls_md_context_t *ctx ) > if( ctx == NULL || ctx->md_info == NULL ) > return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); > > - ctx->md_info->starts_func( ctx->md_ctx ); > - > - return( 0 ); > + return( ctx->md_info->starts_func( ctx->md_ctx ) ); > } > > int mbedtls_md_update( mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen ) > @@ -262,9 +260,7 @@ int mbedtls_md_update( mbedtls_md_context_t *ctx, const unsigned char *input, si > if( ctx == NULL || ctx->md_info == NULL ) > return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); > > - ctx->md_info->update_func( ctx->md_ctx, input, ilen ); > - > - return( 0 ); > + return( ctx->md_info->update_func( ctx->md_ctx, input, ilen ) ); > } > > int mbedtls_md_finish( mbedtls_md_context_t *ctx, unsigned char *output ) > @@ -272,9 +268,7 @@ int mbedtls_md_finish( mbedtls_md_context_t *ctx, unsigned char *output ) > if( ctx == NULL || ctx->md_info == NULL ) > return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); > > - ctx->md_info->finish_func( ctx->md_ctx, output ); > - > - return( 0 ); > + return( ctx->md_info->finish_func( ctx->md_ctx, output ) ); > } > > int mbedtls_md( const mbedtls_md_info_t *md_info, const unsigned char *input, size_t ilen, > @@ -283,9 +277,7 @@ int mbedtls_md( const mbedtls_md_info_t *md_info, const unsigned char *input, si > if( md_info == NULL ) > return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); > > - md_info->digest_func( input, ilen, output ); > - > - return( 0 ); > + return( md_info->digest_func( input, ilen, output ) ); > } > > #if defined(MBEDTLS_FS_IO) > @@ -308,20 +300,20 @@ int mbedtls_md_file( const mbedtls_md_info_t *md_info, const char *path, unsigne > if( ( ret = mbedtls_md_setup( &ctx, md_info, 0 ) ) != 0 ) > goto cleanup; > > - md_info->starts_func( ctx.md_ctx ); > + if( ( ret = md_info->starts_func( ctx.md_ctx ) ) != 0 ) > + goto cleanup; > > while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 ) > - md_info->update_func( ctx.md_ctx, buf, n ); > + if( ( ret = md_info->update_func( ctx.md_ctx, buf, n ) ) != 0 ) > + goto cleanup; > > if( ferror( f ) != 0 ) > - { > ret = MBEDTLS_ERR_MD_FILE_IO_ERROR; > - goto cleanup; > - } > - > - md_info->finish_func( ctx.md_ctx, output ); > + else > + ret = md_info->finish_func( ctx.md_ctx, output ); > > cleanup: > + mbedtls_zeroize( buf, sizeof( buf ) ); > fclose( f ); > mbedtls_md_free( &ctx ); > > @@ -331,6 +323,7 @@ cleanup: > > int mbedtls_md_hmac_starts( mbedtls_md_context_t *ctx, const unsigned char *key, size_t keylen ) > { > + int ret; > unsigned char sum[MBEDTLS_MD_MAX_SIZE]; > unsigned char *ipad, *opad; > size_t i; > @@ -340,9 +333,12 @@ int mbedtls_md_hmac_starts( mbedtls_md_context_t *ctx, const unsigned char *key, > > if( keylen > (size_t) ctx->md_info->block_size ) > { > - ctx->md_info->starts_func( ctx->md_ctx ); > - ctx->md_info->update_func( ctx->md_ctx, key, keylen ); > - ctx->md_info->finish_func( ctx->md_ctx, sum ); > + if( ( ret = ctx->md_info->starts_func( ctx->md_ctx ) ) != 0 ) > + goto cleanup; > + if( ( ret = ctx->md_info->update_func( ctx->md_ctx, key, keylen ) ) != 0 ) > + goto cleanup; > + if( ( ret = ctx->md_info->finish_func( ctx->md_ctx, sum ) ) != 0 ) > + goto cleanup; > > keylen = ctx->md_info->size; > key = sum; > @@ -360,12 +356,16 @@ int mbedtls_md_hmac_starts( mbedtls_md_context_t *ctx, const unsigned char *key, > opad[i] = (unsigned char)( opad[i] ^ key[i] ); > } > > - mbedtls_zeroize( sum, sizeof( sum ) ); > + if( ( ret = ctx->md_info->starts_func( ctx->md_ctx ) ) != 0 ) > + goto cleanup; > + if( ( ret = ctx->md_info->update_func( ctx->md_ctx, ipad, > + ctx->md_info->block_size ) ) != 0 ) > + goto cleanup; > > - ctx->md_info->starts_func( ctx->md_ctx ); > - ctx->md_info->update_func( ctx->md_ctx, ipad, ctx->md_info->block_size ); > +cleanup: > + mbedtls_zeroize( sum, sizeof( sum ) ); > > - return( 0 ); > + return( ret ); > } > > int mbedtls_md_hmac_update( mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen ) > @@ -373,13 +373,12 @@ int mbedtls_md_hmac_update( mbedtls_md_context_t *ctx, const unsigned char *inpu > if( ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL ) > return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); > > - ctx->md_info->update_func( ctx->md_ctx, input, ilen ); > - > - return( 0 ); > + return( ctx->md_info->update_func( ctx->md_ctx, input, ilen ) ); > } > > int mbedtls_md_hmac_finish( mbedtls_md_context_t *ctx, unsigned char *output ) > { > + int ret; > unsigned char tmp[MBEDTLS_MD_MAX_SIZE]; > unsigned char *opad; > > @@ -388,17 +387,22 @@ int mbedtls_md_hmac_finish( mbedtls_md_context_t *ctx, unsigned char *output ) > > opad = (unsigned char *) ctx->hmac_ctx + ctx->md_info->block_size; > > - ctx->md_info->finish_func( ctx->md_ctx, tmp ); > - ctx->md_info->starts_func( ctx->md_ctx ); > - ctx->md_info->update_func( ctx->md_ctx, opad, ctx->md_info->block_size ); > - ctx->md_info->update_func( ctx->md_ctx, tmp, ctx->md_info->size ); > - ctx->md_info->finish_func( ctx->md_ctx, output ); > - > - return( 0 ); > + if( ( ret = ctx->md_info->finish_func( ctx->md_ctx, tmp ) ) != 0 ) > + return( ret ); > + if( ( ret = ctx->md_info->starts_func( ctx->md_ctx ) ) != 0 ) > + return( ret ); > + if( ( ret = ctx->md_info->update_func( ctx->md_ctx, opad, > + ctx->md_info->block_size ) ) != 0 ) > + return( ret ); > + if( ( ret = ctx->md_info->update_func( ctx->md_ctx, tmp, > + ctx->md_info->size ) ) != 0 ) > + return( ret ); > + return( ctx->md_info->finish_func( ctx->md_ctx, output ) ); > } > > int mbedtls_md_hmac_reset( mbedtls_md_context_t *ctx ) > { > + int ret; > unsigned char *ipad; > > if( ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL ) > @@ -406,15 +410,16 @@ int mbedtls_md_hmac_reset( mbedtls_md_context_t *ctx ) > > ipad = (unsigned char *) ctx->hmac_ctx; > > - ctx->md_info->starts_func( ctx->md_ctx ); > - ctx->md_info->update_func( ctx->md_ctx, ipad, ctx->md_info->block_size ); > - > - return( 0 ); > + if( ( ret = ctx->md_info->starts_func( ctx->md_ctx ) ) != 0 ) > + return( ret ); > + return( ctx->md_info->update_func( ctx->md_ctx, ipad, > + ctx->md_info->block_size ) ); > } > > -int mbedtls_md_hmac( const mbedtls_md_info_t *md_info, const unsigned char *key, size_t keylen, > - const unsigned char *input, size_t ilen, > - unsigned char *output ) > +int mbedtls_md_hmac( const mbedtls_md_info_t *md_info, > + const unsigned char *key, size_t keylen, > + const unsigned char *input, size_t ilen, > + unsigned char *output ) > { > mbedtls_md_context_t ctx; > int ret; > @@ -425,15 +430,19 @@ int mbedtls_md_hmac( const mbedtls_md_info_t *md_info, const unsigned char *key, > mbedtls_md_init( &ctx ); > > if( ( ret = mbedtls_md_setup( &ctx, md_info, 1 ) ) != 0 ) > - return( ret ); > + goto cleanup; > > - mbedtls_md_hmac_starts( &ctx, key, keylen ); > - mbedtls_md_hmac_update( &ctx, input, ilen ); > - mbedtls_md_hmac_finish( &ctx, output ); > + if( ( ret = mbedtls_md_hmac_starts( &ctx, key, keylen ) ) != 0 ) > + goto cleanup; > + if( ( ret = mbedtls_md_hmac_update( &ctx, input, ilen ) ) != 0 ) > + goto cleanup; > + if( ( ret = mbedtls_md_hmac_finish( &ctx, output ) ) != 0 ) > + goto cleanup; > > +cleanup: > mbedtls_md_free( &ctx ); > > - return( 0 ); > + return( ret ); > } > > int mbedtls_md_process( mbedtls_md_context_t *ctx, const unsigned char *data ) > @@ -441,9 +450,7 @@ int mbedtls_md_process( mbedtls_md_context_t *ctx, const unsigned char *data ) > if( ctx == NULL || ctx->md_info == NULL ) > return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); > > - ctx->md_info->process_func( ctx->md_ctx, data ); > - > - return( 0 ); > + return( ctx->md_info->process_func( ctx->md_ctx, data ) ); > } > > unsigned char mbedtls_md_get_size( const mbedtls_md_info_t *md_info ) > diff --git a/dll/3rdparty/mbedtls/md2.c b/dll/3rdparty/mbedtls/md2.c > index 9e0c43dabf..7ce86f9302 100644 > --- a/dll/3rdparty/mbedtls/md2.c > +++ b/dll/3rdparty/mbedtls/md2.c > @@ -107,16 +107,25 @@ void mbedtls_md2_clone( mbedtls_md2_context *dst, > /* > * MD2 context setup > */ > -void mbedtls_md2_starts( mbedtls_md2_context *ctx ) > +int mbedtls_md2_starts_ret( mbedtls_md2_context *ctx ) > { > memset( ctx->cksum, 0, 16 ); > memset( ctx->state, 0, 46 ); > memset( ctx->buffer, 0, 16 ); > ctx->left = 0; > + > + return( 0 ); > } > > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > +void mbedtls_md2_starts( mbedtls_md2_context *ctx ) > +{ > + mbedtls_md2_starts_ret( ctx ); > +} > +#endif > + > #if !defined(MBEDTLS_MD2_PROCESS_ALT) > -void mbedtls_md2_process( mbedtls_md2_context *ctx ) > +int mbedtls_internal_md2_process( mbedtls_md2_context *ctx ) > { > int i, j; > unsigned char t = 0; > @@ -148,14 +157,26 @@ void mbedtls_md2_process( mbedtls_md2_context *ctx ) > ( ctx->cksum[i] ^ PI_SUBST[ctx->buffer[i] ^ t] ); > t = ctx->cksum[i]; > } > + > + return( 0 ); > } > + > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > +void mbedtls_md2_process( mbedtls_md2_context *ctx ) > +{ > + mbedtls_internal_md2_process( ctx ); > +} > +#endif > #endif /* !MBEDTLS_MD2_PROCESS_ALT */ > > /* > * MD2 process buffer > */ > -void mbedtls_md2_update( mbedtls_md2_context *ctx, const unsigned char *input, size_t ilen ) > +int mbedtls_md2_update_ret( mbedtls_md2_context *ctx, > + const unsigned char *input, > + size_t ilen ) > { > + int ret; > size_t fill; > > while( ilen > 0 ) > @@ -174,16 +195,30 @@ void mbedtls_md2_update( mbedtls_md2_context *ctx, const unsigned char *input, s > if( ctx->left == 16 ) > { > ctx->left = 0; > - mbedtls_md2_process( ctx ); > + if( ( ret = mbedtls_internal_md2_process( ctx ) ) != 0 ) > + return( ret ); > } > } > + > + return( 0 ); > } > > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > +void mbedtls_md2_update( mbedtls_md2_context *ctx, > + const unsigned char *input, > + size_t ilen ) > +{ > + mbedtls_md2_update_ret( ctx, input, ilen ); > +} > +#endif > + > /* > * MD2 final digest > */ > -void mbedtls_md2_finish( mbedtls_md2_context *ctx, unsigned char output[16] ) > +int mbedtls_md2_finish_ret( mbedtls_md2_context *ctx, > + unsigned char output[16] ) > { > + int ret; > size_t i; > unsigned char x; > > @@ -192,36 +227,70 @@ void mbedtls_md2_finish( mbedtls_md2_context *ctx, unsigned char output[16] ) > for( i = ctx->left; i < 16; i++ ) > ctx->buffer[i] = x; > > - mbedtls_md2_process( ctx ); > + if( ( ret = mbedtls_internal_md2_process( ctx ) ) != 0 ) > + return( ret ); > > memcpy( ctx->buffer, ctx->cksum, 16 ); > - mbedtls_md2_process( ctx ); > + if( ( ret = mbedtls_internal_md2_process( ctx ) ) != 0 ) > + return( ret ); > > memcpy( output, ctx->state, 16 ); > + > + return( 0 ); > +} > + > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > +void mbedtls_md2_finish( mbedtls_md2_context *ctx, > + unsigned char output[16] ) > +{ > + mbedtls_md2_finish_ret( ctx, output ); > } > +#endif > > #endif /* !MBEDTLS_MD2_ALT */ > > /* > * output = MD2( input buffer ) > */ > -void mbedtls_md2( const unsigned char *input, size_t ilen, unsigned char output[16] ) > +int mbedtls_md2_ret( const unsigned char *input, > + size_t ilen, > + unsigned char output[16] ) > { > + int ret; > mbedtls_md2_context ctx; > > mbedtls_md2_init( &ctx ); > - mbedtls_md2_starts( &ctx ); > - mbedtls_md2_update( &ctx, input, ilen ); > - mbedtls_md2_finish( &ctx, output ); > + > + if( ( ret = mbedtls_md2_starts_ret( &ctx ) ) != 0 ) > + goto exit; > + > + if( ( ret = mbedtls_md2_update_ret( &ctx, input, ilen ) ) != 0 ) > + goto exit; > + > + if( ( ret = mbedtls_md2_finish_ret( &ctx, output ) ) != 0 ) > + goto exit; > + > +exit: > mbedtls_md2_free( &ctx ); > + > + return( ret ); > } > > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > +void mbedtls_md2( const unsigned char *input, > + size_t ilen, > + unsigned char output[16] ) > +{ > + mbedtls_md2_ret( input, ilen, output ); > +} > +#endif > + > #if defined(MBEDTLS_SELF_TEST) > > /* > * RFC 1319 test vectors > */ > -static const char md2_test_str[7][81] = > +static const unsigned char md2_test_str[7][81] = > { > { "" }, > { "a" }, > @@ -229,10 +298,15 @@ static const char md2_test_str[7][81] = > { "message digest" }, > { "abcdefghijklmnopqrstuvwxyz" }, > { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" }, > - { "12345678901234567890123456789012345678901234567890123456789012" \ > + { "12345678901234567890123456789012345678901234567890123456789012" > "345678901234567890" } > }; > > +static const size_t md2_test_strlen[7] = > +{ > + 0, 1, 3, 14, 26, 62, 80 > +}; > + > static const unsigned char md2_test_sum[7][16] = > { > { 0x83, 0x50, 0xE5, 0xA3, 0xE2, 0x4C, 0x15, 0x3D, > @@ -256,7 +330,7 @@ static const unsigned char md2_test_sum[7][16] = > */ > int mbedtls_md2_self_test( int verbose ) > { > - int i; > + int i, ret = 0; > unsigned char md2sum[16]; > > for( i = 0; i < 7; i++ ) > @@ -264,15 +338,14 @@ int mbedtls_md2_self_test( int verbose ) > if( verbose != 0 ) > mbedtls_printf( " MD2 test #%d: ", i + 1 ); > > - mbedtls_md2( (unsigned char *) md2_test_str[i], > - strlen( md2_test_str[i] ), md2sum ); > + ret = mbedtls_md2_ret( md2_test_str[i], md2_test_strlen[i], md2sum ); > + if( ret != 0 ) > + goto fail; > > if( memcmp( md2sum, md2_test_sum[i], 16 ) != 0 ) > { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - return( 1 ); > + ret = 1; > + goto fail; > } > > if( verbose != 0 ) > @@ -283,6 +356,12 @@ int mbedtls_md2_self_test( int verbose ) > mbedtls_printf( "\n" ); > > return( 0 ); > + > +fail: > + if( verbose != 0 ) > + mbedtls_printf( "failed\n" ); > + > + return( ret ); > } > > #endif /* MBEDTLS_SELF_TEST */ > diff --git a/dll/3rdparty/mbedtls/md4.c b/dll/3rdparty/mbedtls/md4.c > index 2a66db49ec..f53efa8243 100644 > --- a/dll/3rdparty/mbedtls/md4.c > +++ b/dll/3rdparty/mbedtls/md4.c > @@ -100,7 +100,7 @@ void mbedtls_md4_clone( mbedtls_md4_context *dst, > /* > * MD4 context setup > */ > -void mbedtls_md4_starts( mbedtls_md4_context *ctx ) > +int mbedtls_md4_starts_ret( mbedtls_md4_context *ctx ) > { > ctx->total[0] = 0; > ctx->total[1] = 0; > @@ -109,10 +109,20 @@ void mbedtls_md4_starts( mbedtls_md4_context *ctx ) > ctx->state[1] = 0xEFCDAB89; > ctx->state[2] = 0x98BADCFE; > ctx->state[3] = 0x10325476; > + > + return( 0 ); > +} > + > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > +void mbedtls_md4_starts( mbedtls_md4_context *ctx ) > +{ > + mbedtls_md4_starts_ret( ctx ); > } > +#endif > > #if !defined(MBEDTLS_MD4_PROCESS_ALT) > -void mbedtls_md4_process( mbedtls_md4_context *ctx, const unsigned char data[64] ) > +int mbedtls_internal_md4_process( mbedtls_md4_context *ctx, > + const unsigned char data[64] ) > { > uint32_t X[16], A, B, C, D; > > @@ -213,19 +223,32 @@ void mbedtls_md4_process( mbedtls_md4_context *ctx, const unsigned char data[64] > ctx->state[1] += B; > ctx->state[2] += C; > ctx->state[3] += D; > + > + return( 0 ); > +} > + > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > +void mbedtls_md4_process( mbedtls_md4_context *ctx, > + const unsigned char data[64] ) > +{ > + mbedtls_internal_md4_process( ctx, data ); > } > +#endif > #endif /* !MBEDTLS_MD4_PROCESS_ALT */ > > /* > * MD4 process buffer > */ > -void mbedtls_md4_update( mbedtls_md4_context *ctx, const unsigned char *input, size_t ilen ) > +int mbedtls_md4_update_ret( mbedtls_md4_context *ctx, > + const unsigned char *input, > + size_t ilen ) > { > + int ret; > size_t fill; > uint32_t left; > > if( ilen == 0 ) > - return; > + return( 0 ); > > left = ctx->total[0] & 0x3F; > fill = 64 - left; > @@ -240,7 +263,10 @@ void mbedtls_md4_update( mbedtls_md4_context *ctx, const unsigned char *input, s > { > memcpy( (void *) (ctx->buffer + left), > (void *) input, fill ); > - mbedtls_md4_process( ctx, ctx->buffer ); > + > + if( ( ret = mbedtls_internal_md4_process( ctx, ctx->buffer ) ) != 0 ) > + return( ret ); > + > input += fill; > ilen -= fill; > left = 0; > @@ -248,7 +274,9 @@ void mbedtls_md4_update( mbedtls_md4_context *ctx, const unsigned char *input, s > > while( ilen >= 64 ) > { > - mbedtls_md4_process( ctx, input ); > + if( ( ret = mbedtls_internal_md4_process( ctx, input ) ) != 0 ) > + return( ret ); > + > input += 64; > ilen -= 64; > } > @@ -258,7 +286,18 @@ void mbedtls_md4_update( mbedtls_md4_context *ctx, const unsigned char *input, s > memcpy( (void *) (ctx->buffer + left), > (void *) input, ilen ); > } > + > + return( 0 ); > +} > + > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > +void mbedtls_md4_update( mbedtls_md4_context *ctx, > + const unsigned char *input, > + size_t ilen ) > +{ > + mbedtls_md4_update_ret( ctx, input, ilen ); > } > +#endif > > static const unsigned char md4_padding[64] = > { > @@ -271,8 +310,10 @@ static const unsigned char md4_padding[64] = > /* > * MD4 final digest > */ > -void mbedtls_md4_finish( mbedtls_md4_context *ctx, unsigned char output[16] ) > +int mbedtls_md4_finish_ret( mbedtls_md4_context *ctx, > + unsigned char output[16] ) > { > + int ret; > uint32_t last, padn; > uint32_t high, low; > unsigned char msglen[8]; > @@ -287,37 +328,74 @@ void mbedtls_md4_finish( mbedtls_md4_context *ctx, unsigned char output[16] ) > last = ctx->total[0] & 0x3F; > padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last ); > > - mbedtls_md4_update( ctx, (unsigned char *) md4_padding, padn ); > - mbedtls_md4_update( ctx, msglen, 8 ); > + ret = mbedtls_md4_update_ret( ctx, (unsigned char *)md4_padding, padn ); > + if( ret != 0 ) > + return( ret ); > + > + if( ( ret = mbedtls_md4_update_ret( ctx, msglen, 8 ) ) != 0 ) > + return( ret ); > + > > PUT_UINT32_LE( ctx->state[0], output, 0 ); > PUT_UINT32_LE( ctx->state[1], output, 4 ); > PUT_UINT32_LE( ctx->state[2], output, 8 ); > PUT_UINT32_LE( ctx->state[3], output, 12 ); > + > + return( 0 ); > +} > + > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > +void mbedtls_md4_finish( mbedtls_md4_context *ctx, > + unsigned char output[16] ) > +{ > + mbedtls_md4_finish_ret( ctx, output ); > } > +#endif > > #endif /* !MBEDTLS_MD4_ALT */ > > /* > * output = MD4( input buffer ) > */ > -void mbedtls_md4( const unsigned char *input, size_t ilen, unsigned char output[16] ) > +int mbedtls_md4_ret( const unsigned char *input, > + size_t ilen, > + unsigned char output[16] ) > { > + int ret; > mbedtls_md4_context ctx; > > mbedtls_md4_init( &ctx ); > - mbedtls_md4_starts( &ctx ); > - mbedtls_md4_update( &ctx, input, ilen ); > - mbedtls_md4_finish( &ctx, output ); > + > + if( ( ret = mbedtls_md4_starts_ret( &ctx ) ) != 0 ) > + goto exit; > + > + if( ( ret = mbedtls_md4_update_ret( &ctx, input, ilen ) ) != 0 ) > + goto exit; > + > + if( ( ret = mbedtls_md4_finish_ret( &ctx, output ) ) != 0 ) > + goto exit; > + > +exit: > mbedtls_md4_free( &ctx ); > + > + return( ret ); > +} > + > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > +void mbedtls_md4( const unsigned char *input, > + size_t ilen, > + unsigned char output[16] ) > +{ > + mbedtls_md4_ret( input, ilen, output ); > } > +#endif > > #if defined(MBEDTLS_SELF_TEST) > > /* > * RFC 1320 test vectors > */ > -static const char md4_test_str[7][81] = > +static const unsigned char md4_test_str[7][81] = > { > { "" }, > { "a" }, > @@ -325,10 +403,15 @@ static const char md4_test_str[7][81] = > { "message digest" }, > { "abcdefghijklmnopqrstuvwxyz" }, > { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" }, > - { "12345678901234567890123456789012345678901234567890123456789012" \ > + { "12345678901234567890123456789012345678901234567890123456789012" > "345678901234567890" } > }; > > +static const size_t md4_test_strlen[7] = > +{ > + 0, 1, 3, 14, 26, 62, 80 > +}; > + > static const unsigned char md4_test_sum[7][16] = > { > { 0x31, 0xD6, 0xCF, 0xE0, 0xD1, 0x6A, 0xE9, 0x31, > @@ -352,7 +435,7 @@ static const unsigned char md4_test_sum[7][16] = > */ > int mbedtls_md4_self_test( int verbose ) > { > - int i; > + int i, ret = 0; > unsigned char md4sum[16]; > > for( i = 0; i < 7; i++ ) > @@ -360,15 +443,14 @@ int mbedtls_md4_self_test( int verbose ) > if( verbose != 0 ) > mbedtls_printf( " MD4 test #%d: ", i + 1 ); > > - mbedtls_md4( (unsigned char *) md4_test_str[i], > - strlen( md4_test_str[i] ), md4sum ); > + ret = mbedtls_md4_ret( md4_test_str[i], md4_test_strlen[i], md4sum ); > + if( ret != 0 ) > + goto fail; > > if( memcmp( md4sum, md4_test_sum[i], 16 ) != 0 ) > { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - return( 1 ); > + ret = 1; > + goto fail; > } > > if( verbose != 0 ) > @@ -379,6 +461,12 @@ int mbedtls_md4_self_test( int verbose ) > mbedtls_printf( "\n" ); > > return( 0 ); > + > +fail: > + if( verbose != 0 ) > + mbedtls_printf( "failed\n" ); > + > + return( ret ); > } > > #endif /* MBEDTLS_SELF_TEST */ > diff --git a/dll/3rdparty/mbedtls/md5.c b/dll/3rdparty/mbedtls/md5.c > index 758eebeb66..b4bcf76e52 100644 > --- a/dll/3rdparty/mbedtls/md5.c > +++ b/dll/3rdparty/mbedtls/md5.c > @@ -99,7 +99,7 @@ void mbedtls_md5_clone( mbedtls_md5_context *dst, > /* > * MD5 context setup > */ > -void mbedtls_md5_starts( mbedtls_md5_context *ctx ) > +int mbedtls_md5_starts_ret( mbedtls_md5_context *ctx ) > { > ctx->total[0] = 0; > ctx->total[1] = 0; > @@ -108,10 +108,20 @@ void mbedtls_md5_starts( mbedtls_md5_context *ctx ) > ctx->state[1] = 0xEFCDAB89; > ctx->state[2] = 0x98BADCFE; > ctx->state[3] = 0x10325476; > + > + return( 0 ); > } > > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > +void mbedtls_md5_starts( mbedtls_md5_context *ctx ) > +{ > + mbedtls_md5_starts_ret( ctx ); > +} > +#endif > + > #if !defined(MBEDTLS_MD5_PROCESS_ALT) > -void mbedtls_md5_process( mbedtls_md5_context *ctx, const unsigned char data[64] ) > +int mbedtls_internal_md5_process( mbedtls_md5_context *ctx, > + const unsigned char data[64] ) > { > uint32_t X[16], A, B, C, D; > > @@ -232,19 +242,32 @@ void mbedtls_md5_process( mbedtls_md5_context *ctx, const unsigned char data[64] > ctx->state[1] += B; > ctx->state[2] += C; > ctx->state[3] += D; > + > + return( 0 ); > +} > + > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > +void mbedtls_md5_process( mbedtls_md5_context *ctx, > + const unsigned char data[64] ) > +{ > + mbedtls_internal_md5_process( ctx, data ); > } > +#endif > #endif /* !MBEDTLS_MD5_PROCESS_ALT */ > > /* > * MD5 process buffer > */ > -void mbedtls_md5_update( mbedtls_md5_context *ctx, const unsigned char *input, size_t ilen ) > +int mbedtls_md5_update_ret( mbedtls_md5_context *ctx, > + const unsigned char *input, > + size_t ilen ) > { > + int ret; > size_t fill; > uint32_t left; > > if( ilen == 0 ) > - return; > + return( 0 ); > > left = ctx->total[0] & 0x3F; > fill = 64 - left; > @@ -258,7 +281,9 @@ void mbedtls_md5_update( mbedtls_md5_context *ctx, const unsigned char *input, s > if( left && ilen >= fill ) > { > memcpy( (void *) (ctx->buffer + left), input, fill ); > - mbedtls_md5_process( ctx, ctx->buffer ); > + if( ( ret = mbedtls_internal_md5_process( ctx, ctx->buffer ) ) != 0 ) > + return( ret ); > + > input += fill; > ilen -= fill; > left = 0; > @@ -266,7 +291,9 @@ void mbedtls_md5_update( mbedtls_md5_context *ctx, const unsigned char *input, s > > while( ilen >= 64 ) > { > - mbedtls_md5_process( ctx, input ); > + if( ( ret = mbedtls_internal_md5_process( ctx, input ) ) != 0 ) > + return( ret ); > + > input += 64; > ilen -= 64; > } > @@ -275,59 +302,121 @@ void mbedtls_md5_update( mbedtls_md5_context *ctx, const unsigned char *input, s > { > memcpy( (void *) (ctx->buffer + left), input, ilen ); > } > + > + return( 0 ); > } > > -static const unsigned char md5_padding[64] = > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > +void mbedtls_md5_update( mbedtls_md5_context *ctx, > + const unsigned char *input, > + size_t ilen ) > { > - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, > - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, > - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, > - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 > -}; > + mbedtls_md5_update_ret( ctx, input, ilen ); > +} > +#endif > > /* > * MD5 final digest > */ > -void mbedtls_md5_finish( mbedtls_md5_context *ctx, unsigned char output[16] ) > +int mbedtls_md5_finish_ret( mbedtls_md5_context *ctx, > + unsigned char output[16] ) > { > - uint32_t last, padn; > + int ret; > + uint32_t used; > uint32_t high, low; > - unsigned char msglen[8]; > > + /* > + * Add padding: 0x80 then 0x00 until 8 bytes remain for the length > + */ > + used = ctx->total[0] & 0x3F; > + > + ctx->buffer[used++] = 0x80; > + > + if( used <= 56 ) > + { > + /* Enough room for padding + length in current block */ > + memset( ctx->buffer + used, 0, 56 - used ); > + } > + else > + { > + /* We'll need an extra block */ > + memset( ctx->buffer + used, 0, 64 - used ); > + > + if( ( ret = mbedtls_internal_md5_process( ctx, ctx->buffer ) ) != 0 ) > + return( ret ); > + > + memset( ctx->buffer, 0, 56 ); > + } > + > + /* > + * Add message length > + */ > high = ( ctx->total[0] >> 29 ) > | ( ctx->total[1] << 3 ); > low = ( ctx->total[0] << 3 ); > > - PUT_UINT32_LE( low, msglen, 0 ); > - PUT_UINT32_LE( high, msglen, 4 ); > - > - last = ctx->total[0] & 0x3F; > - padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last ); > + PUT_UINT32_LE( low, ctx->buffer, 56 ); > + PUT_UINT32_LE( high, ctx->buffer, 60 ); > > - mbedtls_md5_update( ctx, md5_padding, padn ); > - mbedtls_md5_update( ctx, msglen, 8 ); > + if( ( ret = mbedtls_internal_md5_process( ctx, ctx->buffer ) ) != 0 ) > + return( ret ); > > + /* > + * Output final state > + */ > PUT_UINT32_LE( ctx->state[0], output, 0 ); > PUT_UINT32_LE( ctx->state[1], output, 4 ); > PUT_UINT32_LE( ctx->state[2], output, 8 ); > PUT_UINT32_LE( ctx->state[3], output, 12 ); > + > + return( 0 ); > +} > + > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > +void mbedtls_md5_finish( mbedtls_md5_context *ctx, > + unsigned char output[16] ) > +{ > + mbedtls_md5_finish_ret( ctx, output ); > } > +#endif > > #endif /* !MBEDTLS_MD5_ALT */ > > /* > * output = MD5( input buffer ) > */ > -void mbedtls_md5( const unsigned char *input, size_t ilen, unsigned char output[16] ) > +int mbedtls_md5_ret( const unsigned char *input, > + size_t ilen, > + unsigned char output[16] ) > { > + int ret; > mbedtls_md5_context ctx; > > mbedtls_md5_init( &ctx ); > - mbedtls_md5_starts( &ctx ); > - mbedtls_md5_update( &ctx, input, ilen ); > - mbedtls_md5_finish( &ctx, output ); > + > + if( ( ret = mbedtls_md5_starts_ret( &ctx ) ) != 0 ) > + goto exit; > + > + if( ( ret = mbedtls_md5_update_ret( &ctx, input, ilen ) ) != 0 ) > + goto exit; > + > + if( ( ret = mbedtls_md5_finish_ret( &ctx, output ) ) != 0 ) > + goto exit; > + > +exit: > mbedtls_md5_free( &ctx ); > + > + return( ret ); > +} > + > +#if !defined(MBEDTLS_DEPRECATED_REMOVED) > +void mbedtls_md5( const unsigned char *input, > + size_t ilen, > + unsigned char output[16] ) > +{ > + mbedtls_md5_ret( input, ilen, output ); > } > +#endif > > #if defined(MBEDTLS_SELF_TEST) > /* > @@ -341,11 +430,11 @@ static const unsigned char md5_test_buf[7][81] = > { "message digest" }, > { "abcdefghijklmnopqrstuvwxyz" }, > { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" }, > - { "12345678901234567890123456789012345678901234567890123456789012" \ > + { "12345678901234567890123456789012345678901234567890123456789012" > "345678901234567890" } > }; > > -static const int md5_test_buflen[7] = > +static const size_t md5_test_buflen[7] = > { > 0, 1, 3, 14, 26, 62, 80 > }; > @@ -373,7 +462,7 @@ static const unsigned char md5_test_sum[7][16] = > */ > int mbedtls_md5_self_test( int verbose ) > { > - int i; > + int i, ret = 0; > unsigned char md5sum[16]; > > for( i = 0; i < 7; i++ ) > @@ -381,14 +470,14 @@ int mbedtls_md5_self_test( int verbose ) > if( verbose != 0 ) > mbedtls_printf( " MD5 test #%d: ", i + 1 ); > > - mbedtls_md5( md5_test_buf[i], md5_test_buflen[i], md5sum ); > + ret = mbedtls_md5_ret( md5_test_buf[i], md5_test_buflen[i], md5sum ); > + if( ret != 0 ) > + goto fail; > > if( memcmp( md5sum, md5_test_sum[i], 16 ) != 0 ) > { > - if( verbose != 0 ) > - mbedtls_printf( "failed\n" ); > - > - return( 1 ); > + ret = 1; > + goto fail; > } > > if( verbose != 0 ) > @@ -399,6 +488,12 @@ int mbedtls_md5_self_test( int verbose ) > mbedtls_printf( "\n" ); > > return( 0 ); > + > +fail: > + if( verbose != 0 ) > + mbedtls_printf( "failed\n" ); > + > + return( ret ); > } > > #endif /* MBEDTLS_SELF_TEST */ > diff --git a/dll/3rdparty/mbedtls/md_wrap.c b/dll/3rdparty/mbedtls/md_wrap.c > index 49c47d69d1..97067b0425 100644 > --- a/dll/3rdparty/mbedtls/md_wrap.c > +++ b/dll/3rdparty/mbedtls/md_wrap.c > @@ -73,20 +73,20 @@ > > #if defined(MBEDTLS_MD2_C) > > -static void md2_starts_wrap( void *ctx ) > +static int md2_starts_wrap( void *ctx ) > { > - mbedtls_md2_starts( (mbedtls_md2_context *) ctx ); > + return( mbedtls_md2_starts_ret( (mbedtls_md2_context *) ctx ) ); > } > > -static void md2_update_wrap( void *ctx, const unsigned char *input, > +static int md2_update_wrap( void *ctx, const unsigned char *input, > size_t ilen ) > { > - mbedtls_md2_update( (mbedtls_md2_context *) ctx, input, ilen ); > + return( mbedtls_md2_update_ret( (mbedtls_md2_context *) ctx, input, ilen ) ); > } > > -static void md2_finish_wrap( void *ctx, unsigned char *output ) > +static int md2_finish_wrap( void *ctx, unsigned char *output ) > { > - mbedtls_md2_finish( (mbedtls_md2_context *) ctx, output ); > + return( mbedtls_md2_finish_ret( (mbedtls_md2_context *) ctx, output ) ); > } > > static void *md2_ctx_alloc( void ) > @@ -111,11 +111,11 @@ static void md2_clone_wrap( void *dst, const void *src ) > (const mbedtls_md2_context *) src ); > } > > -static void md2_process_wrap( void *ctx, const unsigned char *data ) > +static int md2_process_wrap( void *ctx, const unsigned char *data ) > { > ((void) data); > > - mbedtls_md2_process( (mbedtls_md2_context *) ctx ); > + return( mbedtls_internal_md2_process( (mbedtls_md2_context *) ctx ) ); > } > > const mbedtls_md_info_t mbedtls_md2_info = { > @@ -126,7 +126,7 @@ const mbedtls_md_info_t mbedtls_md2_info = { > md2_starts_wrap, > md2_update_wrap, > md2_finish_wrap, > - mbedtls_md2, > + mbedtls_md2_ret, > md2_ctx_alloc, > md2_ctx_free, > md2_clone_wrap, > @@ -137,20 +137,20 @@ const mbedtls_md_info_t mbedtls_md2_info = { > > #if defined(MBEDTLS_MD4_C) > > -static void md4_starts_wrap( void *ctx ) > +static int md4_starts_wrap( void *ctx ) > { > - mbedtls_md4_starts( (mbedtls_md4_context *) ctx ); > + return( mbedtls_md4_starts_ret( (mbedtls_md4_context *) ctx ) ); > } > > -static void md4_update_wrap( void *ctx, const unsigned char *input, > +static int md4_update_wrap( void *ctx, const unsigned char *input, > size_t ilen ) > { > - mbedtls_md4_update( (mbedtls_md4_context *) ctx, input, ilen ); > + return( mbedtls_md4_update_ret( (mbedtls_md4_context *) ctx, input, ilen ) ); > } > > -static void md4_finish_wrap( void *ctx, unsigned char *output ) > +static int md4_finish_wrap( void *ctx, unsigned char *output ) > { > - mbedtls_md4_finish( (mbedtls_md4_context *) ctx, output ); > + return( mbedtls_md4_finish_ret( (mbedtls_md4_context *) ctx, output ) ); > } > > static void *md4_ctx_alloc( void ) > @@ -172,12 +172,12 @@ static void md4_ctx_free( void *ctx ) > static void md4_clone_wrap( void *dst, const void *src ) > { > mbedtls_md4_clone( (mbedtls_md4_context *) dst, > - (const mbedtls_md4_context *) src ); > + (const mbedtls_md4_context *) src ); > } > > -static void md4_process_wrap( void *ctx, const unsigned char *data ) > +static int md4_process_wrap( void *ctx, const unsigned char *data ) > { > - mbedtls_md4_process( (mbedtls_md4_context *) ctx, data ); > + return( mbedtls_internal_md4_process( (mbedtls_md4_context *) ctx, data ) ); > } > > const mbedtls_md_info_t mbedtls_md4_info = { > @@ -188,7 +188,7 @@ const mbedtls_md_info_t mbedtls_md4_info = { > md4_starts_wrap, > md4_update_wrap, > md4_finish_wrap, > - mbedtls_md4, > + mbedtls_md4_ret, > md4_ctx_alloc, > md4_ctx_free, > md4_clone_wrap, > @@ -199,20 +199,20 @@ const mbedtls_md_info_t mbedtls_md4_info = { > > #if defined(MBEDTLS_MD5_C) > > -static void md5_starts_wrap( void *ctx ) > +static int md5_starts_wrap( void *ctx ) > { > - mbedtls_md5_starts( (mbedtls_md5_context *) ctx ); > + return( mbedtls_md5_starts_ret( (mbedtls_md5_context *) ctx ) ); > } > > -static void md5_update_wrap( void *ctx, const unsigned char *input, > +static int md5_update_wrap( void *ctx, const unsigned char *input, > size_t ilen ) > { > - mbedtls_md5_update( (mbedtls_md5_context *) ctx, input, ilen ); > + return( mbedtls_md5_update_ret( (mbedtls_md5_context *) ctx, input, ilen ) ); > } > > -static void md5_finish_wrap( void *ctx, unsigned char *output ) > +static int md5_finish_wrap( void *ctx, unsigned char *output ) > { > - mbedtls_md5_finish( (mbedtls_md5_context *) ctx, output ); > + return( mbedtls_md5_finish_ret( (mbedtls_md5_context *) ctx, output ) ); > } > > static void *md5_ctx_alloc( void ) > @@ -234,12 +234,12 @@ static void md5_ctx_free( void *ctx ) > static void md5_clone_wrap( void *dst, const void *src ) > { > mbedtls_md5_clone( (mbedtls_md5_context *) dst, > - (const mbedtls_md5_context *) src ); > + (const mbedtls_md5_context *) src ); > } > > -static void md5_process_wrap( void *ctx, const unsigned char *data ) > +static int md5_process_wrap( void *ctx, const unsigned char *data ) > { > - mbedtls_md5_process( (mbedtls_md5_context *) ctx, data ); > + return( mbedtls_internal_md5_process( (mbedtls_md5_context *) ctx, data ) ); > } > > const mbedtls_md_info_t mbedtls_md5_info = { > @@ -250,7 +250,7 @@ const mbedtls_md_info_t mbedtls_md5_info = { > md5_starts_wrap, > md5_update_wrap, > md5_finish_wrap, > - mbedtls_md5, > + mbedtls_md5_ret, > md5_ctx_alloc, > md5_ctx_free, > md5_clone_wrap, > @@ -261,20 +261,22 @@ const mbedtls_md_info_t mbedtls_md5_info = { > > #if defined(MBEDTLS_RIPEMD160_C) > > -static void ripemd160_starts_wrap( void *ctx ) > +static int ripemd160_starts_wrap( void *ctx ) > { > - mbedtls_ripemd160_starts( (mbedtls_ripemd160_context *) ctx ); > + return( mbedtls_ripemd160_starts_ret( (mbedtls_ripemd160_context *) ctx ) ); > } > > -static void ripemd160_update_wrap( void *ctx, const unsigned char *input, > +static int ripemd160_update_wrap( void *ctx, const unsigned char *input, > size_t ilen ) > { > - mbedtls_ripemd160_update( (mbedtls_ripemd160_context *) ctx, input, ilen ); > + return( mbedtls_ripemd160_update_ret( (mbedtls_ripemd160_context *) ctx, > + input, ilen ) ); > } > > -static void ripemd160_finish_wrap( void *ctx, unsigned char *output ) > +static int ripemd160_finish_wrap( void *ctx, unsigned char *output ) > { > - mbedtls_ripemd160_finish( (mbedtls_ripemd160_context *) ctx, output ); > + return( mbedtls_ripemd160_finish_ret( (mbedtls_ripemd160_context *) ctx, > + output ) ); > } > > static void *ripemd160_ctx_alloc( void ) > @@ -299,9 +301,10 @@ static void ripemd160_clone_wrap( void *dst, const void *src ) > (const mbedtls_ripemd160_context *) src ); > } > > -static void ripemd160_process_wrap( void *ctx, const unsigned char *data ) > +static int ripemd160_process_wrap( void *ctx, const unsigned char *data ) > { > - mbedtls_ripemd160_process( (mbedtls_ripemd160_context *) ctx, data ); > + return( mbedtls_internal_ripemd160_process( > + (mbedtls_ripemd160_context *) ctx, data ) ); > } > > const mbedtls_md_info_t mbedtls_ripemd160_info = { > @@ -312,7 +315,7 @@ const mbedtls_md_info_t mbedtls_ripemd160_info = { > ripemd160_starts_wrap, > ripemd160_update_wrap, > ripemd160_finish_wrap, > - mbedtls_ripemd160, > + mbedtls_ripemd160_ret, > ripemd160_ctx_alloc, > ripemd160_ctx_free, > ripemd160_clone_wrap, > @@ -323,20 +326,21 @@ const mbedtls_md_info_t mbedtls_ripemd160_info = { > > #if defined(MBEDTLS_SHA1_C) > > -static void sha1_starts_wrap( void *ctx ) > +static int sha1_starts_wrap( void *ctx ) > { > - mbedtls_sha1_starts( (mbedtls_sha1_context *) ctx ); > + return( mbedtls_sha1_starts_ret( (mbedtls_sha1_context *) ctx ) ); > } > > -static void sha1_update_wrap( void *ctx, const unsigned char *input, > +static int sha1_update_wrap( void *ctx, const unsigned char *input, > size_t ilen ) > { > - mbedtls_sha1_update( (mbedtls_sha1_context *) ctx, input, ilen ); > + return( mbedtls_sha1_update_ret( (mbedtls_sha1_context *) ctx, > + input, ilen ) ); > } > > -static void sha1_finish_wrap( void *ctx, unsigned char *output ) > +static int sha1_finish_wrap( void *ctx, unsigned char *output ) > { > - mbedtls_sha1_finish( (mbedtls_sha1_context *) ctx, output ); > + return( mbedtls_sha1_finish_ret( (mbedtls_sha1_context *) ctx, output ) ); > } > > static void *sha1_ctx_alloc( void ) > @@ -361,9 +365,10 @@ static void sha1_ctx_free( void *ctx ) > mbedtls_free( ctx ); > } > > -static void sha1_process_wrap( void *ctx, const unsigned char *data ) > +static int sha1_process_wrap( void *ctx, const unsigned char *data ) > { > - mbedtls_sha1_process( (mbedtls_sha1_context *) ctx, data ); > + return( mbedtls_internal_sha1_process( (mbedtls_sha1_context *) ctx, > + data ) ); > } > > const mbedtls_md_info_t mbedtls_sha1_info = { > @@ -374,7 +379,7 @@ const mbedtls_md_info_t mbedtls_sha1_info = { > sha1_starts_wrap, > sha1_update_wrap, > sha1_finish_wrap, > - mbedtls_sha1, > + mbedtls_sha1_ret, > sha1_ctx_alloc, > sha1_ctx_free, > sha1_clone_wrap, > @@ -388,26 +393,28 @@ const mbedtls_md_info_t mbedtls_sha1_info = { > */ > #if defined(MBEDTLS_SHA256_C) > > -static void sha224_starts_wrap( void *ctx ) > +static int sha224_starts_wrap( void *ctx ) > { > - mbedtls_sha256_starts( (mbedtls_sha256_context *) ctx, 1 ); > + return( mbedtls_sha256_starts_ret( (mbedtls_sha256_context *) ctx, 1 ) ); > } > > -static void sha224_update_wrap( void *ctx, const unsigned char *input, > +static int sha224_update_wrap( void *ctx, const unsigned char *input, > size_t ilen ) > { > - mbedtls_sha256_update( (mbedtls_sha256_context *) ctx, input, ilen ); > + return( mbedtls_sha256_update_ret( (mbedtls_sha256_context *) ctx, > + input, ilen ) ); > } > > -static void sha224_finish_wrap( void *ctx, unsigned char *output ) > +static int sha224_finish_wrap( void *ctx, unsigned char *output ) > { > - mbedtls_sha256_finish( (mbedtls_sha256_context *) ctx, output ); > + return( mbedtls_sha256_finish_ret( (mbedtls_sha256_context *) ctx, > + output ) ); > } > > -static void sha224_wrap( const unsigned char *input, size_t ilen, > - unsigned char *output ) > +static int sha224_wrap( const unsigned char *input, size_t ilen, > + unsigned char *output ) > { > - mbedtls_sha256( input, ilen, output, 1 ); > + return( mbedtls_sha256_ret( input, ilen, output, 1 ) ); > } > > static void *sha224_ctx_alloc( void ) > @@ -432,9 +439,10 @@ static void sha224_clone_wrap( void *dst, const void *src ) > (const mbedtls_sha256_context *) src ); > } > > -static void sha224_process_wrap( void *ctx, const unsigned char *data ) > +static int sha224_process_wrap( void *ctx, const unsigned char *data ) > { > - mbedtls_sha256_process( (mbedtls_sha256_context *) ctx, data ); > + return( mbedtls_internal_sha256_process( (mbedtls_sha256_context *) ctx, > + data ) ); > } > > const mbedtls_md_info_t mbedtls_sha224_info = { > @@ -452,15 +460,15 @@ const mbedtls_md_info_t mbedtls_sha224_info = { > sha224_process_wrap, > }; > > -static void sha256_starts_wrap( void *ctx ) > +static int sha256_starts_wrap( void *ctx ) > { > - mbedtls_sha256_starts( (mbedtls_sha256_context *) ctx, 0 ); > + return( mbedtls_sha256_starts_ret( (mbedtls_sha256_context *) ctx, 0 ) ); > } > > -static void sha256_wrap( const unsigned char *input, size_t ilen, > - unsigned char *output ) > +static int sha256_wrap( const unsigned char *input, size_t ilen, > + unsigned char *output ) > { > - mbedtls_sha256( input, ilen, output, 0 ); > + return( mbedtls_sha256_ret( input, ilen, output, 0 ) ); > } > > const mbedtls_md_info_t mbedtls_sha256_info = { > @@ -482,26 +490,28 @@ const mbedtls_md_info_t mbedtls_sha256_info = { > > #if defined(MBEDTLS_SHA512_C) > > -static void sha384_starts_wrap( void *ctx ) > +static int sha384_starts_wrap( void *ctx ) > { > - mbedtls_sha512_starts( (mbedtls_sha512_context *) ctx, 1 ); > + return( mbedtls_sha512_starts_ret( (mbedtls_sha512_context *) ctx, 1 ) ); > } > > -static void sha384_update_wrap( void *ctx, const unsigned char *input, > - size_t ilen ) > +static int sha384_update_wrap( void *ctx, const unsigned char *input, > + size_t ilen ) > { > - mbedtls_sha512_update( (mbedtls_sha512_context *) ctx, input, ilen ); > + return( mbedtls_sha512_update_ret( (mbedtls_sha512_context *) ctx, > + input, ilen ) ); > } > > -static void sha384_finish_wrap( void *ctx, unsigned char *output ) > +static int sha384_finish_wrap( void *ctx, unsigned char *output ) > { > - mbedtls_sha512_finish( (mbedtls_sha512_context *) ctx, output ); > + return( mbedtls_sha512_finish_ret( (mbedtls_sha512_context *) ctx, > + output ) ); > } > > -static void sha384_wrap( const unsigned char *input, size_t ilen, > - unsigned char *output ) > +static int sha384_wrap( const unsigned char *input, size_t ilen, > + unsigned char *output ) > { > - mbedtls_sha512( input, ilen, output, 1 ); > + return( mbedtls_sha512_ret( input, ilen, output, 1 ) ); > } > > static void *sha384_ctx_alloc( void ) > @@ -526,9 +536,10 @@ static void sha384_clone_wrap( void *dst, const void *src ) > (const mbedtls_sha512_context *) src ); > } > > -static void sha384_process_wrap( void *ctx, const unsigned char *data ) > +static int sha384_process_wrap( void *ctx, const unsigned char *data ) > { > - mbedtls_sha512_process( (mbedtls_sha512_context *) ctx, data ); > + return( mbedtls_internal_sha512_process( (mbedtls_sha512_context *) ctx, > + data ) ); > } > > const mbedtls_md_info_t mbedtls_sha384_info = { > @@ -546,15 +557,15 @@ const mbedtls_md_info_t mbedtls_sha384_info = { > sha384_process_wrap, > }; > > -static void sha512_starts_wrap( void *ctx ) > +static int sha512_starts_wrap( void *ctx ) > { > - mbedtls_sha512_starts( (mbedtls_sha512_context *) ctx, 0 ); > + return( mbedtls_sha512_starts_ret( (mbedtls_sha512_context *) ctx, 0 ) ); > } > > -static void sha512_wrap( const unsigned char *input, size_t ilen, > - unsigned char *output ) > +static int sha512_wrap( const unsigned char *input, size_t ilen, > + unsigned char *output ) > { > - mbedtls_sha512( input, ilen, output, 0 ); > + return( mbedtls_sha512_ret( input, ilen, output, 0 ) ); > } > > const mbedtls_md_info_t mbedtls_sha512_info = { > diff --git a/dll/3rdparty/mbedtls/memory_buffer_alloc.c b/dll/3rdparty/mbedtls/memory_buffer_alloc.c > index cf0a2c69c5..73504c05e1 100644 > --- a/dll/3rdparty/mbedtls/memory_buffer_alloc.c > +++ b/dll/3rdparty/mbedtls/memory_buffer_alloc.c > @@ -184,9 +184,9 @@ static int verify_header( memory_header *hdr ) > > static int verify_chain() > { > - memory_header *prv = heap.first, *cur = heap.first->next; > + memory_header *prv = heap.first, *cur; > > - if( verify_header( heap.first ) != 0 ) > + if( prv == NULL || verify_header( prv ) != 0 ) > { > #if defined(MBEDTLS_MEMORY_DEBUG) > mbedtls_fprintf( stderr, "FATAL: verification of first header " > @@ -204,6 +204,8 @@ static int verify_chain() > return( 1 ); > } > > + cur = heap.first->next; > + > while( cur != NULL ) > { > if( verify_header( cur ) != 0 ) > @@ -247,7 +249,9 @@ static void *buffer_alloc_calloc( size_t n, size_t size ) > > original_len = len = n * size; > > - if( n != 0 && len / n != size ) > + if( n == 0 || size == 0 || len / n != size ) > + return( NULL ); > + else if( len > (size_t)-MBEDTLS_MEMORY_ALIGN_MULTIPLE ) > return( NULL ); > > if( len % MBEDTLS_MEMORY_ALIGN_MULTIPLE ) > @@ -388,7 +392,7 @@ static void buffer_alloc_free( void *ptr ) > if( ptr == NULL || heap.buf == NULL || heap.first == NULL ) > return; > > - if( p < heap.buf || p > heap.buf + heap.len ) > + if( p < heap.buf || p >= heap.buf + heap.len ) > { > #if defined(MBEDTLS_MEMORY_DEBUG) > mbedtls_fprintf( stderr, "FATAL: mbedtls_free() outside of managed " > @@ -520,7 +524,9 @@ void mbedtls_memory_buffer_alloc_status() > heap.alloc_count, heap.free_count ); > > if( heap.first->next == NULL ) > + { > mbedtls_fprintf( stderr, "All memory de-allocated in stack buffer\n" ); > + } > else > { > mbedtls_fprintf( stderr, "Memory currently allocated:\n" ); > @@ -572,8 +578,7 @@ static void buffer_alloc_free_mutexed( void *ptr ) > > void mbedtls_memory_buffer_alloc_init( unsigned char *buf, size_t len ) > { > - memset( &heap, 0, sizeof(buffer_alloc_ctx) ); > - memset( buf, 0, len ); > + memset( &heap, 0, sizeof( buffer_alloc_ctx ) ); > > #if defined(MBEDTLS_THREADING_C) > mbedtls_mutex_init( &heap.mutex ); > @@ -583,20 +588,24 @@ void mbedtls_memory_buffer_alloc_init( unsigned char *buf, size_t len ) > mbedtls_platform_set_calloc_free( buffer_alloc_calloc, buffer_alloc_free ); > #endif > > - if( (size_t) buf % MBEDTLS_MEMORY_ALIGN_MULTIPLE ) > + if( len < sizeof( memory_header ) + MBEDTLS_MEMORY_ALIGN_MULTIPLE ) > + return; > + else if( (size_t)buf % MBEDTLS_MEMORY_ALIGN_MULTIPLE ) > { > /* Adjust len first since buf is used in the computation */ > len -= MBEDTLS_MEMORY_ALIGN_MULTIPLE > - - (size_t) buf % MBEDTLS_MEMORY_ALIGN_MULTIPLE; > + - (size_t)buf % MBEDTLS_MEMORY_ALIGN_MULTIPLE; > buf += MBEDTLS_MEMORY_ALIGN_MULTIPLE > - - (size_t) buf % MBEDTLS_MEMORY_ALIGN_MULTIPLE; > + - (size_t)buf % MBEDTLS_MEMORY_ALIGN_MULTIPLE; > } > > + memset( buf, 0, len ); > + > heap.buf = buf; > heap.len = len; > > - heap.first = (memory_header *) buf; > - heap.first->size = len - sizeof(memory_header); > + heap.first = (memory_header *)buf; > + heap.first->size = len - sizeof( memory_header ); > heap.first->magic1 = MAGIC1; > heap.first->magic2 = MAGIC2; > heap.first_free = heap.first; > diff --git a/dll/3rdparty/mbedtls/net_sockets.c b/dll/3rdparty/mbedtls/net_sockets.c > index 6b421999af..99348dc04f 100644 > --- a/dll/3rdparty/mbedtls/net_sockets.c > +++ b/dll/3rdparty/mbedtls/net_sockets.c > @@ -47,11 +47,12 @@ > #if (defined(_WIN32) || defined(_WIN32_WCE)) && !defined(EFIX64) && \ > !defined(EFI32) > > -#ifdef _WIN32_WINNT > +#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0501) > #undef _WIN32_WINNT > -#endif > /* Enables getaddrinfo() & Co */ > #define _WIN32_WINNT 0x0501 > +#endif > + > #include <ws2tcpip.h> > > #include <winsock2.h> > @@ -65,8 +66,8 @@ > #endif > #endif /* _MSC_VER */ > > -#define read(fd,buf,len) recv(fd,(char*)buf,(int) len,0) > -#define write(fd,buf,len) send(fd,(char*)buf,(int) len,0) > +#define read(fd,buf,len) recv( fd, (char*)( buf ), (int)( len ), 0 ) > +#define write(fd,buf,len) send( fd, (char*)( buf ), (int)( len ), 0 ) > #define close(fd) closesocket(fd) > > static int wsa_init_done = 0; > @@ -87,7 +88,7 @@ static int wsa_init_done = 0; > #endif /* ( _WIN32 || _WIN32_WCE ) && !EFIX64 && !EFI32 */ > > /* Some MS functions want int and MSVC warns if we pass size_t, > - * but the standard fucntions use socklen_t, so cast only for MSVC */ > + * but the standard functions use socklen_t, so cast only for MSVC */ > #if defined(_MSC_VER) > #define MSVC_INT_CAST (int) > #else > @@ -272,13 +273,18 @@ static int net_would_block( const mbedtls_net_context *ctx ) > */ > static int net_would_block( const mbedtls_net_context *ctx ) > { > + int err = errno; > + > /* > * Never return 'WOULD BLOCK' on a non-blocking socket > */ > if( ( fcntl( ctx->fd, F_GETFL ) & O_NONBLOCK ) != O_NONBLOCK ) > + { > + errno = err; > return( 0 ); > + } > > - switch( errno ) > + switch( errno = err ) > { > #if defined EAGAIN > case EAGAIN: > diff --git a/dll/3rdparty/mbedtls/oid.c b/dll/3rdparty/mbedtls/oid.c > index e6fbb30dcb..962bd189a2 100644 > --- a/dll/3rdparty/mbedtls/oid.c > +++ b/dll/3rdparty/mbedtls/oid.c > @@ -627,6 +627,51 @@ static const oid_md_alg_t oid_md_alg[] = > FN_OID_TYPED_FROM_ASN1(oid_md_alg_t, md_alg, oid_md_alg) > FN_OID_GET_ATTR1(mbedtls_oid_get_md_alg, oid_md_alg_t, md_alg, mbedtls_md_type_t, md_alg) > FN_OID_GET_OID_BY_ATTR1(mbedtls_oid_get_oid_by_md, oid_md_alg_t, oid_md_alg, mbedtls_md_type_t, md_alg) > + > +/* > + * For HMAC digestAlgorithm > + */ > +typedef struct { > + mbedtls_oid_descriptor_t descriptor; > + mbedtls_md_type_t md_hmac; > +} oid_md_hmac_t; > + > +static const oid_md_hmac_t oid_md_hmac[] = > +{ > +#if defined(MBEDTLS_SHA1_C) > + { > + { ADD_LEN( MBEDTLS_OID_HMAC_SHA1 ), "hmacSHA1", "HMAC-SHA-1" }, > + MBEDTLS_MD_SHA1, > + }, > +#endif /* MBEDTLS_SHA1_C */ > +#if defined(MBEDTLS_SHA256_C) > + { > + { ADD_LEN( MBEDTLS_OID_HMAC_SHA224 ), "hmacSHA224", "HMAC-SHA-224" }, > + MBEDTLS_MD_SHA224, > + }, > + { > + { ADD_LEN( MBEDTLS_OID_HMAC_SHA256 ), "hmacSHA256", "HMAC-SHA-256" }, > + MBEDTLS_MD_SHA256, > + }, > +#endif /* MBEDTLS_SHA256_C */ > +#if defined(MBEDTLS_SHA512_C) > + { > + { ADD_LEN( MBEDTLS_OID_HMAC_SHA384 ), "hmacSHA384", "HMAC-SHA-384" }, > + MBEDTLS_MD_SHA384, > + }, > + { > + { ADD_LEN( MBEDTLS_OID_HMAC_SHA512 ), "hmacSHA512", "HMAC-SHA-512" }, > + MBEDTLS_MD_SHA512, > + }, > +#endif /* MBEDTLS_SHA512_C */ > + { > + { NULL, 0, NULL, NULL }, > + MBEDTLS_MD_NONE, > + }, > +}; > + > +FN_OID_TYPED_FROM_ASN1(oid_md_hmac_t, md_hmac, oid_md_hmac) > +FN_OID_GET_ATTR1(mbedtls_oid_get_md_hmac, oid_md_hmac_t, md_hmac, mbedtls_md_type_t, md_hmac) > #endif /* MBEDTLS_MD_C */ > > #if defined(MBEDTLS_PKCS12_C) > diff --git a/dll/3rdparty/mbedtls/pem.c b/dll/3rdparty/mbedtls/pem.c > index 2377685228..401c906eec 100644 > --- a/dll/3rdparty/mbedtls/pem.c > +++ b/dll/3rdparty/mbedtls/pem.c > @@ -84,31 +84,33 @@ static int pem_get_iv( const unsigned char *s, unsigned char *iv, > return( 0 ); > } > > -static void pem_pbkdf1( unsigned char *key, size_t keylen, > - unsigned char *iv, > - const unsigned char *pwd, size_t pwdlen ) > +static int pem_pbkdf1( unsigned char *key, size_t keylen, > + unsigned char *iv, > + const unsigned char *pwd, size_t pwdlen ) > { > mbedtls_md5_context md5_ctx; > unsigned char md5sum[16]; > size_t use_len; > + int ret; > > mbedtls_md5_init( &md5_ctx ); > > /* > * key[ 0..15] = MD5(pwd || IV) > */ > - mbedtls_md5_starts( &md5_ctx ); > - mbedtls_md5_update( &md5_ctx, pwd, pwdlen ); > - mbedtls_md5_update( &md5_ctx, iv, 8 ); > - mbedtls_md5_finish( &md5_ctx, md5sum ); > + if( ( ret = mbedtls_md5_starts_ret( &md5_ctx ) ) != 0 ) > + goto exit; > + if( ( ret = mbedtls_md5_update_ret( &md5_ctx, pwd, pwdlen ) ) != 0 ) > + goto exit; > + if( ( ret = mbedtls_md5_update_ret( &md5_ctx, iv, 8 ) ) != 0 ) > + goto exit; > + if( ( ret = mbedtls_md5_finish_ret( &md5_ctx, md5sum ) ) != 0 ) > + goto exit; > > if( keylen <= 16 ) > { > memcpy( key, md5sum, keylen ); > - > - mbedtls_md5_free( &md5_ctx ); > - mbedtls_zeroize( md5sum, 16 ); > - return; > + goto exit; > } > > memcpy( key, md5sum, 16 ); > @@ -116,11 +118,16 @@ static void pem_pbkdf1( unsigned char *key, size_t keylen, > /* > * key[16..23] = MD5(key[ 0..15] || pwd || IV]) > */ > - mbedtls_md5_starts( &md5_ctx ); > - mbedtls_md5_update( &md5_ctx, md5sum, 16 ); > - mbedtls_md5_update( &md5_ctx, pwd, pwdlen ); > - mbedtls_md5_update( &md5_ctx, iv, 8 ); > - mbedtls_md5_finish( &md5_ctx, md5sum ); > + if( ( ret = mbedtls_md5_starts_ret( &md5_ctx ) ) != 0 ) > + goto exit; > + if( ( ret = mbedtls_md5_update_ret( &md5_ctx, md5sum, 16 ) ) != 0 ) > + goto exit; > + if( ( ret = mbedtls_md5_update_ret( &md5_ctx, pwd, pwdlen ) ) != 0 ) > + goto exit; > + if( ( ret = mbedtls_md5_update_ret( &md5_ctx, iv, 8 ) ) != 0 ) > + goto exit; > + if( ( ret = mbedtls_md5_finish_ret( &md5_ctx, md5sum ) ) != 0 ) > + goto exit; > > use_len = 16; > if( keylen < 32 ) > @@ -128,53 +135,68 @@ static void pem_pbkdf1( unsigned char *key, size_t keylen, > > memcpy( key + 16, md5sum, use_len ); > > +exit: > mbedtls_md5_free( &md5_ctx ); > mbedtls_zeroize( md5sum, 16 ); > + > + return( ret ); > } > > #if defined(MBEDTLS_DES_C) > /* > * Decrypt with DES-CBC, using PBKDF1 for key derivation > */ > -static void pem_des_decrypt( unsigned char des_iv[8], > - unsigned char *buf, size_t buflen, > - const unsigned char *pwd, size_t pwdlen ) > +static int pem_des_decrypt( unsigned char des_iv[8], > + unsigned char *buf, size_t buflen, > + const unsigned char *pwd, size_t pwdlen ) > { > mbedtls_des_context des_ctx; > unsigned char des_key[8]; > + int ret; > > mbedtls_des_init( &des_ctx ); > > - pem_pbkdf1( des_key, 8, des_iv, pwd, pwdlen ); > + if( ( ret = pem_pbkdf1( des_key, 8, des_iv, pwd, pwdlen ) ) != 0 ) > + goto exit; > > - mbedtls_des_setkey_dec( &des_ctx, des_key ); > - mbedtls_des_crypt_cbc( &des_ctx, MBEDTLS_DES_DECRYPT, buflen, > + if( ( ret = mbedtls_des_setkey_dec( &des_ctx, des_key ) ) != 0 ) > + goto exit; > + ret = mbedtls_des_crypt_cbc( &des_ctx, MBEDTLS_DES_DECRYPT, buflen, > des_iv, buf, buf ); > > +exit: > mbedtls_des_free( &des_ctx ); > mbedtls_zeroize( des_key, 8 ); > + > + return( ret ); > } > > /* > * Decrypt with 3DES-CBC, using PBKDF1 for key derivation > */ > -static void pem_des3_decrypt( unsigned char des3_iv[8], > - unsigned char *buf, size_t buflen, > - const unsigned char *pwd, size_t pwdlen ) > +static int pem_des3_decrypt( unsigned char des3_iv[8], > + unsigned char *buf, size_t buflen, > + const unsigned char *pwd, size_t pwdlen ) > { > mbedtls_des3_context des3_ctx; > unsigned char des3_key[24]; > + int ret; > > mbedtls_des3_init( &des3_ctx ); > > - pem_pbkdf1( des3_key, 24, des3_iv, pwd, pwdlen ); > + if( ( ret = pem_pbkdf1( des3_key, 24, des3_iv, pwd, pwdlen ) ) != 0 ) > + goto exit; > > - mbedtls_des3_set3key_dec( &des3_ctx, des3_key ); > - mbedtls_des3_crypt_cbc( &des3_ctx, MBEDTLS_DES_DECRYPT, buflen, > + if( ( ret = mbedtls_des3_set3key_dec( &des3_ctx, des3_key ) ) != 0 ) > + goto exit; > + ret = mbedtls_des3_crypt_cbc( &des3_ctx, MBEDTLS_DES_DECRYPT, buflen, > des3_iv, buf, buf ); > > +exit: > mbedtls_des3_free( &des3_ctx ); > mbedtls_zeroize( des3_key, 24 ); > + > + return( ret ); > } > #endif /* MBEDTLS_DES_C */ > > @@ -182,23 +204,29 @@ static void pem_des3_decrypt( unsigned char des3_iv[8], > /* > * Decrypt with AES-XXX-CBC, using PBKDF1 for key derivation > */ > -static void pem_aes_decrypt( unsigned char aes_iv[16], unsigned int keylen, > - unsigned char *buf, size_t buflen, > - const unsigned char *pwd, size_t pwdlen ) > +static int pem_aes_decrypt( unsigned char aes_iv[16], unsigned int keylen, > + unsigned char *buf, size_t buflen, > + const unsigned char *pwd, size_t pwdlen ) > { > mbedtls_aes_context aes_ctx; > unsigned char aes_key[32]; > + int ret; > > mbedtls_aes_init( &aes_ctx ); > > - pem_pbkdf1( aes_key, keylen, aes_iv, pwd, pwdlen ); > + if( ( ret = pem_pbkdf1( aes_key, keylen, aes_iv, pwd, pwdlen ) ) != 0 ) > + goto exit; > > - mbedtls_aes_setkey_dec( &aes_ctx, aes_key, keylen * 8 ); > - mbedtls_aes_crypt_cbc( &aes_ctx, MBEDTLS_AES_DECRYPT, buflen, > + if( ( ret = mbedtls_aes_setkey_dec( &aes_ctx, aes_key, keylen * 8 ) ) != 0 ) > + goto exit; > + ret = mbedtls_aes_crypt_cbc( &aes_ctx, MBEDTLS_AES_DECRYPT, buflen, > aes_iv, buf, buf ); > > +exit: > mbedtls_aes_free( &aes_ctx ); > mbedtls_zeroize( aes_key, keylen ); > + > + return( ret ); > } > #endif /* MBEDTLS_AES_C */ > > @@ -333,6 +361,7 @@ int mbedtls_pem_read_buffer( mbedtls_pem_context *ctx, const char *header, const > > if( ( ret = mbedtls_base64_decode( buf, len, &len, s1, s2 - s1 ) ) != 0 ) > { > + mbedtls_zeroize( buf, len ); > mbedtls_free( buf ); > return( MBEDTLS_ERR_PEM_INVALID_DATA + ret ); > } > @@ -343,26 +372,35 @@ int mbedtls_pem_read_buffer( mbedtls_pem_context *ctx, const char *header, const > ( defined(MBEDTLS_DES_C) || defined(MBEDTLS_AES_C) ) > if( pwd == NULL ) > { > + mbedtls_zeroize( buf, len ); > mbedtls_free( buf ); > return( MBEDTLS_ERR_PEM_PASSWORD_REQUIRED ); > } > > + ret = 0; > + > #if defined(MBEDTLS_DES_C) > if( enc_alg == MBEDTLS_CIPHER_DES_EDE3_CBC ) > - pem_des3_decrypt( pem_iv, buf, len, pwd, pwdlen ); > + ret = pem_des3_decrypt( pem_iv, buf, len, pwd, pwdlen ); > else if( enc_alg == MBEDTLS_CIPHER_DES_CBC ) > - pem_des_decrypt( pem_iv, buf, len, pwd, pwdlen ); > + ret = pem_des_decrypt( pem_iv, buf, len, pwd, pwdlen ); > #endif /* MBEDTLS_DES_C */ > > #if defined(MBEDTLS_AES_C) > if( enc_alg == MBEDTLS_CIPHER_AES_128_CBC ) > - pem_aes_decrypt( pem_iv, 16, buf, len, pwd, pwdlen ); > + ret = pem_aes_decrypt( pem_iv, 16, buf, len, pwd, pwdlen ); > else if( enc_alg == MBEDTLS_CIPHER_AES_192_CBC ) > - pem_aes_decrypt( pem_iv, 24, buf, len, pwd, pwdlen ); > + ret = pem_aes_decrypt( pem_iv, 24, buf, len, pwd, pwdlen ); > else if( enc_alg == MBEDTLS_CIPHER_AES_256_CBC ) > - pem_aes_decrypt( pem_iv, 32, buf, len, pwd, pwdlen ); > + ret = pem_aes_decrypt( pem_iv, 32, buf, len, pwd, pwdlen ); > #endif /* MBEDTLS_AES_C */ > > + if( ret != 0 ) > + { > + mbedtls_free( buf ); > + return( ret ); > + } > + > /* > * The result will be ASN.1 starting with a SEQUENCE tag, with 1 to 3 > * length bytes (allow 4 to be sure) in all known use cases. > @@ -371,10 +409,12 @@ int mbedtls_pem_read_buffer( mbedtls_pem_context *ctx, const char *header, const > */ > if( len <= 2 || buf[0] != 0x30 || buf[1] > 0x83 ) > { > + mbedtls_zeroize( buf, len ); > mbedtls_free( buf ); > return( MBEDTLS_ERR_PEM_PASSWORD_MISMATCH ); > } > #else > + mbedtls_zeroize( buf, len ); > mbedtls_free( buf ); > return( MBEDTLS_ERR_PEM_FEATURE_UNAVAILABLE ); > #endif /* MBEDTLS_MD5_C && MBEDTLS_CIPHER_MODE_CBC && > @@ -389,6 +429,8 @@ int mbedtls_pem_read_buffer( mbedtls_pem_context *ctx, const char *header, const > > void mbedtls_pem_free( mbedtls_pem_context *ctx ) > { > + if( ctx->buf != NULL ) > + mbedtls_zeroize( ctx->buf, ctx->buflen ); > mbedtls_free( ctx->buf ); > mbedtls_free( ctx->info ); > > @@ -402,7 +444,7 @@ int mbedtls_pem_write_buffer( const char *header, const char *footer, > unsigned char *buf, size_t buf_len, size_t *olen ) > { > int ret; > - unsigned char *encode_buf, *c, *p = buf; > + unsigned char *encode_buf = NULL, *c, *p = buf; > size_t len = 0, use_len, add_len = 0; > > mbedtls_base64_encode( NULL, 0, &use_len, der_data, der_len ); > @@ -414,7 +456,8 @@ int mbedtls_pem_write_buffer( const char *header, const char *footer, > return( MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL ); > } > > - if( ( encode_buf = mbedtls_calloc( 1, use_len ) ) == NULL ) > + if( use_len != 0 && > + ( ( encode_buf = mbedtls_calloc( 1, use_len ) ) == NULL ) ) > return( MBEDTLS_ERR_PEM_ALLOC_FAILED ); > > if( ( ret = mbedtls_base64_encode( encode_buf, use_len, &use_len, der_data, > diff --git a/dll/3rdparty/mbedtls/pk.c b/dll/3rdparty/mbedtls/pk.c > index 1b2f829e3f..a369df2a9e 100644 > --- a/dll/3rdparty/mbedtls/pk.c > +++ b/dll/3rdparty/mbedtls/pk.c > @@ -31,8 +31,6 @@ > #include "mbedtls/pk.h" > #include "mbedtls/pk_internal.h" > > -#include "mbedtls/bignum.h" > - > #if defined(MBEDTLS_RSA_C) > #include "mbedtls/rsa.h" > #endif > @@ -44,6 +42,7 @@ > #endif > > #include <limits.h> > +#include <stdint.h> > > /* Implementation that should never be optimized out by the compiler */ > static void mbedtls_zeroize( void *v, size_t n ) { > @@ -215,10 +214,10 @@ int mbedtls_pk_verify_ext( mbedtls_pk_type_t type, const void *options, > int ret; > const mbedtls_pk_rsassa_pss_options *pss_opts; > > -#if defined(MBEDTLS_HAVE_INT64) > +#if SIZE_MAX > UINT_MAX > if( md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len ) > return( MBEDTLS_ERR_PK_BAD_INPUT_DATA ); > -#endif /* MBEDTLS_HAVE_INT64 */ > +#endif /* SIZE_MAX > UINT_MAX */ > > if( options == NULL ) > return( MBEDTLS_ERR_PK_BAD_INPUT_DATA ); > diff --git a/dll/3rdparty/mbedtls/pk_wrap.c b/dll/3rdparty/mbedtls/pk_wrap.c > index e7443b23db..2c24799e38 100644 > --- a/dll/3rdparty/mbedtls/pk_wrap.c > +++ b/dll/3rdparty/mbedtls/pk_wrap.c > @@ -32,7 +32,6 @@ > > /* Even if RSA not activated, for the sake of RSA-alt */ > #include "mbedtls/rsa.h" > -#include "mbedtls/bignum.h" > > #include <string.h> > > @@ -53,6 +52,7 @@ > #endif > > #include <limits.h> > +#include <stdint.h> > > #if defined(MBEDTLS_PK_RSA_ALT_SUPPORT) > /* Implementation that should never be optimized out by the compiler */ > @@ -70,7 +70,8 @@ static int rsa_can_do( mbedtls_pk_type_t type ) > > static size_t rsa_get_bitlen( const void *ctx ) > { > - return( 8 * ((const mbedtls_rsa_context *) ctx)->len ); > + const mbedtls_rsa_context * rsa = (const mbedtls_rsa_context *) ctx; > + return( 8 * mbedtls_rsa_get_len( rsa ) ); > } > > static int rsa_verify_wrap( void *ctx, mbedtls_md_type_t md_alg, > @@ -78,21 +79,28 @@ static int rsa_verify_wrap( void *ctx, mbedtls_md_type_t md_alg, > const unsigned char *sig, size_t sig_len ) > { > int ret; > + mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx; > + size_t rsa_len = mbedtls_rsa_get_len( rsa ); > > -#if defined(MBEDTLS_HAVE_INT64) > +#if SIZE_MAX > UINT_MAX > if( md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len ) > return( MBEDTLS_ERR_PK_BAD_INPUT_DATA ); > -#endif /* MBEDTLS_HAVE_INT64 */ > +#endif /* SIZE_MAX > UINT_MAX */ > > - if( sig_len < ((mbedtls_rsa_context *) ctx)->len ) > + if( sig_len < rsa_len ) > return( MBEDTLS_ERR_RSA_VERIFY_FAILED ); > > - if( ( ret = mbedtls_rsa_pkcs1_verify( (mbedtls_rsa_context *) ctx, NULL, NULL, > + if( ( ret = mbedtls_rsa_pkcs1_verify( rsa, NULL, NULL, > MBEDTLS_RSA_PUBLIC, md_alg, > (unsigned int) hash_len, hash, sig ) ) != 0 ) > return( ret ); > > - if( sig_len > ((mbedtls_rsa_context *) ctx)->len ) > + /* The buffer contains a valid signature followed by extra data. > + * We have a special error code for that so that so that callers can > + * use mbedtls_pk_verify() to check "Does the buffer start with a > + * valid signature?" and not just "Does the buffer contain a valid > + * signature?". */ > + if( sig_len > rsa_len ) > return( MBEDTLS_ERR_PK_SIG_LEN_MISMATCH ); > > return( 0 ); > @@ -103,14 +111,16 @@ static int rsa_sign_wrap( void *ctx, mbedtls_md_type_t md_alg, > unsigned char *sig, size_t *sig_len, > int (*f_rng)(void *, unsigned char *, size_t), void *p_rng ) > { > -#if defined(MBEDTLS_HAVE_INT64) > + mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx; > + > +#if SIZE_MAX > UINT_MAX > if( md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len ) > return( MBEDTLS_ERR_PK_BAD_INPUT_DATA ); > -#endif /* MBEDTLS_HAVE_INT64 */ > +#endif /* SIZE_MAX > UINT_MAX */ > > - *sig_len = ((mbedtls_rsa_context *) ctx)->len; > + *sig_len = mbedtls_rsa_get_len( rsa ); > > - return( mbedtls_rsa_pkcs1_sign( (mbedtls_rsa_context *) ctx, f_rng, p_rng, MBEDTLS_RSA_PRIVATE, > + return( mbedtls_rsa_pkcs1_sign( rsa, f_rng, p_rng, MBEDTLS_RSA_PRIVATE, > md_alg, (unsigned int) hash_len, hash, sig ) ); > } > > @@ -119,10 +129,12 @@ static int rsa_decrypt_wrap( void *ctx, > unsigned char *output, size_t *olen, size_t osize, > int (*f_rng)(void *, unsigned char *, size_t), void *p_rng ) > { > - if( ilen != ((mbedtls_rsa_context *) ctx)->len ) > + mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx; > + > + if( ilen != mbedtls_rsa_get_len( rsa ) ) > return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA ); > > - return( mbedtls_rsa_pkcs1_decrypt( (mbedtls_rsa_context *) ctx, f_rng, p_rng, > + return( mbedtls_rsa_pkcs1_decrypt( rsa, f_rng, p_rng, > MBEDTLS_RSA_PRIVATE, olen, input, output, osize ) ); > } > > @@ -131,13 +143,14 @@ static int rsa_encrypt_wrap( void *ctx, > unsigned char *output, size_t *olen, size_t osize, > int (*f_rng)(void *, unsigned char *, size_t), void *p_rng ) > { > - *olen = ((mbedtls_rsa_context *) ctx)->len; > + mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx; > + *olen = mbedtls_rsa_get_len( rsa ); > > if( *olen > osize ) > return( MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE ); > > - return( mbedtls_rsa_pkcs1_encrypt( (mbedtls_rsa_context *) ctx, > - f_rng, p_rng, MBEDTLS_RSA_PUBLIC, ilen, input, output ) ); > + return( mbedtls_rsa_pkcs1_encrypt( rsa, f_rng, p_rng, MBEDTLS_RSA_PUBLIC, > + ilen, input, output ) ); > } > > static int rsa_check_pair_wrap( const void *pub, const void *prv ) > @@ -417,10 +430,10 @@ static int rsa_alt_sign_wrap( void *ctx, mbedtls_md_type_t md_alg, > { > mbedtls_rsa_alt_context *rsa_alt = (mbedtls_rsa_alt_context *) ctx; > > -#if defined(MBEDTLS_HAVE_INT64) > +#if SIZE_MAX > UINT_MAX > if( UINT_MAX < hash_len ) > return( MBEDTLS_ERR_PK_BAD_INPUT_DATA ); > -#endif /* MBEDTLS_HAVE_INT64 */ > +#endif /* SIZE_MAX > UINT_MAX */ > > *sig_len = rsa_alt->key_len_func( rsa_alt->key ); > > diff --git a/dll/3rdparty/mbedtls/pkcs5.c b/dll/3rdparty/mbedtls/pkcs5.c > index 96f7a04064..e62d663d25 100644 > --- a/dll/3rdparty/mbedtls/pkcs5.c > +++ b/dll/3rdparty/mbedtls/pkcs5.c > @@ -40,9 +40,12 @@ > #if defined(MBEDTLS_PKCS5_C) > > #include "mbedtls/pkcs5.h" > + > +#if defined(MBEDTLS_ASN1_PARSE_C) > #include "mbedtls/asn1.h" > #include "mbedtls/cipher.h" > #include "mbedtls/oid.h" > +#endif /* MBEDTLS_ASN1_PARSE_C */ > > #include <string.h> > > @@ -53,6 +56,22 @@ > #define mbedtls_printf printf > #endif > > +#if !defined(MBEDTLS_ASN1_PARSE_C) > +int mbedtls_pkcs5_pbes2( const mbedtls_asn1_buf *pbe_params, int mode, > + const unsigned char *pwd, size_t pwdlen, > + const unsigned char *data, size_t datalen, > + unsigned char *output ) > +{ > + ((void) pbe_params); > + ((void) mode); > + ((void) pwd); > + ((void) pwdlen); > + ((void) data); > + ((void) datalen); > + ((void) output); > + return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE ); > +} > +#else > static int pkcs5_parse_pbkdf2_params( const mbedtls_asn1_buf *params, > mbedtls_asn1_buf *salt, int *iterations, > int *keylen, mbedtls_md_type_t *md_type ) > @@ -98,11 +117,9 @@ static int pkcs5_parse_pbkdf2_params( const mbedtls_asn1_buf *params, > if( ( ret = mbedtls_asn1_get_alg_null( &p, end, &prf_alg_oid ) ) != 0 ) > return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret ); > > - if( MBEDTLS_OID_CMP( MBEDTLS_OID_HMAC_SHA1, &prf_alg_oid ) != 0 ) > + if( mbedtls_oid_get_md_hmac( &prf_alg_oid, md_type ) != 0 ) > return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE ); > > - *md_type = MBEDTLS_MD_SHA1; > - > if( p != end ) > return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + > MBEDTLS_ERR_ASN1_LENGTH_MISMATCH ); > @@ -215,6 +232,7 @@ exit: > > return( ret ); > } > +#endif /* MBEDTLS_ASN1_PARSE_C */ > > int mbedtls_pkcs5_pbkdf2_hmac( mbedtls_md_context_t *ctx, const unsigned char *password, > size_t plen, const unsigned char *salt, size_t slen, > @@ -233,8 +251,10 @@ int mbedtls_pkcs5_pbkdf2_hmac( mbedtls_md_context_t *ctx, const unsigned char *p > memset( counter, 0, 4 ); > counter[3] = 1; > > +#if UINT_MAX > 0xFFFFFFFF > if( iteration_count > 0xFFFFFFFF ) > return( MBEDTLS_ERR_PKCS5_BAD_INPUT_DATA ); > +#endif > > while( key_length ) > { > diff --git a/dll/3rdparty/mbedtls/pkparse.c b/dll/3rdparty/mbedtls/pkparse.c > index 569ebf7953..c8da059163 100644 > --- a/dll/3rdparty/mbedtls/pkparse.c > +++ b/dll/3rdparty/mbedtls/pkparse.c > @@ -62,12 +62,15 @@ > #define mbedtls_free free > #endif > > -#if defined(MBEDTLS_FS_IO) > +#if defined(MBEDTLS_FS_IO) || \ > + defined(MBEDTLS_PKCS12_C) || defined(MBEDTLS_PKCS5_C) > /* Implementation that should never be optimized out by the compiler */ > static void mbedtls_zeroize( void *v, size_t n ) { > volatile unsigned char *p = v; while( n-- ) *p++ = 0; > } > +#endif > > +#if defined(MBEDTLS_FS_IO) > /* > * Load all data from a file into a given buffer. > * > @@ -103,7 +106,10 @@ int mbedtls_pk_load_file( const char *path, unsigned char **buf, size_t *n ) > if( fread( *buf, 1, *n, f ) != *n ) > { > fclose( f ); > + > + mbedtls_zeroize( *buf, *n ); > mbedtls_free( *buf ); > + > return( MBEDTLS_ERR_PK_FILE_IO_ERROR ); > } > > @@ -177,6 +183,10 @@ static int pk_get_ecparams( unsigned char **p, const unsigned char *end, > { > int ret; > > + if ( end - *p < 1 ) > + return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + > + MBEDTLS_ERR_ASN1_OUT_OF_DATA ); > + > /* Tag may be either OID or SEQUENCE */ > params->tag = **p; > if( params->tag != MBEDTLS_ASN1_OID > @@ -522,18 +532,35 @@ static int pk_get_rsapubkey( unsigned char **p, > return( MBEDTLS_ERR_PK_INVALID_PUBKEY + > MBEDTLS_ERR_ASN1_LENGTH_MISMATCH ); > > - if( ( ret = mbedtls_asn1_get_mpi( p, end, &rsa->N ) ) != 0 || > - ( ret = mbedtls_asn1_get_mpi( p, end, &rsa->E ) ) != 0 ) > + /* Import N */ > + if( ( ret = mbedtls_asn1_get_tag( p, end, &len, MBEDTLS_ASN1_INTEGER ) ) != 0 ) > return( MBEDTLS_ERR_PK_INVALID_PUBKEY + ret ); > > - if( *p != end ) > - return( MBEDTLS_ERR_PK_INVALID_PUBKEY + > - MBEDTLS_ERR_ASN1_LENGTH_MISMATCH ); > + if( ( ret = mbedtls_rsa_import_raw( rsa, *p, len, NULL, 0, NULL, 0, > + NULL, 0, NULL, 0 ) ) != 0 ) > + return( MBEDTLS_ERR_PK_INVALID_PUBKEY ); > + > + *p += len; > > - if( ( ret = mbedtls_rsa_check_pubkey( rsa ) ) != 0 ) > + /* Import E */ > + if( ( ret = mbedtls_asn1_get_tag( p, end, &len, MBEDTLS_ASN1_INTEGER ) ) != 0 ) > + return( MBEDTLS_ERR_PK_INVALID_PUBKEY + ret ); > + > + if( ( ret = mbedtls_rsa_import_raw( rsa, NULL, 0, NULL, 0, NULL, 0, > + NULL, 0, *p, len ) ) != 0 ) > return( MBEDTLS_ERR_PK_INVALID_PUBKEY ); > > - rsa->len = mbedtls_mpi_size( &rsa->N ); > + *p += len; > + > + if( mbedtls_rsa_complete( rsa ) != 0 || > + mbedtls_rsa_check_pubkey( rsa ) != 0 ) > + { > + return( MBEDTLS_ERR_PK_INVALID_PUBKEY ); > + } > + > + if( *p != end ) > + return( MBEDTLS_ERR_PK_INVALID_PUBKEY + > + MBEDTLS_ERR_ASN1_LENGTH_MISMATCH ); > > return( 0 ); > } > @@ -645,10 +672,13 @@ static int pk_parse_key_pkcs1_der( mbedtls_rsa_context *rsa, > const unsigned char *key, > size_t keylen ) > { > - int ret; > + int ret, version; > size_t len; > unsigned char *p, *end; > > + mbedtls_mpi T; > + mbedtls_mpi_init( &T ); > + > p = (unsigned char *) key; > end = p + keylen; > > @@ -676,45 +706,88 @@ static int pk_parse_key_pkcs1_der( mbedtls_rsa_context *rsa, > > end = p + len; > > - if( ( ret = mbedtls_asn1_get_int( &p, end, &rsa->ver ) ) != 0 ) > + if( ( ret = mbedtls_asn1_get_int( &p, end, &version ) ) != 0 ) > { > return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret ); > } > > - if( rsa->ver != 0 ) > + if( version != 0 ) > { > return( MBEDTLS_ERR_PK_KEY_INVALID_VERSION ); > } > > - if( ( ret = mbedtls_asn1_get_mpi( &p, end, &rsa->N ) ) != 0 || > - ( ret = mbedtls_asn1_get_mpi( &p, end, &rsa->E ) ) != 0 || > - ( ret = mbedtls_asn1_get_mpi( &p, end, &rsa->D ) ) != 0 || > - ( ret = mbedtls_asn1_get_mpi( &p, end, &rsa->P ) ) != 0 || > - ( ret = mbedtls_asn1_get_mpi( &p, end, &rsa->Q ) ) != 0 || > - ( ret = mbedtls_asn1_get_mpi( &p, end, &rsa->DP ) ) != 0 || > - ( ret = mbedtls_asn1_get_mpi( &p, end, &rsa->DQ ) ) != 0 || > - ( ret = mbedtls_asn1_get_mpi( &p, end, &rsa->QP ) ) != 0 ) > - { > - mbedtls_rsa_free( rsa ); > - return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret ); > - } > + /* Import N */ > + if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, > + MBEDTLS_ASN1_INTEGER ) ) != 0 || > + ( ret = mbedtls_rsa_import_raw( rsa, p, len, NULL, 0, NULL, 0, > + NULL, 0, NULL, 0 ) ) != 0 ) > + goto cleanup; > + p += len; > > - rsa->len = mbedtls_mpi_size( &rsa->N ); > + /* Import E */ > + if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, > + MBEDTLS_ASN1_INTEGER ) ) != 0 || > + ( ret = mbedtls_rsa_import_raw( rsa, NULL, 0, NULL, 0, NULL, 0, > + NULL, 0, p, len ) ) != 0 ) > + goto cleanup; > + p += len; > + > + /* Import D */ > + if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, > + MBEDTLS_ASN1_INTEGER ) ) != 0 || > + ( ret = mbedtls_rsa_import_raw( rsa, NULL, 0, NULL, 0, NULL, 0, > + p, len, NULL, 0 ) ) != 0 ) > + goto cleanup; > + p += len; > + > + /* Import P */ > + if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, > + MBEDTLS_ASN1_INTEGER ) ) != 0 || > + ( ret = mbedtls_rsa_import_raw( rsa, NULL, 0, p, len, NULL, 0, > + NULL, 0, NULL, 0 ) ) != 0 ) > + goto cleanup; > + p += len; > + > + /* Import Q */ > + if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, > + MBEDTLS_ASN1_INTEGER ) ) != 0 || > + ( ret = mbedtls_rsa_import_raw( rsa, NULL, 0, NULL, 0, p, len, > + NULL, 0, NULL, 0 ) ) != 0 ) > + goto cleanup; > + p += len; > + > + /* Complete the RSA private key */ > + if( ( ret = mbedtls_rsa_complete( rsa ) ) != 0 ) > + goto cleanup; > + > + /* Check optional parameters */ > + if( ( ret = mbedtls_asn1_get_mpi( &p, end, &T ) ) != 0 || > + ( ret = mbedtls_asn1_get_mpi( &p, end, &T ) ) != 0 || > + ( ret = mbedtls_asn1_get_mpi( &p, end, &T ) ) != 0 ) > + goto cleanup; > > if( p != end ) > { > - mbedtls_rsa_free( rsa ); > - return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + > - MBEDTLS_ERR_ASN1_LENGTH_MISMATCH ); > + ret = MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + > + MBEDTLS_ERR_ASN1_LENGTH_MISMATCH ; > } > > - if( ( ret = mbedtls_rsa_check_privkey( rsa ) ) != 0 ) > +cleanup: > + > + mbedtls_mpi_free( &T ); > + > + if( ret != 0 ) > { > + /* Wrap error code if it's coming from a lower level */ > + if( ( ret & 0xff80 ) == 0 ) > + ret = MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret; > + else > + ret = MBEDTLS_ERR_PK_KEY_INVALID_FORMAT; > + > mbedtls_rsa_free( rsa ); > - return( ret ); > } > > - return( 0 ); > + return( ret ); > } > #endif /* MBEDTLS_RSA_C */ > > @@ -790,7 +863,10 @@ static int pk_parse_key_sec1_der( mbedtls_ecp_keypair *eck, > mbedtls_ecp_keypair_free( eck ); > return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret ); > } > + } > > + if( p != end ) > + { > /* > * Is 'publickey' present? If not, or if we can't read it (eg because it > * is compressed), create it from the private key. > @@ -846,6 +922,16 @@ static int pk_parse_key_sec1_der( mbedtls_ecp_keypair *eck, > > /* > * Parse an unencrypted PKCS#8 encoded private key > + * > + * Notes: > + * > + * - This function does not own the key buffer. It is the > + * responsibility of the caller to take care of zeroizing > + * and freeing it after use. > + * > + * - The function is responsible for freeing the provided > + * PK context on failure. > + * > */ > static int pk_parse_key_pkcs8_unencrypted_der( > mbedtls_pk_context *pk, > @@ -861,7 +947,7 @@ static int pk_parse_key_pkcs8_unencrypted_der( > const mbedtls_pk_info_t *pk_info; > > /* > - * This function parses the PrivatKeyInfo object (PKCS#8 v1.2 = RFC 5208) > + * This function parses the PrivateKeyInfo object (PKCS#8 v1.2 = RFC 5208) > * > * PrivateKeyInfo ::= SEQUENCE { > * version Version, > @@ -934,16 +1020,22 @@ static int pk_parse_key_pkcs8_unencrypted_der( > > /* > * Parse an encrypted PKCS#8 encoded private key > + * > + * To save space, the decryption happens in-place on the given key buffer. > + * Also, while this function may modify the keybuffer, it doesn't own it, > + * and instead it is the responsibility of the caller to zeroize and properly > + * free it after use. > + * > */ > #if defined(MBEDTLS_PKCS12_C) || defined(MBEDTLS_PKCS5_C) > static int pk_parse_key_pkcs8_encrypted_der( > mbedtls_pk_context *pk, > - const unsigned char *key, size_t keylen, > + unsigned char *key, size_t keylen, > const unsigned char *pwd, size_t pwdlen ) > { > int ret, decrypted = 0; > size_t len; > - unsigned char buf[2048]; > + unsigned char *buf; > unsigned char *p, *end; > mbedtls_asn1_buf pbe_alg_oid, pbe_params; > #if defined(MBEDTLS_PKCS12_C) > @@ -951,16 +1043,14 @@ static int pk_parse_key_pkcs8_encrypted_der( > mbedtls_md_type_t md_alg; > #endif > > - memset( buf, 0, sizeof( buf ) ); > - > - p = (unsigned char *) key; > + p = key; > end = p + keylen; > > if( pwdlen == 0 ) > return( MBEDTLS_ERR_PK_PASSWORD_REQUIRED ); > > /* > - * This function parses the EncryptedPrivatKeyInfo object (PKCS#8) > + * This function parses the EncryptedPrivateKeyInfo object (PKCS#8) > * > * EncryptedPrivateKeyInfo ::= SEQUENCE { > * encryptionAlgorithm EncryptionAlgorithmIdentifier, > @@ -972,6 +1062,7 @@ static int pk_parse_key_pkcs8_encrypted_der( > * EncryptedData ::= OCTET STRING > * > * The EncryptedData OCTET STRING is a PKCS#8 PrivateKeyInfo > + * > */ > if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, > MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 ) > @@ -987,11 +1078,10 @@ static int pk_parse_key_pkcs8_encrypted_der( > if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 ) > return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret ); > > - if( len > sizeof( buf ) ) > - return( MBEDTLS_ERR_PK_BAD_INPUT_DATA ); > + buf = p; > > /* > - * Decrypt EncryptedData with appropriate PDE > + * Decrypt EncryptedData with appropriate PBE > */ > #if defined(MBEDTLS_PKCS12_C) > if( mbedtls_oid_get_pkcs12_pbe_alg( &pbe_alg_oid, &md_alg, &cipher_alg ) == 0 ) > @@ -1083,10 +1173,8 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk, > > if( ret == 0 ) > { > - if( ( pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == NULL ) > - return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG ); > - > - if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 || > + pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ); > + if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 || > ( ret = pk_parse_key_pkcs1_der( mbedtls_pk_rsa( *pk ), > pem.buf, pem.buflen ) ) != 0 ) > { > @@ -1115,10 +1203,9 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk, > key, pwd, pwdlen, &len ); > if( ret == 0 ) > { > - if( ( pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_ECKEY ) ) == NULL ) > - return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG ); > + pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_ECKEY ); > > - if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 || > + if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 || > ( ret = pk_parse_key_sec1_der( mbedtls_pk_ec( *pk ), > pem.buf, pem.buflen ) ) != 0 ) > { > @@ -1183,7 +1270,6 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk, > return( ret ); > #endif /* MBEDTLS_PKCS12_C || MBEDTLS_PKCS5_C */ > #else > - ((void) ret); > ((void) pwd); > ((void) pwdlen); > #endif /* MBEDTLS_PEM_PARSE_C */ > @@ -1196,12 +1282,27 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk, > * error > */ > #if defined(MBEDTLS_PKCS12_C) || defined(MBEDTLS_PKCS5_C) > - if( ( ret = pk_parse_key_pkcs8_encrypted_der( pk, key, keylen, > - pwd, pwdlen ) ) == 0 ) > { > - return( 0 ); > + unsigned char *key_copy; > + > + if( keylen == 0 ) > + return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT ); > + > + if( ( key_copy = mbedtls_calloc( 1, keylen ) ) == NULL ) > + return( MBEDTLS_ERR_PK_ALLOC_FAILED ); > + > + memcpy( key_copy, key, keylen ); > + > + ret = pk_parse_key_pkcs8_encrypted_der( pk, key_copy, keylen, > + pwd, pwdlen ); > + > + mbedtls_zeroize( key_copy, keylen ); > + mbedtls_free( key_copy ); > } > > + if( ret == 0 ) > + return( 0 ); > + > mbedtls_pk_free( pk ); > > if( ret == MBEDTLS_ERR_PK_PASSWORD_MISMATCH ) > @@ -1216,29 +1317,35 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk, > mbedtls_pk_free( pk ); > > #if defined(MBEDTLS_RSA_C) > - if( ( pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == NULL ) > - return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG ); > > - if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 || > - ( ret = pk_parse_key_pkcs1_der( mbedtls_pk_rsa( *pk ), key, keylen ) ) == 0 ) > + pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ); > + if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 || > + ( ret = pk_parse_key_pkcs1_der( mbedtls_pk_rsa( *pk ), > + key, keylen ) ) != 0 ) > + { > + mbedtls_pk_free( pk ); > + } > + else > { > return( 0 ); > } > > - mbedtls_pk_free( pk ); > #endif /* MBEDTLS_RSA_C */ > > #if defined(MBEDTLS_ECP_C) > - if( ( pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_ECKEY ) ) == NULL ) > - return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG ); > > - if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 || > - ( ret = pk_parse_key_sec1_der( mbedtls_pk_ec( *pk ), key, keylen ) ) == 0 ) > + pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_ECKEY ); > + if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 || > + ( ret = pk_parse_key_sec1_der( mbedtls_pk_ec( *pk ), > + key, keylen ) ) != 0 ) > + { > + mbedtls_pk_free( pk ); > + } > + else > { > return( 0 ); > } > > - mbedtls_pk_free( pk ); > #endif /* MBEDTLS_ECP_C */ > > return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT ); > diff --git a/dll/3rdparty/mbedtls/pkwrite.c b/dll/3rdparty/mbedtls/pkwrite.c > index ae79cf4131..8e0bb2e605 100644 > --- a/dll/3rdparty/mbedtls/pkwrite.c > +++ b/dll/3rdparty/mbedtls/pkwrite.c > @@ -64,13 +64,31 @@ > * } > */ > static int pk_write_rsa_pubkey( unsigned char **p, unsigned char *start, > - mbedtls_rsa_context *rsa ) > + mbedtls_rsa_context *rsa ) > { > int ret; > size_t len = 0; > + mbedtls_mpi T; > > - MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_mpi( p, start, &rsa->E ) ); > - MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_mpi( p, start, &rsa->N ) ); > + mbedtls_mpi_init( &T ); > + > + /* Export E */ > + if ( ( ret = mbedtls_rsa_export( rsa, NULL, NULL, NULL, NULL, &T ) ) != 0 || > + ( ret = mbedtls_asn1_write_mpi( p, start, &T ) ) < 0 ) > + goto end_of_export; > + len += ret; > + > + /* Export N */ > + if ( ( ret = mbedtls_rsa_export( rsa, &T, NULL, NULL, NULL, NULL ) ) != 0 || > + ( ret = mbedtls_asn1_write_mpi( p, start, &T ) ) < 0 ) > + goto end_of_export; > ... 18470 lines suppressed ... > -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

6 years, 3 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [reactos] 03/06: [TCPIP] Save the SubProcessTag when an ADDRESS_FILE is created

by Alex Ionescu

Yay, add more things that the Russians can mock us for in forum posts... Best regards, Alex Ionescu On Mon, Dec 31, 2018 at 5:20 AM Pierre Schweitzer <pierre(a)reactos.org> wrote: > > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d98001de17b9988296e56… > > commit d98001de17b9988296e56c223b0344d58686912e > Author: Pierre Schweitzer <pierre(a)reactos.org> > AuthorDate: Mon Dec 31 10:21:14 2018 +0100 > Commit: Pierre Schweitzer <pierre(a)reactos.org> > CommitDate: Mon Dec 31 11:19:35 2018 +0100 > > [TCPIP] Save the SubProcessTag when an ADDRESS_FILE is created > --- > drivers/network/tcpip/include/titypes.h | 1 + > drivers/network/tcpip/tcpip/fileobjs.c | 5 +++++ > 2 files changed, 6 insertions(+) > > diff --git a/drivers/network/tcpip/include/titypes.h > b/drivers/network/tcpip/include/titypes.h > index e63fad2821..3f75976b4e 100644 > --- a/drivers/network/tcpip/include/titypes.h > +++ b/drivers/network/tcpip/include/titypes.h > @@ -155,6 +155,7 @@ typedef struct _ADDRESS_FILE { > IP_ADDRESS AddrCache; /* One entry address cache > (destination > address of last packet > transmitted) */ > HANDLE ProcessId; /* Creator process ID */ > + PVOID SubProcessTag; /* Creator process tag */ > LARGE_INTEGER CreationTime; /* Time of creation */ > > /* The following members are used to control event notification */ > diff --git a/drivers/network/tcpip/tcpip/fileobjs.c > b/drivers/network/tcpip/tcpip/fileobjs.c > index 30a3939e2b..400f956034 100644 > --- a/drivers/network/tcpip/tcpip/fileobjs.c > +++ b/drivers/network/tcpip/tcpip/fileobjs.c > @@ -10,6 +10,10 @@ > > #include "precomp.h" > > +/* FIXME: including pstypes.h without ntifs fails */ > +#include <ntifs.h> > +#include <ndk/pstypes.h> > + > /* Uncomment for logging of connections and address files every 10 > seconds */ > //#define LOG_OBJECTS > > @@ -425,6 +429,7 @@ NTSTATUS FileOpenAddress( > AddrFile->BCast = 1; > AddrFile->HeaderIncl = 1; > AddrFile->ProcessId = PsGetCurrentProcessId(); > + AddrFile->SubProcessTag = > ((PTEB)PsGetCurrentThreadTeb())->SubProcessTag; > KeQuerySystemTime(&AddrFile->CreationTime); > > /* Make sure address is a local unicast address or 0 */ > >

6 years, 3 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [reactos] 01/01: [TCPIP] Don't assume the TEB is always defined

by Alex Ionescu

A bit better... still a security bug. Best regards, Alex Ionescu On Mon, Dec 31, 2018 at 8:00 AM Pierre Schweitzer <pierre(a)reactos.org> wrote: > > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89a4cde14a5ac1d3363a8… > > commit 89a4cde14a5ac1d3363a8efbca9c26c9f93f037a > Author: Pierre Schweitzer <pierre(a)reactos.org> > AuthorDate: Mon Dec 31 13:59:58 2018 +0100 > Commit: Pierre Schweitzer <pierre(a)reactos.org> > CommitDate: Mon Dec 31 14:00:34 2018 +0100 > > [TCPIP] Don't assume the TEB is always defined > > Fixes the crash in kmtest:TcpIpConnect test. > --- > drivers/network/tcpip/tcpip/fileobjs.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/network/tcpip/tcpip/fileobjs.c > b/drivers/network/tcpip/tcpip/fileobjs.c > index 400f956034..f050a09b0c 100644 > --- a/drivers/network/tcpip/tcpip/fileobjs.c > +++ b/drivers/network/tcpip/tcpip/fileobjs.c > @@ -396,6 +396,7 @@ NTSTATUS FileOpenAddress( > PVOID Options) > { > PADDRESS_FILE AddrFile; > + PTEB Teb; > > TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); > > @@ -429,7 +430,12 @@ NTSTATUS FileOpenAddress( > AddrFile->BCast = 1; > AddrFile->HeaderIncl = 1; > AddrFile->ProcessId = PsGetCurrentProcessId(); > - AddrFile->SubProcessTag = > ((PTEB)PsGetCurrentThreadTeb())->SubProcessTag; > + > + Teb = PsGetCurrentThreadTeb(); > + if (Teb != NULL) { > + AddrFile->SubProcessTag = Teb->SubProcessTag; > + } > + > KeQuerySystemTime(&AddrFile->CreationTime); > > /* Make sure address is a local unicast address or 0 */ > >

6 years, 3 months

1
0
0 0

Re: [ros-dev] Web services down

by Pierre Schweitzer

We seem to be back to normal state. Please report if some service is still not working properly. Pierre Schweitzer <pierre.schweitzer(a)reactos.org> wrote on Wed, December 26th, 2018, 4:43 PM: > Dear all, > > Due to an unexpected outage touching our hoster infrastructure, our DB server is currently down and it affects all the web services relying on it. So, don't expect Jira, boards, wiki, website, and so on to work properly for now, > I'll keep you informed when I have more information. > > Cheers, > Pierre > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://reactos.org/mailman/listinfo/ros-dev

6 years, 3 months

1
0
0 0

Web services down

by Pierre Schweitzer

Dear all, Due to an unexpected outage touching our hoster infrastructure, our DB server is currently down and it affects all the web services relying on it. So, don't expect Jira, boards, wiki, website, and so on to work properly for now, I'll keep you informed when I have more information. Cheers, Pierre

6 years, 3 months

1
0
0 0

Re: [ros-dev] Feature Request CORE-15418 ReactOS Default Media Player - Media Player Classic

by dean beedell

Feature Request CORE-15418 to create a ReactOS Default Media Player using the code from Media Player Classic. This feature request was discussed some time ago on the forum at length and it came to little conclusion, some wanting to bundle VLC, others wanting to bundle classic media player - an open source tool that has recently received some attention. The importance of a media player was noted but one of the main problems was left out. The nub of the problem is this: Windows has a default media player provided as a core part of the system. It is not just a media player, being so tightly integrated into Windows it is used by (some/many?) apps to produce the default sounds and video that emanate from normal program usage. Note that on Windows, ActiveX/COM allows access to system level components and one of those components that is defined as a system level resource is the windows media player (WMP). COM allows programs to make calls to WMP to allow them to play embedded videos or audio tracks within their applications without having to design their own player and bundle their own codecs. The use of WMP means that a far greater range of codecs will be available and the chances of being able to play a particular type of file are increased. *Without such a player these Windows applications will not function as intended.* See the description here: https://docs.microsoft.com/en-us/window ... ject-model <https://docs.microsoft.com/en-us/windows/desktop/wmp/about-the-player-objec…> ReactOS is not a straight o/s without any whizzes or dongles, ie. it already has such bundled apps as games and the ReactOS version of paintbrush. So, the concept of bundling apps is already set, ie. it is perfectly OK to have apps bundled with ReactOS and ReactOS will have them when released. It is just a matter of which applications are bundled. I propose we add Media Player Classic as the default media player. A Windows Media Player type application would be very useful, in fact essential to replace the windows media player that came bundled with Windows, it will need to be a straight drop in replacement for WMP. Indeed, users expect the basic components of an o/s to be present and although RAPPS allows users to install the components they need, some applications are integrated into the o/s far more than others. I would suggest that it is time to re-open this debate and consider using the open source Media Player Classic as ReactOS own embedded version of WMP and to ensure that active X/COM controls can see Media Player Classic just as WMP is disclosed as the default media player in Windows. MPC looks like a media player that ReactOS could use. It is written in C++ and is open source and it supported by the devs at doom9. It seems to me that the only thing missing from Media player classic is the Active X control that allows Windows/ReactOS programs access to its functions. With that control in place it might be a perfect drop-in replacement for WMP and would restore that missing sound functionality to programs giving ReactOS added compatibity. Request raised here in JIRA: https://jira.reactos.org/browse/CORE-15418 Hope this finds you all well this Christmas and that you will consider this feature request for later inclusion. Dean Beedell (dizt3mp3r) --- This email has been checked for viruses by Avast antivirus software. https://www.avast.com/antivirus

6 years, 4 months

1
0
0 0

CORE-15474 - Make modern BSOD in ReactOS

by Javier Agustìn Fernàndez Arroyo

Please.... no... i love NT5 style BSoD

6 years, 4 months

2
1
0 0

Status Meeting (December 2018)

by Colin Finck

Hi all! With Christmas fast approaching and many people traditionally being unavailable over the holidays (myself included), let me prepone our monthly meeting to tomorrow, Thursday, December 20, 2018, 19:00 UTC. Invited members will again receive their IRC Server credentials shortly before the meeting. Note that due to the recent infra changes, your IRC username will now be based on the Display Name you set in https://reactos.org/roslogin/?p=selfservice (spaces replaced by underscores). Please check that before the meeting. However, as our self-hosted Mattermost server is being set up right now, this may as well be our last meeting on IRC :) I wouldn't mind if it's just about the Status Updates from everybody this time, given that the November meeting was really long and a lot of things should be in progress. Let's also not forget about our preparations for Google Summer of Code! Cheers, Colin

6 years, 4 months

2
2
0 0

Re: [ros-dev] CORE-15467 - 1st stage setup freezes when the expected file is missing

by hermes.belusca＠sfr.fr

‌Hi, There is in principle (almost) all the infrastructure to implement the Retry/Skip/Abort dialog in usetup. The freezing you encounter is however a bug I should investigate. Cheers, Hermes <div class="gl_quote" style="margin-top: 20px; padding-top: 5px;">De : "Javier Agustìn Fernàndez Arroyo" A : "ReactOS Development List" Envoyé: mercredi 19 décembre 2018 20:17 Objet : [ros-dev] CORE-15467 - 1st stage setup freezes when the expected file is missing   <div class="gl_quoted"> <div dir="ltr">An idea, <div> </div> <div>I don´t think its a good idea to "skip" a file during 1st stage, specially core files (in 2nd stage it might be acceptable for some device drivers, for example)</div> <div> </div> <div>So, if "cloning" the Win2k3 behavior, i would set only 2 options: retry or abort installation and reboot.</div> <div> </div> <div>what do you guys think?</div> </div>  _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://reactos.org/mailman/listinfo/ros-dev</div> <div class="gl_quoted"> </div> </div>

6 years, 4 months

3
2
0 0

CORE-15467 - 1st stage setup freezes when the expected file is missing

by Javier Agustìn Fernàndez Arroyo

An idea, I don´t think its a good idea to "skip" a file during 1st stage, specially core files (in 2nd stage it might be acceptable for some device drivers, for example) So, if "cloning" the Win2k3 behavior, i would set only 2 options: retry or abort installation and reboot. what do you guys think?

6 years, 4 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [reactos] 01/01: [DESK][SHELL32] Allow Desk.cpl to run standalone on WinXP/2003 again CORE-15412

by Pierre Schweitzer

Hi, I definitely don't like that commit, nor appreciate the way it was done. If we read CORE-15412 carefully, we have three developers (namely: Thomas, Mark, Giannis) expressing that they are again this revert, and thus this commit. Then, why was it pushed to HEAD? Cheers, Pierre Le 17/12/2018 à 22:02, Joachim Henze a écrit : > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f8cb05cad142a8679872… > > commit 6f8cb05cad142a8679872e695f317dc1f9728d55 > Author: Joachim Henze <Joachim.Henze(a)reactos.org> > AuthorDate: Mon Dec 17 22:01:49 2018 +0100 > Commit: Joachim Henze <Joachim.Henze(a)reactos.org> > CommitDate: Mon Dec 17 22:01:49 2018 +0100 > > [DESK][SHELL32] Allow Desk.cpl to run standalone on WinXP/2003 again CORE-15412 > > addendum to 0.4.10-dev-502-g > d559ca9c982f9766acc5db3ea887ef2bc27acdff > > That copy-paste was done once intentionally to keep our imports similar to 2003. > It's worth reading the conversation in PR #748: Getequ seems to be ok with this. > > The ideal solution most likely would be to instead *statically* > link against RegLoadMUIStringW() from advapi32_vista when WINNT=0x502. > For now the stuff runs again at least. > I left the func existing in advapi32_vista.dll. > --- > dll/cpl/desk/CMakeLists.txt | 6 +- > dll/cpl/desk/desk.h | 9 ++ > dll/cpl/desk/muireg.c | 144 ++++++++++++++++++++++++++ > dll/win32/shell32/CMakeLists.txt | 3 +- > dll/win32/shell32/vista.c | 218 +++++++++++++++++++++++++++++++++++++++ > 5 files changed, 375 insertions(+), 5 deletions(-) > > diff --git a/dll/cpl/desk/CMakeLists.txt b/dll/cpl/desk/CMakeLists.txt > index 24d9bb1e60..ae7fb83825 100644 > --- a/dll/cpl/desk/CMakeLists.txt > +++ b/dll/cpl/desk/CMakeLists.txt > @@ -2,9 +2,6 @@ > 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 > @@ -23,6 +20,7 @@ list(APPEND SOURCE > general.c > draw.c > theme.c > + muireg.c > desk.h) > > file(GLOB desk_rc_deps resources/*.*) > @@ -36,6 +34,6 @@ add_library(desk SHARED > > set_module_type(desk cpl UNICODE) > target_link_libraries(desk uuid) > -add_importlibs(desk user32 advapi32 advapi32_vista gdi32 comctl32 comdlg32 ole32 setupapi shell32 shlwapi uxtheme gdiplus msvcrt kernel32 ntdll) > +add_importlibs(desk user32 advapi32 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 3bb02f3a74..3c479251cf 100644 > --- a/dll/cpl/desk/desk.h > +++ b/dll/cpl/desk/desk.h > @@ -122,4 +122,13 @@ 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 > new file mode 100644 > index 0000000000..8754b43655 > --- /dev/null > +++ b/dll/cpl/desk/muireg.c > @@ -0,0 +1,144 @@ > +#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/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt > index 08933dda35..78ee1af531 100644 > --- a/dll/win32/shell32/CMakeLists.txt > +++ b/dll/win32/shell32/CMakeLists.txt > @@ -102,6 +102,7 @@ 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) > @@ -113,7 +114,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 advapi32_vista gdi32 user32 comctl32 comdlg32 shlwapi msvcrt kernel32 ntdll) > +add_importlibs(shell32 advapi32 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) > diff --git a/dll/win32/shell32/vista.c b/dll/win32/shell32/vista.c > new file mode 100644 > index 0000000000..9f1a8335a3 > --- /dev/null > +++ b/dll/win32/shell32/vista.c > @@ -0,0 +1,218 @@ > +/* > + * 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 > + */ > + > +#include <stdarg.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); > + > +/****************************************************************************** > + * 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; > +} > -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

6 years, 4 months

3
2
0 0

BuildBot and irc.reactos.org now using ReactOS.org accounts

by Colin Finck

Hi all! Another important change has just been applied to ReactOS infrastructure: https://build.reactos.org and https://irc.reactos.org now use ReactOS.org accounts. Finally, we have a real global login system where you can access all ReactOS services with the same account! Please let me know if or if not things work for you, as I may have forgotten to add some accounts to the BuildBot group. If everything works well, we are technically ready to launch a Mattermost instance using the same accounts as the next step :) Cheers, Colin

6 years, 4 months

1
0
0 0

iso.reactos.org migrated to new server

by Colin Finck

Hi all! iso.reactos.org, the file server used by our build machines and the source for https://reactos.org/getbuilds, has been migrated to new hardware at a different location today. You should experience better transfer rates due to the increased bandwidth, and a higher availability. The new hardware also offers more disk space and redundancy to keep our precious ISOs absolutely safe :) Unfortunately, the new iso.reactos.org is no longer right next to the build machines. This has several consequences: If I had left the build scripts as-is, the build machines would have uploaded the bootcdregtest ISOs to iso.reactos.org, just to download them multiple times for each Testbot a minute later. This would be an excessive waste of ISP bandwidth and would have delayed the entire testing process. Therefore, I changed the build scripts to keep the bootcdregtest ISOs within the local build machine network. However, the downside is that bootcdregtest ISOs are no longer available via iso.reactos.org. Please let me know if this is a problem for you and needs a solution. In the past, bootcdregtest ISOs were only available for a week and not accessible via GetBuilds either, so I have no idea how popular they are. Cheers, Colin

6 years, 4 months

2
1
0 0

Re: [ros-dev] [ros-diffs] 07/18: [WIN32K:NTUSER] Get rid of the cached window station Name member, and instead just use the name stored in the NT Object's header. CORE-11933 and PR #621.

by hermes.belusca＠sfr.fr

Hello Timo, Let's make a deal: while I fix this in win32k, you may try to find a way to fix that one too in the SAC driver line 1192: https://git.reactos.org/?p=reactos.git;a=blob;f=drivers/sac/driver/util.c;h… I used the object macros because I didn't want to have the (huge) overhead of calling ObQueryNameString() together with allocating memory buffers just to retrieve the necessary names that already exist somewhere. (Also we note that WinStation objects, by their nature, really wrap closely around the NT objects and that's why I didn't see any inconvenience in using the helper macros for retrieving said information). Best, Hermes‌ <div class="gl_quote" style="margin-top: 20px; padding-top: 5px;">De : "Timo Kreuzer" A : ros-dev(a)reactos.org,"Hermès Bélusca-Maïto" Envoyé: lundi 10 décembre 2018 01:44 Objet : Re: [ros-diffs] 07/18: [WIN32K:NTUSER] Get rid of the cached window station Name member, and instead just use the name stored in the NT Object's header. CORE-11933 and PR #621.   <div class="gl_quoted"> Why did you remove an abstraction and create additional dependencies on internal implementation details? Win32k is not supposed to directly access internal kernel structures! The headers and macros shouldn't even be in NDK. Please revert or fix this. And while you are at it, put an "#ifdef _NTOSKRNL_" around the stuff in NDK to prevent people from using it. Thanks, Timo Am 19.08.2018 um 22:16 schrieb Hermès Bélusca-Maïto: > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43e2ab208a2d3d50b12b4… > > commit 43e2ab208a2d3d50b12b4689347f57ca83568dd9 > Author: Hermès Bélusca-Maïto > AuthorDate: Sun Jun 17 19:40:32 2018 +0200 > Commit: Hermès Bélusca-Maïto > CommitDate: Sun Aug 19 22:18:32 2018 +0200 > > [WIN32K:NTUSER] Get rid of the cached window station Name member, and instead just use the name stored in the NT Object's header. > CORE-11933 and PR #621. > > - Remove the related hack-FIXMEs; > - Adjust NtUserGetObjectInformation() in accordance. > - Retrieve the window-station/desktop object type string in NtUserGetObjectInformation() > also from the NT Object's header. > > Also simplify the UOI_FLAGS case of NtUserGetObjectInformation() by reading > the handle inheritance information directly from the OBJECT_HANDLE_INFORMATION > structure returned by ObReferenceObjectByHandle(). > --- > win32ss/user/ntuser/sysparams.c | 3 +- > win32ss/user/ntuser/winsta.c | 106 +++++++++++++++++++--------------------- > win32ss/user/ntuser/winsta.h | 1 - > 3 files changed, 51 insertions(+), 59 deletions(-) > > diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c > index 7eedc028de..d0badba00e 100644 > --- a/win32ss/user/ntuser/sysparams.c > +++ b/win32ss/user/ntuser/sysparams.c > @@ -33,7 +33,8 @@ BOOL g_PaintDesktopVersion = FALSE; > } \ > else \ > { \ > - ERR("NtUserSystemParametersInfo requires interactive window station (current is %wZ)\n", &GetW32ProcessInfo()->prpwinsta->Name); \ > + ERR("NtUserSystemParametersInfo requires interactive window station (current is %wZ)\n", \ > + &(OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(GetW32ProcessInfo()->prpwinsta))->Name)); \ > } \ > EngSetLastError(err); \ > return 0; \ > diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c > index f373b1cedf..ba1b1eb57d 100644 > --- a/win32ss/user/ntuser/winsta.c > +++ b/win32ss/user/ntuser/winsta.c > @@ -114,8 +114,6 @@ IntWinStaObjectDelete( > > RtlDestroyAtomTable(WinSta->AtomTable); > > - RtlFreeUnicodeString(&WinSta->Name); > - > return STATUS_SUCCESS; > } > > @@ -449,8 +447,6 @@ IntCreateWindowStation( > RtlZeroMemory(WindowStationObject, sizeof(WINSTATION_OBJECT)); > > InitializeListHead(&WindowStationObject->DesktopListHead); > - WindowStationObject->Name = *ObjectAttributes->ObjectName; > - ObjectAttributes->ObjectName = NULL; // FIXME! (see NtUserCreateWindowStation()) > WindowStationObject->dwSessionId = NtCurrentPeb()->SessionId; > Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); > if (!NT_SUCCESS(Status)) > @@ -491,7 +487,7 @@ IntCreateWindowStation( > } > > TRACE("IntCreateWindowStation created object 0x%p with name %wZ handle 0x%p\n", > - WindowStationObject, &WindowStationObject->Name, WindowStation); > + WindowStationObject, ObjectAttributes->ObjectName, WindowStation); > > *phWinSta = WindowStation; > return STATUS_SUCCESS; > @@ -582,23 +578,7 @@ NtUserCreateWindowStation( > return NULL; > } > > - WindowStationName.Length = wcslen(ServiceWinStaName) * sizeof(WCHAR); > - WindowStationName.MaximumLength = > - WindowStationName.Length + sizeof(UNICODE_NULL); > - WindowStationName.Buffer = > - ExAllocatePoolWithTag(PagedPool, > - WindowStationName.MaximumLength, > - TAG_STRING); > - if (!WindowStationName.Buffer) > - { > - Status = STATUS_NO_MEMORY; > - ERR("Impossible to build a valid window station name, Status 0x%08lx\n", Status); > - SetLastNtError(Status); > - return NULL; > - } > - RtlStringCbCopyW(WindowStationName.Buffer, > - WindowStationName.MaximumLength, > - ServiceWinStaName); > + RtlInitUnicodeString(&WindowStationName, ServiceWinStaName); > LocalObjectAttributes.ObjectName = &WindowStationName; > AccessMode = KernelMode; > } > @@ -615,12 +595,7 @@ NtUserCreateWindowStation( > Unknown5, > Unknown6); > > - // FIXME! Because in some situations we store the allocated window station name > - // inside the window station, we must not free it now! We know this fact when > - // IntCreateWindowStation() sets LocalObjectAttributes.ObjectName to NULL. > - // This hack must be removed once we just use the stored Ob name instead > - // (in which case we will always free the allocated name here). > - if (LocalObjectAttributes.ObjectName) > + if ((AccessMode == UserMode) && LocalObjectAttributes.ObjectName) > ExFreePoolWithTag(LocalObjectAttributes.ObjectName->Buffer, TAG_STRING); > > if (NT_SUCCESS(Status)) > @@ -802,7 +777,11 @@ NtUserGetObjectInformation( > NTSTATUS Status; > PWINSTATION_OBJECT WinStaObject = NULL; > PDESKTOP DesktopObject = NULL; > + POBJECT_HEADER ObjectHeader; > + POBJECT_HEADER_NAME_INFO NameInfo; > + OBJECT_HANDLE_INFORMATION HandleInfo; > USEROBJECTFLAGS ObjectFlags; > + PUNICODE_STRING pStrNameU = NULL; > PVOID pvData = NULL; > SIZE_T nDataSize = 0; > > @@ -820,13 +799,13 @@ NtUserGetObjectInformation( > _SEH2_END; > > /* Try window station */ > - TRACE("Trying to open window station %p\n", hObject); > + TRACE("Trying to open window station 0x%p\n", hObject); > Status = ObReferenceObjectByHandle(hObject, > 0, > ExWindowStationObjectType, > UserMode, > (PVOID*)&WinStaObject, > - NULL); > + &HandleInfo); > > if (Status == STATUS_OBJECT_TYPE_MISMATCH) > { > @@ -852,23 +831,8 @@ NtUserGetObjectInformation( > { > case UOI_FLAGS: > { > - OBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo; > - ULONG BytesWritten; > - > ObjectFlags.fReserved = FALSE; > - > - /* Check whether this handle is inheritable */ > - Status = ZwQueryObject(hObject, > - ObjectHandleFlagInformation, > - &HandleInfo, > - sizeof(OBJECT_HANDLE_ATTRIBUTE_INFORMATION), > - &BytesWritten); > - if (!NT_SUCCESS(Status)) > - { > - ERR("ZwQueryObject failed, Status 0x%08lx\n", Status); > - break; > - } > - ObjectFlags.fInherit = HandleInfo.Inherit; > + ObjectFlags.fInherit = !!(HandleInfo.HandleAttributes & OBJ_INHERIT); > > ObjectFlags.dwFlags = 0; > if (WinStaObject != NULL) > @@ -893,11 +857,24 @@ NtUserGetObjectInformation( > > case UOI_NAME: > { > - // FIXME: Use either ObQueryNameString() or read directly that name inside the Object section! > if (WinStaObject != NULL) > { > - pvData = WinStaObject->Name.Buffer; > - nDataSize = WinStaObject->Name.Length + sizeof(WCHAR); > + ObjectHeader = OBJECT_TO_OBJECT_HEADER(WinStaObject); > + NameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); > + > + if (NameInfo && (NameInfo->Name.Length > 0)) > + { > + /* Named window station */ > + pStrNameU = &NameInfo->Name; > + nDataSize = pStrNameU->Length + sizeof(UNICODE_NULL); > + } > + else > + { > + /* Unnamed window station (should never happen!) */ > + ASSERT(FALSE); > + pStrNameU = NULL; > + nDataSize = sizeof(UNICODE_NULL); > + } > Status = STATUS_SUCCESS; > } > else if (DesktopObject != NULL) > @@ -917,14 +894,16 @@ NtUserGetObjectInformation( > { > if (WinStaObject != NULL) > { > - pvData = L"WindowStation"; > - nDataSize = sizeof(L"WindowStation"); > + ObjectHeader = OBJECT_TO_OBJECT_HEADER(WinStaObject); > + pStrNameU = &ObjectHeader->Type->Name; > + nDataSize = pStrNameU->Length + sizeof(UNICODE_NULL); > Status = STATUS_SUCCESS; > } > else if (DesktopObject != NULL) > { > - pvData = L"Desktop"; > - nDataSize = sizeof(L"Desktop"); > + ObjectHeader = OBJECT_TO_OBJECT_HEADER(DesktopObject); > + pStrNameU = &ObjectHeader->Type->Name; > + nDataSize = pStrNameU->Length + sizeof(UNICODE_NULL); > Status = STATUS_SUCCESS; > } > else > @@ -954,10 +933,25 @@ Exit: > *nLengthNeeded = nDataSize; > > /* Try to copy data to caller */ > - if (Status == STATUS_SUCCESS) > + if (Status == STATUS_SUCCESS && (nDataSize > 0)) > { > TRACE("Trying to copy data to caller (len = %lu, len needed = %lu)\n", nLength, nDataSize); > - RtlCopyMemory(pvInformation, pvData, nDataSize); > + if (pvData) > + { > + /* Copy the data */ > + RtlCopyMemory(pvInformation, pvData, nDataSize); > + } > + else if (pStrNameU) > + { > + /* Copy and NULL-terminate the string */ > + RtlCopyMemory(pvInformation, pStrNameU->Buffer, pStrNameU->Length); > + ((PWCHAR)pvInformation)[pStrNameU->Length / sizeof(WCHAR)] = UNICODE_NULL; > + } > + else > + { > + /* Zero the memory */ > + RtlZeroMemory(pvInformation, nDataSize); > + } > } > } > _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) > @@ -1026,8 +1020,6 @@ NtUserSetObjectInformation( > } > > > - > - > HWINSTA FASTCALL > UserGetProcessWindowStation(VOID) > { > diff --git a/win32ss/user/ntuser/winsta.h b/win32ss/user/ntuser/winsta.h > index 085f3bcb26..19b1479ec0 100644 > --- a/win32ss/user/ntuser/winsta.h > +++ b/win32ss/user/ntuser/winsta.h > @@ -15,7 +15,6 @@ typedef struct _WINSTATION_OBJECT > { > DWORD dwSessionId; > > - UNICODE_STRING Name; > LIST_ENTRY DesktopListHead; > PRTL_ATOM_TABLE AtomTable; > HANDLE ShellWindow; > >  </div> <div class="gl_quoted"> </div> </div>

6 years, 4 months

1
0
0 0

Test_KVM_AHK is offline

by Sylvain Petreolle

Hi all, The Test_KVM_AHK machine has encountered a power shortage in my area and is currently shut off. I will bring it back on today evening. Kind regards, Sylvain Petreolle

6 years, 4 months

1
0
0 0

Re: [ros-dev] [ros-diffs] 07/18: [WIN32K:NTUSER] Get rid of the cached window station Name member, and instead just use the name stored in the NT Object's header. CORE-11933 and PR #621.

by Timo Kreuzer

Why did you remove an abstraction and create additional dependencies on internal implementation details? Win32k is not supposed to directly access internal kernel structures! The headers and macros shouldn't even be in NDK. Please revert or fix this. And while you are at it, put an "#ifdef _NTOSKRNL_" around the stuff in NDK to prevent people from using it. Thanks, Timo Am 19.08.2018 um 22:16 schrieb Hermès Bélusca-Maïto: > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43e2ab208a2d3d50b12b4… > > commit 43e2ab208a2d3d50b12b4689347f57ca83568dd9 > Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> > AuthorDate: Sun Jun 17 19:40:32 2018 +0200 > Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> > CommitDate: Sun Aug 19 22:18:32 2018 +0200 > > [WIN32K:NTUSER] Get rid of the cached window station Name member, and instead just use the name stored in the NT Object's header. > CORE-11933 and PR #621. > > - Remove the related hack-FIXMEs; > - Adjust NtUserGetObjectInformation() in accordance. > - Retrieve the window-station/desktop object type string in NtUserGetObjectInformation() > also from the NT Object's header. > > Also simplify the UOI_FLAGS case of NtUserGetObjectInformation() by reading > the handle inheritance information directly from the OBJECT_HANDLE_INFORMATION > structure returned by ObReferenceObjectByHandle(). > --- > win32ss/user/ntuser/sysparams.c | 3 +- > win32ss/user/ntuser/winsta.c | 106 +++++++++++++++++++--------------------- > win32ss/user/ntuser/winsta.h | 1 - > 3 files changed, 51 insertions(+), 59 deletions(-) > > diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c > index 7eedc028de..d0badba00e 100644 > --- a/win32ss/user/ntuser/sysparams.c > +++ b/win32ss/user/ntuser/sysparams.c > @@ -33,7 +33,8 @@ BOOL g_PaintDesktopVersion = FALSE; > } \ > else \ > { \ > - ERR("NtUserSystemParametersInfo requires interactive window station (current is %wZ)\n", &GetW32ProcessInfo()->prpwinsta->Name); \ > + ERR("NtUserSystemParametersInfo requires interactive window station (current is %wZ)\n", \ > + &(OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(GetW32ProcessInfo()->prpwinsta))->Name)); \ > } \ > EngSetLastError(err); \ > return 0; \ > diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c > index f373b1cedf..ba1b1eb57d 100644 > --- a/win32ss/user/ntuser/winsta.c > +++ b/win32ss/user/ntuser/winsta.c > @@ -114,8 +114,6 @@ IntWinStaObjectDelete( > > RtlDestroyAtomTable(WinSta->AtomTable); > > - RtlFreeUnicodeString(&WinSta->Name); > - > return STATUS_SUCCESS; > } > > @@ -449,8 +447,6 @@ IntCreateWindowStation( > RtlZeroMemory(WindowStationObject, sizeof(WINSTATION_OBJECT)); > > InitializeListHead(&WindowStationObject->DesktopListHead); > - WindowStationObject->Name = *ObjectAttributes->ObjectName; > - ObjectAttributes->ObjectName = NULL; // FIXME! (see NtUserCreateWindowStation()) > WindowStationObject->dwSessionId = NtCurrentPeb()->SessionId; > Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); > if (!NT_SUCCESS(Status)) > @@ -491,7 +487,7 @@ IntCreateWindowStation( > } > > TRACE("IntCreateWindowStation created object 0x%p with name %wZ handle 0x%p\n", > - WindowStationObject, &WindowStationObject->Name, WindowStation); > + WindowStationObject, ObjectAttributes->ObjectName, WindowStation); > > *phWinSta = WindowStation; > return STATUS_SUCCESS; > @@ -582,23 +578,7 @@ NtUserCreateWindowStation( > return NULL; > } > > - WindowStationName.Length = wcslen(ServiceWinStaName) * sizeof(WCHAR); > - WindowStationName.MaximumLength = > - WindowStationName.Length + sizeof(UNICODE_NULL); > - WindowStationName.Buffer = > - ExAllocatePoolWithTag(PagedPool, > - WindowStationName.MaximumLength, > - TAG_STRING); > - if (!WindowStationName.Buffer) > - { > - Status = STATUS_NO_MEMORY; > - ERR("Impossible to build a valid window station name, Status 0x%08lx\n", Status); > - SetLastNtError(Status); > - return NULL; > - } > - RtlStringCbCopyW(WindowStationName.Buffer, > - WindowStationName.MaximumLength, > - ServiceWinStaName); > + RtlInitUnicodeString(&WindowStationName, ServiceWinStaName); > LocalObjectAttributes.ObjectName = &WindowStationName; > AccessMode = KernelMode; > } > @@ -615,12 +595,7 @@ NtUserCreateWindowStation( > Unknown5, > Unknown6); > > - // FIXME! Because in some situations we store the allocated window station name > - // inside the window station, we must not free it now! We know this fact when > - // IntCreateWindowStation() sets LocalObjectAttributes.ObjectName to NULL. > - // This hack must be removed once we just use the stored Ob name instead > - // (in which case we will always free the allocated name here). > - if (LocalObjectAttributes.ObjectName) > + if ((AccessMode == UserMode) && LocalObjectAttributes.ObjectName) > ExFreePoolWithTag(LocalObjectAttributes.ObjectName->Buffer, TAG_STRING); > > if (NT_SUCCESS(Status)) > @@ -802,7 +777,11 @@ NtUserGetObjectInformation( > NTSTATUS Status; > PWINSTATION_OBJECT WinStaObject = NULL; > PDESKTOP DesktopObject = NULL; > + POBJECT_HEADER ObjectHeader; > + POBJECT_HEADER_NAME_INFO NameInfo; > + OBJECT_HANDLE_INFORMATION HandleInfo; > USEROBJECTFLAGS ObjectFlags; > + PUNICODE_STRING pStrNameU = NULL; > PVOID pvData = NULL; > SIZE_T nDataSize = 0; > > @@ -820,13 +799,13 @@ NtUserGetObjectInformation( > _SEH2_END; > > /* Try window station */ > - TRACE("Trying to open window station %p\n", hObject); > + TRACE("Trying to open window station 0x%p\n", hObject); > Status = ObReferenceObjectByHandle(hObject, > 0, > ExWindowStationObjectType, > UserMode, > (PVOID*)&WinStaObject, > - NULL); > + &HandleInfo); > > if (Status == STATUS_OBJECT_TYPE_MISMATCH) > { > @@ -852,23 +831,8 @@ NtUserGetObjectInformation( > { > case UOI_FLAGS: > { > - OBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo; > - ULONG BytesWritten; > - > ObjectFlags.fReserved = FALSE; > - > - /* Check whether this handle is inheritable */ > - Status = ZwQueryObject(hObject, > - ObjectHandleFlagInformation, > - &HandleInfo, > - sizeof(OBJECT_HANDLE_ATTRIBUTE_INFORMATION), > - &BytesWritten); > - if (!NT_SUCCESS(Status)) > - { > - ERR("ZwQueryObject failed, Status 0x%08lx\n", Status); > - break; > - } > - ObjectFlags.fInherit = HandleInfo.Inherit; > + ObjectFlags.fInherit = !!(HandleInfo.HandleAttributes & OBJ_INHERIT); > > ObjectFlags.dwFlags = 0; > if (WinStaObject != NULL) > @@ -893,11 +857,24 @@ NtUserGetObjectInformation( > > case UOI_NAME: > { > - // FIXME: Use either ObQueryNameString() or read directly that name inside the Object section! > if (WinStaObject != NULL) > { > - pvData = WinStaObject->Name.Buffer; > - nDataSize = WinStaObject->Name.Length + sizeof(WCHAR); > + ObjectHeader = OBJECT_TO_OBJECT_HEADER(WinStaObject); > + NameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); > + > + if (NameInfo && (NameInfo->Name.Length > 0)) > + { > + /* Named window station */ > + pStrNameU = &NameInfo->Name; > + nDataSize = pStrNameU->Length + sizeof(UNICODE_NULL); > + } > + else > + { > + /* Unnamed window station (should never happen!) */ > + ASSERT(FALSE); > + pStrNameU = NULL; > + nDataSize = sizeof(UNICODE_NULL); > + } > Status = STATUS_SUCCESS; > } > else if (DesktopObject != NULL) > @@ -917,14 +894,16 @@ NtUserGetObjectInformation( > { > if (WinStaObject != NULL) > { > - pvData = L"WindowStation"; > - nDataSize = sizeof(L"WindowStation"); > + ObjectHeader = OBJECT_TO_OBJECT_HEADER(WinStaObject); > + pStrNameU = &ObjectHeader->Type->Name; > + nDataSize = pStrNameU->Length + sizeof(UNICODE_NULL); > Status = STATUS_SUCCESS; > } > else if (DesktopObject != NULL) > { > - pvData = L"Desktop"; > - nDataSize = sizeof(L"Desktop"); > + ObjectHeader = OBJECT_TO_OBJECT_HEADER(DesktopObject); > + pStrNameU = &ObjectHeader->Type->Name; > + nDataSize = pStrNameU->Length + sizeof(UNICODE_NULL); > Status = STATUS_SUCCESS; > } > else > @@ -954,10 +933,25 @@ Exit: > *nLengthNeeded = nDataSize; > > /* Try to copy data to caller */ > - if (Status == STATUS_SUCCESS) > + if (Status == STATUS_SUCCESS && (nDataSize > 0)) > { > TRACE("Trying to copy data to caller (len = %lu, len needed = %lu)\n", nLength, nDataSize); > - RtlCopyMemory(pvInformation, pvData, nDataSize); > + if (pvData) > + { > + /* Copy the data */ > + RtlCopyMemory(pvInformation, pvData, nDataSize); > + } > + else if (pStrNameU) > + { > + /* Copy and NULL-terminate the string */ > + RtlCopyMemory(pvInformation, pStrNameU->Buffer, pStrNameU->Length); > + ((PWCHAR)pvInformation)[pStrNameU->Length / sizeof(WCHAR)] = UNICODE_NULL; > + } > + else > + { > + /* Zero the memory */ > + RtlZeroMemory(pvInformation, nDataSize); > + } > } > } > _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) > @@ -1026,8 +1020,6 @@ NtUserSetObjectInformation( > } > > > - > - > HWINSTA FASTCALL > UserGetProcessWindowStation(VOID) > { > diff --git a/win32ss/user/ntuser/winsta.h b/win32ss/user/ntuser/winsta.h > index 085f3bcb26..19b1479ec0 100644 > --- a/win32ss/user/ntuser/winsta.h > +++ b/win32ss/user/ntuser/winsta.h > @@ -15,7 +15,6 @@ typedef struct _WINSTATION_OBJECT > { > DWORD dwSessionId; > > - UNICODE_STRING Name; > LIST_ENTRY DesktopListHead; > PRTL_ATOM_TABLE AtomTable; > HANDLE ShellWindow; > >

6 years, 4 months

1
0
0 0

USB meta bug

by Javier Agustìn Fernàndez Arroyo

hello all, There are lots of USB related reports, and i´m about creating a master one, which blocks all of those... what do you think?

6 years, 4 months

2
1
0 0

Doxygen migrated - now with a reasonable search feature!

by Colin Finck

Hi all! Good news! I've just migrated the last of our existing services, Doxygen, to a new server that is a lot faster and more reliable. But I also had a look at the often criticized search feature and enabled the alternative EXTERNAL_SEARCH in the Doxyfile and on the server. This doubled the runtime for Doxygen due to the additional indexing, but the result is well worth the effort! A simple search for a universal function like "Sleep" now instantly yields all results, but with the definition in "winbase.h" and the declaration in "kernel32/client/synch.c" at the very top! Results are also a lot more readable and distributed over multiple pages. Just try it yourself: https://doxygen.reactos.org/search.html?query=Sleep Hope you'll like it as much as I do! :) We can now start tweaking the extra settings, e.g. whether we need "Referenced by" and other information. ReactOS is already known to many due to our Doxygen popping up whenever they google a Windows API. This step should improve the usefulness of our documentation even further and turn the ReactOS codebase into *the* public reference about Windows internals again! I hope it also motivates you to take care of Doxygen-compatible comments during your coding :) Cheers, Colin

6 years, 4 months

2
1
0 0

Re: [ros-dev] iso.reactos.org migrated to new server

by hermes.belusca＠sfr.fr

‌Hi, In case this happens to be indeed a problem, the additional stuff to add to the build scripts would be to upload these bootcdregtest ISOs to iso.reactos.org, while using now the local copy on the build machine network. Best, Hermes <div class="gl_quote" style="margin-top: 20px; padding-top: 5px;">De : "Colin Finck" A : "'ReactOS Development List'" Envoyé: mercredi 5 décembre 2018 20:01 Objet : [ros-dev] iso.reactos.org migrated to new server   <div class="gl_quoted">Hi all! iso.reactos.org, the file server used by our build machines and the source for https://reactos.org/getbuilds, has been migrated to new hardware at a different location today. You should experience better transfer rates due to the increased bandwidth, and a higher availability. The new hardware also offers more disk space and redundancy to keep our precious ISOs absolutely safe :) Unfortunately, the new iso.reactos.org is no longer right next to the build machines. This has several consequences: If I had left the build scripts as-is, the build machines would have uploaded the bootcdregtest ISOs to iso.reactos.org, just to download them multiple times for each Testbot a minute later. This would be an excessive waste of ISP bandwidth and would have delayed the entire testing process. Therefore, I changed the build scripts to keep the bootcdregtest ISOs within the local build machine network. However, the downside is that bootcdregtest ISOs are no longer available via iso.reactos.org. Please let me know if this is a problem for you and needs a solution. In the past, bootcdregtest ISOs were only available for a week and not accessible via GetBuilds either, so I have no idea how popular they are. Cheers, Colin _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://reactos.org/mailman/listinfo/ros-dev</div> <div class="gl_quoted"> </div> </div>

6 years, 4 months

1
0
0 0

"[shell32] Shell dialog issues" .- CORE-10481

by Javier Agustìn Fernàndez Arroyo

Are you sure its better to follow Win behavior on this? I think its a enhancement, specially if there are many open windows at a given time.... it saves time!

6 years, 4 months

4
4
0 0

ReactOS 0.5 Planning

by Colin Finck

Hi all! Planning the ReactOS 0.5 release and establishing a new roadmap was one of the points on the agenda of yesterday's meeting. This is still an ongoing process. Please make up your minds about what a ReactOS 0.5 release must offer in your opinion and write it down to https://reactos.org/wiki/0.5.0 To get a realistic roadmap, it is important that we define a responsible person for each task. It should be the person having the most in-depth knowledge about the status of the affected ReactOS components. Don't worry, we won't put any pressure on you to complete the task soon. But we need someone who can give a detailed report about the current status. If nobody can be the responsible person for a certain task, having it for 0.5 is not realistic and it eventually needs to be removed from the roadmap. But that's for later! Let's first add all points we consider important until the end of the year. If you can already add yourself as the responsible person, even better! :) Cheers, Colin

6 years, 4 months

5
4
0 0

Google Summer of Code 2019

by Colin Finck

Hi all! While there is still some time until the February 6, 2019 application deadline for projects, we should already begin planning our GSoC participation now! As today's meeting already has a long agenda, I delibereately didn't add GSoC to it. But I've already created https://reactos.org/wiki/Google_Summer_of_Code_2019 and https://reactos.org/wiki/Google_Summer_of_Code_2019_Ideas Please decide whether you want to be a GSoC org admin or mentor and add your ideas to the list or remove deprecated ones. My experience from the Mentor Summit tells me that proper planning and advertising can make a huge difference for our 2019 participation and will certainly get us more students :) Cheers, Colin

6 years, 4 months

4
3
0 0

Re: [ros-dev] Status Meeting (November 2018)

by Can Tasan

While there's a discussion of 0.5 release plan, here are some candidate topics: * MM/CC work, to reduce BSoDs and enable further development * PNP work. vgal has done some work on both HAL and PNP to fix device issues. Also many Windows Server 2003 drivers are usable now. Progressing this and finally integrating into ReactOS is essential at some point. * Driver issues * System corruption after hard resets or BSoDs * Further Win32 work to get many programs usable (I can extensively test Word 2003 if there's help!) * Getting rid of old fastfat (and progressing NTFS further?) * Robust networking (adding WPA support, fixing bugs...) * Installer support for old programs and WoW16 (there's two resources: Win3mu is now open-source and otya128's winevdm) * Further DirectX work (or just syncs from Wine) and some video work to get more games playable? * Sound? * And other things you add or I forgot. Best regards, Can

6 years, 4 months

1
0
0 0

Status Meeting (November 2018)

by Colin Finck

Hi all! Let me invite you to the November 2018 meeting, taking place next Thursday, November 29, 2018 at 19:00 UTC. Invited members will again receive their credentials shortly before the meeting. This will be the first meeting since August and I hope we get some more topics than just the obligatory Status Reports. Please send your proposals by replying to this mail. Best regards, Colin

6 years, 4 months

5
9
0 0

Re: [ros-dev] Status Meeting (November 2018)

by Serge Gautherie

On 29/11/2018 00:35, Thomas Mueller wrote: > My hard drives are all partitioned GPT, and lack of support for USB and GPT has kept me away from doing anything regarding ReactOS. Where would I put it? Meantime solution: in a virtual machine. --

6 years, 4 months

1
0
0 0

Re: [ros-dev] Status Meeting (November 2018)

by hermes.belusca＠sfr.fr

‌Hi! Usually when we talk about ReactOS 0.5, we implicitly think that it will enter beta state there. So unless you consider this to not completely hold anymore, we can look at what remains to be done/fixed (importantly) so that we may qualify as going into beta state. (And yes, USB and storage sound strongly as prerequisites for 0.5 in my opinion). Best, Hermes <div class="gl_quote" style="margin-top: 20px; padding-top: 5px;">De : "Ged Murphy" A : "'ReactOS Development List'" Envoyé: mercredi 28 novembre 2018 17:42 Objet : Re: [ros-dev] Status Meeting (November 2018)   <div class="gl_quoted"><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style type="text/css"> </style>  <div class="WordSection1"> Some potential talking points:   <ul style="margin-top:0cm" type="disc"> <li class="MsoListParagraph" style="margin-left:0cm;mso-list:l0 level1 lfo1">Selecting a new coordinator</li> <li class="MsoListParagraph" style="margin-left:0cm;mso-list:l0 level1 lfo1">Version bump to 0.5</li> <li class="MsoListParagraph" style="margin-left:0cm;mso-list:l0 level1 lfo1">USB / Storage (perhaps linked to a 0.5 release)</li> <li class="MsoListParagraph" style="margin-left:0cm;mso-list:l0 level1 lfo1">Mattermost</li> <li class="MsoListParagraph" style="margin-left:0cm;mso-list:l0 level1 lfo1">New website progress</li> </ul>     From: Ros-dev <ros-dev-bounces(a)reactos.org> On Behalf Of Mark Jansen Sent: Wednesday, 28 November 2018 16:13 To: ReactOS Development List <ros-dev(a)reactos.org> Subject: Re: [ros-dev] Status Meeting (November 2018)   <div> <div> We can discuss this if you are present, but I don't see the value in discussing it without you. </div> <div> We have seen before that something discussed without the initiator being present is time not well spent, since it is a bit hard to argue with only one side of the argument present </div> <div>   </div> <div>   </div> </div> <div>   <div> Op 26 nov. 2018 12:15 schreef <a href="mailto:hermes.belusca@sfr.fr">hermes.belusca(a)sfr.fr</a>: <blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0cm 0cm 0cm 6.0pt;margin-left:4.8pt;margin-right:0cm"> Hello, I may not be available as it's the day when I'm going somewhere for a conference; it just depends at which time I arrive at destination. For the meeting we may talk about the best way we can move to delivering all-in-one ReactOS ISOs (containing livecd + installation in both text and GUI modes), and which changes this could imply for our infrastructure (buildbots/website...). Best regards, Hermes <div style="margin-top:15.0pt"> De : "Javier Agustìn Fernàndez Arroyo" A : "ReactOS Development List" Envoyé: samedi 24 novembre 2018 22:06 Objet : Re: [ros-dev] Status Meeting (November 2018)   <div> <div> I'm at work but I will do my best to attend! </div>   <div> <div> El sáb., 24 nov. 2018 21:38, Colin Finck <<a href="mailto:colin@reactos.org">colin(a)reactos.org</a>> escribió: </div> <blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0cm 0cm 0cm 6.0pt;margin-left:4.8pt;margin-right:0cm"> Hi all! Let me invite you to the November 2018 meeting, taking place next Thursday, November 29, 2018 at 19:00 UTC. Invited members will again receive their credentials shortly before the meeting. This will be the first meeting since August and I hope we get some more topics than just the obligatory Status Reports. Please send your proposals by replying to this mail. Best regards, Colin _______________________________________________ Ros-dev mailing list <a href="mailto:Ros-dev@reactos.org">Ros-dev(a)reactos.org</a> <a href="http://reactos.org/mailman/listinfo/ros-dev">http://reactos.org/mailman/listinfo/ros-dev</a> </blockquote> </div> _______________________________________________ Ros-dev mailing list <a href="mailto:Ros-dev@reactos.org">Ros-dev(a)reactos.org</a> <a href="http://reactos.org/mailman/listinfo/ros-dev">http://reactos.org/mailman/listinfo/ros-dev</a> </div> <div>   </div> </div> </blockquote> </div>   </div> </div>  _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://reactos.org/mailman/listinfo/ros-dev</div> <div class="gl_quoted"> </div> </div>

6 years, 4 months

6
5
0 0

Re: [ros-dev] Status Meeting (November 2018)

by hermes.belusca＠sfr.fr

Hello, I may not be available as it's the day when I'm going somewhere for a conference; it just depends at which time I arrive at destination. For the meeting we may talk about the best way we can move to delivering all-in-one ReactOS ISOs (containing livecd + installation in both text and GUI modes), and which changes this could imply for our infrastructure (buildbots/website...). Best regards, Hermes <div class="gl_quote" style="margin-top: 20px; padding-top: 5px;">De : "Javier Agustìn Fernàndez Arroyo" A : "ReactOS Development List" Envoyé: samedi 24 novembre 2018 22:06 Objet : Re: [ros-dev] Status Meeting (November 2018)   <div class="gl_quoted"> <div dir="auto">I'm at work but I will do my best to attend!</div>   <div class="gmail_quote"> <div dir="ltr">El sáb., 24 nov. 2018 21:38, Colin Finck <<a href="mailto:colin@reactos.org">colin(a)reactos.org</a>> escribió:</div> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi all! Let me invite you to the November 2018 meeting, taking place next Thursday, November 29, 2018 at 19:00 UTC. Invited members will again receive their credentials shortly before the meeting. This will be the first meeting since August and I hope we get some more topics than just the obligatory Status Reports. Please send your proposals by replying to this mail. Best regards, Colin _______________________________________________ Ros-dev mailing list <a href="mailto:Ros-dev@reactos.org" rel="noreferrer" target="_blank">Ros-dev(a)reactos.org</a> <a href="http://reactos.org/mailman/listinfo/ros-dev" rel="noreferrer noreferrer" target="_blank">http://reactos.org/mailman/listinfo/ros-dev</a></blockquote> </div>  _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://reactos.org/mailman/listinfo/ros-dev</div> <div class="gl_quoted"> </div> </div>

6 years, 4 months

4
3
0 0

Website and JIRA Migration on Friday

by Colin Finck

Hi all, Our last 3 servers are finally being migrated on Friday morning (UTC). Expect downtimes for the following services during this period: * https://reactos.org * https://jira.reactos.org * https://lam.reactos.org As always, I will try my best to keep the downtimes low and let you know when everything is over. Best regards, Colin Finck

6 years, 5 months

1
1
0 0

Git/SVN Server migrated

by Colin Finck

Hi all! Another server has been migrated to new hardware and software today! I'm talking about our Git/SVN Server, which also serves BuildBot, Doxygen, download.reactos.org, etc. The anticipated and actual downtime has been so low again that I didn't even have to announce the migration in advance. Some remarks though: * If you had file server upload access to svn.reactos.org *and still need it*, please let me know and I can recreate your account. Have your SSH public key ready. Note that I plan to set up an easier and more official file sharing service for ReactOS soon. * For obvious reasons, the Mumble server at mumble.reactos.org has not been migrated and is now officially shut down. I'm looking forward to finally set up the Mattermost instance once all existing VMs have been migrated (5 done, 3 to go). * git.reactos.org is no longer accessible via the git:// protocol. If you have any URLs using that, please change them to https://. Cheers, Colin

6 years, 5 months

1
0
0 0

Re: [ros-dev] [ros-diffs] 03/03: [OLE32] The CoDisconnectContext() stub added in 6a2f9673 (PR #1044) is actually Vista+. Caught by Thomas Faber.

by Pierre Schweitzer

I'm not sure I understand this commit, nor the PR that was merged before. This is a synced module, for a Vista+ export... What's the point of this? It would have been better to sync with Wine and have this patch upstream. Le 18/11/2018 à 21:03, Hermès Bélusca-Maïto a écrit : > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d320f5a8daf4627458e8… > > commit 2d320f5a8daf4627458e81f0ffd51bdd8f60d120 > Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> > AuthorDate: Sun Nov 18 21:05:32 2018 +0100 > Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> > CommitDate: Sun Nov 18 21:06:22 2018 +0100 > > [OLE32] The CoDisconnectContext() stub added in 6a2f9673 (PR #1044) is actually Vista+. Caught by Thomas Faber. > --- > dll/win32/ole32/ole32.spec | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dll/win32/ole32/ole32.spec b/dll/win32/ole32/ole32.spec > index d4ed1163d4..97667918e9 100644 > --- a/dll/win32/ole32/ole32.spec > +++ b/dll/win32/ole32/ole32.spec > @@ -23,7 +23,7 @@ > # CoCreateObjectInContext > # CoDeactivateObject > @ stdcall -stub CoDisableCallCancellation(ptr) > -@ stdcall -stub CoDisconnectContext(long) > +@ stdcall -stub -version=0x600+ CoDisconnectContext(long) > @ stdcall CoDisconnectObject(ptr long) > @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime > @ stdcall -stub CoEnableCallCancellation(ptr) > -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

6 years, 5 months

1
0
0 0

Last SVN repo finally converted to Git

by Colin Finck

Hi all! Having converted the last ReactOS SVN repository (press-media) to Git today, we can finally call the entire Git migration done :) Well, probably it felt done for you for a long time, but I still struggled with that last repository until today. As I'm also about to migrate the Git/SVN server soon, I can finally tell you about the long-term availability of the old SVN repositories: * Access to svn.reactos.org over the svn:// protocol will soon be suspended. * Read-only access to the press-media, project-tools, reactos, and web SVN repositories at https://svn.reactos.org will be maintained. This allows you to continue looking up old SVN history whenever Git's log has problems tracking a file move. * Access to ViewVC at https://svn.reactos.org/svn and https://svn.reactos.org/viewcvs will be suspended as well. One less tool for us to maintain. Of course, I will again let you know when the actual migration is happening (or already over :)). Cheers, Colin

6 years, 5 months

1
0
0 0

no replies about making reactos accessible for the blind

by Dick

Hi, I did not receive anny replies about my question to make reactos accessible for the blind. I would really suggest to do that while building the os, instead of doign it when the whole system is fully built.

6 years, 5 months

6
21
0 0

Mail server downtime tomorrow

by Colin Finck

Hi all! Our mail server will be shut down for migration TOMORROW, WEDNESDAY, NOVEMBER 14, AROUND 9:00 UTC This will result in a temporary downtime for the following services: * @reactos.org E-Mail addresses * Mailing lists * https://iserv.reactos.org The migration has already been prepared and simulated, so I expect the downtime to be low and the entire process to only take a few minutes. I will let you know when everything is back up again. We look forward to improve the performance, reliability, and especially maintainability through this migration. This probably just sounds like a pile of buzzwords to you, but there are hardly other words to describe a move from HDDs to SSDs, data replication on even more disks, and gaining independence from a single hypervisor hardware ;) Cheers, Colin

6 years, 5 months

1
1
0 0

Duplicated include in reactos/base/shell/filebrowser/filebrowser.c

by Manuel Oppermann

6 years, 5 months

1
0
0 0

Distinguish between Windows and ReactOS

by Nick Surfer

Hello all. Sorry if this mail is off topic of the mail-list, but am not sure which one is right for my question. I am writing a program which needs to know exact environment in which it is running. In case of Windows I simply use GetVersionEx and then analyze dwMajorVersion + dwMinorVersion which is enough for my case (then I know which WIN API calls I should use). But I stuck how to recognize that my program runs in ReactOS. I failed to find any docs about it. Any help is appreciated. P.S. I am not well experienced in WIN API, so if someone gives me an example it will be great.

6 years, 5 months

3
3
0 0

reactos & debug mode issue

by Javier Agustìn Fernàndez Arroyo

Hello all, I have just noticed that ReactOS, when in debug configuration, will only boot if an output console is set up. Won't boot if minicom (for example) is not running... Is that expected?

6 years, 5 months

2
1
0 0

reports about Win7+ apps

by Javier Agustìn Fernàndez Arroyo

hello all, im planning to use ReactOS at a foundation here in Madrid, which is dedicated to people with intellectual disabilities he point is, they are using mostly Windows 10, so they are using Win10 apps are bug reports about Win10 apps acceptable?

6 years, 5 months

3
5
0 0

ReactOS 0.4.10 to be released tomorrow, November 6, 2018 - Press Kit is online!

by Colin Finck

Hi all! ReactOS 0.4.10 will be released tomorrow, Tuesday, November 6, 2018! The download will be officially available around noon (CEST). A Press Kit for the ReactOS 0.4.10 release is already available: https://download.reactos.org/reactos/ReactOS/0.4.10/ReactOS-0.4.10-PressKit… Feel free to send it to interested parties to let them know about the upcoming release in advance. Best regards, Colin Finck

6 years, 5 months

1
0
0 0

nvda and reactos

by Dick

Hi, I think it would be much better to implement accessibillity for visualy impared people when building an os, than having to find ways to make that possible when everything is built and running. Nvda is a good opensource screenreader for windows The only big problem is, it heavily depends on msaa and iaccessible which will not be included in reactos i suppose. So: what would be the way to make this os accessible for the blind? I am not a programmer at all so maybe i say stupid things. The most simple way i could think of is, creating a textmode environment. In this case i do not mean just a command prompt, like dos, but the full functions but without graphical interface(like the browser browsh, www.brow.sh) can do using a headless-firefox to open pages without needing anny graphical interface(in monochrome mode it displays just text, but is able to stream youtube/everything firefox can handle). If something like that can be created in reactos, the only thing needed is to make the windows binaries of brltty work and much of the accessibility would be ready to use, as long as every graphic element is banned from the screen otherwise blrtty will display just lines with ??????????????? on the braille display. I am curious to know if some things can be done to make reactos accesible for the blind. best regards, Dick

6 years, 5 months

1
0
0 0

DbgCom release note.

by Neo Love

Greetings fellow developers... After a rather long hiatus (I actually came close to death), I went back to the DbgCom source and merged some improvements that are now in the RosIDE I'm working on. Most notably a Preferences settings dialog, but also some improved performance in the message list painting, and various bug fixes. The first time you run DbgCom, be sure to execute the Preferences dialog, and Ok the settings, so they get stored in the registry. I will make the source dependencies available shortly, they just need to be cleaned up a bit, since there is currently some hackery in there that I don't want to publish. I'll notify you on the ROSBE-100 page. You'll find DbgCom here: https://jira.reactos.org/browse/ROSBE-100 Well, that's it I guess. Best Regards / Love

6 years, 5 months

1
0
0 0

Pen width support

by katahiromz

Can somebody read this codes? https://gist.github.com/katahiromz/36f7135d3afe9fe6d2b7b28816be0f30 Thanks. katahiromz

6 years, 5 months

1
0
0 0

Re: [ros-dev] [ros-diffs] 03/04: [KERNEL32] Directly use UnhandledExceptionFilter in BaseProcessStartup

by Alex Ionescu

Same here! This will break things. We should not be overriding the proper handling of the exception filters. Best regards, Alex Ionescu On Sun, Oct 28, 2018 at 9:03 AM Mark Jansen <mark.jansen(a)reactos.org> wrote: > > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=824e5dba51aca08204045… > > commit 824e5dba51aca08204045e440be9c253a8469ac2 > Author: Mark Jansen <mark.jansen(a)reactos.org> > AuthorDate: Sat Oct 20 15:38:21 2018 +0200 > Commit: Mark Jansen <mark.jansen(a)reactos.org> > CommitDate: Sun Oct 28 13:01:38 2018 +0100 > > [KERNEL32] Directly use UnhandledExceptionFilter in BaseProcessStartup > --- > dll/win32/kernel32/client/proc.c | 29 +---------------------------- > 1 file changed, 1 insertion(+), 28 deletions(-) > > diff --git a/dll/win32/kernel32/client/proc.c > b/dll/win32/kernel32/client/proc.c > index dbd5c10d0f..f36219457b 100644 > --- a/dll/win32/kernel32/client/proc.c > +++ b/dll/win32/kernel32/client/proc.c > @@ -445,33 +445,6 @@ BasepSxsCloseHandles(IN PBASE_MSG_SXS_HANDLES Handles) > } > } > > -static > -LONG BaseExceptionFilter(EXCEPTION_POINTERS *ExceptionInfo) > -{ > - LONG ExceptionDisposition = EXCEPTION_EXECUTE_HANDLER; > - LPTOP_LEVEL_EXCEPTION_FILTER RealFilter; > - RealFilter = RtlDecodePointer(GlobalTopLevelExceptionFilter); > - > - if (RealFilter != NULL) > - { > - _SEH2_TRY > - { > - ExceptionDisposition = RealFilter(ExceptionInfo); > - } > - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) > - { > - } > - _SEH2_END; > - } > - if ((ExceptionDisposition == EXCEPTION_CONTINUE_SEARCH || > ExceptionDisposition == EXCEPTION_EXECUTE_HANDLER) && > - RealFilter != UnhandledExceptionFilter) > - { > - ExceptionDisposition = UnhandledExceptionFilter(ExceptionInfo); > - } > - > - return ExceptionDisposition; > -} > - > VOID > WINAPI > BaseProcessStartup(PPROCESS_START_ROUTINE lpStartAddress) > @@ -489,7 +462,7 @@ BaseProcessStartup(PPROCESS_START_ROUTINE > lpStartAddress) > /* Call the Start Routine */ > ExitThread(lpStartAddress()); > } > - _SEH2_EXCEPT(BaseExceptionFilter(_SEH2_GetExceptionInformation())) > + > _SEH2_EXCEPT(UnhandledExceptionFilter(_SEH2_GetExceptionInformation())) > { > /* Get the Exit code from the SEH Handler */ > if (!BaseRunningInServerProcess) > >

6 years, 5 months

1
0
0 0

Re: [ros-dev] [ros-diffs] 02/04: [KERNEL32] Use the default UnhandledExceptionFilter in BaseThreadStartup. This should allow unhandled exceptions in a thread to trigger our crash reporter, instead of killing the process directly.

by Alex Ionescu

Uhh, this change is not correct. It overrides the proper handling of exception filtering -- please revert. Best regards, Alex Ionescu On Sun, Oct 28, 2018 at 9:03 AM Mark Jansen <mark.jansen(a)reactos.org> wrote: > > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40549483f60aa00e9fc95… > > commit 40549483f60aa00e9fc952ba831027028f6df107 > Author: Mark Jansen <mark.jansen(a)reactos.org> > AuthorDate: Thu Oct 18 22:07:37 2018 +0200 > Commit: Mark Jansen <mark.jansen(a)reactos.org> > CommitDate: Sun Oct 28 13:01:38 2018 +0100 > > [KERNEL32] Use the default UnhandledExceptionFilter in > BaseThreadStartup. > This should allow unhandled exceptions in a thread to trigger our > crash reporter, > instead of killing the process directly. > --- > dll/win32/kernel32/client/thread.c | 25 +------------------------ > 1 file changed, 1 insertion(+), 24 deletions(-) > > diff --git a/dll/win32/kernel32/client/thread.c > b/dll/win32/kernel32/client/thread.c > index 8fc5a7ad61..2ff0102483 100644 > --- a/dll/win32/kernel32/client/thread.c > +++ b/dll/win32/kernel32/client/thread.c > @@ -26,29 +26,6 @@ BasepNotifyCsrOfThread(IN HANDLE ThreadHandle, > > /* FUNCTIONS > ******************************************************************/ > > -static > -LONG BaseThreadExceptionFilter(EXCEPTION_POINTERS * ExceptionInfo) > -{ > - LONG ExceptionDisposition = EXCEPTION_EXECUTE_HANDLER; > - LPTOP_LEVEL_EXCEPTION_FILTER RealFilter; > - > - RealFilter = RtlDecodePointer(GlobalTopLevelExceptionFilter); > - if (RealFilter != NULL) > - { > - _SEH2_TRY > - { > - ExceptionDisposition = RealFilter(ExceptionInfo); > - } > - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) > - { > - ExceptionDisposition = > UnhandledExceptionFilter(ExceptionInfo); > - } > - _SEH2_END; > - } > - > - return ExceptionDisposition; > -} > - > __declspec(noreturn) > VOID > WINAPI > @@ -68,7 +45,7 @@ BaseThreadStartup(IN LPTHREAD_START_ROUTINE > lpStartAddress, > /* Get the exit code from the Thread Start */ > ExitThread((lpStartAddress)((PVOID)lpParameter)); > } > - > _SEH2_EXCEPT(BaseThreadExceptionFilter(_SEH2_GetExceptionInformation())) > + > _SEH2_EXCEPT(UnhandledExceptionFilter(_SEH2_GetExceptionInformation())) > { > /* Get the Exit code from the SEH Handler */ > if (!BaseRunningInServerProcess) > >

6 years, 5 months

1
0
0 0

Test_KVM_AHK is temporarily offline

by Sylvain Petreolle

Hello all. My family is at home and I need to shut down the AHK bot until the end of the week. See you later on Ros ;-) Kind regards, Sylvain Petreolle

6 years, 5 months

1
0
0 0

New member

by Никита

6 years, 6 months

2
1
0 0

Upcoming Google Summer of Code Mentor Summit

by Colin Finck

Hi all, As announced, I'll be travelling to California this Thursday to attend the Google Summer of Code Mentor Summit from Friday to Sunday. I'll be using this opportunity to spread the word about ReactOS, our experiences with GSoC, and learning from other projects' experiences. I'm especially interested to hear how others are acquiring talented students and managing their list of task ideas over the year. Let's hope this will help us to get more than 1 student next year and efficiently collect a list of GSoC ideas continuously instead of preparing it shortly before the deadline ;) Is there anything else you want me to talk about during the summit? Cheers, Colin

6 years, 6 months

2
1
0 0

Add InitializeProcThreadAttributeList function

by Biswapriyo Nath

I found that this function `InitializeProcThreadAttributeList()` is added with GetProcAddress but not with the real function. I can provide the real function from Windows 10. The function hasn't any imported function, just conatins some arithmatic operations. I don't know how to contribute and not familiar with ReactOS repo. So, I can only provide a c file.

6 years, 6 months

1
0
0 0

Re: [ros-dev] [ros-diffs] 01/01: [SERVICES] Fix timeout when a service is stopped

by Pierre Schweitzer

Hey Eric, What's the purpose of that "Sleep(2000);"? Is it a debug leftover? Cheers, Pierre Le 05/10/2018 à 08:43, Eric Kohl a écrit : > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6d81f225747e4b1b3716… > > commit f6d81f225747e4b1b3716e9ca8629f77dcc52b1a > Author: Eric Kohl <eric.kohl(a)reactos.org> > AuthorDate: Fri Oct 5 08:41:23 2018 +0200 > Commit: Eric Kohl <eric.kohl(a)reactos.org> > CommitDate: Fri Oct 5 08:41:23 2018 +0200 > > [SERVICES] Fix timeout when a service is stopped > > RSetServiceStatus: Send the stop command for the dispatcher thread from a separate thread. > > Fixes CORE-15064 > --- > base/system/services/rpcserver.c | 59 ++++++++++++++++++++++++++++++++++------ > 1 file changed, 50 insertions(+), 9 deletions(-) > > diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c > index 7f251c8760..8e383a5bdc 100644 > --- a/base/system/services/rpcserver.c > +++ b/base/system/services/rpcserver.c > @@ -1671,6 +1671,43 @@ ScmIsValidServiceState(DWORD dwCurrentState) > } > > > +static > +DWORD > +WINAPI > +ScmStopThread( > + _In_ PVOID pParam) > +{ > + PSERVICE pService; > + > + DPRINT("ScmStopThread(%p)\n", pParam); > + > + pService = (PSERVICE)pParam; > + > + if (pService->lpImage->dwImageRunCount != 0) > + return 0; > + > + Sleep(2000); > + > + /* Lock the service database exclusively */ > + ScmLockDatabaseExclusive(); > + > + /* Stop the dispatcher thread */ > + ScmControlService(pService->lpImage->hControlPipe, > + L"", > + (SERVICE_STATUS_HANDLE)pService, > + SERVICE_CONTROL_STOP); > + > + /* Remove the service image */ > + ScmRemoveServiceImage(pService->lpImage); > + > + /* Unlock the service database */ > + ScmUnlockDatabase(); > + > + DPRINT("ScmStopThread done!\n"); > + return 0; > +} > + > + > /* Function 7 */ > DWORD > WINAPI > @@ -1683,6 +1720,8 @@ RSetServiceStatus( > DWORD dwPreviousType; > LPCWSTR lpLogStrings[2]; > WCHAR szLogBuffer[80]; > + HANDLE hStopThread = NULL; > + DWORD dwStopThreadId; > UINT uID; > > DPRINT("RSetServiceStatus() called\n"); > @@ -1762,15 +1801,17 @@ RSetServiceStatus( > /* If we just stopped the last running service... */ > if (lpService->lpImage->dwImageRunCount == 0) > { > - /* Stop the dispatcher thread */ > - ScmControlService(lpService->lpImage->hControlPipe, > - L"", > - (SERVICE_STATUS_HANDLE)lpService, > - SERVICE_CONTROL_STOP); > - > - /* Remove the service image */ > - ScmRemoveServiceImage(lpService->lpImage); > - lpService->lpImage = NULL; > + /* Run the stop thread to stop the service dispatcher */ > + hStopThread = CreateThread(NULL, > + 0, > + (LPTHREAD_START_ROUTINE)ScmStopThread, > + (LPVOID)lpService, > + 0, > + &dwStopThreadId); > + if (hStopThread != NULL) > + { > + CloseHandle(hStopThread); > + } > } > } > > -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

6 years, 6 months

1
0
0 0

WidenPath

by katahiromz

About NTGDI Should we use PATHOBJ for WidenPath and FlattenPath?

6 years, 6 months

2
1
0 0

Unused bandwidth at home

by Javier Agustìn Fernàndez Arroyo

Hello all, I have just set optical fiber up at my home. The thing is, im completely sure it will be infra-used Is there anything in ROS i might do for help with that?

6 years, 7 months

1
0
0 0

Re: [ros-dev] [ros-diffs] 01/01: [ADVAPI32][SERVICES] Add (dummy) password encryption/decryption functions to CreateServiceA/W and ChangeServiceConfigA/W in order to prepare to pass encrypted passwords to the service manager

by Pierre Schweitzer

Hi Eric, For security reason, when freeing your password buffers (see below), you shouldn't be using ZeroMemory() before free, but SecureZeroMemory() to zero the buffer. The first one can be optimized (and thus removed) by the compiler. The second cannot. Cheers, Pierre Le 17/09/2018 à 16:36, Eric Kohl a écrit : > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e2c4657ca10dea1154cb… > > commit 5e2c4657ca10dea1154cb43f16ee6962999ac7a4 > Author: Eric Kohl <eric.kohl(a)reactos.org> > AuthorDate: Mon Sep 17 16:34:48 2018 +0200 > Commit: Eric Kohl <eric.kohl(a)reactos.org> > CommitDate: Mon Sep 17 16:34:48 2018 +0200 > > [ADVAPI32][SERVICES] Add (dummy) password encryption/decryption functions to CreateServiceA/W and ChangeServiceConfigA/W in order to prepare to pass encrypted passwords to the service manager > --- > base/system/services/config.c | 24 ++++++++ > base/system/services/rpcserver.c | 49 ++++++++++++++-- > base/system/services/services.h | 7 +++ > dll/win32/advapi32/service/scm.c | 123 ++++++++++++++++++++++++++++++++------- > 4 files changed, 177 insertions(+), 26 deletions(-) > > diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c > index aa64233350..454181bb66 100644 > --- a/base/system/services/rpcserver.c > +++ b/base/system/services/rpcserver.c > @@ -2216,12 +2232,23 @@ RChangeServiceConfigW( > dwError = ERROR_SUCCESS; > > if (dwError != ERROR_SUCCESS) > + { > + DPRINT1("ScmSetServicePassword failed (Error %lu)\n", dwError); > goto done; > + } > } > } > } > > done: > + if (lpClearTextPassword != NULL) > + { > + /* Wipe and release the password buffer */ > + ZeroMemory(lpClearTextPassword, > + (wcslen(lpClearTextPassword) + 1) * sizeof(WCHAR)); > + HeapFree(GetProcessHeap(), 0, lpClearTextPassword); > + } > + > if (hServiceKey != NULL) > RegCloseKey(hServiceKey); > > @@ -2612,6 +2645,14 @@ done: > if (hServiceKey != NULL) > RegCloseKey(hServiceKey); > > + if (lpClearTextPassword != NULL) > + { > + /* Wipe and release the password buffer */ > + ZeroMemory(lpClearTextPassword, > + (wcslen(lpClearTextPassword) + 1) * sizeof(WCHAR)); > + HeapFree(GetProcessHeap(), 0, lpClearTextPassword); > + } > + > if (dwError == ERROR_SUCCESS) > { > DPRINT("hService %p\n", hServiceHandle); -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

6 years, 7 months

2
1
0 0

Re: [ros-dev] Win8 theme for ReactOS?

by theUser BL

> Isn't it fun that ppl simply don't understand a "NO" I give 'em in the > forums?! Thats only a comment of ONE developer. If your medical doctor syas you anything, do you never asks a second doctor again for the same thing, to see if he was right? > I even explained why and that GreenteaOS is not more than > stolen ROS code (*) The only problem you have had is, that he have removed the name "ReactOS" everywhere. But it is still al under the same license like ReactOS. > filled with questionable code sources like the > betaarchive forums. So "NO" means go on the other dev's nerves for a > ugly theme violating our and MS's copyrights? Why is an Win8-theme violating MS-copyright but - changing the color of WineMine to Microsofts WinMine - copying the XP explorer.exe 1:1, only the images on it are different - having a Look And Feel VERY similar to Win2000 - etc is all ok? Greetings theuserbl

6 years, 7 months

3
2
0 0

Win8 theme for ReactOS?

by theUser BL

A while ago I have asked in the forum, if the modified Lautus-theme of GreenteaOS could beintegrated in ReactOS https://www.reactos.org/forum/viewtopic.php?f=2&t=16788 Sadly the theme is called in GreenteaOS Lautus, too. Here the source of it https://github.com/GreenteaOS/Deprecated/tree/master/third-party/reactos/me… But it looks like Windows 8. Here a screenshot of the Greentea Windows 8 like theme on ReactOS. Choose one link. I have uploaded it multiple times on multiple places, because some picture-uploading-sides delete its files from time to time https://image.ibb.co/gTsPkU/Virtual_Box_React_OS_0_4_9_08_09_2018_16_22_18.… http://img4host.net/upload/081642005b93dfb8c233a.png https://img3.picload.org/image/dlpgdlow/virtualbox_reactos0.4.9_08_09_.png https://cdn3.imggmi.com/uploads/2018/9/8/e016c5a6842640ac5f7436ee2e9b04e7-f… https://i.imgur.com/mCUvsLy.png EmuandCo is against the integration of the Win8-theme in ReactOS. But he is the only ReactOS-developer in the ReactOS-forum. So I now also ask here, what the other developers thinking about it. Greetings theuserbl

6 years, 7 months

5
4
0 0

Contribution for Tracing APIs

by Biswapriyo Nath

I've some working code for event tracing APIs like StartTrace, OpenTrace, ControlTrace etc. Those works in Windows 10 but are not present in ReactOS Advapi.dll. How can I add those APIs?

6 years, 7 months

2
3
0 0

Virtual consoles using ntvdm

by Javier Agustìn Fernàndez Arroyo

A crazy idea .. What about implementing some kind of virtual consoles, just like Linux? The point is, using ntvdm subsystem, we could allow only console (DOS) apps to run in there. And some kind of "you are running a console. Switch to desktop to run this app!" Message is anyone tried to run another stuff What do you think? A side effect could be, allow remote connections, etc ... :)

6 years, 7 months

2
1
0 0

Valve support for ReactOS?

by Javier Agustìn Fernàndez Arroyo

i was thinking about Valve's Linux support (Steam play) and i was wondering about asking them to support ReactOS via development... Since Windows XP/2k3 are being abandoned, maybe ReactOS could still run Steam games... if they support it. what do you think?

6 years, 7 months

6
6
0 0

Broken booting since commit ae11022712db7a5a1e818e33a5f4052eac7e8e3c

by David Quintana (gigaherz)

I believe from the testbot log, that my commit made some DLLs grow out of their assigned memory allocation, but I don't know how to update the dll address mappings. Help appreciated.

6 years, 7 months

2
2
0 0

Status Meeting (August 2018)

by Colin Finck

Hi all! Let me invite you to the August 2018 meeting, taking place this Thursday, August 30, 2018 at 19:00 UTC. Invited members will again receive their credentials shortly before the meeting. The current agenda is: 1. Status Reports (extended) Note that this is the first meeting after both GSoC and the Hackfest. Participants in either effort are encouraged to also report their related work, what they liked and didn't like about GSoC/ Hackfest, and what we could do better next time. As always, I'm open for additional proposals. I also have to announce that I will definitely be unavailable during the entire September, so someone else has to invite for and lead the September meeting. Best regards, Colin

6 years, 7 months

1
0
0 0

Test_VBox finally fixed - but a flawed test remains

by Colin Finck

Hi all, I took some time during Hackfest to upgrade our Test_VBox Testbot to Ubuntu 18.04, which finally brings us VirtualBox 5.2.x support for sysreg2. Pierre also worked on the relevant BuildBot scripts to improve their reliability. This has resulted in https://github.com/reactos/buildbot_config/commit/388a831eb5ccf67535d8cbd6d… and since using that script, the infamous "IVirtualBox object is null" bug hasn't occurred again :) The upgrade from VirtualBox 4.3.40 to 5.2.10 also resulted in unbearably slow serial port output at first, but this could be fixed by https://github.com/reactos/sysreg2/commit/a4eb4a4551618b4af4dc1985ad8c55fe0…. Have a look at this commit if you encounter a slow serial port output in one of the latest VirtualBox versions with either operating system. This only leaves a funnily flawed WINE test left, which currently causes the entire regression testing process to come to a standstill: https://jira.reactos.org/browse/CORE-14975 Cheers, Colin

6 years, 7 months

2
1
0 0

Discussions on ENIW

by Erkin Alp Güney

|My proposed architecture diagram for ENIW: Linux app systemd <> systemd2svchost Windows userland ------ User-mode Linux kernel ------- SVCHOST Windows services ENIW.SYS Windows personalities Kernel-mode drivers for everything -------------------------- NTOSKRNL.EXE ----------------------------------- ENIW is a component to implement WSL-like functionality named after WINE and its bacronym is ENIW never imitated WSL. systemd2svchost is a service translator to run systemd units as svchost services. Forum thread: <https://www.reactos.org/forum/viewtopic.php?f=9&t=17434> JIRA ticket: <https://jira.reactos.org/browse/CORE-13613> Yours, faihfully Erkin Alp |

6 years, 8 months

2
6
0 0

Re: [ros-dev] [ros-diffs] 01/01: [NTOS:MM] Fix paged pool expansion

by Pierre Schweitzer

Hi Timo et al., To make the issue wider known than just me comment on GitHub. That commit introduced a regression. Le 20/08/2018 à 18:07, Timo Kreuzer a écrit : > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c219be9409af429909b14… > > commit c219be9409af429909b1433da536516b3c3ab823 > Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> > AuthorDate: Sun Feb 4 19:20:56 2018 +0100 > Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> > CommitDate: Mon Aug 20 18:07:35 2018 +0200 > > [NTOS:MM] Fix paged pool expansion > --- > ntoskrnl/mm/ARM3/pool.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/ntoskrnl/mm/ARM3/pool.c b/ntoskrnl/mm/ARM3/pool.c > index 7cebabe818..113a7aa981 100644 > --- a/ntoskrnl/mm/ARM3/pool.c > +++ b/ntoskrnl/mm/ARM3/pool.c > @@ -561,10 +565,11 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, > MiInitializePfnForOtherProcess(PageFrameNumber, > (PMMPTE)PointerPde, > MmSystemPageDirectory[(PointerPde - MiAddressToPde(NULL)) / PDE_COUNT]); > +#endif > > /* Write the actual PDE now */ > -// MI_WRITE_VALID_PDE(PointerPde, TempPde); > -#endif > + MI_WRITE_VALID_PDE(PointerPde, TempPde); > + That little change for x86 actually breaks VBox support. It hits an ASSERT during 3rd stage: *** Assertion failed: PointerPde->u.Hard.Valid == 0 *** Source File: /srv/buildbot/Build_GCCLin_x86/build/ntoskrnl/mm/ARM3/miarm.h, line 975 See testbots for instance: https://build.reactos.org/builders/Test%20VBox/builds/8625/steps/test/logs/… Cheers, Pierre -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

6 years, 8 months

1
0
0 0

Re: [ros-dev] [ros-diffs] 01/01: [CONFIGURE] Added support for new VS 19.15.x

by Pierre Schweitzer

Formatting is inconsistent now. Tab vs space issue. Le 16/08/2018 à 17:14, Oleksandr Shaposhnikov a écrit : > 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 > -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

6 years, 8 months

1
0
0 0

Re: [ros-dev] [ros-diffs] 01/01: [HAL] Remove misleading debug prints about USB controllers.

by Alex Ionescu

Why are these misleading? These are checks that Windows does that we are missing. Guys, open PRs for changes like these ffs. Best regards, Alex Ionescu On Wed, Aug 8, 2018 at 7:14 PM Thomas Faber <thomas.faber(a)reactos.org> wrote: > > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ed0f9ab576f094b27e11… > > commit 1ed0f9ab576f094b27e11ba374738ecabc00e2e6 > Author: Thomas Faber <thomas.faber(a)reactos.org> > AuthorDate: Wed Aug 8 19:58:56 2018 +0200 > Commit: Thomas Faber <thomas.faber(a)reactos.org> > CommitDate: Wed Aug 8 20:08:38 2018 +0200 > > [HAL] Remove misleading debug prints about USB controllers. > --- > hal/halx86/legacy/bussupp.c | 26 -------------------------- > 1 file changed, 26 deletions(-) > > diff --git a/hal/halx86/legacy/bussupp.c b/hal/halx86/legacy/bussupp.c > index a37d875ede..4d20396560 100644 > --- a/hal/halx86/legacy/bussupp.c > +++ b/hal/halx86/legacy/bussupp.c > @@ -1128,32 +1128,6 @@ HalpInitializePciBus(VOID) > } > } > > - /* Check if this is a USB controller */ > - if ((PciData->BaseClass == PCI_CLASS_SERIAL_BUS_CTLR) && > - (PciData->SubClass == PCI_SUBCLASS_SB_USB)) > - { > - /* Check if this is an OHCI controller */ > - if (PciData->ProgIf == 0x10) > - { > - DbgPrint("\tDevice is an OHCI (USB) PCI Expansion > Card. Turn off Legacy USB in your BIOS!\n\n"); > - continue; > - } > - > - /* Check for Intel UHCI controller */ > - if (PciData->VendorID == 0x8086) > - { > - DbgPrint("\tDevice is an Intel UHCI (USB) > Controller. Turn off Legacy USB in your BIOS!\n\n"); > - continue; > - } > - > - /* Check for VIA UHCI controller */ > - if (PciData->VendorID == 0x1106) > - { > - DbgPrint("\tDevice is a VIA UHCI (USB) > Controller. Turn off Legacy USB in your BIOS!\n\n"); > - continue; > - } > - } > - > /* Now check the registry for chipset hacks */ > Status = HalpGetChipHacks(PciData->VendorID, > PciData->DeviceID, > >

6 years, 8 months

1
0
0 0

Re: [ros-dev] [ros-diffs] 01/04: [REACTOS] RtlAssert(): use "%lu" as LineNumber format.

by Michael Fritscher

Moin, On 08.08.2018 22:05, Serge Gautherie wrote: > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97d3b3ce3349fa87d01ee… > > commit 97d3b3ce3349fa87d01ee29d0d08ff2ca8618a7d > Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> > AuthorDate: Thu Jun 21 05:05:50 2018 +0200 > Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> > CommitDate: Wed Aug 8 21:24:07 2018 +0200 > > [REACTOS] RtlAssert(): use "%lu" as LineNumber format. > --- ... > - if (NULL != Message) > - { > - DbgPrint("Assertion \'%s\' failed at %s line %d: %s\n", > - (PCHAR)FailedAssertion, > - (PCHAR)FileName, > - LineNumber, > - Message); > - } > - else > - { > - DbgPrint("Assertion \'%s\' failed at %s line %d\n", > - (PCHAR)FailedAssertion, > - (PCHAR)FileName, > - LineNumber); > - } > - > - //DbgBreakPoint(); > + if (Message != NULL) > + { > + DbgPrint("Assertion \'%s\' failed at %s line %u: %s\n", > + (PCHAR)FailedAssertion, > + (PCHAR)FileName, > + LineNumber, > + Message); > + } > + else > + { > + DbgPrint("Assertion \'%s\' failed at %s line %u\n", > + (PCHAR)FailedAssertion, > + (PCHAR)FileName, > + LineNumber); > + } > + > + //DbgBreakPoint(); > } > > // DECLSPEC_NORETURN > here no %lu, but only %u? Best regards, Michael Fritscher

6 years, 8 months

2
1
0 0

Re: [ros-dev] [ros-diffs] 01/01: [WLNOTIFY] Add sens service stubs

by Ged Murphy

Hi Eric, Do you plan on implementing sysntfy which sens is dependent upon from win7, or do you plan to stick with the XP way via winlogon? If so, I have some undocumented notes and code on sysntfy which might be of some use. Ged. -----Original Message----- From: Ros-diffs <ros-diffs-bounces(a)reactos.org> On Behalf Of Eric Kohl Sent: Tuesday, 07 August 2018 21:57 To: ros-diffs(a)reactos.org Subject: [ros-diffs] 01/01: [WLNOTIFY] Add sens service stubs https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb5d5ecd64e1e47701e92… commit fb5d5ecd64e1e47701e922e08fd97b29a1d418be Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Aug 7 22:56:33 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Aug 7 22:56:33 2018 +0200 [WLNOTIFY] Add sens service stubs --- dll/win32/wlnotify/CMakeLists.txt | 1 + dll/win32/wlnotify/{test.c => senssvc.c} | 56 +++++++++++++++++--------------- dll/win32/wlnotify/test.c | 2 +- dll/win32/wlnotify/wlnotify.spec | 24 +++++++------- 4 files changed, 43 insertions(+), 40 deletions(-) diff --git a/dll/win32/wlnotify/CMakeLists.txt b/dll/win32/wlnotify/CMakeLists.txt index 1db47fffe2..6cbf00ce86 100644 --- a/dll/win32/wlnotify/CMakeLists.txt +++ b/dll/win32/wlnotify/CMakeLists.txt @@ -3,6 +3,7 @@ spec2def(wlnotify.dll wlnotify.spec ADD_IMPORTLIB) list(APPEND SOURCE schedsvc.c + senssvc.c test.c wlnotify.c precomp.h) diff --git a/dll/win32/wlnotify/test.c b/dll/win32/wlnotify/senssvc.c similarity index 86% copy from dll/win32/wlnotify/test.c copy to dll/win32/wlnotify/senssvc.c index e3911d3b75..e238a849a9 100644 --- a/dll/win32/wlnotify/test.c +++ b/dll/win32/wlnotify/senssvc.c @@ -1,12 +1,13 @@ /* * PROJECT: ReactOS system libraries * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/wlnotify/test.c - * PURPOSE: Winlogon notifications - * PROGRAMMER: Eric Kohl + * FILE: dll/win32/wlnotify/senssvc.c + * PURPOSE: SENS service logon notifications + * PROGRAMMER: Eric Kohl <eric.kohl(a)reactos.org> */ #include "precomp.h" +#include <winsvc.h> #define _NDEBUG #include <debug.h> @@ -14,10 +15,10 @@ VOID WINAPI -TestLogonEvent( +SensDisconnectEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestLogonEvent\n"); + DPRINT("SensDisconnectEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -31,10 +32,10 @@ TestLogonEvent( VOID WINAPI -TestLogoffEvent( +SensLockEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestLogoffEvent\n"); + DPRINT("SensLockEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -48,10 +49,10 @@ TestLogoffEvent( VOID WINAPI -TestLockEvent( +SensLogoffEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestLockEvent\n"); + DPRINT("SensLogoffEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -65,10 +66,10 @@ TestLockEvent( VOID WINAPI -TestUnlockEvent( +SensLogonEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestUnlockEvent\n"); + DPRINT("SensLogonEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -82,10 +83,10 @@ TestUnlockEvent( VOID WINAPI -TestStartupEvent( +SensPostShellEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStartupEvent\n"); + DPRINT("SensPostShellEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -99,10 +100,10 @@ TestStartupEvent( VOID WINAPI -TestShutdownEvent( +SensReconnectEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestShutdownEvent\n"); + DPRINT("SensReconnectEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -116,10 +117,10 @@ TestShutdownEvent( VOID WINAPI -TestStartScreenSaverEvent( +SensShutdownEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStartScreenSaverEvent\n"); + DPRINT("SensShutdownEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -133,10 +134,10 @@ TestStartScreenSaverEvent( VOID WINAPI -TestStopScreenSaverEvent( +SensStartScreenSaverEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStopScreenSaverEvent\n"); + DPRINT("SensStartScreenSaverEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -150,10 +151,10 @@ TestStopScreenSaverEvent( VOID WINAPI -TestStartShellEvent( +SensStartShellEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStartShellEvent\n"); + DPRINT("SensStartShellEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -167,10 +168,10 @@ TestStartShellEvent( VOID WINAPI -TestPostShellEvent( +SensStartupEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStartShellEvent\n"); + DPRINT("SensStartupEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -181,12 +182,13 @@ TestPostShellEvent( DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); } + VOID WINAPI -TestDisconnectEvent( +SensStopScreenSaverEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestDisconnectEvent\n"); + DPRINT("SensStopScreenSaverEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -200,10 +202,10 @@ TestDisconnectEvent( VOID WINAPI -TestReconnectEvent( +SensUnlockEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestReconnectEvent\n"); + DPRINT("SensUnlockEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); diff --git a/dll/win32/wlnotify/test.c b/dll/win32/wlnotify/test.c index e3911d3b75..8f8705547a 100644 --- a/dll/win32/wlnotify/test.c +++ b/dll/win32/wlnotify/test.c @@ -170,7 +170,7 @@ WINAPI TestPostShellEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStartShellEvent\n"); + DPRINT("TestPostShellEvent\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); diff --git a/dll/win32/wlnotify/wlnotify.spec b/dll/win32/wlnotify/wlnotify.spec index 737448d4d9..2eb0b647c1 100644 --- a/dll/win32/wlnotify/wlnotify.spec +++ b/dll/win32/wlnotify/wlnotify.spec @@ -5,18 +5,18 @@ ;@ stub SCardSuspendCertProp @ stdcall SchedEventLogoff(ptr) @ stdcall SchedStartShell(ptr) -;@ stub SensDisconnectEvent -;@ stub SensLockEvent -;@ stub SensLogoffEvent -;@ stub SensLogonEvent -;@ stub SensPostShellEvent -;@ stub SensReconnectEvent -;@ stub SensShutdownEvent -;@ stub SensStartScreenSaverEvent -;@ stub SensStartShellEvent -;@ stub SensStartupEvent -;@ stub SensStopScreenSaverEvent -;@ stub SensUnlockEvent +@ stdcall SensDisconnectEvent(ptr) +@ stdcall SensLockEvent(ptr) +@ stdcall SensLogoffEvent(ptr) +@ stdcall SensLogonEvent(ptr) +@ stdcall SensPostShellEvent(ptr) +@ stdcall SensReconnectEvent(ptr) +@ stdcall SensShutdownEvent(ptr) +@ stdcall SensStartScreenSaverEvent(ptr) @ stdcall +SensStartShellEvent(ptr) @ stdcall SensStartupEvent(ptr) @ stdcall +SensStopScreenSaverEvent(ptr) @ stdcall SensUnlockEvent(ptr) ;@ stub ShowNotificationBallonW @ stdcall TestDisconnectEvent(ptr) @ stdcall TestLockEvent(ptr)

6 years, 8 months

1
0
0 0

Postponing the July Meeting

by Colin Finck

Hi all! Looking at the calendar, it would be time for the July Meeting today. However, I didn't receive any agenda proposals and also forgot to announce it in the course of releasing 0.4.9. So I suggest we postpone the meeting to next week's Thursday, August 2. Please send agenda proposals by then. That meeting also allows us to handle last-minute planning regarding the Hackfest. Best regards, Colin

6 years, 8 months

4
6
0 0

Re: [ros-dev] Postponing the July Meeting

by Giannis Adamopoulos

Hi, I really like this idea. Actually i was thinking something similar about user mode apps like paint or even the file browser of the shell which can be used from windows xp to windows 10. (You need just these three files from us: filebrowser.exe, rshell.dll and browseui.dll). Ged Murphy <gedmurphy.maillists(a)gmail.com> wrote on Wed, August 1st, 2018, 11:30 PM: > We could keep components in the reactos git project and just create a new repo for them, however it might still get lost/overshadowed slightly by the main reactos codebase. Another option would be to create a new separate project with one\multiple repos. This would allow us to truly separate components from the reactos project and try to generate interest on their own merit. > > We'd need to maximize their visibility by adding a good README.rd files with plenty of buzzwords for the google crawler bot to pick up. > > If it was successful and we decide to do more, then we'd need to come up with a format as to how to best manage multiple components. > Do we have individual repos for each component, which allows dedicated README.rd files? This would give maximum flexibility and allow us to have a separate README.rd for each component. > Do we bundle everything into one repo similar to how the WDK samples are setup? This is easier to manage, but less convenient for end users, and won't be as visible for people to find in google searches. > > Ged. > > > -----Original Message----- > From: Ros-dev <ros-dev-bounces(a)reactos.org> On Behalf Of Hermès BÉLUSCA-MAÏTO > Sent: Wednesday, 01 August 2018 20:20 > To: 'ReactOS Development List' <ros-dev(a)reactos.org> > Subject: Re: [ros-dev] Postponing the July Meeting > > Hi, > > This sounds interesting, for potential developers wanting just to work on some module, but not wanting to deal with the whole OS thing. > Would this mean that we also have to think about git submodules? Because (in the case of the NTFS driver for example) it would be in a different git repo, and then it would have to be automatically downloaded and updated whenever one of the core ROS dev updates his own ROS git repo. > > Cheers, > Hermes > > > -----Message d'origine----- > > De : Ros-dev [mailto:ros-dev-bounces@reactos.org] De la part de Ged > > Murphy Envoyé : mercredi 1 août 2018 20:16 À : 'ReactOS Development > > List' > > Objet : Re: [ros-dev] Postponing the July Meeting > > > > I have an item for the agenda. I'd like to discuss the possibility of > > moving some of our drivers out of the main repo and into something more convenient. > > > > In case I don't make the meeting, I'll put forward some of my reasons here: > > > > This thought has come about due to the btrfs driver which we use from > > Mark Harmstone. Mark's project receives quite a bit of interest on > > github, and I'm assuming one of the reasons is that it's so easy to > > find and build. Searching for 'btrfs windows' lists his project as the > > top hit in google, and building is as simple as cloning, opening the > > project in VS and clicking build (assuming you have the > > WDK) > > > > I'm wondering if we did the same thing to some of our drivers, we > > might generate more interest in them. A good example would be our NTFS driver. > > When searching for open source NTFS solutions you're only really given > > Linux and Max options. The reactos driver is buried deep in the search > > list, and you only see it if you know what you're looking for. Next if > > you want to build it, you need to clone the main reactos repo, install > > the build tools, setup and build the environment, build the tool > > chain, build the linkers libs, etc, etc. There are so many barriers > > for people who aren't part of the reactos development team that the chance of getting anyone interested in it are practically zero. > > > > This process would be much simpler if the code was available to clone > > as a separate project, and could simply build with the WDK and VS. > > There's then a chance that it might start to generate interest, and > > people may start working on it instead of it just bit-rotting deep in our main repo. > > > > If we're going to do that, why not consider others too. Network cards, > > sound stack, USB, boot loaders, printer drivers, directx, etc, There's > > lots of things that people might be interested in working on and using > > if they weren't tied to the reactos code base. We obviously benefit > > from any external interest, and simply pull/import it back into the reactos project. > > > > Ged. > > > > > > > > -----Original Message----- > > From: Ros-dev <ros-dev-bounces(a)reactos.org> On Behalf Of Colin Finck > > Sent: Thursday, 26 July 2018 17:58 > > To: 'ReactOS Development List' <ros-dev(a)reactos.org> > > Subject: [ros-dev] Postponing the July Meeting > > > > Hi all! > > > > Looking at the calendar, it would be time for the July Meeting today. > > However, I didn't receive any agenda proposals and also forgot to > > announce it in the course of releasing 0.4.9. > > So I suggest we postpone the meeting to next week's Thursday, August 2. > > > > Please send agenda proposals by then. > > That meeting also allows us to handle last-minute planning regarding > > the Hackfest. > > > > Best regards, > > > > Colin > > > > > > > > _______________________________________________ > > Ros-dev mailing list > > Ros-dev(a)reactos.org > > http://www.reactos.org/mailman/listinfo/ros-dev > > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev

6 years, 8 months

2
1
0 0

Repetitive "shell submit results failed" errors when running testbot manually

by Hermès BÉLUSCA - MAÏTO

Hello! I repeatedly get an error "shell submit results failed" while trying to run testbot on a PR  patch, see for example https://build.reactos.org/builders/Test%20KVM/builds/20818 and as a result I cannot obtain the results under reactos.org/testman . Can someone investigate what is going on? Regards, Hermes

6 years, 8 months

2
1
0 0

Needs DejaVuMathTeXGyre.ttf?

by katahiromz

Dear everyone, I think DejaVuMathTeXGyre.ttf is bad font for normal use. Why do we need this font? Thanks

6 years, 8 months

2
1
0 0

ReactOS Software installer ignores proxy settings

by Thomas Schweikle

ReactOS Software installer ignores proxy settings. If you are behind some firewall allowing internet connections only by proxy, you are lost. The software installer ignores any proxy setting. -- Thomas

6 years, 9 months

3
2
0 0

metric analyze

by katahiromz

https://jira.reactos.org/secure/attachment/47741/47741_MetricAnalyze.csv Can you analyze the relations between these parameters? I want the formulas to get (tmHeight, tmAscent, tmDescent, tmInternalLeading, tmExternalLeading) values from lfHeight and the other parameters. NOTE: The formula differs depending on the sign of lfHeight.

6 years, 9 months

1
0
0 0

ReactOS 0.4.9 to be released tomorrow, July 23, 2018 - Press Kit is online!

by Colin Finck

Hi all! With the great last-minute work on the press release, we can finally release ReactOS 0.4.9 tomorrow, Monday, July 23, 2018! The download will be officially available around noon (CEST). A Press Kit for the ReactOS 0.4.9 release is already available: https://download.reactos.org/reactos/ReactOS/0.4.9/ReactOS-0.4.9-PressKit.z… Feel free to send it to interested parties to let them know about the upcoming release in advance. Best regards, Colin Finck

6 years, 9 months

1
0
0 0

Re: [ros-dev] [ros-diffs] 01/01: [WIN32SS] Fix NtUserGetClipboardData for text paste (#645)

by Pierre Schweitzer

For the record, that commit seems to have broken ReactOS testing (see testman, which records last successful test run for 2170901, ie, previous commit). Starting with that commit, any regression test run never ends. It seems bug reports have been creating regarding regressions (timeouts) in the tests but got ignored so far. It would be great to fix these before pushing any other commits. Cheers, Pierre Le 30/06/2018 à 17:12, Katayama Hirofumi MZ a écrit : > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6abc9f5b5af6cc7b7c57f… > > commit 6abc9f5b5af6cc7b7c57ff9c6bcc4a919cf85d1e > Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> > AuthorDate: Sun Jul 1 00:12:23 2018 +0900 > Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> > CommitDate: Sat Jun 30 17:12:23 2018 +0200 > > [WIN32SS] Fix NtUserGetClipboardData for text paste (#645) > > Fix the NtUserGetClipboardData function for the synthesized text formats (CF_TEXT, CF_OEMTEXT and CF_UNICODETEXT). > CORE-11471 > --- > win32ss/user/ntuser/clipboard.c | 47 ++++++++++++++++++++++++++--------------- > 1 file changed, 30 insertions(+), 17 deletions(-) > > diff --git a/win32ss/user/ntuser/clipboard.c b/win32ss/user/ntuser/clipboard.c > index 92109953cc..04e5d22291 100644 > --- a/win32ss/user/ntuser/clipboard.c > +++ b/win32ss/user/ntuser/clipboard.c > @@ -294,8 +294,8 @@ IntAddSynthesizedFormats(PWINSTATION_OBJECT pWinStaObj) > bHaveBm = IntIsFormatAvailable(pWinStaObj, CF_BITMAP); > bHaveDib = IntIsFormatAvailable(pWinStaObj, CF_DIB); > > - /* Add CF_LOCALE format if we have CF_TEXT */ > - if (!bHaveLocale && bHaveText) > + /* Add CF_LOCALE format if we have CF_TEXT, CF_OEMTEXT or CF_UNICODETEXT */ > + if (!bHaveLocale && (bHaveText || bHaveOemText || bHaveUniText)) > { > PCLIPBOARDDATA pMemObj; > HANDLE hMem; > @@ -881,6 +881,7 @@ NtUserGetClipboardData(UINT fmt, PGETCLIPBDATA pgcd) > HANDLE hRet = NULL; > PCLIP pElement; > PWINSTATION_OBJECT pWinStaObj; > + UINT uSourceFmt = fmt; > > TRACE("NtUserGetClipboardData(%x, %p)\n", fmt, pgcd); > > @@ -898,18 +899,7 @@ NtUserGetClipboardData(UINT fmt, PGETCLIPBDATA pgcd) > } > > pElement = IntGetFormatElement(pWinStaObj, fmt); > - if (pElement && IS_DATA_DELAYED(pElement) && pWinStaObj->spwndClipOwner) > - { > - /* Send WM_RENDERFORMAT message */ > - pWinStaObj->fInDelayedRendering = TRUE; > - co_IntSendMessage(pWinStaObj->spwndClipOwner->head.h, WM_RENDERFORMAT, (WPARAM)fmt, 0); > - pWinStaObj->fInDelayedRendering = FALSE; > - > - /* Data should be in clipboard now */ > - pElement = IntGetFormatElement(pWinStaObj, fmt); > - } > - > - if (!pElement || IS_DATA_DELAYED(pElement)) > + if (!pElement) > goto cleanup; > > if (IS_DATA_SYNTHESIZED(pElement)) > @@ -921,20 +911,43 @@ NtUserGetClipboardData(UINT fmt, PGETCLIPBDATA pgcd) > case CF_UNICODETEXT: > case CF_TEXT: > case CF_OEMTEXT: > - pElement = IntGetFormatElement(pWinStaObj, CF_UNICODETEXT); > + uSourceFmt = CF_UNICODETEXT; > + pElement = IntGetFormatElement(pWinStaObj, uSourceFmt); > if (IS_DATA_SYNTHESIZED(pElement)) > - pElement = IntGetFormatElement(pWinStaObj, CF_TEXT); > + { > + uSourceFmt = CF_TEXT; > + pElement = IntGetFormatElement(pWinStaObj, uSourceFmt); > + } > if (IS_DATA_SYNTHESIZED(pElement)) > - pElement = IntGetFormatElement(pWinStaObj, CF_OEMTEXT); > + { > + uSourceFmt = CF_OEMTEXT; > + pElement = IntGetFormatElement(pWinStaObj, uSourceFmt); > + } > break; > + > case CF_BITMAP: > IntSynthesizeBitmap(pWinStaObj, pElement); > break; > + > default: > ASSERT(FALSE); > } > } > > + if (pElement && IS_DATA_DELAYED(pElement) && pWinStaObj->spwndClipOwner) > + { > + /* Send WM_RENDERFORMAT message */ > + pWinStaObj->fInDelayedRendering = TRUE; > + co_IntSendMessage(pWinStaObj->spwndClipOwner->head.h, WM_RENDERFORMAT, (WPARAM)uSourceFmt, 0); > + pWinStaObj->fInDelayedRendering = FALSE; > + > + /* Data should be in clipboard now */ > + pElement = IntGetFormatElement(pWinStaObj, uSourceFmt); > + } > + > + if (!pElement || IS_DATA_DELAYED(pElement)) > + goto cleanup; > + > _SEH2_TRY > { > ProbeForWrite(pgcd, sizeof(*pgcd), 1); > -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

6 years, 9 months

2
1
0 0

Website migrated to a new Login system

by Colin Finck

Hello all, Our website has been migrated to a new Login system today and all components have been upgraded to their latest versions. In the course of that, the user database has also been moved into an LDAP directory and cleaned from accounts that have never been used. Please check that everything is working alright and report bugs in our JIRA: https://jira.reactos.org You are also advised to change your password in the self-service at https://reactos.org/roslogin/?p=selfservice - even to the same one. Every password change from now on will use a state-of-the-art hashing algorithm (salted SHA-512 with 6000 rounds) to protect your account from credential theft. Unfortunately, there have been several newer accounts, for which the password could not be migrated. If you encounter problems logging in, please reset your account password at https://reactos.org/roslogin/?p=forgot to regain access. Best regards, Colin Finck

6 years, 9 months

3
2
0 0

Website Maintenance on Wednesday, July 4

by Colin Finck

Hi all! The ReactOS Website along with the Forum, Wiki, and JIRA bug tracker will be down for maintenance for several hours during the day (European time) on Wednesday, July 4. In the course of this process, the user database will be migrated to the new RosLogin Single-Sign-On system (https://github.com/reactos/web/tree/master/www/www.reactos.org/roslogin) and the Forum and Wiki software will be upgraded to their latest releases. This is expected to put an end to our login weirdnesses (dead Login buttons, 30 minute propagation delay to JIRA), solve the CAPTCHA problems people were reporting, and increase the maintainability of the website. I will be on the #reactos IRC channel during the migration and give status updates there. Best regards, Colin

6 years, 9 months

1
0
0 0

Status Meeting (June 2018)

by Colin Finck

Hi all! Let me invite you to the June 2018 meeting, taking place this Thursday, June 28, 2018 at 19:00 UTC. Invited members will again receive their credentials shortly before the meeting. The current agenda is: 1. Status Reports 2. ReactOS Hackfest on August 16 - 21 3. 0.4.9 release on July 14 I'm open for additional proposals. Best regards, Colin

6 years, 9 months

4
5
0 0

Re: [ros-dev] Microsoft acquires GitHub

by Thomas Mueller

from Javier Agustìn Fernàndez Arroyo: > May this affect ReactOS? > https://blogs.microsoft.com/blog/2018/06/04/microsoft-github-empowering-dev… I just found this new article on heise online about a new possible alternative to Github: https://www.heise.de/newsticker/meldung/Neue-Entwickler-Plattform-TeaHub-wi… (This is in German language) TeaHub will be nonprofit, URL is https://about.teahub.io/ This website is in English. Tom

6 years, 10 months

1
0
0 0

Microsoft acquires GitHub

by Javier Agustìn Fernàndez Arroyo

May this affect ReactOS? https://blogs.microsoft.com/blog/2018/06/04/microsoft-github-empowering-dev…

6 years, 10 months

8
12
0 0

Re: [ros-dev] [ros-diffs] 01/01: [USERSRV] HardError: Fix compilation warning; fix few comments; fix the default empty window title string.

by Hermès BÉLUSCA-MAÏTO

This change (on my own code snippet btw, see commit 5a1a35ca5a6) was necessary because otherwise, the StringPrintf call that is done below (which would then use a WindowTitleU.Buffer == NULL) would generate the harderror dialog title: "(null)" (in addition to other strings being appended), instead of just an empty string. And so the bug is that I forgot to adjust the condition that needs to be checked before freeing the window title string (if it has been allocated). Hermès > -----Message d'origine----- > De : Thomas Faber [mailto:thomas.faber@reactos.org] > Envoyé : samedi 9 juin 2018 09:21 > À : ros-dev(a)reactos.org; Hermès Bélusca-Maïto > Objet : Re: [ros-diffs] 01/01: [USERSRV] HardError: Fix compilation warning; > fix few comments; fix the default empty window title string. > > On 2018-04-08 16:17, Hermès Bélusca-Maïto wrote: > > /* Retrieve the window title of the client, if it has one */ > > - RtlInitEmptyUnicodeString(&WindowTitleU, NULL, 0); > > + RtlInitEmptyUnicodeString(&WindowTitleU, L"", 0); > > This looks like a bug. Can you explain why you think it's necessary please? > > In particular, it will break this: > > if (WindowTitleU.Buffer) RtlFreeUnicodeString(&WindowTitleU); > > > Thanks, > Thomas

6 years, 10 months

2
1
0 0

ReactOS mirror repo detected on GitLab

by Stas'M

I've found this mirror repo on GitLab, it was created today: https://gitlab.com/reactos/reactos Does it belong to the ReactOS team? If not, we may have problems. ---- Regards, Stas'M

6 years, 10 months

3
2
0 0

Re: [ros-dev] [ros-diffs] 01/01: [USERSRV] HardError: Fix compilation warning; fix few comments; fix the default empty window title string.

by Thomas Faber

On 2018-04-08 16:17, Hermès Bélusca-Maïto wrote: > /* Retrieve the window title of the client, if it has one */ > - RtlInitEmptyUnicodeString(&WindowTitleU, NULL, 0); > + RtlInitEmptyUnicodeString(&WindowTitleU, L"", 0); This looks like a bug. Can you explain why you think it's necessary please? In particular, it will break this: if (WindowTitleU.Buffer) RtlFreeUnicodeString(&WindowTitleU); Thanks, Thomas

6 years, 10 months

1
0
0 0

Interested in building developer interface mentioned in your gsoc'18 page.

by Ayush Sinha

Hey there ! Went through the reactOS GSOC’18 page. I am interested in making web interface for reactos which can show all GitHub reactos repos, commits, etc using the GitHub API. (https://www.reactos.org/wiki/Google_Summer_of_Code_2018_Ideas#Developer_Web…) Looking forward to work on the same idea for GSOC’19 under your mentorship. Need to know more about layout of the web interface. Kindly help! thanks

6 years, 10 months

1
0
0 0

Announcing the ReactOS Hackfest 2018 in Berlin

by Colin Finck

Hi all! It's official now! The ReactOS Hackfest 2018 will take place from Thursday, 16th August 2018 to Tuesday, 21st August 2018 in Berlin, Germany. Thanks to Thomas, the event location is already checked out ("definitely more space than in Cologne") and he has found a hostel nearby. All information can be found at https://reactos.org/wiki/ReactOS_Hackfest_2018, with the lists for registering yourself and collecting ideas at https://reactos.org/wiki/ReactOS_Hackfest_2018/Lists Hope to see you in August! Cheers, Colin

6 years, 10 months

2
1
0 0

Re: [ros-dev] Phoronix

by Can Tasan

I have finished for now. Please inform them.

6 years, 10 months

2
1
0 0

Document regarding the rules for managing pull requests

by David Quintana (gigaherz)

Team members and other interested parties, At this month's meeting, we decided we had to have a talk about the growing number of open pull requests. From such a discussion, we game up with a set of rules that the team members should follow, when reviewing or managing PRs. If you are such a person, please take a moment to make sure you can agree with those rules. There's a PR waiting for your input: https://github.com/reactos/reactos/pull/585

6 years, 10 months

1
0
0 0

Status Meeting (May 2018)

by Colin Finck

Hi all! Let me invite you to the May 2018 meeting, taking place this Thursday, May 31, 2018 at 19:00 UTC. Invited members will again receive their credentials shortly before the meeting. Based on requests and current topics, the agenda looks like this: 1. Status Reports ============== Like last time, participants are requested to just post their prepared reports again to not waste any minute. 2. Improving our handling of PRs and JIRA reports ============================================== The global JIRA permissions have been changed this month and there has been a lot of bad blood regarding issues marked as "trivial". On the one hand, trivial PRs waste a lot of time of our core developers as long as they are the only ones able to commit them. On the other hand, trivial PRs still add minor improvements to the code, so it would be wrong to just close them as invalid. Let's have an open discussion on this topic and try to establish rules we can all work with without taking this problem to a personal level. 3. Google Summer of Code ===================== This will be the first meeting, which could be joined by our GSoC student Victor Perevertkin. If he or the mentors have questions that are better discussed with all developers in the monthly meeting, let's do this here. 4. Changes affecting base addresses ================================ Robert Naumann has requested adding this topic to the agenda. He couldn't merge several PRs translating .mc files, because that would blow up the kernel and require a regeneration of all base addresses. He requested a brainstorming session in this meeting to get to a conclusion how to deal with this problem. I know that Joachim Henze has also attempted to change base addresses lately to fix Photoshop CS2, so this is probably the right time to deal with this problem. Further topics can be requested by replying to this mail. See you all on Thursday! Best regards, Colin

6 years, 10 months

6
10
0 0

Re: [ros-dev] Status Meeting (May 2018)

by hermes.belusca＠sfr.fr

Hi! To that I see one solution, that has actually already been proposed in the PR: we make an external package (a la Wine gecko) that one can download during installation, or later through RAPPS. Then this package (possibly together with other heavy core ones?) could be hosted in some GitHub sub-repo or elsewhere... Closing the PR now would definitely not be the right solution. Best, H.‌ <div class="gl_quote" style="margin-top: 20px; padding-top: 5px;">De : "Colin Finck" A : ros-dev(a)reactos.org Envoyé: mercredi 30 mai 2018 18:21 Objet : Re: [ros-dev] Status Meeting (May 2018)   <div class="gl_quoted">Am 30.05.2018 um 13:26 schrieb Ged Murphy: > Potential problems are: > 4) something else? I've been struggling with e.g. https://github.com/reactos/reactos/pull/276 On the one hand, we definitely need official support for Chinese, Korean, and Japanese character sets. On the other hand, this must not bloat up ReactOS by default, and just dropping a 12 MB font into the repository definitely does. So what is the ideal solution? I don't even know myself. - I could leave the PR open and hope that the submitter addresses my comments and comes up with a better solution. That hasn't happened in the last months. - I could close the PR right away. That would give the submitter no chance to address my comments and may even look disrespectful. And the original problem tends to be forgotten. - I could close the PR and open a JIRA issue describing the problem. If we decide on that as a general rule, we would put another burden on every reviewer. Additionally, such general JIRA issues tend to rot in our database as well. I think we often have this situation where the submitted PR is wrong, but we don't know the right solution either, and therefore keep the PR open. If we can better deal with these cases, the number of open PRs may decrease significantly. - Colin _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev</div> <div class="gl_quoted"> </div> </div>

6 years, 10 months

2
1
0 0

Re: [ros-dev] Phoronix

by Can Tasan

Well, the problem is that current CC is missing HALF of the improvements made.

6 years, 10 months

2
3
0 0

Phoronix

by Can Tasan

Phoronix has published an article regarding 0.4.9, but Community Changelog is a month behind! They gave links despite warnings! Please get the news deleted until I make an update!!!

6 years, 10 months

2
1
0 0

Re: [ros-dev] [ros-diffs] 04/05: [USETUP] Enhancements for filesystem utility functions.

by Pierre Schweitzer

Obviously, as long as you have the IopParseDevice hack in action in usetup, you cannot expect FS to given you reliable information when you open the device since you directly talk to scsiport driver. Le 26/05/2018 à 19:18, Hermès Bélusca-Maïto a écrit : > https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56ea51bbe498d126a61ba… > > commit 56ea51bbe498d126a61bab93c7ae95860bd290f2 > Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> > AuthorDate: Sat May 13 16:20:10 2017 +0000 > Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> > CommitDate: Sat May 26 19:09:38 2018 +0200 > > [USETUP] Enhancements for filesystem utility functions. > > - Introduce code that detects the filesystem of a (mounted?) partition, using NtQueryVolumeInformationFile() with FileFsAttributeInformation class, > aka. rely on ReactOS itself (kernel, storage stack, filesystem drivers...) to recognize the FS on a partition that should normally be seen by the system. > This currently half-works for whatever reason (to be insvestigated), while it works on Windows. > - Fix few comments & a function parameter name. > - Use NT string pointer types. > > svn path=/branches/setup_improvements/; revision=74529 > --- > base/setup/usetup/fslist.c | 131 ++++++++++++++++++++++++++++++++++++++++----- > base/setup/usetup/fslist.h | 10 ++-- > 2 files changed, 122 insertions(+), 19 deletions(-) > > diff --git a/base/setup/usetup/fslist.c b/base/setup/usetup/fslist.c > index 0b190d4a8b..1eb158b777 100644 > --- a/base/setup/usetup/fslist.c > +++ b/base/setup/usetup/fslist.c > @@ -35,7 +35,7 @@ > VOID > AddProvider( > IN OUT PFILE_SYSTEM_LIST List, > - IN LPCWSTR FileSystemName, > + IN PCWSTR FileSystemName, > IN FORMATEX FormatFunc, > IN CHKDSKEX ChkdskFunc) > { > @@ -69,7 +69,7 @@ AddProvider( > PFILE_SYSTEM_ITEM > GetFileSystemByName( > IN PFILE_SYSTEM_LIST List, > - IN LPWSTR FileSystemName) > + IN PWSTR FileSystemName) > { > PLIST_ENTRY ListEntry; > PFILE_SYSTEM_ITEM Item; > @@ -87,6 +87,80 @@ GetFileSystemByName( > return NULL; > } > > +#if 0 // FIXME: To be fully enabled when our storage stack & al. will work better! > + > +/* NOTE: Ripped & adapted from base/system/autochk/autochk.c */ > +static NTSTATUS > +_MyGetFileSystem( > + IN struct _PARTENTRY* PartEntry, > + IN OUT PWSTR FileSystemName, > + IN SIZE_T FileSystemNameSize) > +{ > + NTSTATUS Status; > + HANDLE FileHandle; > + IO_STATUS_BLOCK IoStatusBlock; > + PFILE_FS_ATTRIBUTE_INFORMATION FileFsAttribute; > + UCHAR Buffer[sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; > + > + OBJECT_ATTRIBUTES ObjectAttributes; > + UNICODE_STRING PartitionRootPath; > + WCHAR PathBuffer[MAX_PATH]; > + > + FileFsAttribute = (PFILE_FS_ATTRIBUTE_INFORMATION)Buffer; > + > + /* Set PartitionRootPath */ > + swprintf(PathBuffer, > + // L"\\Device\\Harddisk%lu\\Partition%lu", // Should work! But because ReactOS sucks atm. it actually doesn't work!! > + L"\\Device\\Harddisk%lu\\Partition%lu\\", // HACK: Use this as a temporary hack! > + PartEntry->DiskEntry->DiskNumber, > + PartEntry->PartitionNumber); > + RtlInitUnicodeString(&PartitionRootPath, PathBuffer); > + DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); > + > + /* Open the partition */ > + InitializeObjectAttributes(&ObjectAttributes, > + &PartitionRootPath, > + OBJ_CASE_INSENSITIVE, > + NULL, > + NULL); > + Status = NtOpenFile(&FileHandle, // PartitionHandle, > + FILE_GENERIC_READ /* | SYNCHRONIZE */, > + &ObjectAttributes, > + &IoStatusBlock, > + FILE_SHARE_READ, > + 0 /* FILE_SYNCHRONOUS_IO_NONALERT */); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("Failed to open partition %wZ, Status 0x%08lx\n", &PartitionRootPath, Status); > + return Status; > + } > + > + /* Retrieve the FS attributes */ > + Status = NtQueryVolumeInformationFile(FileHandle, > + &IoStatusBlock, > + FileFsAttribute, > + sizeof(Buffer), > + FileFsAttributeInformation); > + NtClose(FileHandle); > + > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("NtQueryVolumeInformationFile failed for partition %wZ, Status 0x%08lx\n", &PartitionRootPath, Status); > + return Status; > + } > + > + if (FileSystemNameSize * sizeof(WCHAR) < FileFsAttribute->FileSystemNameLength + sizeof(WCHAR)) > + return STATUS_BUFFER_TOO_SMALL; > + > + RtlCopyMemory(FileSystemName, > + FileFsAttribute->FileSystemName, > + FileFsAttribute->FileSystemNameLength); > + FileSystemName[FileFsAttribute->FileSystemNameLength / sizeof(WCHAR)] = UNICODE_NULL; > + > + return STATUS_SUCCESS; > +} > + > +#endif > > PFILE_SYSTEM_ITEM > GetFileSystem( > @@ -94,7 +168,11 @@ GetFileSystem( > IN struct _PARTENTRY* PartEntry) > { > PFILE_SYSTEM_ITEM CurrentFileSystem; > - LPWSTR FileSystemName = NULL; > + PWSTR FileSystemName = NULL; > +#if 0 // For code temporarily disabled below > + NTSTATUS Status; > + WCHAR FsRecFileSystemName[MAX_PATH]; > +#endif > > CurrentFileSystem = PartEntry->FileSystem; > > @@ -106,6 +184,26 @@ GetFileSystem( > > CurrentFileSystem = NULL; > > +#if 0 // FIXME: To be fully enabled when our storage stack & al. will work better! > + > + /* > + * We don't have one... > + * > + * Try to infer one using NT file system recognition. > + */ > + Status = _MyGetFileSystem(PartEntry, FsRecFileSystemName, ARRAYSIZE(FsRecFileSystemName)); > + if (NT_SUCCESS(Status) && *FsRecFileSystemName) > + { > + /* Temporary HACK: map FAT32 back to FAT */ > + if (wcscmp(FsRecFileSystemName, L"FAT32") == 0) > + wcscpy(FsRecFileSystemName, L"FAT"); > + > + FileSystemName = FsRecFileSystemName; > + goto Quit; > + } > + > +#endif > + > /* > * We don't have one... > * > @@ -141,12 +239,19 @@ GetFileSystem( > FileSystemName = L"NTFS"; /* FIXME: Not quite correct! */ > } > > +#if 0 > +Quit: // For code temporarily disabled above > +#endif > + > // HACK: WARNING: We cannot write on this FS yet! > - if (PartEntry->PartitionType == PARTITION_EXT2 || PartEntry->PartitionType == PARTITION_IFS) > - DPRINT1("Recognized file system %S that doesn't support write support yet!\n", FileSystemName); > + if (FileSystemName) > + { > + if (PartEntry->PartitionType == PARTITION_EXT2 || PartEntry->PartitionType == PARTITION_IFS) > + DPRINT1("Recognized file system %S that doesn't support write support yet!\n", FileSystemName); > + } > > DPRINT1("GetFileSystem -- PartitionType: 0x%02X ; FileSystemName (guessed): %S\n", > - PartEntry->PartitionType, FileSystemName); > + PartEntry->PartitionType, FileSystemName ? FileSystemName : L"None"); > > if (FileSystemName != NULL) > CurrentFileSystem = GetFileSystemByName(FileSystemList, FileSystemName); > @@ -160,7 +265,7 @@ CreateFileSystemList( > IN SHORT Left, > IN SHORT Top, > IN BOOLEAN ForceFormat, > - IN LPCWSTR ForceFileSystem) > + IN PCWSTR SelectFileSystem) > { > PFILE_SYSTEM_LIST List; > PFILE_SYSTEM_ITEM Item; > @@ -183,16 +288,16 @@ CreateFileSystemList( > > if (!ForceFormat) > { > - /* Add 'Keep' provider */ > + /* Add the 'Keep existing filesystem' dummy provider */ > AddProvider(List, NULL, NULL, NULL); > } > > - /* Search for ForceFileSystem in list */ > + /* Search for SelectFileSystem in list */ > ListEntry = List->ListHead.Flink; > while (ListEntry != &List->ListHead) > { > Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); > - if (Item->FileSystemName && wcscmp(ForceFileSystem, Item->FileSystemName) == 0) > + if (Item->FileSystemName && wcscmp(SelectFileSystem, Item->FileSystemName) == 0) > { > List->Selected = Item; > break; > @@ -205,7 +310,6 @@ CreateFileSystemList( > return List; > } > > - > VOID > DestroyFileSystemList( > IN PFILE_SYSTEM_LIST List) > @@ -226,7 +330,6 @@ DestroyFileSystemList( > RtlFreeHeap(ProcessHeap, 0, List); > } > > - > VOID > DrawFileSystemList( > IN PFILE_SYSTEM_LIST List) > @@ -264,7 +367,9 @@ DrawFileSystemList( > snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK2), Item->FileSystemName); > } > else > + { > snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_KEEPFORMAT)); > + } > > if (ListEntry == &List->Selected->ListEntry) > CONSOLE_SetInvertedTextXY(List->Left, > @@ -279,7 +384,6 @@ DrawFileSystemList( > } > } > > - > VOID > ScrollDownFileSystemList( > IN PFILE_SYSTEM_LIST List) > @@ -291,7 +395,6 @@ ScrollDownFileSystemList( > } > } > > - > VOID > ScrollUpFileSystemList( > IN PFILE_SYSTEM_LIST List) > diff --git a/base/setup/usetup/fslist.h b/base/setup/usetup/fslist.h > index 685a2cfe2e..4433d381ba 100644 > --- a/base/setup/usetup/fslist.h > +++ b/base/setup/usetup/fslist.h > @@ -31,7 +31,7 @@ > typedef struct _FILE_SYSTEM_ITEM > { > LIST_ENTRY ListEntry; > - LPCWSTR FileSystemName; /* Not owned by the item */ > + PCWSTR FileSystemName; /* Not owned by the item */ > FORMATEX FormatFunc; > CHKDSKEX ChkdskFunc; > BOOLEAN QuickFormat; > @@ -46,16 +46,16 @@ typedef struct _FILE_SYSTEM_LIST > } FILE_SYSTEM_LIST, *PFILE_SYSTEM_LIST; > > VOID > -FS_AddProvider( > +AddProvider( > IN OUT PFILE_SYSTEM_LIST List, > - IN LPCWSTR FileSystemName, > + IN PCWSTR FileSystemName, > IN FORMATEX FormatFunc, > IN CHKDSKEX ChkdskFunc); > > PFILE_SYSTEM_ITEM > GetFileSystemByName( > IN PFILE_SYSTEM_LIST List, > - IN LPWSTR FileSystemName); > + IN PWSTR FileSystemName); > > struct _PARTENTRY; // Defined in partlist.h > PFILE_SYSTEM_ITEM > @@ -68,7 +68,7 @@ CreateFileSystemList( > IN SHORT Left, > IN SHORT Top, > IN BOOLEAN ForceFormat, > - IN LPCWSTR ForceFileSystem); > + IN PCWSTR SelectFileSystem); > > VOID > DestroyFileSystemList( > -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

6 years, 11 months

1
0
0 0

Testman

by Edijs van Kole de McSnikovics

Hello. I am wondering if testman source code is available to download. ----------------------------------------------SIGNATURE------------------------------------------------------ Draudžiama tiesiogiai teikti reklama konkreciam asmeniui, jeigu yra aiškiai išreikštas šio asmens nesutikimas. Už reklamos naudojimo reikalavimu nesilaikyma istatymas numato bauda nuo 300 iki 10 tukst. EUR. Nesutinku gauti reklamos ar reklaminio pobudžio žinuciu! Nesutinku, jog mano duomenys butu naudojami rinkodaros tikslais! Nesutinku, jog mano duomenys butu perduodami treciosioms salims be mano sutikimo!

6 years, 11 months

2
1
0 0

Re: [ros-dev] Ros-dev Digest, Vol 165, Issue 3

by John Duncan

unsubscribe On Sun, May 6, 2018 at 8:00 AM, <ros-dev-request(a)reactos.org> wrote: > Send Ros-dev mailing list submissions to > ros-dev(a)reactos.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://www.reactos.org/mailman/listinfo/ros-dev > or, via email, send a message with subject or body 'help' to > ros-dev-request(a)reactos.org > > You can reach the person managing the list at > ros-dev-owner(a)reactos.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of Ros-dev digest..." > > > Today's Topics: > > 1. Re: "Note: LibreOffice 5.4 will be the last codeline > tosupport Windows XP or Vista" (Javier Agustìn Fernàndez Arroyo) > 2. Re: "Note: LibreOffice 5.4 will be the last codeline > tosupport Windows XP or Vista" (Erkin Alp Güney) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Sun, 6 May 2018 01:02:53 +0200 > From: Javier Agustìn Fernàndez Arroyo <elhoir(a)gmail.com> > To: ReactOS Development List <ros-dev(a)reactos.org> > Subject: Re: [ros-dev] "Note: LibreOffice 5.4 will be the last > codeline tosupport Windows XP or Vista" > Message-ID: > <CAAHf8rcC_PhT6OHmf-frhuB6tarj6SAj3un8AipR48hChEDM > gQ(a)mail.gmail.com> > Content-Type: text/plain; charset="utf-8" > > as an alternative, Apache OpenOffice still supports NT5 > > On Sun, May 6, 2018 at 12:38 AM, David Quintana (gigaherz) < > gigaherz(a)gmail.com> wrote: > > > No need to panick, they themselves link to this as an archive of old > > versions: https://downloadarchive.documentfoundation.org/ > libreoffice/old/ > > So even if it's gone from their own site, it should remain there. > > > > On 6 May 2018 at 00:30, Javier Agustìn Fernàndez Arroyo < > elhoir(a)gmail.com> > > wrote: > > > >> hello again guys, > >> > >> What if we get latest NT5 libreoffice version (5.4.6 as of now, and > >> 5.4.7-rc1 is out) just for testing purposes? i guess it will be dropped > >> from official website, andi don´t know if it will be still available in > any > >> way...... > >> > >> On Sat, Jul 1, 2017 at 9:29 AM, Michael Fritscher < > michael(a)fritscher.net> > >> wrote: > >> > >>> Hi, > >>> > >>> is there a list which need to be done to get the basic NT6 architecture > >>> just to get feeling how much work it is? Sadly, I'm afraid that we'll > >>> need a proper NT6 architecture to get modern drivers running, won't we? > >>> > >>> Best regards, > >>> Michael Fritscher > >>> > >>> On 30.06.2017 11:46, Ged Murphy wrote: > >>> > That’s what’s currently being worked on. > >>> > > >>> > The kernel still closely follows the NT5.2 architecture, but user > mode > >>> will have NT6+ compatibility shims to allow modern applications to run > >>> correctly. > >>> > > >>> > > >>> > > >>> > From: Ros-dev [mailto:ros-dev-bounces@reactos.org] On Behalf Of > >>> ajaczgz(a)yahoo.es > >>> > Sent: 30 June 2017 05:47 > >>> > To: ReactOS Development List <ros-dev(a)reactos.org> > >>> > Subject: Re: [ros-dev] "Note: LibreOffice 5.4 will be the last > >>> codeline tosupport Windows XP or Vista" > >>> > > >>> > > >>> > > >>> > I think it’s no neccesary to implement NT6, only to avoid the > >>> compatibility tests to NT6 and implement only the characteristics that > the > >>> most of the programs uses. > >>> > > >>> > > >>> > > >>> > Best regards > >>> > > >>> > Antonio J. Arrieta Cuartero > >>> > > >>> > > >>> > > >>> > Enviado desde mi Lumia 635 con Windows 10 Mobile > >>> > > >>> > > >>> > > >>> > De: Riccardo Paolo Bestetti <mailto:riccardo.kyogre@live.it> > >>> > Enviado: jueves, 29 de junio de 2017 22:11 > >>> > Para: ReactOS Development List <mailto:ros-dev@reactos.org> > >>> > Asunto: Re: [ros-dev] "Note: LibreOffice 5.4 will be the last > codeline > >>> tosupport Windows XP or Vista" > >>> > > >>> > > >>> > > >>> > Hello Colin, > >>> > > >>> > As this definitely wasn't the predominant thinking the last time this > >>> same discussion took place, Hermès' email scared me a bit. Thank you so > >>> much for clarifying. > >>> > > >>> > > >>> > > >>> > Best regards, > >>> > > >>> > Riccardo Paolo Bestetti > >>> > > >>> > > >>> > > >>> > -----Original Message----- > >>> > > >>> > From: Ros-dev [mailto:ros-dev-bounces@reactos.org] On Behalf Of > Colin > >>> Finck > >>> > > >>> > Sent: giovedì 29 giugno 2017 20:00 > >>> > > >>> > To: ros-dev(a)reactos.org <mailto:ros-dev@reactos.org> > >>> > > >>> > Subject: Re: [ros-dev] "Note: LibreOffice 5.4 will be the last > >>> codeline to support Windows XP or Vista" > >>> > > >>> > > >>> > > >>> > Rest assured, we know that ReactOS won't be of much use if we stay > >>> NT5-only. Work is underway to provide a seamless support of NT6 > >>> applications on top of the existing codebase. > >>> > > >>> > Also the majority of developers should be using an NT6 platform > >>> themselves, so they certainly aim for support for NT6 applications. > >>> > > >>> > Finally, applications compiled by modern versions of Visual Studio > are > >>> NT6-only by default, so supporting this platform is unavoidable. > >>> > > >>> > > >>> > > >>> > Just my two cents, as the previous replies could lead you to believe > >>> we're failing the reality check. > >>> > > >>> > > >>> > > >>> > Cheers, > >>> > > >>> > > >>> > > >>> > Colin > >>> > > >>> > > >>> > > >>> > > >>> > > >>> > Am 29.06.2017 um 18:54 schrieb Riccardo Paolo Bestetti: > >>> > > >>> >> I’m just gonna snap in for my yearly IT guy NT6 rant: this mindset > is > >>> > > >>> >> going to kill the project by making it useless whenever it reaches a > >>> > > >>> >> usable state. > >>> > > >>> >> > >>> > > >>> >> Windows XP/Server 2003 use is **already** marginal as of today, and > >>> > > >>> >> it’s only gonna get “worse” as more and more networks get infected > by > >>> > > >>> >> ransomware and institutions all over the world wake up and update > >>> (and > >>> > > >>> >> as time passes of course). It’s not a matter of “fancy”, it is a > >>> > > >>> >> matter of what people use on their computers. With that argument you > >>> > > >>> >> may as well advocate for DOS. > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> Please don’t be offended, as always this is only intended as a > >>> reality > >>> > > >>> >> check. > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> Best regards, > >>> > > >>> >> > >>> > > >>> >> Riccardo Paolo Bestetti > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> *From:*Ros-dev [mailto:ros-dev-bounces@reactos.org] *On Behalf Of > >>> > > >>> >> *Hermès BÉLUSCA-MAÏTO > >>> > > >>> >> *Sent:* giovedì 29 giugno 2017 16:09 > >>> > > >>> >> *To:* 'ReactOS Development List' <ros-dev(a)reactos.org <mailto: > >>> ros-dev(a)reactos.org> > > >>> > > >>> >> *Subject:* Re: [ros-dev] "Note: LibreOffice 5.4 will be the last > >>> > > >>> >> codeline to support Windows XP or Vista" > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> I’m wondering for which useless / fancy features they need Windows > 7+ > >>> > > >>> >> support only…. > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> H. > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> *De :*Ros-dev [mailto:ros-dev-bounces@reactos.org] *De la part de* > >>> > > >>> >> Javier Agustìn Fernàndez Arroyo *Envoyé :* jeudi 29 juin 2017 15:48 > >>> *À > >>> > > >>> >> :* ReactOS Development List *Objet :* [ros-dev] "Note: LibreOffice > >>> 5.4 > >>> > > >>> >> will be the last codeline to support Windows XP or Vista" > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> https://wiki.documentfoundation.org/Releases/5.4.0/RC1 > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> FYI > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> > >>> > > >>> >> _______________________________________________ > >>> > > >>> >> Ros-dev mailing list > >>> > > >>> >> Ros-dev(a)reactos.org > >>> > > >>> >> http://www.reactos.org/mailman/listinfo/ros-dev > >>> > > >>> >> > >>> > > >>> > > >>> > > >>> > _______________________________________________ > >>> > > >>> > Ros-dev mailing list > >>> > > >>> > Ros-dev(a)reactos.org <mailto:Ros-dev@reactos.org> > >>> > > >>> > http://www.reactos.org/mailman/listinfo/ros-dev > >>> > > >>> > _______________________________________________ > >>> > > >>> > Ros-dev mailing list > >>> > > >>> > Ros-dev(a)reactos.org <mailto:Ros-dev@reactos.org> > >>> > > >>> > http://www.reactos.org/mailman/listinfo/ros-dev > >>> > > >>> > > >>> > > >>> > > >>> > > >>> > > >>> > _______________________________________________ > >>> > Ros-dev mailing list > >>> > Ros-dev(a)reactos.org > >>> > http://www.reactos.org/mailman/listinfo/ros-dev > >>> > > >>> > >>> > >>> _______________________________________________ > >>> Ros-dev mailing list > >>> Ros-dev(a)reactos.org > >>> http://www.reactos.org/mailman/listinfo/ros-dev > >>> > >> > >> > >> _______________________________________________ > >> Ros-dev mailing list > >> Ros-dev(a)reactos.org > >> http://www.reactos.org/mailman/listinfo/ros-dev > >> > > > > > > _______________________________________________ > > Ros-dev mailing list > > Ros-dev(a)reactos.org > > http://www.reactos.org/mailman/listinfo/ros-dev > > >

6 years, 11 months

3
2
0 0

"Note: LibreOffice 5.4 will be the last codeline to support Windows XP or Vista"

by Javier Agustìn Fernàndez Arroyo

https://wiki.documentfoundation.org/Releases/5.4.0/RC1 FYI

6 years, 11 months

11
19
0 0

logon sound remaked

by Javier Agustìn Fernàndez Arroyo

did you guys hear this? :) https://www.youtube.com/watch?v=xO5T5d4AmYo

6 years, 11 months

1
0
0 0

Tr : ReactOS, AHK: offline!

by Sylvain Petreolle

Due to my family presence, I need to stop the Test KVM AHK bot during this week end.I have good news regarding CORE-14536 and sound in general. "I'll be back." Kind regards, Sylvain Petreolle Le Vendredi 27 avril 2018 14h46, Serge Gautherie <reactos_serge_161107(a)gautherie.fr> a écrit : Hello Sylvain, Test KVM AHK is offline since "about 1 day ago (2018-Apr-25 18:27:36)". Thanks. --

6 years, 12 months

1
0
0 0

Re: [ros-dev] [ros-diffs] 01/01: [NULL] Additions for the Null driver.

by Alex Ionescu

1) I thought certain MDL fast I/O routines can get called at DISPATCH_LEVEL 2) For perf reasons, causing a page-fault in the middle of a "fast I/O" is probably a bad idea. That being said -- these concerns seem silly since we are talking about the "Null" driver which... is entirely PAGED_CODE and clearly neither #1 or #2 are actual issues. In Windows, the fast I/o table is part of the DEVICE_OBJECT itself. Not sure why our driver allocates a separate pool allocation to begin with. Best regards, Alex Ionescu On Mon, Apr 23, 2018 at 1:30 AM, Ged Murphy <gedmurphy.maillists(a)gmail.com> wrote: > They're pagable in NT6, I don't know whether that's the case in NT5. > > Change looks good to me, I'm not really sure why Alex used NNP? > Perhaps our kernel does/did things slightly differently back when he wrote > the Null driver? > > Ged. > > -----Original Message----- > From: Ros-dev <ros-dev-bounces(a)reactos.org> On Behalf Of Thomas Faber > Sent: Monday, 23 April 2018 07:49 > To: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> > Cc: ros-dev(a)reactos.org > Subject: Re: [ros-dev] [ros-diffs] 01/01: [NULL] Additions for the Null > driver. > > On 2018-04-22 22:23, Hermès Bélusca-Maïto wrote: > > diff --git a/drivers/base/null/null.c b/drivers/base/null/null.c index > > 610e886ddd..0d4ed541de 100644 > > --- a/drivers/base/null/null.c > > +++ b/drivers/base/null/null.c > > @@ -181,26 +199,16 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, > > DriverObject->MajorFunction[IRP_MJ_READ] = NullDispatch; > > DriverObject->MajorFunction[IRP_MJ_LOCK_CONTROL] = NullDispatch; > > DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = > > NullDispatch; > > + DriverObject->DriverUnload = NullUnload; > > > > - /* Allocate the fast I/O dispatch table */ > > - FastIoDispatch = ExAllocatePoolWithTag(NonPagedPool, > > - sizeof(FAST_IO_DISPATCH), > > - 'llun'); > > - if (!FastIoDispatch) > > - { > > - /* Failed, cleanup */ > > - IoDeleteDevice(DeviceObject); > > - return STATUS_INSUFFICIENT_RESOURCES; > > - } > > - > > - /* Initialize it */ > > - RtlZeroMemory(FastIoDispatch, sizeof(FAST_IO_DISPATCH)); > > - FastIoDispatch->SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); > > + /* Initialize the fast I/O dispatch table */ > > + RtlZeroMemory(&FastIoDispatch, sizeof(FastIoDispatch)); > > + FastIoDispatch.SizeOfFastIoDispatch = sizeof(FastIoDispatch); > > > > /* Setup our pointers */ > > - FastIoDispatch->FastIoRead = NullRead; > > - FastIoDispatch->FastIoWrite = NullWrite; > > - DriverObject->FastIoDispatch = FastIoDispatch; > > + FastIoDispatch.FastIoRead = NullRead; > > + FastIoDispatch.FastIoWrite = NullWrite; > > + DriverObject->FastIoDispatch = &FastIoDispatch; > > > Are you sure FAST_IO_DISPATCH is allowed to be pageable? It seems to only > be used at low IRQLs, so it seems logical. However I see it allocated > nonpaged everywhere else and can't seem to find definitive documentation on > the subject. > (And yes, most filesystem drivers use a static structure, but those > drivers don't use MmPageEntireDriver) > > Thanks, > Thomas > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev >

6 years, 12 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev