- Ros-dev - ReactOS.org

About GSOC 2016

by Олег Брежнев

Hello everyone, My name is Oleg Brezhnev, i am 3rd course student of Software Engineering in Penza State University, Russia. It would be very cool to get some driver programming experience, since recently i got a work, where driver programming skills will be really useful. So i want to implement the AHCI SATA Storage Driver or anything related to drivers. But the problem is i do not have any experience in driver devleopment besides one chapter of a small book about NT-drivers, i've bought today, so i can not estimate amount of work properly. I have some experience of user-space C programming, i've wrote several application like user control app and device manager for my company's products. My question is: is it ok to apply on a GSOC with proposal like this considering this circumstances? I ready to work really hard to learn all i need during my work and complete the task. Sincerely yours, Oleg Brezhnev

9 years, 1 month

2
2
0 0

GSOC 2016 - Tools for translations - Idea

by Adam Stachowicz

Hello :) I think that someone can push my project (or make a new one) further - ReactOS Translation Tool for RC files. It will be nice GSOC Idea References: https://reactos.org/wiki/Translation_Introduction https://github.com/Saibamen/ReactOS-Translation-Tool Pozdrawiam / Best regards, Adam Stachowicz Administrator it-maniak.pl, ReactOS.org Forum Global Moderator

9 years, 1 month

2
1
0 0

GSOC 2016 - SSH Service Project

by Anchit Jain

Hello everyone, I am Anchit Jain, Computer Science undergraduate from BITS PILANI, India. I am interested in pursuing SSH Service project. I have some experience in Socket Programming and Network Protocol development in C. Some of my work could be seen at [https://github.com/anchitjain1234](htt ps://link.nylas.com/link/ezhvubksgc7dhi29sglp2mpvq/7af2e7b30ed04821b97b5daf… 9e7a5/0?redirect=https%3A%2F%2Fgithub.com%2Fanchitjain1234). In past, I have implemented some basic network services like TFTP protocol and some minor part of FTP client. Regarding the project :- Would this project require a new SSH Server to be written from scratch or to be build upon some existing codebase like Apache Mina etc.? I would request potential mentors to guide me for the same. Thanks, Anchit Jain ![](https://link.nylas.com/open/ezhvubksgc7dhi29sglp2mpvq/b6c19abbf9d6411eb72c 8562b4b783ce)

9 years, 1 month

6
8
0 0

Build Crash Revision 70918

by James Tabor

Linux build this is haping on all my systems, Slackware, Fedora,,,,, Building C object base/shell/progman/progman_pch.h.gch FAILED: /usr/local/RosBE/i386/bin/i686-w64-mingw32-gcc -DDBG=1 -DKDBG=1 -DUSE_COMPILER_EXCEPTIONS -DWINVER=0x502 -D_DLL -D_M_IX86 -D_SEH_ENABLE_TRACE -D_SETUPAPI_VER=0x502 -D_USE_32BIT_TIME_T -D_USE_PSEH3=1 -D_WIN32_IE=0x600 -D_WIN32_WINDOWS=0x502 -D_WIN32_WINNT=0x502 -D_X86_ -D__REACTOS__ -D__USE_CRTIMP -D__i386__ -D_inline=__inline -Di386 -Wa,--compress-debug-sections -pipe -fms-extensions -fno-strict-aliasing -nostdinc -mstackrealign -Wold-style-declaration -Wdeclaration-after-statement -fdebug-prefix-map="/home/ros/reactos"=ReactOS -gdwarf-2 -gstrict-dwarf -femit-struct-debug-detailed=none -feliminate-unused-debug-symbols -march=pentium -mtune=i686 -Werror -Wall -Wpointer-arith -Wno-char-subscripts -Wno-multichar -Wno-unused-value -Wno-maybe-uninitialized -O1 -fno-optimize-sibling-calls -fno-omit-frame-pointer -mpreferred-stack-boundary=3 -fno-set-stack-executable -Winvalid-pch -Werror=invalid-pch -Ibase/shell/progman -I../../base/shell/progman -I../../include -I../../include/psdk -I../../include/dxsdk -Iinclude -Iinclude/psdk -Iinclude/dxsdk -Iinclude/ddk -Iinclude/reactos -I../../include/crt -I../../include/ddk -I../../include/ndk -I../../include/reactos -I../../include/reactos/libs -MMD -MT base/shell/progman/progman_pch.h.gch -MF base/shell/progman/progman_pch.h.gch.d -o base/shell/progman/progman_pch.h.gch -c ../../base/shell/progman/progman.h ../../base/shell/progman/progman.h:25:9: error: #pragma once in main file [-Werror] cc1: all warnings being treated as errors

9 years, 1 month

3
5
0 0

Re: [ros-dev] Hello, GSoC 2016

by Amine Khaldi

> Hi,I'm Chu Bingxiang, from Harbin Engineering University, China, and this is my third year in this University. This is my first time met with ReactOS, and I found that I really love this project. And maybe "Fully Integrate lwIP" is my dish.After reading the idea-list, I think this one is to fit IwIP well with ReactOS and I need to try my best to make further progress in it.Now I'm facing a big problem, that the newest version of lwIP is 1.4.1, and 1.5.0 is going to be released, which one should I learn? Hi Chu, welcome to ReactOS! The lwip version won't be a problem for two reasons: * We try to stay up to date whenever a new release is available. * There *shouldn't* be significant differences between lwip versions to the point of needing to rewrite the whole tcpip driver when a new lwip version is released. Also, please consider joining our IRC channel if you need realtime discussions/interactions. Good luck! Cheers, Amine.

9 years, 1 month

1
0
0 0

Hello, GSoC 2016

by MarylandenyChu

Hi,I'm Chu Bingxiang, from Harbin Engineering University, China, and this is my third year in this University. This is my first time met with ReactOS, and I found that I really love this project. And maybe "Fully Integrate lwIP" is my dish.After reading the idea-list, I think this one is to fit IwIP well with ReactOS and I need to try my best to make further progress in it.Now I'm facing a big problem, that the newest version of lwIP is 1.4.1, and 1.5.0 is going to be released, which one should I learn? Cheers, 初炳享Chu Bingxiang哈尔滨工程大学计算机科学与技术学院Computer Science and Technology of Harbin Engineering University

9 years, 1 month

1
0
0 0

Re: [ros-dev] livecd and bootcd not working with VMware Workstation / ESX-Server

by Alexander Rechitskiy

Registration is closed! They cant report to JIRA. > Hello, we normally ask that bug reports be opened on our JIRA at https://jira.reactos.org/ > > Some months ago I had an issue with VMware, where boot would fail if I upgraded the VM to hardware version 11 or 12, and I had to set it to hardware version 10 for it to work correctly. I thoguht that issue was fixed a while ago, but it may be worth checking. > > On 3 March 2016 at 15:20, Thomas Schweikle <tschweikle(a)gmail.com> wrote: > >> Hi! >> >> After I managed to build ReactOS with the build system I noticed that >> >> live- and bootcd do not work within VMware Workstation 12. I've tried >> >> ESX Server too. Same: livecd just displays a black screen, while >> >> bootcd shows a startup menu. After selecting (or letting timeout) an >> >> item the screen goes black. >> >> Since the downloadable versions of live- and bootcd do have the same >> >> problem I assume this not being a problem of my build, but something >> >> they just do not work together with VMware Workstation/ESX-Server. >> >> -- >> >> Thomas >> >> _______________________________________________ >> >> Ros-dev mailing list >> >> Ros-dev(a)reactos.org >> >> http://www.reactos.org/mailman/listinfo/ros-dev

9 years, 1 month

3
2
0 0

livecd and bootcd not working with VMware Workstation / ESX-Server

by Thomas Schweikle

Hi! After I managed to build ReactOS with the build system I noticed that live- and bootcd do not work within VMware Workstation 12. I've tried ESX Server too. Same: livecd just displays a black screen, while bootcd shows a startup menu. After selecting (or letting timeout) an item the screen goes black. Since the downloadable versions of live- and bootcd do have the same problem I assume this not being a problem of my build, but something they just do not work together with VMware Workstation/ESX-Server. -- Thomas

9 years, 1 month

2
1
0 0

Building with jenkins

by Thomas Schweikle

Hi! Building ReactOS from scratch is not really magic! It is easy. But now I am trying to set up an automated build by jenkins, and it starts to be a challenge ... I could not find any repository for the build system RosBE? Is there one? I'd like to check it out, compile it, install it and if this went OK -- start compiling ReactOS. Here's an other point: I've to start the build system; this offers a shell I can enter the next commands. It doesn't seem to be possible to handle commands to the build system in some way, without typing them in -- exactly this would be nice to have. It would be useful for automating with jenkins ...! Any idea? I've gut some to push the commands in, but all of them are crude and not really simple and stupid adding some more points of failure to this build process. Thanks in advance for any help! -- Thomas

9 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 70869: [AUTOCHK][CHKDSK]: Minor fixes / formatting. Really add chkdsk to build. [FMIFS]: Quickly implement the chkdsk function, the same way as it is done for the formatting function.

by Thomas Faber

On 2016-03-03 01:36, hbelusca(a)svn.reactos.org wrote: > @@ -160,9 +163,9 @@ > > switch (argv[i][1]) > { > - case L'?': > - Usage(argv[0]); > - break; > + // case L'?': > + // Usage(argv[0]); > + // return i; > > case L'F': case L'f': > { What is the purpose of this? Thanks, Thomas

9 years, 1 month

2
1
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 70857: [USETUP]: In case chkdsk detects some disk errors, just display a warning message but allow the user to continue the installation.

by Pierre Schweitzer

No?! This is totally broken and is to be reverted. If you detect errors, there are only 3 issues: - Offer the user to attempt to repair errors - Offer the user to format - Exit (as it was done previously) (If repairing fails, you fall into the two next cases). You cannot ignore errors and let the use write on a borked file system. Le 02/03/2016 01:51, hbelusca(a)svn.reactos.org a écrit : > Author: hbelusca > Date: Wed Mar 2 00:51:48 2016 > New Revision: 70857 > > URL: http://svn.reactos.org/svn/reactos?rev=70857&view=rev > Log: > [USETUP]: In case chkdsk detects some disk errors, just display a warning message but allow the user to continue the installation. > > Modified: > trunk/reactos/base/setup/usetup/interface/usetup.c > trunk/reactos/base/setup/usetup/lang/bg-BG.h > trunk/reactos/base/setup/usetup/lang/bn-BD.h > trunk/reactos/base/setup/usetup/lang/cs-CZ.h > trunk/reactos/base/setup/usetup/lang/da-DK.h > trunk/reactos/base/setup/usetup/lang/de-DE.h > trunk/reactos/base/setup/usetup/lang/el-GR.h > trunk/reactos/base/setup/usetup/lang/en-US.h > trunk/reactos/base/setup/usetup/lang/es-ES.h > trunk/reactos/base/setup/usetup/lang/et-EE.h > trunk/reactos/base/setup/usetup/lang/fr-FR.h > trunk/reactos/base/setup/usetup/lang/he-IL.h > trunk/reactos/base/setup/usetup/lang/it-IT.h > trunk/reactos/base/setup/usetup/lang/ja-JP.h > trunk/reactos/base/setup/usetup/lang/lt-LT.h > trunk/reactos/base/setup/usetup/lang/ms-MY.h > trunk/reactos/base/setup/usetup/lang/nl-NL.h > trunk/reactos/base/setup/usetup/lang/pl-PL.h > trunk/reactos/base/setup/usetup/lang/pt-BR.h > trunk/reactos/base/setup/usetup/lang/ro-RO.h > trunk/reactos/base/setup/usetup/lang/ru-RU.h > trunk/reactos/base/setup/usetup/lang/sk-SK.h > trunk/reactos/base/setup/usetup/lang/sq-AL.h > trunk/reactos/base/setup/usetup/lang/sv-SE.h > trunk/reactos/base/setup/usetup/lang/tr-TR.h > trunk/reactos/base/setup/usetup/lang/uk-UA.h > trunk/reactos/base/setup/usetup/mui.h > > Modified: trunk/reactos/base/setup/usetup/interface/usetup.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… > ============================================================================== > --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -3154,13 +3154,15 @@ > if (!NT_SUCCESS(Status)) > { > DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status); > - sprintf(Buffer, "Setup failed to verify the selected partition.\n" > + // sprintf(Buffer, "Setup failed to verify the selected partition.\n" > + sprintf(Buffer, "ChkDsk detected some disk errors.\n" > "(Status 0x%08lx).\n", Status); > PopupError(Buffer, > - MUIGetString(STRING_REBOOTCOMPUTER), > + // MUIGetString(STRING_REBOOTCOMPUTER), > + MUIGetString(STRING_CONTINUE), > Ir, POPUP_WAIT_ENTER); > > - return QUIT_PAGE; > + // return QUIT_PAGE; > } > > PartEntry->NeedsCheck = FALSE; > > Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1758,6 +1758,8 @@ > "« £ ¥ ¥ ªâ ¢êàåã ¤ï«"}, > {STRING_CHECKINGPART, > "¥ç¥ ¯à®¢¥àª ¨§¡à ¨ï ¤ï«."}, > + {STRING_CONTINUE, > + "ENTER = à®¤ê«¦ ¢ ¥"}, > {STRING_QUITCONTINUE, > "F3 = §å®¤ ENTER = à®¤ê«¦ ¢ ¥"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1743,6 +1743,8 @@ > "Setup installs ReactOS onto Partition"}, > {STRING_CHECKINGPART, > "Setup is now checking the selected partition."}, > + {STRING_CONTINUE, > + "ENTER = Continue"}, > {STRING_QUITCONTINUE, > "F3 = Quit ENTER = Continue"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1751,6 +1751,8 @@ > "Instalace nakop¡ruje ReactOS na odd¡l"}, > {STRING_CHECKINGPART, > "Instalace nyn¡ kontroluje zvolenì odd¡l."}, > + {STRING_CONTINUE, > + "ENTER = Pokraovat"}, > {STRING_QUITCONTINUE, > "F3 = Ukonit ENTER = Pokraovat"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/da-DK.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/da-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1763,6 +1763,8 @@ > "Installationen installere ReactOS p partitionen"}, > {STRING_CHECKINGPART, > "Installationen tjekker den valgte partition."}, > + {STRING_CONTINUE, > + "ENTER = Fortst"}, > {STRING_QUITCONTINUE, > "F3 = Afslut ENTER = Fortst"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1747,6 +1747,8 @@ > "ReactOS wird auf dieser Partition installiert."}, > {STRING_CHECKINGPART, > "Die ausgewhlte Partition wird berprft."}, > + {STRING_CONTINUE, > + "EINGABETASTE = Fortsetzen"}, > {STRING_QUITCONTINUE, > "F3 = Beenden EINGABETASTE = Fortsetzen"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1762,6 +1762,8 @@ > "Setup install ReactOS onto Partition"}, > {STRING_CHECKINGPART, > " ¡«á©«© ¢â® «é¨ «¦ § ¢£â¤¦ partition."}, > + {STRING_CONTINUE, > + "ENTER = ¬¤â® "}, > {STRING_QUITCONTINUE, > "F3 = §¦®é¨© ENTER = ¬¤â® "}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/en-US.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1743,6 +1743,8 @@ > "Setup installs ReactOS onto Partition"}, > {STRING_CHECKINGPART, > "Setup is now checking the selected partition."}, > + {STRING_CONTINUE, > + "ENTER = Continue"}, > {STRING_QUITCONTINUE, > "F3 = Quit ENTER = Continue"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1753,6 +1753,8 @@ > "El instalador est instalando ReactOS en la partici¢n"}, > {STRING_CHECKINGPART, > "El instalador est comprobando la partici¢n seleccionada."}, > + {STRING_CONTINUE, > + "INTRO = Continuar"}, > {STRING_QUITCONTINUE, > "F3 = Salir INTRO = Continuar"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1743,6 +1743,8 @@ > "ReactOS paigaldatakse partitsioonile"}, > {STRING_CHECKINGPART, > "Valitud partitsiooni kontrollitakse."}, > + {STRING_CONTINUE, > + "ENTER = Jtka"}, > {STRING_QUITCONTINUE, > "F3 = Vlju ENTER = Jtka"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1768,6 +1768,8 @@ > "Setup installe ReactOS sur la partition"}, > {STRING_CHECKINGPART, > "Setup vrifie la partition slectionne."}, > + {STRING_CONTINUE, > + "ENTRE = Continuer"}, > {STRING_QUITCONTINUE, > "F3 = Quitter ENTRE = Continuer"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1745,6 +1745,8 @@ > "Setup installs ReactOS onto Partition"}, > {STRING_CHECKINGPART, > "Setup is now checking the selected partition."}, > + {STRING_CONTINUE, > + "ENTER = "}, > {STRING_QUITCONTINUE, > "F3 = ENTER = "}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1753,6 +1753,8 @@ > "Setup installer ReactOS sulla partitione"}, > {STRING_CHECKINGPART, > "Setup sta controllando la partizione selezionata."}, > + {STRING_CONTINUE, > + "INVIO = Continua"}, > {STRING_QUITCONTINUE, > "F3 = Esci INVIO = Continua"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1747,6 +1747,8 @@ > "¾¯Ä±¯ÌßÊ ReactOS¦ Êß°Ã¨¼®Ý ¼Þ®³Æ ²Ý½Ä°Ù¼Ï½¡"}, > {STRING_CHECKINGPART, > "¾¯Ä±¯ÌßÊ ¾ÝÀ¸ »ÚÀ Êß°Ã¨¼®Ý¦ ¹Ý» ¼Ã²Ï½¡"}, > + {STRING_CONTINUE, > + "ENTER = ¿Þ¯º³"}, > {STRING_QUITCONTINUE, > "F3 = Á³¼ ENTER = ¿Þ¯º³"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1753,6 +1753,8 @@ > "Setup installs ReactOS onto Partition"}, > {STRING_CHECKINGPART, > "Setup is now checking the selected partition."}, > + {STRING_CONTINUE, > + "ENTER = Continue"}, > {STRING_QUITCONTINUE, > "F3 = Quit ENTER = Continue"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/ms-MY.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ms-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1632,6 +1632,8 @@ > "Persediaan memasang ReactOS ke Partition"}, > {STRING_CHECKINGPART, > "Persediaan kini sedang menyemak sekatan yang dipilih."}, > + {STRING_CONTINUE, > + "ENTER = Teruskan"}, > {STRING_QUITCONTINUE, > "F3 = Keluar ENTER = Teruskan"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1785,6 +1785,8 @@ > "Setup installeert ReactOS op Partitie"}, > {STRING_CHECKINGPART, > "Setup controleert nu de geselecteerde partitie."}, > + {STRING_CONTINUE, > + "ENTER = Doorgaan"}, > {STRING_QUITCONTINUE, > "F3 = Afsluiten ENTER = Doorgaan"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1754,6 +1754,8 @@ > "Instalator kopiuje pliki systemu na wybran¥ partycj©."}, > {STRING_CHECKINGPART, > "Instalator sprawdza wybran¥ partycj©."}, > + {STRING_CONTINUE, > + "ENTER = Kontynuacja"}, > {STRING_QUITCONTINUE, > "F3 = Wyjcie ENTER = Kontynuacja"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1783,6 +1783,8 @@ > "O instalador instala o ReactOS na partiÆo"}, > {STRING_CHECKINGPART, > "O instalador est verificando a partiÆo selecionada."}, > + {STRING_CONTINUE, > + "ENTER=Continuar"}, > {STRING_QUITCONTINUE, > "F3=Sair ENTER=Continuar"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1814,6 +1814,8 @@ > "ReactOS va fi instalat pe partiþia"}, > {STRING_CHECKINGPART, > "Programul de instalare verificã acum partiþia aleasã."}, > + {STRING_CONTINUE, > + "ENTER = Continuare"}, > {STRING_QUITCONTINUE, > "F3 = Ieºire ENTER = Continuare"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1744,6 +1744,8 @@ > "ReactOS ãáâ ¢«¨¢ ¥âáï à §¤¥«:"}, > {STRING_CHECKINGPART, > "à®£à ¬¬ ãáâ ®¢ª¨ ¯à®¢¥àï¥â ¢ë¡à ë© à §¤¥«."}, > + {STRING_CONTINUE, > + "ENTER = à®¤®«¦¨âì"}, > {STRING_QUITCONTINUE, > "F3 = ëå®¤ ENTER = à®¤®«¦¨âì"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1757,6 +1757,8 @@ > "Inçtal tor nainçtaluje systm ReactOS na oblas"}, > {STRING_CHECKINGPART, > "Inçtal tor teraz skontroluje vybran£ oblas."}, > + {STRING_CONTINUE, > + "ENTER = Pokraova"}, > {STRING_QUITCONTINUE, > "F3 = Skoni ENTER = Pokraova"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1750,6 +1750,8 @@ > "Instalimi i ReactOS ne Particion"}, > {STRING_CHECKINGPART, > "Instalimi tani sht duke kontrolluar particionin e przgjedhur."}, > + {STRING_CONTINUE, > + "ENTER = Vazhdo"}, > {STRING_QUITCONTINUE, > "F3 = Dil ENTER = Vazhdo"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1753,6 +1753,8 @@ > "Setup installerar ReactOS till Partitionen"}, > {STRING_CHECKINGPART, > "Setup undersker nu den valda partitionen."}, > + {STRING_CONTINUE, > + "ENTER = Fortstt"}, > {STRING_QUITCONTINUE, > "F3 = Avsluta ENTER = Fortstt"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1724,6 +1724,8 @@ > "Kur, ReactOS'u blm zerine kurar."}, > {STRING_CHECKINGPART, > "Kur, imdi seili blm gzden geiriyor."}, > + {STRING_CONTINUE, > + "Giri = Srdr"}, > {STRING_QUITCONTINUE, > "3 = k Giri = Srdr"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… > ============================================================================== > --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -1753,6 +1753,8 @@ > "ReactOS ¢áâ ®¢«îóâìáï à®§¤i«"}, > {STRING_CHECKINGPART, > "áâ ®¢«î¢ ç ¯¥à¥¢iàïó ¢¨¡à ¨© à®§¤i«."}, > + {STRING_CONTINUE, > + "ENTER = à®¤®¢¦¨â¨"}, > {STRING_QUITCONTINUE, > "F3 = ¨©â¨ ENTER = à®¤®¢¦¨â¨"}, > {STRING_REBOOTCOMPUTER, > > Modified: trunk/reactos/base/setup/usetup/mui.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… > ============================================================================== > --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Wed Mar 2 00:51:48 2016 > @@ -115,11 +115,12 @@ > #define STRING_NONFORMATTEDOTHERPART 63 > #define STRING_INSTALLONPART 10 > #define STRING_CHECKINGPART 11 > -#define STRING_QUITCONTINUE 12 > -#define STRING_REBOOTCOMPUTER 13 > -#define STRING_TXTSETUPFAILED 14 > -#define STRING_COPYING 15 > -#define STRING_SETUPCOPYINGFILES 16 > +#define STRING_CONTINUE 12 > +#define STRING_QUITCONTINUE 13 > +#define STRING_REBOOTCOMPUTER 14 > +#define STRING_TXTSETUPFAILED 15 > +#define STRING_COPYING 16 > +#define STRING_SETUPCOPYINGFILES 17 > #define STRING_REGHIVEUPDATE 20 > #define STRING_IMPORTFILE 21 > #define STRING_DISPLAYETTINGSUPDATE 22 > > -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

9 years, 1 month

2
3
0 0

[GSOC] NTFS driver improvements

by Pratik Singhal

Hello all, I am Pratik Singhal, a 3rd year undergraduate student studying Computer Science studying in BITS-Pilani, Goa Campus, India. I want to pursue the project NTFS Driver Improvement project as a part of Google summer of code 2016. I have previously participated in Google summer of Code 2015 for FreeBSD operating system and have done some kernel hacking before.( https://wiki.freebsd.org/SummerOfCode2015/CubieBoardSupport) I have also made a mini operating system of my own. I am sure, that the experience I gained while previously for FreeBSD will certainly help me in understanding the ReactOS code base quickly which will be useful for the project. I don't have any significant experience on working with file systems before, but I am confident that with some guidance from fellow developers I will be able to learn new things which will help in completion of the project. Also, I haven't had any access to Windows source code , so that shouldn't be a problem. We will have to figure out concrete goals of the project, full term and mid term deliverable and a plan for completion of project, if it is to be selected for Google summer of Code. It'll be great if somebody, could mentor me for this project. Thanks, Pratik Singhal

9 years, 1 month

3
2
0 0

ReactOS Participation in Google Summer of Code 2016

by Amine Khaldi

Hi, After five years the ReactOS Project is returning to the Google Summer of Code[1]! On the heels of the 0.4.0 release the project's aim is on creating smoother user experiences and generally making the system feel more robust and pleasant to use. The team is looking for students interested in learning more about the NT architecture that underpins the most widely used desktop operating system in the world and who wants to take part in the creation of an open source implementation of it. Please head on over to the project proposal page[2] to see some of the ideas we've come up with so far. If you have your own bright idea on how to make ReactOS even better don't be afraid to share as we're always open to new ideas. Either way please head over to the IRC channel[3] to give us a shout if you're interested. We promise, we don't bite. Mostly of the time ;) Cheers, Amine. [1] https://summerofcode.withgoogle.com/organizations/6324900541235200/ [2] https://www.reactos.org/wiki/Google_Summer_of_Code_2016_Ideas [3] https://reactos.org/irc

9 years, 1 month

1
0
0 0

ReactOS SVN version naming

by Hermès BÉLUSCA - MAÏTO

Hi guys, I would like to understand whats the rationale behind changing the ReactOS trunk version from 0.4-SVN to 0.5-SVN (see revision 70818) whereas we have just started to release ROS 0.4.0 only? Thanks in advance for your explanations! Cheers, Hermès.

9 years, 1 month

2
1
0 0

Consideration for migrating from Subversion to Git

by Mike Swanson

Hello there, A couple of you have already seen me make this request in IRC, but I will make a more formal one here. I've noticed that ReactOS still uses the Subversion VCS, and while this might have been a good choice when it was initially set up, in 2016, it is a rather backwards and self-defeating method to develop software. For users without write access to the repository, developing against it means that SVN serves barely better than copying a whole directory just to do a diff against it. Submitting patches means that they'll not be split up into logical steps (commits), and increases the difficulty of determining what a patch contains, or even making a sane commit message for it. In the modern DVCS world, this simply doesn't need to hold true. Each clone of the repository is exactly as the name implies: it's a clone. Users that want to hack away on the source are freer to do so, create their own private branches, commit to all their heart's content, and submit a pull request back to the project (don't think of GitHub as the only example of pull requests: they come in many forms and can even include "sending patches to a mailing list", which would still retain better properties than the Subversion model). I do urge to give consideration to moving development infrastructure to Git[*]. It would greatly ease both developer burden, and especially contributors' burden. It is, simply, what the modern world uses. :-) Secondary tale: I'm aware of git.reactos.org and GitHub both having a git-svn clone of the repository. These are "okay" for the most basic glances of the repo, but be warned that git-svn is unmaintained, extremely buggy, and should never be used for a serious migration. For a migration, we'll use reposurgeon. Each repository is unique and the problems cannot be fully automated away, sorry. Human intervention is required to do these properly. --- Now that I've talked about why, I'll note some observations about the Subversion repository in its present state: * Multiple logical projects exist in the namespace. At the very least, each of the subdirectories under /trunk should be translated to independent Git repositories. If there are even more historical ones (I've only looked at HEAD), we should get a list of them. * Old versions of RosBE are under /tags. Is RosBE maintained elsewhere? * A lot of old and new branches. If any of these are already merged into trunk, it may be best to just discard their preservation. Per- developer branches might work out best if each developer took 'ownership' of them with independent repository clones. An infrastructure and organization like https://git.kernel.org/ may be worth looking into. * Tagging conventions at least appear sane and logical, but they should be named with more conventional names for Git, usually a bare number or prefixed with v. For example, "0.3.17", "0.4.0", or "v0.3.17", "v0.4.0" -- this is a pure policy decision, but with one- project-per-repository, it keeps things looking clean. * It is very large. Over a gigabyte as a live repository, 14GB as a full stream dump. It will require a lot of memory to process and I'm not sure my own system will handle that. It will also take a long time to process and develop a migration -- the upper bound can be on the order of months of work. Development in Subversion should not be halted until the day the migration is being completed. [*] Okay, it doesn't have to be Git. Hypothetically, any DVCS will do, but only Mercurial has enough traction to be a viable alternative. Thanks for listening, Mike

9 years, 1 month

9
15
0 0

Consideration for migrating from Subversion to Git

by Ștefan Fulea

On Thu, Feb 25, 2016 at 5:54 AM, David Quintana (gigaherz) <gigaherz at gmail.com> wrote: > I think the real goal with moving to a platform such as github is reducing > the entry barriers for new contributors. As it has been mentioned already, > almost all projects who moved from SVN with "send patches" contribution > system, to Git/Hg with Pull Requests have got non-negligible growth in > contributions. > I don't know... Speaking about "the entry barriers for new contributors", this is contributing now: 1. svn checkout svn://svn.reactos.org/reactos/trunk/reactos 2. // make changes 3. svn diff > patch_for_JIRA_issue compare it with "Git/Hg with Pull Requests": 1. Create/Log in to your GitHub account 2. Go to the page for the code respository you want to contribute to (the “upstream”) 3. “Fork” the repository (this creates a clone to your GitHub account) 4. Create a local clone of your fork with git clone 5. Create a local branch for your changes 6. Make your changes and commit them to your local branch with git commit, ensuring to include a descriptive commit message 7. Push the branch to your GitHub fork using git push 8. Go to the page for the upstream repository go to the pull requests tab 9. Click the “New Pull Request” Button 10. Select the branch you want to submit, and write a summary of what your change explaining what it is intended to do and how it is implemented which is the process for "Raising a Pull Request" described in here: http://oss-watch.ac.uk/resources/pullrequest (the preferred source chosed by Google search for explaining to me what a "pull request" is). Ignoring the fact that new ReactOS contributions will have as prerequisite the signing up for a (commercial) third party service, GitHub may appear a good move for those familiar with GitHub intrinsic knowledge, but it doesn't to for the rest of us. I know that Amine Khaldi offered (on IRC, on #reactos-dev) to help to "resort to manually relaying to GH" "only if someone doesn't want to" sign up, but this will be counterproductive (who wants to be a burden and to abuse in such a way precious developer's time?) and will most likely prevent many not-so-motivated (but potentially precious) contributions outside this cherished GitHub community.

9 years, 1 month

1
0
0 0

Status Meeting (January-February 2016)

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place last Thursday of a month, 25th of February, 19:00 UTC, as usual. IRC service will only be started shortly before the meeting. Your participation passwords and server address will be emailed to you shortly before the meeting starts, and they are going to be different once again as they are not stored in any database. Hopefully it's not much of inconvenience. Please send agenda proposals to me before the meeting. Regards, Aleksey Bragin

9 years, 1 month

4
3
0 0

Error trying to checkout reactos sources

by Thomas Schweikle

Hi! trying to checkout reactos sources using svn leads to: $ LANG=CC svn co https://svn.reactos.org/svn/reactos/trunk/reactos/ reactos svn: warning: cannot set LC_CTYPE locale svn: warning: environment variable LANG is CC svn: warning: please check that your locale name is correct Redirecting to URL 'https://svn.reactos.org/svn/reactos/trunk/reactos': Redirecting to URL 'https://svn.reactos.org/svn/reactos/trunk/reactos': svn: E195019: Redirect cycle detected for URL 'https://svn.reactos.org/svn/reactos/trunk/reactos' Trying the same using http instead of https: $ LANG=CC svn co http://svn.reactos.org/svn/reactos/trunk/reactos/ reactos svn: warning: cannot set LC_CTYPE locale svn: warning: environment variable LANG is CC svn: warning: please check that your locale name is correct Redirecting to URL 'https://svn.reactos.org/svn/reactos/trunk/reactos': Redirecting to URL 'https://svn.reactos.org/svn/reactos/trunk/reactos': svn: E195019: Redirect cycle detected for URL 'https://svn.reactos.org/svn/reactos/trunk/reactos' Trying to use git: $ LANG=CC git clone https://git.reactos.org/projects/reactos.git Cloning into 'reactos'... fatal: repository 'https://git.reactos.org/projects/reactos.git/' not found $ LANG=CC git clone https://git.reactos.org/reactos.git Cloning into 'reactos'... fatal: repository 'https://git.reactos.org/reactos.git/' not found Using https://github.com/mirror/reactos.git seems to be the only working variant ... -- Thomas

9 years, 1 month

3
5
0 0

ReactOS 0.4.0 Released

by Amine Khaldi

Nearly ten years ago the ReactOS Project released version 0.3.0. Today we are proud to announce the formal release of version 0.4.0! A great deal of work has gone into making this release happen and as we look back it is remarkable to consider how far the project has come since that release a decade ago. This release is both a celebration of and a testament to everything that the ReactOS team and community has achieved together. Here we document some of the highlights that separate 0.4.0 from not just the 0.3.17 release but also the cumulative achievements that the 0.3.x series achieved: https://reactos.org/project-news/reactos-040-released A changelog is available at: https://reactos.org/wiki/ChangeLog-0.4.0 Thank you to all of you for having stood by the project for this long and we hope rewarding journey. For those of you chomping at the bit to check out the release, please go to the download page to get it now: https://reactos.org/download

9 years, 2 months

3
6
0 0

About ReactOS "perception" by people

by Hermès BÉLUSCA - MAÏTO

Hi all ! Please have a look at http://www.reactos.org/forum/viewtopic.php?f=2 <http://www.reactos.org/forum/viewtopic.php?f=2&t=14713> &t=14713 , I think these two posts (at the time of writing this mail) show/remind few points about ReactOS that need to be more emphased/better explained in our website (and concerning the license, better be shown; notice that we run with GPL + BSD for some parts of the code). Regards, Hermès

9 years, 2 months

1
0
0 0

[ros-diffs] [hbelusca] 70713: [WIN32SS] - Fix orthograph - Mention in the code that some stuff are hacks & need to be fixed. - Add parentheses around bit checks.

by James Tabor

Hello, Why is this a hack? Thanks, James Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Fri Feb 12 16:40:36 2016 @@ -724,8 +724,8 @@ pwndParent = Window->spwndParent; if (pwndParent == UserGetDesktopWindow()) { - ERR("Parent is Desktop, Min off screen!\n"); - /* ReactOS doesn't support iconic minimize to desktop */ + ERR("FIXME: Parent is Desktop, Min off screen!\n"); + /* FIXME: ReactOS doesn't support iconic minimize to desktop */ Pos->x = Pos->y = -32000; Window->InternalPos.flags |= WPF_MININIT; Window->InternalPos.IconPos.x = Pos->x;

9 years, 2 months

3
3
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 70713: [WIN32SS] - Fix orthograph - Mention in the code that some stuff are hacks & need to be fixed. - Add parentheses around bit checks.

by Ziggyesque＠hotmail.com

IIRC, it's a hack because neither x nor y is usually -32000, so those are flag values instead of fixed actual values. You have enough physical screens laid out in a line it's possible (16 1080p + a 1280 wide one), but still unlikely on one system given it would take multiple video cards to drive that many. The desktop as a decorated window hides the resize frame and title bar by positioning outside the effective area of a multiple screen layout and using a width and height that just encompasses the layout in Display Properties as the client area dimensions, with (0,0) of the viewports being one of the corners of the primary screen's client area. This forces at least one position coordinate to be negative by at least the width of the resize frame. I forget whether this is documented in the DDK or SDK, sorry, and which edition. ------ Original message------From: James TaborDate: Sat, Feb 13, 2016 12:03 AMTo: ReactOS Development List;Cc: Subject:[ros-dev] [ros-diffs] [hbelusca] 70713: [WIN32SS] - Fix orthograph - Mention in the code that some stuff are hacks & need to be fixed. - Add parentheses around bit checks. Hello, Why is this a hack? Thanks, James Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Fri Feb 12 16:40:36 2016 @@ -724,8 +724,8 @@ pwndParent = Window->spwndParent; if (pwndParent == UserGetDesktopWindow()) { - ERR("Parent is Desktop, Min off screen!\n"); - /* ReactOS doesn't support iconic minimize to desktop */ + ERR("FIXME: Parent is Desktop, Min off screen!\n"); + /* FIXME: ReactOS doesn't support iconic minimize to desktop */ Pos->x = Pos->y = -32000; Window->InternalPos.flags |= WPF_MININIT; Window->InternalPos.IconPos.x = Pos->x; _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev

9 years, 2 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 70707: [CMLIB]: Implement CmpFreeSecurityDescriptor. See r70609. CORE-10793 CORE-10796

by Alex Ionescu

On Wed, Feb 10, 2016 at 5:28 PM, <hbelusca(a)svn.reactos.org> wrote: > else // if (SecurityData->ReferenceCount <= 1) Is the intent to free the data while SecurityData->RefCount will remain at 1?! Best regards, Alex Ionescu

9 years, 2 months

2
1
0 0

[ros-diffs] [jimtabor] 70685: [User32] - Patch by Manuel : Explorer not draw (16 bits) icons. See CORE-10789.

by James Tabor

Hello, Apologies to Carlo Bramini, I listed the wrong author of the patch. James <https://jira.reactos.org/secure/ViewProfile.jspa?name=carlo+bramix>

9 years, 2 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 70674: [CMLIB]: Demote the DPRINT1 saying that we leak the security block descriptor to a DPRINT. People (Alex & me) working on cmlib already know this. "Fixes" timeout problems of the t...

by Alex Ionescu

I think you guys took more time to debug and mess with the DPRINT then it would've taken to implement the function. Come on guys. Best regards, Alex Ionescu On Mon, Feb 1, 2016 at 3:10 PM, <hbelusca(a)svn.reactos.org> wrote: > Author: hbelusca > Date: Mon Feb 1 23:10:38 2016 > New Revision: 70674 > > URL: http://svn.reactos.org/svn/reactos?rev=70674&view=rev > Log: > [CMLIB]: Demote the DPRINT1 saying that we leak the security block descriptor to a DPRINT. People (Alex & me) working on cmlib already know this. "Fixes" timeout problems of the testbots due to spamming this dprint. > > Modified: > trunk/reactos/lib/cmlib/cmkeydel.c > > Modified: trunk/reactos/lib/cmlib/cmkeydel.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmkeydel.c?rev=7… > ============================================================================== > --- trunk/reactos/lib/cmlib/cmkeydel.c [iso-8859-1] (original) > +++ trunk/reactos/lib/cmlib/cmkeydel.c [iso-8859-1] Mon Feb 1 23:10:38 2016 > @@ -215,7 +215,7 @@ > } > > /* FIXME: This leaks the security desriptor! */ > - DPRINT1("Potentially leaking key security descriptor. Please call CmpFreeSecurityDescriptor\n"); > + DPRINT("Potentially leaking key security descriptor. Please call CmpFreeSecurityDescriptor\n"); > > /* Free the key body itself, and then return our status */ > if (!CmpFreeKeyBody(Hive, Cell)) return STATUS_INSUFFICIENT_RESOURCES; > >

9 years, 2 months

2
1
0 0

Re: [ros-dev] [BOOTLIB]: Cleanup, less magic.

by Love Nystrom

On 2016-01-24 19.00, ros-dev-request(a)reactos.org wrote: > + if (Length != Length) Now that's what we call an unlikely condition :-D The CPU branch predictor will have no problem. Magic indeed.. Hope it's not indicative.. L.

9 years, 2 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [ion] 70633: [BOOTLIB]: Cleanup, less magic.

by Timo Kreuzer

Am 21.01.2016 um 16:47 schrieb ion(a)svn.reactos.org: > Author: ion > Date: Thu Jan 21 15:47:14 2016 > New Revision: 70633 > > URL: http://svn.reactos.org/svn/reactos?rev=70633&view=rev > Log: > [BOOTLIB]: Cleanup, less magic. Looks like you forgot to cleanup this special piece of extra magic. > + if (Length != Length) > + { > + PartialSum += (unsigned __int8)Buffer[Length]; > + if (Flags & BL_UTL_CHECKSUM_COMPLEMENT) > + { > + PartialSum = (unsigned __int16)((PartialSum >> 16) + PartialSum); > + } > + } > +

9 years, 3 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 70507: [BOOTVID] Change the Blue Screen Font hardcoded into bootvid.dll to the Open Source "Anonymous Pro" font, which makes a nice 8x13 font. Blue Screens now look like this: http://fs5.d...

by Timo Kreuzer

For everyone who thinks this looks terrible: don't view it in your browser. Instead download it and open it with a proper image viewer. Then your eyes stop bleeding and it actually looks good :) Timo Am 06.01.2016 um 10:31 schrieb cfinck(a)svn.reactos.org: > Author: cfinck > Date: Wed Jan 6 09:31:53 2016 > New Revision: 70507 > > URL: http://svn.reactos.org/svn/reactos?rev=70507&view=rev > Log: > [BOOTVID] > Change the Blue Screen Font hardcoded into bootvid.dll to the Open Source "Anonymous Pro" font, which makes a nice 8x13 font. > Blue Screens now look like this: http://fs5.directupload.net/images/160106/ehv6245t.png > > [BOOTVID_FONT_GENERATOR] > In case you find an even better font, you now have a nice little tool to test that font and generate the corresponding FontData array for bootvid. > > Added: > trunk/rosapps/applications/devutils/bootvid_font_generator/ > trunk/rosapps/applications/devutils/bootvid_font_generator/CMakeLists.txt (with props) > trunk/rosapps/applications/devutils/bootvid_font_generator/bootvid_font_generator.c (with props) > Modified: > trunk/reactos/drivers/base/bootvid/arm/bootdata.c > trunk/reactos/drivers/base/bootvid/i386/bootdata.c > trunk/rosapps/applications/devutils/CMakeLists.txt > > [This mail would be too long, it was shortened to contain the URLs only.] > > Modified: trunk/reactos/drivers/base/bootvid/arm/bootdata.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/arm/b… > > Modified: trunk/reactos/drivers/base/bootvid/i386/bootdata.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… > > Modified: trunk/rosapps/applications/devutils/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/CMak… > > Added: trunk/rosapps/applications/devutils/bootvid_font_generator/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/boot… > > Added: trunk/rosapps/applications/devutils/bootvid_font_generator/bootvid_font_generator.c > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/boot… > > >

9 years, 3 months

3
3
0 0

Commit access for creating a branch

by Mohamed MEDIOUNI

Can I have commit access to !trunk branches for not forking to Git? (for reviving the POSIX subsystem with the Newlib C library and adding pthreads support) Thanks,

9 years, 3 months

3
3
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 70464: [WIN32K] Properly check the bitmap size in IntSetDIBits, taking into account that it might be set to 0, then we have to calculate it ourselves. Fixes a crash when invalid data is ...

by Thomas Faber

Timo, this is causing testbot to freak out since it now crashes during an apitest. Could you look into it? Thanks. On 2015-12-29 21:28, tkreuzer(a)svn.reactos.org wrote: > Author: tkreuzer > Date: Tue Dec 29 20:28:23 2015 > New Revision: 70464 > > URL: http://svn.reactos.org/svn/reactos?rev=70464&view=rev > Log: > [WIN32K] > Properly check the bitmap size in IntSetDIBits, taking into account that it might be set to 0, then we have to calculate it ourselves. Fixes a crash when invalid data is passed to NtGdiCreateDIBitmapInternal. > [GDI32] > Convert COREINFOHEADER to BITMAPINFOHEADER before passing it to NtGdiCreateDIBitmapInternal, which doesn't support it. > CORE-10583 #resolve > > Modified: > trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c > trunk/reactos/win32ss/gdi/ntgdi/dibobj.c > > Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… > ============================================================================== > --- trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) > +++ trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Tue Dec 29 20:28:23 2015 > @@ -408,23 +408,30 @@ > // PDC_ATTR pDc_Attr; > UINT InfoSize = 0; > UINT cjBmpScanSize = 0; > - HBITMAP hBmp; > + HBITMAP hBmp = NULL; > NTSTATUS Status = STATUS_SUCCESS; > + PBITMAPINFO pbmiConverted; > + UINT cjInfoSize; > + > + /* Convert the BITMAPINFO if it is a COREINFO */ > + pbmiConverted = ConvertBitmapInfo(Data, ColorUse, &cjInfoSize, FALSE); > > /* Check for CBM_CREATDIB */ > if (Init & CBM_CREATDIB) > { > /* CBM_CREATDIB needs Data. */ > - if (!Data) > - { > - return 0; > + if (pbmiConverted == NULL) > + { > + DPRINT1("CBM_CREATDIB needs a BITMAINFO!\n"); > + goto Exit; > } > > /* It only works with PAL or RGB */ > if (ColorUse > DIB_PAL_COLORS) > { > + DPRINT1("Invalid ColorUse: %lu\n", ColorUse); > GdiSetLastError(ERROR_INVALID_PARAMETER); > - return 0; > + goto Exit; > } > > /* Use the header from the data */ > @@ -434,38 +441,48 @@ > /* Header is required */ > if (!Header) > { > + DPRINT1("Header is NULL\n"); > GdiSetLastError(ERROR_INVALID_PARAMETER); > - return 0; > + goto Exit; > } > > /* Get the bitmap format and dimensions */ > if (DIB_GetBitmapInfo(Header, &width, &height, &planes, &bpp, &compr, &dibsize) == -1) > { > + DPRINT1("DIB_GetBitmapInfo failed!\n"); > GdiSetLastError(ERROR_INVALID_PARAMETER); > - return NULL; > + goto Exit; > } > > /* Check if the Compr is incompatible */ > if ((compr == BI_JPEG) || (compr == BI_PNG) || (compr == BI_BITFIELDS)) > - return 0; > + { > + DPRINT1("invalid compr: %lu!\n", compr); > + goto Exit; > + } > > /* Only DIB_RGB_COLORS (0), DIB_PAL_COLORS (1) and 2 are valid. */ > if (ColorUse > DIB_PAL_COLORS + 1) > { > + DPRINT1("invalid compr: %lu!\n", compr); > GdiSetLastError(ERROR_INVALID_PARAMETER); > - return 0; > + goto Exit; > } > > /* If some Bits are given, only DIB_PAL_COLORS and DIB_RGB_COLORS are valid */ > if (Bits && (ColorUse > DIB_PAL_COLORS)) > { > + DPRINT1("Invalid ColorUse: %lu\n", ColorUse); > GdiSetLastError(ERROR_INVALID_PARAMETER); > - return 0; > + goto Exit; > } > > /* Negative width is not allowed */ > if (width < 0) > - return 0; > + { > + DPRINT1("Negative width: %li\n", width); > + goto Exit; > + } > > /* Top-down DIBs have a negative height. */ > height = abs(height); > @@ -473,13 +490,13 @@ > // For Icm support. > // GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) > > - if (Data) > + if (pbmiConverted) > { > _SEH2_TRY > { > - cjBmpScanSize = GdiGetBitmapBitsSize((BITMAPINFO *) Data); > - CalculateColorTableSize(&Data->bmiHeader, &ColorUse, &InfoSize); > - InfoSize += Data->bmiHeader.biSize; > + cjBmpScanSize = GdiGetBitmapBitsSize(pbmiConverted); > + CalculateColorTableSize(&pbmiConverted->bmiHeader, &ColorUse, &InfoSize); > + InfoSize += pbmiConverted->bmiHeader.biSize; > } > _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) > { > @@ -490,8 +507,9 @@ > > if (!NT_SUCCESS(Status)) > { > + DPRINT1("Got an exception!\n"); > GdiSetLastError(ERROR_INVALID_PARAMETER); > - return NULL; > + goto Exit; > } > > DPRINT("pBMI %p, Size bpp %u, dibsize %d, Conv %u, BSS %u\n", Data, bpp, dibsize, InfoSize, > @@ -501,9 +519,18 @@ > hBmp = GetStockObject(DEFAULT_BITMAP); > else > { > - hBmp = NtGdiCreateDIBitmapInternal(hDC, width, height, Init, (LPBYTE) Bits, > - (LPBITMAPINFO) Data, ColorUse, InfoSize, cjBmpScanSize, 0, 0); > - } > + hBmp = NtGdiCreateDIBitmapInternal(hDC, width, height, Init, (LPBYTE)Bits, > + (LPBITMAPINFO)pbmiConverted, ColorUse, InfoSize, cjBmpScanSize, 0, 0); > + } > + > +Exit: > + > + /* Cleanup converted BITMAPINFO */ > + if ((pbmiConverted != NULL) && (pbmiConverted != Data)) > + { > + RtlFreeHeap(RtlGetProcessHeap(), 0, pbmiConverted); > + } > + > return hBmp; > } > > > Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… > ============================================================================== > --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) > +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Tue Dec 29 20:28:23 2015 > @@ -259,11 +259,37 @@ > POINTL ptSrc; > EXLATEOBJ exlo; > PPALETTE ppalDIB = 0; > + ULONG cjSizeImage; > > if (!bmi) return 0; > > - if (bmi->bmiHeader.biSizeImage > cjMaxBits) > - { > + /* Check if the header provided an image size */ > + if (bmi->bmiHeader.biSizeImage != 0) > + { > + /* Use the given size */ > + cjSizeImage = bmi->bmiHeader.biSizeImage; > + } > + /* Otherwise check for uncompressed formats */ > + else if ((bmi->bmiHeader.biCompression == BI_RGB) || > + (bmi->bmiHeader.biCompression == BI_BITFIELDS)) > + { > + /* Calculate the image size */ > + cjSizeImage = DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth, > + ScanLines, > + bmi->bmiHeader.biBitCount); > + } > + else > + { > + /* Compressed format without a size. This is invalid. */ > + DPRINT1("Compressed format without a size!"); > + return 0; > + } > + > + /* Check if the size that we have is ok */ > + if (cjSizeImage > cjMaxBits) > + { > + DPRINT1("Size too large! cjSizeImage = %lu, cjMaxBits = %lu\n", > + cjSizeImage, cjMaxBits); > return 0; > } > > @@ -273,7 +299,7 @@ > BitmapFormat(bmi->bmiHeader.biBitCount, > bmi->bmiHeader.biCompression), > bmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, > - bmi->bmiHeader.biSizeImage, > + cjSizeImage, > (PVOID)Bits, > 0); > if (!SourceBitmap) > @@ -314,6 +340,8 @@ > rcDst.right = psurfDst->SurfObj.sizlBitmap.cx; > ptSrc.x = 0; > ptSrc.y = 0; > + > + NT_ASSERT(psurfSrc->SurfObj.cjBits <= cjMaxBits); > > result = IntEngCopyBits(&psurfDst->SurfObj, > &psurfSrc->SurfObj, > @@ -1366,7 +1394,11 @@ > /* Undocumented flag which creates a DDB of the format specified by the bitmap info. */ > handle = IntCreateCompatibleBitmap(Dc, width, height, planes, bpp); > if (!handle) > + { > + DPRINT1("IntCreateCompatibleBitmap() failed!\n"); > return NULL; > + } > + > /* The palette must also match the given data */ > Surface = SURFACE_ShareLockSurface(handle); > ASSERT(Surface); > @@ -1430,6 +1462,7 @@ > safeBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, TAG_DIB); > if(!safeBits) > { > + DPRINT1("Failed to allocate %lu bytes\n", cjMaxBits); > EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); > return NULL; > } > @@ -1452,6 +1485,7 @@ > > if(!NT_SUCCESS(Status)) > { > + DPRINT1("Got an exception! pjInit = %p\n", pjInit); > SetLastNtError(Status); > goto cleanup; > } > @@ -1498,6 +1532,7 @@ > hdcDest = NtGdiCreateCompatibleDC(0); > if(!hdcDest) > { > + DPRINT1("NtGdiCreateCompatibleDC failed\n"); > return NULL; > } > } > @@ -1509,6 +1544,7 @@ > Dc = DC_LockDc(hdcDest); > if (!Dc) > { > + DPRINT1("Failed to lock hdcDest %p\n", hdcDest); > EngSetLastError(ERROR_INVALID_HANDLE); > return NULL; > } > >

9 years, 3 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [gedmurphy] 70408: [NTOSKRNL] - Raise the IRQL when enumerating device lists so it doesn't get edited mid-listing - Don't hardcode the pointer size when checking the buffer size

by Thomas Faber

Uhm... raising the IRQL is not a synchronization mechanism. Should there be a spinlock involved? On 2015-12-23 12:26, gedmurphy(a)svn.reactos.org wrote: > Author: gedmurphy > Date: Wed Dec 23 11:26:28 2015 > New Revision: 70408 > > URL: http://svn.reactos.org/svn/reactos?rev=70408&view=rev > Log: > [NTOSKRNL] > - Raise the IRQL when enumerating device lists so it doesn't get edited mid-listing > - Don't hardcode the pointer size when checking the buffer size > > Modified: > trunk/reactos/ntoskrnl/io/iomgr/device.c > > Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Wed Dec 23 11:26:28 2015 > @@ -1088,6 +1088,10 @@ > { > ULONG ActualDevices = 1; > PDEVICE_OBJECT CurrentDevice = DriverObject->DeviceObject; > + KIRQL OldIrql; > + > + /* Raise to dispatch level */ > + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); > > /* Find out how many devices we'll enumerate */ > while ((CurrentDevice = CurrentDevice->NextDevice)) ActualDevices++; > @@ -1099,13 +1103,14 @@ > *ActualNumberDeviceObjects = ActualDevices; > > /* Check if we can support so many */ > - if ((ActualDevices * 4) > DeviceObjectListSize) > + if ((ActualDevices * sizeof(PDEVICE_OBJECT)) > DeviceObjectListSize) > { > /* Fail because the buffer was too small */ > + KeLowerIrql(OldIrql); > return STATUS_BUFFER_TOO_SMALL; > } > > - /* Check if the caller only wanted the size */ > + /* Check if the caller wanted the device list */ > if (DeviceObjectList) > { > /* Loop through all the devices */ > @@ -1123,6 +1128,9 @@ > DeviceObjectList++; > } > } > + > + /* Return back to previous IRQL */ > + KeLowerIrql(OldIrql); > > /* Return the status */ > return STATUS_SUCCESS; > >

9 years, 3 months

3
6
0 0

[ros-diffs] [tkreuzer] 70464: [WIN32K] Properly check the bitmap size in IntSetDIBits, taking into account that it might be set to 0, then we have to calculate it ourselves. Fixes a crash when invalid data is ...

by James Tabor

I guess it take a decade to get things done in ReactOS? After a few had reverted some code and stuff. Like, Convert COREINFOHEADER to BITMAPINFOHEADER before passing it to NtGdiCreateDIBitmapInternal Yeah~! Very Original! Those that do not get it, research it! It's all in the mailing list! James

9 years, 3 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 70405: [KDCOM] Do not use the "LoaderBlock->u.I386.CommonDataArea; " hack to use FreeLdr's DbgPrint function inside KDCOM, for the simple reason that while it works when KDCOM just initia...

by Timo Kreuzer

That doesn't seem to make much sense. Why enumerate from the end? It should rather enumerate from the start and skip the KdComPort. So far we used COM1 as debug port on MSVC builds and COM2 as terminal debug port for both freeldr and KDCOM. Preferably this should configurable. I really don't like this unintuitive and quite random behaviour. > +#ifdef KDDEBUG > + /* > + * Try to find a free COM port and use it as the KD debugging port. > + * NOTE: Inspired by reactos/boot/freeldr/freeldr/comm/rs232.c, Rs232PortInitialize(...) > + */ > + { > + /* > + * Start enumerating COM ports from the last one to the first one, > + * and break when we find a valid port. > + * If we reach the first element of the list, the invalid COM port, > + * then it means that no valid port was found. > + */ > + ULONG ComPort; > + for (ComPort = MAX_COM_PORTS; ComPort > 0; ComPort--) > + { > + /* Check if the port exist; skip the KD port */ > + if ((ComPort != ComPortNumber) && CpDoesPortExist(UlongToPtr(BaseArray[ComPort]))) > + break; > + } > + if (ComPort != 0) > + CpInitialize(&KdDebugComPort, UlongToPtr(BaseArray[ComPort]), DEFAULT_BAUD_RATE); > + } > +#endif > + > + KDDBGPRINT("KdDebuggerInitialize0\n"); > > >

9 years, 3 months

1
0
0 0

Fwd: Congratulations! Your project is a Project of the Week on SourceForge

by Alex Ionescu

Do you guys get these e-mails too? I think I'm still listed as the admin ;-) Best regards, Alex Ionescu ---------- Forwarded message ---------- From: Cherith Janes <cjanes(a)slashdotmedia.com> Date: Fri, Dec 18, 2015 at 10:09 PM Subject: Congratulations! Your project is a Project of the Week on SourceForge To: communityteam(a)sourceforge.net Hello, My name is Cherith Janes and I am a content editor for SourceForge. I am writing to inform you that your project is a featured Project of the Week and will be listed on the front page of our site next week. This means your project may be included in this month's Community Project of the Month vote, depending on the number of downloads it gets. Projects are chosen based on a variety of considerations, such as recent releases, interesting blog activity, or other related things. Front page features tend to result in increased traffic to your project page so you may want to take this opportunity to make sure you have the latest project description, screenshots, and project logo. And, here is the link to the blog post (*that will go live Monday*) notifying the community of your accomplishment: http://sourceforge.net/blog/project-of-the-week-december-21-2015 Here are all of the *Projects of the Week* for December 21, 2015: akelpad <https://sourceforge.net/projects/akelpad/> filebot <https://sourceforge.net/projects/filebot/> winpython <https://sourceforge.net/projects/winpython/> moneymanagerex <https://sourceforge.net/projects/moneymanagerex/> reactos <https://sourceforge.net/projects/reactos/> cmusphinx <https://sourceforge.net/projects/cmusphinx/> outlookcaldavsynchronizer <https://sourceforge.net/projects/outlookcaldavsynchronizer/> winpenpack <https://sourceforge.net/projects/winpenpack/> <https://sourceforge.net/projects/maxima/>jedit-plugins <https://sourceforge.net/projects/jedit-plugins/> Thanks for being part of the SourceForge community! And best of luck. Cherith Janes Content Editor SourceForge.net

9 years, 4 months

3
2
0 0

Something is wron again with getbuilds

by Alexander Rechitskiy

9 years, 4 months

3
2
0 0

Filesystem corruption in ReactOS when Firefox is updated

by Dimitrij Klingbeil

Hi all I'd like to report a bug, but can't figure out how to do this properly. Jira requires being a registered user but does not tell how exactly one is supposed to get that registration. I hope you have some other, more user-friendly way for reporting bugs by "normal" users - people not so intimate with the ReactOS development - or that you at least plan to provide such a way in the near future. Anyway, here's what I think warrants looking into in more detail: Apparently there is still something that corrupts fastfat - triggerable from user-mode programs. The automatic update function of Firefox (as well as other derivatives like Pale Moon) seems to trigger a particularly nasty instance of that. I think that if a new ReactOS version is going to be released now, it will cause a lot of spurious bug reports from users that install Firefox (it's a popular program after all), and wreck FastFAT during an update in the background. In fact, many users may not be aware of the connection as Firefox tends to update itself in a stealthy way and the user does not really get to see what happens. Steps to reproduce: - install Firefox (or Palemoon, any version from the last couple of years, except of course the latest one) - open the about dialog in it - it will start downloading an update - it will copy the update into a temporary dir in the firefox install dir - it will prompt the user for a restart - look into the Firefox install dir, you will find (among other things) an "update" subdir with temporary files, but so far everything looks OK - now click restart in prompt - it will do some filesystem operations for some seconds, quit, but not restart - look into the install dir again, now it will be a horrible mess of unintelligible things with completely broken filenames - you may not always be able to take that last look as ReactOS may lock-up when you open the folder in explorer (or when you hit F5 if it was already opened) - in any case, ReactOS won't stay very stable for significant time afterwards, even if it survives the look - if it does stay stable for a while, you won't be able to delete the directory nor any items in it, an attempt to delete them will fail, often causing a lock-up Affected versions of Firefox - seemingly all from the recent decade Affected SVN builds of ReactOS - everything from recent years as far as I can tell, but see notes below Additional notes - I've only tested builds made from SVN with RosBE on Windows - but many versions - this bug seems to be always changing when FastFAT is touched in various ROS SVN builds - about half a yer ago it was always leading to a hard lock-up and the filesystem was badly broken, even without opening the folder in Explorer, the crash would not be far away - some 3-4 months ago, the "survival" (no-crash) rate rose somewhat, but the folder still got "filled" with various rubbish - a month or 2 ago the filesystem at least tended to survive and the Firefox directory seemed to be "empty" after an update - although it could not be deleted even though nothing could be "seen" inside it, also a reinstall into the same folder tended to work without crashing - in the recent 1-2 weeks one FastFAT update brought back the bad old times, after the failed update the Firefox directory is again getting filled with broken items, and the number of those items that end up in there, seems to have increased by a lot Regards Dimitrij Klingbeil

9 years, 4 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [rnaumann] 70314: [EXPLORER]Initialize the propInfo structure before using it. Spotted by Mark Jansen. See CORE-10560

by Thomas Faber

On 2015-12-08 23:54, rnaumann(a)svn.reactos.org wrote: > --- trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] (original) > +++ trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] Tue Dec 8 22:54:33 2015 > @@ -338,7 +338,7 @@ > VOID > DisplayTrayProperties(IN HWND hwndOwner) > { > - PROPSHEET_INFO propInfo; > + PROPSHEET_INFO propInfo = {0}; > PROPSHEETHEADER psh; > PROPSHEETPAGE psp[2]; > WCHAR szCaption[256]; I would find this code much easier to understand if you passed 0 as the start menu page's lParam, since it's not making use of it anyway. Having it in both made me worry quite a lot about double frees and such that would happen if both pages used the same structure.

9 years, 4 months

1
0
0 0

kbswitch update

by Hans-Peter Diettrich

Hi all, I'm just digging into kbswitch and have several questions (later). The major issue: kbswitch affects all windows at once, while it should change the input language only for the current (focused) window. I assume that kbswitch must preserve the active window, so that it can know where to apply changes, and to re-activate that window when done. As I don't know what's already implemented, I wrote a simple test program, using GetForegroundWindow() to determine the active window (hwnd), GetWindowThreadProcessId() to get the related process handle, and GetKeyboardLayout() to get the keyboard/language handle (hkl). Tested on WinXP and ReactOS, the output looks correct. The hkl seems to be composed of two words (hi: language and low: layout), which are always the same on ReactOS. On XP a different keyboard layout can be used for a language, but I cannot decipher the resulting encoding of the layout. As soon as I try to change the layout for a language on ReactOS, kbswitch shows the *layout* name, not the *language* name. Q: Can somebody try to find out how to convert a HKL into language and layout id's and/or names? (see GetLayoutIDByHkl) Q: Is kbswitch notified of focus changes, and if so: how? Then above sequence can be used to identify the related thread's setting, and update the tray icon and menu accordingly. Q: Is every process/thread already assigned a *private* hkl? If not, this feature must be implemented before further updates. So much for now DoDi

9 years, 4 months

6
7
0 0

wtf iso.reactos.org is down for ages?

by Alexander Rechitskiy

9 years, 4 months

7
11
0 0

Status Meeting (November 2015)

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place last Thursday of a month, 26th of November, 19:00 UTC, as usual. IRC service will only be started shortly before the meeting. Your participation passwords and server address will be emailed to you shortly before the meeting starts, and they are going to be different once again as they are not stored in any database. Hopefully it's not much of inconvenience. Please send agenda proposals to me before the meeting. Regards, Aleksey Bragin

9 years, 4 months

8
11
0 0

Patch situation

by Robert Naumann

Hey all. I have some thoughts about our current patch situation. After the last big strike regarding patches, which was around the Hackfest, The count of them increased amazingly. We got some new contributers, this year, which do a great work. Some of our old contributers are still hacking like fire and mostly this are small fixes with big impact. Easy to review. I summed up some of them, to show which could get some attention. There are also bigger patches, which would need a coordinated review, but add very nice features (Swyters vbox fix for example). I am sure that about 10 of them could make it. Patches that are currently under review or active development ============================================================= The following patches are the ones, which actually got some attention. They all are slightly bigger ones. CORE-10533 PATCH: Fix local network resolving CORE-10440 PATCH: Fix issues of ws2_32_new CORE-10367 Implement apphelp sdb layer (More or less) simple patches, that would be nice2have for 0.4 ============================================================== These are all the patches from our actual most active contributers. Most of them are very small and easy to understand. Let's not forget them because contributers can become developers, which we need so badly. It would be nice to have them in trunk before release, if they are correct. CORE-10550 clipbrd: Load the clipboard contents from a file CORE-10476 Add a placeholder machine owner at second stage installer to improve UX CORE-10438 [shell32] 'Empty Recycle Bin' should be disabled when no items are present CORE-10437 [console] Add missing DS_MODALFRAME CORE-10436 [shell32] OK button in run dialog should be disabled by default CORE-10410 [fdebug] Manifest and application title CORE-10393 [RAPPS] Small Database Update CORE-10310 Automatically format file size & assorted fixes for apps CORE-9721 [notepad] Let the user know when an opened file is modified CORE-9959 shell32: patch for SHFileOperation (delete-operation) CORE-6742 Can't dynamically change the resolution by resizing in VirtualBox Hacks(?) that would improve the look and feel in 0.4 ==================================================== These patches contain hacks but it would be nice to have them in release. I don't mean to apply them to trunk, but to the 0.4 branch. Important is that, if this happens, enough regression testing is done. CORE-9654 PATCH +Bugfix: UXTHEME draw text with shadows, fix GetThemeSysColor CORE-9533 Title icons are 32pixel downsized to 16pixel CORE-5644 mspaint: selection border isn't visible CORE-9689 Drive's properties theming problem CORE-8925 Start menu has classic border when themes are enabled Drive Type related patches ========================== The author of these patches did some effort to fix the bug, which shows the correct icon for specific drives. I feel like I saw more than this 2 patches but I am not sure and don't find more. We should collaborate with him and take care of this annoying bug, CORE-10221 Fix icons in My Computer CORE-9622 Improvement to GetDriveType() Function Victor's Patches ================ These patches are from Victor M. Calvo. He did a big effort to fix bugs, which affect specifig apps and caused registry curruption. He also proved his patches with apitests but almost nothing happened with the patches. CORE-9673 PATCH: BS_DIBPATTERN8x8 not supported CORE-9672 PATCH: Rewrite RegQueryInfoKeyW CORE-9666 PATCH: RegQueryValueExW fails to set properly the REG_NONE type CORE-9665 PATCH: RegQueryValueExW and RegQueryValueExA calls accept bytes not chars. CORE-9398 PATCH: Several fixes for SetupInstallServicesFromInfSectionExW CORE-8164 Fix a interexchanging values in Vga driver CORE-8157 Fix a memcpy in Dhcpclient using the length in bytes. CORE-8156 Fix a sanity check of a returned ConstructBitBlob CORE-8077 GetDiskFreeSpaceW fixes CORE-8076 SetVolumeLabelW and GetVolumeInformationW fixes Cheers Robert

9 years, 5 months

3
2
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 69936: [USER32] Implement now-documented MB_GetString. See: https://msdn.microsoft.com/en-us/library/windows/desktop/dn910915(v=vs.85).aspx and: http://undoc.airesoft.co.uk/user32.dll/MB...

by Michael Fritscher

Hi, > + > + /* The allowable IDs are between IDOK (0) and IDCONTINUE (11) > inclusive */ > + if (wBtn >= IDCONTINUE) > + return NULL; > + > + LoadStringW(User32Instance, wBtn, (LPWSTR)&btnStr, 0); > + return btnStr; If IDCONTINUE is inclusive then the check in the next line should be >, shouldn't it? Best regards, Michael

9 years, 5 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 69935: [USER32] MessageBoxIndirect fixes by Carlo Bramini: - Implemented loading of text and caption if they are detected as resource IDs. - Use direct resource string pointers with Load...

by Thomas Faber

Mixing formatting changes, changes that should and changes that shouldn't affect behavior, and making indentation inconsistent in the progress is my favorite. :\ On 2015-11-19 00:46, hbelusca(a)svn.reactos.org wrote: > Author: hbelusca > Date: Wed Nov 18 23:46:38 2015 > New Revision: 69935 > > URL: http://svn.reactos.org/svn/reactos?rev=69935&view=rev > Log: > [USER32] > MessageBoxIndirect fixes by Carlo Bramini: > - Implemented loading of text and caption if they are detected as resource IDs. > - Use direct resource string pointers with LoadStringW and use the returned string length. > - Dramatically improve the implementation of ID and resource string assignments, by using a little look up table. This removes some ugly, difficult to maintain copy-paste code. > - Fix the scaling of logical coordinates by making it aware of rounding, i.e. the size of the controls is now calculated correctly. > CORE-10352 #resolve #comment Thank you for the patch! :D

9 years, 5 months

1
0
0 0

Infrastructure problems today

by Colin Finck

Hi all, We suffered from several Infrastructure problems in one of our datacenters today, with the cause that multiple servers were temporarily unreachable. All problems should be finally fixed now though. If you still encounter related problems, please reply to my mail. Cheers, Colin

9 years, 5 months

2
2
0 0

Re: [ros-dev] [ros-diffs] [gedmurphy] 69650: The c++ bool is 1 byte, not 4. Thanks Thomas

by Timo Kreuzer

In fact in this case it wouldn't make a difference, since the bool would be converted to a LONG. But using TRUE/FALSE seems to be appropriate here. Am 22.10.2015 um 19:37 schrieb gedmurphy(a)svn.reactos.org: > Author: gedmurphy > Date: Thu Oct 22 17:37:51 2015 > New Revision: 69650 > > URL: http://svn.reactos.org/svn/reactos?rev=69650&view=rev > Log: > The c++ bool is 1 byte, not 4. Thanks Thomas > > Modified: > trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp > trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h > > Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… > ============================================================================== > --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Thu Oct 22 17:37:51 2015 > @@ -786,7 +786,7 @@ > // we set a timer to run in 500ms, which should leave enough time for all > // the messages to come through. Wrap so we don't set multiple timers > // > - if (InterlockedCompareExchange((LONG *)&This->m_RefreshPending, true, false) == false) > + if (InterlockedCompareExchange((LONG *)&This->m_RefreshPending, TRUE, FALSE) == FALSE) > { > SetTimer(hwnd, REFRESH_TIMER, 500, NULL); > } > @@ -807,7 +807,7 @@ > KillTimer(hwnd, REFRESH_TIMER); > > // Allow more change notifications > - InterlockedExchange((LONG *)&This->m_RefreshPending, false); > + InterlockedExchange((LONG *)&This->m_RefreshPending, FALSE); > } > break; > } > > Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… > ============================================================================== > --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] Thu Oct 22 17:37:51 2015 > @@ -17,7 +17,7 @@ > HMENU m_hMenu; > HMENU m_hActionMenu; > int m_CmdShow; > - bool m_RefreshPending; > + BOOL m_RefreshPending; > > public: > CDeviceManager(void); > > >

9 years, 5 months

4
7
0 0

Files in press-media repository

by Colin Finck

Hi all, After Victor's commit of so many files to our press-media repository, I think we should establish some binding rules for it: * There is no need to have a single file in X different formats in the repository. Let's only keep it there in the best format. In particular, that means: Vector formats > Dynamic raster formats > Static raster formats E.g.: AI/SVG > PSD/TIFF > PNG The only exception to the rule can be made if one of the better formats is highly proprietary (like AI). In that case, an additional SVG file or (as a last resort) high-resolution PNG file may accompany it. I don't consider PSD proprietary anymore, because almost every Open-Source and Closed-Source graphics tool can work with them. Totally uncompressed formats (like BMP) have no reason to stay in the repository at all when better compressed formats (like PNG) are available. I would make the only exception to e.g. the BIOS logo for the MiniPC, because this one needs to be a BMP with special settings for technical reasons. * Only directly ReactOS-related media whose copyright is clarified should go there. Third-party graphics can pose a serious legal trouble. Additionally, Stock graphics can be found on many platforms. There is no need to let press-media become a repository for this. As long as there are no objections or additions, I would like Victor to remove some redundant files according to these rules. Cheers, Colin

9 years, 5 months

3
4
0 0

Status meeting today

by Alex Bragin

I am in traffic in the very centre of Moscow right now and most probably won't be on time for the meeting start. Please start the meeting without me, and first topic of agenda which I would like you to start with is the release plans. I will join you ASAP Regards, Aleksey

9 years, 5 months

1
0
0 0

Status Meeting (October 2015)

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place last Thursday of a month, 29th of October, 19:00 UTC, as usual. IRC service will only be started shortly before the meeting. Your participation passwords and server address will be emailed to you shortly before the meeting starts, and they are going to be different once again as they are not stored in any database. Hopefully it's not much of inconvenience. Please send agenda proposals to me before the meeting. Regards, Aleksey Bragin

9 years, 5 months

3
3
0 0

Re: [ros-dev] [ros-diffs] [pschweitzer] 69683: [CRT] Fix NTDLL implementation of mbstowcs() and wcstombs() so that they return length in caracters and not in bytes. This fixes last failing *to* CRT apitests CORE-10390

by Michael Fritscher

Hi, > Modified: trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/mbstowc… > ============================================================================== > --- trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c [iso-8859-1] (original) > +++ trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c [iso-8859-1] Sun Oct 25 > 09:28:57 2015 > @@ -60,7 +60,7 @@ > if (!NT_SUCCESS(Status)) > return -1; > > - return (size_t)Size; > + return (size_t)(Size / sizeof(wchar_t));; > } > > /* EOF */ Tiny, not critical typo: Two semicolons ;-) Best regards, Michael Fritscher

9 years, 6 months

1
0
0 0

Website Downtime on Monday

by Colin Finck

Hi all, I will upgrade the Web Server Operating System upcoming Monday (2015/10/19) around 11:00 CEST. During this time, the ReactOS Website and related services will be temporarily offline. As always, I will try to keep the downtime low :) Cheers, Colin

9 years, 6 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [sginsberg] 69528: [NTOS] Add super-complicated handling of global pages to KeFlushCurrentTb (pretty much the same code which has been in HalpFlushTLB for the past ~6 years). This should be all tha...

by Alex Ionescu

This is wrong, wrong, wrong. 1) The feature needs to be enabled on all processors, not just one. There's a reason for that loop. 2) ValidKernelPte/Pde being marked global will make ALL kernel pages global. This is probably not what you want. Best regards, Alex Ionescu On Wed, Oct 14, 2015 at 12:33 PM, <sginsberg(a)svn.reactos.org> wrote: > Author: sginsberg > Date: Wed Oct 14 19:33:35 2015 > New Revision: 69528 > > URL: http://svn.reactos.org/svn/reactos?rev=69528&view=rev > Log: > [NTOS] > Add super-complicated handling of global pages to KeFlushCurrentTb (pretty > much the same code which has been in HalpFlushTLB for the past ~6 years). > This should be all that is required to make this feature work (everything > else being in place already), and *seems* to work fine but is disabled > under a switch until tested thoroughly. > > Global pages, an important optimization that allows for not flushing the > whole x86 TLB every time CR3 is changed (typically on context switch to a > new process, or during process attach/detach), relies on us doing extra > work whenever we do alter a global page. This is likely where any bugs will > have to be flushed out! > > Fixup Ki386EnableGlobalPage while we are at it -- disable/restore > interrupts properly, and verify PGE-bit isn't set (nothing should have > touched it before this routine, which is responsible for initializing it, > so we shouldn't have to disable it). Fix, but disable, the CPU-sync spin as > well as there should be no particular reason to do this for PGE-enabling > during initialization (no other processor will be messing with PTEs at this > stage, as compared to a call to KeFlushEntireTb). > > Everyone, repeat after me: Global pages are awesome! > > Modified: > trunk/reactos/ntoskrnl/include/ntoskrnl.h > trunk/reactos/ntoskrnl/ke/i386/cpu.c > trunk/reactos/ntoskrnl/ke/i386/patpge.c > trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c > > Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… > > ============================================================================== > --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Wed Oct 14 > 19:33:35 2015 > @@ -98,6 +98,14 @@ > #define ASSERT NT_ASSERT > #endif > > + > +// > +// Switch for enabling global page support > +// > + > +//#define _GLOBAL_PAGES_ARE_AWESOME_ > + > + > /* Internal Headers */ > #include "internal/ntoskrnl.h" > #include "config.h" > > Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… > > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Oct 14 > 19:33:35 2015 > @@ -878,8 +878,37 @@ > NTAPI > KeFlushCurrentTb(VOID) > { > + > +#if !defined(_GLOBAL_PAGES_ARE_AWESOME_) > + > /* Flush the TLB by resetting CR3 */ > __writecr3(__readcr3()); > + > +#else > + > + /* Check if global pages are enabled */ > + if (KeFeatureBits & KF_GLOBAL_PAGE) > + { > + ULONG Cr4; > + > + /* Disable PGE */ > + Cr4 = __readcr4() & ~CR4_PGE; > + __writecr4(Cr4); > + > + /* Flush everything */ > + __writecr3(__readcr3()); > + > + /* Re-enable PGE */ > + __writecr4(Cr4 | CR4_PGE); > + } > + else > + { > + /* No global pages, resetting CR3 is enough */ > + __writecr3(__readcr3()); > + } > + > +#endif > + > } > > VOID > > Modified: trunk/reactos/ntoskrnl/ke/i386/patpge.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/patpge.c?… > > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] Wed Oct 14 > 19:33:35 2015 > @@ -17,40 +17,41 @@ > > /* FUNCTIONS > *****************************************************************/ > > +INIT_SECTION > ULONG_PTR > NTAPI > -INIT_FUNCTION > Ki386EnableGlobalPage(IN ULONG_PTR Context) > { > - PLONG Count = (PLONG)Context; > - ULONG Cr4, Cr3; > + //PLONG Count; > +#if defined(_GLOBAL_PAGES_ARE_AWESOME_) > + ULONG Cr4; > +#endif > + BOOLEAN Enable; > > /* Disable interrupts */ > - _disable(); > - > - /* Decrease CPU Count and loop until it's reached 0 */ > - do {InterlockedDecrement(Count);} while (!*Count); > - > - /* Now check if this is the Boot CPU */ > - if (!KeGetPcr()->Number) > - { > - /* It is.FIXME: Patch KeFlushCurrentTb */ > - } > - > - /* Now get CR4 and make sure PGE is masked out */ > + Enable = KeDisableInterrupts(); > + > + /* Spin until other processors are ready */ > + //Count = (PLONG)Context; > + //InterlockedDecrement(Count); > + //while (*Count) YieldProcessor(); > + > +#if defined(_GLOBAL_PAGES_ARE_AWESOME_) > + > + /* Get CR4 and ensure global pages are disabled */ > Cr4 = __readcr4(); > - __writecr4(Cr4 & ~CR4_PGE); > - > - /* Flush the TLB */ > - Cr3 = __readcr3(); > - __writecr3(Cr3); > + ASSERT(!(Cr4 & CR4_PGE)); > + > + /* Reset CR3 to flush the TLB */ > + __writecr3(__readcr3()); > > /* Now enable PGE */ > - DPRINT("Global page support detected but not yet taken advantage > of\n"); > - //__writecr4(Cr4 | CR4_PGE); > - > - /* Restore interrupts */ > - _enable(); > + __writecr4(Cr4 | CR4_PGE); > + > +#endif > + > + /* Restore interrupts and return */ > + KeRestoreInterrupts(Enable); > return 0; > } > > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… > > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Wed Oct 14 > 19:33:35 2015 > @@ -249,15 +249,18 @@ > PMMPFN Pfn1; > ULONG Flags; > > +#if defined(_GLOBAL_PAGES_ARE_AWESOME_) > + > /* Check for global bit */ > -#if 0 > if (KeFeatureBits & KF_GLOBAL_PAGE) > { > /* Set it on the template PTE and PDE */ > ValidKernelPte.u.Hard.Global = TRUE; > ValidKernelPde.u.Hard.Global = TRUE; > } > + > #endif > + > /* Now templates are ready */ > TempPte = ValidKernelPte; > TempPde = ValidKernelPde; > > >

9 years, 6 months

2
2
0 0

Re: [ros-dev] [ros-diffs] [pschweitzer] 69507: [WHOOPS] C/P error

by Alex Ionescu

This is checking for 8-byte alignment on x86, not 16-byte. On Sun, Oct 11, 2015 at 2:51 PM, <pschweitzer(a)svn.reactos.org> wrote: > if (!((ULONG_PTR)Buffers[i] & 0x2)) Best regards, Alex Ionescu

9 years, 6 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [sginsberg] 69466: [KERNEL32] Fix bug in CreateFiberEx that made it replace the CONTEXT_FULL bits rather than ORing in CONTEXT_FLOATING_POINT when caller wanted FPU state saved. SwitchToFiber check...

by Alex Ionescu

How did our Fiber tests ever pass? Best regards, Alex Ionescu On Thu, Oct 8, 2015 at 9:26 AM, <sginsberg(a)svn.reactos.org> wrote: > Author: sginsberg > Date: Thu Oct 8 16:26:29 2015 > New Revision: 69466 > > URL: http://svn.reactos.org/svn/reactos?rev=69466&view=rev > Log: > [KERNEL32] Fix bug in CreateFiberEx that made it replace the CONTEXT_FULL > bits rather than ORing in CONTEXT_FLOATING_POINT when caller wanted FPU > state saved. SwitchToFiber checks for CONTEXT_FULL OR > CONTEXT_FLOATING_POINT so the save/restore would fail. Moreover, fix > BaseInitializeContext that was not checking CONTEXT_FLOATING_POINT > correctly for some fibers and, as a result, not initializing FPU context > correctly for callers of ConvertThreadToFiberEx. Finally, because trying to > access address 0x6 is generally a bad idea, fix SwitchToFiber to use the > correct shared user data offsets. Misc cleanup all around. Bonus: Sort > TEB/PEB asm offsets and add GDI Batch Count offset, needed soon. > > Modified: > trunk/reactos/dll/win32/kernel32/client/fiber.c > trunk/reactos/dll/win32/kernel32/client/i386/fiber.S > trunk/reactos/dll/win32/kernel32/client/utils.c > trunk/reactos/include/asm/ks386.template.h > trunk/reactos/include/ndk/i386/asm.h > > Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… > > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] > (original) > +++ trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] Thu > Oct 8 16:26:29 2015 > @@ -27,10 +27,9 @@ > > VOID > WINAPI > -BaseRundownFls(IN PVOID FlsData) > +BaseRundownFls(_In_ PVOID FlsData) > { > /* No FLS support yet */ > - > } > > /* PUBLIC FUNCTIONS > ***********************************************************/ > @@ -55,16 +54,18 @@ > return FALSE; > } > > - /* this thread won't run a fiber anymore */ > + /* This thread won't run a fiber anymore */ > Teb->HasFiberData = FALSE; > FiberData = Teb->NtTib.FiberData; > Teb->NtTib.FiberData = NULL; > > /* Free the fiber */ > ASSERT(FiberData != NULL); > - RtlFreeHeap(GetProcessHeap(), 0, FiberData); > - > - /* success */ > + RtlFreeHeap(GetProcessHeap(), > + 0, > + FiberData); > + > + /* Success */ > return TRUE; > } > > @@ -73,15 +74,15 @@ > */ > LPVOID > WINAPI > -ConvertThreadToFiberEx(LPVOID lpParameter, > - DWORD dwFlags) > +ConvertThreadToFiberEx(_In_opt_ LPVOID lpParameter, > + _In_ DWORD dwFlags) > { > PTEB Teb; > PFIBER Fiber; > DPRINT1("Converting Thread to Fiber\n"); > > /* Check for invalid flags */ > - if (dwFlags &~ FIBER_FLAG_FLOAT_SWITCH) > + if (dwFlags & ~FIBER_FLAG_FLOAT_SWITCH) > { > /* Fail */ > SetLastError(ERROR_INVALID_PARAMETER); > @@ -98,9 +99,12 @@ > } > > /* Allocate the fiber */ > - Fiber = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(FIBER)); > + Fiber = RtlAllocateHeap(RtlGetProcessHeap(), > + 0, > + sizeof(FIBER)); > if (!Fiber) > { > + /* Fail */ > SetLastError(ERROR_NOT_ENOUGH_MEMORY); > return NULL; > } > @@ -114,13 +118,11 @@ > Fiber->FlsData = Teb->FlsData; > Fiber->GuaranteedStackBytes = Teb->GuaranteedStackBytes; > Fiber->ActivationContextStackPointer = > Teb->ActivationContextStackPointer; > - Fiber->FiberContext.ContextFlags = CONTEXT_FULL; > - > - /* Save FPU State if requested */ > - if (dwFlags & FIBER_FLAG_FLOAT_SWITCH) > - { > - Fiber->FiberContext.ContextFlags |= CONTEXT_FLOATING_POINT; > - } > + > + /* Save FPU State if requested, otherwise just the basic registers */ > + Fiber->FiberContext.ContextFlags = (dwFlags & > FIBER_FLAG_FLOAT_SWITCH) ? > + (CONTEXT_FULL | > CONTEXT_FLOATING_POINT) : > + CONTEXT_FULL; > > /* Associate the fiber to the current thread */ > Teb->NtTib.FiberData = Fiber; > @@ -135,10 +137,11 @@ > */ > LPVOID > WINAPI > -ConvertThreadToFiber(LPVOID lpParameter) > +ConvertThreadToFiber(_In_opt_ LPVOID lpParameter) > { > /* Call the newer function */ > - return ConvertThreadToFiberEx(lpParameter, 0); > + return ConvertThreadToFiberEx(lpParameter, > + 0); > } > > /* > @@ -146,12 +149,16 @@ > */ > LPVOID > WINAPI > -CreateFiber(SIZE_T dwStackSize, > - LPFIBER_START_ROUTINE lpStartAddress, > - LPVOID lpParameter) > +CreateFiber(_In_ SIZE_T dwStackSize, > + _In_ LPFIBER_START_ROUTINE lpStartAddress, > + _In_opt_ LPVOID lpParameter) > { > /* Call the Newer Function */ > - return CreateFiberEx(dwStackSize, 0, 0, lpStartAddress, lpParameter); > + return CreateFiberEx(dwStackSize, > + 0, > + 0, > + lpStartAddress, > + lpParameter); > } > > /* > @@ -159,20 +166,20 @@ > */ > LPVOID > WINAPI > -CreateFiberEx(SIZE_T dwStackCommitSize, > - SIZE_T dwStackReserveSize, > - DWORD dwFlags, > - LPFIBER_START_ROUTINE lpStartAddress, > - LPVOID lpParameter) > +CreateFiberEx(_In_ SIZE_T dwStackCommitSize, > + _In_ SIZE_T dwStackReserveSize, > + _In_ DWORD dwFlags, > + _In_ LPFIBER_START_ROUTINE lpStartAddress, > + _In_opt_ LPVOID lpParameter) > { > PFIBER Fiber; > NTSTATUS Status; > INITIAL_TEB InitialTeb; > - PACTIVATION_CONTEXT_STACK ActivationContextStackPointer = NULL; > + PACTIVATION_CONTEXT_STACK ActivationContextStackPointer; > DPRINT("Creating Fiber\n"); > > /* Check for invalid flags */ > - if (dwFlags &~ FIBER_FLAG_FLOAT_SWITCH) > + if (dwFlags & ~FIBER_FLAG_FLOAT_SWITCH) > { > /* Fail */ > SetLastError(ERROR_INVALID_PARAMETER); > @@ -180,6 +187,7 @@ > } > > /* Allocate the Activation Context Stack */ > + ActivationContextStackPointer = NULL; > Status = > RtlAllocateActivationContextStack(&ActivationContextStackPointer); > if (!NT_SUCCESS(Status)) > { > @@ -189,7 +197,9 @@ > } > > /* Allocate the fiber */ > - Fiber = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(FIBER)); > + Fiber = RtlAllocateHeap(RtlGetProcessHeap(), > + 0, > + sizeof(FIBER)); > if (!Fiber) > { > /* Free the activation context stack */ > @@ -208,7 +218,9 @@ > if (!NT_SUCCESS(Status)) > { > /* Free the fiber */ > - RtlFreeHeap(GetProcessHeap(), 0, Fiber); > + RtlFreeHeap(GetProcessHeap(), > + 0, > + Fiber); > > /* Free the activation context stack */ > RtlFreeActivationContextStack(ActivationContextStackPointer); > @@ -219,7 +231,8 @@ > } > > /* Clear the context */ > - RtlZeroMemory(&Fiber->FiberContext, sizeof(CONTEXT)); > + RtlZeroMemory(&Fiber->FiberContext, > + sizeof(CONTEXT)); > > /* Copy the data into the fiber */ > Fiber->StackBase = InitialTeb.StackBase; > @@ -230,12 +243,13 @@ > Fiber->GuaranteedStackBytes = 0; > Fiber->FlsData = NULL; > Fiber->ActivationContextStackPointer = ActivationContextStackPointer; > - Fiber->FiberContext.ContextFlags = CONTEXT_FULL; > - > - /* Save FPU State if requested */ > - Fiber->FiberContext.ContextFlags = (dwFlags & > FIBER_FLAG_FLOAT_SWITCH) ? CONTEXT_FLOATING_POINT : 0; > - > - /* initialize the context for the fiber */ > + > + /* Save FPU State if requested, otherwise just the basic registers */ > + Fiber->FiberContext.ContextFlags = (dwFlags & > FIBER_FLAG_FLOAT_SWITCH) ? > + (CONTEXT_FULL | > CONTEXT_FLOATING_POINT) : > + CONTEXT_FULL; > + > + /* Initialize the context for the fiber */ > BaseInitializeContext(&Fiber->FiberContext, > lpParameter, > lpStartAddress, > @@ -251,17 +265,24 @@ > */ > VOID > WINAPI > -DeleteFiber(LPVOID lpFiber) > -{ > - SIZE_T Size = 0; > - PFIBER Fiber = (PFIBER)lpFiber; > +DeleteFiber(_In_ LPVOID lpFiber) > +{ > + SIZE_T Size; > + PFIBER Fiber; > PTEB Teb; > > - /* First, exit the thread */ > + /* Are we deleting ourselves? */ > Teb = NtCurrentTeb(); > - if ((Teb->HasFiberData) && (Teb->NtTib.FiberData == Fiber)) > ExitThread(1); > - > - /* Now de-allocate the stack */ > + Fiber = (PFIBER)lpFiber; > + if ((Teb->HasFiberData) && > + (Teb->NtTib.FiberData == Fiber)) > + { > + /* Just exit */ > + ExitThread(1); > + } > + > + /* Not ourselves, de-allocate the stack */ > + Size = 0 ; > NtFreeVirtualMemory(NtCurrentProcess(), > &Fiber->DeallocationStack, > &Size, > @@ -274,7 +295,9 @@ > RtlFreeActivationContextStack(Fiber->ActivationContextStackPointer); > > /* Free the fiber data */ > - RtlFreeHeap(GetProcessHeap(), 0, lpFiber); > + RtlFreeHeap(GetProcessHeap(), > + 0, > + lpFiber); > } > > /* > @@ -284,6 +307,7 @@ > WINAPI > IsThreadAFiber(VOID) > { > + /* Return flag in the TEB */ > return NtCurrentTeb()->HasFiberData; > } > > @@ -349,7 +373,8 @@ > */ > BOOL > WINAPI > -FlsSetValue(DWORD dwFlsIndex, PVOID lpFlsData) > +FlsSetValue(DWORD dwFlsIndex, > + PVOID lpFlsData) > { > PVOID *ppFlsSlots; > TEB *pTeb = NtCurrentTeb(); > > Modified: trunk/reactos/dll/win32/kernel32/client/i386/fiber.S > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… > > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/client/i386/fiber.S > [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32/client/i386/fiber.S > [iso-8859-1] Thu Oct 8 16:26:29 2015 > @@ -15,21 +15,26 @@ > .code > > PUBLIC _BaseFiberStartup@0 > -.PROC _BaseFiberStartup@0 > - /* Frame pointer is zeroed */ > +FUNC _BaseFiberStartup@0 > FPO 0, 0, 0, 0, 0, FRAME_FPO > + > + /* Note that EBP is already zeroed for us during fiber creation */ > > /* Get the fiber data */ > mov eax, fs:[TEB_FIBER_DATA] > > - push dword ptr [eax+FIBER_CONTEXT_EBX] /* Parameter */ > - push dword ptr [eax+FIBER_CONTEXT_EAX] /* Start Address */ > - call _BaseThreadStartup@8 > -.ENDP > + /* Start the thread with our parameters */ > + push dword ptr [eax+FIBER_CONTEXT_EBX] > + push dword ptr [eax+FIBER_CONTEXT_EAX] > + jmp _BaseThreadStartup@8 > + > +ENDFUNC > > > PUBLIC _SwitchToFiber@4 > -_SwitchToFiber@4: > +FUNC _SwitchToFiber@4 > + FPO 0, 0, 0, 0, 0, FRAME_FPO > + > /* Get the TEB */ > mov edx, fs:[TEB_SELF] > > @@ -51,7 +56,7 @@ > fnstcw [eax+FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD] > > /* Check if the CPU supports SIMD MXCSR State Save */ > - cmp byte ptr ds:[PF_XMMI_INSTRUCTIONS_AVAILABLE], 1 > + cmp byte ptr ds:[USER_SHARED_DATA + > USER_SHARED_DATA_PROCESSOR_FEATURES + PF_XMMI_INSTRUCTIONS_AVAILABLE], 1 > jnz NoFpuStateSave > stmxcsr [eax+FIBER_CONTEXT_DR6] > > @@ -109,13 +114,13 @@ > StatusWordChanged: > > /* Load the new one */ > - mov word ptr [ecx+FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD], HEX(0FFFF) > + mov word ptr [ecx+FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD], HEX(FFFF) > fldenv [ecx+FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD] > > ControlWordEqual: > > /* Load the new one */ > - cmp byte ptr ds:[PF_XMMI_INSTRUCTIONS_AVAILABLE], 1 > + cmp byte ptr ds:[USER_SHARED_DATA + > USER_SHARED_DATA_PROCESSOR_FEATURES + PF_XMMI_INSTRUCTIONS_AVAILABLE], 1 > jnz NoFpuStateRestore > ldmxcsr [ecx+FIBER_CONTEXT_DR6] > > @@ -136,6 +141,7 @@ > mov esp, [ecx+FIBER_CONTEXT_ESP] > ret 4 > > +ENDFUNC > > END > /* EOF */ > > Modified: trunk/reactos/dll/win32/kernel32/client/utils.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… > > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] > (original) > +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Thu > Oct 8 16:26:29 2015 > @@ -548,7 +548,7 @@ > > /* Is FPU state required? */ > Context->ContextFlags |= ContextFlags; > - if (ContextFlags == CONTEXT_FLOATING_POINT) > + if ((ContextFlags & CONTEXT_FLOATING_POINT) == > CONTEXT_FLOATING_POINT) > { > /* Set an initial state */ > Context->FloatSave.ControlWord = 0x27F; > > Modified: trunk/reactos/include/asm/ks386.template.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/ks386.template… > > ============================================================================== > --- trunk/reactos/include/asm/ks386.template.h [iso-8859-1] (original) > +++ trunk/reactos/include/asm/ks386.template.h [iso-8859-1] Thu Oct 8 > 16:26:29 2015 > @@ -724,17 +724,20 @@ > > HEADER("TEB"), > OFFSET(TEB_EXCEPTION_LIST, TEB, NtTib.ExceptionList), > +OFFSET(TEB_STACK_BASE, TEB, NtTib.StackBase), > OFFSET(TEB_STACK_LIMIT, TEB, NtTib.StackLimit), > -OFFSET(TEB_STACK_BASE, TEB, NtTib.StackBase), > +OFFSET(TEB_FIBER_DATA, TEB, NtTib.FiberData), > OFFSET(TEB_SELF, TEB, NtTib.Self), > -OFFSET(TEB_FIBER_DATA, TEB, NtTib.FiberData), > OFFSET(TEB_PEB, TEB, ProcessEnvironmentBlock), > OFFSET(TEB_EXCEPTION_CODE, TEB, ExceptionCode), > +OFFSET(TEB_ACTIVATION_CONTEXT_STACK_POINTER, TEB, > ActivationContextStackPointer), > +OFFSET(TEB_DEALLOCATION_STACK, TEB, DeallocationStack), > +OFFSET(TEB_GDI_BATCH_COUNT, TEB, GdiBatchCount), > +OFFSET(TEB_GUARANTEED_STACK_BYTES, TEB, GuaranteedStackBytes), > +OFFSET(TEB_FLS_DATA, TEB, FlsData), > + > +HEADER("PEB"), > OFFSET(PEB_KERNEL_CALLBACK_TABLE, PEB, KernelCallbackTable), > -OFFSET(TEB_FLS_DATA, TEB, FlsData), > -OFFSET(TEB_ACTIVATION_CONTEXT_STACK_POINTER, TEB, > ActivationContextStackPointer), > -OFFSET(TEB_GUARANTEED_STACK_BYTES, TEB, GuaranteedStackBytes), > -OFFSET(TEB_DEALLOCATION_STACK, TEB, DeallocationStack), > > HEADER("Misc"), > CONSTANT(NPX_FRAME_LENGTH), > @@ -754,4 +757,6 @@ > CONSTANT(CONTEXT_ALIGNED_SIZE), > CONSTANT(PROCESSOR_FEATURE_FXSR), > CONSTANT(KUSER_SHARED_SYSCALL_RET), > - > +CONSTANT(USER_SHARED_DATA), > +CONSTANT(USER_SHARED_DATA_PROCESSOR_FEATURES), > + > > Modified: trunk/reactos/include/ndk/i386/asm.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/asm.h?rev… > > ============================================================================== > --- trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] (original) > +++ trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] Thu Oct 8 > 16:26:29 2015 > @@ -315,13 +315,14 @@ > #define FRAME_EDITED 0xFFF8 > > // > -// KUSER_SHARED_DATA Offsets > +// USER_SHARED_DATA Offsets > // > #ifdef __ASM__ > #define USER_SHARED_DATA 0xFFDF0000 > #endif > #define USER_SHARED_DATA_INTERRUPT_TIME 0x8 > #define USER_SHARED_DATA_SYSTEM_TIME 0x14 > +#define USER_SHARED_DATA_PROCESSOR_FEATURES 0x274 > #define USER_SHARED_DATA_TICK_COUNT 0x320 > > // > > >

9 years, 6 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 69435: [NTVDM] Improve the PCH situation.

by Hermès BÉLUSCA - MAÏTO

Hi ! I don't think this commit constitutes a nice improvement for NTVDM at its present status: - having the precise list of the used headers in each .c file helped me in knowing at a glance which functionalities a given .c needed, - therefore enabling me to find better places where to put the functions and possibly reduce the number of headers in the future (refactoring). - This broke my numerous local changes regarding e.g. a modularization of the CPU layer in NTVDM, video layer, ... - Finally, stuffing indistinctively *all* the headers (including the private ones like bios32p.h which purpose was to be used in the sources of one module only) inside the PCH ntvdm.h, makes for example BIOS or DOS functions visible inside hardware modules like ps2.h, which is completely illogical when you try to modularize NTVDM at source level, by completely separating hardware emulation from bios code and DOS emulation, etc... . Therefore I will revert your commit tomorrow, while keeping a diff and put it in a JIRA report. Cheers, Hermès. ________________________________________ [ros-diffs] [akhaldi] 69435: [NTVDM] Improve the PCH situation. akhaldi at svn.reactos.org akhaldi at svn.reactos.org Sat Oct 3 21:47:46 UTC 2015 Previous message: [ros-diffs] [spetreolle] 69434: [user32_apitest] 0x%lu does not mean anything correct. Next message: [ros-diffs] [spetreolle] 69436: [ROSTESTS] Fix 0x%lu specifier. Add cmake file for notificationtest. Messages sorted by: [ date ] [ thread ] [ subject ] [ author ] ________________________________________ Author: akhaldi Date: Sat Oct 3 21:47:46 2015 New Revision: 69435 URL: http://svn.reactos.org/svn/reactos?rev=69435&view=rev Log: [NTVDM] Improve the PCH situation.

9 years, 6 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [sginsberg] 69393: [NTOS] Fix the Ob wait system calls to only catch the exceptions that are expected to be raised by the Ke wait functions (and not potentially silently catching *any* exception an...

by Pierre Schweitzer

On 28/09/2015 11:01, sginsberg(a)svn.reactos.org wrote: > Author: sginsberg > Date: Mon Sep 28 09:01:11 2015 > New Revision: 69393 > > URL: http://svn.reactos.org/svn/reactos?rev=69393&view=rev > Log: > [NTOS] Fix the Ob wait system calls to only catch the exceptions that are expected to be raised by the Ke wait functions (and not potentially silently catching *any* exception and corrupting everything in the process). Also fixup some code logic. SEH Mega Fixup 1/??? > > Modified: > trunk/reactos/ntoskrnl/ob/obwait.c > > Modified: trunk/reactos/ntoskrnl/ob/obwait.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=6… > ============================================================================== > --- trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] Mon Sep 28 09:01:11 2015 > @@ -49,12 +49,12 @@ > IN BOOLEAN Alertable, > IN PLARGE_INTEGER TimeOut OPTIONAL) > { > - PKWAIT_BLOCK WaitBlockArray = NULL; > + PKWAIT_BLOCK WaitBlockArray; > HANDLE Handles[MAXIMUM_WAIT_OBJECTS], KernelHandle; > PVOID Objects[MAXIMUM_WAIT_OBJECTS]; > PVOID WaitObjects[MAXIMUM_WAIT_OBJECTS]; > - ULONG i = 0, ReferencedObjects = 0, j; > - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); > + ULONG i, ReferencedObjects, j; > + KPROCESSOR_MODE PreviousMode; > LARGE_INTEGER SafeTimeOut; > BOOLEAN LockInUse; > PHANDLE_TABLE_ENTRY HandleEntry; > @@ -65,31 +65,26 @@ > NTSTATUS Status; > PAGED_CODE(); > > - /* Enter a critical region since we'll play with handles */ > - LockInUse = TRUE; > - KeEnterCriticalRegion(); > - > /* Check for valid Object Count */ > if ((ObjectCount > MAXIMUM_WAIT_OBJECTS) || !(ObjectCount)) > { > /* Fail */ > - Status = STATUS_INVALID_PARAMETER_1; > - goto Quickie; > + return STATUS_INVALID_PARAMETER_1; > } > > /* Check for valid Wait Type */ > if ((WaitType != WaitAll) && (WaitType != WaitAny)) > { > /* Fail */ > - Status = STATUS_INVALID_PARAMETER_3; > - goto Quickie; > - } > - > - /* Enter SEH */ > - _SEH2_TRY > - { > - /* Check if the call came from user mode */ > - if (PreviousMode != KernelMode) > + return STATUS_INVALID_PARAMETER_3; > + } > + > + /* Enter SEH for user mode */ > + PreviousMode = ExGetPreviousMode(); > + if (PreviousMode != KernelMode) > + { > + /* Enter SEH */ > + _SEH2_TRY No, this is plain wrong. This is not because you're in kernel mode that the world is marvelous and callers trustable. A caller can pass you buggy address and you HAVE to wrap the RtlCopyMemory in SEH to make sure that if a buggy address is passed, the whole system isn't brought down (that's the whole purpose of the copy after all!). In case you have a doubt, just put some random: Status = ZwWaitForMultipleObjects(2, (void **)0x42424242, WaitAll, FALSE, NULL); In a kernel component. In w2k3, you'll get Status = STATUS_ACCESS_VIOLATION In ReactOS, with your changes: BSOD. Please before doing random changes that you believe are right: do testing. Alex already told you that. Cheers, -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

9 years, 6 months

1
0
0 0

Status Meeting (September 2015)

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place last Thursday of a month, 24th of September, 19:00 UTC, as usual. IRC service will only be started shortly before the meeting. Your participation passwords and server address will be emailed to you shortly before the meeting starts, and they are going to be different once again as they are not stored in any database. Hopefully it's not much of inconvenience. Please send agenda proposals to me before the meeting. Regards, Aleksey Bragin

9 years, 7 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [tfaber] 69296: [KMTESTS] - Add missing OBJ_KERNEL_HANDLE - OBJ_KERNEL_HANDLE in user mode has no effect... no reason to make a define around it CORE-10207

by Alex Ionescu

Actually, in XP, OBJ_KERNEL_HANDLE Did work, and gave you a kernel handle that you could never use. In Windows Vista, it returns a failure code. Not sure about 2003. Best regards, Alex Ionescu On Sat, Sep 19, 2015 at 2:46 PM, <tfaber(a)svn.reactos.org> wrote: > Author: tfaber > Date: Sat Sep 19 21:46:40 2015 > New Revision: 69296 > > URL: http://svn.reactos.org/svn/reactos?rev=69296&view=rev > Log: > [KMTESTS] > - Add missing OBJ_KERNEL_HANDLE > - OBJ_KERNEL_HANDLE in user mode has no effect... no reason to make a > define around it > CORE-10207 > > Modified: > trunk/rostests/kmtests/ntos_io/IoCreateFile.c > trunk/rostests/kmtests/ntos_ke/KeEvent.c > trunk/rostests/kmtests/rtl/RtlRegistry.c > > Modified: trunk/rostests/kmtests/ntos_io/IoCreateFile.c > URL: > http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoCreateF… > > ============================================================================== > --- trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] > (original) > +++ trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] Sat > Sep 19 21:46:40 2015 > @@ -454,7 +454,7 @@ > ok_eq_hex(IoStatusBlock.Status, 0xFFFFFFFF); > if (Status == STATUS_SUCCESS) > { > - ObCloseHandle(ParentHandle, KernelMode); > + ObCloseHandle(ParentHandle, UserMode); > } > > /* Attempt relative target open */ > @@ -462,7 +462,7 @@ > IoStatusBlock.Information = 0xFFFFFFFF; > InitializeObjectAttributes(&ObjectAttributes, > &SystemRoot, > - OBJ_CASE_INSENSITIVE, > + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, > NULL, NULL); > Status = ZwOpenFile(&SystemRootHandle, > GENERIC_WRITE | GENERIC_READ | SYNCHRONIZE, > @@ -478,7 +478,7 @@ > IoStatusBlock.Information = 0xFFFFFFFF; > InitializeObjectAttributes(&ObjectAttributes, > &Regedit, > - OBJ_CASE_INSENSITIVE, > + OBJ_CASE_INSENSITIVE | > OBJ_KERNEL_HANDLE, > SystemRootHandle, > NULL); > Status = IoCreateFile(&ParentHandle, > > Modified: trunk/rostests/kmtests/ntos_ke/KeEvent.c > URL: > http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeEvent.c… > > ============================================================================== > --- trunk/rostests/kmtests/ntos_ke/KeEvent.c [iso-8859-1] (original) > +++ trunk/rostests/kmtests/ntos_ke/KeEvent.c [iso-8859-1] Sat Sep 19 > 21:46:40 2015 > @@ -155,6 +155,7 @@ > PVOID ThreadObjects[RTL_NUMBER_OF(Threads)]; > LONG State; > PKTHREAD Thread = KeGetCurrentThread(); > + OBJECT_ATTRIBUTES ObjectAttributes; > > LongTimeout.QuadPart = -100 * MILLISECOND; > ShortTimeout.QuadPart = -1 * MILLISECOND; > @@ -165,7 +166,12 @@ > { > Threads[i].Event = Event; > Threads[i].Signal = FALSE; > - Status = PsCreateSystemThread(&Threads[i].Handle, GENERIC_ALL, > NULL, NULL, NULL, WaitForEventThread, &Threads[i]); > + InitializeObjectAttributes(&ObjectAttributes, > + NULL, > + OBJ_KERNEL_HANDLE, > + NULL, > + NULL); > + Status = PsCreateSystemThread(&Threads[i].Handle, GENERIC_ALL, > &ObjectAttributes, NULL, NULL, WaitForEventThread, &Threads[i]); > ok_eq_hex(Status, STATUS_SUCCESS); > Status = ObReferenceObjectByHandle(Threads[i].Handle, > SYNCHRONIZE, *PsThreadType, KernelMode, (PVOID *)&Threads[i].Thread, NULL); > ok_eq_hex(Status, STATUS_SUCCESS); > > Modified: trunk/rostests/kmtests/rtl/RtlRegistry.c > URL: > http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlRegistry.c… > > ============================================================================== > --- trunk/rostests/kmtests/rtl/RtlRegistry.c [iso-8859-1] (original) > +++ trunk/rostests/kmtests/rtl/RtlRegistry.c [iso-8859-1] Sat Sep 19 > 21:46:40 2015 > @@ -7,12 +7,6 @@ > > #define KMT_EMULATE_KERNEL > #include <kmt_test.h> > - > -#ifdef KMT_KERNEL_MODE > -#define KMT_KERNEL_HANDLE OBJ_KERNEL_HANDLE > -#else > -#define KMT_KERNEL_HANDLE 0 > -#endif > > #ifndef RTL_NUMBER_OF > #define RTL_NUMBER_OF(x) (sizeof(x) / sizeof(x[0])) > @@ -212,7 +206,7 @@ > RtlInitUnicodeString(&KeyName, L"\\Registry\\MACHINE\\Software"); > InitializeObjectAttributes(&ObjectAttributes, > &KeyName, > - OBJ_CASE_INSENSITIVE | KMT_KERNEL_HANDLE, > + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, > NULL, > NULL); > Status = ZwOpenKey(&SoftwareHandle, > @@ -225,7 +219,7 @@ > RtlInitUnicodeString(&KeyName, L"RtlRegistryKmtestKey"); > InitializeObjectAttributes(&ObjectAttributes, > &KeyName, > - OBJ_CASE_INSENSITIVE | KMT_KERNEL_HANDLE, > + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, > SoftwareHandle, > NULL); > Status = ZwCreateKey(&KeyHandle, > > >

9 years, 7 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [tfaber] 69236: [MSFS] - Use a NULL timeout for infinite waits instead of waiting for 100 ns. CORE-10188 #resolve - Wait for available read data in user mode to handle thread termination - Return S...

by Alex Ionescu

I'm not convinced on the user->kernel changes Thomas. Best regards, Alex Ionescu On Tue, Sep 15, 2015 at 5:40 AM, <tfaber(a)svn.reactos.org> wrote: > Author: tfaber > Date: Tue Sep 15 09:40:30 2015 > New Revision: 69236 > > URL: http://svn.reactos.org/svn/reactos?rev=69236&view=rev > Log: > [MSFS] > - Use a NULL timeout for infinite waits instead of waiting for 100 ns. > CORE-10188 #resolve > - Wait for available read data in user mode to handle thread termination > - Return STATUS_IO_TIMEOUT also for a zero-length timeout. Fixes Wine tests > - Avoid MmGetSystemAddressForMdl > - Acquiring a mutex is not a UserRequest > > Modified: > trunk/reactos/drivers/filesystems/msfs/msfs.h > trunk/reactos/drivers/filesystems/msfs/rw.c > > Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… > > ============================================================================== > --- trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] > (original) > +++ trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] Tue > Sep 15 09:40:30 2015 > @@ -54,7 +54,7 @@ > > > #define KeLockMutex(x) KeWaitForSingleObject(x, \ > - UserRequest, \ > + Executive, \ > KernelMode, \ > FALSE, \ > NULL); > > Modified: trunk/reactos/drivers/filesystems/msfs/rw.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r… > > ============================================================================== > --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Tue Sep 15 > 09:40:30 2015 > @@ -29,6 +29,7 @@ > ULONG LengthRead = 0; > PVOID Buffer; > NTSTATUS Status; > + PLARGE_INTEGER Timeout; > > DPRINT("MsfsRead(DeviceObject %p Irp %p)\n", DeviceObject, Irp); > > @@ -52,16 +53,21 @@ > > Length = IoStack->Parameters.Read.Length; > if (Irp->MdlAddress) > - Buffer = MmGetSystemAddressForMdl (Irp->MdlAddress); > + Buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, > NormalPagePriority); > else > Buffer = Irp->UserBuffer; > > + if (Fcb->TimeOut.QuadPart == -1LL) > + Timeout = NULL; > + else > + Timeout = &Fcb->TimeOut; > + > Status = KeWaitForSingleObject(&Fcb->MessageEvent, > UserRequest, > - KernelMode, > + UserMode, > FALSE, > - &Fcb->TimeOut); > - if (NT_SUCCESS(Status)) > + Timeout); > + if (Status != STATUS_USER_APC) > { > if (Fcb->MessageCount > 0) > { > @@ -84,7 +90,7 @@ > KeClearEvent(&Fcb->MessageEvent); > } > } > - else if (Fcb->TimeOut.QuadPart != 0LL) > + else > { > /* No message found after waiting */ > Status = STATUS_IO_TIMEOUT; > @@ -135,7 +141,7 @@ > > Length = IoStack->Parameters.Write.Length; > if (Irp->MdlAddress) > - Buffer = MmGetSystemAddressForMdl (Irp->MdlAddress); > + Buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, > NormalPagePriority); > else > Buffer = Irp->UserBuffer; > > > >

9 years, 7 months

2
2
0 0

Re: [ros-dev] [ros-diffs] [spetreolle] 69186: [TRANSLATIONS] Translate remaining French strings in msgina.dll

by Pierre Schweitzer

Comments inline. On 11/09/2015 21:30, spetreolle(a)svn.reactos.org wrote: > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… > ============================================================================== > --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Fri Sep 11 19:30:29 2015 > @@ -25,11 +25,11 @@ > FONT 8, "MS Shell Dlg", 400, 0, 1 > BEGIN > CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 > - LTEXT "Utilisateur :", IDC_STATIC, 6, 60, 52, 8 > + LTEXT "Utilisateur:", IDC_STATIC, 6, 60, 52, 8 This is a broken change. > EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL > - LTEXT "Mot de passe :", IDC_STATIC, 6, 78, 52, 8 > + LTEXT "Mot de passe:", IDC_STATIC, 6, 78, 52, 8 This is a broken change. > @@ -68,50 +68,50 @@ > > IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 > STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP > -CAPTION "Unlock Computer" > +CAPTION "DÃ©verrouiller l'ordinateur" > FONT 8, "MS Shell Dlg", 400, 0, 1 > BEGIN > CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 > ICON IDI_LOCKICON, -1, 7, 59, 20, 20 > - LTEXT "This computer is in use and has been locked.", IDC_STATIC, 36, 61, 232, 8 > + LTEXT "Cet ordinateur est actuellement verrouillÃ©.", IDC_STATIC, 36, 61, 232, 8 > LTEXT "Message", IDC_LOCKMSG, 36, 75, 232, 26 > - LTEXT "User name:", IDC_STATIC, 36, 107, 40, 8 > + LTEXT "Utilisateur:", IDC_STATIC, 36, 107, 40, 8 French typography requires a space before and after ':' > EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL > - LTEXT "Password:", IDC_STATIC, 36, 125, 42, 8 > + LTEXT "Mot de passe:", IDC_STATIC, 36, 125, 50, 8 See upper comment. > EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD > PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON > - PUSHBUTTON "Cancel", IDCANCEL, 144, 154, 50, 14 > + PUSHBUTTON "Annuler", IDCANCEL, 144, 154, 50, 14 > END > > IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 > STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP > -CAPTION "Change Password" > +CAPTION "Changer le mot de passe" > FONT 8, "MS Shell Dlg", 400, 0, 1 > BEGIN > CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 > - LTEXT "User name:", IDC_STATIC, 7, 61, 78, 8 > + LTEXT "Utilisateur:", IDC_STATIC, 7, 61, 78, 8 Same here. > EDITTEXT IDC_CHANGEPWD_USERNAME, 90, 59, 127, 12, ES_AUTOHSCROLL > - LTEXT "Log on to:", IDC_STATIC, 7, 78, 78, 8 > + LTEXT "Se connecter Ã :", IDC_STATIC, 7, 78, 78, 8 > COMBOBOX IDC_CHANGEPWD_DOMAIN, 90, 75, 127, 144, CBS_DROPDOWNLIST | CBS_SORT | WS_TABSTOP > - LTEXT "Old Password:", IDC_STATIC, 7, 95, 78, 8 > + LTEXT "Ancien mot de passe:", IDC_STATIC, 7, 95, 78, 8 See upper comment. > EDITTEXT IDC_CHANGEPWD_OLDPWD, 90, 92, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD > - LTEXT "New Password:", IDC_STATIC, 7, 111, 78, 8 > + LTEXT "Nouveau mot de passe:", IDC_STATIC, 7, 111, 78, 8 Same here. > EDITTEXT IDC_CHANGEPWD_NEWPWD1, 90, 109, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD > - LTEXT "Confirm new Password:", IDC_STATIC, 7, 127, 78, 8 > + LTEXT "Confirmez le nouveau mot de passe:", IDC_STATIC, 7, 127, 78, 16 See upper comment. > EDITTEXT IDC_CHANGEPWD_NEWPWD2, 90, 125, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD > PUSHBUTTON "OK", IDOK, 164, 145, 50, 14, BS_DEFPUSHBUTTON > - PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 > + PUSHBUTTON "Annuler", IDCANCEL, 218, 145, 50, 14 > END > > IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 > STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP > -CAPTION "Log Off ReactOS" > +CAPTION "DÃ©connexion de ReactOS" > FONT 8, "MS Shell Dlg", 400, 0, 1 > BEGIN > ICON IDI_LOCKICON, -1, 7, 7, 20, 20 > - LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 > - PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON > - PUSHBUTTON "No", IDNO, 95, 39, 50, 14 > + LTEXT "Ãtes vous sÃ»r de vouloir vous dÃ©connecter?", IDC_STATIC, 35, 16, 146, 8 You need a dash here. > @@ -160,34 +160,34 @@ > IDS_ASKFORUSER "Utilisateur : " > IDS_ASKFORPASSWORD "Mot de passe : " > IDS_FORCELOGOFF "Cela dÃ©connectera l'utilisateur en cours et perdra les donnÃ©es non sauvÃ©es. Continuer ?" > - IDS_LOCKMSG "Seulement %s ou bien un Administrateur peut dÃ©verrouiller cet ordinateur." > - IDS_LOGONMSG "You are logged on as %s." > - IDS_LOGONDATE "Logon date: %s %s" > - IDS_COMPUTERLOCKED "Computer locked" > - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." > - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." > - IDS_CHANGEPWDTITLE "Change Password" > - IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." > - IDS_PASSWORDCHANGED "Your password has been changed." > - IDS_LOGONTITLE "Logon Message" > - IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." > - IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." > - IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon." > - IDS_PASSWORDEXPIRED "Your password has expired and must be changed." > + IDS_LOCKMSG "Seul %s ou un administrateur peut dÃ©verrouiller cet ordinateur." > + IDS_LOGONMSG "Vous Ãªtes connectÃ© en tant que %s." > + IDS_LOGONDATE "Date de connexion: %s %s" See comment about ':' > + IDS_COMPUTERLOCKED "Ordinateur verrouillÃ©" > + IDS_LOCKEDWRONGPASSWORD "Le mot de passe est incorrect. Entrez Ã nouveau votre mot de passe en respectant les majuscules." > + IDS_LOCKEDWRONGUSER "Cet ordinateur est actuellement verrouillÃ©. Seul %s\\%s ou un administrateur peut dÃ©verrouiller cet ordinateur." > + IDS_CHANGEPWDTITLE "Changer le mot de passe" > + IDS_NONMATCHINGPASSWORDS "Les mots de passe ne correspondent pas. Entrez le mÃªme mot de passe dans les deux zones de texte." > + IDS_PASSWORDCHANGED "Votre mot de passe a Ã©tÃ© changÃ©." > + IDS_LOGONTITLE "Connexion" > + IDS_LOGONWRONGUSERORPWD "Le systÃ¨me ne peut vous connecter. VÃ©rifiez vos noms d'utilisateur et de domaine. Entrez Ã nouveau votre mot de passe en respectant les majuscules." > + IDS_LOGONUSERDISABLED "Votre compte est dÃ©sactivÃ©. Voyez votre administrateur systÃ¨me." Consultez votre ? -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

9 years, 7 months

3
5
0 0

Re: [ros-dev] [ros-diffs] [sginsberg] 69248: [HAL] Get rid off REGISTERCALL ("regparm(3)" for GCC) and replace with good old NTAPI (stdcall). Such an obsession with avoiding stack usage is not healthy nor makes much sense t...

by Alex Ionescu

You seem to have a huge misunderstanding of modern processor architecture. Everything you said is false. In fact, this is why x64 uses register passing, as does ARM and every other major architecture except x86. Push/pop operations are extremely expensive and break pipelining. The compiler will then place the parameters in registers anyways after the fact. Suffice it to say though, the original reason these were regparm/fastcall is to easily allow them to be called from assembly at the time. Best regards, Alex Ionescu On Tue, Sep 15, 2015 at 7:03 PM, <sginsberg(a)svn.reactos.org> wrote: > Author: sginsberg > Date: Tue Sep 15 23:03:42 2015 > New Revision: 69248 > > URL: http://svn.reactos.org/svn/reactos?rev=69248&view=rev > Log: > [HAL] Get rid off REGISTERCALL ("regparm(3)" for GCC) and replace with > good old NTAPI (stdcall). Such an obsession with avoiding stack usage is > not healthy nor makes much sense today (or even a long time before today) > with processors that have a decent L1 cache, whose "cost of access" is > basically the same as to that of a register, and with processors being > capable of recognising basic access patterns to ensure frequently used > memory (read: stack) is in the cache. Slapping FASTCALL/regparm on > frequently used code does not ensure it actually operates faster. You want > to know what really hurts performance (and cache)? Slapping FORCEINLINE on > everything like if it was some kind of asm macro, making code needlessly > bloated. > > Modified: > trunk/reactos/hal/halx86/include/halp.h > trunk/reactos/hal/halx86/up/pic.c > > Modified: trunk/reactos/hal/halx86/include/halp.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… > > ============================================================================== > --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Tue Sep 15 > 23:03:42 2015 > @@ -10,12 +10,6 @@ > #define INIT_SECTION /* Done via alloc_text for MSC */ > #endif > > - > -#ifdef _MSC_VER > -#define REGISTERCALL FASTCALL > -#else > -#define REGISTERCALL __attribute__((regparm(3))) > -#endif > > #ifdef CONFIG_SMP > #define HAL_BUILD_TYPE (DBG ? PRCB_BUILD_DEBUG : 0) > @@ -430,14 +424,14 @@ > > typedef > BOOLEAN > -( REGISTERCALL *PHAL_DISMISS_INTERRUPT)( > +(NTAPI *PHAL_DISMISS_INTERRUPT)( > IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrqGeneric( > IN KIRQL Irql, > IN ULONG Irq, > @@ -445,7 +439,7 @@ > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq15( > IN KIRQL Irql, > IN ULONG Irq, > @@ -453,7 +447,7 @@ > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq13( > IN KIRQL Irql, > IN ULONG Irq, > @@ -461,7 +455,7 @@ > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq07( > IN KIRQL Irql, > IN ULONG Irq, > @@ -469,7 +463,7 @@ > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrqLevel( > IN KIRQL Irql, > IN ULONG Irq, > @@ -477,7 +471,7 @@ > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq15Level( > IN KIRQL Irql, > IN ULONG Irq, > @@ -485,7 +479,7 @@ > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq13Level( > IN KIRQL Irql, > IN ULONG Irq, > @@ -493,7 +487,7 @@ > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq07Level( > IN KIRQL Irql, > IN ULONG Irq, > > Modified: trunk/reactos/hal/halx86/up/pic.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=69… > > ============================================================================== > --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Tue Sep 15 23:03:42 > 2015 > @@ -843,7 +843,7 @@ > } > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrqGeneric(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > @@ -853,7 +853,7 @@ > } > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq15(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > @@ -889,7 +889,7 @@ > > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq13(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > @@ -902,7 +902,7 @@ > } > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq07(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > @@ -986,7 +986,7 @@ > } > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrqLevel(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > @@ -996,7 +996,7 @@ > } > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq15Level(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > @@ -1031,7 +1031,7 @@ > } > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq13Level(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > @@ -1044,7 +1044,7 @@ > } > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq07Level(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > > >

9 years, 7 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [pschweitzer] 69221: [MOUNTMGR] Implement the IOCTL IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED: - Implement WriteRemoteDatabaseEntry() - Implement MountMgrVolumeMountPointCreated()

by Alex Ionescu

Lol, make sure not to implement the huge vulnerability Microsoft patched two months ago (win2k->xp-style database migration). Best regards, Alex Ionescu On Sun, Sep 13, 2015 at 6:52 PM, <pschweitzer(a)svn.reactos.org> wrote: > Author: pschweitzer > Date: Sun Sep 13 22:52:07 2015 > New Revision: 69221 > > URL: http://svn.reactos.org/svn/reactos?rev=69221&view=rev > Log: > [MOUNTMGR] > Implement the IOCTL IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED: > - Implement WriteRemoteDatabaseEntry() > - Implement MountMgrVolumeMountPointCreated() > > Modified: > trunk/reactos/drivers/filters/mountmgr/database.c > trunk/reactos/drivers/filters/mountmgr/device.c > trunk/reactos/drivers/filters/mountmgr/mntmgr.h > trunk/reactos/drivers/filters/mountmgr/mountmgr.c > > Modified: trunk/reactos/drivers/filters/mountmgr/database.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… > > ============================================================================== > --- trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] > (original) > +++ trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] Sun > Sep 13 22:52:07 2015 > @@ -192,6 +192,39 @@ > } > > return Entry; > +} > + > +/* > + * @implemented > + */ > +NTSTATUS > +WriteRemoteDatabaseEntry(IN HANDLE Database, > + IN LONG Offset, > + IN PDATABASE_ENTRY Entry) > +{ > + NTSTATUS Status; > + LARGE_INTEGER ByteOffset; > + IO_STATUS_BLOCK IoStatusBlock; > + > + ByteOffset.QuadPart = Offset; > + Status = ZwWriteFile(Database, > + NULL, > + NULL, > + NULL, > + &IoStatusBlock, > + Entry, > + Entry->EntrySize, > + &ByteOffset, > + NULL); > + if (NT_SUCCESS(Status)) > + { > + if (IoStatusBlock.Information < Entry->EntrySize) > + { > + Status = STATUS_INSUFFICIENT_RESOURCES; > + } > + } > + > + return Status; > } > > /* > > Modified: trunk/reactos/drivers/filters/mountmgr/device.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… > > ============================================================================== > --- trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] > (original) > +++ trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] Sun > Sep 13 22:52:07 2015 > @@ -1688,15 +1688,242 @@ > return Status; > } > > +/* > + * @implemented > + */ > NTSTATUS > MountMgrVolumeMountPointCreated(IN PDEVICE_EXTENSION DeviceExtension, > IN PIRP Irp, > IN NTSTATUS LockStatus) > { > - UNREFERENCED_PARAMETER(DeviceExtension); > - UNREFERENCED_PARAMETER(Irp); > - UNREFERENCED_PARAMETER(LockStatus); > - return STATUS_NOT_IMPLEMENTED; > + LONG Offset; > + BOOLEAN Found; > + NTSTATUS Status; > + HANDLE RemoteDatabase; > + PMOUNTDEV_UNIQUE_ID UniqueId; > + PDATABASE_ENTRY DatabaseEntry; > + PASSOCIATED_DEVICE_ENTRY AssociatedEntry; > + PDEVICE_INFORMATION DeviceInformation, TargetDeviceInformation; > + UNICODE_STRING LinkTarget, SourceDeviceName, SourceSymbolicName, > TargetVolumeName, VolumeName, DbName; > + > + /* Initialize string */ > + LinkTarget.Length = 0; > + LinkTarget.MaximumLength = 0xC8; > + LinkTarget.Buffer = AllocatePool(LinkTarget.MaximumLength); > + if (LinkTarget.Buffer == NULL) > + { > + return STATUS_INSUFFICIENT_RESOURCES; > + } > + > + /* If the mount point was created, then, it changed! > + * Also use it to query some information > + */ > + Status = MountMgrVolumeMountPointChanged(DeviceExtension, Irp, > LockStatus, &SourceDeviceName, &SourceSymbolicName, &TargetVolumeName); > + /* Pending means DB are under synchronization, bail out */ > + if (Status == STATUS_PENDING) > + { > + FreePool(LinkTarget.Buffer); > + FreePool(SourceDeviceName.Buffer); > + FreePool(SourceSymbolicName.Buffer); > + return STATUS_PENDING; > + } > + else if (!NT_SUCCESS(Status)) > + { > + FreePool(LinkTarget.Buffer); > + return Status; > + } > + > + /* Query the device information */ > + Status = FindDeviceInfo(DeviceExtension, &SourceDeviceName, FALSE, > &DeviceInformation); > + if (!NT_SUCCESS(Status)) > + { > + /* If it failed, first try to get volume name */ > + Status = QueryVolumeName(0, NULL, &SourceDeviceName, &LinkTarget, > &VolumeName); > + if (!NT_SUCCESS(Status)) > + { > + /* Then, try to read the symlink */ > + Status = MountMgrQuerySymbolicLink(&SourceDeviceName, > &LinkTarget); > + if (!NT_SUCCESS(Status)) > + { > + FreePool(LinkTarget.Buffer); > + FreePool(SourceDeviceName.Buffer); > + FreePool(SourceSymbolicName.Buffer); > + return Status; > + } > + } > + else > + { > + FreePool(VolumeName.Buffer); > + } > + > + FreePool(SourceDeviceName.Buffer); > + > + SourceDeviceName.Length = LinkTarget.Length; > + SourceDeviceName.MaximumLength = LinkTarget.MaximumLength; > + SourceDeviceName.Buffer = LinkTarget.Buffer; > + > + /* Now that we have the correct source, reattempt to query > information */ > + Status = FindDeviceInfo(DeviceExtension, &SourceDeviceName, > FALSE, &DeviceInformation); > + if (!NT_SUCCESS(Status)) > + { > + FreePool(SourceDeviceName.Buffer); > + FreePool(SourceSymbolicName.Buffer); > + return Status; > + } > + } > + > + FreePool(SourceDeviceName.Buffer); > + > + /* Get information about target device */ > + Status = FindDeviceInfo(DeviceExtension, &TargetVolumeName, FALSE, > &TargetDeviceInformation); > + if (!NT_SUCCESS(Status)) > + { > + FreePool(SourceSymbolicName.Buffer); > + return Status; > + } > + > + /* Notify if not disabled */ > + if (!TargetDeviceInformation->SkipNotifications) > + { > + PostOnlineNotification(DeviceExtension, > &TargetDeviceInformation->SymbolicName); > + } > + > + /* Open the remote database */ > + RemoteDatabase = OpenRemoteDatabase(DeviceInformation, TRUE); > + if (RemoteDatabase == 0) > + { > + FreePool(SourceSymbolicName.Buffer); > + return STATUS_INSUFFICIENT_RESOURCES; > + } > + > + /* Browse all the entries */ > + Offset = 0; > + Found = FALSE; > + for (;;) > + { > + DatabaseEntry = GetRemoteDatabaseEntry(RemoteDatabase, Offset); > + if (DatabaseEntry == NULL) > + { > + break; > + } > + > + /* Try to find ourselves */ > + DbName.MaximumLength = DatabaseEntry->SymbolicNameLength; > + DbName.Length = DbName.MaximumLength; > + DbName.Buffer = (PWSTR)((ULONG_PTR)DatabaseEntry + > DatabaseEntry->SymbolicNameOffset); > + if (RtlEqualUnicodeString(&TargetVolumeName, &DbName, TRUE)) > + { > + ++DatabaseEntry->DatabaseOffset; > + Status = WriteRemoteDatabaseEntry(RemoteDatabase, Offset, > DatabaseEntry); > + FreePool(DatabaseEntry); > + Found = TRUE; > + break; > + } > + > + Offset += DatabaseEntry->EntrySize; > + FreePool(DatabaseEntry); > + } > + > + /* We couldn't find ourselves, we'll have to add ourselves */ > + if (!Found) > + { > + ULONG EntrySize; > + PUNIQUE_ID_REPLICATE UniqueIdReplicate; > + > + /* Query the device unique ID */ > + Status = QueryDeviceInformation(&TargetVolumeName, NULL, > &UniqueId, NULL, NULL, NULL, NULL, NULL); > + if (!NT_SUCCESS(Status)) > + { > + FreePool(SourceSymbolicName.Buffer); > + CloseRemoteDatabase(RemoteDatabase); > + return Status; > + } > + > + /* Allocate a database entry */ > + EntrySize = UniqueId->UniqueIdLength + TargetVolumeName.Length + > sizeof(DATABASE_ENTRY); > + DatabaseEntry = AllocatePool(EntrySize); > + if (DatabaseEntry == NULL) > + { > + FreePool(UniqueId); > + FreePool(SourceSymbolicName.Buffer); > + CloseRemoteDatabase(RemoteDatabase); > + return STATUS_INSUFFICIENT_RESOURCES; > + } > + > + /* Fill it in */ > + DatabaseEntry->EntrySize = EntrySize; > + DatabaseEntry->DatabaseOffset = 1; > + DatabaseEntry->SymbolicNameOffset = sizeof(DATABASE_ENTRY); > + DatabaseEntry->SymbolicNameLength = TargetVolumeName.Length; > + DatabaseEntry->UniqueIdOffset = TargetVolumeName.Length + > sizeof(DATABASE_ENTRY); > + DatabaseEntry->UniqueIdLength = UniqueId->UniqueIdLength; > + RtlCopyMemory((PVOID)((ULONG_PTR)DatabaseEntry + > sizeof(DATABASE_ENTRY)), TargetVolumeName.Buffer, > DatabaseEntry->SymbolicNameLength); > + RtlCopyMemory((PVOID)((ULONG_PTR)DatabaseEntry + > DatabaseEntry->UniqueIdOffset), UniqueId->UniqueId, > UniqueId->UniqueIdLength); > + > + /* And write it down */ > + Status = AddRemoteDatabaseEntry(RemoteDatabase, DatabaseEntry); > + FreePool(DatabaseEntry); > + if (!NT_SUCCESS(Status)) > + { > + FreePool(UniqueId); > + FreePool(SourceSymbolicName.Buffer); > + CloseRemoteDatabase(RemoteDatabase); > + return Status; > + } > + > + /* And now, allocate an Unique ID item */ > + UniqueIdReplicate = AllocatePool(sizeof(UNIQUE_ID_REPLICATE)); > + if (UniqueIdReplicate == NULL) > + { > + FreePool(UniqueId); > + FreePool(SourceSymbolicName.Buffer); > + CloseRemoteDatabase(RemoteDatabase); > + return Status; > + } > + > + /* To associate it with the device */ > + UniqueIdReplicate->UniqueId = UniqueId; > + InsertTailList(&DeviceInformation->ReplicatedUniqueIdsListHead, > &UniqueIdReplicate->ReplicatedUniqueIdsListEntry); > + } > + > + /* We're done with the remote database */ > + CloseRemoteDatabase(RemoteDatabase); > + > + /* Check we were find writing the entry */ > + if (!NT_SUCCESS(Status)) > + { > + FreePool(SourceSymbolicName.Buffer); > + return Status; > + } > + > + /* This is the end, allocate an associated entry */ > + AssociatedEntry = AllocatePool(sizeof(ASSOCIATED_DEVICE_ENTRY)); > + if (AssociatedEntry == NULL) > + { > + FreePool(SourceSymbolicName.Buffer); > + return STATUS_INSUFFICIENT_RESOURCES; > + } > + > + /* Initialize its source name string */ > + AssociatedEntry->String.Length = SourceSymbolicName.Length; > + AssociatedEntry->String.MaximumLength = > AssociatedEntry->String.Length + sizeof(UNICODE_NULL); > + AssociatedEntry->String.Buffer = > AllocatePool(AssociatedEntry->String.MaximumLength); > + if (AssociatedEntry->String.Buffer == NULL) > + { > + FreePool(AssociatedEntry); > + FreePool(SourceSymbolicName.Buffer); > + return STATUS_INSUFFICIENT_RESOURCES; > + } > + > + /* Copy data & insert in list */ > + RtlCopyMemory(AssociatedEntry->String.Buffer, > SourceSymbolicName.Buffer, SourceSymbolicName.Length); > + AssociatedEntry->String.Buffer[SourceSymbolicName.Length / > sizeof(WCHAR)] = UNICODE_NULL; > + AssociatedEntry->DeviceInformation = DeviceInformation; > + InsertTailList(&TargetDeviceInformation->AssociatedDevicesHead, > &AssociatedEntry->AssociatedDevicesEntry); > + > + /* We're done! */ > + FreePool(SourceSymbolicName.Buffer); > + return STATUS_SUCCESS; > } > > NTSTATUS > > Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… > > ============================================================================== > --- trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] > (original) > +++ trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] Sun > Sep 13 22:52:07 2015 > @@ -298,6 +298,36 @@ > OUT PUNICODE_STRING VolumeName > ); > > +HANDLE > +OpenRemoteDatabase( > + IN PDEVICE_INFORMATION DeviceInformation, > + IN BOOLEAN MigrateDatabase > +); > + > +PDATABASE_ENTRY > +GetRemoteDatabaseEntry( > + IN HANDLE Database, > + IN LONG StartingOffset > +); > + > +NTSTATUS > +WriteRemoteDatabaseEntry( > + IN HANDLE Database, > + IN LONG Offset, > + IN PDATABASE_ENTRY Entry > +); > + > +NTSTATUS > +CloseRemoteDatabase( > + IN HANDLE Database > +); > + > +NTSTATUS > +AddRemoteDatabaseEntry( > + IN HANDLE Database, > + IN PDATABASE_ENTRY Entry > +); > + > /* device.c */ > > DRIVER_DISPATCH MountMgrDeviceControl; > @@ -458,4 +488,10 @@ > IN BOOLEAN MarkOffline > ); > > +NTSTATUS > +MountMgrQuerySymbolicLink( > + IN PUNICODE_STRING SymbolicName, > + IN OUT PUNICODE_STRING LinkTarget > +); > + > #endif /* _MNTMGR_H_ */ > > Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… > > ============================================================================== > --- trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] > (original) > +++ trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] Sun > Sep 13 22:52:07 2015 > @@ -48,7 +48,6 @@ > * - MountMgrQueryDosVolumePaths > * - MountMgrQueryVolumePaths > * - MountMgrValidateBackPointer > - * - MountMgrVolumeMountPointCreated > * - MountMgrVolumeMountPointDeleted > * - ReconcileThisDatabaseWithMasterWorker > */ > > >

9 years, 7 months

3
3
0 0

Re: [ros-dev] [ros-diffs] [ion] 69180: [CDFS_NEW] - Resurrect back 7 years later (revert commit 34622). - Add correct MS-PL (Public) License. Not added to build/used, but I need some of the headers/data structures in here. ...

by Colin Finck

ion(a)svn.reactos.org wrote: > - Add correct MS-PL (Public) License. Not added to build/used, but I > need some of the headers/data structures in here. > - Source: https://github.com/Microsoft/Windows-driver-samples/blob/master/filesys/cdfs Yay! No more messing around with DDK licenses! Someone should take the other samples there and replace our DDK-inspired components (e.g. classpnp and disk) by these ones licensed under MS-PL. Cheers, Colin

9 years, 7 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 69139: OMGWTFBBQ!!!! We can now boot our ISOs on UEFI systems!! Thanks gigaherz for the "fatten" utility!, and others for testing. [CDMAKE] - Add multi-boot CD support, following El-Tori...

by Colin Finck

hbelusca(a)svn.reactos.org wrote: > +// FIXME! FIXME! Do it in a portable way!! > typedef unsigned char BYTE; > typedef unsigned short WORD; > typedef unsigned long DWORD; Try using our include/host/typedefs.h, which provides the most popular Windows type definitions in a portable way. - Colin

9 years, 7 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [cwittich] 69079: [MODE] use ARRAYSIZE, don't include windows.h, fix two possible out-of-bounds reads CID 1206872 CID 1206873

by Colin Finck

cwittich(a)svn.reactos.org wrote: > Modified: trunk/reactos/base/applications/cmdutils/mode/mode.c What is that tool for anyway? Windows has a 16-bit "mode.com" for compatibility and I believe the actual "mode" command is built-in into cmd.exe these days. Cheers, Colin

9 years, 7 months

3
3
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 68975: [VSSAPI] Compile the THISCALL calling convention support only for x86. On x64, we are automatically in THISCALL. Also I suggest we turn this file (and maybe also /lib/sdk/crt/exce...

by Thomas Faber

On 2015-09-04 03:14, hbelusca(a)svn.reactos.org wrote: > Also I suggest we turn this file (and maybe also /lib/sdk/crt/except/i386/cpp.s) into a "msvc-thiscall.c" as it is already done in some other DLLs (like in ole32, riched20). ole32 and riched20 don't export mangled names. MSVC ignores redirects for them in the def file so it needs to be assembly (or C++ code).

9 years, 7 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [sginsberg] 68888: - Remove all NT_ASSERT from the kernel and replace with good old ASSERT, for ease of debugging, especially for tests run on the build servers. There is no need to use NT_ASSERT i...

by Thomas Faber

I would understand a commit that does the exact opposite; I don't understand this one. How exactly is ASSERT easier to debug? NT_ASSERT on GCC should essentially be the same as ASSERT On MSVC/Windbg you get lots of advantages: - you can ignore specific asserts - you can set different event filters for asserts vs other breakpoints in the debugger - the assert becomes a single instruction instead of a function call, which means you can easily overwrite it with something else, or do a "Set Instruction Pointer" without doing two "Step Out"s first - You could change what KiRaiseAssertionHandler does to change behavior, or probably even catch STATUS_ASSERTION_FAILURE exceptions in code. This could e.g. allow assertions not to cause bugchecks if you didn't select Debug mode in freeldr On 2015-09-01 03:45, sginsberg(a)svn.reactos.org wrote: > Author: sginsberg > Date: Tue Sep 1 01:45:59 2015 > New Revision: 68888 > > URL: http://svn.reactos.org/svn/reactos?rev=68888&view=rev > Log: > - Remove all NT_ASSERT from the kernel and replace with good old ASSERT, for ease of debugging, especially for tests run on the build servers. There is no need to use NT_ASSERT in the kernel. > - The fish is long gone. > > Modified: > trunk/reactos/ntoskrnl/cc/copy.c > trunk/reactos/ntoskrnl/config/cmapi.c > trunk/reactos/ntoskrnl/config/cmparse.c > trunk/reactos/ntoskrnl/ex/handle.c > trunk/reactos/ntoskrnl/ex/win32k.c > trunk/reactos/ntoskrnl/io/iomgr/deviface.c > trunk/reactos/ntoskrnl/io/iomgr/driver.c > trunk/reactos/ntoskrnl/ke/arm/usercall.c > trunk/reactos/ntoskrnl/ke/i386/traphdlr.c > trunk/reactos/ntoskrnl/lpc/send.c > trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c > trunk/reactos/ntoskrnl/mm/ARM3/section.c > trunk/reactos/ntoskrnl/mm/ARM3/session.c > trunk/reactos/ntoskrnl/mm/ARM3/virtual.c > trunk/reactos/ntoskrnl/mm/arm/page.c > trunk/reactos/ntoskrnl/ob/oblife.c > trunk/reactos/ntoskrnl/se/accesschk.c > trunk/reactos/ntoskrnl/se/acl.c > trunk/reactos/ntoskrnl/se/audit.c > trunk/reactos/ntoskrnl/se/priv.c > trunk/reactos/ntoskrnl/se/sd.c > trunk/reactos/ntoskrnl/se/sid.c > trunk/reactos/ntoskrnl/wmi/wmidrv.c > > Modified: trunk/reactos/ntoskrnl/cc/copy.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=688… > ============================================================================== > --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -453,7 +453,7 @@ > TRUE, > Buffer, > IoStatus); > - NT_ASSERT(Success == TRUE); > + ASSERT(Success == TRUE); > } > > /* > @@ -479,7 +479,7 @@ > Length, > TRUE, > Buffer); > - NT_ASSERT(Success == TRUE); > + ASSERT(Success == TRUE); > } > > /* > > Modified: trunk/reactos/ntoskrnl/config/cmapi.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… > ============================================================================== > --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -606,7 +606,7 @@ > } > > /* Copy the class data */ > - NT_ASSERT(Length >= Offset); > + ASSERT(Length >= Offset); > RtlCopyMemory(Info->KeyFullInformation.Class, > ClassData, > min(Node->ClassLength, Length - Offset)); > > Modified: trunk/reactos/ntoskrnl/config/cmparse.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… > ============================================================================== > --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -24,7 +24,7 @@ > { > BOOLEAN NameValid = TRUE; > > - NT_ASSERT(RemainingName->Length % sizeof(WCHAR) == 0); > + ASSERT(RemainingName->Length % sizeof(WCHAR) == 0); > > /* Check if there's nothing left in the name */ > if (!(RemainingName->Buffer) || > > Modified: trunk/reactos/ntoskrnl/ex/handle.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=6… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -85,7 +85,7 @@ > > default: > > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > Entry = NULL; > } > > > Modified: trunk/reactos/ntoskrnl/ex/win32k.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=6… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -77,7 +77,7 @@ > if (SessionEntry == NULL) > { > /* The requested session does not even exist! */ > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > return STATUS_NOT_FOUND; > } > > @@ -92,7 +92,7 @@ > > /* Cleanup and return */ > MmQuitNextSession(SessionEntry); > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > return Status; > } > } > > Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -876,7 +876,7 @@ > } > > /* Add final NULL to ReturnBuffer */ > - NT_ASSERT(ReturnBuffer.Length <= ReturnBuffer.MaximumLength); > + ASSERT(ReturnBuffer.Length <= ReturnBuffer.MaximumLength); > if (ReturnBuffer.Length >= ReturnBuffer.MaximumLength) > { > PWSTR NewBuffer; > > Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -934,7 +934,7 @@ > > NextEntry = NextEntry->Flink; > } > - NT_ASSERT(NextEntry != &PsLoadedModuleList); > + ASSERT(NextEntry != &PsLoadedModuleList); > > /* > * Initialize the driver > @@ -1374,7 +1374,7 @@ > /* Set the unload invoked flag and call the unload routine */ > DriverObject->Flags |= DRVO_UNLOAD_INVOKED; > Status = IopLoadUnloadDriver(NULL, &DriverObject); > - NT_ASSERT(Status == STATUS_SUCCESS); > + ASSERT(Status == STATUS_SUCCESS); > > /* Mark the driver object temporary, so it could be deleted later */ > ObMakeTemporaryObject(DriverObject); > @@ -1874,7 +1874,7 @@ > { > PLOAD_UNLOAD_PARAMS LoadParams = Parameter; > > - NT_ASSERT(PsGetCurrentProcess() == PsInitialSystemProcess); > + ASSERT(PsGetCurrentProcess() == PsInitialSystemProcess); > LoadParams->Status = IopLoadUnloadDriver(LoadParams->RegistryPath, > &LoadParams->DriverObject); > KeSetEvent(&LoadParams->Event, 0, FALSE); > > Modified: trunk/reactos/ntoskrnl/ke/arm/usercall.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/usercall.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/arm/usercall.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/arm/usercall.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -312,7 +312,7 @@ > OUT PVOID *Result, > OUT PULONG ResultLength) > { > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > return STATUS_NOT_IMPLEMENTED; > } > > @@ -322,7 +322,7 @@ > IN PVOID *OutputBuffer, > IN PULONG OutputLength) > { > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > return STATUS_NOT_IMPLEMENTED; > } > > @@ -333,7 +333,7 @@ > _In_ ULONG ResultLength, > _In_ NTSTATUS CallbackStatus) > { > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > return STATUS_NOT_IMPLEMENTED; > } > > > Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -1537,7 +1537,7 @@ > Thread = KeGetCurrentThread(); > Thread->TrapFrame = TrapFrame; > Thread->PreviousMode = KiUserTrap(TrapFrame); > - NT_ASSERT(Thread->PreviousMode != KernelMode); > + ASSERT(Thread->PreviousMode != KernelMode); > > /* Pass the register parameters to NtCallbackReturn. > Result pointer is in ecx, result length in edx, status in eax */ > > Modified: trunk/reactos/ntoskrnl/lpc/send.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=68… > ============================================================================== > --- trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -793,7 +793,7 @@ > MessageType = LocalLpcRequest.u2.s2.Type; > > /* Due to the above probe, we know that TotalLength is positive */ > - NT_ASSERT(LocalLpcRequest.u1.s1.TotalLength >= 0); > + ASSERT(LocalLpcRequest.u1.s1.TotalLength >= 0); > > /* Validate the length */ > if ((((ULONG)(USHORT)LocalLpcRequest.u1.s1.DataLength + sizeof(PORT_MESSAGE)) > > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -189,7 +189,7 @@ > /* Check if this is a guard page */ > if ((ProtectionMask & MM_PROTECT_SPECIAL) == MM_GUARDPAGE) > { > - NT_ASSERT(ProtectionMask != MM_DECOMMIT); > + ASSERT(ProtectionMask != MM_DECOMMIT); > > /* Attached processes can't expand their stack */ > if (KeIsAttachedProcess()) return STATUS_ACCESS_VIOLATION; > @@ -200,7 +200,7 @@ > > /* Remove the guard page bit, and return a guard page violation */ > TempPte.u.Soft.Protection = ProtectionMask & ~MM_GUARDPAGE; > - NT_ASSERT(TempPte.u.Long != 0); > + ASSERT(TempPte.u.Long != 0); > MI_WRITE_INVALID_PTE(PointerPte, TempPte); > return STATUS_GUARD_PAGE_VIOLATION; > } > @@ -1080,7 +1080,7 @@ > } > > /* There is no such thing as a decommitted prototype PTE */ > - NT_ASSERT(TempPte.u.Long != MmDecommittedPte.u.Long); > + ASSERT(TempPte.u.Long != MmDecommittedPte.u.Long); > > /* Check for access rights on the PTE proper */ > PteContents = *PointerPte; > @@ -1420,7 +1420,7 @@ > /* Resolve */ > Status = MiResolveTransitionFault(Address, PointerPte, Process, LockIrql, &InPageBlock); > > - NT_ASSERT(NT_SUCCESS(Status)); > + ASSERT(NT_SUCCESS(Status)); > > /* And now release the lock and leave*/ > KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); > @@ -2069,7 +2069,7 @@ > if ((ProtectionCode & MM_PROTECT_SPECIAL) == MM_GUARDPAGE) > { > /* The VAD protection cannot be MM_DECOMMIT! */ > - NT_ASSERT(ProtectionCode != MM_DECOMMIT); > + ASSERT(ProtectionCode != MM_DECOMMIT); > > /* Remove the bit */ > TempPte.u.Soft.Protection = ProtectionCode & ~MM_GUARDPAGE; > @@ -2185,7 +2185,7 @@ > /* Write the prototype PTE */ > TempPte = PrototypePte; > TempPte.u.Soft.Protection = ProtectionCode; > - NT_ASSERT(TempPte.u.Long != 0); > + ASSERT(TempPte.u.Long != 0); > MI_WRITE_INVALID_PTE(PointerPte, TempPte); > } > else > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -1121,7 +1121,7 @@ > Status = MiSessionCommitPageTables(Base, > (PVOID)((ULONG_PTR)Base + > Buckets * MI_SYSTEM_VIEW_BUCKET_SIZE)); > - NT_ASSERT(NT_SUCCESS(Status)); > + ASSERT(NT_SUCCESS(Status)); > } > > /* Create the actual prototype PTEs for this mapping */ > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/session.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/session.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -930,7 +930,7 @@ > > /* The parameter is the actual process! */ > EntryProcess = SessionEntry; > - NT_ASSERT(EntryProcess != NULL); > + ASSERT(EntryProcess != NULL); > > /* Sanity checks */ > ASSERT(KeGetCurrentIrql() <= APC_LEVEL); > @@ -998,7 +998,7 @@ > > /* The parameter is the actual process! */ > EntryProcess = SessionEntry; > - NT_ASSERT(EntryProcess != NULL); > + ASSERT(EntryProcess != NULL); > > /* Sanity checks */ > ASSERT(KeGetCurrentIrql() <= APC_LEVEL); > @@ -1039,7 +1039,7 @@ > > /* The parameter is the actual process! */ > EntryProcess = SessionEntry; > - NT_ASSERT(EntryProcess != NULL); > + ASSERT(EntryProcess != NULL); > > /* Sanity checks */ > ASSERT(KeGetCurrentIrql () <= APC_LEVEL); > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -7,7 +7,6 @@ > */ > > /* INCLUDES *******************************************************************/ > -/* So long, and Thanks for All the Fish */ > > #include <ntoskrnl.h> > #define NDEBUG > @@ -431,7 +430,7 @@ > /* Make the page free. For prototypes, it will be made free when deleting the section object */ > if (Pfn1->u2.ShareCount == 0) > { > - NT_ASSERT(Pfn1->u3.e2.ReferenceCount == 0); > + ASSERT(Pfn1->u3.e2.ReferenceCount == 0); > > /* And it should be in standby or modified list */ > ASSERT((Pfn1->u3.e1.PageLocation == ModifiedPageList) || (Pfn1->u3.e1.PageLocation == StandbyPageList)); > @@ -1887,7 +1886,7 @@ > { > DPRINT1("MmQuerySectionView failed. MemoryArea=%p (%p-%p), BaseAddress=%p\n", > MemoryArea, MA_GetStartingAddress(MemoryArea), MA_GetEndingAddress(MemoryArea), BaseAddress); > - NT_ASSERT(NT_SUCCESS(Status)); > + ASSERT(NT_SUCCESS(Status)); > } > } > else > @@ -4856,7 +4855,7 @@ > // > TempPte.u.Long = 0; > TempPte.u.Soft.Protection = ProtectionMask; > - NT_ASSERT(TempPte.u.Long != 0); > + ASSERT(TempPte.u.Long != 0); > > // > // Get the PTE, PDE and the last PTE for this address range > > Modified: trunk/reactos/ntoskrnl/mm/arm/page.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/page.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -301,14 +301,14 @@ > PVOID Address, > SWAPENTRY* SwapEntry) > { > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > } > > BOOLEAN > NTAPI > MmIsDisabledPage(PEPROCESS Process, PVOID Address) > { > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > return FALSE; > } > > @@ -317,6 +317,6 @@ > INIT_FUNCTION > MiInitializeSessionSpaceLayout(VOID) > { > - NT_ASSERT(FALSE); > -} > - > + ASSERT(FALSE); > +} > + > > Modified: trunk/reactos/ntoskrnl/ob/oblife.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=6… > ============================================================================== > --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -1245,7 +1245,7 @@ > /* Set the index and the entry into the object type array */ > LocalObjectType->Index = ObpTypeObjectType->TotalNumberOfObjects; > > - NT_ASSERT(LocalObjectType->Index != 0); > + ASSERT(LocalObjectType->Index != 0); > > if (LocalObjectType->Index < 32) > { > > Modified: trunk/reactos/ntoskrnl/se/accesschk.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/accesschk.c?re… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -465,7 +465,7 @@ > > PAGED_CODE(); > > - NT_ASSERT(AccessMode != KernelMode); > + ASSERT(AccessMode != KernelMode); > > if (SecurityDescriptor == NULL) > return FALSE; > > Modified: trunk/reactos/ntoskrnl/se/acl.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/acl.c?rev=6888… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/acl.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/acl.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -439,10 +439,10 @@ > PSID Sid; > BOOLEAN WriteTwoAces; > > - NT_ASSERT(RtlValidAcl(AclSource)); > - NT_ASSERT(AclSource->AclSize % sizeof(ULONG) == 0); > - NT_ASSERT(AclSource->Sbz1 == 0); > - NT_ASSERT(AclSource->Sbz2 == 0); > + ASSERT(RtlValidAcl(AclSource)); > + ASSERT(AclSource->AclSize % sizeof(ULONG) == 0); > + ASSERT(AclSource->Sbz1 == 0); > + ASSERT(AclSource->Sbz2 == 0); > > Written = 0; > if (*AclLength >= Written + sizeof(ACL)) > @@ -457,18 +457,18 @@ > CurrentSource = (PUCHAR)(AclSource + 1); > for (i = 0; i < AclSource->AceCount; i++) > { > - NT_ASSERT((ULONG_PTR)CurrentDest % sizeof(ULONG) == 0); > - NT_ASSERT((ULONG_PTR)CurrentSource % sizeof(ULONG) == 0); > + ASSERT((ULONG_PTR)CurrentDest % sizeof(ULONG) == 0); > + ASSERT((ULONG_PTR)CurrentSource % sizeof(ULONG) == 0); > AceDest = (PACCESS_ALLOWED_ACE)CurrentDest; > AceSource = (PACCESS_ALLOWED_ACE)CurrentSource; > > /* These all have the same structure */ > - NT_ASSERT(AceSource->Header.AceType == ACCESS_ALLOWED_ACE_TYPE || > + ASSERT(AceSource->Header.AceType == ACCESS_ALLOWED_ACE_TYPE || > AceSource->Header.AceType == ACCESS_DENIED_ACE_TYPE || > AceSource->Header.AceType == SYSTEM_AUDIT_ACE_TYPE); > > - NT_ASSERT(AceSource->Header.AceSize % sizeof(ULONG) == 0); > - NT_ASSERT(AceSource->Header.AceSize >= sizeof(*AceSource)); > + ASSERT(AceSource->Header.AceSize % sizeof(ULONG) == 0); > + ASSERT(AceSource->Header.AceSize >= sizeof(*AceSource)); > if (!SepShouldPropagateAce(AceSource->Header.AceFlags, > &AceFlags, > IsInherited, > @@ -482,7 +482,7 @@ > AceSize = AceSource->Header.AceSize; > Mask = AceSource->Mask; > Sid = (PSID)&AceSource->SidStart; > - NT_ASSERT(AceSize >= FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + RtlLengthSid(Sid)); > + ASSERT(AceSize >= FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + RtlLengthSid(Sid)); > > WriteTwoAces = FALSE; > /* Map effective ACE to specific rights */ > @@ -598,7 +598,7 @@ > *IsInherited, > IsDirectoryObject, > GenericMapping); > - NT_ASSERT(Status == STATUS_BUFFER_TOO_SMALL); > + ASSERT(Status == STATUS_BUFFER_TOO_SMALL); > > /* Use the parent ACL only if it's not empty */ > if (*AclLength != sizeof(ACL)) > @@ -633,7 +633,7 @@ > *IsInherited, > IsDirectoryObject, > GenericMapping); > - NT_ASSERT(Status == STATUS_BUFFER_TOO_SMALL); > + ASSERT(Status == STATUS_BUFFER_TOO_SMALL); > } > return Acl; > } > > Modified: trunk/reactos/ntoskrnl/se/audit.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=68… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -644,7 +644,7 @@ > _SEH2_TRY > { > /* Loop all result entries (only 1 when no list was requested) */ > - NT_ASSERT(UseResultList || (ResultListLength == 1)); > + ASSERT(UseResultList || (ResultListLength == 1)); > for (i = 0; i < ResultListLength; i++) > { > AccessStatusList[i] = SafeAccessStatusList[i]; > > Modified: trunk/reactos/ntoskrnl/se/priv.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=688… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -129,7 +129,7 @@ > SepReleaseTokenLock(Token); > > /* When we reached this point, we did not find all privileges */ > - NT_ASSERT(Required > 0); > + ASSERT(Required > 0); > return FALSE; > } > > > Modified: trunk/reactos/ntoskrnl/se/sd.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=68888… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -864,7 +864,7 @@ > Control |= (ObjectSd->Control & SE_OWNER_DEFAULTED); > } > OwnerLength = Owner ? RtlLengthSid(Owner) : 0; > - NT_ASSERT(OwnerLength % sizeof(ULONG) == 0); > + ASSERT(OwnerLength % sizeof(ULONG) == 0); > > /* Get group and group size */ > if (SecurityInformation & GROUP_SECURITY_INFORMATION) > @@ -878,7 +878,7 @@ > Control |= (ObjectSd->Control & SE_GROUP_DEFAULTED); > } > GroupLength = Group ? RtlLengthSid(Group) : 0; > - NT_ASSERT(GroupLength % sizeof(ULONG) == 0); > + ASSERT(GroupLength % sizeof(ULONG) == 0); > > /* Get DACL and DACL size */ > if (SecurityInformation & DACL_SECURITY_INFORMATION) > @@ -1211,7 +1211,7 @@ > } > } > OwnerLength = RtlLengthSid(Owner); > - NT_ASSERT(OwnerLength % sizeof(ULONG) == 0); > + ASSERT(OwnerLength % sizeof(ULONG) == 0); > > /* Inherit the Group SID */ > if (ExplicitDescriptor != NULL) > @@ -1248,7 +1248,7 @@ > return STATUS_INVALID_PRIMARY_GROUP; > } > GroupLength = RtlLengthSid(Group); > - NT_ASSERT(GroupLength % sizeof(ULONG) == 0); > + ASSERT(GroupLength % sizeof(ULONG) == 0); > > /* Inherit the DACL */ > DaclLength = 0; > @@ -1283,7 +1283,7 @@ > GenericMapping); > if (DaclPresent) > Control |= SE_DACL_PRESENT; > - NT_ASSERT(DaclLength % sizeof(ULONG) == 0); > + ASSERT(DaclLength % sizeof(ULONG) == 0); > > /* Inherit the SACL */ > SaclLength = 0; > @@ -1318,7 +1318,7 @@ > GenericMapping); > if (SaclPresent) > Control |= SE_SACL_PRESENT; > - NT_ASSERT(SaclLength % sizeof(ULONG) == 0); > + ASSERT(SaclLength % sizeof(ULONG) == 0); > > /* Allocate and initialize the new security descriptor */ > Length = sizeof(SECURITY_DESCRIPTOR_RELATIVE) + > @@ -1356,7 +1356,7 @@ > SaclIsInherited, > IsDirectoryObject, > GenericMapping); > - NT_ASSERT(Status == STATUS_SUCCESS); > + ASSERT(Status == STATUS_SUCCESS); > Descriptor->Sacl = Current; > Current += SaclLength; > } > @@ -1371,7 +1371,7 @@ > DaclIsInherited, > IsDirectoryObject, > GenericMapping); > - NT_ASSERT(Status == STATUS_SUCCESS); > + ASSERT(Status == STATUS_SUCCESS); > Descriptor->Dacl = Current; > Current += DaclLength; > } > > Modified: trunk/reactos/ntoskrnl/se/sid.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev=6888… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -499,8 +499,8 @@ > RtlCopyMemory(CurrentDest, SrcSidAndAttributes[i].Sid, SidLength); > > /* Sanity checks */ > - NT_ASSERT(RtlLengthSid(SidAndAttributes[i].Sid) == SidLength); > - NT_ASSERT(RtlValidSid(SidAndAttributes[i].Sid)); > + ASSERT(RtlLengthSid(SidAndAttributes[i].Sid) == SidLength); > + ASSERT(RtlValidSid(SidAndAttributes[i].Sid)); > > /* Update the current destination address */ > CurrentDest += ALIGN_UP_BY(SidLength, sizeof(ULONG)); > > Modified: trunk/reactos/ntoskrnl/wmi/wmidrv.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmidrv.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -125,7 +125,7 @@ > _Out_ PWSTR ObjectNameBuffer, > _In_ KPROCESSOR_MODE AccessMode) > { > - NT_ASSERT(AccessMode != KernelMode); > + ASSERT(AccessMode != KernelMode); > > _SEH2_TRY > { > >

9 years, 7 months

2
2
0 0

Re: [ros-dev] [ros-diffs] [bfreisen] 68792: [HHPCOMP] Improve functionality of Windows MSVC build. Based on a WIP patch by Michael Fritscher. See CORE-10019.

by Thomas Faber

On 2015-08-22 13:16, bfreisen(a)svn.reactos.org wrote: > [HHPCOMP] > Improve functionality of Windows MSVC build. Based on a WIP patch by Michael Fritscher. > See CORE-10019. > +/* if O_BINARY is not defined, the system is probably not expecting any such flag */ > +#ifndef O_BINARY > +#define O_BINARY 0 > +#endif > - chm->fd = creat(filename, 0644); > + chm->fd = open(filename, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0644); Hmm... fopen wouldn't have this problem ;)

9 years, 8 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 68754: [NTVDM]: Initialize the PSP' memory control block owner name with the file name (without extension, and up to 8 chars) of the started program.

by Thomas Faber

On 2015-08-18 14:26, hbelusca(a)svn.reactos.org wrote: > [NTVDM]: Initialize the PSP' memory control block owner name with the file name (without extension, and up to 8 chars) of the started program. Shouldn't that use GetShortPathName to make sure the program can find itself on disk? :p

9 years, 8 months

4
4
0 0

Follow-up on Hackfest

by Colin Finck

Hi all, First of all, let me thank everybody who could make it to Aachen for Hackfest! Thanks also go to all the others on IRC, Twitter, etc. who supported us during that time! It was a pleasure to have you all here and simply a great week! :) Now let's spread the word even more, so that everyone can get an idea of our Hackfest: Hackfest report =============== Aleksey suggested (and volunteered!) to write a report about our Hackfest for the website. He wants someone to help him though. Victor, as you did a pretty great job at live streaming every day, would you help Aleksey here? If there are other volunteers, just raise your voice :) Photos ====== I've created a folder "ReactOS Hackfest 2015" in the "Developers" file section on IServ. You already find all my photos there (among them, first group photos from Saturday). Please share your photos as well, either by uploading through the website or through SFTP (WinSCP is a great tool for this). If you're not in the "Developers" section, but participated in the Hackfest, please tell either Christoph, Pierre or me and we will add you. Cheers, Colin

9 years, 8 months

1
0
0 0

Visual Studio Support

by Alberto Vaudagna

Just wonder why no one has yet fixed the compiling errors you get if you use visual studio. All the errors are not code related but linking problem, so I wonder why no body solve all the compiler errors. Thanks, Alberto Vaudagna

9 years, 8 months

3
15
0 0

#ReactOS in OpenExpo'15 (Madrid) and other PR stuff

by victor martinez

Hi guys!I'm proud to confirm that ReactOS project will be shown in OpenExpo'15 in Madrid, 16th June.OpenExpo is one of the greatest open source events in Spain: http://www.openexpo.esWe'll have the opportunity to give a Talk plus some Hacking lab (wish me good luck!). If anyone wants to come, I've one additional free pass. On the other hand, the open source 2/OS project is pushing forward through some Latam guys:https://plus.google.com/112666045931562995118/posts/6k1Xw2yXB7MSeems they're using ReactOS code in their project according with their tweets:https://twitter.com/2osproject/status/578135968219267072(Translation: We're using code of reactos.org and winehq.org, we have had to interact with networking stack with ROS using JAVA)Using Java??? And they seemed to have some issues with ReactOS code:http://twitter.com/2osproject/status/592291632004882433 Keep rockin'!

9 years, 8 months

6
8
0 0

Re: [ros-dev] [ros-diffs] [cwittich] 68673: [MSAFD] don't trace an uninitialized UNICODE_STRING

by Thomas Faber

On 2015-08-10 19:54, cwittich(a)svn.reactos.org wrote: > @@ -40,8 +40,8 @@ > PLIST_ENTRY Helpers; > INT Status; > > - TRACE("AddressFamily %p, SocketType %p, Protocol %p, Group %u, Flags %lx, TransportName %wZ, HelperDllContext %p, HeplperDllData %p, Events %p\n", > - AddressFamily, SocketType, Protocol, Group, Flags, TransportName, HelperDllContext, HelperDllData, Events); > + TRACE("AddressFamily %p, SocketType %p, Protocol %p, Group %u, Flags %lx, HelperDllContext %p, HeplperDllData %p, Events %p\n", > + AddressFamily, SocketType, Protocol, Group, Flags, HelperDllContext, HelperDllData, Events); So change it to %p? This is tracing all function arguments... seems keeping that scheme would be good. (also you could fix the Heplper typo if you're already at it :p)

9 years, 8 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [dreimer] 68672: [BROWSEUI] Address is untranslatable by Adam Stachowicz CORE-9977 #resolve #comment Committed (with a Unicode fix), thx ^^

by Thomas Faber

On 2015-08-10 18:52, dreimer(a)svn.reactos.org wrote: > --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Mon Aug 10 16:52:40 2015 > @@ -93,7 +93,11 @@ > pdbi->ptActual.y = 22; > } > if (pdbi->dwMask & DBIM_TITLE) > - wcscpy(pdbi->wszTitle, L"Address"); > + { > + if (!LoadStringW(_AtlBaseModule.GetResourceInstance(), IDS_ADDRESSBANDLABEL, pdbi->wszTitle, _countof(pdbi->wszTitle))) > + return E_FAIL; > + } As a general rule, try not to use E_FAIL. HRESULT_FROM_WIN32(GetLastError()) would probably be correct here.

9 years, 8 months

1
0
0 0

Audio development

by Andrew Greenwood

Hi everyone, Some of you probably remember me. I was involved with trying to get audio/sound implemented in ReactOS a few years ago. To be honest, my progress was rather poor, I managed to write a few bits of code but never really had a proper understanding of kernel/OS development or CPU/system architectures. Additionally, whilst I could grasp how the multimedia APIs (MME) in NT4 worked, and how they interacted with the drivers (audio device X opens device Y and writes buffered data to it) for Windows 2000 and later, Kernel Streaming was used which partly built on top of the older implementation but added a load of new stuff. This complicated matters as firstly, KS uses COM (which I still struggle to wrap my head around) in kernel-mode, secondly there were multiple components involved between the application and the hardware (wdmaud.drv -> wdmaud.sys -> ks.sys -> portcls.sys -> driver as far as I remember), and finally I really struggled to find example code and thorough documentation describing how it all worked. Ultimately I gave up with that and intended to move to another platform to develop multimedia applications. Not much happened with that. I remember there were complaints from application developers over Kernel Streaming offering poor latency - instead developers would turn to other technologies such as ASIO or DirectSound. So for recent versions of Windows (Vista onwards?) Microsoft implemented a new, user-mode sound system (WASAPI) which again uses COM but is pretty nicely documented, with code samples. Having done a little reading about this, it renewed my interest. It still uses COM, and KS.SYS is still present (I assume for compatibility?) but as a lot of this is implemented in user-space I suspect it'd be easier to develop/test. Aside from this, over the past few years I've also gained a better understanding of topics I didn't know much about previously and I feel more confident at being able to write lower-level stuff that works properly. I've also developed more of a keen interest in how Windows works. So basically I'm considering implementing the current Windows audio system in ReactOS. I'd imagine we don't need to be too concerned about audio drivers themselves (at least, initially) as vendors tend to offer these and it's not like we need sound immediately post-install! The only thing I really lack now is knowledge of how to implement COM classes - at least, outside of using Visual Studio. Anyone got recommended reading or example code for this? Andrew

9 years, 8 months

3
3
0 0

Re: [ros-dev] [ros-diffs] [dreimer] 68645: [shell32] Change Trash to Recycle Bin by Lee Schroeder CORE-8391 #resolve #comment Committed the big one with changes to all RC files, because it's the right way to do that. All th...

by Thomas Faber

Well... since you asked... Really good reason not to: if something's not broken, don't fix it. Really good reason not to: if everything works fine and the user experience is generally Windows-like, we should NOT try to make things more Windows-like. On the contrary. Different is good, both in terms of project philosophy and legally. Really good reason not to: as another non-native speaker... neither of the two terms seems better than the other for any objective reason. Except that 'trash' is something people actually say :p Keep on hacking! ;) On August 9, 2015 9:56:47 AM CEST, dreimer(a)svn.reactos.org wrote: >Author: dreimer >Date: Sun Aug 9 07:56:47 2015 >New Revision: 68645 > >URL: http://svn.reactos.org/svn/reactos?rev=68645&view=rev >Log: >[shell32] >Change Trash to Recycle Bin by Lee Schroeder >CORE-8391 #resolve #comment Committed the big one with changes to all >RC files, because it's the right way to do that. All these strings are >originated from the english resource and NEVER were translated up to >now, so we keep these strings in sync. Second argument. Trash is not >the right word here (YES, a non native dares to say this ^^) We use the >Windows way here, unless someone gives me a REALLY good reason not to >^^ > >Modified: > trunk/reactos/dll/win32/shell32/lang/ca-ES.rc > trunk/reactos/dll/win32/shell32/lang/da-DK.rc > trunk/reactos/dll/win32/shell32/lang/en-US.rc > trunk/reactos/dll/win32/shell32/lang/fi-FI.rc > trunk/reactos/dll/win32/shell32/lang/he-IL.rc > trunk/reactos/dll/win32/shell32/lang/hu-HU.rc > trunk/reactos/dll/win32/shell32/lang/ko-KR.rc > trunk/reactos/dll/win32/shell32/lang/nl-NL.rc > trunk/reactos/dll/win32/shell32/lang/pt-BR.rc > trunk/reactos/dll/win32/shell32/lang/sl-SI.rc > trunk/reactos/dll/win32/shell32/lang/sv-SE.rc > trunk/reactos/dll/win32/shell32/lang/zh-TW.rc > >Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc >URL: >http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… >============================================================================== >--- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] >(original) >+++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Sun Aug >9 07:56:47 2015 >@@ -661,7 +661,7 @@ > /* special folders */ > IDS_DESKTOP "Desktop" > IDS_MYCOMPUTER "My Computer" >- IDS_RECYCLEBIN_FOLDER_NAME "Trash" >+ IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin" > IDS_CONTROLPANEL "Control Panel" > IDS_ADMINISTRATIVETOOLS "Administrative Tools" > >@@ -689,10 +689,10 @@ > IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" >IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 >items?" >IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected >item(s)?" >- IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Trash?" >- IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Trash?" >- IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Trash?" >- IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you >want to delete it instead?" >+ IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Recycle Bin?" >+ IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Recycle Bin?" >+ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Recycle Bin?" >+ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do >you want to delete it instead?" >IDS_OVERWRITEFILE_TEXT "This folder already contains a file called >'%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" >IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named >'%1'.\n\nIf the files in the destination folder have the same names as >files in the\nselected folder they will be replaced. Do you still want >to move or copy\nthe folder?" > >Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc >URL: >http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… >============================================================================== >--- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] >(original) >+++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Sun Aug >9 07:56:47 2015 >@@ -667,7 +667,7 @@ > /* special folders */ > IDS_DESKTOP "Skrivebord" > IDS_MYCOMPUTER "Min Computer" >- IDS_RECYCLEBIN_FOLDER_NAME "Trash" >+ IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin" > IDS_CONTROLPANEL "Control Panel" > IDS_ADMINISTRATIVETOOLS "Administrative Tools" > >@@ -695,10 +695,10 @@ > IDS_DELETEITEM_TEXT "Er du sikker pÃ¥ du vil slette '%1'?" >IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 >items?" >IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected >item(s)?" >- IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Trash?" >- IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Trash?" >- IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Trash?" >- IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you >want to delete it instead?" >+ IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Recycle Bin?" >+ IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Recycle Bin?" >+ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Recycle Bin?" >+ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do >you want to delete it instead?" > IDS_OVERWRITEFILE_TEXT "Overskriv fil %1?" > IDS_OVERWRITEFILE_CAPTION "BekrÃ¦ft overskrivelse af fil" >IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named >'%1'.\n\nIf the files in the destination folder have the same names as >files in the\nselected folder they will be replaced. Do you still want >to move or copy\nthe folder?" > >Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc >URL: >http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… >============================================================================== >--- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] >(original) >+++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sun Aug >9 07:56:47 2015 >@@ -661,7 +661,7 @@ > /* special folders */ > IDS_DESKTOP "Desktop" > IDS_MYCOMPUTER "My Computer" >- IDS_RECYCLEBIN_FOLDER_NAME "Trash" >+ IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin" > IDS_CONTROLPANEL "Control Panel" > IDS_ADMINISTRATIVETOOLS "Administrative Tools" > >@@ -689,10 +689,10 @@ > IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" >IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 >items?" >IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected >item(s)?" >- IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Trash?" >- IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Trash?" >- IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Trash?" >- IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you >want to delete it instead?" >+ IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Recycle Bin?" >+ IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Recycle Bin?" >+ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Recycle Bin?" >+ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do >you want to delete it instead?" >IDS_OVERWRITEFILE_TEXT "This folder already contains a file called >'%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" >IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named >'%1'.\n\nIf the files in the destination folder have the same names as >files in the\nselected folder they will be replaced. Do you still want >to move or copy\nthe folder?" > >Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc >URL: >http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… >============================================================================== >--- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] >(original) >+++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Sun Aug >9 07:56:47 2015 >@@ -661,7 +661,7 @@ > /* special folders */ > IDS_DESKTOP "TyÃ¶pÃ¶ytÃ¤" > IDS_MYCOMPUTER "Oma Tietokone" >- IDS_RECYCLEBIN_FOLDER_NAME "Trash" >+ IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin" > IDS_CONTROLPANEL "Control Panel" > IDS_ADMINISTRATIVETOOLS "Administrative Tools" > >@@ -689,10 +689,10 @@ > IDS_DELETEITEM_TEXT "Haluatko varmasti tuhota '%1':n?" > IDS_DELETEMULTIPLE_TEXT "Haluatko varmasti tuhota nÃ¤mÃ¤ %1?" >IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected >item(s)?" >- IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Trash?" >- IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Trash?" >- IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Trash?" >- IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you >want to delete it instead?" >+ IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Recycle Bin?" >+ IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Recycle Bin?" >+ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Recycle Bin?" >+ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do >you want to delete it instead?" >IDS_OVERWRITEFILE_TEXT "This folder already contains a file called >'%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Vahvista Tiedoston Ylikirjoitus" >IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named >'%1'.\n\nIf the files in the destination folder have the same names as >files in the\nselected folder they will be replaced. Do you still want >to move or copy\nthe folder?" > >Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc >URL: >http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… >============================================================================== >--- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] >(original) >+++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Sun Aug >9 07:56:47 2015 >@@ -689,10 +689,10 @@ > IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" >IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 >items?" >IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected >item(s)?" >- IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Trash?" >- IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Trash?" >- IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Trash?" >- IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you >want to delete it instead?" >+ IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Recycle Bin?" >+ IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Recycle Bin?" >+ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Recycle Bin?" >+ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do >you want to delete it instead?" >IDS_OVERWRITEFILE_TEXT "This folder already contains a file called >'%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" >IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named >'%1'.\n\nIf the files in the destination folder have the same names as >files in the\nselected folder they will be replaced. Do you still want >to move or copy\nthe folder?" > >Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc >URL: >http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… >============================================================================== >--- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] >(original) >+++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Sun Aug >9 07:56:47 2015 >@@ -661,7 +661,7 @@ > /* special folders */ > IDS_DESKTOP "Asztal" > IDS_MYCOMPUTER "SzÃ¡mÃtÃ³gÃ©p" >- IDS_RECYCLEBIN_FOLDER_NAME "Trash" >+ IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin" > IDS_CONTROLPANEL "Control Panel" > IDS_ADMINISTRATIVETOOLS "Administrative Tools" > >@@ -689,10 +689,10 @@ > IDS_DELETEITEM_TEXT "Biztosan tÃ¶rÃ¶lni szeretnÃ©d?: '%1'?" >IDS_DELETEMULTIPLE_TEXT "Biztosan tÃ¶rÃ¶lni szeretnÃ©d ezt a(z) %1 >elemet?" >IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected >item(s)?" >- IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Trash?" >- IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Trash?" >- IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Trash?" >- IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you >want to delete it instead?" >+ IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Recycle Bin?" >+ IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Recycle Bin?" >+ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Recycle Bin?" >+ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do >you want to delete it instead?" >IDS_OVERWRITEFILE_TEXT "This folder already contains a file called >'%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "ÃllomÃ¡ny felÃ¼lÃrÃ¡sa" >IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named >'%1'.\n\nIf the files in the destination folder have the same names as >files in the\nselected folder they will be replaced. Do you still want >to move or copy\nthe folder?" > >Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc >URL: >http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… >============================================================================== >--- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] >(original) >+++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Sun Aug >9 07:56:47 2015 >@@ -661,7 +661,7 @@ > /* special folders */ > IDS_DESKTOP "Desktop" > IDS_MYCOMPUTER "My Computer" >- IDS_RECYCLEBIN_FOLDER_NAME "Trash" >+ IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin" > IDS_CONTROLPANEL "Control Panel" > IDS_ADMINISTRATIVETOOLS "Administrative Tools" > >@@ -689,10 +689,10 @@ > IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" >IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 >items?" >IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected >item(s)?" >- IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Trash?" >- IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Trash?" >- IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Trash?" >- IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you >want to delete it instead?" >+ IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Recycle Bin?" >+ IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Recycle Bin?" >+ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Recycle Bin?" >+ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do >you want to delete it instead?" >IDS_OVERWRITEFILE_TEXT "This folder already contains a file called >'%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" >IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named >'%1'.\n\nIf the files in the destination folder have the same names as >files in the\nselected folder they will be replaced. Do you still want >to move or copy\nthe folder?" > >Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc >URL: >http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… >============================================================================== >--- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] >(original) >+++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Sun Aug >9 07:56:47 2015 >@@ -661,7 +661,7 @@ > /* special folders */ > IDS_DESKTOP "Desktop" > IDS_MYCOMPUTER "My Computer" >- IDS_RECYCLEBIN_FOLDER_NAME "Trash" >+ IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin" > IDS_CONTROLPANEL "Control Panel" > IDS_ADMINISTRATIVETOOLS "Administrative Tools" > >@@ -689,10 +689,10 @@ > IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" >IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 >items?" >IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected >item(s)?" >- IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Trash?" >- IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Trash?" >- IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Trash?" >- IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you >want to delete it instead?" >+ IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Recycle Bin?" >+ IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Recycle Bin?" >+ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Recycle Bin?" >+ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do >you want to delete it instead?" >IDS_OVERWRITEFILE_TEXT "This folder already contains a file called >'%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" >IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named >'%1'.\n\nIf the files in the destination folder have the same names as >files in the\nselected folder they will be replaced. Do you still want >to move or copy\nthe folder?" > >Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc >URL: >http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… >============================================================================== >--- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] >(original) >+++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Sun Aug >9 07:56:47 2015 >@@ -689,10 +689,10 @@ > IDS_DELETEITEM_TEXT "VocÃª tem certeza que deseja excluir '%1'?" >IDS_DELETEMULTIPLE_TEXT "VocÃª tem certeza que deseja excluir estes %1 >arquivos?" >IDS_DELETESELECTED_TEXT "VocÃª tem certeza que deseja excluir o(s) >arquivo(s) selecionado(s)?" >- IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Trash?" >- IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Trash?" >- IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Trash?" >- IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you >want to delete it instead?" >+ IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Recycle Bin?" >+ IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Recycle Bin?" >+ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Recycle Bin?" >+ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do >you want to delete it instead?" >IDS_OVERWRITEFILE_TEXT "This folder already contains a file called >'%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Confirmar sobreescrever arquivo" >IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named >'%1'.\n\nIf the files in the destination folder have the same names as >files in the\nselected folder they will be replaced. Do you still want >to move or copy\nthe folder?" > >Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc >URL: >http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… >============================================================================== >--- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] >(original) >+++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Sun Aug >9 07:56:47 2015 >@@ -661,7 +661,7 @@ > /* special folders */ > IDS_DESKTOP "Desktop" > IDS_MYCOMPUTER "My Computer" >- IDS_RECYCLEBIN_FOLDER_NAME "Trash" >+ IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin" > IDS_CONTROLPANEL "Control Panel" > IDS_ADMINISTRATIVETOOLS "Administrative Tools" > >@@ -689,10 +689,10 @@ > IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" >IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 >items?" >IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected >item(s)?" >- IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Trash?" >- IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Trash?" >- IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Trash?" >- IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you >want to delete it instead?" >+ IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Recycle Bin?" >+ IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Recycle Bin?" >+ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Recycle Bin?" >+ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do >you want to delete it instead?" >IDS_OVERWRITEFILE_TEXT "This folder already contains a file called >'%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" >IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named >'%1'.\n\nIf the files in the destination folder have the same names as >files in the\nselected folder they will be replaced. Do you still want >to move or copy\nthe folder?" > >Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc >URL: >http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… >============================================================================== >--- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] >(original) >+++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Sun Aug >9 07:56:47 2015 >@@ -661,7 +661,7 @@ > /* special folders */ > IDS_DESKTOP "Desktop" > IDS_MYCOMPUTER "My Computer" >- IDS_RECYCLEBIN_FOLDER_NAME "Trash" >+ IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin" > IDS_CONTROLPANEL "Control Panel" > IDS_ADMINISTRATIVETOOLS "Administrative Tools" > >@@ -689,10 +689,10 @@ > IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" >IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 >items?" >IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected >item(s)?" >- IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Trash?" >- IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Trash?" >- IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Trash?" >- IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you >want to delete it instead?" >+ IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Recycle Bin?" >+ IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Recycle Bin?" >+ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Recycle Bin?" >+ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do >you want to delete it instead?" >IDS_OVERWRITEFILE_TEXT "This folder already contains a file called >'%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" >IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named >'%1'.\n\nIf the files in the destination folder have the same names as >files in the\nselected folder they will be replaced. Do you still want >to move or copy\nthe folder?" > >Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc >URL: >http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… >============================================================================== >--- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] >(original) >+++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Sun Aug >9 07:56:47 2015 >@@ -697,10 +697,10 @@ > IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" >IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 >items?" >IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected >item(s)?" >- IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Trash?" >- IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Trash?" >- IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Trash?" >- IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you >want to delete it instead?" >+ IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the >Recycle Bin?" >+ IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and >all its content to the Recycle Bin?" >+ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these >%1 items to the Recycle Bin?" >+ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do >you want to delete it instead?" >IDS_OVERWRITEFILE_TEXT "This folder already contains a file called >'%1'.\n\nDo you want to replace it?" > IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" >IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named >'%1'.\n\nIf the files in the destination folder have the same names as >files in the\nselected folder they will be replaced. Do you still want >to move or copy\nthe folder?" -- Sent from my Android phone with K-9 Mail. Please excuse my brevity.

9 years, 8 months

3
3
0 0

Re: [ros-dev] [ros-diffs] [aandrejevic] 68607: [FASTFAT] Irp->UserBuffer being NULL doesn't indicate any error. It could be that the caller really wants the result stored at address NULL (which can be valid, and is valid by...

by Pierre Schweitzer

This patch, as it, is really dangerous. MS allows null pointer in its Read/Write routines, but they are wrapped inside a SEH block, to prevent nasty things to happen in case of a null pointer dereference. Here we don't, meaning that a null pointer here will cause major damages. Furthermore, your commit regressed ntdll:file: https://reactos.org/sites/all/modules/reactos/testman/compare.php?ids=40042… Regards, On 08/07/2015 05:30 AM, aandrejevic(a)svn.reactos.org wrote: > Author: aandrejevic > Date: Fri Aug 7 03:30:05 2015 > New Revision: 68607 > > URL: http://svn.reactos.org/svn/reactos?rev=68607&view=rev > Log: > [FASTFAT] > Irp->UserBuffer being NULL doesn't indicate any error. It could be that the > caller really wants the result stored at address NULL (which can be valid, > and is valid by default for programs like NTVDM). > > > Modified: > trunk/reactos/drivers/filesystems/fastfat/rw.c > > Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… > ============================================================================== > --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Fri Aug 7 03:30:05 2015 > @@ -656,7 +656,7 @@ > } > > Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO)); > - if (!Buffer) > + if (!Buffer && IrpContext->Irp->MdlAddress) > { > Status = STATUS_INVALID_USER_BUFFER; > goto ByeBye; > @@ -927,7 +927,7 @@ > OldFileSize = Fcb->RFCB.FileSize; > > Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO)); > - if (!Buffer) > + if (!Buffer && IrpContext->Irp->MdlAddress) > { > Status = STATUS_INVALID_USER_BUFFER; > goto ByeBye; > > -- Pierre Schweitzer <pierre(a)reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

9 years, 8 months

2
1
0 0

VcXsrv Windows X Server

by Javier Agustìn Fernàndez Arroyo

Hello, i dont know if this list is the correct place to post this, I found this software some weeks ago, and i thought it would be interesting to have it running in ReactOS. But, according its website, support for Windows XP has been stopped. So question is, what about asking author to reenable XP support via ReactOS? :) http://sourceforge.net/projects/vcxsrv/

9 years, 8 months

1
0
0 0

WDM sound drivers question

by Mgr. Janusz Chmiel

Dear core developers, Is it possible to use Windows XP based WDM sound drivers with Reactos 0.4-CLT2015? Is it possible to make something so specific WDM sound driver can be incorporated to Live CD so it would work out of The box? If there is issues with using various sound drivers, how complex would bew for You to add support for general USB audio device. Last plea. Which dlls would had to be redesigned so NVDA screen reader would be used? Oleacc.dll and other mSAA based libraries? Thank You very much for Yours answers. With kindness regards. Janusz Chmiel

9 years, 8 months

1
0
0 0

Unify system icons into one central folder

by Jared Smudde

Hello. I am Jared Smudde aka. Pi_User5. I propose that we move most of the icons in trunk into a central folder in the media folder. Some icons will need to stay because they might be application specific. The folder can be called icons and it would be organized according to http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.h…. This way, we can eliminate duplicate icons thus making trunk slightly smaller. It will also make changing ReactOS to a different icon theme much easier. This idea was suggested by gigaherz and I would like to see it done. Thanks! Jared

9 years, 9 months

3
5
0 0

Working on partitions

by stack exchange

Hi On my issue CORE-9641 <https://jira.reactos.org/browse/CORE-9641> Victor Martinez made a comment saying that Eric Kohl is currently working on partitions. If that is the case, what kind of changes are being worked on? Since I created another issue related to that (CORE-9661 <https://jira.reactos.org/browse/CORE-9661>), if this is already worked on, I don't want to look into it either, otherwise this would be what I would fix next. mfg, Gerhard Gruber

9 years, 9 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 68253: [SPOOLSS] Halfplement and document the undocumented but exported MarshallDownStructure API. Information about this API was exclusively gained by writing a custom XML file for rohita...

by Alex Ionescu

On Wed, Jun 24, 2015 at 9:26 AM, <cfinck(a)svn.reactos.org> wrote: > cbSize Well, you may at least want to validate that your dwOffsets are within cbSize? Best regards, Alex Ionescu

9 years, 9 months

3
3
0 0

Re: [ros-dev] [ros-diffs] [cwittich] 68305: [BROWSEUI] don't expose some interfaces expose IID_IContextMenu3 from CBandSiteMenu

by Pierre Schweitzer

This commit regressed (badly) explorer: https://www3.heisspiter.net/explorer.png On 28/06/2015 20:22, cwittich(a)svn.reactos.org wrote: > Author: cwittich > Date: Sun Jun 28 18:22:02 2015 > New Revision: 68305 > > URL: http://svn.reactos.org/svn/reactos?rev=68305&view=rev > Log: > [BROWSEUI] > don't expose some interfaces > expose IID_IContextMenu3 from CBandSiteMenu > > Modified: > trunk/reactos/dll/win32/browseui/addressband.h > trunk/reactos/dll/win32/browseui/addresseditbox.h > trunk/reactos/dll/win32/browseui/bandsitemenu.h > trunk/reactos/dll/win32/browseui/internettoolbar.h > > Modified: trunk/reactos/dll/win32/browseui/addressband.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… > ============================================================================== > --- trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] Sun Jun 28 18:22:02 2015 > @@ -136,6 +136,5 @@ > COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) > COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) > COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) > - COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) > END_COM_MAP() > }; > > Modified: trunk/reactos/dll/win32/browseui/addresseditbox.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… > ============================================================================== > --- trunk/reactos/dll/win32/browseui/addresseditbox.h [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/browseui/addresseditbox.h [iso-8859-1] Sun Jun 28 18:22:02 2015 > @@ -97,7 +97,6 @@ > COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) > COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) > COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) > - COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) > COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) > END_COM_MAP() > }; > > Modified: trunk/reactos/dll/win32/browseui/bandsitemenu.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… > ============================================================================== > --- trunk/reactos/dll/win32/browseui/bandsitemenu.h [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/browseui/bandsitemenu.h [iso-8859-1] Sun Jun 28 18:22:02 2015 > @@ -55,6 +55,7 @@ > BEGIN_COM_MAP(CBandSiteMenu) > COM_INTERFACE_ENTRY_IID(IID_IShellService, IShellService) > COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) > + COM_INTERFACE_ENTRY_IID(IID_IContextMenu3, IContextMenu3) > COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) > END_COM_MAP() > }; > > Modified: trunk/reactos/dll/win32/browseui/internettoolbar.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… > ============================================================================== > --- trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] Sun Jun 28 18:22:02 2015 > @@ -228,7 +228,6 @@ > COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) > COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) > COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow) > - COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) > // COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) > COM_INTERFACE_ENTRY_IID(IID_IPersistStreamInit, IPersistStreamInit) > COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) > @@ -237,7 +236,5 @@ > COM_INTERFACE_ENTRY_IID(IID_IShellChangeNotify, IShellChangeNotify) > COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) > COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) > - COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) > - COM_INTERFACE_ENTRY_IID(IID_IBandSite, IBandSite) > END_COM_MAP() > }; > > -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

9 years, 9 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [ekohl] 68313: [NTOSKRNL] Add CmpDestroySecurityCache() and CmpDestroyHiveViewList() stubs and call them in CmpDestroyHive and CmUnloadKey(). CORE-6492 #resolve #comment Thank you Hermes! This is e...

by Thomas Faber

On 2015-06-29 20:26, ekohl(a)svn.reactos.org wrote: > Modified: trunk/reactos/ntoskrnl/config/cmmapvw.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmmapvw.c?… > ============================================================================== > --- trunk/reactos/ntoskrnl/config/cmmapvw.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/config/cmmapvw.c [iso-8859-1] Mon Jun 29 18:26:56 2015 > @@ -29,3 +29,54 @@ > Hive->PinnedViews = 0; > Hive->UseCount = 0; > } > + > +VOID > +NTAPI > +CmpDestroyHiveViewList(IN PCMHIVE Hive) > +{ > + PCM_VIEW_OF_FILE CmView; > + PLIST_ENTRY EntryList; > + > + /* Do NOT destroy the views of read-only hives */ > + ASSERT(Hive->Hive.ReadOnly == FALSE); > + > + /* Free all the views inside the Pinned View List */ > + EntryList = RemoveHeadList(&Hive->PinViewListHead); > + while (EntryList != &Hive->PinViewListHead) In case you haven't found it yourself yet maybe I can speed things up in identifying the test failures here: I made RemoveHeadList on an empty list cause a security check failure a while back because when done unintentionally it can indicate a bug in the code, while OTOH it's super easy to avoid. So I'm guessing this is probably the cause, and should use a while (!IsListEmpty()) RemoveHeadList(); or similar pattern. If you have strong feelings against this check (which MS's headers don't do), let me know. > + { > + CmView = CONTAINING_RECORD(EntryList, CM_VIEW_OF_FILE, PinViewList); > + > + /* FIXME: Unmap the view if it is mapped */ > + > + ExFreePool(CmView); > + > + Hive->PinnedViews--; > + > + EntryList = RemoveHeadList(&Hive->PinViewListHead); > + } > + > + /* The Pinned View List should be empty */ > + ASSERT(IsListEmpty(&Hive->PinViewListHead) == TRUE); > + ASSERT(Hive->PinnedViews == 0); > + > + /* Now, free all the views inside the LRU View List */ > + EntryList = RemoveHeadList(&Hive->LRUViewListHead); > + while (EntryList != &Hive->LRUViewListHead) > + { > + CmView = CONTAINING_RECORD(EntryList, CM_VIEW_OF_FILE, LRUViewList); > + > + /* FIXME: Unmap the view if it is mapped */ > + > + ExFreePool(CmView); > + > + Hive->MappedViews--; > + > + EntryList = RemoveHeadList(&Hive->LRUViewListHead); > + }

9 years, 9 months

2
1
0 0

Status Meeting (June 2015)

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place 25th of June, 19:00 UTC, as always. IRC service will only be started shortly before the meeting. Your participation passwords and server address will be emailed to you shortly before the meeting starts, and they are going to be different once again as they are not stored in any database. Hopefully it's not much of inconvenience. Please send agenda proposals to me before the meeting. One point for agenda would be discussion of our upcoming Hackfest in Aachen, which is going to be awesome (the Hackfest, and hopefully the discussion too ;)) Regards, Aleksey Bragin

9 years, 10 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 68139: [TOOLS] Improve bin2c by saving in a #define the size of the generated array, and specify this size in the declaration of the array so that doing sizeof(...) becomes possible. Use...

by Steven Edwards

This causes failures in cross-compiling on OS X [15/6897] Building C object hal/halx86/CMakeFiles/lib_hal_legacy.dir/pci_classes.c.obj FAILED: /usr/local/RosBE/i386/bin/i686-w64-mingw32-gcc -DDBG=1 -DKDBG=1 -DUSE_COMPILER_EXCEPTIONS -DWINVER=0x502 -D_M_IX86 -D_NTHALDLL_ -D_NTHAL_ -D_SEH_ENABLE_TRACE -D_SETUPAPI_VER=0x502 -D_USE_32BIT_TIME_T -D_USE_PSEH3=1 -D_WIN32_IE=0x600 -D_WIN32_WINDOWS=0x502 -D_WIN32_WINNT=0x502 -D_X86_ -D__REACTOS__ -D__i386__ -D_inline=__inline -Di386 -Wa,--compress-debug-sections -pipe -fms-extensions -fno-strict-aliasing -nostdinc -mstackrealign -Wold-style-declaration -Wdeclaration-after-statement -fdebug-prefix-map="/Users/steven.edwards/source/reactos/reactos"=ReactOS -gdwarf-2 -gstrict-dwarf -femit-struct-debug-detailed=none -feliminate-unused-debug-symbols -march=pentium -mtune=i686 -Werror -Wall -Wpointer-arith -Wno-char-subscripts -Wno-multichar -Wno-unused-value -Wno-maybe-uninitialized -O1 -fno-optimize-sibling-calls -fno-omit-frame-pointer -mpreferred-stack-boundary=3 -fno-set-stack-executable -g -Ihal/halx86 -I../../hal/halx86 -I../../include -I../../include/psdk -I../../include/dxsdk -Iinclude -Iinclude/psdk -Iinclude/dxsdk -Iinclude/reactos -I../../include/crt -I../../include/ddk -I../../include/ndk -I../../include/reactos -I../../include/reactos/libs -I../../hal/halx86/include -I../../ntoskrnl/include -MMD -MT hal/halx86/CMakeFiles/lib_hal_legacy.dir/pci_classes.c.obj -MF hal/halx86/CMakeFiles/lib_hal_legacy.dir/pci_classes.c.obj.d -o hal/halx86/CMakeFiles/lib_hal_legacy.dir/pci_classes.c.obj -c hal/halx86/pci_classes.c In file included from hal/halx86/pci_classes.c:4:0: /Users/steven.edwards/source/reactos/reactos/output-MinGW-i386/reactos/hal/halx86/pci_classes.h:4:33: error: 'Iu' undeclared here (not in a function) [15/6897] Building C object hal/halx86/CMakeFiles/lib_hal_legacy.dir/legacy/bussupp.c.obj FAILED: /usr/local/RosBE/i386/bin/i686-w64-mingw32-gcc -DDBG=1 -DKDBG=1 -DUSE_COMPILER_EXCEPTIONS -DWINVER=0x502 -D_M_IX86 -D_NTHALDLL_ -D_NTHAL_ -D_SEH_ENABLE_TRACE -D_SETUPAPI_VER=0x502 -D_USE_32BIT_TIME_T -D_USE_PSEH3=1 -D_WIN32_IE=0x600 -D_WIN32_WINDOWS=0x502 -D_WIN32_WINNT=0x502 -D_X86_ -D__REACTOS__ -D__i386__ -D_inline=__inline -Di386 -Wa,--compress-debug-sections -pipe -fms-extensions -fno-strict-aliasing -nostdinc -mstackrealign -Wold-style-declaration -Wdeclaration-after-statement -fdebug-prefix-map="/Users/steven.edwards/source/reactos/reactos"=ReactOS -gdwarf-2 -gstrict-dwarf -femit-struct-debug-detailed=none -feliminate-unused-debug-symbols -march=pentium -mtune=i686 -Werror -Wall -Wpointer-arith -Wno-char-subscripts -Wno-multichar -Wno-unused-value -Wno-maybe-uninitialized -O1 -fno-optimize-sibling-calls -fno-omit-frame-pointer -mpreferred-stack-boundary=3 -fno-set-stack-executable -g -Ihal/halx86 -I../../hal/halx86 -I../../include -I../../include/psdk -I../../include/dxsdk -Iinclude -Iinclude/psdk -Iinclude/dxsdk -Iinclude/reactos -I../../include/crt -I../../include/ddk -I../../include/ndk -I../../include/reactos -I../../include/reactos/libs -I../../hal/halx86/include -I../../ntoskrnl/include -MMD -MT hal/halx86/CMakeFiles/lib_hal_legacy.dir/legacy/bussupp.c.obj -MF hal/halx86/CMakeFiles/lib_hal_legacy.dir/legacy/bussupp.c.obj.d -o hal/halx86/CMakeFiles/lib_hal_legacy.dir/legacy/bussupp.c.obj -c ../../hal/halx86/legacy/bussupp.c In file included from ../../hal/halx86/legacy/bussupp.c:697:0: hal/halx86/pci_classes.h:4:33: error: 'Iu' undeclared here (not in a function) ../../hal/halx86/legacy/bussupp.c: In function 'HalpDebugPciDumpBus': ../../hal/halx86/legacy/bussupp.c:739:32: error: 'VendorTable' undeclared (first use in this function) ../../hal/halx86/legacy/bussupp.c:739:32: note: each undeclared identifier is reported only once for each function it appears in [15/6897] Building C object lib/3rdparty/adns/CMakeFiles/adns.dir/src/event.c.obj ninja: build stopped: subcommand failed. On Sun, Jun 14, 2015 at 11:13 AM, <hbelusca(a)svn.reactos.org> wrote: > Author: hbelusca > Date: Sun Jun 14 18:13:50 2015 > New Revision: 68139 > > URL: http://svn.reactos.org/svn/reactos?rev=68139&view=rev > Log: > [TOOLS] > Improve bin2c by saving in a #define the size of the generated array, and > specify this size in the declaration of the array so that doing sizeof(...) > becomes possible. Use "unsigned char" as the (portable) type of the > contents of the array. > > [HAL] > Add PCHAR casts where needed to take into account the previous > modifications. > > Modified: > trunk/reactos/hal/halx86/legacy/bussupp.c > trunk/reactos/tools/bin2c.c > > Modified: trunk/reactos/hal/halx86/legacy/bussupp.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.… > > ============================================================================== > --- trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] Sun Jun 14 > 18:13:50 2015 > @@ -715,7 +715,7 @@ > > /* Isolate the class name */ > sprintf(LookupString, "C %02x ", PciData->BaseClass); > - ClassName = strstr(ClassTable, LookupString); > + ClassName = strstr((PCHAR)ClassTable, LookupString); > if (ClassName) > { > /* Isolate the subclass name */ > @@ -736,7 +736,7 @@ > > /* Isolate the vendor name */ > sprintf(LookupString, "\r\n%04x ", PciData->VendorID); > - VendorName = strstr(VendorTable, LookupString); > + VendorName = strstr((PCHAR)VendorTable, LookupString); > if (VendorName) > { > /* Copy the vendor name into our buffer */ > > Modified: trunk/reactos/tools/bin2c.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.c?rev=68139&r1… > > ============================================================================== > --- trunk/reactos/tools/bin2c.c [iso-8859-1] (original) > +++ trunk/reactos/tools/bin2c.c [iso-8859-1] Sun Jun 14 18:13:50 2015 > @@ -13,8 +13,8 @@ > FILE* inFile; > FILE* outCFile; > FILE* outHFile; > + size_t bufLen; > unsigned char ch; > - unsigned char cnt; > > /* Validate the arguments */ > if (argc < 5) > @@ -46,14 +46,6 @@ > return -1; > } > > - /* Generate the header file and close it */ > - fprintf(outHFile, "/* This file is autogenerated, do not edit. > */\n\n"); > - fprintf(outHFile, "#ifndef CHAR\n" > - "#define CHAR char\n" > - "#endif\n\n"); > - fprintf(outHFile, "extern CHAR %s[];\n", argv[4]); > - fclose(outHFile); > - > /* Generate the source file and close it */ > fprintf(outCFile, "/* This file is autogenerated, do not edit. > */\n\n"); > if (argc >= 7) > @@ -69,25 +61,29 @@ > /* Add the array attribute */ > fprintf(outCFile, "%s ", argv[5]); > } > - fprintf(outCFile, "CHAR %s[] =\n{", argv[4]); > + fprintf(outCFile, "unsigned char %s[] =\n{", argv[4]); > > - cnt = 0; > - ch = fgetc(inFile); > + bufLen = 0; > + ch = fgetc(inFile); > while (!feof(inFile)) > { > - if ((cnt % 16) == 0) > - { > + if ((bufLen % 16) == 0) > fprintf(outCFile, "\n "); > - cnt = 0; > - } > + > fprintf(outCFile, " 0x%02x,", (unsigned int)ch); > - ++cnt; > + ++bufLen; > ch = fgetc(inFile); > } > /* Put a final NULL terminator */ > - fprintf(outCFile, "\n 0x00"); > + fprintf(outCFile, "\n 0x00"); ++bufLen; > fprintf(outCFile, "\n};\n"); > fclose(outCFile); > + > + /* Generate the header file and close it */ > + fprintf(outHFile, "/* This file is autogenerated, do not edit. > */\n\n"); > + fprintf(outHFile, "#define %s_SIZE %Iu\n" , argv[4], bufLen); > + fprintf(outHFile, "extern unsigned char %s[%Iu];\n", argv[4], bufLen); > + fclose(outHFile); > > /* Close the input file */ > fclose(inFile); > > > -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

9 years, 10 months

2
1
0 0

The first ever ReactOS Hackfest

by Colin Finck

Join us for the very first ReactOS Hackfest from Friday, 7th August to Wednesday, 13th August 2015, in the German city of Aachen. Discover Germany's most-Western city in the direct neighborhood of Belgium and the Netherlands. Within the historical city center, Aachen offers a scientific environment and a high density of pubs. Let's catch this atmosphere to code the week away and achieve great results as a team! ===> It is now time to plan your trip! <=== Flights and Accommodation won't get cheaper. You find all details on this Wiki page: https://reactos.org/wiki/ReactOS_Hackfest_2015 Don't forget to add your ideas and travelling details to this page: https://reactos.org/wiki/ReactOS_Hackfest_2015/Lists If you have any further questions, just drop me a line by E-Mail or call me on the mobile phone number I sent to ros-priv. Looking forward to meet you! With best regards, Colin Finck

9 years, 10 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 68155: [THEMEUI] Revert r67304 (Leverage add_registry_inf() as suggested by Timo). Figuring out why that doesn't work is left as an exercise for the reader. See CORE-5984 for details.

by Timo Kreuzer

If you look at the autogenerated file, you'll find this: [AddReg.NTarm] ; RAM Disk class driver HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ImagePath",0x00020000,"system32\drivers\ramdisk.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Start",0x00010001,0x00000003 ; EOF ; MS Styles (Themes) HKCR,".msstyles","",0x00000000,"msstylesfile" HKCR,"msstylesfile","",0x00000000,"Visual Style File" HKCR,"msstylesfile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" HKCR,"msstylesfile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenMSTheme file:""%1""" ; Theme File HKCR,".theme","",0x00000000,"themefile" HKCR,"themefile","",0x00000000,"Theme File" HKCR,"themefile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" HKCR,"themefile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenTheme /file:""%1""" And now figure out, why it didn't work. Am 15.06.2015 um 22:42 schrieb akhaldi(a)svn.reactos.org: > Author: akhaldi > Date: Mon Jun 15 20:42:08 2015 > New Revision: 68155 > > URL: http://svn.reactos.org/svn/reactos?rev=68155&view=rev > Log: > [THEMEUI] Revert r67304 (Leverage add_registry_inf() as suggested by Timo). Figuring out why that doesn't work is left as an exercise for the reader. See CORE-5984 for details. > > Removed: > trunk/reactos/dll/win32/themeui/themeui_reg.inf > Modified: > trunk/reactos/boot/bootdata/hivecls.inf > trunk/reactos/dll/win32/themeui/CMakeLists.txt > > Modified: trunk/reactos/boot/bootdata/hivecls.inf > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… > ============================================================================== > --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) > +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Mon Jun 15 20:42:08 2015 > @@ -284,6 +284,18 @@ > HKCR,"sysfile","NoOpen",0x00000000,"" > HKCR,"sysfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-171" > HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" > + > +; MS Styles (Themes) > +HKCR,".msstyles","",0x00000000,"msstylesfile" > +HKCR,"msstylesfile","",0x00000000,"Visual Style File" > +HKCR,"msstylesfile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" > +HKCR,"msstylesfile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenMSTheme file:""%1""" > + > +; Theme File > +HKCR,".theme","",0x00000000,"themefile" > +HKCR,"themefile","",0x00000000,"Theme File" > +HKCR,"themefile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" > +HKCR,"themefile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenTheme /file:""%1""" > > ; URL shortcuts (e.g. used in favorites folder of IExplorer) > HKCR,".url","",0x00000000,"InternetShortcut" > > Modified: trunk/reactos/dll/win32/themeui/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/themeui/CMakeLis… > ============================================================================== > --- trunk/reactos/dll/win32/themeui/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/themeui/CMakeLists.txt [iso-8859-1] Mon Jun 15 20:42:08 2015 > @@ -1,5 +1,4 @@ > > add_library(themeui SHARED themeui.rc) > set_module_type(themeui win32dll ENTRYPOINT 0) > -add_registry_inf(themeui_reg.inf) > add_cd_file(TARGET themeui DESTINATION reactos/system32 FOR all) > > Removed: trunk/reactos/dll/win32/themeui/themeui_reg.inf > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/themeui/themeui_… > ============================================================================== > --- trunk/reactos/dll/win32/themeui/themeui_reg.inf [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/themeui/themeui_reg.inf (removed) > @@ -1,11 +0,0 @@ > -; MS Styles (Themes) > -HKCR,".msstyles","",0x00000000,"msstylesfile" > -HKCR,"msstylesfile","",0x00000000,"Visual Style File" > -HKCR,"msstylesfile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" > -HKCR,"msstylesfile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenMSTheme file:""%1""" > - > -; Theme File > -HKCR,".theme","",0x00000000,"themefile" > -HKCR,"themefile","",0x00000000,"Theme File" > -HKCR,"themefile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" > -HKCR,"themefile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenTheme /file:""%1""" > > >

9 years, 10 months

2
1
0 0

VMware Testbots fixed

by Colin Finck

Hi all, After some attempts yesterday and today, the VMware Testbots are finally fixed. Due to a misconfiguration, they were unfortunately testing the same revision 65663 all the time. I'm going to delete the duplicate testings for r65663 once I have some time. Unless somebody is interested in the most detailed information about randomly failing Wine tests ;) Cheers, Colin

9 years, 10 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [pschweitzer] 68137: [KERNEL32] Addendum to r68136: use appropriate define. Spotted by Thomas

by Timo Kreuzer

Am 14.06.2015 um 18:00 schrieb pschweitzer(a)svn.reactos.org: > Author: pschweitzer > Date: Sun Jun 14 16:00:27 2015 > New Revision: 68137 > > > - Proc = (1ULL << Processor) >> 0x20; > + Proc = (1ULL << Processor) >> MAXIMUM_PROCESSORS; This is effectively the same as "Proc = (Processor == MAXIMUM_PROCESSORS);" which is always 0. Timo

9 years, 10 months

1
1
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 68080: [LOCALSPL_APITEST] Write an API-Test for localspl.dll. As the original localspl.dll from Windows Server 2003 relies on proper initialization inside spoolsv.exe, we cannot test it st...

by Thomas Faber

This looks great, but I hope you're aware of the limitations of DllMain. If the test gets more complex, it might be better to do a separate CreateRemoteThread call on an exported function after the dll has been loaded. Although I guess as long as things work, this is fine ;) (maybe this is related to the SEH issue you mention in the next commit, not sure) On 2015-06-08 19:15, cfinck(a)svn.reactos.org wrote: > [LOCALSPL_APITEST] > Write an API-Test for localspl.dll. As the original localspl.dll from Windows Server 2003 relies on proper initialization inside spoolsv.exe, we cannot test it standalone as usual. > +// Running the tests from the injected DLL and redirecting their output to the pipe. > +BOOL WINAPI > +DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) > +{ > + char szTestName[150]; > + DWORD cbRead; > + FILE* fpStdout; > + HANDLE hCommandPipe; > + int iOldStdout; > + > + // We only want to run our test once when the DLL is injected to the process. > + if (fdwReason != DLL_PROCESS_ATTACH) > + return TRUE;

9 years, 10 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 68051: [LAUTUS] Make the text files UTF-8 without BOM, and convert them to UTF-16 LE at compile time. Remove the now unneeded application/octet-stream type property and set native EOL one...

by Thomas Faber

Quick note: Files that get embedded into binaries or put on the CD should not use native EOL, but CRLF. This applies e.g. to inf files, as well as text files that are resources (which I believe is what these inis are?). The idea is that in a perfect world the CD image build by a Unix builder is identical to the one built by a Windows builder. On 2015-06-06 20:27, akhaldi(a)svn.reactos.org wrote: > [LAUTUS] Make the text files UTF-8 without BOM, and convert them to UTF-16 LE at compile time. Remove the now unneeded application/octet-stream type property and set native EOL one. CORE-9770 > Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI > ------------------------------------------------------------------------------ > svn:eol-style = native >

9 years, 10 months

1
0
0 0

Name of builders/testers in buildbot

by Timo Kreuzer

Hi, The names for our builders / testers don't seem to be optimal to me. And since they seem to be sorted in the waterfall display alphabetically now, I suggest renaming them in the following way: Build_GCCLin_Debug Build_GCCLin_Release Build_GCCWin Build_MSVC_x64 Build_MSVC_x86 Test_KVM Test_VBox Test_VMW Test_VMW_Hybrid Test_WHS This way it is much more consistent, limited to actually useful information and would sort them nicely with builders left and testers right. Regards, Timo

9 years, 10 months

4
4
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 68069: [OLE32_APITEST] Add test for IInitializeSpy. By Mark Jansen. See ROSTESTS-175 for more details.

by Thomas Faber

For future reference: (1) It's a bad idea to move something to a different file and edit it at the same time (2) Those constructor parameters really should be optional. The interface was trivial before, and it's a good idea to keep it that way. (I'm really only saying this because it broke the additional tests I had in my working copy :D) On 2015-06-08 13:05, akhaldi(a)svn.reactos.org wrote: > Added: trunk/rostests/apitests/include/unknownbase.h > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/include/unknownb… > ============================================================================== > --- trunk/rostests/apitests/include/unknownbase.h (added) > +++ trunk/rostests/apitests/include/unknownbase.h [iso-8859-1] Mon Jun 8 11:05:35 2015 > @@ -0,0 +1,47 @@ > +#ifndef APITESTS_UNKNOWNBASE_H > +#define APITESTS_UNKNOWNBASE_H > + > +template<typename Interface> > +class CUnknownBase : public Interface > +{ > + LONG m_lRef; > + bool m_AutoDelete; > +protected: > + virtual const QITAB* GetQITab() = 0; > +public: > + > + CUnknownBase(bool autoDelete, LONG initialRef) > + : m_lRef(initialRef), > + m_AutoDelete(autoDelete) > + { > + } > + > + ULONG STDMETHODCALLTYPE AddRef () > + { > + return InterlockedIncrement( &m_lRef ); > + } > + > + ULONG STDMETHODCALLTYPE Release() > + { > + long newref = InterlockedDecrement( &m_lRef ); > + if (m_AutoDelete && newref<=0) > + { > + delete this; > + } > + return newref; > + } > + > + HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppv) > + { > + return QISearch(this, GetQITab(), riid, ppv); > + } > + > + virtual ~CUnknownBase() {} > + > + LONG GetRef() const > + { > + return m_lRef; > + } > +}; > + > +#endif // APITESTS_UNKNOWNBASE_H

9 years, 10 months

1
0
0 0

Changes in authentication for Jira

by Pierre Schweitzer

Dear all, We have proceed to a complete reimplementation of authentication server which serves Jira & Fisheye. The purpose is to rely on something maintained and stable. It should not change anything for you on daily usage. 58 accounts have been left out and will not be able to connect to Jira due to incompatible account name (using invalid chars). If you happen to be incapable of log in, please contact me so that I can rename your account. New accounts cannot be created with such invalid chars any longer. As a side note, this was a major blocker for our upgrade to Jira 6. If we do not spot anything wrong with our new authentication mechanism, then, then the upgrade to Jira 6 should happen in the next days. With my best regards, -- Pierre Schweitzer <pierre(a)reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

9 years, 10 months

4
7
0 0

PATCH: Get configure and host-tools building on arm again

by Steven Edwards

-- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

9 years, 10 months

1
0
0 0

Writing an API-Test for localspl.dll

by Colin Finck

Hi all, In order to verify the exact behaviour of localspl.dll on Windows Server 2003, I'm trying to write an API-Test for it. This is no problem for winspool.drv or even the Print Processor functions of localspl.dll, but its Print Provider functions pose some serious problems: * You get a table of function pointers by calling InitializePrintProvidor. * Instead of just handing over the pointers, this function first calls many undocumented ones from spoolss.dll, including CacheAddName, CacheCreateAndAddNode, GetServerPolicy, SplInitializeWinSpoolDrv, SplIsUpgrade. * Out of these undocumented functions, GetServerPolicy is the most problematic one, because it itself relies on a function pointer given by spoolsv.exe to spoolss.dll in an initialization function. My API-Test is not spoolsv.exe, so I don't initialize spoolss.dll the same way. Thus, GetServerPolicy will fail and InitializePrintProvidor as well. * For now, I worked around this problem by stubbing these functions in my spoolss.dll. I.e., GetServerPolicy just returns TRUE there and I get further. * On top of this, InitializePrintProvidor also makes use of RevertToPrinterSelf and ImpersonatePrinterClient. To let these functions succeed, the current thread actually needs to impersonate a user. For now, I worked around this problem by doing: OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE, &hToken); DuplicateToken(hToken, SecurityImpersonation, &hDup); ImpersonateLoggedOnUser(hDup); before calling InitializePrintProvidor. * Finally, this lets InitializePrintProvidor succeed and it gave me the table of function pointers. Unfortunately, even simple query functions like fpEnumPrinters do a RevertToPrinterSelf and then expect to be in the SYSTEM context of spoolsv.exe. When my API-Test was just run in a usual Administrator user context under Windows Server 2003, fpEnumPrinters didn't succeed. For now, I worked around this problem by running my test program as a service in the SYSTEM context. With all these problems presented, can you think of any way how I can now write a reliable API-Test for localspl.dll that could be run regularly under Windows Server 2003 and ReactOS? One idea would be to load the system spoolss.dll and then rewire the GetServerPolicy import to a function that just returns TRUE all the time. Still then, I have the problem that my API-Test would need to be run in the SYSTEM security context. Creative ideas are welcome! :) Cheers, Colin

9 years, 10 months

2
1
0 0

Gallium Nine?

by Mohamed MEDIOUNI

Can Gallium Nine be used instead of WineD3D?

9 years, 10 months

1
0
0 0

Vote for removing rapps DB from trunk

by daniel.reimer＠reactos.org

Hey guys, as some of you might have seen already we now have two copies of the more and more increasing RAPPS DB in trunk. This is: a) Absolutely unnecessary and does only result in one thing, two differing DBs b) Shows even more that it’s not useful to have it in trunk at all. Because of this I start a vote now to get your opinion in completely removing the RAPPS DB from trunk into a subtree like done for many other things, too. What do you think? Greetings Daniel Reimer Gesendet von Windows Mail

9 years, 10 months

4
3
0 0

Re: [ros-dev] [ros-diffs] [dquintana] 67976: [DEVMGMT_NEW] At the request of Christoph von Wittich, bring devmgmt_new into the build. * Created CMakeLists.txt and added to parent folder. * Removed some references to CAtlStr...

by Ged Murphy

Eeek, I was working on this via VS and have quite a few changes in my WC, including CAtlString support for our ATL lib... -----Original Message----- From: Ros-diffs [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dquintana(a)svn.reactos.org Sent: 30 May 2015 20:54 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dquintana] 67976: [DEVMGMT_NEW] At the request of Christoph von Wittich, bring devmgmt_new into the build. * Created CMakeLists.txt and added to parent folder. * Removed some references to CAtlStr... Author: dquintana Date: Sat May 30 19:53:44 2015 New Revision: 67976 URL: http://svn.reactos.org/svn/reactos?rev=67976&view=rev Log: [DEVMGMT_NEW] At the request of Christoph von Wittich, bring devmgmt_new into the build. * Created CMakeLists.txt and added to parent folder. * Removed some references to CAtlString that were not needed and are not implemented in our headers. * Fixed build with gcc. * Spread all the changes done to the english resources to the other languages. Many languages now contain untranslated strings that will need to be fixed. Note that I made no effort to fix any bugs or improve any features. The app comes as-is, except it now builds with rosbe. Added: trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt (with props) trunk/reactos/base/applications/mscutils/devmgmt_new/precomp.h - copied, changed from r67940, trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h trunk/reactos/base/applications/mscutils/devmgmt_new/resource.h - copied unchanged from r67940, trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.exe.manifest trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.h trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.sln trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj.filters trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h trunk/reactos/base/applications/mscutils/devmgmt_new/targetver.h Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h trunk/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.exe.manifest URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.sln URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Copied: trunk/reactos/base/applications/mscutils/devmgmt_new/precomp.h (from r67940, trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/targetver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…

9 years, 10 months

3
3
0 0

Re: [ros-dev] [ros-diffs] [cwittich] 67981: [DEVMGMT_NEW] enable/disable context menu items on selection change

by Ged Murphy

I also have all the code for this, but for choosing which icons to show in the toolbar. The context menu would have been able to use this code.... -----Original Message----- From: Ros-diffs [mailto:ros-diffs-bounces@reactos.org] On Behalf Of cwittich(a)svn.reactos.org Sent: 31 May 2015 10:15 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [cwittich] 67981: [DEVMGMT_NEW] enable/disable context menu items on selection change Author: cwittich Date: Sun May 31 09:14:29 2015 New Revision: 67981 URL: http://svn.reactos.org/svn/reactos?rev=67981&view=rev Log: [DEVMGMT_NEW] enable/disable context menu items on selection change Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp [iso-8859-1] Sun May 31 09:14:29 2015 @@ -110,6 +110,30 @@ (VOID)m_Devices->Uninitialize(); return TRUE; +} + +BOOL CDeviceView::HasChildItem( + _In_ HTREEITEM Item) +{ + return (TreeView_GetChild(m_hTreeView, Item) != NULL); } + +BOOL CDeviceView::IsRootItem( + _In_ HTREEITEM Item) +{ + return (TreeView_GetRoot(m_hTreeView) == Item); } + +BOOL CDeviceView::IsRootItemSelected() +{ + return (TreeView_GetRoot(m_hTreeView) == +TreeView_GetSelection(m_hTreeView)); +} + +VOID CDeviceView::EnableContextMenuItem( + _In_ UINT Id, + _In_ UINT Enabled) +{ + EnableMenuItem(m_hShortcutMenu, Id, Enabled); } VOID Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h [iso-8859-1] Sun May 31 09:14:29 2015 @@ -34,6 +34,11 @@ BOOL Initialize(); BOOL Uninitialize(); + VOID EnableContextMenuItem( + _In_ UINT Id, + _In_ UINT Enabled + ); + VOID ShowContextMenu( _In_ INT xPos, _In_ INT yPos @@ -49,12 +54,27 @@ VOID Refresh(); VOID DisplayPropertySheet(); VOID SetFocus(); - + + BOOL IsRootItemSelected(); + + BOOL IsRootItem( + _In_ HTREEITEM Item + ); + + BOOL HasChildItem( + _In_ HTREEITEM Item + ); + VOID SetDeviceListType(ListDevices List) { m_ListDevices = List; } + ListDevices GetDeviceListType() + { + return m_ListDevices; + } + VOID ShowHiddenDevices(_In_ BOOL ShowHidden) { m_ShowHidden = ShowHidden; Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp [iso-8859-1] Sun May 31 09:14:29 2015 @@ -429,7 +429,61 @@ break; } - + + case TVN_SELCHANGED: + { + LPNM_TREEVIEW pnmtv = (LPNM_TREEVIEW)lParam; + ListDevices ListType = m_DeviceView->GetDeviceListType(); + + if (ListType == DevicesByType) + { + if (!m_DeviceView->HasChildItem(pnmtv->itemNew.hItem)) + { + SendMessage(m_hToolBar, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + + EnableMenuItem(GetMenu(m_hMainWnd), IDC_PROP, MF_ENABLED); + m_DeviceView->EnableContextMenuItem(IDC_PROP, MF_ENABLED); + } + else + { + SendMessage(m_hToolBar, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, + 0)); + + EnableMenuItem(GetMenu(m_hMainWnd), IDC_PROP, MF_GRAYED); + m_DeviceView->EnableContextMenuItem(IDC_PROP, MF_GRAYED); + } + } + else if (ListType == DevicesByConnection) + { + if (m_DeviceView->IsRootItem(pnmtv->itemNew.hItem)) + { + SendMessage(m_hToolBar, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, + 0)); + + EnableMenuItem(GetMenu(m_hMainWnd), IDC_PROP, MF_GRAYED); + m_DeviceView->EnableContextMenuItem(IDC_PROP, MF_GRAYED); + } + else + { + SendMessage(m_hToolBar, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + + EnableMenuItem(GetMenu(m_hMainWnd), IDC_PROP, MF_ENABLED); + m_DeviceView->EnableContextMenuItem(IDC_PROP, MF_ENABLED); + } + } + } + break; + case NM_DBLCLK: { m_DeviceView->DisplayPropertySheet(); @@ -438,7 +492,18 @@ case NM_RETURN: { - m_DeviceView->DisplayPropertySheet(); + ListDevices ListType = m_DeviceView->GetDeviceListType(); + if (ListType == DevicesByType) + { + m_DeviceView->DisplayPropertySheet(); + } + else if (ListType == DevicesByConnection) + { + if (!m_DeviceView->IsRootItemSelected()) + { + m_DeviceView->DisplayPropertySheet(); + } + } break; } }

9 years, 10 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 67974: [USER32] Sync edit.c with Wine Staging 1.7.37. CORE-9246

by Michael Fritscher

Interesting that the wine code doesn't check for NULL at HeapAlloc at all - could these be submitted to wine? Additionally, at least one HeapAlloc isn't checked also in our build: piDx = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * (*count)); Perhaps a #ifdef __REACTOS__ if (piDx == NULL) { return FALSE; //Not sure about this, just looked at the diff ;) } #endif would be usefull there. Best regards, Michael Fritscher > Author: akhaldi > Date: Sat May 30 17:14:16 2015 > New Revision: 67974 > > URL: http://svn.reactos.org/svn/reactos?rev=67974&view=rev > Log: > [USER32] Sync edit.c with Wine Staging 1.7.37. CORE-9246 > > Modified: > trunk/reactos/media/doc/README.WINE > trunk/reactos/win32ss/user/user32/controls/edit.c >

9 years, 10 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [jimtabor] 67937: [NtUser] - De-reference global cursor. See CORE-8305.

by Thomas Faber

That's a bit** of a hack. Either the code holds a reference and needs to release it or not. cLockObj is a private field and code outside of UserReference* should not be allowed to access it. Thanks! -Thomas ** actually it's a pretty big hack On May 28, 2015 12:13:03 AM CEST, jimtabor(a)svn.reactos.org wrote: >Author: jimtabor >Date: Wed May 27 22:13:03 2015 >New Revision: 67937 > >URL: http://svn.reactos.org/svn/reactos?rev=67937&view=rev >Log: >[NtUser] >- De-reference global cursor. See CORE-8305. > >Modified: > trunk/reactos/win32ss/user/ntuser/cursoricon.c > >Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c >URL: >http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… >============================================================================== >--- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] >(original) >+++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Wed May >27 22:13:03 2015 >@@ -1077,6 +1077,12 @@ > if (pcurOld->CURSORF_flags & CURSORF_GLOBAL) > { > TRACE("Returning Global Cursor hcur %p\n",hOldCursor); >+ >+ if (pcurOld->head.cLockObj > 2) // Throttle down to 2. >+ { >+ UserDereferenceObject(pcurOld); >+ } >+ > goto leave; > } > -- Sent from my Android phone with K-9 Mail. Please excuse my brevity.

9 years, 11 months

2
1
0 0

Status Meeting (May 2015)

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place 28th of May, 19:00 UTC, as always. IRC service will only be started shortly before the meeting. Your participation passwords and server address will be emailed to you shortly before the meeting starts, and they are going to be different once again as they are not stored in any database. Hopefully it's not much of inconvenience. Please send agenda proposals to me before the meeting, so that we can start with a proposed agenda. Regards, Aleksey Bragin

9 years, 11 months

5
7
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 67940: [TCPIP] Identify TCP/IP driver as version 4. By Lee Schroeder. CORE-9744

by Thomas Faber

> --- trunk/reactos/drivers/network/tcpip/tcpip.rc [iso-8859-1] (original) > +++ trunk/reactos/drivers/network/tcpip/tcpip.rc [iso-8859-1] Thu May 28 10:31:38 2015 > @@ -1,5 +1,5 @@ > #define REACTOS_VERSION_DLL > -#define REACTOS_STR_FILE_DESCRIPTION "TCP/IP protocol driver" > +#define REACTOS_STR_FILE_DESCRIPTION "TCP/IPv4 protocol driver" > #define REACTOS_STR_INTERNAL_NAME "tcpip" > #define REACTOS_STR_ORIGINAL_FILENAME "tcpip.sys" > #include <reactos/version.rc> This part makes no sense. tcpip.sys does both v4 and v6

9 years, 11 months

1
0
0 0

ReactOS Updates flowing to our Social Channels.

by victor martinez

Hi guys! After a week dealing with several scripts and options, we're finally integrating the most important info from Reactos.org and Community.reactos.org directly to our Social channels to keep a constant flow of updates to our followers. Since now our ReactOS Facebook and ReactOS Twitter will be automatically updated when... ... A Jira bugreport is resolved with a 'Fixed' and 'Cannot reproduce' status. ... A blog post is published in "ReactOS.org" ... A blog post is published in "Community.ReactOS.org" Some of the features: - Updates are queued and published with a time gap between them, so in case, eg, a Tester/Dev runs a Spring Cleanup, we won't be publishing 10 Jira reports in the same minute. - Facebook and Twitter updates include pictures in case the blog post or the Jira report has one. So please add a picture in case you're blogging even if it is just a screenshot of you running "whatever" in ReactOS. - Includes #hashtags related to the current Jira/Blog report. - Uses bit.ly shortener when needed. - And several hidden Easter Eggs in Twitter...(I was bored in the train) If you've any suggestions about other potential updates to be sent to our Social Channels, just tell me and I'd try to integrate them in an automated way. I'm planning a way to ease and have community contributions filtered and joining the automated flow, but it'll have to wait until I master Drupal. Also I'm working in some "crossposting" among our Social Channels, so a direct post in Facebook not coming from our PR Update System is replicated in Twitter and the other way around. We can be really proud of the current PR Update system implemented, since probably it even beats several bigger opensource projects and/or companies out there. If you didn't join our Twitter or Facebook yet, please feel free to join: - Facebook: https://www.facebook.com/pages/ReactOS/19143619259 - Twitter: http://www.twitter.com/reactos Brought to you by the ReactOS PR Team.

9 years, 11 months

3
7
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 67718: [CRT] Add simple C implementations for acosf, ceilf, floorf, fmodf and fix sqrtf

by Thomas Faber

On 2015-05-14 15:44, tkreuzer(a)svn.reactos.org wrote: > +_Check_return_ > +float > +__cdecl > +ceilf( > +_In_ float x) > +{ > + return (float)ceilf((double)x); > +} > +_Check_return_ > +float > +__cdecl > +floorf( > +_In_ float x) > +{ > + return (float)floorf((double)x); > +} Did you mean to call ceil/floor here?

9 years, 11 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 67709: [D3DX9_36/WINED3D] - Remove useless copysignf invocation and the wrong defines for it - BrokenHacksOnTopOfBrokenCode--; - Should be sent upstream

by Thomas Faber

On 2015-05-14 06:00, tkreuzer(a)svn.reactos.org wrote: > - int sign = (copysignf(1, in) < 0); > + int sign = (in < 0); > - if (copysignf(1.0f, value) < 0.0f) > + if (value < 0.0f) > ++idx; I believe the behavior would be different here for negative zero: copysignf(1.0f, -0.0f) should be < 0.0f -0.0f should be == 0.0f Maybe that's the reason for having these calls?

9 years, 11 months

3
3
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 67689: [CMAKE] The /SUBSYSTEM flag takes uppercase parameters.

by Timo Kreuzer

Can you please also add an approproate value for ARM (I guess win8)? :) Am 12.05.2015 um 14:18 schrieb akhaldi(a)svn.reactos.org: > Author: akhaldi > Date: Tue May 12 12:18:02 2015 > New Revision: 67689 > > URL: http://svn.reactos.org/svn/reactos?rev=67689&view=rev > Log: > [CMAKE] The /SUBSYSTEM flag takes uppercase parameters. > > Modified: > trunk/reactos/cmake/msvc.cmake > > Modified: trunk/reactos/cmake/msvc.cmake > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=67689… > ============================================================================== > --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) > +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue May 12 12:18:02 2015 > @@ -210,10 +210,11 @@ > endfunction() > > function(set_subsystem MODULE SUBSYSTEM) > + string(TOUPPER ${SUBSYSTEM} _subsystem) > if(ARCH STREQUAL "amd64") > - add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.02") > - else() > - add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.01") > + add_target_link_flags(${MODULE} "/SUBSYSTEM:${_subsystem},5.02") > + else() > + add_target_link_flags(${MODULE} "/SUBSYSTEM:${_subsystem},5.01") > endif() > endfunction() > > > >

9 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 67683: [SHELL32] Don't provide the format option when the volume is read only. By Barrett Karish. CORE-9530

by Thomas Faber

On 2015-05-12 06:57, akhaldi(a)svn.reactos.org wrote: > +/* FIXME: ntifs.h */ > +#define FILE_READ_ONLY_VOLUME 0x00080000 This should go in ndk/iotypes.h inside an NTOS_MODE_USER ifdef.

9 years, 11 months

1
0
0 0

Fezile motherboard has finally failed

by Colin Finck

Hi all, Today, the motherboard in our Fezile server has finally failed after many hick-ups over the year. This causes an outage for the following services: * doxygen.reactos.org * cppcheck.reactos.org * VMware Player Test slave * VMware Player Patchbot As this is not the first time we struggle with such problems, iso.reactos.org is routed to a different server right now and not affected. We have already ordered replacement hardware for this system and hope to be able to get it back to a working state soon. Even if this machine is from 2007, we have decided to revive it with replacement parts instead of going for a brand-new one as this is much cheaper and quicker to realize. Also there is a huge pile of replacement hardware available. Sorry for the inconveniences! Cheers, Colin

9 years, 11 months

3
5
0 0

Re: [ros-dev] [ros-builds] Trunk_x86_GCCLin Release: build failed

by Pierre Schweitzer

Manually uploaded. On 10/05/2015 19:28, buildbot(a)reactos.org wrote: > The Buildbot has detected a failed build on builder Trunk_x86_GCCLin Release while building ReactOS. > Full details are available at: > https://build.reactos.org/builders/Trunk_x86_GCCLin%20Release/builds/1177 > > Buildbot URL: https://build.reactos.org/ > > Buildslave for this Build: Debug > > Build Reason: The Periodic scheduler named 'Release' triggered this build > Build Source Stamp: HEAD > Blamelist: > > BUILD FAILED: failed shell > > sincerely, > -The Buildbot > > > > > -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

9 years, 11 months

1
0
0 0

[ros-diffs] [hbelusca] 67595: [NTVDM] - Move some interrupt initialization where it belongs and activate few other ones. - Initialize interruct vector for INT 2Ah (Network check) because some apps directly cal...

by James Tabor

Hi, Yes Int 2A is needed for the novel client server to work correctly. I added it to FreeDOS, here are some examples, http://sourceforge.net/p/freedos/svn/HEAD/tree/kernel/trunk/kernel/entry.as… http://sourceforge.net/p/freedos/svn/HEAD/tree/kernel/trunk/kernel/kernel.a… LOL yeah just bragging now, http://sourceforge.net/p/freedos/svn/HEAD/tree/kernel/trunk/kernel/dosidle.…

9 years, 11 months

1
0
0 0

Debug output

by stack exchange

Whats the difference between DPRINT and DbgPrint? I wrote a little program that I can use to observe pipes, which I use for debugging. The text from DPRINT is there, but where does DbgPrint go and why are there multiple different debugging aids?

9 years, 11 months

3
2
0 0

Re: [ros-dev] [ros-diffs] [gedmurphy] 67563: [DDK] Fix the FS filter callback definitions

by Ged Murphy

Well this is a weird one, the DDK says these callbacks are cdecl (missing NTAPI) and anyone building against the DDK will obviously declare their callbacks to match this convention. However internally, windows uses stdcall for these callbacks. I can't find much by way of problems people have encountered with this, so why aren't people seeing problems with the way the stack is cleaned up? Anyone have any ideas before I blindly revert this change? Ged. -----Original Message----- From: Ros-diffs [mailto:ros-diffs-bounces@reactos.org] On Behalf Of gedmurphy(a)svn.reactos.org Sent: 05 May 2015 19:54 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [gedmurphy] 67563: [DDK] Fix the FS filter callback definitions Author: gedmurphy Date: Tue May 5 18:54:28 2015 New Revision: 67563 URL: http://svn.reactos.org/svn/reactos?rev=67563&view=rev Log: [DDK] Fix the FS filter callback definitions Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=67… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Tue May 5 18:54:28 2015 @@ -4890,12 +4890,12 @@ } FS_FILTER_CALLBACK_DATA, *PFS_FILTER_CALLBACK_DATA; typedef NTSTATUS -(NTAPI *PFS_FILTER_CALLBACK) ( +(*PFS_FILTER_CALLBACK) ( _In_ PFS_FILTER_CALLBACK_DATA Data, _Out_ PVOID *CompletionContext); typedef VOID -(NTAPI *PFS_FILTER_COMPLETION_CALLBACK) ( +(*PFS_FILTER_COMPLETION_CALLBACK) ( _In_ PFS_FILTER_CALLBACK_DATA Data, _In_ NTSTATUS OperationStatus, _In_ PVOID CompletionContext);

9 years, 11 months

3
8
0 0

Setup on an extended partition

by stack exchange

Hi I'm new to ReactOS development and started to look into some issues I noticed with the setup. When I tried to install it I experimented a bit and noticed that you can create extended partitions during the setup. The setup also accepts such a partition for installation, but the actual installations fails with an error. Now I wondered, what would be the correct way to fix it. I checked with Windows 7 installation, and it apparently doesn't allow you to install on an extended partition either, at least it only allows you to create primary partitions. So if this shouldn't be possible, then I would add an error message to the setup, when the user chooses an extended partition. If this should be possible though, I would look into it, why it fails and try to fix it. Not sure if XP or others allow installations on extended partitions, I have to check this (been a long time since I last installed an XP :) ). regards, Gerhard Gruber

9 years, 11 months

7
16
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 67508: [PARPORT] Introduce a skeleton that will serve as base for implementing the parallel port function driver. Brought to you by The ReactOS Printing Group. CORE-9644

by Pierre Schweitzer

On 02/05/2015 12:15, akhaldi(a)svn.reactos.org wrote: > Author: akhaldi > Date: Sat May 2 10:15:37 2015 > New Revision: 67508 > > URL: http://svn.reactos.org/svn/reactos?rev=67508&view=rev > Log: > [PARPORT] Introduce a skeleton that will serve as base for implementing the parallel port function driver. Brought to you by The ReactOS Printing Group. CORE-9644 Is there a need for that much secrecy? I shall remind that we ask people to contribute with their real names. Such secret looks useless and damaging for the project. And no, ARM group isn't a good example, nor a reason to keep doing so. -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

9 years, 11 months

3
3
0 0

ReactOS Hackfest 2015

by Colin Finck

Hi all, As already announced at the meeting today, I'm planning the very first "ReactOS Hackfest" this year. Let's all finally meet up independently of an exhibition and do some great work on ReactOS for a week! The first idea was to have it at a location in Sweden, but this one turned out to be not ready yet. Anyway, I found a possibility to have it in the university city of Aachen, Germany. Before we can plan any further regarding travelling and accomodation, I need to know who's coming and when. So please fill out this Doodle: http://doodle.com/tdaaie3rbbs5phpb Cheers, Colin

9 years, 11 months

1
0
0 0

Status Meeting (April 2015)

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place 30th of April, 19:00 UTC, as always. IRC service will only be started shortly before the meeting. Your participation passwords and server address will be emailed to you shortly before the meeting starts, and they are going to be different once again as they are not stored in any database. Hopefully it's not much of inconvenience. If someone still is not getting passwords sent before a meeting - please email Pierre before the meeting started to get one. Please send agenda proposals to me before the meeting, so that we can start with a proposed agenda. And join Mumble! Regards, Aleksey Bragin

9 years, 11 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [cwittich] 67368: [CRT] add ARM stub for chkstk_ms (Timo please review)

by Timo Kreuzer

If it compiles, it's good :) But isn't this some GCC thing? Do you use RosBE ARM? I doubt it even works at all. Am 23.04.2015 um 14:27 schrieb cwittich(a)svn.reactos.org: > Author: cwittich > Date: Thu Apr 23 12:27:08 2015 > New Revision: 67368 > > URL: http://svn.reactos.org/svn/reactos?rev=67368&view=rev > Log: > [CRT] > add ARM stub for chkstk_ms (Timo please review) > > Added: > trunk/reactos/lib/sdk/crt/except/arm/chkstk_ms.s (with props) > > Added: trunk/reactos/lib/sdk/crt/except/arm/chkstk_ms.s > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/chk… > ============================================================================== > --- trunk/reactos/lib/sdk/crt/except/arm/chkstk_ms.s (added) > +++ trunk/reactos/lib/sdk/crt/except/arm/chkstk_ms.s [iso-8859-1] Thu Apr 23 12:27:08 2015 > @@ -0,0 +1,30 @@ > +/* > + * COPYRIGHT: See COPYING in the top level directory > + * PROJECT: ReactOS system libraries > + * PURPOSE: Implementation of _chkstk and _alloca_probe > + * FILE: lib/sdk/crt/except/arm/chkstk_ms.s > + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) > + * Yuntian Zhang (yuntian.zh(a)gmail.com) > + */ > + > +/* INCLUDES ******************************************************************/ > + > +#include <kxarm.h> > + > +/* CODE **********************************************************************/ > + TEXTAREA > + > +MsgUnimplemented ASCII "Unimplemented", CR, LF, NUL > + > + LEAF_ENTRY ___chkstk_ms > + UNIMPLEMENTED chkstk_ms > + bx lr > + LEAF_END __chkstk_ms > + > + LEAF_ENTRY __alloca_probe > + UNIMPLEMENTED alloca_probe > + bx lr > + LEAF_END __alloca_probe > + > + END > +/* EOF */ > > Propchange: trunk/reactos/lib/sdk/crt/except/arm/chkstk_ms.s > ------------------------------------------------------------------------------ > svn:eol-style = native > > >

9 years, 12 months

1
0
0 0

ARM intrinsics patch

by Mohamed MEDIOUNI

Some intrinsics are redefined differently in two places.

10 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [aandrejevic] 67340: [NTVDM] Implement basic XMS functions.

by Pierre Schweitzer

On 22/04/2015 05:10, aandrejevic(a)svn.reactos.org wrote: > +static inline PXMS_HANDLE GetHandleRecord(WORD Handle) > +{ > + PXMS_HANDLE Entry = &HandleTable[Handle - 1]; > + if (Handle == 0 || Handle >= XMS_MAX_HANDLES) return NULL; > + > + return Entry->Size ? Entry : NULL; > +} This looks highly dangerous to me and likely compiler dependent. I'd rather perform the sanity checks before ever touching HandleTable, especially because the value of Handle is coming right from caller registers and have never been sanitized before. -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

10 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [dreimer] 67297: [ROSAPPS] There are still RBUILD files in here?? NOT anymore!

by Aleksey Bragin

Are all of them already converted to CMake? Regards, Aleksey Bragin On 19.04.2015 15:21, dreimer(a)svn.reactos.org wrote: > Author: dreimer > Date: Sun Apr 19 12:21:56 2015 > New Revision: 67297 > > URL: http://svn.reactos.org/svn/reactos?rev=67297&view=rev > Log: > [ROSAPPS] > There are still RBUILD files in here?? NOT anymore! > > Removed: > trunk/rosapps/applications/devutils/gdb2/gdb2.rbuild > trunk/rosapps/applications/devutils/gdihv/gdihv.rbuild > trunk/rosapps/applications/devutils/genguid/genguid.rbuild > trunk/rosapps/applications/devutils/symdump/symdump.rbuild > trunk/rosapps/applications/devutils/syscalldump/syscalldump.rbuild > trunk/rosapps/applications/fraginator/fraginator.rbuild > trunk/rosapps/applications/net/directory.rbuild > trunk/rosapps/applications/net/ncftp/ncftp.rbuild > trunk/rosapps/applications/net/netreg/netreg.rbuild > trunk/rosapps/applications/net/niclist/niclist.rbuild > trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild > trunk/rosapps/applications/net/tditest/tditest.rbuild > trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild > trunk/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild > trunk/rosapps/applications/sysutils/chklib/chklib.rbuild > trunk/rosapps/applications/sysutils/gettype/gettype.rbuild > trunk/rosapps/applications/sysutils/logevent/logevent.rbuild > trunk/rosapps/applications/sysutils/lsdd/lsdd.rbuild > trunk/rosapps/applications/sysutils/man/man.rbuild > trunk/rosapps/applications/sysutils/pedump/pedump.rbuild > trunk/rosapps/applications/sysutils/regexpl/regexpl.rbuild > trunk/rosapps/applications/sysutils/rosddt/rosddt.rbuild > trunk/rosapps/applications/sysutils/screenshot/screenshot.rbuild > trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild > trunk/rosapps/applications/sysutils/tcat/tcat.rbuild > trunk/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild > trunk/rosapps/applications/sysutils/utils/driver/driver.rbuild > trunk/rosapps/applications/sysutils/utils/driver/load/load.rbuild > trunk/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild > trunk/rosapps/applications/sysutils/utils/infinst/infinst.rbuild > trunk/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild > trunk/rosapps/applications/sysutils/utils/objdir/objdir.rbuild > trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild > trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild > trunk/rosapps/applications/sysutils/utils/stats/stats.rbuild > trunk/rosapps/applications/sysutils/utils/theme/dump/manifest.rbuild > trunk/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild > trunk/rosapps/applications/winfile/winfile.rbuild > trunk/rosapps/lib/directory.rbuild > trunk/rosapps/lib/win32err/win32err.rbuild > trunk/rosapps/templates/dialog/dialog.rbuild > trunk/rosapps/templates/mdi/mdi.rbuild > trunk/rosapps/templates/old_wordpad/old_wordpad.rbuild > > Removed: trunk/rosapps/applications/devutils/gdb2/gdb2.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/gdb2… > ============================================================================== > --- trunk/rosapps/applications/devutils/gdb2/gdb2.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/devutils/gdb2/gdb2.rbuild (removed) > @@ -1,5 +0,0 @@ > -<module name="gdb2" type="win32cui" installbase="system32" installname="gdb2.exe" stdlib="host"> > - <include base="gdb2">.</include> > - <library>user32</library> > - <file>gdb2.cpp</file> > -</module> > > Removed: trunk/rosapps/applications/devutils/gdihv/gdihv.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/gdih… > ============================================================================== > --- trunk/rosapps/applications/devutils/gdihv/gdihv.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/devutils/gdihv/gdihv.rbuild (removed) > @@ -1,11 +0,0 @@ > -<module name="gdihv" type="win32gui" installbase="system32" installname="gdihv.exe"> > - <include base="gdihv">.</include> > - <library>user32</library> > - <library>comctl32</library> > - <library>psapi</library> > - <file>gdihv.c</file> > - <file>gdihv.rc</file> > - <file>mainwnd.c</file> > - <file>handlelist.c</file> > - <file>proclist.c</file> > -</module> > > Removed: trunk/rosapps/applications/devutils/genguid/genguid.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/geng… > ============================================================================== > --- trunk/rosapps/applications/devutils/genguid/genguid.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/devutils/genguid/genguid.rbuild (removed) > @@ -1,4 +0,0 @@ > -<module name="genguid" type="win32cui" installbase="system32" installname="genguid.exe"> > - <library>ole32</library> > - <library>uuid</library> > - <file>genguid.c</file> > > Removed: trunk/rosapps/applications/devutils/symdump/symdump.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/symd… > ============================================================================== > --- trunk/rosapps/applications/devutils/symdump/symdump.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/devutils/symdump/symdump.rbuild (removed) > @@ -1,6 +0,0 @@ > -<module name="symdump" type="win32cui" installbase="system32" installname="symdump.exe"> > - <include base="gdihv">.</include> > - <library>dbghelp</library> > - <library>shlwapi</library> > - <file>symdump.c</file> > -</module> > > Removed: trunk/rosapps/applications/devutils/syscalldump/syscalldump.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/sysc… > ============================================================================== > --- trunk/rosapps/applications/devutils/syscalldump/syscalldump.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/devutils/syscalldump/syscalldump.rbuild (removed) > @@ -1,5 +0,0 @@ > -<module name="syscalldump" type="win32cui" installname="syscalldump.exe"> > - <include base="syscalldump">.</include> > - <library>dbghelp</library> > - <file>syscalldump.c</file> > -</module> > > Removed: trunk/rosapps/applications/fraginator/fraginator.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/fr… > ============================================================================== > --- trunk/rosapps/applications/fraginator/fraginator.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/fraginator/fraginator.rbuild (removed) > @@ -1,26 +0,0 @@ > -<?xml version="1.0"?> > -<!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> > -<group> > - <module name="frag" type="win32gui" installbase="system32" installname="frag.exe" unicode="yes"> > - <include base="frag">.</include> > - <library>advapi32</library> > - <library>ntdll</library> > - <library>comctl32</library> > - <library>msvcrt</library> > - <file>Fraginator.cpp</file> > - <file>MainDialog.cpp</file> > - <file>Defragment.cpp</file> > - <file>DriveVolume.cpp</file> > - <file>ReportDialog.cpp</file> > - <file>Unfrag.cpp</file> > - </module> > - > - <module name="unfrag" type="win32cui" installbase="system32" installname="unfrag.exe" unicode="yes"> > - <include base="unfrag">.</include> > - <library>advapi32</library> > - <library>ntdll</library> > - <file>Unfrag.cpp</file> > - <file>Defragment.cpp</file> > - <file>DriveVolume.cpp</file> > - </module> > -</group> > > Removed: trunk/rosapps/applications/net/directory.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/directory… > ============================================================================== > --- trunk/rosapps/applications/net/directory.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/net/directory.rbuild (removed) > @@ -1,23 +0,0 @@ > -<?xml version="1.0"?> > -<group xmlns:xi="http://www.w3.org/2001/XInclude"> > - <directory name="ncftp"> > - <xi:include href="ncftp/ncftp.rbuild" /> > - </directory> > - > - <directory name="netreg"> > - <xi:include href="netreg/netreg.rbuild" /> > - </directory> > - > - <directory name="niclist"> > - <xi:include href="niclist/niclist.rbuild" /> > - </directory> > - > - <directory name="roshttpd"> > - <xi:include href="roshttpd/roshttpd.rbuild" /> > - </directory> > - > - <directory name="tditest"> > - <xi:include href="tditest/tditest.rbuild" /> > - </directory> > -</group> > - > > Removed: trunk/rosapps/applications/net/ncftp/ncftp.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncf… > ============================================================================== > --- trunk/rosapps/applications/net/ncftp/ncftp.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/net/ncftp/ncftp.rbuild (removed) > @@ -1,91 +0,0 @@ > -<module name="ncftp" type="win32cui" installbase="system32" installname="ncftp.exe" allowwarnings="true"> > - <include base="ncftp">.</include> > - <include base="ncftp">sio</include> > - <include base="ncftp">Strn</include> > - <include base="ncftp">libncftp</include> > - <include base="ncftp">ncftp</include> > - > - <define name="ncftp" /> > - <library>user32</library> > - <library>advapi32</library> > - <library>ws2_32</library> > - > - <directory name="sio"> > - <file>PRead.c</file> > - <file>PWrite.c</file> > - <file>SAcceptA.c</file> > - <file>SAcceptS.c</file> > - <file>SBind.c</file> > - <file>SClose.c</file> > - <file>SConnect.c</file> > - <file>SConnectByName.c</file> > - <file>SNew.c</file> > - <file>SRead.c</file> > - <file>SReadline.c</file> > - <file>SRecv.c</file> > - <file>SRecvfrom.c</file> > - <file>SRecvmsg.c</file> > - <file>SSelect.c</file> > - <file>SSend.c</file> > - <file>SSendto.c</file> > - <file>SSendtoByName.c</file> > - <file>SWrite.c</file> > - <file>SocketUtil.c</file> > - <file>StrAddr.c</file> > - <file>UAcceptA.c</file> > - <file>UAcceptS.c</file> > - <file>UBind.c</file> > - <file>UConnect.c</file> > - <file>UConnectByName.c</file> > - <file>UNew.c</file> > - <file>URecvfrom.c</file> > - <file>USendto.c</file> > - <file>USendtoByName.c</file> > - <file>SError.c</file> > - <file>SWait.c</file> > - <file>main.c</file> > - </directory> > - > - <directory name="Strn"> > - <file>Dynscat.c</file> > - <file>Strncpy.c</file> > - <file>Strncat.c</file> > - <file>Strntok.c</file> > - <file>Strnpcpy.c</file> > - <file>Strnpcat.c</file> > - <file>strtokc.c</file> > - <file>version.c</file> > - </directory> > - > - <directory name="libncftp"> > - <file>open.c</file> > - <file>cmds.c</file> > - <file>util.c</file> > - <file>rcmd.c</file> > - <file>ftp.c</file> > - <file>io.c</file> > - <file>errno.c</file> > - <file>linelist.c</file> > - <file>glob.c</file> > - </directory> > - > - <directory name="ncftp"> > - <file>cmds.c</file> > - <file>cmdlist.c</file> > - <file>getopt.c</file> > - <file>ls.c</file> > - <file>main.c</file> > - <file>version.c</file> > - <file>shell.c</file> > - <file>util.c</file> > - <file>readln.c</file> > - <file>progress.c</file> > - <file>bookmark.c</file> > - <file>pref.c</file> > - <file>preffw.c</file> > - <file>trace.c</file> > - <file>spool.c</file> > - <file>log.c</file> > - <file>getline.c</file> > - </directory> > -</module> > > Removed: trunk/rosapps/applications/net/netreg/netreg.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/netreg/ne… > ============================================================================== > --- trunk/rosapps/applications/net/netreg/netreg.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/net/netreg/netreg.rbuild (removed) > @@ -1,9 +0,0 @@ > -<module name="netreg" type="win32cui" installbase="system32" installname="netreg.exe" stdlib="host"> > - <include base="netreg">.</include> > - <library>user32</library> > - <library>ws2_32</library> > - <library>advapi32</library> > - <compilerflag compiler="cxx" compilerset="gcc">-Wno-non-virtual-dtor</compilerflag> > - <file>netreg.cpp</file> > - <file>netreg.rc</file> > -</module> > > Removed: trunk/rosapps/applications/net/niclist/niclist.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/niclist/n… > ============================================================================== > --- trunk/rosapps/applications/net/niclist/niclist.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/net/niclist/niclist.rbuild (removed) > @@ -1,7 +0,0 @@ > -<module name="niclist" type="win32cui" installbase="system32" installname="niclist.exe"> > - <include base="niclist">.</include> > - <library>user32</library> > - > - <file>niclist.c</file> > - <file>niclist.rc</file> > -</module> > > Removed: trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/roshttpd/… > ============================================================================== > --- trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild (removed) > @@ -1,20 +0,0 @@ > -<?xml version="1.0"?> > -<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> > -<module name="roshttpd" type="win32cui" installbase="system32" installname="roshttpd.exe" stdlib="host"> > - <include base="roshttpd">include</include> > - <define name="__USE_W32_SOCKETS" /> > - <library>ws2_32</library> > - <library>user32</library> > - <compilerflag compiler="cxx" compilerset="gcc">-Wno-non-virtual-dtor</compilerflag> > - <file>config.cpp</file> > - <file>error.cpp</file> > - <file>http.cpp</file> > - <file>httpd.cpp</file> > - <file>roshttpd.cpp</file> > - <directory name="common" > > - <file>list.cpp</file> > - <file>roshttpd.rc</file> > - <file>socket.cpp</file> > - <file>thread.cpp</file> > - </directory> > -</module> > > Removed: trunk/rosapps/applications/net/tditest/tditest.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/tditest/t… > ============================================================================== > --- trunk/rosapps/applications/net/tditest/tditest.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/net/tditest/tditest.rbuild (removed) > @@ -1,9 +0,0 @@ > -<module name="tditest" type="kernelmodedriver" installbase="system32/drivers" installname="tditest.sys"> > - <include base="tditest">include</include> > - <library>ntoskrnl</library> > - <library>pseh</library> > - > - <directory name="tditest"> > - <file>tditest.c</file> > - </directory> > -</module> > > Removed: trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… > ============================================================================== > --- trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild (removed) > @@ -1,10 +0,0 @@ > -<?xml version="1.0"?> > -<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> > -<module name="blankscr" type="win32scr" installbase="system32" installname="scrnsave.scr" unicode="yes"> > - <library>scrnsave</library> > - <library>user32</library> > - <library>gdi32</library> > - > - <file>scrnsave.c</file> > - <file>scrnsave.rc</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/chkd… > ============================================================================== > --- trunk/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild (removed) > @@ -1,11 +0,0 @@ > -<module name="chkdsk" type="win32cui" installbase="system32" installname="chkdsk.exe" allowwarnings="true" unicode="yes"> > - <include base="reactos">include/reactos/libs/fmifs</include> > - <include base="chkdsk">..</include> > - > - <library>fmifs</library> > - <library>win32err</library> > - <library>ntdll</library> > - > - <file>chkdsk.c</file> > - <file>chkdsk.rc</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/chklib/chklib.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/chkl… > ============================================================================== > --- trunk/rosapps/applications/sysutils/chklib/chklib.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/chklib/chklib.rbuild (removed) > @@ -1,8 +0,0 @@ > -<module name="chklib" type="win32cui" installbase="system32" installname="chklib.exe" allowwarnings="true"> > - <include base="chklib">..</include> > - > - <library>win32err</library> > - > - <file>chklib.c</file> > - <file>chklib.rc</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/gettype/gettype.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/gett… > ============================================================================== > --- trunk/rosapps/applications/sysutils/gettype/gettype.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/gettype/gettype.rbuild (removed) > @@ -1,7 +0,0 @@ > -<module name="gettype" type="win32cui" installbase="system32" installname="gettype.exe" unicode="yes"> > - <include base="gettype">.</include> > - <library>shell32</library> > - <library>mpr</library> > - <library>netapi32</library> > - <file>gettype.c</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/logevent/logevent.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/loge… > ============================================================================== > --- trunk/rosapps/applications/sysutils/logevent/logevent.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/logevent/logevent.rbuild (removed) > @@ -1,7 +0,0 @@ > -<?xml version="1.0"?> > - > -<module name="logevent" type="win32cui" installbase="system32" installname="logevent.exe" allowwarnings="true"> > - <library>advapi32</library> > - <file>logevent.c</file> > - <file>logevent.rc</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/lsdd/lsdd.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/lsdd… > ============================================================================== > --- trunk/rosapps/applications/sysutils/lsdd/lsdd.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/lsdd/lsdd.rbuild (removed) > @@ -1,7 +0,0 @@ > -<module name="lsdd" type="win32cui" installbase="system32" installname="lsdd.exe"> > - <library>win32err</library> > - <library>user32</library> > - > - <file>lsdd.c</file> > - <file>lsdd.rc</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/man/man.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/man/… > ============================================================================== > --- trunk/rosapps/applications/sysutils/man/man.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/man/man.rbuild (removed) > @@ -1,6 +0,0 @@ > -<module name="man" type="win32cui" installbase="system32" installname="man.exe"> > - <library>ntdll</library> > - <library>user32</library> > - > - <file>man.c</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/pedump/pedump.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/pedu… > ============================================================================== > --- trunk/rosapps/applications/sysutils/pedump/pedump.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/pedump/pedump.rbuild (removed) > @@ -1,5 +0,0 @@ > -<module name="pedump" type="win32cui" installbase="system32" installname="pedump.exe"> > - <library>ntdll</library> > - <file>pedump.c</file> > - <file>pedump.rc</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/regexpl/regexpl.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… > ============================================================================== > --- trunk/rosapps/applications/sysutils/regexpl/regexpl.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/regexpl/regexpl.rbuild (removed) > @@ -1,33 +0,0 @@ > -<module name="regexpl" type="win32cui" installbase="system32" installname="regexpl.exe" stdlib="host"> > - <include base="regexpl">.</include> > - <library>user32</library> > - <library>advapi32</library> > - > - <file>ArgumentParser.cpp</file> > - <file>Console.cpp</file> > - <file>RegistryExplorer.cpp</file> > - <file>RegistryKey.cpp</file> > - <file>RegistryTree.cpp</file> > - <file>SecurityDescriptor.cpp</file> > - <file>ShellCommand.cpp</file> > - <file>ShellCommandChangeKey.cpp</file> > - <file>ShellCommandConnect.cpp</file> > - <file>ShellCommandDACL.cpp</file> > - <file>ShellCommandDeleteKey.cpp</file> > - <file>ShellCommandDeleteValue.cpp</file> > - <file>ShellCommandDir.cpp</file> > - <file>ShellCommandExit.cpp</file> > - <file>ShellCommandHelp.cpp</file> > - <file>ShellCommandNewKey.cpp</file> > - <file>ShellCommandOwner.cpp</file> > - <file>ShellCommandSACL.cpp</file> > - <file>ShellCommandSetValue.cpp</file> > - <file>ShellCommandValue.cpp</file> > - <file>ShellCommandVersion.cpp</file> > - <file>ShellCommandsLinkedList.cpp</file> > - <file>TextHistory.cpp</file> > - <file>Completion.cpp</file> > - <file>Pattern.cpp</file> > - <file>Settings.cpp</file> > - <file>Prompt.cpp</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/rosddt/rosddt.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… > ============================================================================== > --- trunk/rosapps/applications/sysutils/rosddt/rosddt.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/rosddt/rosddt.rbuild (removed) > @@ -1,10 +0,0 @@ > -<module name="rosddt" type="win32cui" installbase="system32" installname="rosddt.exe" unicode="yes" allowwarnings="true"> > - > - <library>setupapi</library> > - <library>wininet</library> > - <library>user32</library> > - > - <file>http.c</file> > - <file>rosddt.c</file> > - <file>rosddt.rc</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/screenshot/screenshot.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/scre… > ============================================================================== > --- trunk/rosapps/applications/sysutils/screenshot/screenshot.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/screenshot/screenshot.rbuild (removed) > @@ -1,8 +0,0 @@ > -<module name="screenshot" type="win32gui" installbase="system32" installname="screenshot.exe" unicode="yes"> > - <include base="screenshot">.</include> > - <library>user32</library> > - <library>gdi32</library> > - <library>comdlg32</library> > - <file>screenshot.c</file> > - <file>screenshot.rc</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… > ============================================================================== > --- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild (removed) > @@ -1,12 +0,0 @@ > -<module name="systeminfo" type="win32cui" installbase="system32" installname="systeminfo.exe"> > - <library>user32</library> > - <library>ntdll</library> > - <library>advapi32</library> > - <library>netapi32</library> > - <library>shlwapi</library> > - <library>iphlpapi</library> > - <library>ws2_32</library> > - <file>systeminfo.c</file> > - <file>systeminfo.rc</file> > - <file>rsrc.rc</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/tcat/tcat.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/tcat… > ============================================================================== > --- trunk/rosapps/applications/sysutils/tcat/tcat.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/tcat/tcat.rbuild (removed) > @@ -1,6 +0,0 @@ > -<module name="tcat" type="win32cui" installbase="system32" installname="tcat.exe"> > - <library>ntdll</library> > - <library>user32</library> > - > - <file>cat.c</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… > ============================================================================== > --- trunk/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild (removed) > @@ -1,3 +0,0 @@ > -<module name="binpatch" type="win32cui" installbase="bin" installname="binpatch.exe" > > - <library>ntdll</library> > - <file>patch.c</file> > > Removed: trunk/rosapps/applications/sysutils/utils/driver/driver.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… > ============================================================================== > --- trunk/rosapps/applications/sysutils/utils/driver/driver.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/utils/driver/driver.rbuild (removed) > @@ -1,8 +0,0 @@ > -<group xmlns:xi="http://www.w3.org/2001/XInclude"> > - <directory name="load"> > - <xi:include href="load/load.rbuild" /> > - </directory> > - <directory name="unload"> > - <xi:include href="unload/unload.rbuild" /> > - </directory> > -</group> > > Removed: trunk/rosapps/applications/sysutils/utils/driver/load/load.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… > ============================================================================== > --- trunk/rosapps/applications/sysutils/utils/driver/load/load.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/utils/driver/load/load.rbuild (removed) > @@ -1,4 +0,0 @@ > -<module name="load" type="win32cui" installbase="bin" installname="load.exe" unicode="true" > > - <library>ntdll</library> > - <library>user32</library> > - <file>load.c</file> > > Removed: trunk/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… > ============================================================================== > --- trunk/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild (removed) > @@ -1,4 +0,0 @@ > -<module name="unload" type="win32cui" installbase="bin" installname="unload.exe" unicode="true"> > - <library>ntdll</library> > - <library>user32</library> > - <file>unload.c</file> > > Removed: trunk/rosapps/applications/sysutils/utils/infinst/infinst.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… > ============================================================================== > --- trunk/rosapps/applications/sysutils/utils/infinst/infinst.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/utils/infinst/infinst.rbuild (removed) > @@ -1,6 +0,0 @@ > -<module name="infinst" type="win32cui" installbase="bin" installname="infinst.exe" > > - <library>ntdll</library> > - <library>user32</library> > - <library>setupapi</library> > - <library>comdlg32</library> > - <file>infinst.c</file> > > Removed: trunk/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… > ============================================================================== > --- trunk/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild (removed) > @@ -1,4 +0,0 @@ > -<module name="nts2w32err" type="win32cui" installbase="bin" installname="nts2w32err.exe" > > - <library>ntdll</library> > - <file>nts2w32err.c</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/utils/objdir/objdir.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… > ============================================================================== > --- trunk/rosapps/applications/sysutils/utils/objdir/objdir.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/utils/objdir/objdir.rbuild (removed) > @@ -1,4 +0,0 @@ > -<module name="objdir" type="win32cui" installbase="bin" installname="objdir.exe"> > - <library>ntdll</library> > - <file>objdir.c</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… > ============================================================================== > --- trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild (removed) > @@ -1,4 +0,0 @@ > -<module name="partinfo" type="win32cui" installbase="bin" installname="partinfo.exe" allowwarnings="true"> > - <library>ntdll</library> > - <file>partinfo.c</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… > ============================================================================== > --- trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild (removed) > @@ -1,20 +0,0 @@ > -<module name="rosperf" type="win32cui" installbase="system32" installname="rosperf.exe"> > - <include base="rosperf">.</include> > - <define name="UNICODE" /> > - <library>version</library> > - <library>msimg32</library> > - <library>gdi32</library> > - <library>shell32</library> > - <library>advapi32</library> > - <library>user32</library> > - <library>ntdll</library> > - <file>rosperf.c</file> > - <file>lines.c</file> > - <file>fill.c</file> > - <file>scroll.c</file> > - <file>text.c</file> > - <file>alphablend.c</file> > - <file>testlist.c</file> > - <file>gradient.c</file> > - <file>rosperf.rc</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/utils/stats/stats.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… > ============================================================================== > --- trunk/rosapps/applications/sysutils/utils/stats/stats.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/utils/stats/stats.rbuild (removed) > @@ -1,4 +0,0 @@ > -<module name="stats" type="win32cui" installbase="bin" installname="stats.exe" unicode="true" > > - <library>ntdll</library> > - <file>stats.c</file> > -</module> > > Removed: trunk/rosapps/applications/sysutils/utils/theme/dump/manifest.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… > ============================================================================== > --- trunk/rosapps/applications/sysutils/utils/theme/dump/manifest.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/utils/theme/dump/manifest.rbuild (removed) > @@ -1,24 +0,0 @@ > -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> > -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> > - <assemblyIdentity > - version="1.0.0.0" > - processorArchitecture="X86" > - name="ReactOS.Theme.Dump" > - type="win32" > - /> > - <description>Dumps properties of Windows/ReactOS Visual Styles.</description> > - <dependency> > - <dependentAssembly> > - <assemblyIdentity > - type="win32" > - name="Microsoft.Windows.Common-Controls" > - version="6.0.0.0" > - processorArchitecture="X86" > - publicKeyToken="6595b64144ccf1df" > - language="*" > - /> > - </dependentAssembly> > - </dependency> > -</assembly> > - > - > > Removed: trunk/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… > ============================================================================== > --- trunk/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild (removed) > @@ -1,4 +0,0 @@ > -<module name="tickcount" type="win32cui" installbase="bin" installname="tickcount.exe" unicode="true" > > - <library>ntdll</library> > - <file>tickcount.c</file> > -</module> > > Removed: trunk/rosapps/applications/winfile/winfile.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winfi… > ============================================================================== > --- trunk/rosapps/applications/winfile/winfile.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/applications/winfile/winfile.rbuild (removed) > @@ -1,20 +0,0 @@ > -<?xml version="1.0"?> > -<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> > - <module name="winfile" type="win32gui" installbase="system32" installname="winfile.exe" allowwarnings="true"> > - <include base="winfile">.</include> > - <define name="UNICODE" /> > - <library>shell32</library> > - <library>comdlg32</library> > - <library>comctl32</library> > - <library>ole32</library> > - <library>mpr</library> > - <library>version</library> > - <library>user32</library> > - <library>gdi32</library> > - <library>advapi32</library> > - <library>uuid</library> > - <file>splitpath.c</file> > - <file>winefile.c</file> > - <file>rsrc.rc</file> > - </module> > -</rbuild> > > Removed: trunk/rosapps/lib/directory.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/directory.rbuild?rev=6… > ============================================================================== > --- trunk/rosapps/lib/directory.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/lib/directory.rbuild (removed) > @@ -1,8 +0,0 @@ > -<?xml version="1.0"?> > -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> > -<group xmlns:xi="http://www.w3.org/2001/XInclude"> > - <directory name="win32err"> > - <xi:include href="win32err/win32err.rbuild" /> > - </directory> > -</group> > - > > Removed: trunk/rosapps/lib/win32err/win32err.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/win32err/win32err.rbui… > ============================================================================== > --- trunk/rosapps/lib/win32err/win32err.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/lib/win32err/win32err.rbuild (removed) > @@ -1,3 +0,0 @@ > -<module name="win32err" type="objectlibrary"> > - <file>win32err.c</file> > -</module> > > Removed: trunk/rosapps/templates/dialog/dialog.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/dialog/dialog.rb… > ============================================================================== > --- trunk/rosapps/templates/dialog/dialog.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/templates/dialog/dialog.rbuild (removed) > @@ -1,13 +0,0 @@ > -<module name="template_dialog" type="win32cui" installname="dialog.exe" allowwarnings="true"> > - <include base="template_dialog">.</include> > - <library>ntdll</library> > - <library>user32</library> > - <library>gdi32</library> > - <library>comctl32</library> > - <file>dialog.c</file> > - <file>memdlg.c</file> > - <file>page1.c</file> > - <file>page2.c</file> > - <file>page3.c</file> > - <file>trace.c</file> > -</module> > > Removed: trunk/rosapps/templates/mdi/mdi.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/mdi/mdi.rbuild?r… > ============================================================================== > --- trunk/rosapps/templates/mdi/mdi.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/templates/mdi/mdi.rbuild (removed) > @@ -1,10 +0,0 @@ > -<module name="template_mdi" type="win32cui" installname="mdi.exe" allowwarnings="true"> > - <include base="template_mdi">.</include> > - <library>ntdll</library> > - <library>user32</library> > - <library>gdi32</library> > - <file>about.c</file> > - <file>framewnd.c</file> > - <file>childwnd.c</file> > - <file>main.c</file> > -</module> > > Removed: trunk/rosapps/templates/old_wordpad/old_wordpad.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/old_wordpad/old_… > ============================================================================== > --- trunk/rosapps/templates/old_wordpad/old_wordpad.rbuild [iso-8859-1] (original) > +++ trunk/rosapps/templates/old_wordpad/old_wordpad.rbuild (removed) > @@ -1,21 +0,0 @@ > -<?xml version="1.0"?> > -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> > -<module name="old_wordpad" type="win32gui" installbase="system32" installname="old_wordpad.exe" unicode="yes"> > - <include base="old_wordpad">.</include> > - <library>user32</library> > - <library>gdi32</library> > - <library>comdlg32</library> > - <library>advapi32</library> > - <library>shell32</library> > - <library>comctl32</library> > - <compilationunit name="unit.c"> > - <file>dialogs.c</file> > - <file>editwnd.c</file> > - <file>mainwnd.c</file> > - <file>misc.c</file> > - <file>opensave.c</file> > - <file>wordpad.c</file> > - </compilationunit> > - <file>wordpad.rc</file> > - <pch>precomp.h</pch> > -</module> > >

10 years

1
0
0 0

The DirectX Toolkit (a collection of DX utilities and wrappers) is on Github.

by Alexander Rechitskiy

10 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [dreimer] 67255: [REGEDIT] Fix wrong font usage

by Timo Kreuzer

A few more: https://git.reactos.org/?p=reactos.git&a=search&h=4b4476d74116de8c6218b50d6… https://git.reactos.org/?p=reactos.git&a=search&h=4b4476d74116de8c6218b50d6… Am 18.04.2015 um 16:28 schrieb dreimer(a)svn.reactos.org: > Author: dreimer > Date: Sat Apr 18 14:28:13 2015 > New Revision: 67255 > > URL: http://svn.reactos.org/svn/reactos?rev=67255&view=rev > Log: > [REGEDIT] > Fix wrong font usage > > Modified: > trunk/reactos/base/applications/regedit/lang/pt-PT.rc > > Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… > ============================================================================== > --- trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] (original) > +++ trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] Sat Apr 18 14:28:13 2015 > @@ -149,7 +149,7 @@ > IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 > STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU > CAPTION "Editar texto" > -FONT 8, "System" > +FONT 8, "MS Shell Dlg" > BEGIN > LTEXT "Nome do valor:", IDC_STATIC, 5, 5, 119, 8 > EDITTEXT IDC_VALUE_NAME, 5, 15, 200, 12, ES_AUTOHSCROLL | ES_READONLY > > >

10 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 67242: [THEMEUI] Add this module for .msstyle file type association. By Lee Schroeder. CORE-5984

by Timo Kreuzer

Just as a reminder: we can put registry stuff, that is related to a special module, into a separate file together with the module itself now. This one looks a bit like it should go into the the themeui folder. Am 18.04.2015 um 11:52 schrieb akhaldi(a)svn.reactos.org: > Modified: trunk/reactos/boot/bootdata/hivecls.inf > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… > ============================================================================== > --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) > +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Sat Apr 18 09:52:23 2015 > @@ -265,6 +265,18 @@ > HKCR,"sysfile","NoOpen",0x00000000,"" > HKCR,"sysfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-171" > HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" > + > +; MS Styles (Themes) > +HKCR,".msstyles","",0x00000000,"msstylesfile" > +HKCR,"msstylesfile","",0x00000000,"Visual Style File" > +HKCR,"msstylesfile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" > +HKCR,"msstylesfile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenMSTheme file:""%1""" > + > +; Theme File > +HKCR,".theme","",0x00000000,"themefile" > +HKCR,"themefile","",0x00000000,"Theme File" > +HKCR,"themefile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" > +HKCR,"themefile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenTheme /file:""%1""" > > ; URL shortcuts (e.g. used in favorites folder of IExplorer) > HKCR,".url","",0x00000000,"InternetShortcut" > >

10 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [cwittich] 67177: [SNDREC32] do not delete objects which are still selected into a DC

by Timo Kreuzer

Just for the record: it's perfectly fine and safe to do that. They will be kept alive as long as they are selected and will be deleted, once a different object is selected or the DC is deleted. Am 12.04.2015 um 18:29 schrieb cwittich(a)svn.reactos.org: > Author: cwittich > Date: Sun Apr 12 16:29:36 2015 > New Revision: 67177 > > URL: http://svn.reactos.org/svn/reactos?rev=67177&view=rev > Log: > [SNDREC32] > do not delete objects which are still selected into a DC > > Modified: > trunk/reactos/base/applications/sndrec32/sndrec32.cpp > > Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… > ============================================================================== > --- trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] (original) > +++ trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] Sun Apr 12 16:29:36 2015 > @@ -352,6 +352,7 @@ > PAINTSTRUCT ps; > HDC hdc; > HPEN pen; > + HPEN oldpen; > > unsigned int max_h = (cli.bottom / 2); > unsigned int samples; > @@ -366,7 +367,7 @@ > /* Initialize hdc objects */ > hdc = BeginPaint(hWnd, &ps); > pen = (HPEN)CreatePen(PS_SOLID, 1, WAVEBAR_COLOR); > - SelectObject(hdc, (HBRUSH)pen); > + oldpen = (HPEN) SelectObject(hdc, (HBRUSH)pen); > if (AUD_OUT->current_status() == snd::WAVEOUT_PLAYING) > { > samples = AUD_OUT->tot_samples_buf(); > @@ -412,6 +413,7 @@ > LineTo(hdc, WAVEBAR_CX, cli.bottom / 2); > } > > + SelectObject(hdc, oldpen); > DeleteObject( pen ); > EndPaint( hWnd, &ps ); > break; > @@ -437,6 +439,7 @@ > PAINTSTRUCT ps; > HDC hdc; > HFONT font; > + HFONT oldfont; > long long slid_samp = 0; > > /* Checking for global pointers to buffer and io audio devices */ > @@ -774,7 +777,7 @@ > case WM_PAINT: > hdc = BeginPaint(hWnd, &ps); > font = CreateFontIndirect(&s_info.lfMenuFont); > - SelectObject(hdc, font); > + oldfont = (HFONT) SelectObject(hdc, font); > SetBkMode(hdc, TRANSPARENT); > > if (AUD_IN->current_status() == snd::WAVEIN_RECORDING) > @@ -877,6 +880,7 @@ > _tcslen(str_tmp), > 0); > > + SelectObject(hdc, oldfont); > DeleteObject(font); > EndPaint(hWnd, &ps); > break; > > >

10 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 67140: [RTL] Improve RtlImageNtHeaderEx: - Fix signed/unsigned mismatch when comparing NT header offset - Simplify overflow checks - Add missing overflow-into-systemspace check CR-77 / C...

by Alex Ionescu

The Windows implementation of the API is different in user vs kernel-mode. We should probably try to remain compatible. Best regards, Alex Ionescu On Fri, Apr 10, 2015 at 12:21 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Fri Apr 10 19:21:22 2015 > New Revision: 67140 > > URL: http://svn.reactos.org/svn/reactos?rev=67140&view=rev > Log: > [RTL] > Improve RtlImageNtHeaderEx: > - Fix signed/unsigned mismatch when comparing NT header offset > - Simplify overflow checks > - Add missing overflow-into-systemspace check > CR-77 / CORE-8091 #resolve > > Modified: > trunk/reactos/boot/freeldr/freeldr/lib/rtl/libsupp.c > trunk/reactos/dll/ntdll/rtl/libsupp.c > trunk/reactos/include/ndk/amd64/mmtypes.h > trunk/reactos/include/ndk/i386/mmtypes.h > trunk/reactos/lib/rtl/image.c > trunk/reactos/lib/rtl/rtlp.h > trunk/reactos/ntoskrnl/include/internal/amd64/mm.h > trunk/reactos/ntoskrnl/mm/ARM3/miarm.h > > Modified: trunk/reactos/boot/freeldr/freeldr/lib/rtl/libsupp.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/lib/r… > > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/lib/rtl/libsupp.c > [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/lib/rtl/libsupp.c > [iso-8859-1] Fri Apr 10 19:21:22 2015 > @@ -19,6 +19,8 @@ > */ > > #include <freeldr.h> > + > +PVOID MmHighestUserAddress = (PVOID)MI_HIGHEST_USER_ADDRESS; > > #if DBG > VOID FASTCALL > > Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… > > ============================================================================== > --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) > +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Fri Apr 10 > 19:21:22 2015 > @@ -16,6 +16,7 @@ > > SIZE_T RtlpAllocDeallocQueryBufferSize = PAGE_SIZE; > PTEB LdrpTopLevelDllBeingLoadedTeb = NULL; > +PVOID MmHighestUserAddress = (PVOID)MI_HIGHEST_USER_ADDRESS; > > /* FUNCTIONS > ***************************************************************/ > > > Modified: trunk/reactos/include/ndk/amd64/mmtypes.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/mmtypes.… > > ============================================================================== > --- trunk/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] (original) > +++ trunk/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] Fri Apr 10 > 19:21:22 2015 > @@ -36,6 +36,11 @@ > #define MM_ALLOCATION_GRANULARITY 0x10000 > #define MM_ALLOCATION_GRANULARITY_SHIFT 16L > #define MM_PAGE_FRAME_NUMBER_SIZE 52 > + > +// > +// User space range limit > +// > +#define MI_HIGHEST_USER_ADDRESS (PVOID)0x000007FFFFFEFFFFULL > > // > // Address of the shared user page > > Modified: trunk/reactos/include/ndk/i386/mmtypes.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/mmtypes.h… > > ============================================================================== > --- trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] (original) > +++ trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] Fri Apr 10 > 19:21:22 2015 > @@ -35,6 +35,11 @@ > #define MM_ALLOCATION_GRANULARITY 0x10000 > #define MM_ALLOCATION_GRANULARITY_SHIFT 16L > #define MM_PAGE_FRAME_NUMBER_SIZE 20 > + > +// > +// User space range limit > +// > +#define MI_HIGHEST_USER_ADDRESS (PVOID)0x7FFEFFFF > > // > // Address of the shared user page > > Modified: trunk/reactos/lib/rtl/image.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=67140&… > > ============================================================================== > --- trunk/reactos/lib/rtl/image.c [iso-8859-1] (original) > +++ trunk/reactos/lib/rtl/image.c [iso-8859-1] Fri Apr 10 19:21:22 > 2015 > @@ -137,32 +137,42 @@ > */ > NTSTATUS > NTAPI > -RtlImageNtHeaderEx(IN ULONG Flags, > - IN PVOID Base, > - IN ULONG64 Size, > - OUT PIMAGE_NT_HEADERS *OutHeaders) > +RtlImageNtHeaderEx( > + _In_ ULONG Flags, > + _In_ PVOID Base, > + _In_ ULONG64 Size, > + _Out_ PIMAGE_NT_HEADERS *OutHeaders) > { > PIMAGE_NT_HEADERS NtHeaders; > PIMAGE_DOS_HEADER DosHeader; > BOOLEAN WantsRangeCheck; > + ULONG NtHeaderOffset; > > /* You must want NT Headers, no? */ > - if (!OutHeaders) return STATUS_INVALID_PARAMETER; > + if (OutHeaders == NULL) > + { > + DPRINT1("OutHeaders is NULL\n"); > + return STATUS_INVALID_PARAMETER; > + } > > /* Assume failure */ > *OutHeaders = NULL; > > /* Validate Flags */ > - if (Flags &~ RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK) > - { > - DPRINT1("Invalid flag combination... check for new API flags?\n"); > + if (Flags & ~RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK) > + { > + DPRINT1("Invalid flags: 0x%lx\n", Flags); > return STATUS_INVALID_PARAMETER; > } > > /* Validate base */ > - if (!(Base) || (Base == (PVOID)-1)) return STATUS_INVALID_PARAMETER; > - > - /* Check if the caller wants validation */ > + if ((Base == NULL) || (Base == (PVOID)-1)) > + { > + DPRINT1("Invalid base address: %p\n", Base); > + return STATUS_INVALID_PARAMETER; > + } > + > + /* Check if the caller wants range checks */ > WantsRangeCheck = !(Flags & > RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK); > if (WantsRangeCheck) > { > @@ -179,56 +189,56 @@ > if (DosHeader->e_magic != IMAGE_DOS_SIGNATURE) > { > /* Not a valid COFF */ > - DPRINT1("Not an MZ file\n"); > + DPRINT1("Invalid image DOS signature!\n"); > + return STATUS_INVALID_IMAGE_FORMAT; > + } > + > + /* Get the offset to the NT headers (and copy from LONG to ULONG) */ > + NtHeaderOffset = DosHeader->e_lfanew; > + > + /* The offset must not be larger than 256MB, as a hard-coded check. > + In Windows this check is only done in user mode, not in kernel > mode, > + but it shouldn't harm to have it anyway. Note that without this > check, > + other overflow checks would become necessary! */ > + if (NtHeaderOffset >= (256 * 1024 * 1024)) > + { > + /* Fail */ > + DPRINT1("NT headers offset is larger than 256MB!\n"); > return STATUS_INVALID_IMAGE_FORMAT; > } > > /* Check if the caller wants validation */ > if (WantsRangeCheck) > { > - /* The offset should fit in the passsed-in size */ > - if (DosHeader->e_lfanew >= Size) > + /* Make sure the file header fits into the size */ > + if ((NtHeaderOffset + > + RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS, FileHeader)) >= > Size) > { > /* Fail */ > - DPRINT1("e_lfanew is larger than PE file\n"); > + DPRINT1("NT headers beyond image size!\n"); > return STATUS_INVALID_IMAGE_FORMAT; > } > - > - /* It shouldn't be past 4GB either */ > - if (DosHeader->e_lfanew >= > - (MAXULONG - sizeof(IMAGE_DOS_SIGNATURE) - > sizeof(IMAGE_FILE_HEADER))) > - { > - /* Fail */ > - DPRINT1("e_lfanew is larger than 4GB\n"); > + } > + > + /* Now get a pointer to the NT Headers */ > + NtHeaders = (PIMAGE_NT_HEADERS)((ULONG_PTR)Base + NtHeaderOffset); > + > + /* Check if the mapping is in user space */ > + if (Base <= MmHighestUserAddress) > + { > + /* Make sure we don't overflow into kernel space */ > + if ((PVOID)(NtHeaders + 1) > MmHighestUserAddress) > + { > + DPRINT1("Image overflows from user space into kernel > space!\n"); > return STATUS_INVALID_IMAGE_FORMAT; > } > - > - /* And the whole file shouldn't overflow past 4GB */ > - if ((DosHeader->e_lfanew + > - sizeof(IMAGE_DOS_SIGNATURE) - sizeof(IMAGE_FILE_HEADER)) >= > Size) > - { > - /* Fail */ > - DPRINT1("PE is larger than 4GB\n"); > - return STATUS_INVALID_IMAGE_FORMAT; > - } > - } > - > - /* The offset also can't be larger than 256MB, as a hard-coded check > */ > - if (DosHeader->e_lfanew >= (256 * 1024 * 1024)) > - { > - /* Fail */ > - DPRINT1("PE offset is larger than 256MB\n"); > - return STATUS_INVALID_IMAGE_FORMAT; > - } > - > - /* Now it's safe to get the NT Headers */ > - NtHeaders = (PIMAGE_NT_HEADERS)((ULONG_PTR)Base + > DosHeader->e_lfanew); > + } > > /* Verify the PE Signature */ > if (NtHeaders->Signature != IMAGE_NT_SIGNATURE) > { > /* Fail */ > - DPRINT1("PE signature missing\n"); > + DPRINT1("Invalid image NT signature!\n"); > return STATUS_INVALID_IMAGE_FORMAT; > } > > @@ -245,6 +255,10 @@ > RtlImageNtHeader(IN PVOID Base) > { > PIMAGE_NT_HEADERS NtHeader; > + > + ULONG c = 1; > + ULONG s = FIELD_OFFSET(IMAGE_OPTIONAL_HEADER32, DataDirectory[c]); > + (void)s; > > /* Call the new API */ > RtlImageNtHeaderEx(RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK, > > Modified: trunk/reactos/lib/rtl/rtlp.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=67140&r… > > ============================================================================== > --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) > +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Fri Apr 10 19:21:22 > 2015 > @@ -34,6 +34,8 @@ > > #define RVA(m, b) ((PVOID)((ULONG_PTR)(b) + (ULONG_PTR)(m))) > > +extern PVOID MmHighestUserAddress; > + > NTSTATUS > NTAPI > RtlpSafeCopyMemory( > > Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… > > ============================================================================== > --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] > (original) > +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Fri > Apr 10 19:21:22 2015 > @@ -5,7 +5,6 @@ > > /* Memory layout base addresses */ > #define MI_LOWEST_VAD_ADDRESS (PVOID)0x000000007FF00000ULL > -#define MI_HIGHEST_USER_ADDRESS (PVOID)0x000007FFFFFEFFFFULL > #define MI_USER_PROBE_ADDRESS (PVOID)0x000007FFFFFF0000ULL > #define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0xFFFF080000000000ULL > #define MI_REAL_SYSTEM_RANGE_START 0xFFFF800000000000ULL > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… > > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Fri Apr 10 > 19:21:22 2015 > @@ -29,7 +29,6 @@ > > #define MI_SYSTEM_VIEW_SIZE (32 * _1MB) > > -#define MI_HIGHEST_USER_ADDRESS (PVOID)0x7FFEFFFF > #define MI_USER_PROBE_ADDRESS (PVOID)0x7FFF0000 > #define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0x80000000 > #define MI_SYSTEM_CACHE_WS_START (PVOID)0xC0C00000 > > >

10 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [spetreolle] 67053: [FREELDR] In a quest to better registry, don't break VSSolution builds. freeldr_pe is not in the same directory and copy doesn't care if you ask to concatenate C:\tomatoes, it a...

by Timo Kreuzer

The comment "# Retrieve the full path to the generated file of the 'freeldr_pe' target" Doesn't explain why it is done. It rather looks like someone is doing something pointless and documenting in a comment that he's doing the pointless. ${CMAKE_CURRENT_BINARY_DIR} should be the "full path to the generated file". So it seems completely pointless to add extra magic to get that file path. Your commit message implies that this change fixes VSSolution builds, but it also doesn't explain it. In fact I don't even understand that sentence. If you don't add a proper comment to that thing, why it is needed, I promise I will have forgotten about this in a year and remove it again. :) Thanks, Timo Am 04.04.2015 um 22:33 schrieb spetreolle(a)svn.reactos.org: > Author: spetreolle > Date: Sat Apr 4 20:33:18 2015 > New Revision: 67053 > > URL: http://svn.reactos.org/svn/reactos?rev=67053&view=rev > Log: > [FREELDR] > In a quest to better registry, > don't break VSSolution builds. > freeldr_pe is not in the same directory and copy doesn't care if you ask to concatenate C:\tomatoes, it already has the first file. > > Modified: > trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt > > Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sat Apr 4 20:33:18 2015 > @@ -226,10 +226,13 @@ > add_dependencies(freeldr_pe asm) > add_dependencies(freeldr_pe_dbg asm) > > +# Retrieve the full path to the generated file of the 'freeldr_pe' target > +get_target_property(_freeldr_pe_output_file freeldr_pe LOCATION) > + > concatenate_files( > ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys > ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin > - ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.dll) > + ${_freeldr_pe_output_file}) > > add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) > > @@ -240,7 +243,8 @@ > concatenate_files( > ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys > ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin > - ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.dll) > + ${_freeldr_pe_output_file}) > > add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) > add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) > + > > >

10 years

3
2
0 0

old.reactos.org reaching end-of-life

by Pierre Schweitzer

Dear all, On the 3rd of April 2015, the old.reactos.org website will be taken offline after several years of good services. If you have anything to do on it (like gathering data or whatever) please make sure you do before that date. With my best regards, -- Pierre Schweitzer <pierre(a)reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

10 years

1
1
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 65893: [GDI32] Import metafile code from wine. The wine code is unmodified (please keep it that way) and used through a wrapper function dispatcher and some helpers. Fixes 1931 wine tests.

by Thomas Faber

Hey Timo, I was just about to sync enhmetafile.c with Wine and found that your original import had the following diff: --- win32ss/gdi/gdi32/wine/enhmetafile.c (revision 67001) +++ win32ss/gdi/gdi32/wine/enhmetafile.c (working copy) @@ -546,8 +546,6 @@ if (!SetWorldTransform(hdc, &final_trans)) { - __debugbreak(); - SetWorldTransform(hdc, &final_trans); ERR("World transform failed!\n"); } } @@ -1232,12 +1230,10 @@ case EMR_EXTSELECTCLIPRGN: { const EMREXTSELECTCLIPRGN *lpRgn = (const EMREXTSELECTCLIPRGN *)mr; - const RGNDATA *pRgnData = (const RGNDATA *)lpRgn->RgnData; - DWORD dwSize = sizeof(RGNDATAHEADER) + pRgnData->rdh.nCount * sizeof(RECT); HRGN hRgn = 0; if (mr->nSize >= sizeof(*lpRgn) + sizeof(RGNDATAHEADER)) - hRgn = ExtCreateRegion( &info->init_transform, dwSize, pRgnData ); + hRgn = ExtCreateRegion( &info->init_transform, 0, (const RGNDATA *)lpRgn->RgnData ); ExtSelectClipRgn(hdc, hRgn, (INT)(lpRgn->iMode)); /* ExtSelectClipRgn created a copy of the region */ (this is the reverse diff, i.e. the one that would get it back in sync with Wine) My guess is I should just remove this difference and get it completely synced (i.e. apply the above patch)? What do you think? On 2014-12-29 15:25, tkreuzer(a)svn.reactos.org wrote: > Author: tkreuzer > Date: Mon Dec 29 14:25:30 2014 > New Revision: 65893 > > URL: http://svn.reactos.org/svn/reactos?rev=65893&view=rev > Log: > [GDI32] > Import metafile code from wine. The wine code is unmodified (please keep it that way) and used through a wrapper function dispatcher and some helpers. Fixes 1931 wine tests. > > Added: > trunk/reactos/win32ss/gdi/gdi32/include/wine/ (with props) > trunk/reactos/win32ss/gdi/gdi32/include/wine/gdi_driver.h (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/ (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/CMakeLists.txt (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/enhmetafile.c (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/ (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/bitblt.c (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/dc.c (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/enhmetafiledrv.h (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/graphics.c (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/init.c (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/objects.c (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/gdi_private.h (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/metafile.c (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/ (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/bitblt.c (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/dc.c (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/graphics.c (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/init.c (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/metafiledrv.h (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/objects.c (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/text.c (with props) > trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c (with props) > Modified: > trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt > trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h > trunk/reactos/win32ss/gdi/gdi32/misc/misc.c > trunk/reactos/win32ss/gdi/gdi32/objects/arc.c > trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c > trunk/reactos/win32ss/gdi/gdi32/objects/coord.c > trunk/reactos/win32ss/gdi/gdi32/objects/dc.c > trunk/reactos/win32ss/gdi/gdi32/objects/enhmfile.c > trunk/reactos/win32ss/gdi/gdi32/objects/gdiobj.c > trunk/reactos/win32ss/gdi/gdi32/objects/metafile.c > trunk/reactos/win32ss/gdi/gdi32/objects/painting.c > trunk/reactos/win32ss/gdi/gdi32/objects/palette.c > trunk/reactos/win32ss/gdi/gdi32/objects/path.c > trunk/reactos/win32ss/gdi/gdi32/objects/region.c > trunk/reactos/win32ss/gdi/gdi32/objects/text.c > trunk/reactos/win32ss/include/ntgdihdl.h > > [This mail would be too long, it was shortened to contain the URLs only.] > > Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/CMakeLis… > > Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… > > Added: trunk/reactos/win32ss/gdi/gdi32/include/wine/gdi_driver.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… > > Modified: trunk/reactos/win32ss/gdi/gdi32/misc/misc.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/mis… > > Modified: trunk/reactos/win32ss/gdi/gdi32/objects/arc.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… > > Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… > > Modified: trunk/reactos/win32ss/gdi/gdi32/objects/coord.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… > > Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… > > Modified: trunk/reactos/win32ss/gdi/gdi32/objects/enhmfile.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… > > Modified: trunk/reactos/win32ss/gdi/gdi32/objects/gdiobj.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… > > Modified: trunk/reactos/win32ss/gdi/gdi32/objects/metafile.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… > > Modified: trunk/reactos/win32ss/gdi/gdi32/objects/painting.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… > > Modified: trunk/reactos/win32ss/gdi/gdi32/objects/palette.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… > > Modified: trunk/reactos/win32ss/gdi/gdi32/objects/path.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… > > Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… > > Modified: trunk/reactos/win32ss/gdi/gdi32/objects/text.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/CMa… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/enhmetafile.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/enh… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/bitblt.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/enh… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/dc.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/enh… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/enhmetafiledrv.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/enh… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/graphics.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/enh… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/init.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/enh… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/objects.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/enh… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/gdi_private.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/gdi… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/metafile.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/met… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/bitblt.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/mfd… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/dc.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/mfd… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/graphics.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/mfd… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/init.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/mfd… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/metafiledrv.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/mfd… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/objects.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/mfd… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/text.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/mfd… > > Added: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/ros… > > Modified: trunk/reactos/win32ss/include/ntgdihdl.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntgdihdl.h…

10 years

3
3
0 0

Re: [ros-dev] [ros-diffs] [gadamopoulos] 66988: [EXPLORER] - Fix showing the website when Help is selected from the start menu.

by Pierre Schweitzer

Just a side (minor) remark. On 31/03/2015 00:28, gadamopoulos(a)svn.reactos.org wrote: > Modified: trunk/reactos/base/shell/explorer/explorer.rc > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… > ============================================================================== > --- trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] (original) > +++ trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] Mon Mar 30 22:28:08 2015 > @@ -28,7 +28,7 @@ > STRINGTABLE > BEGIN > //IDS_HELP_COMMAND "helpctr.exe>-FromStartHelp" > - IDS_HELP_COMMAND "https://www.reactos.org/" > + IDS_HELP_COMMAND "http://www.reactos.org/" This is to be reverted once ReactOS fully supports SSL. -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

10 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [gadamopoulos] 66992: [BROWSEUI] - CProgressDialog: Allocate big enough buffers needed for the text messages during initialization and don't reallocate them at all. Should stop thrashing the heap w...

by Thomas Faber

On 2015-03-31 00:50, gadamopoulos(a)svn.reactos.org wrote: > --- trunk/reactos/dll/win32/browseui/CProgressDialog.cpp [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/browseui/CProgressDialog.cpp [iso-8859-1] Mon Mar 30 22:50:34 2015 > CProgressDialog::CProgressDialog() > { > + this->cancelMsg[0] = this->title[0]; Did you mean this->cancelMsg[0] = this->title[0] = 0;? (or UNICODE_NULL for that matter) > static void set_buffer(LPWSTR *buffer, LPCWSTR string) > { > + > + ULONG len = max((wcslen(string) + 1)*sizeof(WCHAR), BUFFER_SIZE); > StringCchCopyW(*buffer, len, string); This makes no sense. I think you simply want StringCchCopyW(*buffer, len, BUFFER_SIZE); Thanks! -Thomas

10 years

1
1
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 66946: [CMAKE] Improve the concatenate_files macro introduced by Timo in r52179 + r52182 and hackfixed in r53914 . Notice that now it can take an arbitrary number of files to be concaten...

by Thomas Faber

I don't see how creating a new host-tool is an improvement over using OS builtins? On 2015-03-29 03:53, hbelusca(a)svn.reactos.org wrote: > Author: hbelusca > Date: Sun Mar 29 01:53:10 2015 > New Revision: 66946 > > URL: http://svn.reactos.org/svn/reactos?rev=66946&view=rev > Log: > [CMAKE] > Improve the concatenate_files macro introduced by Timo in r52179 + r52182 and hackfixed in r53914 . Notice that now it can take an arbitrary number of files to be concatenated. Hence you need to specify first the output file, and all the rest is the different files. > > [FREELDR] > Use the improved concatenate_files macro. > > Modified: > trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt > trunk/reactos/cmake/CMakeMacros.cmake > > Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Mar 29 01:53:10 2015 > @@ -226,10 +226,13 @@ > add_dependencies(freeldr_pe asm) > add_dependencies(freeldr_pe_dbg asm) > > +# Retrieve the full path to the generated file of the 'freeldr_pe' target > +get_target_property(_freeldr_pe_output_file freeldr_pe LOCATION) > + > concatenate_files( > + ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys > ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin > - freeldr_pe > - ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) > + ${_freeldr_pe_output_file}) > > add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) > > @@ -238,9 +241,9 @@ > add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR livecd hybridcd NAME_ON_CD setupldr.sys) > > concatenate_files( > + ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys > ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin > - freeldr_pe > - ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) > + ${_freeldr_pe_output_file}) > > add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) > add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) > > Modified: trunk/reactos/cmake/CMakeMacros.cmake > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… > ============================================================================== > --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) > +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sun Mar 29 01:53:10 2015 > @@ -504,33 +504,12 @@ > endfunction() > endif() > > -if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") > - macro(to_win_path _cmake_path _native_path) > - string(REPLACE "/" "\\" ${_native_path} "${_cmake_path}") > - endmacro() > - > - # yeah the parameter mess sucks, but thats what works... > - function(concatenate_files _file1 _target2 _output) > - get_target_property(_file2 ${_target2} LOCATION) > - to_win_path("${_file1}" _real_file1) > - to_win_path("${_file2}" _real_file2) > - to_win_path("${_output}" _real_output) > - add_custom_command( > - OUTPUT ${_output} > - COMMAND cmd.exe /C "copy /Y /B ${_real_file1} + ${_real_file2} ${_real_output} > nul" > - DEPENDS ${_file1} > - DEPENDS ${_target2}) > - endfunction() > -else() > - macro(concatenate_files _file1 _target2 _output) > - get_target_property(_file2 ${_target2} LOCATION) > - add_custom_command( > - OUTPUT ${_output} > - COMMAND cat ${_file1} ${_file2} > ${_output} > - DEPENDS ${_file1} > - DEPENDS ${_target2}) > - endmacro() > -endif() > +macro(concatenate_files _output) > + add_custom_command( > + OUTPUT ${_output} > + COMMAND native-cat ${ARGN} > ${_output} > + DEPENDS ${ARGN} native-cat) > +endmacro() > > function(add_importlibs _module) > add_dependency_node(${_module}) > >

10 years

6
7
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 66903: [NTVDM] - Fix some english. - Validity checks for DosGetSftEntry returned pointer added. - Use unsigned indices for for-loops indices that are always positive.

by Pierre Schweitzer

On 03/26/2015 03:52 PM, hbelusca(a)svn.reactos.org wrote: > Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… > ============================================================================== > --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] (original) > +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] Thu Mar 26 14:52:16 2015 > @@ -56,6 +56,13 @@ > BOOLEAN DosCheckInput(VOID) > { > PDOS_SFT_ENTRY SftEntry = DosGetSftEntry(DOS_INPUT_HANDLE); > + > + if (SftEntry == NULL) > + { > + /* Invalid handle */ > + DosLastError = ERROR_INVALID_HANDLE; // ERROR_FILE_NOT_FOUND Hum... Why? Is the error code wrong and should be ERROR_FILE_NOT_FOUND? And then, why setting this other error code? Or is the error code right, and then, what's the purpose of such comment? Or do you have a doubt about the right error code to use? Be it one or the other? I come back to my eternal comment: don't comment for yourself. Comment for the others, you're not alone here. So, make it explicit. Cheers, -- Pierre Schweitzer <pierre(a)reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

10 years

3
2
0 0

Win2k3 end of life

by Huw Campbell

Hey, Win2k3 is end of support in 6 months, which will mean that the symbol server will go down (as it has done for XP). At the very least, we should scrape the symbol server so we can continue to check and debug. Or move to NT6...

10 years

4
3
0 0

Status Meeting (March 2015)

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place today 26th of March, 19:00 UTC, as always. IRC service will only be started shortly before the meeting. Your participation passwords and server address will be emailed to you shortly before the meeting starts, and they are going to be different once again as they are not stored in any database. Hopefully it's not much of inconvenience. If someone still is not getting passwords sent before a meeting - please email Pierre before the meeting started to get one. Please send agenda proposals to me before the meeting, so that we can start with a proposed agenda. And join Mumble! Regards, Aleksey Bragin

10 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 66893: [WIN32K] Rewrite brush code in C++

by Ged Murphy

Timo and C++?? Hell must be a bit chilly today :) -----Original Message----- From: Ros-diffs [mailto:ros-diffs-bounces@reactos.org] On Behalf Of tkreuzer(a)svn.reactos.org Sent: 25 March 2015 22:38 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [tkreuzer] 66893: [WIN32K] Rewrite brush code in C++ Author: tkreuzer Date: Wed Mar 25 22:38:20 2015 New Revision: 66893 URL: http://svn.reactos.org/svn/reactos?rev=66893&view=rev Log: [WIN32K] Rewrite brush code in C++

10 years

1
0
0 0

msi:msi Wine Test hanging under Windows Server 2003

by Colin Finck

Hi all, With my latest log flush change to rosautotest, you see that it's msi:msi which is hanging in our Windows Server 2003 WHS-Testbot. See https://build.reactos.org/builders/WHS-Testbot/builds/30/steps/test/logs/st… The actual hang looks like this: http://fs2.directupload.net/images/150322/tsr72fu5.png This is the only bug that prevents us from running the full Wine Test Suite under Windows Server 2003. Fixes are welcome :) Cheers, Colin

10 years, 1 month

1
0
0 0

Jira & Fisheye downtime

by Pierre Schweitzer

Dear all, Due to DB maintenance, Jira & Fisheye will be down in a few minutes. There's no ETA for up status. Sorry for the caused inconvenience, -- Pierre Schweitzer <pierre(a)reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

10 years, 1 month

1
1
0 0

Re: [ros-dev] Ros-dev Digest, Vol 127, Issue 29

by Fedor Zaitsev

Thank you, with revision 66721 everything is ok with building ReactOS > Hi Fedor, > >> Hi. I am trying to compile ReactOS on my macbook with OSX 10.10 on it, but I got an error. Building tools compiled quite well (with some warmings, but I think that it is ok), but when I call "ninja all? I got error: > Can you please try with r66700 and report back? > > Cheers, > Amine.

10 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [dreimer] 66690: [RAPPS] lack of a proxy configuration by Peter Hater. German translation updated by me. CORE-4852 #resolve #comment Committed, thx for help.

by Colin Finck

dreimer(a)svn.reactos.org wrote: > [RAPPS] lack of a proxy configuration by Peter Hater. I don't think we need a separate proxy configuration per application. We should rather keep things consistent and always use the system proxy set in the "Internet Options" control panel applet. Unless someone has any objections, I suggest reverting this. - Colin

10 years, 1 month

4
4
0 0

Error with compiling ReactOS on OSX 10.10

by Fedor Zaitsev

Hi. I am trying to compile ReactOS on my macbook with OSX 10.10 on it, but I got an error. Building tools compiled quite well (with some warmings, but I think that it is ok), but when I call "ninja all» I got error: bash-3.2$ cd ../../output-MinGW-i386/reactos bash-3.2$ ninja [544/8381] Building C object dll/openg...Files/mesa_main.dir/api_arrayelt.c.obj FAILED: /usr/local/RosBE/i386/bin/i686-w64-mingw32-gcc -DBUILD_GL32 -DFEATURE_GL=1 -DKDBG=1 -DOPENGL32_USE_TLS -DUSE_3DNOW_ASM -DUSE_COMPILER_EXCEPTIONS -DUSE_MMX_ASM -DUSE_SSE_ASM -DUSE_X86_ASM -DWIN32 -DWINVER=0x502 -D_DLL -D_GDI32_ -D_GLAPI_NO_EXPORTS -D_M_IX86 -D_SEH_ENABLE_TRACE -D_SETUPAPI_VER=0x502 -D_USE_32BIT_TIME_T -D_USE_PSEH3=1 -D_WIN32_IE=0x600 -D_WIN32_WINDOWS=0x502 -D_WIN32_WINNT=0x502 -D_WINDOWS -D_X86_ -D__REACTOS__ -D__i386__ -D_inline=__inline -Di386 -Wa,--compress-debug-sections -pipe -fms-extensions -fno-strict-aliasing -mstackrealign -Wold-style-declaration -Wdeclaration-after-statement -fdebug-prefix-map="/Users/lobster/documents/RosBE/reactos"=ReactOS -gdwarf-2 -gstrict-dwarf -femit-struct-debug-detailed=none -feliminate-unused-debug-symbols -march=pentium -mtune=i686 -Werror -Wall -Wpointer-arith -Wno-char-subscripts -Wno-multichar -Wno-unused-value -Wno-maybe-uninitialized -Wno-error=unused-but-set-variable -Wno-error=type-limits -O1 -fno-optimize-sibling-calls -fno-omit-frame-pointer -mpreferred-stack-boundary=3 -fno-set-stack-executable -Winvalid-pch -Werror=invalid-pch -g -Idll/opengl/mesa/main -I../../dll/opengl/mesa/main -I../../include -I../../include/psdk -I../../include/dxsdk -Iinclude -Iinclude/psdk -Iinclude/dxsdk -Iinclude/reactos -I../../include/crt -I../../include/ddk -I../../include/ndk -I../../include/reactos -I../../include/reactos/libs -I../../dll/opengl/mesa/. -Wno-error -Wno-type-limits -include /Users/lobster/documents/RosBE/reactos/output-MinGW-i386/reactos/dll/opengl/mesa/main/mesa_main_pch.h -MMD -MT dll/opengl/mesa/main/CMakeFiles/mesa_main.dir/api_arrayelt.c.obj -MF dll/opengl/mesa/main/CMakeFiles/mesa_main.dir/api_arrayelt.c.obj.d -o dll/opengl/mesa/main/CMakeFiles/mesa_main.dir/api_arrayelt.c.obj -c ../../dll/opengl/mesa/main/api_arrayelt.c cc1: warning: /Users/lobster/documents/RosBE/reactos/output-MinGW-i386/reactos/dll/opengl/mesa/main/mesa_main_pch.h.gch: had text segment at different address [enabled by default] cc1: error: one or more PCH files were found, but they were invalid cc1: fatal error: /Users/lobster/documents/RosBE/reactos/output-MinGW-i386/reactos/dll/opengl/mesa/main/mesa_main_pch.h: No such file or directory compilation terminated. … … and so on What I am doing wrong? I have googled, but I don’t found anything relevant Thanks

10 years, 1 month

3
4
0 0

Re: [ros-dev] [ros-diffs] [aandrejevic] 66666: [NTVDM][FAST486] - Implement VDDInstallMemoryHook and VDDDeInstallMemoryHook using page guards. - Implement another API for memory hooks that should be faster than page guards ...

by Aleksey Bragin

Allright, so NTVDM is evil. Pretty good choice, as I wouldn't want to taint kernel or other important part of the system by 66666 commit made on Friday 13th... ;-) Regards, Aleksey Bragin On 13.03.2015 20:57, aandrejevic(a)svn.reactos.org wrote: > Author: aandrejevic > Date: Fri Mar 13 17:57:51 2015 > New Revision: 66666 > > URL: http://svn.reactos.org/svn/reactos?rev=66666&view=rev > Log: > [NTVDM][FAST486] > - Implement VDDInstallMemoryHook and VDDDeInstallMemoryHook using page guards. > - Implement another API for memory hooks that should be faster than page guards > (for NTVDM only). > - Adjust the VGA and EMS memory handlers to use this method. > - In Fast486, implement a method that will allow us to "rewind" the current instruction, > in case it was interrupted by a memory hook page fault. > - Use a memory hook to protect the BIOS ROM from being written to. >

10 years, 1 month

4
4
0 0

Re: [ros-dev] [ros-diffs] [dreimer] 66690: [RAPPS] lack of a proxy configuration by Peter Hater. German translation updated by me. CORE-4852 #resolve #comment Committed, thx for help.

by Colin Finck

dreimer(a)svn.reactos.org wrote: > [RAPPS] lack of a proxy configuration by Peter Hater. I don't think we need a separate proxy configuration per application. We should rather keep things consistent and always use the system proxy set in the "Internet Options" control panel applet. Unless someone has any objections, I suggest reverting this. - Colin

10 years, 1 month

1
0
0 0

ReactOS versioning

by Timo Kreuzer

Hi, Here's the promised suggestion regarding how we handle versioning problems in reactos. It has some relationship to the tree restructure. Since some time we now run into issues with our targeted Windows version. This is both wine dlls, as well as applications that refuse to run due to reactos being limited to Windows server 2003 SP2. I think many of us, me included, see more in ReactOS than an academic research project, or a nice way for 3rd party companies to cheaply get insight into how the Windows kernel works. So we are interested in making it an actually useful operating system. To achieve this goal, it is obviously important to make it run modern Windows applications. The current approach of pure Windows 2003 Server SP2 compatibility on user mode side is a dead end. Our target OS version is starting to become a fossil. With time more and more applications will simply refuse to work on it. Even wine DLLs start to require Vista APIs and their number will most likely increase. So what can we do? It is obvious, that we cannot instantaniously switch all user mode to Windows 7/8/10 compatibility, due to the amount of required work, especially regarding missing kernel features. The wine approach is just adding whatever is needed, creating a Windows version chimera. It has already been discussed here and shown to be a problem, since it can easily fool applications into believing they run on Vista or Windows 7, making them demand all the modern features, which we cannot provide, thus failing to run, while they would run flawlessly, when being provided a pure Windows 2003 environment, restricting itself to this functionality. So this is also not a very good way, either. So the conclusion is, that we need a mechanism, that allows us to control this, providing individual applications with what they require, while leaving others in a more restricted environment. And at the same time allowing our internal/wine DLLs to make use of higher version functionality. Suggested approach: 1. We need a method to specify which application should be run in which environment. We should probably use the same mechanism that is used on Windows. Compatibility information is stored in a registry key HKCU\Software\Microsodt\Windows NT\CurrentVersion\AppCompatFlags\... The trick is to make this easy / transparent for the user. A right-click -> properties -> compatibility approach should for now probably be the easiest thing, even if it requires the user to actively make this setting. A larger app compatibility database would be nice, but it would be difficult to figure out what application is being run. And it's also a problem to maintain such a list. Potential solutions: detect failures to load due to missing imports and app crashes and invoke a "compatibility assistent" in that case. Detect first-run of a new application and try to identify it, either based on a hash or based on PE version information. 2. We need a way to provide the application transparently with the environment we want to give it. In terms of DLL exports this could be done on the loader side, making it chose the right DLL, potentially adding a suffix to the DLL name or selecting a different folder other than system32. While this will most likely work good in the majority of cases, it is not 100% transparent. Therefore a mechanism in the kernel, using file system redirection, like it already exists on 64 bit Windows for WoW64, seems to be a more promising approach. The file system redirection would redirect system32 into merged folders, containing the version specific DLLs, while everything that is not existing in this folder will be taken from the original system32. Potential naming scheme: system32.601 system32.602, etc. 3. We need a method to create and maintain the required DLLs for different OS versions. Preferably avoiding bloat by sharing common code in common "parent" DLLs. But also allowing to still plug the DLLs into the related Windows version for testing. This can be tricky. I suggest a DLL import forwarding scheme. This is both to avoid bloat, i.e. avoid to compile and deploy all full blown DLLs for all OS versions, as well as creating a better organized system. So each DLL, lets say ADVAPI32, as located in different version specific system32 folders, would mainly/only consist of forwarders to a "parent" DLL. On Windows we can see this being developed similarly, using "api sets" and redirections made by the loader. Cloning this mechanism 1:1 might not be the right thing though, since it does not address all our requirements. So instead I suggest proving our own custom "parent DLLs". While these could be organized the same way as on Windows 2003, this is probably not optimal. Instead I suggest merging stuff together into 1 or few DLLs (similar to how stuff was combined in kernelbase.dll) This might looks like this (note, that the names are just quickly made up names, I don't claim that they are good) - user32/gdi32 -> ros-win32-core.dll - kernel32/advapi32 -> ros-kernel-base.dll - msvcr* -> ros-crt.dll - ntdll -> ros-ntdll (the kernel would need to load this one) This also allows our DLLs to make use of higher version APIs, by linking them to the parent DLL. Now this obviously introduces a problem when trying to run individual DLLs within a Windows system. To still be able to do this for testing purposes, we need to make sure that they still run there. First, if they import from a custom ros-* DLL, it won't run on Windows without that DLL. So we need the possibility to either statically link these functions, or compile a "helper DLL", that contains these functions, so our DLLs can be run on Windows. If we used a common parent DLL, this also creates the problem of DLL initialization. e.g. the DLL parent for kernel32 and advapi32 would do the initialization for both of these, so this would not be suitable to use when replacing only one of the DLLs. Instead DLL initialization could be done by calling a specific initialization function in the parent DLL from the child DLL. So kernel32!DllMain would call ros-kernel-base!DllMain_kernel32, passing the original parameters as well as a version number, that the parent DLL can use to do version specific initialization. This way The parent DLL would only do the kernel32 initialization, when the related kernel32 child DLL was used, the advapi32 initialization would not be done. There is still a problem: relocation. So we would need to make sure we chose base addresses that still allow us to plug the stuff into Windows without causing everything to relocate, which often simply doesn't work. As an alternative, we should provide a compile time switch to compile specific DLLs in a self-contained way. In terms of structure we could use the MS api-sets as a base for static libraries. Then we can link these either into the parent DLLs like ros-kernel-base.dll or - when a compile switch is given - to link together fully self contained DLLs. I am really not interested in answers like "This is not what WIndows does!", "THIS CANNOT WORK!!!", "You are a ***** even suggesting this", "What if application x parses the import table and disassembles the DLL to hook into internal functions, ...": I am only interested in *constructive* comments. Everything else: -> /dev/null Thanks, Timo

10 years, 1 month

14
25
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 66660: [ADVAPI32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by Thomas Faber

On 2015-03-10 11:10, akhaldi(a)svn.reactos.org wrote: > +if(NOT MSVC) > + add_target_compile_flags(advapi32_winetest "-Wno-format") > +endif() Why are we getting format warnings? Is __WINESRC__ not set correctly?

10 years, 1 month

2
2
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 66658: [NTDLL_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by Jerome Gardou

Hello Amine, Although I agreed to sync our stuff with wine staging, I am not sure it is a good idea to use their tests. My understanding is that patches present in the wine staging tree implement missing features but did not yet pass the wine quality requirement. Although it might be worth it for modules, I'm not sure this is a good idea to include tests which were not proven as good enough. Simply put: I don't want to chase unexisting bugs just because we're using a flaky test suite. Regards Jérôme Le 10/03/2015 11:10, akhaldi(a)svn.reactos.org a écrit : > Author: akhaldi > Date: Tue Mar 10 10:10:04 2015 > New Revision: 66658 > > URL: http://svn.reactos.org/svn/reactos?rev=66658&view=rev > Log: > [NTDLL_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 > > Modified: > trunk/rostests/winetests/ntdll/directory.c > trunk/rostests/winetests/ntdll/exception.c > trunk/rostests/winetests/ntdll/file.c > trunk/rostests/winetests/ntdll/info.c > trunk/rostests/winetests/ntdll/om.c > trunk/rostests/winetests/ntdll/reg.c > trunk/rostests/winetests/ntdll/rtl.c > trunk/rostests/winetests/ntdll/string.c > > Modified: trunk/rostests/winetests/ntdll/directory.c > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/directory… > ============================================================================== > --- trunk/rostests/winetests/ntdll/directory.c [iso-8859-1] (original) > +++ trunk/rostests/winetests/ntdll/directory.c [iso-8859-1] Tue Mar 10 10:10:04 2015 > @@ -51,7 +51,6 @@ > > /* The attribute sets to test */ > static struct testfile_s { > - BOOL todo; /* set if it doesn't work on wine yet */ > BOOL attr_done; /* set if attributes were tested for this file already */ > const DWORD attr; /* desired attribute */ > const char *name; /* filename to use */ > @@ -60,13 +59,13 @@ > int nfound; /* How many were found (expect 1) */ > WCHAR nameW[20]; /* unicode version of name (filled in later) */ > } testfiles[] = { > - { 0, 0, FILE_ATTRIBUTE_NORMAL, "n.tmp", NULL, "normal" }, > - { 1, 0, FILE_ATTRIBUTE_HIDDEN, "h.tmp", NULL, "hidden" }, > - { 1, 0, FILE_ATTRIBUTE_SYSTEM, "s.tmp", NULL, "system" }, > - { 0, 0, FILE_ATTRIBUTE_DIRECTORY, "d.tmp", NULL, "directory" }, > - { 0, 0, FILE_ATTRIBUTE_DIRECTORY, ".", NULL, ". directory" }, > - { 0, 0, FILE_ATTRIBUTE_DIRECTORY, "..", NULL, ".. directory" }, > - { 0, 0, 0, NULL } > + { 0, FILE_ATTRIBUTE_NORMAL, "n.tmp", NULL, "normal" }, > + { 0, FILE_ATTRIBUTE_HIDDEN, "h.tmp", NULL, "hidden" }, > + { 0, FILE_ATTRIBUTE_SYSTEM, "s.tmp", NULL, "system" }, > + { 0, FILE_ATTRIBUTE_DIRECTORY, "d.tmp", NULL, "directory" }, > + { 0, FILE_ATTRIBUTE_DIRECTORY, ".", NULL, ". directory" }, > + { 0, FILE_ATTRIBUTE_DIRECTORY, "..", NULL, ".. directory" }, > + { 0, 0, NULL } > }; > static const int max_test_dir_size = 20; /* size of above plus some for .. etc */ > > @@ -147,12 +146,7 @@ > if (namelen != len || memcmp(nameW, testfiles[i].nameW, len*sizeof(WCHAR))) > continue; > if (!testfiles[i].attr_done) { > - if (testfiles[i].todo) { > - todo_wine > - ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); > - } else { > - ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); > - } > + ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); > testfiles[i].attr_done = TRUE; > } > testfiles[i].nfound++; > > Modified: trunk/rostests/winetests/ntdll/exception.c > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/exception… > ============================================================================== > --- trunk/rostests/winetests/ntdll/exception.c [iso-8859-1] (original) > +++ trunk/rostests/winetests/ntdll/exception.c [iso-8859-1] Tue Mar 10 10:10:04 2015 > @@ -46,11 +46,14 @@ > static PVOID (WINAPI *pRtlUnwind)(PVOID, PVOID, PEXCEPTION_RECORD, PVOID); > static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG first, PVECTORED_EXCEPTION_HANDLER func); > static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID handler); > +static PVOID (WINAPI *pRtlAddVectoredContinueHandler)(ULONG first, PVECTORED_EXCEPTION_HANDLER func); > +static ULONG (WINAPI *pRtlRemoveVectoredContinueHandler)(PVOID handler); > static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); > static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); > static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); > static NTSTATUS (WINAPI *pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG); > static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); > +static NTSTATUS (WINAPI *pNtClose)(HANDLE); > > #if defined(__x86_64__) > static BOOLEAN (CDECL *pRtlAddFunctionTable)(RUNTIME_FUNCTION*, DWORD, DWORD64); > @@ -936,6 +939,16 @@ > /* here we handle exception */ > } > } > + else if (stage == 7 || stage == 8) > + { > + ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE, > + "unexpected exception code %08x, expected %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode, > + EXCEPTION_INVALID_HANDLE); > + ok(de.u.Exception.ExceptionRecord.NumberParameters == 0, > + "unexpected number of parameters %d, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters); > + > + if (stage == 8) continuestatus = DBG_EXCEPTION_NOT_HANDLED; > + } > else > ok(FALSE, "unexpected stage %x\n", stage); > > @@ -1695,6 +1708,7 @@ > > #endif /* __x86_64__ */ > > +#if defined(__i386__) || defined(__x86_64__) > static DWORD outputdebugstring_exceptions; > > static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) > @@ -1713,7 +1727,7 @@ > return EXCEPTION_CONTINUE_SEARCH; > } > > -static void test_outputdebugstring(DWORD numexc, BOOL todo) > +static void test_outputdebugstring(DWORD numexc) > { > PVOID vectored_handler; > > @@ -1728,13 +1742,8 @@ > > outputdebugstring_exceptions = 0; > OutputDebugStringA("Hello World"); > - if (todo) > - todo_wine > - ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", > - outputdebugstring_exceptions, numexc); > - else > - ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", > - outputdebugstring_exceptions, numexc); > + ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", > + outputdebugstring_exceptions, numexc); > > pRtlRemoveVectoredExceptionHandler(vectored_handler); > } > @@ -1788,6 +1797,91 @@ > pRtlRemoveVectoredExceptionHandler(vectored_handler); > } > > +static DWORD invalid_handle_exceptions; > + > +static LONG CALLBACK invalid_handle_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) > +{ > + PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; > + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); > + > + ok(rec->ExceptionCode == EXCEPTION_INVALID_HANDLE, "ExceptionCode is %08x instead of %08x\n", > + rec->ExceptionCode, EXCEPTION_INVALID_HANDLE); > + ok(rec->NumberParameters == 0, "ExceptionParameters is %d instead of 0\n", rec->NumberParameters); > + > + invalid_handle_exceptions++; > + return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; > +} > + > +static void test_closehandle(DWORD numexc) > +{ > + PVOID vectored_handler; > + NTSTATUS status; > + DWORD res; > + > + if (!pRtlAddVectoredExceptionHandler || !pRtlRemoveVectoredExceptionHandler || !pRtlRaiseException) > + { > + skip("RtlAddVectoredExceptionHandler or RtlRemoveVectoredExceptionHandler or RtlRaiseException not found\n"); > + return; > + } > + > + vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &invalid_handle_vectored_handler); > + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); > + > + invalid_handle_exceptions = 0; > + res = CloseHandle((HANDLE)0xdeadbeef); > + ok(!res, "CloseHandle(0xdeadbeef) unexpectedly succeeded\n"); > + ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error code %d instead of %d", > + GetLastError(), ERROR_INVALID_HANDLE); > + ok(invalid_handle_exceptions == numexc, "CloseHandle generated %d exceptions, expected %d\n", > + invalid_handle_exceptions, numexc); > + > + invalid_handle_exceptions = 0; > + status = pNtClose((HANDLE)0xdeadbeef); > + ok(status == STATUS_INVALID_HANDLE, "NtClose(0xdeadbeef) returned status %08x\n", status); > + ok(invalid_handle_exceptions == numexc, "NtClose generated %d exceptions, expected %d\n", > + invalid_handle_exceptions, numexc); > + > + pRtlRemoveVectoredExceptionHandler(vectored_handler); > +} > + > +static void test_vectored_continue_handler(void) > +{ > + PVOID handler1, handler2; > + ULONG ret; > + > + if (!pRtlAddVectoredContinueHandler || !pRtlRemoveVectoredContinueHandler) > + { > + skip("RtlAddVectoredContinueHandler or RtlRemoveVectoredContinueHandler not found\n"); > + return; > + } > + > + handler1 = pRtlAddVectoredContinueHandler(TRUE, (void *)0xdeadbeef); > + ok(handler1 != 0, "RtlAddVectoredContinueHandler failed\n"); > + > + handler2 = pRtlAddVectoredContinueHandler(TRUE, (void *)0xdeadbeef); > + ok(handler2 != 0, "RtlAddVectoredContinueHandler failed\n"); > + ok(handler1 != handler2, "RtlAddVectoredContinueHandler returned same handler\n"); > + > + if (pRtlRemoveVectoredExceptionHandler) > + { > + ret = pRtlRemoveVectoredExceptionHandler(handler1); > + ok(!ret, "RtlRemoveVectoredExceptionHandler succeeded\n"); > + } > + > + ret = pRtlRemoveVectoredContinueHandler(handler1); > + ok(ret, "RtlRemoveVectoredContinueHandler failed\n"); > + > + ret = pRtlRemoveVectoredContinueHandler(handler2); > + ok(ret, "RtlRemoveVectoredContinueHandler failed\n"); > + > + ret = pRtlRemoveVectoredContinueHandler(handler1); > + ok(!ret, "RtlRemoveVectoredContinueHandler succeeded\n"); > + > + ret = pRtlRemoveVectoredContinueHandler((void *)0x11223344); > + ok(!ret, "RtlRemoveVectoredContinueHandler succeeded\n"); > +} > +#endif /* defined(__i386__) || defined(__x86_64__) */ > + > START_TEST(exception) > { > HMODULE hntdll = GetModuleHandleA("ntdll.dll"); > @@ -1802,6 +1896,7 @@ > pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" ); > pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" ); > pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" ); > + pNtClose = (void *)GetProcAddress( hntdll, "NtClose" ); > pRtlUnwind = (void *)GetProcAddress( hntdll, "RtlUnwind" ); > pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" ); > pNtTerminateProcess = (void *)GetProcAddress( hntdll, "NtTerminateProcess" ); > @@ -1809,6 +1904,10 @@ > "RtlAddVectoredExceptionHandler" ); > pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, > "RtlRemoveVectoredExceptionHandler" ); > + pRtlAddVectoredContinueHandler = (void *)GetProcAddress( hntdll, > + "RtlAddVectoredContinueHandler" ); > + pRtlRemoveVectoredContinueHandler = (void *)GetProcAddress( hntdll, > + "RtlRemoveVectoredContinueHandler" ); > pNtQueryInformationProcess = (void*)GetProcAddress( hntdll, > "NtQueryInformationProcess" ); > pNtSetInformationProcess = (void*)GetProcAddress( hntdll, > @@ -1858,13 +1957,17 @@ > run_rtlraiseexception_test(EXCEPTION_BREAKPOINT); > run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); > test_stage = 3; > - test_outputdebugstring(0, FALSE); > + test_outputdebugstring(0); > test_stage = 4; > - test_outputdebugstring(2, TRUE); /* is this a Windows bug? */ > + test_outputdebugstring(2); > test_stage = 5; > test_ripevent(0); > test_stage = 6; > test_ripevent(1); > + test_stage = 7; > + test_closehandle(0); > + test_stage = 8; > + test_closehandle(1); > } > else > skip( "RtlRaiseException not found\n" ); > @@ -1876,8 +1979,10 @@ > test_unwind(); > test_exceptions(); > test_rtlraiseexception(); > - test_outputdebugstring(1, FALSE); > + test_outputdebugstring(1); > test_ripevent(1); > + test_closehandle(0); > + test_vectored_continue_handler(); > test_debugger(); > test_simd_exceptions(); > test_fpu_exceptions(); > @@ -1894,8 +1999,10 @@ > pRtlLookupFunctionEntry = (void *)GetProcAddress( hntdll, > "RtlLookupFunctionEntry" ); > > - test_outputdebugstring(1, FALSE); > + test_outputdebugstring(1); > test_ripevent(1); > + test_closehandle(0); > + test_vectored_continue_handler(); > test_virtual_unwind(); > > if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) > > Modified: trunk/rostests/winetests/ntdll/file.c > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/file.c?re… > ============================================================================== > --- trunk/rostests/winetests/ntdll/file.c [iso-8859-1] (original) > +++ trunk/rostests/winetests/ntdll/file.c [iso-8859-1] Tue Mar 10 10:10:04 2015 > @@ -37,6 +37,33 @@ > #include "winternl.h" > #include "winuser.h" > #include "wine/winioctl.h" > + > +/* FIXME */ > +typedef struct _REPARSE_DATA_BUFFER { > + ULONG ReparseTag; > + USHORT ReparseDataLength; > + USHORT Reserved; > + _ANONYMOUS_UNION union { > + struct { > + USHORT SubstituteNameOffset; > + USHORT SubstituteNameLength; > + USHORT PrintNameOffset; > + USHORT PrintNameLength; > + ULONG Flags; > + WCHAR PathBuffer[1]; > + } SymbolicLinkReparseBuffer; > + struct { > + USHORT SubstituteNameOffset; > + USHORT SubstituteNameLength; > + USHORT PrintNameOffset; > + USHORT PrintNameLength; > + WCHAR PathBuffer[1]; > + } MountPointReparseBuffer; > + struct { > + UCHAR DataBuffer[1]; > + } GenericReparseBuffer; > + } DUMMYUNIONNAME; > +} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER; > > #ifndef IO_COMPLETION_ALL_ACCESS > #define IO_COMPLETION_ALL_ACCESS 0x001F0003 > @@ -1234,7 +1261,7 @@ > memset(&fbi, 0, sizeof(fbi)); > res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); > ok ( res == STATUS_SUCCESS, "can't get attributes\n"); > - todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %x not FILE_ATTRIBUTE_SYSTEM\n", fbi.FileAttributes ); > + ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %x not FILE_ATTRIBUTE_SYSTEM (ok in old linux without xattr)\n", fbi.FileAttributes ); > > /* Then HIDDEN */ > memset(&fbi, 0, sizeof(fbi)); > @@ -1247,7 +1274,7 @@ > memset(&fbi, 0, sizeof(fbi)); > res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); > ok ( res == STATUS_SUCCESS, "can't get attributes\n"); > - todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %x not FILE_ATTRIBUTE_HIDDEN\n", fbi.FileAttributes ); > + ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %x not FILE_ATTRIBUTE_HIDDEN (ok in old linux without xattr)\n", fbi.FileAttributes ); > > /* Check NORMAL last of all (to make sure we can clear attributes) */ > memset(&fbi, 0, sizeof(fbi)); > @@ -1304,7 +1331,7 @@ > memset(&fai_buf.fai, 0, sizeof(fai_buf.fai)); > res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); > ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); > - todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %x not FILE_ATTRIBUTE_SYSTEM\n", fai_buf.fai.BasicInformation.FileAttributes ); > + ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %x not FILE_ATTRIBUTE_SYSTEM (ok in old linux without xattr)\n", fai_buf.fai.BasicInformation.FileAttributes ); > > /* Then HIDDEN */ > memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation)); > @@ -1317,7 +1344,7 @@ > memset(&fai_buf.fai, 0, sizeof(fai_buf.fai)); > res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); > ok ( res == STATUS_SUCCESS, "can't get attributes\n"); > - todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %x not FILE_ATTRIBUTE_HIDDEN\n", fai_buf.fai.BasicInformation.FileAttributes ); > + ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %x not FILE_ATTRIBUTE_HIDDEN (ok in old linux without xattr)\n", fai_buf.fai.BasicInformation.FileAttributes ); > > /* Check NORMAL last of all (to make sure we can clear attributes) */ > memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation)); > @@ -1371,7 +1398,6 @@ > ok( res == STATUS_INVALID_INFO_CLASS || res == STATUS_NOT_IMPLEMENTED, "Unexpected NtQueryInformationFile result (expected STATUS_INVALID_INFO_CLASS, got %x)\n", res ); > fdi.DoDeleteFile = TRUE; > res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); > - todo_wine > ok( res == STATUS_ACCESS_DENIED, "unexpected FileDispositionInformation result (expected STATUS_ACCESS_DENIED, got %x)\n", res ); > CloseHandle( handle ); > fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; > @@ -1384,12 +1410,24 @@ > ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); > fdi.DoDeleteFile = TRUE; > res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); > - todo_wine > ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); > CloseHandle( handle ); > fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; > - todo_wine > ok( fileDeleted, "File should have been deleted\n" ); > + DeleteFileA( buffer ); > + > + /* cannot set disposition on readonly file */ > + GetTempFileNameA( tmp_path, "dis", 0, buffer ); > + DeleteFileA( buffer ); > + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); > + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); > + fdi.DoDeleteFile = TRUE; > + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); > + ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res ); > + CloseHandle( handle ); > + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; > + ok( !fileDeleted, "File shouldn't have been deleted\n" ); > + SetFileAttributesA( buffer, FILE_ATTRIBUTE_NORMAL ); > DeleteFileA( buffer ); > > /* cannot set disposition on readonly file */ > @@ -1402,6 +1440,21 @@ > ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res ); > CloseHandle( handle ); > fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; > + todo_wine > + ok( !fileDeleted, "File shouldn't have been deleted\n" ); > + SetFileAttributesA( buffer, FILE_ATTRIBUTE_NORMAL ); > + DeleteFileA( buffer ); > + > + /* cannot set disposition on readonly file */ > + GetTempFileNameA( tmp_path, "dis", 0, buffer ); > + DeleteFileA( buffer ); > + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); > + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); > + fdi.DoDeleteFile = TRUE; > + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); > + ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res ); > + CloseHandle( handle ); > + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; > ok( !fileDeleted, "File shouldn't have been deleted\n" ); > SetFileAttributesA( buffer, FILE_ATTRIBUTE_NORMAL ); > DeleteFileA( buffer ); > @@ -1412,11 +1465,9 @@ > ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); > fdi.DoDeleteFile = TRUE; > res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); > - todo_wine > ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); > fdi.DoDeleteFile = FALSE; > res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); > - todo_wine > ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); > CloseHandle( handle ); > fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; > @@ -1429,7 +1480,6 @@ > ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); > fdi.DoDeleteFile = FALSE; > res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); > - todo_wine > ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); > CloseHandle( handle ); > fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; > @@ -1444,7 +1494,6 @@ > CloseHandle( handle ); > fdi.DoDeleteFile = FALSE; > res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation ); > - todo_wine > ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); > CloseHandle( handle2 ); > fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; > @@ -1459,11 +1508,9 @@ > ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); > fdi.DoDeleteFile = TRUE; > res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); > - todo_wine > ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); > CloseHandle( handle ); > fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; > - todo_wine > ok( fileDeleted, "Directory should have been deleted\n" ); > RemoveDirectoryA( buffer ); > > @@ -1476,7 +1523,6 @@ > RemoveDirectoryA( buffer ); > fdi.DoDeleteFile = FALSE; > res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); > - todo_wine > ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); > CloseHandle( handle ); > fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; > @@ -1501,6 +1547,7 @@ > buffer[dirpos] = '\0'; > CloseHandle( handle ); > fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; > + todo_wine > ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); > RemoveDirectoryA( buffer ); > } > @@ -2683,6 +2730,178 @@ > CloseHandle(hfile); > } > > +static INT build_reparse_buffer(WCHAR *filename, REPARSE_DATA_BUFFER **pbuffer) > +{ > + REPARSE_DATA_BUFFER *buffer; > + INT buffer_len, string_len; > + WCHAR *dest; > + > + string_len = (lstrlenW(filename)+1)*sizeof(WCHAR); > + buffer_len = FIELD_OFFSET(REPARSE_DATA_BUFFER, MountPointReparseBuffer.PathBuffer[1]) + string_len; > + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buffer_len); > + buffer->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; > + buffer->ReparseDataLength = sizeof(buffer->MountPointReparseBuffer) + string_len; > + buffer->MountPointReparseBuffer.SubstituteNameLength = string_len - sizeof(WCHAR); > + buffer->MountPointReparseBuffer.PrintNameOffset = string_len; > + dest = &buffer->MountPointReparseBuffer.PathBuffer[0]; > + memcpy(dest, filename, string_len); > + *pbuffer = buffer; > + return buffer_len; > +} > + > +static void test_junction_points(void) > +{ > + static const WCHAR junctionW[] = {'\\','j','u','n','c','t','i','o','n',0}; > + WCHAR path[MAX_PATH], junction_path[MAX_PATH], target_path[MAX_PATH]; > + static const WCHAR targetW[] = {'\\','t','a','r','g','e','t',0}; > + FILE_BASIC_INFORMATION old_attrib, new_attrib; > + static const WCHAR fooW[] = {'f','o','o',0}; > + static WCHAR volW[] = {'c',':','\\',0}; > + REPARSE_GUID_DATA_BUFFER guid_buffer; > + static const WCHAR dotW[] = {'.',0}; > + REPARSE_DATA_BUFFER *buffer = NULL; > + DWORD dwret, dwLen, dwFlags, err; > + INT buffer_len, string_len; > + IO_STATUS_BLOCK iosb; > + UNICODE_STRING nameW; > + HANDLE hJunction; > + WCHAR *dest; > + BOOL bret; > + > + /* Create a temporary folder for the junction point tests */ > + GetTempFileNameW(dotW, fooW, 0, path); > + DeleteFileW(path); > + if (!CreateDirectoryW(path, NULL)) > + { > + win_skip("Unable to create a temporary junction point directory.\n"); > + return; > + } > + > + /* Check that the volume this folder is located on supports junction points */ > + pRtlDosPathNameToNtPathName_U(path, &nameW, NULL, NULL); > + volW[0] = nameW.Buffer[4]; > + pRtlFreeUnicodeString( &nameW ); > + GetVolumeInformationW(volW, 0, 0, 0, &dwLen, &dwFlags, 0, 0); > + if (!(dwFlags & FILE_SUPPORTS_REPARSE_POINTS)) > + { > + skip("File system does not support junction points.\n"); > + RemoveDirectoryW(path); > + return; > + } > + > + /* Create the folder to be replaced by a junction point */ > + lstrcpyW(junction_path, path); > + lstrcatW(junction_path, junctionW); > + bret = CreateDirectoryW(junction_path, NULL); > + ok(bret, "Failed to create junction point directory.\n"); > + > + /* Create a destination folder for the junction point to target */ > + lstrcpyW(target_path, path); > + lstrcatW(target_path, targetW); > + bret = CreateDirectoryW(target_path, NULL); > + ok(bret, "Failed to create junction point target directory.\n"); > + pRtlDosPathNameToNtPathName_U(target_path, &nameW, NULL, NULL); > + > + /* Create the junction point */ > + hJunction = CreateFileW(junction_path, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, > + FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, 0); > + if (hJunction == INVALID_HANDLE_VALUE) > + { > + win_skip("Failed to open junction point directory handle (0x%x).\n", GetLastError()); > + goto cleanup; > + } > + dwret = NtQueryInformationFile(hJunction, &iosb, &old_attrib, sizeof(old_attrib), FileBasicInformation); > + ok(dwret == STATUS_SUCCESS, "Failed to get junction point folder's attributes (0x%x).\n", dwret); > + buffer_len = build_reparse_buffer(nameW.Buffer, &buffer); > + bret = DeviceIoControl(hJunction, FSCTL_SET_REPARSE_POINT, (LPVOID)buffer, buffer_len, NULL, 0, &dwret, 0); > + ok(bret, "Failed to create junction point! (0x%x)\n", GetLastError()); > + > + /* Check the file attributes of the junction point */ > + dwret = GetFileAttributesW(junction_path); > + ok(dwret != (DWORD)~0, "Junction point doesn't exist (attributes: 0x%x)!\n", dwret); > + ok(dwret & FILE_ATTRIBUTE_REPARSE_POINT, "File is not a junction point! (attributes: %d)\n", dwret); > + > + /* Read back the junction point */ > + HeapFree(GetProcessHeap(), 0, buffer); > + buffer_len = sizeof(*buffer) + MAX_PATH*sizeof(WCHAR); > + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buffer_len); > + bret = DeviceIoControl(hJunction, FSCTL_GET_REPARSE_POINT, NULL, 0, (LPVOID)buffer, buffer_len, &dwret, 0); > + string_len = buffer->MountPointReparseBuffer.SubstituteNameLength; > + dest = &buffer->MountPointReparseBuffer.PathBuffer[buffer->MountPointReparseBuffer.SubstituteNameOffset/sizeof(WCHAR)]; > + ok(bret, "Failed to read junction point!\n"); > + ok((memcmp(dest, nameW.Buffer, string_len) == 0), "Junction point destination does not match ('%s' != '%s')!\n", > + wine_dbgstr_w(dest), wine_dbgstr_w(nameW.Buffer)); > + > + /* Delete the junction point */ > + memset(&old_attrib, 0x00, sizeof(old_attrib)); > + old_attrib.LastAccessTime.QuadPart = 0x200deadcafebeef; > + dwret = NtSetInformationFile(hJunction, &iosb, &old_attrib, sizeof(old_attrib), FileBasicInformation); > + ok(dwret == STATUS_SUCCESS, "Failed to set junction point folder's attributes (0x%x).\n", dwret); > + memset(&guid_buffer, 0x00, sizeof(guid_buffer)); > + guid_buffer.ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; > + bret = DeviceIoControl(hJunction, FSCTL_DELETE_REPARSE_POINT, (LPVOID)&guid_buffer, > + REPARSE_GUID_DATA_BUFFER_HEADER_SIZE, NULL, 0, &dwret, 0); > + ok(bret, "Failed to delete junction point! (0x%x)\n", GetLastError()); > + memset(&new_attrib, 0x00, sizeof(new_attrib)); > + dwret = NtQueryInformationFile(hJunction, &iosb, &new_attrib, sizeof(new_attrib), FileBasicInformation); > + ok(dwret == STATUS_SUCCESS, "Failed to get junction point folder's attributes (0x%x).\n", dwret); > + ok(old_attrib.LastAccessTime.QuadPart == new_attrib.LastAccessTime.QuadPart, > + "Junction point folder's access time does not match (0x%llx != 0x%llx).\n", > + new_attrib.LastAccessTime.QuadPart, old_attrib.LastAccessTime.QuadPart); > + CloseHandle(hJunction); > + > + /* Check deleting a junction point as if it were a directory */ > + HeapFree(GetProcessHeap(), 0, buffer); > + hJunction = CreateFileW(junction_path, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, > + FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, 0); > + buffer_len = build_reparse_buffer(nameW.Buffer, &buffer); > + bret = DeviceIoControl(hJunction, FSCTL_SET_REPARSE_POINT, (LPVOID)buffer, buffer_len, NULL, 0, &dwret, 0); > + ok(bret, "Failed to create junction point! (0x%x)\n", GetLastError()); > + CloseHandle(hJunction); > + bret = RemoveDirectoryW(junction_path); > + ok(bret, "Failed to delete junction point as directory!\n"); > + dwret = GetFileAttributesW(junction_path); > + ok(dwret == (DWORD)~0, "Junction point still exists (attributes: 0x%x)!\n", dwret); > + > + /* Check deleting a junction point as if it were a file */ > + HeapFree(GetProcessHeap(), 0, buffer); > + bret = CreateDirectoryW(junction_path, NULL); > + ok(bret, "Failed to create junction point target directory.\n"); > + hJunction = CreateFileW(junction_path, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, > + FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, 0); > + buffer_len = build_reparse_buffer(nameW.Buffer, &buffer); > + bret = DeviceIoControl(hJunction, FSCTL_SET_REPARSE_POINT, (LPVOID)buffer, buffer_len, NULL, 0, &dwret, 0); > + ok(bret, "Failed to create junction point! (0x%x)\n", GetLastError()); > + CloseHandle(hJunction); > + bret = DeleteFileW(junction_path); > + ok(!bret, "Succeeded in deleting junction point as file!\n"); > + err = GetLastError(); > + ok(err == ERROR_ACCESS_DENIED, "Expected last error 0x%x for DeleteFile on junction point (actually 0x%x)!\n", > + ERROR_ACCESS_DENIED, err); > + dwret = GetFileAttributesW(junction_path); > + ok(dwret != (DWORD)~0, "Junction point doesn't exist (attributes: 0x%x)!\n", dwret); > + ok(dwret & FILE_ATTRIBUTE_REPARSE_POINT, "File is not a junction point! (attributes: 0x%x)\n", dwret); > + > + /* Test deleting a junction point's target */ > + dwret = GetFileAttributesW(junction_path); > + ok(dwret == 0x410 || broken(dwret == 0x430) /* win2k */, > + "Unexpected junction point attributes (0x%x != 0x410)!\n", dwret); > + bret = RemoveDirectoryW(target_path); > + ok(bret, "Failed to delete junction point target!\n"); > + bret = CreateDirectoryW(target_path, NULL); > + ok(bret, "Failed to create junction point target directory.\n"); > + > +cleanup: > + /* Cleanup */ > + pRtlFreeUnicodeString( &nameW ); > + HeapFree(GetProcessHeap(), 0, buffer); > + bret = RemoveDirectoryW(junction_path); > + ok(bret, "Failed to remove temporary junction point directory!\n"); > + bret = RemoveDirectoryW(target_path); > + ok(bret, "Failed to remove temporary target directory!\n"); > + RemoveDirectoryW(path); > +} > + > START_TEST(file) > { > HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); > @@ -2736,4 +2955,5 @@ > test_file_disposition_information(); > test_query_volume_information_file(); > test_query_attribute_information_file(); > + test_junction_points(); > } > > Modified: trunk/rostests/winetests/ntdll/info.c > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/info.c?re… > ============================================================================== > --- trunk/rostests/winetests/ntdll/info.c [iso-8859-1] (original) > +++ trunk/rostests/winetests/ntdll/info.c [iso-8859-1] Tue Mar 10 10:10:04 2015 > @@ -737,6 +737,84 @@ > HeapFree(GetProcessHeap(), 0, ppi); > } > > +static void test_query_process_wow64(void) > +{ > + NTSTATUS status; > + ULONG ReturnLength; > + ULONG_PTR pbi[2], dummy; > + > + memset(&dummy, 0xcc, sizeof(dummy)); > + > + /* Do not give a handle and buffer */ > + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, NULL, 0, NULL); > + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); > + > + /* Use a correct info class and buffer size, but still no handle and buffer */ > + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, NULL, sizeof(ULONG_PTR), NULL); > + ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, > + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE, got %08x\n", status); > + > + /* Use a correct info class, buffer size and handle, but no buffer */ > + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, NULL, sizeof(ULONG_PTR), NULL); > + ok( status == STATUS_ACCESS_VIOLATION , "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); > + > + /* Use a correct info class, buffer and buffer size, but no handle */ > + pbi[0] = pbi[1] = dummy; > + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL); > + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); > + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); > + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); > + > + /* Use a greater buffer size */ > + pbi[0] = pbi[1] = dummy; > + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, pbi, sizeof(ULONG_PTR) + 1, NULL); > + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); > + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); > + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); > + > + /* Use no ReturnLength */ > + pbi[0] = pbi[1] = dummy; > + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL); > + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); > + trace( "Platform is_wow64 %d, ProcessInformation of ProcessWow64Information %lx\n", is_wow64, pbi[0]); > + ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %lx\n", is_wow64, pbi[0]); > + ok( pbi[0] != dummy, "pbi[0] %lx\n", pbi[0]); > + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); > + /* Test written size on 64 bit by checking high 32 bit buffer */ > + if (sizeof(ULONG_PTR) > sizeof(DWORD)) > + { > + DWORD *ptr = (DWORD *)pbi; > + ok( ptr[1] != (DWORD)dummy, "ptr[1] unchanged!\n"); > + } > + > + /* Finally some correct calls */ > + pbi[0] = pbi[1] = dummy; > + ReturnLength = 0xdeadbeef; > + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), &ReturnLength); > + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); > + ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %lx\n", is_wow64, pbi[0]); > + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); > + ok( ReturnLength == sizeof(ULONG_PTR), "Inconsistent length %d\n", ReturnLength); > + > + /* Everything is correct except a too small buffer size */ > + pbi[0] = pbi[1] = dummy; > + ReturnLength = 0xdeadbeef; > + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR) - 1, &ReturnLength); > + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); > + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); > + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); > + todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", ReturnLength); > + > + /* Everything is correct except a too large buffer size */ > + pbi[0] = pbi[1] = dummy; > + ReturnLength = 0xdeadbeef; > + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR) + 1, &ReturnLength); > + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); > + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); > + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); > + todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", ReturnLength); > +} > + > static void test_query_process_basic(void) > { > NTSTATUS status; > @@ -1714,6 +1792,10 @@ > trace("Starting test_query_process_handlecount()\n"); > test_query_process_handlecount(); > > + /* 0x1A ProcessWow64Information */ > + trace("Starting test_query_process_wow64()\n"); > + test_query_process_wow64(); > + > /* 0x1B ProcessImageFileName */ > trace("Starting test_query_process_image_file_name()\n"); > test_query_process_image_file_name(); > > Modified: trunk/rostests/winetests/ntdll/om.c > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/om.c?rev=… > ============================================================================== > --- trunk/rostests/winetests/ntdll/om.c [iso-8859-1] (original) > +++ trunk/rostests/winetests/ntdll/om.c [iso-8859-1] Tue Mar 10 10:10:04 2015 > @@ -835,14 +835,14 @@ > status = pNtOpenEvent(&Event2, GENERIC_ALL, &attr); > ok( status == STATUS_SUCCESS, "NtOpenEvent failed %08x\n", status ); > > - status = pNtClose(Event); > + pNtClose(Event); > > status = pNtQueryEvent(Event2, EventBasicInformation, &info, sizeof(info), NULL); > ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); > ok( info.EventType == 1 && info.EventState == 0, > "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); > > - status = pNtClose(Event2); > + pNtClose(Event2); > } > > static const WCHAR keyed_nameW[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s', > > Modified: trunk/rostests/winetests/ntdll/reg.c > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/reg.c?rev… > ============================================================================== > --- trunk/rostests/winetests/ntdll/reg.c [iso-8859-1] (original) > +++ trunk/rostests/winetests/ntdll/reg.c [iso-8859-1] Tue Mar 10 10:10:04 2015 > @@ -129,11 +129,14 @@ > static NTSTATUS (WINAPI * pNtCreateKey)( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, > ULONG TitleIndex, const UNICODE_STRING *class, ULONG options, > PULONG dispos ); > +static NTSTATUS (WINAPI * pNtQueryKey)(HANDLE,KEY_INFORMATION_CLASS,PVOID,ULONG,PULONG); > +static NTSTATUS (WINAPI * pNtQueryLicenseValue)(const UNICODE_STRING *,ULONG *,PVOID,ULONG,ULONG *); > static NTSTATUS (WINAPI * pNtQueryValueKey)(HANDLE,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS,void *,DWORD,DWORD *); > static NTSTATUS (WINAPI * pNtSetValueKey)(HANDLE, const PUNICODE_STRING, ULONG, > ULONG, const void*, ULONG ); > static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE,PROCESSINFOCLASS,PVOID,ULONG,PULONG); > static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(PUNICODE_STRING); > +static LONG (WINAPI * pRtlCompareUnicodeString)(const PUNICODE_STRING,const PUNICODE_STRING,BOOLEAN); > static BOOLEAN (WINAPI * pRtlCreateUnicodeString)(PUNICODE_STRING, LPCWSTR); > static LPVOID (WINAPI * pRtlReAllocateHeap)(IN PVOID, IN ULONG, IN PVOID, IN ULONG); > static NTSTATUS (WINAPI * pRtlAppendUnicodeToString)(PUNICODE_STRING, PCWSTR); > @@ -166,7 +169,6 @@ > NTDLL_GET_PROC(RtlCreateUnicodeStringFromAsciiz) > NTDLL_GET_PROC(RtlCreateUnicodeString) > NTDLL_GET_PROC(RtlFreeUnicodeString) > - NTDLL_GET_PROC(NtDeleteValueKey) > NTDLL_GET_PROC(RtlQueryRegistryValues) > NTDLL_GET_PROC(RtlCheckRegistryKey) > NTDLL_GET_PROC(RtlOpenCurrentUser) > @@ -175,11 +177,13 @@ > NTDLL_GET_PROC(NtCreateKey) > NTDLL_GET_PROC(NtFlushKey) > NTDLL_GET_PROC(NtDeleteKey) > + NTDLL_GET_PROC(NtQueryKey) > NTDLL_GET_PROC(NtQueryValueKey) > NTDLL_GET_PROC(NtQueryInformationProcess) > NTDLL_GET_PROC(NtSetValueKey) > NTDLL_GET_PROC(NtOpenKey) > NTDLL_GET_PROC(RtlFormatCurrentUserKeyPath) > + NTDLL_GET_PROC(RtlCompareUnicodeString) > NTDLL_GET_PROC(RtlReAllocateHeap) > NTDLL_GET_PROC(RtlAppendUnicodeToString) > NTDLL_GET_PROC(RtlUnicodeStringToAnsiString) > @@ -188,6 +192,10 @@ > NTDLL_GET_PROC(RtlZeroMemory) > NTDLL_GET_PROC(RtlpNtQueryValueKey) > NTDLL_GET_PROC(RtlOpenCurrentUser) > + > + /* optional functions */ > + pNtQueryLicenseValue = (void *)GetProcAddress(hntdll, "NtQueryLicenseValue"); > + > return TRUE; > } > #undef NTDLL_GET_PROC > @@ -640,6 +648,180 @@ > > status = pNtDeleteKey(hkey); > ok(status == STATUS_SUCCESS, "NtDeleteKey Failed: 0x%08x\n", status); > +} > + > +static void test_NtQueryLicenseKey(void) > +{ > + static const WCHAR emptyW[] = {'E','M','P','T','Y',0}; > + UNICODE_STRING name; > + WORD buffer[32]; > + NTSTATUS status; > + ULONG type, len; > + DWORD value; > + > + if (!pNtQueryLicenseValue) > + { > + win_skip("NtQueryLicenseValue not found, skipping tests\n"); > + return; > + } > + > + type = 0xdead; > + len = 0xbeef; > + memset(&name, 0, sizeof(name)); > + status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len); > + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); > + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); > + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); > + > + /* test with empty key */ > + pRtlCreateUnicodeStringFromAsciiz(&name, ""); > + > + type = 0xdead; > + len = 0xbeef; > + status = pNtQueryLicenseValue(NULL, &type, buffer, sizeof(buffer), &len); > + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); > + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); > + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); > + > + type = 0xdead; > + status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), NULL); > + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); > + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); > + > + len = 0xbeef; > + status = pNtQueryLicenseValue(&name, NULL, buffer, sizeof(buffer), &len); > + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); > + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); > + > + type = 0xdead; > + len = 0xbeef; > + status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len); > + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); > + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); > + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); > + > + pRtlFreeUnicodeString(&name); > + > + /* test with nonexistent licence key */ > + pRtlCreateUnicodeStringFromAsciiz(&name, "Nonexistent-License-Value"); > + > + type = 0xdead; > + len = 0xbeef; > + status = pNtQueryLicenseValue(NULL, &type, buffer, sizeof(buffer), &len); > + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); > + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); > + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); > + > + type = 0xdead; > + status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), NULL); > + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); > + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); > + > + len = 0xbeef; > + status = pNtQueryLicenseValue(&name, NULL, buffer, sizeof(buffer), &len); > + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue returned %08x, expected STATUS_OBJECT_NAME_NOT_FOUND\n", status); > + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); > + > + type = 0xdead; > + len = 0xbeef; > + status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len); > + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue unexpected suceeded\n"); > + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); > + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); > + > + pRtlFreeUnicodeString(&name); > + > + /* test with REG_SZ license key */ > + pRtlCreateUnicodeStringFromAsciiz(&name, "Kernel-MUI-Language-Allowed"); > + > + type = 0xdead; > + len = 0xbeef; > + status = pNtQueryLicenseValue(NULL, &type, buffer, sizeof(buffer), &len); > + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); > + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); > + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); > + > + type = 0xdead; > + status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), NULL); > + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); > + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); > + > + type = 0xdead; > + len = 0; > + status = pNtQueryLicenseValue(&name, &type, buffer, 0, &len); > + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status); > + ok(type == REG_SZ, "expected type = REG_SZ, got %u\n", type); > + ok(len == sizeof(emptyW), "expected len = %u, got %u\n", (DWORD)sizeof(emptyW), len); > + > + len = 0; > + status = pNtQueryLicenseValue(&name, NULL, buffer, 0, &len); > + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status); > + ok(len == sizeof(emptyW), "expected len = %u, got %u\n", (DWORD)sizeof(emptyW), len); > + > + type = 0xdead; > + len = 0; > + memset(buffer, 0x11, sizeof(buffer)); > + status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len); > + ok(status == STATUS_SUCCESS, "NtQueryLicenseValue returned %08x, expected STATUS_SUCCESS\n", status); > + ok(type == REG_SZ, "expected type = REG_SZ, got %u\n", type); > + ok(len == sizeof(emptyW), "expected len = %u, got %u\n", (DWORD)sizeof(emptyW), len); > + ok(!memcmp(buffer, emptyW, sizeof(emptyW)), "unexpected buffer content\n"); > + > + type = 0xdead; > + len = 0; > + memset(buffer, 0x11, sizeof(buffer)); > + status = pNtQueryLicenseValue(&name, &type, buffer, 2, &len); > + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status); > + ok(type == REG_SZ, "expected type REG_SZ, got %u\n", type); > + ok(len == sizeof(emptyW), "expected len = %u, got %u\n", (DWORD)sizeof(emptyW), len); > + ok(buffer[0] == 0x1111, "expected buffer[0] = 0x1111, got %u\n", buffer[0]); > + > + pRtlFreeUnicodeString(&name); > + > + /* test with REG_DWORD license key */ > + pRtlCreateUnicodeStringFromAsciiz(&name, "Kernel-MUI-Number-Allowed"); > + > + type = 0xdead; > + len = 0xbeef; > + status = pNtQueryLicenseValue(NULL, &type, &value, sizeof(value), &len); > + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); > + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); > + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); > + > + type = 0xdead; > + status = pNtQueryLicenseValue(&name, &type, &value, sizeof(value), NULL); > + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); > + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); > + > + type = 0xdead; > + len = 0; > + status = pNtQueryLicenseValue(&name, &type, &value, 0, &len); > + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status); > + ok(type == REG_DWORD, "expected type = REG_DWORD, got %u\n", type); > + ok(len == sizeof(value), "expected len = %u, got %u\n", (DWORD)sizeof(value), len); > + > + len = 0; > + status = pNtQueryLicenseValue(&name, NULL, &value, 0, &len); > + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status); > + ok(len == sizeof(value), "expected len = %u, got %u\n", (DWORD)sizeof(value), len); > + > + type = 0xdead; > + len = 0; > + value = 0xdeadbeef; > + status = pNtQueryLicenseValue(&name, &type, &value, sizeof(value), &len); > + ok(status == STATUS_SUCCESS, "NtQueryLicenseValue returned %08x, expected STATUS_SUCCESS\n", status); > + ok(type == REG_DWORD, "expected type = REG_DWORD, got %u\n", type); > + ok(len == sizeof(value), "expected len = %u, got %u\n", (DWORD)sizeof(value), len); > + ok(value != 0xdeadbeef, "expected value != 0xdeadbeef\n"); > + > + type = 0xdead; > + len = 0; > + status = pNtQueryLicenseValue(&name, &type, &value, 2, &len); > + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status); > + ok(type == REG_DWORD, "expected type REG_DWORD, got %u\n", type); > + ok(len == sizeof(value), "expected len = %u, got %u\n", (DWORD)sizeof(value), len); > + > + pRtlFreeUnicodeString(&name); > } > > static void test_RtlpNtQueryValueKey(void) > @@ -1277,6 +1459,51 @@ > pNtClose(key); > } > > +static void test_NtQueryKey(void) > +{ > + HANDLE key; > + NTSTATUS status; > + OBJECT_ATTRIBUTES attr; > + ULONG length, len; > + KEY_NAME_INFORMATION *info = NULL; > + UNICODE_STRING str; > + > + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); > + status = pNtOpenKey(&key, KEY_READ, &attr); > + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); > + > + status = pNtQueryKey(key, KeyNameInformation, NULL, 0, &length); > + if (status == STATUS_INVALID_PARAMETER) { > + win_skip("KeyNameInformation is not supported\n"); > + pNtClose(key); > + return; > + } > + todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08x\n", status); > + info = HeapAlloc(GetProcessHeap(), 0, length); > + > + /* non-zero buffer size, but insufficient */ > + status = pNtQueryKey(key, KeyNameInformation, info, sizeof(*info), &len); > + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryKey Failed: 0x%08x\n", status); > + ok(length == len, "got %d, expected %d\n", len, length); > + ok(info->NameLength == winetestpath.Length, "got %d, expected %d\n", > + info->NameLength, winetestpath.Length); > + > + /* correct buffer size */ > + status = pNtQueryKey(key, KeyNameInformation, info, length, &len); > + ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status); > + ok(length == len, "got %d, expected %d\n", len, length); > + > + str.Buffer = info->Name; > + str.Length = info->NameLength; > + ok(pRtlCompareUnicodeString(&winetestpath, &str, TRUE) == 0, > + "got %s, expected %s\n", > + wine_dbgstr_wn(str.Buffer, str.Length/sizeof(WCHAR)), > + wine_dbgstr_wn(winetestpath.Buffer, winetestpath.Length/sizeof(WCHAR))); > + > + HeapFree(GetProcessHeap(), 0, info); > + pNtClose(key); > +} > + > START_TEST(reg) > { > static const WCHAR winetest[] = {'\\','W','i','n','e','T','e','s','t',0}; > @@ -1297,7 +1524,9 @@ > test_RtlQueryRegistryValues(); > test_RtlpNtQueryValueKey(); > test_NtFlushKey(); > + test_NtQueryKey(); > test_NtQueryValueKey(); > + test_NtQueryLicenseKey(); > test_long_value_name(); > test_NtDeleteKey(); > test_symlinks(); > > Modified: trunk/rostests/winetests/ntdll/rtl.c > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev… > ============================================================================== > --- trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] (original) > +++ trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] Tue Mar 10 10:10:04 2015 > @@ -62,6 +62,8 @@ > > /* Function ptrs for ntdll calls */ > static HMODULE hntdll = 0; > +static PVOID (WINAPI *pWinSqmStartSession)(PVOID unknown1, DWORD unknown2, DWORD unknown3); > +static NTSTATUS (WINAPI *pWinSqmEndSession)(PVOID unknown1); > static SIZE_T (WINAPI *pRtlCompareMemory)(LPCVOID,LPCVOID,SIZE_T); > static SIZE_T (WINAPI *pRtlCompareMemoryUlong)(PULONG, SIZE_T, ULONG); > static NTSTATUS (WINAPI *pRtlDeleteTimer)(HANDLE, HANDLE, HANDLE); > @@ -89,9 +91,14 @@ > static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); > static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); > static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); > +static NTSTATUS (WINAPI *pRtlIpv4StringToAddressExA)(PCSTR, BOOLEAN, IN_ADDR *, PUSHORT); > static NTSTATUS (WINAPI *pLdrAddRefDll)(ULONG, HMODULE); > static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG_PTR*); > static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); > +static NTSTATUS (WINAPI *pRtlGetCompressionWorkSpaceSize)(USHORT, PULONG, PULONG); > +static NTSTATUS (WINAPI *pRtlDecompressBuffer)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, PULONG); > +static NTSTATUS (WINAPI *pRtlDecompressFragment)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, ULONG, PULONG, PVOID); > +static NTSTATUS (WINAPI *pRtlCompressBuffer)(USHORT, const UCHAR*, ULONG, PUCHAR, ULONG, ULONG, PULONG, PVOID); > > static HMODULE hkernel32 = 0; > static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); > @@ -109,6 +116,8 @@ > hntdll = LoadLibraryA("ntdll.dll"); > ok(hntdll != 0, "LoadLibrary failed\n"); > if (hntdll) { > + pWinSqmStartSession = (void *)GetProcAddress(hntdll, "WinSqmStartSession"); > + pWinSqmEndSession = (void *)GetProcAddress(hntdll, "WinSqmEndSession"); > pRtlCompareMemory = (void *)GetProcAddress(hntdll, "RtlCompareMemory"); > pRtlCompareMemoryUlong = (void *)GetProcAddress(hntdll, "RtlCompareMemoryUlong"); > pRtlDeleteTimer = (void *)GetProcAddress(hntdll, "RtlDeleteTimer"); > @@ -136,9 +145,14 @@ > pRtlIpv4AddressToStringA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringA"); > pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); > pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressA"); > + pRtlIpv4StringToAddressExA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressExA"); > pLdrAddRefDll = (void *)GetProcAddress(hntdll, "LdrAddRefDll"); > pLdrLockLoaderLock = (void *)GetProcAddress(hntdll, "LdrLockLoaderLock"); > pLdrUnlockLoaderLock = (void *)GetProcAddress(hntdll, "LdrUnlockLoaderLock"); > + pRtlGetCompressionWorkSpaceSize = (void *)GetProcAddress(hntdll, "RtlGetCompressionWorkSpaceSize"); > + pRtlDecompressBuffer = (void *)GetProcAddress(hntdll, "RtlDecompressBuffer"); > + pRtlDecompressFragment = (void *)GetProcAddress(hntdll, "RtlDecompressFragment"); > + pRtlCompressBuffer = (void *)GetProcAddress(hntdll, "RtlCompressBuffer"); > } > hkernel32 = LoadLibraryA("kernel32.dll"); > ok(hkernel32 != 0, "LoadLibrary failed\n"); > @@ -148,6 +162,46 @@ > strcpy((char*)src_aligned_block, src_src); > ok(strlen(src) == 15, "Source must be 16 bytes long!\n"); > } > + > +#ifdef __i386__ > +const char stdcall3_thunk[] = > + "\x56" /* push %esi */ > + "\x89\xE6" /* mov %esp, %esi */ > + "\xFF\x74\x24\x14" /* pushl 20(%esp) */ > + "\xFF\x74\x24\x14" /* pushl 20(%esp) */ > + "\xFF\x74\x24\x14" /* pushl 20(%esp) */ > + "\xFF\x54\x24\x14" /* calll 20(%esp) */ > + "\x89\xF0" /* mov %esi, %eax */ > + "\x29\xE0" /* sub %esp, %eax */ > + "\x89\xF4" /* mov %esi, %esp */ > + "\x5E" /* pop %esi */ > + "\xC2\x10\x00" /* ret $16 */ > +; > + > +static INT (WINAPI *call_stdcall_func3)(PVOID func, PVOID arg0, DWORD arg1, DWORD arg2) = NULL; > + > +static void test_WinSqm(void) > +{ > + INT args; > + > + if (!pWinSqmStartSession) > + { > + win_skip("WinSqmStartSession() is not available\n"); > + return; > + } > + > + call_stdcall_func3 = (void*) VirtualAlloc( NULL, sizeof(stdcall3_thunk) - 1, MEM_COMMIT, > + PAGE_EXECUTE_READWRITE ); > + memcpy( call_stdcall_func3, stdcall3_thunk, sizeof(stdcall3_thunk) - 1 ); > + > + args = 3 - call_stdcall_func3( pWinSqmStartSession, NULL, 0, 0 ) / 4; > + ok(args == 3, "WinSqmStartSession expected to take %d arguments instead of 3\n", args); > + args = 3 - call_stdcall_func3( pWinSqmEndSession, NULL, 0, 0 ) / 4; > + ok(args == 1, "WinSqmEndSession expected to take %d arguments instead of 1\n", args); > + > + VirtualFree( call_stdcall_func3, 0, MEM_RELEASE ); > +} > +#endif > > #define COMP(str1,str2,cmplen,len) size = pRtlCompareMemory(str1, str2, cmplen); \ > ok(size == len, "Expected %ld, got %ld\n", size, (SIZE_T)len) > @@ -1492,6 +1546,94 @@ > } > } > > +static void test_RtlIpv4StringToAddressEx(void) > +{ > + NTSTATUS res; > + IN_ADDR ip, expected_ip; > + USHORT port; > + struct > + { > + PCSTR address; > + NTSTATUS res; > + int ip[4]; > + USHORT port; > + } tests[] = > + { > + { "", STATUS_INVALID_PARAMETER, { -1 }, 0xdead }, > + { " ", STATUS_INVALID_PARAMETER, { -1 }, 0xdead }, > + { "1.1.1.1:", STATUS_INVALID_PARAMETER, { 1, 1, 1, 1 }, 0xdead }, > + { "1.1.1.1+", STATUS_INVALID_PARAMETER, { 1, 1, 1, 1 }, 0xdead }, > + { "1.1.1.1:1", STATUS_SUCCESS, { 1, 1, 1, 1 }, 0x100 }, > + { "0.0.0.0:0", STATUS_INVALID_PARAMETER, { 0, 0, 0, 0 }, 0xdead }, > + { "0.0.0.0:1", STATUS_SUCCESS, { 0, 0, 0, 0 }, 0x100 }, > + { "1.2.3.4:65535", STATUS_SUCCESS, { 1, 2, 3, 4 }, 65535 }, > + { "1.2.3.4:65536", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, > + { "1.2.3.4:0xffff", STATUS_SUCCESS, { 1, 2, 3, 4 }, 65535 }, > + { "1.2.3.4:0XfFfF", STATUS_SUCCESS, { 1, 2, 3, 4 }, 65535 }, > + { "1.2.3.4:011064", STATUS_SUCCESS, { 1, 2, 3, 4 }, 0x3412 }, > + { "1.2.3.4:1234a", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, > + { "1.2.3.4:1234+", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, > + { "1.2.3.4: 1234", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, > + { "1.2.3.4:\t1234", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, > + }; > + const int testcount = sizeof(tests) / sizeof(tests[0]); > + int i, Strict; > + > + if (!pRtlIpv4StringToAddressExA) > + { > + skip("RtlIpv4StringToAddressEx not available\n"); > + return; > + } > + > + /* do not crash, and do not touch the ip / port. */ > + ip.S_un.S_addr = 0xabababab; > + port = 0xdead; > + res = pRtlIpv4StringToAddressExA(NULL, FALSE, &ip, &port); > + ok(res == STATUS_INVALID_PARAMETER, "[null address] res = 0x%08x, expected 0x%08x\n", res, STATUS_INVALID_PARAMETER); > + ok(ip.S_un.S_addr == 0xabababab, "RtlIpv4StringToAddressExA should not touch the ip!, ip == %x\n", ip.S_un.S_addr); > + ok(port == 0xdead, "RtlIpv4StringToAddressExA should not touch the port!, port == %x\n", port); > + > + port = 0xdead; > + res = pRtlIpv4StringToAddressExA("1.1.1.1", FALSE, NULL, &port); > + ok(res == STATUS_INVALID_PARAMETER, "[null ip] res = 0x%08x, expected 0x%08x\n", res, STATUS_INVALID_PARAMETER); > + ok(port == 0xdead, "RtlIpv4StringToAddressExA should not touch the port!, port == %x\n", port); > + > + ip.S_un.S_addr = 0xabababab; > + port = 0xdead; > + res = pRtlIpv4StringToAddressExA("1.1.1.1", FALSE, &ip, NULL); > + ok(res == STATUS_INVALID_PARAMETER, "[null port] res = 0x%08x, expected 0x%08x\n", res, STATUS_INVALID_PARAMETER); > + ok(ip.S_un.S_addr == 0xabababab, "RtlIpv4StringToAddressExA should not touch the ip!, ip == %x\n", ip.S_un.S_addr); > + ok(port == 0xdead, "RtlIpv4StringToAddressExA should not touch the port!, port == %x\n", port); > + > + for (i = 0; i < testcount; i++) > + { > + /* Strict is only relevant for the ip address, so make sure that it does not influence the port */ > + for (Strict = 0; Strict < 2; Strict++) > + { > + ip.S_un.S_addr = 0xabababab; > + port = 0xdead; > + res = pRtlIpv4StringToAddressExA(tests[i].address, Strict, &ip, &port); > + if (tests[i].ip[0] == -1) > + { > + expected_ip.S_un.S_addr = 0xabababab; > + } > + else > + { > + expected_ip.S_un.S_un_b.s_b1 = tests[i].ip[0]; > + expected_ip.S_un.S_un_b.s_b2 = tests[i].ip[1]; > + expected_ip.S_un.S_un_b.s_b3 = tests[i].ip[2]; > + expected_ip.S_un.S_un_b.s_b4 = tests[i].ip[3]; > + } > + ok(res == tests[i].res, "[%s] res = 0x%08x, expected 0x%08x\n", > + tests[i].address, res, tests[i].res); > + ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, "[%s] ip = %08x, expected %08x\n", > + tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); > + ok(port == tests[i].port, "[%s] port = %u, expected %u\n", > + tests[i].address, port, tests[i].port); > + } > + } > +} > + > static void test_LdrAddRefDll(void) > { > HMODULE mod, mod2; > @@ -1599,9 +1741,744 @@ > pLdrUnlockLoaderLock(0, magic); > } > > +static void test_RtlGetCompressionWorkSpaceSize(void) > +{ > + ULONG compress_workspace, decompress_workspace; > + NTSTATUS status; > + > + if (!pRtlGetCompressionWorkSpaceSize) > + { > + win_skip("RtlGetCompressionWorkSpaceSize is not available\n"); > + return; > + } > + > + status = pRtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_NONE, &compress_workspace, > + &decompress_workspace); > + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); > + > + status = pRtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_DEFAULT, &compress_workspace, > + &decompress_workspace); > + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); > + > + status = pRtlGetCompressionWorkSpaceSize(0xFF, &compress_workspace, &decompress_workspace); > + ok(status == STATUS_UNSUPPORTED_COMPRESSION, "got wrong status 0x%08x\n", status); > + > + compress_workspace = decompress_workspace = 0xdeadbeef; > + status = pRtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_LZNT1, &compress_workspace, > + &decompress_workspace); > + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); > + ok(compress_workspace != 0, "got wrong compress_workspace %d\n", compress_workspace); > + ok(decompress_workspace == 0x1000, "got wrong decompress_workspace %d\n", decompress_workspace); > + > + compress_workspace = decompress_workspace = 0xdeadbeef; > + status = pRtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_LZNT1 | COMPRESSION_ENGINE_MAXIMUM, > + &compress_workspace, &decompress_workspace); > + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); > + ok(compress_workspace != 0, "got wrong compress_workspace %d\n", compress_workspace); > + ok(decompress_workspace == 0x1000, "got wrong decompress_workspace %d\n", decompress_workspace); > +} > + > +/* helper for test_RtlDecompressBuffer, checks if a chunk is incomplete */ > +static BOOL is_incomplete_chunk(const UCHAR *compressed, ULONG compressed_size, BOOL check_all) > +{ > + ULONG chunk_size; > + if (compressed_size <= sizeof(WORD)) > + return TRUE; > + while (compressed_size >= sizeof(WORD)) > + { > + chunk_size = (*(WORD *)compressed & 0xFFF) + 1; > + if (compressed_size < sizeof(WORD) + chunk_size) > + return TRUE; > + if (!check_all) > + break; > + compressed += sizeof(WORD) + chunk_size; > + compressed_size -= sizeof(WORD) + chunk_size; > + } > + return FALSE; > +} > + > +#define DECOMPRESS_BROKEN_TRUNCATED 1 > +#define DECOMPRESS_BROKEN_FRAGMENT0 2 > +#define DECOMPRESS_BROKEN_FRAGMENT1 4 > +#define DECOMPRESS_BROKEN_FRAGMENT4095 8 > + > +static void test_RtlDecompressBuffer(void) > +{ > + static const UCHAR test_multiple_chunks[] = {0x03, 0x30, 'W', 'i', 'n', 'e', > + 0x03, 0x30, 'W', 'i', 'n', 'e'}; > + static const struct > + { > + UCHAR compressed[32]; > + ULONG compressed_size; > + NTSTATUS status; > + UCHAR uncompressed[32]; > + ULONG uncompressed_size; > + DWORD broken_flags; > + } > + test_lznt[] = > + { > + /* 4 byte uncompressed chunk */ > + { > + {0x03, 0x30, 'W', 'i', 'n', 'e'}, > + 6, > + STATUS_SUCCESS, > + "Wine", > + 4, > + DECOMPRESS_BROKEN_FRAGMENT4095 | > + DECOMPRESS_BROKEN_FRAGMENT1 | > + DECOMPRESS_BROKEN_FRAGMENT0 > + }, > + /* 8 byte uncompressed chunk */ > + { > + {0x07, 0x30, 'W', 'i', 'n', 'e', 'W', 'i', 'n', 'e'}, > + 10, > + STATUS_SUCCESS, > + "WineWine", > + 8, > + DECOMPRESS_BROKEN_FRAGMENT4095 | > + DECOMPRESS_BROKEN_FRAGMENT1 | > + DECOMPRESS_BROKEN_FRAGMENT0 > + }, > + /* 4 byte compressed chunk */ > + { > + {0x04, 0xB0, 0x00, 'W', 'i', 'n', 'e'}, > + 7, > + STATUS_SUCCESS, > + "Wine", > + 4 > + }, > + /* 8 byte compressed chunk */ > + { > + {0x08, 0xB0, 0x00, 'W', 'i', 'n', 'e', 'W', 'i', 'n', 'e'}, > + 11, > + STATUS_SUCCESS, > + "WineWine", > + 8 > + }, > + /* compressed chunk using backwards reference */ > + { > + {0x06, 0xB0, 0x10, 'W', 'i', 'n', 'e', 0x01, 0x30}, > + 9, > + STATUS_SUCCESS, > + "WineWine", > + 8, > + DECOMPRESS_BROKEN_TRUNCATED > + }, > + /* compressed chunk using backwards reference with length > bytes_read */ > + { > + {0x06, 0xB0, 0x10, 'W', 'i', 'n', 'e', 0x05, 0x30}, > + 9, > + STATUS_SUCCESS, > + "WineWineWine", > + 12, > + DECOMPRESS_BROKEN_TRUNCATED > + }, > + /* same as above, but unused bits != 0 */ > + { > + {0x06, 0xB0, 0x30, 'W', 'i', 'n', 'e', 0x01, 0x30}, > + 9, > + STATUS_SUCCESS, > + "WineWine", > + 8, > + DECOMPRESS_BROKEN_TRUNCATED > + }, > + /* compressed chunk without backwards reference and unused bits != 0 */ > + { > + {0x01, 0xB0, 0x02, 'W'}, > + 4, > + STATUS_SUCCESS, > + "W", > + 1 > + }, > + /* termination sequence after first chunk */ > + { > + {0x03, 0x30, 'W', 'i', 'n', 'e', 0x00, 0x00, 0x03, 0x30, 'W', 'i', 'n', 'e'}, > + 14, > + STATUS_SUCCESS, > + "Wine", > + 4, > + DECOMPRESS_BROKEN_FRAGMENT4095 | > + DECOMPRESS_BROKEN_FRAGMENT1 | > + DECOMPRESS_BROKEN_FRAGMENT0 > + }, > + /* compressed chunk using backwards reference with 4 bit offset, 12 bit length */ > + { > + {0x14, 0xB0, 0x00, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', > + 0x00, 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', > + 0x01, 0x01, 0xF0}, > + 23, > + STATUS_SUCCESS, > + "ABCDEFGHIJKLMNOPABCD", > + 20, > + DECOMPRESS_BROKEN_TRUNCATED > + }, > + /* compressed chunk using backwards reference with 5 bit offset, 11 bit length */ > + { > + {0x15, 0xB0, 0x00, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', > + 0x00, 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', > + 0x02, 'A', 0x00, 0x78}, > + 24, > + STATUS_SUCCESS, > + "ABCDEFGHIJKLMNOPABCD", > + 20, > + DECOMPRESS_BROKEN_TRUNCATED > + }, > + /* uncompressed chunk with invalid magic */ > + { > + {0x03, 0x20, 'W', 'i', 'n', 'e'}, > + 6, > + STATUS_SUCCESS, > + "Wine", > + 4, > + DECOMPRESS_BROKEN_FRAGMENT4095 | > + DECOMPRESS_BROKEN_FRAGMENT1 | > + DECOMPRESS_BROKEN_FRAGMENT0 > + }, > + /* compressed chunk with invalid magic */ > + { > + {0x04, 0xA0, 0x00, 'W', 'i', 'n', 'e'}, > + 7, > + STATUS_SUCCESS, > + "Wine", > + 4 > + }, > + /* garbage byte after end of buffer */ > + { > + {0x00, 0xB0, 0x02, 0x01}, > + 4, > + STATUS_SUCCESS, > + "", > + 0 > + }, > + /* empty compressed chunk */ > + { > + {0x00, 0xB0, 0x00}, > + 3, > + STATUS_SUCCESS, > + "", > + 0 > + }, > + /* empty compressed chunk with unused bits != 0 */ > + { > + {0x00, 0xB0, 0x01}, > + 3, > + STATUS_SUCCESS, > + "", > + 0 > + }, > + /* empty input buffer */ > + { > + {0}, > + 0, > + STATUS_BAD_COMPRESSION_BUFFER, > + }, > + /* incomplete chunk header */ > + { > + {0x01}, > + 1, > + STATUS_BAD_COMPRESSION_BUFFER > + }, > + /* incomplete chunk header */ > + { > + {0x00, 0x30}, > + 2, > + STATUS_BAD_COMPRESSION_BUFFER > + }, > + /* compressed chunk with invalid backwards reference */ > + { > + {0x06, 0xB0, 0x10, 'W', 'i', 'n', 'e', 0x05, 0x40}, > + 9, > + STATUS_BAD_COMPRESSION_BUFFER > + }, > + /* compressed chunk with incomplete backwards reference */ > + { > + {0x05, 0xB0, 0x10, 'W', 'i', 'n', 'e', 0x05}, > + 8, > + STATUS_BAD_COMPRESSION_BUFFER > + }, > + /* incomplete uncompressed chunk */ > + { > + {0x07, 0x30, 'W', 'i', 'n', 'e'}, > + 6, > + STATUS_BAD_COMPRESSION_BUFFER > + }, > + /* incomplete compressed chunk */ > + { > + {0x08, 0xB0, 0x00, 'W', 'i', 'n', 'e'}, > + 7, > + STATUS_BAD_COMPRESSION_BUFFER > + }, > + /* two compressed chunks, the second one incomplete */ > + { > + {0x00, 0xB0, 0x02, 0x00, 0xB0}, > + 5, > + STATUS_BAD_COMPRESSION_BUFFER, > + } > + }; > + > + static UCHAR buf[0x2000], workspace[0x1000]; > + NTSTATUS status, expected_status; > + ULONG final_size; > + int i; > + > + if (!pRtlDecompressBuffer || !pRtlDecompressFragment) > + { > + win_skip("RtlDecompressBuffer or RtlDecompressFragment is not available\n"); > + return; > + } > + > + /* test compression format / engine */ > + final_size = 0xdeadbeef; > + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_NONE, buf, sizeof(buf) - 1, test_lznt[0].compressed, > + test_lznt[0].compressed_size, &final_size); > + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); > + ok(final_size == 0xdeadbeef, "got wrong final_size %d\n", final_size); > + > + final_size = 0xdeadbeef; > + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_DEFAULT, buf, sizeof(buf) - 1, test_lznt[0].compressed, > + test_lznt[0].compressed_size, &final_size); > + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); > + ok(final_size == 0xdeadbeef, "got wrong final_size %d\n", final_size); > + > + final_size = 0xdeadbeef; > + status = pRtlDecompressBuffer(0xFF, buf, sizeof(buf) - 1, test_lznt[0].compressed, > + test_lznt[0].compressed_size, &final_size); > + ok(status == STATUS_UNSUPPORTED_COMPRESSION, "got wrong status 0x%08x\n", status); > + ok(final_size == 0xdeadbeef, "got wrong final_size %d\n", final_size); > + > + /* regular tests for RtlDecompressBuffer */ > + for (i = 0; i < sizeof(test_lznt) / sizeof(test_lznt[0]); i++) > + { > + trace("Running test %d (compressed_size=%d, compressed_size=%d, status=%d)\n", > + i, test_lznt[i].compressed_size, test_lznt[i].compressed_size, test_lznt[i].status); > + > + /* test with very big buffer */ > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, > + test_lznt[i].compressed_size, &final_size); > + ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); > + if (!status) > + { > + ok(final_size == test_lznt[i].uncompressed_size, > + "%d: got wrong final_size %d\n", i, final_size); > + ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size), > + "%d: got wrong decoded data\n", i); > + ok(buf[test_lznt[i].uncompressed_size] == 0x11, > + "%d: buf[%d] overwritten\n", i, test_lznt[i].uncompressed_size); > + } > + > + /* test that modifier for compression engine is ignored */ > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1 | COMPRESSION_ENGINE_MAXIMUM, buf, sizeof(buf), > + test_lznt[i].compressed, test_lznt[i].compressed_size, &final_size); > + ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); > + if (!status) > + { > + ok(final_size == test_lznt[i].uncompressed_size, > + "%d: got wrong final_size %d\n", i, final_size); > + ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size), > + "%d: got wrong decoded data\n", i); > + ok(buf[test_lznt[i].uncompressed_size] == 0x11, > + "%d: buf[%d] overwritten\n", i, test_lznt[i].uncompressed_size); > + } > + > + /* test with expected output size */ > + if (test_lznt[i].uncompressed_size > 0) > + { > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, test_lznt[i].uncompressed_size, > + test_lznt[i].compressed, test_lznt[i].compressed_size, &final_size); > + ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); > + if (!status) > + { > + ok(final_size == test_lznt[i].uncompressed_size, > + "%d: got wrong final_size %d\n", i, final_size); > + ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size), > + "%d: got wrong decoded data\n", i); > + ok(buf[test_lznt[i].uncompressed_size] == 0x11, > + "%d: buf[%d] overwritten\n", i, test_lznt[i].uncompressed_size); > + } > + } > + > + /* test with smaller output size */ > + if (test_lznt[i].uncompressed_size > 1) > + { > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, test_lznt[i].uncompressed_size - 1, > + test_lznt[i].compressed, test_lznt[i].compressed_size, &final_size); > + ok(status == test_lznt[i].status || broken(status == STATUS_BAD_COMPRESSION_BUFFER && > + (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_TRUNCATED)), "%d: got wrong status 0x%08x\n", i, status); > + if (!status) > + { > + ok(final_size == test_lznt[i].uncompressed_size - 1, > + "%d: got wrong final_size %d\n", i, final_size); > + ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size - 1), > + "%d: got wrong decoded data\n", i); > + ok(buf[test_lznt[i].uncompressed_size - 1] == 0x11, > + "%d: buf[%d] overwritten\n", i, test_lznt[i].uncompressed_size - 1); > + } > + } > + > + /* test with zero output size */ > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, 0, test_lznt[i].compressed, > + test_lznt[i].compressed_size, &final_size); > + if (is_incomplete_chunk(test_lznt[i].compressed, test_lznt[i].compressed_size, FALSE)) > + { > + ok(status == STATUS_BAD_COMPRESSION_BUFFER, "%d: got wrong status 0x%08x\n", i, status); > + } > + else > + { > + ok(status == STATUS_SUCCESS, "%d: got wrong status 0x%08x\n", i, status); > + ok(final_size == 0, "%d: got wrong final_size %d\n", i, final_size); > + ok(buf[0] == 0x11, "%d: buf[%d] overwritten\n", i, test_lznt[i].uncompressed_size); > + } > + > + /* test RtlDecompressBuffer with offset = 0 */ > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, > + test_lznt[i].compressed_size, 0, &final_size, workspace); > + ok(status == test_lznt[i].status || broken(status == STATUS_BAD_COMPRESSION_BUFFER && > + (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT0)), "%d: got wrong status 0x%08x\n", i, status); > + if (!status) > + { > + ok(final_size == test_lznt[i].uncompressed_size, > + "%d: got wrong final_size %d\n", i, final_size); > + ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size), > + "%d: got wrong decoded data\n", i); > + ok(buf[test_lznt[i].uncompressed_size] == 0x11, > + "%d: buf[%d] overwritten\n", i, test_lznt[i].uncompressed_size); > + } > + > + /* test RtlDecompressBuffer with offset = 1 */ > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, > + test_lznt[i].compressed_size, 1, &final_size, workspace); > + ok(status == test_lznt[i].status || broken(status == STATUS_BAD_COMPRESSION_BUFFER && > + (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT1)), "%d: got wrong status 0x%08x\n", i, status); > + if (!status) > + { > + if (test_lznt[i].uncompressed_size == 0) > + { > + todo_wine > + ok(final_size == 4095, > + "%d: got wrong final size %d\n", i, final_size); > + /* Buffer doesn't contain any useful value on Windows */ > + ok(buf[4095] == 0x11, > + "%d: buf[4095] overwritten\n", i); > + } > + else > + { > + ok(final_size == test_lznt[i].uncompressed_size - 1, > + "%d: got wrong final_size %d\n", i, final_size); > + ok(!memcmp(buf, test_lznt[i].uncompressed + 1, test_lznt[i].uncompressed_size - 1), > + "%d: got wrong decoded data\n", i); > + ok(buf[test_lznt[i].uncompressed_size - 1] == 0x11, > + "%d: buf[%d] overwritten\n", i, test_lznt[i].uncompressed_size - 1); > + } > + } > + > + /* test RtlDecompressBuffer with offset = 4095 */ > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, > + test_lznt[i].compressed_size, 4095, &final_size, workspace); > + ok(status == test_lznt[i].status || broken(status == STATUS_BAD_COMPRESSION_BUFFER && > + (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT4095)), "%d: got wrong status 0x%08x\n", i, status); > + if (!status) > + { > + todo_wine > + ok(final_size == 1, > + "%d: got wrong final size %d\n", i, final_size); > + todo_wine > + ok(buf[0] == 0, > + "%d: padding is not zero\n", i); > + ok(buf[1] == 0x11, > + "%d: buf[1] overwritten\n", i); > + } > + > + /* test RtlDecompressBuffer with offset = 4096 */ > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, > + test_lznt[i].compressed_size, 4096, &final_size, workspace); > + expected_status = is_incomplete_chunk(test_lznt[i].compressed, test_lznt[i].compressed_size, TRUE) ? > + test_lznt[i].status : STATUS_SUCCESS; > + ok(status == expected_status, "%d: got wrong status 0x%08x, expected 0x%08x\n", i, status, expected_status); > + if (!status) > + { > + ok(final_size == 0, > + "%d: got wrong final size %d\n", i, final_size); > + ok(buf[0] == 0x11, > + "%d: buf[4096] overwritten\n", i); > + } > + } > + > + /* test decoding of multiple chunks with pRtlDecompressBuffer */ > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_multiple_chunks, > + sizeof(test_multiple_chunks), &final_size); > + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); > + if (!status) > + { > + ok(final_size == 4100, "got wrong final_size %d\n", final_size); > + ok(!memcmp(buf, "Wine", 4), "got wrong decoded data at offset 0\n"); > + ok(buf[4] == 0 && buf[4095] == 0, "padding is not zero\n"); > + ok(!memcmp(buf + 4096, "Wine", 4), "got wrong decoded data at offset 4096\n"); > + ok(buf[4100] == 0x11, "buf[4100] overwritten\n"); > + } > + > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, 4097, test_multiple_chunks, > + sizeof(test_multiple_chunks), &final_size); > + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); > + if (!status) > + { > + ok(final_size == 4097, "got wrong final_size %d\n", final_size); > + ok(!memcmp(buf, "Wine", 4), "got wrong decoded data at offset 0\n"); > + ok(buf[4] == 0 && buf[4095] == 0, "padding is not zero\n"); > + ok(buf[4096], "got wrong decoded data at offset 4096\n"); > + ok(buf[4097] == 0x11, "buf[4097] overwritten\n"); > + } > + > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, 4096, test_multiple_chunks, > + sizeof(test_multiple_chunks), &final_size); > + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); > + if (!status) > + { > + ok(final_size == 4, "got wrong final_size %d\n", final_size); > + ok(!memcmp(buf, "Wine", 4), "got wrong decoded data at offset 0\n"); > + ok(buf[4] == 0x11, "buf[4] overwritten\n"); > + } > + > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, 4, test_multiple_chunks, > + sizeof(test_multiple_chunks), &final_size); > + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); > + if (!status) > + { > + ok(final_size == 4, "got wrong final_size %d\n", final_size); > + ok(!memcmp(buf, "Wine", 4), "got wrong decoded data at offset 0\n"); > + ok(buf[4] == 0x11, "buf[4] overwritten\n"); > + } > + > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, 3, test_multiple_chunks, > + sizeof(test_multiple_chunks), &final_size); > + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); > + if (!status) > + { > + ok(final_size == 3, "got wrong final_size %d\n", final_size); > + ok(!memcmp(buf, "Wine", 3), "got wrong decoded data at offset 0\n"); > + ok(buf[3] == 0x11, "buf[3] overwritten\n"); > + } > + > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, 0, test_multiple_chunks, > + sizeof(test_multiple_chunks), &final_size); > + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); > + if (!status) > + { > + ok(final_size == 0, "got wrong final_size %d\n", final_size); > + ok(buf[0] == 0x11, "buf[0] overwritten\n"); > + } > + > + /* test multiple chunks in combination with RtlDecompressBuffer and offset=1 */ > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_multiple_chunks, > + sizeof(test_multiple_chunks), 1, &final_size, workspace); > + ok(status == STATUS_SUCCESS || broken(status == STATUS_BAD_COMPRESSION_BUFFER), > + "got wrong status 0x%08x\n", status); > + if (!status) > + { > + ok(final_size == 4099, "got wrong final_size %d\n", final_size); > + ok(!memcmp(buf, "ine", 3), "got wrong decoded data at offset 0\n"); > + ok(buf[3] == 0 && buf[4094] == 0, "padding is not zero\n"); > + ok(!memcmp(buf + 4095, "Wine", 4), "got wrong decoded data at offset 4095\n"); > + ok(buf[4099] == 0x11, "buf[4099] overwritten\n"); > + } > + > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, 4096, test_multiple_chunks, > + sizeof(test_multiple_chunks), 1, &final_size, workspace); > + ok(status == STATUS_SUCCESS || broken(status == STATUS_BAD_COMPRESSION_BUFFER), > + "got wrong status 0x%08x\n", status); > + if (!status) > + { > + ok(final_size == 4096, "got wrong final_size %d\n", final_size); > + ok(!memcmp(buf, "ine", 3), "got wrong decoded data at offset 0\n"); > + ok(buf[3] == 0 && buf[4094] == 0, "padding is not zero\n"); > + ok(buf[4095] == 'W', "got wrong decoded data at offset 4095\n"); > + ok(buf[4096] == 0x11, "buf[4096] overwritten\n"); > + } > + > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, 4095, test_multiple_chunks, > + sizeof(test_multiple_chunks), 1, &final_size, workspace); > + ok(status == STATUS_SUCCESS || broken(status == STATUS_BAD_COMPRESSION_BUFFER), > + "got wrong status 0x%08x\n", status); > + if (!status) > + { > + ok(final_size == 3, "got wrong final_size %d\n", final_size); > + ok(!memcmp(buf, "ine", 3), "got wrong decoded data at offset 0\n"); > + ok(buf[4] == 0x11, "buf[4] overwritten\n"); > + } > + > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, 3, test_multiple_chunks, > + sizeof(test_multiple_chunks), 1, &final_size, workspace); > + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); > + if (!status) > + { > + ok(final_size == 3, "got wrong final_size %d\n", final_size); > + ok(!memcmp(buf, "ine", 3), "got wrong decoded data at offset 0\n"); > + ok(buf[3] == 0x11, "buf[3] overwritten\n"); > + } > + > + /* test multiple chunks in combination with RtlDecompressBuffer and offset=4 */ > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_multiple_chunks, > + sizeof(test_multiple_chunks), 4, &final_size, workspace); > + ok(status == STATUS_SUCCESS || broken(status == STATUS_BAD_COMPRESSION_BUFFER), > + "got wrong status 0x%08x\n", status); > + if (!status) > + { > + ok(final_size == 4096, "got wrong final_size %d\n", final_size); > + ok(buf[0] == 0 && buf[4091] == 0, "padding is not zero\n"); > + ok(!memcmp(buf + 4092, "Wine", 4), "got wrong decoded data at offset 4092\n"); > + ok(buf[4096] == 0x11, "buf[4096] overwritten\n"); > + } > + > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_multiple_chunks, > + sizeof(test_multiple_chunks), 4095, &final_size, workspace); > + ok(status == STATUS_SUCCESS || broken(status == STATUS_BAD_COMPRESSION_BUFFER), > + "got wrong status 0x%08x\n", status); > + if (!status) > + { > + ok(final_size == 5, "got wrong final_size %d\n", final_size); > + ok(buf[0] == 0, "padding is not zero\n"); > + ok(!memcmp(buf + 1, "Wine", 4), "got wrong decoded data at offset 1\n"); > + ok(buf[5] == 0x11, "buf[5] overwritten\n"); > + } > + > + final_size = 0xdeadbeef; > + memset(buf, 0x11, sizeof(buf)); > + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_multiple_chunks, > + sizeof(test_multiple_chunks), 4096, &final_size, workspace); > + ok(status == STATUS_SUCCESS || broken(status == STATUS_BAD_COMPRESSION_BUFFER), > + "got wrong status 0x%08x\n", status); > + if (!status) > + { > + ok(final_size == 4, "got wrong final_size %d\n", final_size); > + ok(!memcmp(buf, "Wine", 4), "got wrong decoded data at offset 0\n"); > + ok(buf[4] == 0x11, "buf[4] overwritten\n"); > + } > + > +} > + > +static void test_RtlCompressBuffer(void) > +{ > + ULONG compress_workspace, decompress_workspace; > + static const UCHAR test_buffer[] = "WineWineWine"; > + static UCHAR buf1[0x1000], buf2[0x1000], *workspace; > + ULONG final_size, buf_size; > + NTSTATUS status; > + > + if (!pRtlCompressBuffer || !pRtlGetCompressionWorkSpaceSize) > + { > + win_skip("RtlCompressBuffer or RtlGetCompressionWorkSpaceSize is not available\n"); > + return; > + } > + > + compress_workspace = decompress_workspace = 0xdeadbeef; > + status = pRtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_LZNT1, &compress_workspace, > + &decompress_workspace); > + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); > + ok(compress_workspace != 0, "got wrong compress_workspace %d\n", compress_workspace); > + > + workspace = HeapAlloc( GetProcessHeap(), 0, compress_workspace ); > + ok(workspace != NULL, "HeapAlloc failed %x\n", GetLastError()); > + > + /* test compression format / engine */ > + final_size = 0xdeadbeef; > + status = pRtlCompressBuffer(COMPRESSION_FORMAT_NONE, test_buffer, sizeof(test_buffer), > + buf1, sizeof(buf1) - 1, 4096, &final_size, workspace); > + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); > + ok(final_size == 0xdeadbeef, "got wrong final_size %d\n", final_size); > + > + final_size = 0xdeadbeef; > + status = pRtlCompressBuffer(COMPRESSION_FORMAT_DEFAULT, test_buffer, sizeof(test_buffer), > + buf1, sizeof(buf1) - 1, 4096, &final_size, workspace); > + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); > + ok(final_size == 0xdeadbeef, "got wrong final_size %d\n", final_size); > + > + final_size = 0xdeadbeef; > + status = pRtlCompressBuffer(0xFF, test_buffer, sizeof(test_buffer), > + buf1, sizeof(buf1) - 1, 4096, &final_size, workspace); > + ok(status == STATUS_UNSUPPORTED_COMPRESSION, "got wrong status 0x%08x\n", status); > + ok(final_size == 0xdeadbeef, "got wrong final_size %d\n", final_size); > + > + /* test compression */ > + final_size = 0xdeadbeef; > + memset(buf1, 0x11, sizeof(buf1)); > + status = pRtlCompressBuffer(COMPRESSION_FORMAT_LZNT1, test_buffer, sizeof(test_buffer), > + buf1, sizeof(buf1), 4096, &final_size, workspace); > + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); > + ok((*(WORD *)buf1 & 0x7000) == 0x3000, "no chunk signature found %04x\n", *(WORD *)buf1); > + buf_size = final_size; > + todo_wine > + ok(final_size < sizeof(test_buffer), "got wrong final_size %d\n", final_size); > + > + /* test decompression */ > + final_size = 0xdeadbeef; > + memset(buf2, 0x11, sizeof(buf2)); > + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf2, sizeof(buf2), > + buf1, buf_size, &final_size); > + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); > + ok(final_size == sizeof(test_buffer), "got wrong final_size %d\n", final_size); > + ok(!memcmp(buf2, test_buffer, sizeof(test_buffer)), "got wrong decoded data\n"); > + ok(buf2[sizeof(test_buffer)] == 0x11, "buf[%u] overwritten\n", (DWORD)sizeof(test_buffer)); > + > + /* buffer too small */ > + final_size = 0xdeadbeef; > + memset(buf1, 0x11, sizeof(buf1)); > + status = pRtlCompressBuffer(COMPRESSION_FORMAT_LZNT1, test_buffer, sizeof(test_buffer), > + buf1, 4, 4096, &final_size, workspace); > + ok(status == STATUS_BUFFER_TOO_SMALL, "got wrong status 0x%08x\n", status); > + > + HeapFree(GetProcessHeap(), 0, workspace); > +} > + > START_TEST(rtl) > { > InitFunctionPtrs(); > + > +#ifdef __i386__ > + test_WinSqm(); > +#else > + skip("stdcall-style parameter checks are not supported on this platform.\n"); > +#endif > > test_RtlCompareMemory(); > test_RtlCompareMemoryUlong(); > @@ -1623,6 +2500,10 @@ > test_RtlIpv4AddressToString(); > test_RtlIpv4AddressToStringEx(); > test_RtlIpv4StringToAddress(); > + test_RtlIpv4StringToAddressEx(); > test_LdrAddRefDll(); > test_LdrLockLoaderLock(); > -} > + test_RtlGetCompressionWorkSpaceSize(); > + test_RtlDecompressBuffer(); > + test_RtlCompressBuffer(); > +} > > Modified: trunk/rostests/winetests/ntdll/string.c > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/string.c?… > ============================================================================== > --- trunk/rostests/winetests/ntdll/string.c [iso-8859-1] (original) > +++ trunk/rostests/winetests/ntdll/string.c [iso-8859-1] Tue Mar 10 10:10:04 2015 > @@ -1083,8 +1083,8 @@ > result = p_atoi64(str2longlong[test_num].str); > if (str2longlong[test_num].overflow) > ok(result == str2longlong[test_num].value || > - (result == (str2longlong[test_num].overflow == -1) ? > - ULL(0x80000000,0x00000000) : ULL(0x7fffffff,0xffffffff)), > + (result == ((str2longlong[test_num].overflow == -1) ? > + ULL(0x80000000,0x00000000) : ULL(0x7fffffff,0xffffffff))), > "(test %d): call failed: _atoi64(\"%s\") has result 0x%x%08x, expected: 0x%x%08x\n", > test_num, str2longlong[test_num].str, (DWORD)(result >> 32), (DWORD)result, > (DWORD)(str2longlong[test_num].value >> 32), (DWORD)str2longlong[test_num].value); > @@ -1108,8 +1108,8 @@ > result = p_wtoi64(uni.Buffer); > if (str2longlong[test_num].overflow) > ok(result == str2longlong[test_num].value || > - (result == (str2longlong[test_num].overflow == -1) ? > - ULL(0x80000000,0x00000000) : ULL(0x7fffffff,0xffffffff)), > + (result == ((str2longlong[test_num].overflow == -1) ? > + ULL(0x80000000,0x00000000) : ULL(0x7fffffff,0xffffffff))), > "(test %d): call failed: _atoi64(\"%s\") has result 0x%x%08x, expected: 0x%x%08x\n", > test_num, str2longlong[test_num].str, (DWORD)(result >> 32), (DWORD)result, > (DWORD)(str2longlong[test_num].value >> 32), (DWORD)str2longlong[test_num].value); > >

10 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 66636: [DDK/XDK] - Fix some prototypes in wdm.h (PMDLX -> PMDL) - Fix annotations for ExFreePool(WithTag)

by Thomas Faber

On 2015-03-10 01:09, tkreuzer(a)svn.reactos.org wrote: > --- trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] (original) > +++ trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] Tue Mar 10 00:09:20 2015 > @@ -606,14 +606,14 @@ > VOID > NTAPI > ExFreePool( > - _In_ __drv_freesMem(Mem) PVOID P); > + _Pre_not __drv_freesMem(Mem) PVOID P); > > _IRQL_requires_max_(DISPATCH_LEVEL) > NTKERNELAPI > VOID > NTAPI > ExFreePoolWithTag( > - _In_ __drv_freesMem(Mem) PVOID P, > + _Pre_not __drv_freesMem(Mem) PVOID P, > _In_ ULONG Tag); > > _IRQL_requires_max_(DISPATCH_LEVEL) Are these typos (missing "null_")?

10 years, 1 month

1
0
0 0

Undocumented interesting WinDBG commands

by Hermès BÉLUSCA - MAÏTO

Hi ! For your information, here are some undocumented but nevertheless interesting WinDBG commands: http://blogs.msdn.com/b/reiley/archive/2011/10/30/undocumented-windbg.aspx Cheers, Hermès.

10 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 66623: [RTL] Partly sync actctx.c with Wine Staging 1.7.37. CORE-9246

by Aleksey Bragin

Hi Amine, thanks for syncing up ActCtx stuff! Is that DPRINT->DPRINT1 change intentional btw? Regards, Aleksey Bragin On 09.03.2015 21:08, akhaldi(a)svn.reactos.org wrote: > @@ -2920,7 +2975,7 @@ > HANDLE file; > DWORD len; > > - DPRINT( "looking for name=%S version=%u.%u.%u.%u arch=%S\n", > + DPRINT1( "looking for name=%S version=%u.%u.%u.%u arch=%S\n", > ai->name, ai->version.major, ai->version.minor, ai->version.build, ai->version.revision, ai->arch ); > > if ((status = lookup_winsxs(acl, ai)) != STATUS_NO_SUCH_FILE) return status; >

10 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 66613: [WIN32K] Fix a typo

by Jerome Gardou

Hey Timo, Le 09/03/2015 00:36, tkreuzer(a)svn.reactos.org a écrit : > Author: tkreuzer > Date: Sun Mar 8 23:36:04 2015 > New Revision: 66613 > > URL: http://svn.reactos.org/svn/reactos?rev=66613&view=rev > Log: > [WIN32K] > Fix a typo > > Modified: > trunk/reactos/win32ss/gdi/eng/bitblt.c > > Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… > ============================================================================== > --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) > +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Sun Mar 8 23:36:04 2015 > @@ -468,7 +468,7 @@ > if (psoMask == NULL) > { > /* We have no mask, assume the mask is all foreground */ > - rop4 &= (rop4 & 0xFF) || ((rop4 & 0xFF) << 8); > + rop4 = (rop4 & 0xFF) || ((rop4 & 0xFF) << 8); Looks dubious. Is equivalent to ((rop4 & 0xFF) != 0) > UsesMask = FALSE; > } > } > >

10 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 66575: Start source tree (final, I hope!) restructuration. Part 1/X Win32, Shell, Services, MVDM

by daniel.reimer

Hii, Well... In theory the restructuring might be logical and maybe even a good idea to separate some of the DLL/win32 folder etc, but this can't be done as one man show. It breaks the patches in jira, breaks the stuff our devs might have locally and maybe someone has something to say to your plans.How to resolve this? Tbh, no clue. But a open discussion BEFORE commiting would be a start IMO. So guys, what now? Can we keep it or not? Greetings Daniel Von meinem Samsung Gerät gesendet. -------- Ursprüngliche Nachricht -------- Von: Hermès BÉLUSCA - MAÏTO <hermes.belusca(a)sfr.fr> Datum: 06.03.2015 12:03 (GMT+01:00) An: 'ReactOS Development List' <ros-dev(a)reactos.org> Betreff: Re: [ros-dev] [ros-diffs] [hbelusca] 66575: Start source tree (final, I hope!) restructuration. Part 1/X Win32, Shell, Services, MVDM So... ... must I revert trunk pre-66575 ? Hermès. -----Message d'origine----- De : Ros-dev [mailto:ros-dev-bounces@reactos.org] De la part de Aleksey Bragin Envoyé : vendredi 6 mars 2015 10:48 À : ReactOS Development List Objet : Re: [ros-dev] [ros-diffs] [hbelusca] 66575: Start source tree (final, I hope!) restructuration. Part 1/X Win32, Shell, Services, MVDM On 06.03.2015 2:58, Hermès BÉLUSCA - MAÏTO wrote: > Hi, > > So first, please receive my apologies for not having warned in ros-dev > about this (continuation of) tree restructure I did starting with > r66575. Indeed this was the first thing to do before doing anything, > even if I talked about that on IRC and JIRA! Wrong. You did not need to warn, you need to get majority of devs to support this change, to get comments from them, to make sure they continue to feel "at home" in ReactOS source code. Right now, for the sake of subjective beautification you just forced everyone but you to adapt their patches (myself included, I have many working copies) just because you feel the tree structure was wrong. This is just ridiculous. As Pierre said, we are a team here. And teamwork without big issues is what is making our project a good place to work in, to get pleasure and satisfaction from the work done. > In fact, the tree restructure discussion started 5 years ago, along > with the cmake bringup: see the big thread here: > http://www.reactos.org/pipermail/ros-dev/2010-July/013257.html . Imagine what, I was part of it. > At that > time the main argument was that we were also in the middle of changing > the old build system (rbuild) to a new one (cmake) so it was > problematic to do those two big changes at once. Also at that time, > seeing the argumentation of Ged, Timo, Jérôme and the few others > (active developers) who dared to participate to this discussion, it > was clear that a tree restructure was necessary anyway, sooner or later. This is called https://en.wikipedia.org/wiki/Post-purchase_rationalization . After you made the change you start explaining that everyone was supporting it, it was so much needed, and let's just forget about any side-effects it may have caused. > In 2012 some tree restructure happened (r56305) by moving around and > in a more logical manner some core components of win32. Yep. > What happens now in 2015, i.e. 5 years after ? We have CMake well > established, everything works, but only win32 core was reorganized. Sure, 5 years is a magic number which means you can safely ignore everyone else and just force your own change. > I made http://jira.reactos.org/browse/CORE-9111 , people started to > give proposals. You came back with the almost same argument, that is > to finish the existing things first (adapt that: at the time of CMake, > it was CMake, now, it's fix all ReactOS 0.4 bugs), and then improve > structure of source tree. Since not all the existing bugs will be > fixed by then, we can continue this way and wait another 5 years in order to have a real tree restructure? > I don't think so. > So I took that for granted and committed r66575. You know, users don't care about source code tree structure. Tree is for developers. Users (and hence, popularity and usability of ReactOS) like when ReactOS does not crash, when ReactOS runs their apps, when ReactOS loads native binary drivers. And my point is that internal changes (code refactorings, tree restructures, reformatting) must happen only when the advantage of that is more than the disadvantage/side effects. Are you going to say that ReactOS 0.4 is closer now because you restructured the tree according to your taste? Was there any urge to do the restructure? > Active developers really think (at least, myself) it's a pain in the > *** The key part: "myself". Let's face it: you silently ignored my opinion and decided not to ask anyone else. This is PITA, not the tree structure. > that when we code on some given module (example: shell), we need to > modify some bit of code in base/shell/whatever, some bit of code in > dll/win32/shell32, some bit of code here and there. All the code of > the shell should be tied together. This goes also for everything else: > the core of NT (kernel, ntdll, "base" drivers...), the win32 subsystem > (win32k; for it the change in r56305 started to make things more > logical: you would not have to modify code in some win32k/ directory > while also changing > dll/win32/gdi32 or dll/win32/user32 that were by the way amongst all > the rest of wine dlls, etc...) . It's not "more logical", it's just different logical approaches. > Because I didn't want to wait yet another 5 years I decided to start > something. Just remember, trunk is not your private branch. You have to take other devs opinion into account. And you are not always right. Sometimes even Alex Ionescu fails, though I must say it happens very rare. Get used to convince people. Remember Arwinss? Did I just delete the existing trunk win32ss back then? Imagine if I did? My reasoning was perfect, the subsystem was superior to trunk back then in many ways, and "I did not want to wait another 10 years for someone to finish trunk's win32ss". > OK my fault I would have to get a synthesis of the different proposals > of tree restructures I got, then put in ros-dev, then wait 1 month > until everybody starts to vote. Of course you would get people > thinking it's better to do à la Wine and sort the files by extension > type (that's what we almost have currently) and it was already > repeated that it is BAD because it doesn't translate the fact that > ROS/windows is built by modules; others would have thought it's nice > to have this piece of thing next to another one whereas this can be > postponed later on until the *obvious* parts of code have been properly packed together. Yes, unless I don't know something and suddenly all your ideas are absolutely true without the need for verification. Mine aren't, I always consult with other skilled people. > And because of that, here is my proposal: UNTIL details get fixed, I > propose > to: > - keep the /boot/, /include/, /lib/, /media/ and /tools/ directories > (as well as /cmake/ and the files in / ) untouched. > - ntoskrnl, ntdll and the drivers we have in /drivers/ (SAUF, the > multimedia > ones) go into some main "ntcore" directory (ntcore, ntos, call it > whatever you prefer. I'm inclined to the second name, but I'm ok with the first one). > - the keyboard layouts can be moved either to win32ss/ or to / (in > case we can give sense to keyboard layouts in "pure" NT, for example > when we run usetup, etc...) > - ok... my already-done (but revertable) modifs from 66575 (directory > renamings can be done, it's not set in stone). > - putting all printing support in some /win32/printsup (or > "printing"...) directory : that means: localspl, ntprint, printui, > spoolsv and spoolss, and winspool (so far...) Oh, now you shared your secret plan with us. Thank you so much! Actually, I would like to invent something better than just copying the NT source code tree layout. > That's what I'm 99.99% sure (and what I think is quite clear). > Concerning the rest (that can create discussion) I still keep it in old directories. ... > Regards, > Hermès. > > > > -----Message d'origine----- > De : Ros-dev [mailto:ros-dev-bounces@reactos.org] De la part de > Aleksey Bragin Envoyé : vendredi 6 mars 2015 00:15 À : > ros-dev(a)reactos.org Objet : Re: [ros-dev] [ros-diffs] [hbelusca] > 66575: Start source tree (final, I hope!) restructuration. Part 1/X > Win32, Shell, Services, MVDM > > Hermes, > > What the fuck, may I ask? > > I don't understand since when we started doing big changes in trunk > without talking (or listening) to anyone at all, just at your own discretion? > > Are you so sure the change is accepted by majority of our developers? > Did you get approval of those devs? Give them some respect which they > earned over years with their skills and commitment. > > I understand ReactOS is a very loosely managed project (to favor ease > of development), but totally ignoring everyone? > I checked CORE-9111 and I don't see any single comment from Timo, > Jerome, James, whoever else counts. > > Regards, > Aleksey Bragin > P.S. I'm not talking about actual changes, I'm talking about the > process and attitude. > > On 06.03.2015 2:03, hbelusca(a)svn.reactos.org wrote: >> Author: hbelusca >> Date: Thu Mar 5 23:03:33 2015 >> New Revision: 66575 >> >> URL: http://svn.reactos.org/svn/reactos?rev=66575&view=rev >> Log: >> Start source tree (final, I hope!) restructuration. Part 1/X Win32, >> Shell, Services, MVDM >> > _______________________________________________ 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

10 years, 1 month

7
7
0 0

GSoC :: application rejected

by Pierre Schweitzer

Dear all, The ReactOS Foundation application to GSoC has been rejected this year again. Statistics are not reliable after all. In any case, keep up the good work. We don't need Google to be the bests at what we do. Cheers, -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

10 years, 1 month

8
10
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 66575: Start source tree (final, I hope!) restructuration. Part 1/X Win32, Shell, Services, MVDM

by Aleksey Bragin

Hermes, What the fuck, may I ask? I don't understand since when we started doing big changes in trunk without talking (or listening) to anyone at all, just at your own discretion? Are you so sure the change is accepted by majority of our developers? Did you get approval of those devs? Give them some respect which they earned over years with their skills and commitment. I understand ReactOS is a very loosely managed project (to favor ease of development), but totally ignoring everyone? I checked CORE-9111 and I don't see any single comment from Timo, Jerome, James, whoever else counts. Regards, Aleksey Bragin P.S. I'm not talking about actual changes, I'm talking about the process and attitude. On 06.03.2015 2:03, hbelusca(a)svn.reactos.org wrote: > Author: hbelusca > Date: Thu Mar 5 23:03:33 2015 > New Revision: 66575 > > URL: http://svn.reactos.org/svn/reactos?rev=66575&view=rev > Log: > Start source tree (final, I hope!) restructuration. Part 1/X > Win32, Shell, Services, MVDM >

10 years, 1 month

6
7
0 0

Intel Edison + ReactOS

by Aleksey Bragin

Hi! I visited Intel's office in Moscow this week where I was given the brand new Intel Edison along with the Arduino-compatible prototype board. This story started by Alexander Rechitsky who brought all this to my attention, communicated with Novosibirsk's and Moscow's Intel staff and explained the ReactOS-on-Edison idea. Now I can get my hands on this board, and I invite everyone who's interested to play with it together. I am just getting started with it - the basics, like attaching serial output, etc. Some photos of this thing can be seen in my public Facebook album: https://www.facebook.com/media/set/?set=a.10204517582234470.1073741833.1080… Regards, Aleksey Bragin

10 years, 1 month

5
4
0 0

Re: [ros-dev] [ros-diffs] [cwittich] 66547: [WLANAPI] add stubs for WlanQueryInterface and WlanGetInterfaceCapability

by Thomas Faber

On 2015-03-02 20:27, cwittich(a)svn.reactos.org wrote: > --- trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] (original) > +++ trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] Mon Mar 2 19:27:45 2015 > @@ -24,7 +24,7 @@ > wlan_opcode_value_type_set_by_group_policy, > wlan_opcode_value_type_set_by_user, > wlan_opcode_value_type_invalid > -} WLAN_OPCODE_VALUE_TYPE; > +} WLAN_OPCODE_VALUE_TYPE; /* HACK: WIDL is broken , *PWLAN_OPCODE_VALUE_TYPE; */ > > typedef enum _WLAN_SECURABLE_OBJECT { > wlan_secure_permit_list = 0, What's broken, exactly? Let's see if we can get it fixed...

10 years, 1 month

2
1
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 66551: [PSDK] Fix winternl.h version of SECTION_IMAGE_INFORMATION and add missing MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION definition.

by Alex Ionescu

This is wintrnl.h which should match the Windows one. Make sure you're not accidentally adding fields that only NDK should have. Best regards, Alex Ionescu On Mon, Mar 2, 2015 at 3:38 PM, <akhaldi(a)svn.reactos.org> wrote: > Author: akhaldi > Date: Mon Mar 2 23:38:49 2015 > New Revision: 66551 > > URL: http://svn.reactos.org/svn/reactos?rev=66551&view=rev > Log: > [PSDK] Fix winternl.h version of SECTION_IMAGE_INFORMATION and add missing > MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION definition. > > Modified: > trunk/reactos/include/psdk/winternl.h > > Modified: trunk/reactos/include/psdk/winternl.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… > > ============================================================================== > --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) > +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Mon Mar 2 > 23:38:49 2015 > @@ -705,6 +705,7 @@ > > #define MEM_EXECUTE_OPTION_DISABLE 0x01 > #define MEM_EXECUTE_OPTION_ENABLE 0x02 > +#define MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION 0x04 > #define MEM_EXECUTE_OPTION_PERMANENT 0x08 > > typedef enum _SECTION_INHERIT { > @@ -1685,23 +1686,28 @@ > } SECTION_INFORMATION_CLASS; > > typedef struct _SECTION_BASIC_INFORMATION { > - ULONG BaseAddress; > + PVOID BaseAddress; > ULONG Attributes; > LARGE_INTEGER Size; > } SECTION_BASIC_INFORMATION, *PSECTION_BASIC_INFORMATION; > > typedef struct _SECTION_IMAGE_INFORMATION { > - PVOID EntryPoint; > - ULONG StackZeroBits; > - ULONG StackReserved; > - ULONG StackCommit; > - ULONG ImageSubsystem; > + PVOID TransferAddress; > + ULONG ZeroBits; > + SIZE_T MaximumStackSize; > + SIZE_T CommittedStackSize; > + ULONG SubSystemType; > WORD SubsystemVersionLow; > WORD SubsystemVersionHigh; > - ULONG Unknown1; > + ULONG GpValue; > ULONG ImageCharacteristics; > - ULONG ImageMachineType; > - ULONG Unknown2[3]; > + USHORT DllCharacteristics; > + USHORT Machine; > + BOOLEAN ImageContainsCode; > + UCHAR ImageFlags; > + ULONG LoaderFlags; > + ULONG ImageFileSize; > + ULONG CheckSum; > } SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION; > > typedef struct _LPC_SECTION_WRITE { > > >

10 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [cgutman] 66511: [PCI] - Handle 64-bit PCI base address registers (BARs) - Fix maximum address in resource requirements for 20-bit resources - Fix flags on memory and I/O port resources [NTOS] - Fi...

by Alex Ionescu

Just make pcix work already Best regards, Alex Ionescu On Sat, Feb 28, 2015 at 11:52 PM, <cgutman(a)svn.reactos.org> wrote: > Author: cgutman > Date: Sun Mar 1 07:52:32 2015 > New Revision: 66511 > > URL: http://svn.reactos.org/svn/reactos?rev=66511&view=rev > Log: > [PCI] > - Handle 64-bit PCI base address registers (BARs) > - Fix maximum address in resource requirements for 20-bit resources > - Fix flags on memory and I/O port resources > [NTOS] > - Fix handling of 64-bit resources > > Modified: > trunk/reactos/drivers/bus/pci/pdo.c > trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c > > Modified: trunk/reactos/drivers/bus/pci/pdo.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… > > ============================================================================== > --- trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] Sun Mar 1 07:52:32 > 2015 > @@ -21,6 +21,9 @@ > #define DBGPRINT(...) > #endif > > +#define PCI_ADDRESS_MEMORY_ADDRESS_MASK_64 0xfffffffffffffff0ull > +#define PCI_ADDRESS_IO_ADDRESS_MASK_64 0xfffffffffffffffcull > + > /*** PRIVATE > *****************************************************************/ > > static NTSTATUS > @@ -191,80 +194,159 @@ > return STATUS_SUCCESS; > } > > +static BOOLEAN > +PdoReadPciBar(PPDO_DEVICE_EXTENSION DeviceExtension, > + ULONG Offset, > + PULONG OriginalValue, > + PULONG NewValue) > +{ > + ULONG Size; > + ULONG AllOnes; > + > + /* Read the original value */ > + Size = HalGetBusDataByOffset(PCIConfiguration, > + DeviceExtension->PciDevice->BusNumber, > + > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > + OriginalValue, > + Offset, > + sizeof(ULONG)); > + if (Size != sizeof(ULONG)) > + { > + DPRINT1("Wrong size %lu\n", Size); > + return FALSE; > + } > + > + /* Write all ones to determine which bits are held to zero */ > + AllOnes = MAXULONG; > + Size = HalSetBusDataByOffset(PCIConfiguration, > + DeviceExtension->PciDevice->BusNumber, > + > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > + &AllOnes, > + Offset, > + sizeof(ULONG)); > + if (Size != sizeof(ULONG)) > + { > + DPRINT1("Wrong size %lu\n", Size); > + return FALSE; > + } > + > + /* Get the range length */ > + Size = HalGetBusDataByOffset(PCIConfiguration, > + DeviceExtension->PciDevice->BusNumber, > + > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > + NewValue, > + Offset, > + sizeof(ULONG)); > + if (Size != sizeof(ULONG)) > + { > + DPRINT1("Wrong size %lu\n", Size); > + return FALSE; > + } > + > + /* Restore original value */ > + Size = HalSetBusDataByOffset(PCIConfiguration, > + DeviceExtension->PciDevice->BusNumber, > + > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > + OriginalValue, > + Offset, > + sizeof(ULONG)); > + if (Size != sizeof(ULONG)) > + { > + DPRINT1("Wrong size %lu\n", Size); > + return FALSE; > + } > + > + return TRUE; > +} > > static BOOLEAN > PdoGetRangeLength(PPDO_DEVICE_EXTENSION DeviceExtension, > - ULONG Offset, > - PULONG Base, > - PULONG Length, > - PULONG Flags) > -{ > - ULONG OrigValue; > - ULONG BaseValue; > - ULONG NewValue; > - ULONG Size; > - ULONG XLength; > - > - /* Save original value */ > - Size= HalGetBusDataByOffset(PCIConfiguration, > - DeviceExtension->PciDevice->BusNumber, > - > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > - &OrigValue, > - Offset, > - sizeof(ULONG)); > - if (Size != sizeof(ULONG)) > - { > - DPRINT1("Wrong size %lu\n", Size); > + UCHAR Bar, > + PULONGLONG Base, > + PULONGLONG Length, > + PULONG Flags, > + PUCHAR NextBar, > + PULONGLONG MaximumAddress) > +{ > + union { > + struct { > + ULONG Bar0; > + ULONG Bar1; > + } Bars; > + ULONGLONG Bar; > + } OriginalValue; > + union { > + struct { > + ULONG Bar0; > + ULONG Bar1; > + } Bars; > + ULONGLONG Bar; > + } NewValue; > + ULONG Offset; > + > + /* Compute the offset of this BAR in PCI config space */ > + Offset = 0x10 + Bar * 4; > + > + /* Assume this is a 32-bit BAR until we find wrong */ > + *NextBar = Bar + 1; > + > + /* Initialize BAR values to zero */ > + OriginalValue.Bar = 0ULL; > + NewValue.Bar = 0ULL; > + > + /* Read the first BAR */ > + if (!PdoReadPciBar(DeviceExtension, Offset, > + &OriginalValue.Bars.Bar0, > + &NewValue.Bars.Bar0)) > + { > return FALSE; > } > - > - BaseValue = (OrigValue & PCI_ADDRESS_IO_SPACE) > - ? (OrigValue & PCI_ADDRESS_IO_ADDRESS_MASK) > - : (OrigValue & PCI_ADDRESS_MEMORY_ADDRESS_MASK); > - > - *Base = BaseValue; > - > - /* Set magic value */ > - NewValue = MAXULONG; > - Size= HalSetBusDataByOffset(PCIConfiguration, > - DeviceExtension->PciDevice->BusNumber, > - > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > - &NewValue, > - Offset, > - sizeof(ULONG)); > - if (Size != sizeof(ULONG)) > - { > - DPRINT1("Wrong size %lu\n", Size); > - return FALSE; > - } > - > - /* Get the range length */ > - Size= HalGetBusDataByOffset(PCIConfiguration, > - DeviceExtension->PciDevice->BusNumber, > - > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > - &NewValue, > - Offset, > - sizeof(ULONG)); > - if (Size != sizeof(ULONG)) > - { > - DPRINT1("Wrong size %lu\n", Size); > - return FALSE; > - } > - > - /* Restore original value */ > - Size= HalSetBusDataByOffset(PCIConfiguration, > - DeviceExtension->PciDevice->BusNumber, > - > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > - &OrigValue, > - Offset, > - sizeof(ULONG)); > - if (Size != sizeof(ULONG)) > - { > - DPRINT1("Wrong size %lu\n", Size); > - return FALSE; > - } > - > - if (NewValue == 0) > + > + /* Check if this is a memory BAR */ > + if (!(OriginalValue.Bars.Bar0 & PCI_ADDRESS_IO_SPACE)) > + { > + /* Write the maximum address if the caller asked for it */ > + if (MaximumAddress != NULL) > + { > + if ((OriginalValue.Bars.Bar0 & PCI_ADDRESS_MEMORY_TYPE_MASK) > == PCI_TYPE_32BIT) > + { > + *MaximumAddress = 0x00000000FFFFFFFFULL; > + } > + else if ((OriginalValue.Bars.Bar0 & > PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_20BIT) > + { > + *MaximumAddress = 0x00000000000FFFFFULL; > + } > + else if ((OriginalValue.Bars.Bar0 & > PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_64BIT) > + { > + *MaximumAddress = 0xFFFFFFFFFFFFFFFFULL; > + } > + } > + > + /* Check if this is a 64-bit BAR */ > + if ((OriginalValue.Bars.Bar0 & PCI_ADDRESS_MEMORY_TYPE_MASK) == > PCI_TYPE_64BIT) > + { > + /* We've now consumed the next BAR too */ > + *NextBar = Bar + 2; > + > + /* Read the next BAR */ > + if (!PdoReadPciBar(DeviceExtension, Offset + 4, > + &OriginalValue.Bars.Bar1, > + &NewValue.Bars.Bar1)) > + { > + return FALSE; > + } > + } > + } > + else > + { > + /* Write the maximum I/O port address */ > + if (MaximumAddress != NULL) > + { > + *MaximumAddress = 0x00000000FFFFFFFFULL; > + } > + } > + > + if (NewValue.Bar == 0) > { > DPRINT("Unused address register\n"); > *Base = 0; > @@ -272,48 +354,16 @@ > *Flags = 0; > return TRUE; > } > - > - XLength = ~((NewValue & PCI_ADDRESS_IO_SPACE) > - ? (NewValue & PCI_ADDRESS_IO_ADDRESS_MASK) > - : (NewValue & PCI_ADDRESS_MEMORY_ADDRESS_MASK)) + 1; > - > -#if 0 > - DbgPrint("BaseAddress 0x%08lx Length 0x%08lx", > - BaseValue, XLength); > - > - if (NewValue & PCI_ADDRESS_IO_SPACE) > - { > - DbgPrint(" IO range"); > - } > - else > - { > - DbgPrint(" Memory range"); > - if ((NewValue & PCI_ADDRESS_MEMORY_TYPE_MASK) == 0) > - { > - DbgPrint(" in 32-Bit address space"); > - } > - else if ((NewValue & PCI_ADDRESS_MEMORY_TYPE_MASK) == 2) > - { > - DbgPrint(" below 1BM "); > - } > - else if ((NewValue & PCI_ADDRESS_MEMORY_TYPE_MASK) == 4) > - { > - DbgPrint(" in 64-Bit address space"); > - } > - > - if (NewValue & PCI_ADDRESS_MEMORY_PREFETCHABLE) > - { > - DbgPrint(" prefetchable"); > - } > - } > - > - DbgPrint("\n"); > -#endif > - > - *Length = XLength; > - *Flags = (NewValue & PCI_ADDRESS_IO_SPACE) > - ? (NewValue & ~PCI_ADDRESS_IO_ADDRESS_MASK) > - : (NewValue & ~PCI_ADDRESS_MEMORY_ADDRESS_MASK); > + > + *Base = OriginalValue.Bar & PCI_ADDRESS_MEMORY_ADDRESS_MASK_64; > + > + *Length = ~((NewValue.Bar & PCI_ADDRESS_IO_SPACE) > + ? (NewValue.Bar & PCI_ADDRESS_IO_ADDRESS_MASK_64) > + : (NewValue.Bar & PCI_ADDRESS_MEMORY_ADDRESS_MASK_64)) + > 1; > + > + *Flags = (NewValue.Bar & PCI_ADDRESS_IO_SPACE) > + ? (NewValue.Bar & ~PCI_ADDRESS_IO_ADDRESS_MASK_64) > + : (NewValue.Bar & ~PCI_ADDRESS_MEMORY_ADDRESS_MASK_64); > > return TRUE; > } > @@ -332,10 +382,11 @@ > ULONG Size; > ULONG ResCount = 0; > ULONG ListSize; > - ULONG i; > - ULONG Base; > - ULONG Length; > + UCHAR Bar; > + ULONGLONG Base; > + ULONGLONG Length; > ULONG Flags; > + ULONGLONG MaximumAddress; > > UNREFERENCED_PARAMETER(IrpSp); > DPRINT("PdoQueryResourceRequirements() called\n"); > @@ -361,13 +412,15 @@ > ResCount = 0; > if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE) > { > - for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE0_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > + &Flags, > + &Bar, > + NULL)) > break; > > if (Length != 0) > @@ -381,13 +434,15 @@ > } > else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) > { > - for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE1_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > + &Flags, > + &Bar, > + NULL)) > break; > > if (Length != 0) > @@ -442,13 +497,15 @@ > Descriptor = &ResourceList->List[0].Descriptors[0]; > if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE) > { > - for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE0_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > + &Flags, > + &Bar, > + &MaximumAddress)) > { > DPRINT1("PdoGetRangeLength() failed\n"); > break; > @@ -472,19 +529,20 @@ > > Descriptor->u.Port.Length = Length; > Descriptor->u.Port.Alignment = 1; > - Descriptor->u.Port.MinimumAddress.QuadPart = > (ULONGLONG)Base; > - Descriptor->u.Port.MaximumAddress.QuadPart = > (ULONGLONG)(Base + Length - 1); > + Descriptor->u.Port.MinimumAddress.QuadPart = Base; > + Descriptor->u.Port.MaximumAddress.QuadPart = Base + > Length - 1; > } > else > { > Descriptor->Type = CmResourceTypeMemory; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; > + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | > + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? > CM_RESOURCE_MEMORY_PREFETCHABLE : 0; > > Descriptor->u.Memory.Length = Length; > Descriptor->u.Memory.Alignment = 1; > - Descriptor->u.Memory.MinimumAddress.QuadPart = > (ULONGLONG)Base; > - Descriptor->u.Memory.MaximumAddress.QuadPart = > (ULONGLONG)(Base + Length - 1); > + Descriptor->u.Memory.MinimumAddress.QuadPart = Base; > + Descriptor->u.Memory.MaximumAddress.QuadPart = Base + > Length - 1; > } > Descriptor++; > > @@ -500,19 +558,20 @@ > > Descriptor->u.Port.Length = Length; > Descriptor->u.Port.Alignment = Length; > - Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)0; > - Descriptor->u.Port.MaximumAddress.QuadPart = > (ULONGLONG)0x00000000FFFFFFFF; > + Descriptor->u.Port.MinimumAddress.QuadPart = 0; > + Descriptor->u.Port.MaximumAddress.QuadPart = > MaximumAddress; > } > else > { > Descriptor->Type = CmResourceTypeMemory; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; > + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | > + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? > CM_RESOURCE_MEMORY_PREFETCHABLE : 0; > > Descriptor->u.Memory.Length = Length; > Descriptor->u.Memory.Alignment = Length; > - Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)0; > - Descriptor->u.Port.MaximumAddress.QuadPart = > (ULONGLONG)0x00000000FFFFFFFF; > + Descriptor->u.Port.MinimumAddress.QuadPart = 0; > + Descriptor->u.Port.MaximumAddress.QuadPart = > MaximumAddress; > } > Descriptor++; > } > @@ -532,13 +591,15 @@ > } > else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) > { > - for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE1_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > + &Flags, > + &Bar, > + &MaximumAddress)) > { > DPRINT1("PdoGetRangeLength() failed\n"); > break; > @@ -562,19 +623,20 @@ > > Descriptor->u.Port.Length = Length; > Descriptor->u.Port.Alignment = 1; > - Descriptor->u.Port.MinimumAddress.QuadPart = > (ULONGLONG)Base; > - Descriptor->u.Port.MaximumAddress.QuadPart = > (ULONGLONG)(Base + Length - 1); > + Descriptor->u.Port.MinimumAddress.QuadPart = Base; > + Descriptor->u.Port.MaximumAddress.QuadPart = Base + > Length - 1; > } > else > { > Descriptor->Type = CmResourceTypeMemory; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; > + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | > + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? > CM_RESOURCE_MEMORY_PREFETCHABLE : 0; > > Descriptor->u.Memory.Length = Length; > Descriptor->u.Memory.Alignment = 1; > - Descriptor->u.Memory.MinimumAddress.QuadPart = > (ULONGLONG)Base; > - Descriptor->u.Memory.MaximumAddress.QuadPart = > (ULONGLONG)(Base + Length - 1); > + Descriptor->u.Memory.MinimumAddress.QuadPart = Base; > + Descriptor->u.Memory.MaximumAddress.QuadPart = Base + > Length - 1; > } > Descriptor++; > > @@ -590,19 +652,20 @@ > > Descriptor->u.Port.Length = Length; > Descriptor->u.Port.Alignment = Length; > - Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)0; > - Descriptor->u.Port.MaximumAddress.QuadPart = > (ULONGLONG)0x00000000FFFFFFFF; > + Descriptor->u.Port.MinimumAddress.QuadPart = 0; > + Descriptor->u.Port.MaximumAddress.QuadPart = > MaximumAddress; > } > else > { > Descriptor->Type = CmResourceTypeMemory; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; > + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | > + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? > CM_RESOURCE_MEMORY_PREFETCHABLE : 0; > > Descriptor->u.Memory.Length = Length; > Descriptor->u.Memory.Alignment = Length; > - Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)0; > - Descriptor->u.Port.MaximumAddress.QuadPart = > (ULONGLONG)0x00000000FFFFFFFF; > + Descriptor->u.Port.MinimumAddress.QuadPart = 0; > + Descriptor->u.Port.MaximumAddress.QuadPart = > MaximumAddress; > } > Descriptor++; > } > @@ -645,9 +708,9 @@ > ULONG Size; > ULONG ResCount = 0; > ULONG ListSize; > - ULONG i; > - ULONG Base; > - ULONG Length; > + UCHAR Bar; > + ULONGLONG Base; > + ULONGLONG Length; > ULONG Flags; > > DPRINT("PdoQueryResources() called\n"); > @@ -674,13 +737,15 @@ > ResCount = 0; > if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE) > { > - for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE0_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > + &Flags, > + &Bar, > + NULL)) > break; > > if (Length) > @@ -694,13 +759,15 @@ > } > else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) > { > - for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE1_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > + &Flags, > + &Bar, > + NULL)) > break; > > if (Length != 0) > @@ -749,17 +816,16 @@ > Descriptor = &PartialList->PartialDescriptors[0]; > if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE) > { > - for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE0_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > - { > - DPRINT1("PdoGetRangeLength() failed\n"); > + &Flags, > + &Bar, > + NULL)) > break; > - } > > if (Length == 0) > { > @@ -771,7 +837,9 @@ > { > Descriptor->Type = CmResourceTypePort; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_PORT_IO; > + Descriptor->Flags = CM_RESOURCE_PORT_IO | > + CM_RESOURCE_PORT_16_BIT_DECODE | > + CM_RESOURCE_PORT_POSITIVE_DECODE; > Descriptor->u.Port.Start.QuadPart = (ULONGLONG)Base; > Descriptor->u.Port.Length = Length; > > @@ -782,7 +850,8 @@ > { > Descriptor->Type = CmResourceTypeMemory; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; > + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | > + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? > CM_RESOURCE_MEMORY_PREFETCHABLE : 0; > Descriptor->u.Memory.Start.QuadPart = (ULONGLONG)Base; > Descriptor->u.Memory.Length = Length; > > @@ -811,17 +880,16 @@ > } > else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) > { > - for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE1_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > - { > - DPRINT1("PdoGetRangeLength() failed\n"); > + &Flags, > + &Bar, > + NULL)) > break; > - } > > if (Length == 0) > { > @@ -833,7 +901,9 @@ > { > Descriptor->Type = CmResourceTypePort; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_PORT_IO; > + Descriptor->Flags = CM_RESOURCE_PORT_IO | > + CM_RESOURCE_PORT_16_BIT_DECODE | > + CM_RESOURCE_PORT_POSITIVE_DECODE; > Descriptor->u.Port.Start.QuadPart = (ULONGLONG)Base; > Descriptor->u.Port.Length = Length; > > @@ -844,7 +914,8 @@ > { > Descriptor->Type = CmResourceTypeMemory; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; > + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | > + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? > CM_RESOURCE_MEMORY_PREFETCHABLE : 0; > Descriptor->u.Memory.Start.QuadPart = (ULONGLONG)Base; > Descriptor->u.Memory.Length = Length; > > > Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… > > ============================================================================== > --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sun Mar 1 > 07:52:32 2015 > @@ -73,7 +73,7 @@ > IN PIO_RESOURCE_DESCRIPTOR IoDesc, > OUT PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDesc) > { > - LONGLONG Start; > + ULONGLONG Start; > CM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDesc; > > ASSERT(IoDesc->Type == CmDesc->Type); > @@ -82,16 +82,16 @@ > /* HACK */ > if (IoDesc->u.Memory.Alignment == 0) IoDesc->u.Memory.Alignment = 1; > > - for (Start = IoDesc->u.Memory.MinimumAddress.QuadPart; > - Start <= IoDesc->u.Memory.MaximumAddress.QuadPart - > IoDesc->u.Memory.Length + 1; > + for (Start = (ULONGLONG)IoDesc->u.Memory.MinimumAddress.QuadPart; > + Start <= (ULONGLONG)IoDesc->u.Memory.MaximumAddress.QuadPart - > IoDesc->u.Memory.Length + 1; > Start += IoDesc->u.Memory.Alignment) > { > CmDesc->u.Memory.Length = IoDesc->u.Memory.Length; > - CmDesc->u.Memory.Start.QuadPart = Start; > + CmDesc->u.Memory.Start.QuadPart = (LONGLONG)Start; > > if (IopCheckDescriptorForConflict(CmDesc, &ConflictingDesc)) > { > - Start += ConflictingDesc.u.Memory.Start.QuadPart + > + Start += (ULONGLONG)ConflictingDesc.u.Memory.Start.QuadPart + > ConflictingDesc.u.Memory.Length; > } > else > @@ -110,7 +110,7 @@ > IN PIO_RESOURCE_DESCRIPTOR IoDesc, > OUT PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDesc) > { > - LONGLONG Start; > + ULONGLONG Start; > CM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDesc; > > ASSERT(IoDesc->Type == CmDesc->Type); > @@ -119,16 +119,16 @@ > /* HACK */ > if (IoDesc->u.Port.Alignment == 0) IoDesc->u.Port.Alignment = 1; > > - for (Start = IoDesc->u.Port.MinimumAddress.QuadPart; > - Start <= IoDesc->u.Port.MaximumAddress.QuadPart - > IoDesc->u.Port.Length + 1; > + for (Start = (ULONGLONG)IoDesc->u.Port.MinimumAddress.QuadPart; > + Start <= (ULONGLONG)IoDesc->u.Port.MaximumAddress.QuadPart - > IoDesc->u.Port.Length + 1; > Start += IoDesc->u.Port.Alignment) > { > CmDesc->u.Port.Length = IoDesc->u.Port.Length; > - CmDesc->u.Port.Start.QuadPart = Start; > + CmDesc->u.Port.Start.QuadPart = (LONGLONG)Start; > > if (IopCheckDescriptorForConflict(CmDesc, &ConflictingDesc)) > { > - Start += ConflictingDesc.u.Port.Start.QuadPart + > ConflictingDesc.u.Port.Length; > + Start += (ULONGLONG)ConflictingDesc.u.Port.Start.QuadPart + > ConflictingDesc.u.Port.Length; > } > else > { > @@ -300,8 +300,8 @@ > case CmResourceTypePort: > /* Make sure the length matches and it satisfies > our address range */ > if (CmDesc->u.Memory.Length == > IoDesc->u.Memory.Length && > - CmDesc->u.Memory.Start.QuadPart >= > IoDesc->u.Memory.MinimumAddress.QuadPart && > - CmDesc->u.Memory.Start.QuadPart + > CmDesc->u.Memory.Length - 1 <= IoDesc->u.Memory.MaximumAddress.QuadPart) > + (ULONGLONG)CmDesc->u.Memory.Start.QuadPart >= > (ULONGLONG)IoDesc->u.Memory.MinimumAddress.QuadPart && > + (ULONGLONG)CmDesc->u.Memory.Start.QuadPart + > CmDesc->u.Memory.Length - 1 <= > (ULONGLONG)IoDesc->u.Memory.MaximumAddress.QuadPart) > { > /* Found it */ > Matched = TRUE; > @@ -564,11 +564,11 @@ > switch (ResDesc->Type) > { > case CmResourceTypeMemory: > - if ((ResDesc->u.Memory.Start.QuadPart < > ResDesc2->u.Memory.Start.QuadPart && > - ResDesc->u.Memory.Start.QuadPart + > ResDesc->u.Memory.Length > > - ResDesc2->u.Memory.Start.QuadPart) || > (ResDesc2->u.Memory.Start.QuadPart < > - ResDesc->u.Memory.Start.QuadPart && > ResDesc2->u.Memory.Start.QuadPart + > - ResDesc2->u.Memory.Length > > ResDesc->u.Memory.Start.QuadPart)) > + if (((ULONGLONG)ResDesc->u.Memory.Start.QuadPart < > (ULONGLONG)ResDesc2->u.Memory.Start.QuadPart && > + (ULONGLONG)ResDesc->u.Memory.Start.QuadPart + > ResDesc->u.Memory.Length > > + (ULONGLONG)ResDesc2->u.Memory.Start.QuadPart) || > ((ULONGLONG)ResDesc2->u.Memory.Start.QuadPart < > + (ULONGLONG)ResDesc->u.Memory.Start.QuadPart && > (ULONGLONG)ResDesc2->u.Memory.Start.QuadPart + > + ResDesc2->u.Memory.Length > > (ULONGLONG)ResDesc->u.Memory.Start.QuadPart)) > { > if (!Silent) > { > @@ -585,11 +585,11 @@ > break; > > case CmResourceTypePort: > - if ((ResDesc->u.Port.Start.QuadPart < > ResDesc2->u.Port.Start.QuadPart && > - ResDesc->u.Port.Start.QuadPart + > ResDesc->u.Port.Length > > - ResDesc2->u.Port.Start.QuadPart) || > (ResDesc2->u.Port.Start.QuadPart < > - ResDesc->u.Port.Start.QuadPart && > ResDesc2->u.Port.Start.QuadPart + > - ResDesc2->u.Port.Length > > ResDesc->u.Port.Start.QuadPart)) > + if (((ULONGLONG)ResDesc->u.Port.Start.QuadPart < > (ULONGLONG)ResDesc2->u.Port.Start.QuadPart && > + (ULONGLONG)ResDesc->u.Port.Start.QuadPart + > ResDesc->u.Port.Length > > + (ULONGLONG)ResDesc2->u.Port.Start.QuadPart) || > ((ULONGLONG)ResDesc2->u.Port.Start.QuadPart < > + (ULONGLONG)ResDesc->u.Port.Start.QuadPart && > (ULONGLONG)ResDesc2->u.Port.Start.QuadPart + > + ResDesc2->u.Port.Length > > (ULONGLONG)ResDesc->u.Port.Start.QuadPart)) > { > if (!Silent) > { > > >

10 years, 1 month

1
0
0 0

Windows Server 2003 Testbot is live!

by Colin Finck

Hi all, After a long, long time, we finally have a Testbot regularly running our Wine tests and API tests under our target platform Windows Server 2003. The VM is actually based on Windows Home Server, which is a cheap Windows Server 2003 SP2 edition. The first successful test results are here: https://reactos.org/sites/all/modules/reactos/testman/compare.php?ids=34839 Okay, I have to admit this already required manual intervention. Test msi:install reproducibly hangs with the error message "The process cannot access the file because another process has locked a portion of the file". I expect all of this to still need some tweaking here and there. Please reply to this mail with all your tweaking suggestions and I see what I can do. Have fun, Colin

10 years, 1 month

3
3
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 66538: [SHLWAPI]: Remove some Wine madness. CORE-8936.

by Thomas Faber

Hmm what's the point of this? If it doesn't break anything, let's not create a ROS-diff? On 2015-03-02 02:15, hbelusca(a)svn.reactos.org wrote: > Author: hbelusca > Date: Mon Mar 2 01:15:00 2015 > New Revision: 66538 > > URL: http://svn.reactos.org/svn/reactos?rev=66538&view=rev > Log: > [SHLWAPI]: Remove some Wine madness. CORE-8936. > > Modified: > trunk/reactos/dll/win32/shlwapi/path.c > > Modified: trunk/reactos/dll/win32/shlwapi/path.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/path.c?r… > ============================================================================== > --- trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] Mon Mar 2 01:15:00 2015 > @@ -21,22 +21,7 @@ > > #include "precomp.h" > > -/* Get a function pointer from a DLL handle */ > -#define GET_FUNC(func, module, name, fail) \ > - do { \ > - if (!func) { \ > - if (!SHLWAPI_h##module && !(SHLWAPI_h##module = LoadLibraryA(#module ".dll"))) return fail; \ > - func = (fn##func)GetProcAddress(SHLWAPI_h##module, name); \ > - if (!func) return fail; \ > - } \ > - } while (0) > - > -/* DLL handles for late bound calls */ > -static HMODULE SHLWAPI_hshell32; > - > -/* Function pointers for GET_FUNC macro; these need to be global because of gcc bug */ > -typedef BOOL (WINAPI *fnpIsNetDrive)(int); > -static fnpIsNetDrive pIsNetDrive; > +int WINAPI IsNetDrive(int drive); > > HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR,LPWSTR,DWORD); > > @@ -3699,8 +3684,7 @@ > dwDriveNum = PathGetDriveNumberA(lpszPath); > if (dwDriveNum == -1) > return FALSE; > - GET_FUNC(pIsNetDrive, shell32, (LPCSTR)66, FALSE); /* ord 66 = shell32.IsNetDrive */ > - return pIsNetDrive(dwDriveNum); > + return IsNetDrive(dwDriveNum); > } > > /************************************************************************* > @@ -3721,8 +3705,7 @@ > dwDriveNum = PathGetDriveNumberW(lpszPath); > if (dwDriveNum == -1) > return FALSE; > - GET_FUNC(pIsNetDrive, shell32, (LPCSTR)66, FALSE); /* ord 66 = shell32.IsNetDrive */ > - return pIsNetDrive(dwDriveNum); > + return IsNetDrive(dwDriveNum); > } > > /************************************************************************* > >

10 years, 1 month

1
0
0 0

Cant log in jira

by Alexander Rechitskiy

10 years, 1 month

3
2
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 66500: [KERNEL32_VISTA] Add and export InitOnceExecuteOnce(). CORE-9246

by Alex Ionescu

Why are we adding Wineisms to core binaries like kernel32? These functions should be in NTDLL and not in kernel32, and they are badly written anyway. Best regards, Alex Ionescu On Sat, Feb 28, 2015 at 10:46 AM, <akhaldi(a)svn.reactos.org> wrote: > Author: akhaldi > Date: Sat Feb 28 15:46:43 2015 > New Revision: 66500 > > URL: http://svn.reactos.org/svn/reactos?rev=66500&view=rev > Log: > [KERNEL32_VISTA] Add and export InitOnceExecuteOnce(). CORE-9246 > > Added: > trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c (with > props) > Modified: > trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt > trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec > > Modified: trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/C… > > ============================================================================== > --- trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt > [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt > [iso-8859-1] Sat Feb 28 15:46:43 2015 > @@ -8,15 +8,11 @@ > list(APPEND SOURCE > DllMain.c > GetTickCount64.c > + InitOnceExecuteOnce.c > ${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def) > > add_library(kernel32_vista SHARED ${SOURCE}) > set_module_type(kernel32_vista win32dll HOTPATCHABLE ENTRYPOINT DllMain > 12) > -add_importlibs(kernel32_vista kernel32) > - > -if(MSVC) > - add_importlibs(kernel32_vista ntdll) > -endif() > - > +add_importlibs(kernel32_vista kernel32 ntdll) > add_dependencies(kernel32_vista psdk) > add_cd_file(TARGET kernel32_vista DESTINATION reactos/system32 FOR all) > > Added: trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/I… > > ============================================================================== > --- trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c > (added) > +++ trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c > [iso-8859-1] Sat Feb 28 15:46:43 2015 > @@ -0,0 +1,118 @@ > + > +#include "k32_vista.h" > + > +#include <ndk/exfuncs.h> > +#include <wine/config.h> > +#include <wine/port.h> > + > +/* Taken from Wine ntdll/sync.c */ > + > +HANDLE keyed_event = NULL; > + > +static DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG > flags, void **context ) > +{ > + if (flags & RTL_RUN_ONCE_CHECK_ONLY) > + { > + ULONG_PTR val = (ULONG_PTR)once->Ptr; > + > + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; > + if ((val & 3) != 2) return STATUS_UNSUCCESSFUL; > + if (context) *context = (void *)(val & ~3); > + return STATUS_SUCCESS; > + } > + > + for (;;) > + { > + ULONG_PTR next, val = (ULONG_PTR)once->Ptr; > + > + switch (val & 3) > + { > + case 0: /* first time */ > + if (!interlocked_cmpxchg_ptr( &once->Ptr, > + (flags & RTL_RUN_ONCE_ASYNC) ? > (void *)3 : (void *)1, 0 )) > + return STATUS_PENDING; > + break; > + > + case 1: /* in progress, wait */ > + if (flags & RTL_RUN_ONCE_ASYNC) return > STATUS_INVALID_PARAMETER; > + next = val & ~3; > + if (interlocked_cmpxchg_ptr( &once->Ptr, (void > *)((ULONG_PTR)&next | 1), > + (void *)val ) == (void *)val) > + NtWaitForKeyedEvent( keyed_event, &next, FALSE, NULL ); > + break; > + > + case 2: /* done */ > + if (context) *context = (void *)(val & ~3); > + return STATUS_SUCCESS; > + > + case 3: /* in progress, async */ > + if (!(flags & RTL_RUN_ONCE_ASYNC)) return > STATUS_INVALID_PARAMETER; > + return STATUS_PENDING; > + } > + } > +} > + > +static DWORD WINAPI RtlpRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, > void *context ) > +{ > + if ((ULONG_PTR)context & 3) return STATUS_INVALID_PARAMETER; > + > + if (flags & RTL_RUN_ONCE_INIT_FAILED) > + { > + if (context) return STATUS_INVALID_PARAMETER; > + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; > + } > + else context = (void *)((ULONG_PTR)context | 2); > + > + for (;;) > + { > + ULONG_PTR val = (ULONG_PTR)once->Ptr; > + > + switch (val & 3) > + { > + case 1: /* in progress */ > + if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val > ) != (void *)val) break; > + val &= ~3; > + while (val) > + { > + ULONG_PTR next = *(ULONG_PTR *)val; > + NtReleaseKeyedEvent( keyed_event, (void *)val, FALSE, > NULL ); > + val = next; > + } > + return STATUS_SUCCESS; > + > + case 3: /* in progress, async */ > + if (!(flags & RTL_RUN_ONCE_ASYNC)) return > STATUS_INVALID_PARAMETER; > + if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val > ) != (void *)val) break; > + return STATUS_SUCCESS; > + > + default: > + return STATUS_UNSUCCESSFUL; > + } > + } > +} > + > +static DWORD WINAPI RtlpRunOnceExecuteOnce( RTL_RUN_ONCE *once, > PRTL_RUN_ONCE_INIT_FN func, > + void *param, void **context ) > +{ > + DWORD ret = RtlRunOnceBeginInitialize( once, 0, context ); > + > + if (ret != STATUS_PENDING) return ret; > + > + if (!func( once, param, context )) > + { > + RtlpRunOnceComplete( once, RTL_RUN_ONCE_INIT_FAILED, NULL ); > + return STATUS_UNSUCCESSFUL; > + } > + > + return RtlpRunOnceComplete( once, 0, context ? *context : NULL ); > +} > + > +/* Taken from Wine kernel32/sync.c */ > + > +/* > + * @implemented > + */ > +BOOL NTAPI InitOnceExecuteOnce( INIT_ONCE *once, PINIT_ONCE_FN func, void > *param, void **context ) > +{ > + return !RtlpRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, > param, context ); > +} > > Propchange: trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c > > ------------------------------------------------------------------------------ > svn:eol-style = native > > Modified: trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/k… > > ============================================================================== > --- trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec > [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec > [iso-8859-1] Sat Feb 28 15:46:43 2015 > @@ -1,2 +1,3 @@ > > @ stdcall -ret64 GetTickCount64() > +@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) > > >

10 years, 1 month

3
3
0 0

New Patchbot

by Colin Finck

Hi all, Based on Hermès' suggestion, I've transformed our Debug-Buildbot "Trunk_x86_GCCLin Debug" into a Patchbot. That means, it will continue to build each SVN revision as usual, but you can also force a build and enter a patch ID. Your build will then be patched accordingly. After building and testing, you will have: * The patched regtest ISO at http://iso.reactos.org/regtestcd/ * A test result in Testman with source "Patched Trunk_x86_GCCLin (KVM)" These changes will be applied to the other Buildslaves too once our servers are all back up. Cheers, Colin

10 years, 1 month

3
2
0 0

Re: [ros-dev] [ros-diffs] [gadamopoulos] 66457: [USER32] - button.c: Use NtUserAlterWindowStyle where wine uses WIN_SetStyle (usage and parameters were confirmed with windbg) [NTUSER] - Implement NtUserAlterWindowStyle. Fix...

by Timo Kreuzer

Why don't we use a macro or wrapper function, unstead of hacking shared code everywhere? Am 25.02.2015 um 21:02 schrieb gadamopoulos(a)svn.reactos.org: > Author: gadamopoulos > Date: Wed Feb 25 20:02:10 2015 > New Revision: 66457 > > URL: http://svn.reactos.org/svn/reactos?rev=66457&view=rev > Log: > [USER32] > - button.c: Use NtUserAlterWindowStyle where wine uses WIN_SetStyle (usage and parameters were confirmed with windbg) > > [NTUSER] > - Implement NtUserAlterWindowStyle. > > Fixes remaining failures in user32:msg_controls test. > > Modified: > trunk/reactos/win32ss/user/ntuser/ntstubs.c > trunk/reactos/win32ss/user/ntuser/window.c > trunk/reactos/win32ss/user/user32/controls/button.c > > Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… > ============================================================================== > --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) > +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Wed Feb 25 20:02:10 2015 > @@ -1157,19 +1157,6 @@ > return 0; > } > > -/* > - * @unimplemented > - */ > -DWORD APIENTRY > -NtUserAlterWindowStyle(DWORD Unknown0, > - DWORD Unknown1, > - DWORD Unknown2) > -{ > - STUB > - > - return(0); > -} > - > BOOL APIENTRY NtUserAddClipboardFormatListener( > HWND hwnd > ) > > Modified: trunk/reactos/win32ss/user/ntuser/window.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… > ============================================================================== > --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) > +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Wed Feb 25 20:02:10 2015 > @@ -3537,8 +3537,8 @@ > return FALSE; > } > > -LONG FASTCALL > -co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) > +static LONG > +co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlter) > { > PWND Window, Parent; > PWINSTATION_OBJECT WindowStation; > @@ -3597,6 +3597,7 @@ > Style.styleNew &= ~WS_EX_WINDOWEDGE; > > Window->ExStyle = (DWORD)Style.styleNew; > + > co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_EXSTYLE, (LPARAM) &Style); > break; > > @@ -3604,7 +3605,9 @@ > OldValue = (LONG) Window->style; > Style.styleOld = OldValue; > Style.styleNew = NewValue; > - co_IntSendMessage(hWnd, WM_STYLECHANGING, GWL_STYLE, (LPARAM) &Style); > + > + if (!bAlter) > + co_IntSendMessage(hWnd, WM_STYLECHANGING, GWL_STYLE, (LPARAM) &Style); > > /* WS_CLIPSIBLINGS can't be reset on top-level windows */ > if (Window->spwndParent == UserGetDesktopWindow()) Style.styleNew |= WS_CLIPSIBLINGS; > @@ -3621,7 +3624,9 @@ > DceResetActiveDCEs( Window ); > } > Window->style = (DWORD)Style.styleNew; > - co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_STYLE, (LPARAM) &Style); > + > + if (!bAlter) > + co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_STYLE, (LPARAM) &Style); > break; > > case GWL_WNDPROC: > @@ -3672,6 +3677,13 @@ > return( OldValue); > } > > + > +LONG FASTCALL > +co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) > +{ > + return co_IntSetWindowLong(hWnd, Index, NewValue, Ansi, FALSE); > +} > + > /* > * NtUserSetWindowLong > * > @@ -3686,24 +3698,45 @@ > LONG APIENTRY > NtUserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) > { > - DECLARE_RETURN(LONG); > - > - TRACE("Enter NtUserSetWindowLong\n"); > + LONG ret; > + > UserEnterExclusive(); > > if (hWnd == IntGetDesktopWindow()) > { > EngSetLastError(STATUS_ACCESS_DENIED); > - RETURN( 0); > - } > - > - RETURN( co_UserSetWindowLong(hWnd, Index, NewValue, Ansi)); > - > -CLEANUP: > - TRACE("Leave NtUserSetWindowLong, ret=%i\n",_ret_); > + UserLeave(); > + return 0; > + } > + > + ret = co_IntSetWindowLong(hWnd, Index, NewValue, Ansi, FALSE); > + > UserLeave(); > - END_CLEANUP; > -} > + > + return ret; > +} > + > +DWORD APIENTRY > +NtUserAlterWindowStyle(HWND hWnd, DWORD Index, LONG NewValue) > +{ > + LONG ret; > + > + UserEnterExclusive(); > + > + if (hWnd == IntGetDesktopWindow()) > + { > + EngSetLastError(STATUS_ACCESS_DENIED); > + UserLeave(); > + return 0; > + } > + > + ret = co_IntSetWindowLong(hWnd, Index, NewValue, FALSE, TRUE); > + > + UserLeave(); > + > + return ret; > +} > + > > /* > * NtUserSetWindowWord > > Modified: trunk/reactos/win32ss/user/user32/controls/button.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… > ============================================================================== > --- trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] (original) > +++ trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] Wed Feb 25 20:02:10 2015 > @@ -298,11 +298,10 @@ > /* XP turns a BS_USERBUTTON into BS_PUSHBUTTON */ > if (btn_type == BS_USERBUTTON ) > { > + style = (style & ~BS_TYPEMASK) | BS_PUSHBUTTON; > #ifdef __REACTOS__ > - style = (style & ~BS_TYPEMASK) | BS_PUSHBUTTON; > - SetWindowLongPtrW( hWnd, GWL_STYLE, style ); > + NtUserAlterWindowStyle(hWnd, GWL_STYLE, style ); > #else > - style = (style & ~BS_TYPEMASK) | BS_PUSHBUTTON; > WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); > #endif > } > @@ -508,8 +507,11 @@ > if ((wParam & BS_TYPEMASK) >= MAX_BTN_TYPE) break; > btn_type = wParam & BS_TYPEMASK; > style = (style & ~BS_TYPEMASK) | btn_type; > - SetWindowLongPtrW( hWnd, GWL_STYLE, style ); > - //WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); > +#ifdef __REACTOS__ > + NtUserAlterWindowStyle(hWnd, GWL_STYLE, style ); > +#else > + WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); > +#endif > > /* Only redraw if lParam flag is set.*/ > if (lParam) > @@ -565,7 +567,7 @@ > #ifdef __REACTOS__ > if (wParam) style |= WS_TABSTOP; > else style &= ~WS_TABSTOP; > - SetWindowLongPtrW( hWnd, GWL_STYLE, style ); > + NtUserAlterWindowStyle(hWnd, GWL_STYLE, style ); > #else > if (wParam) WIN_SetStyle( hWnd, WS_TABSTOP, 0 ); > else WIN_SetStyle( hWnd, 0, WS_TABSTOP ); > > >

10 years, 1 month

1
0
0 0

Status Meeting (February 2015)

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place 26th of February, 19:00 UTC. IRC service will only be started shortly before the meeting. Your participation passwords and server address will be emailed to you shortly before the meeting starts, and they are going to be different once again as they are not stored in any database. Hopefully it's not much of inconvenience. If someone still is not getting passwords sent before a meeting - please email Pierre before the meeting started to get one. Please send agenda proposals to me before the meeting, so that we can start with a proposed agenda. And join Mumble! :-) Regards, Aleksey Bragin

10 years, 1 month

4
8
0 0

VirtualBox Testslave

by Colin Finck

Hi all, As tests have shown that VirtualBox doesn't work properly inside an already virtualized environment, ReactOS Deutschland e.V. has just ordered a tiny Intel NUC that will serve as a VirtualBox Testslave. We plan to set it up right next to our Buildslaves, so that every ISO could possibly be regression-tested under VirtualBox. As a start, we plan to test the builds of the new MSVC Builder. The machine is powerful enough though to eventually test multiple ISOs simultaneously. I don't know about the current state of sysreg2 regarding VirtualBox support. To let this all happen as soon as possible, please ensure sysreg2 can fully handle VirtualBox once I set up the machine. Cheers, Colin

10 years, 1 month

2
2
0 0

Re: [ros-dev] [ros-diffs] [jimtabor] 66464: [User32_WINETEST] - Move test_SetFocus first as it is done originally. Refer to read past wine CVS logs for the reason.

by Thomas Faber

I don't care about the reason. Tests that fail on Windows are broken, period. In this order the tests fail on Windows. On 2015-02-26 09:38, jimtabor(a)svn.reactos.org wrote: > Author: jimtabor > Date: Thu Feb 26 08:38:00 2015 > New Revision: 66464 > > URL: http://svn.reactos.org/svn/reactos?rev=66464&view=rev > Log: > [User32_WINETEST] > - Move test_SetFocus first as it is done originally. Refer to read past wine CVS logs for the reason. > > Modified: > trunk/rostests/winetests/user32/msg.c > > Modified: trunk/rostests/winetests/user32/msg.c > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… > ============================================================================== > --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) > +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Thu Feb 26 08:38:00 2015 > @@ -14717,8 +14717,8 @@ > START_TEST(msg_focus) > { > init_tests(); > + test_SetFocus(); > test_SetActiveWindow(); > - test_SetFocus(); > > /* HACK: For some reason test_SetForegroundWindow fails on Windows unless > * we do this */

10 years, 1 month

2
2
0 0

[ros-diffs] [gadamopoulos] 66454: [USER32_WINETEST] and [ros-diffs] [gadamopoulos] 66457: [USER32] - button.c: Use NtUserAlterWindowStyle

by James Tabor

Hi! The message testing, LOL just made more work for Amine... Okay AlterWindowStyle, could it be better to place it in WIN_SetStyle as a wrapper, maybe? WIN_SetStyle is just glue code for ReactOS. James

10 years, 1 month

2
1
0 0

[ros-diffs] [tkreuzer] 66444: [USER32_APITEST] Add some test for GetDCEx that highlight the ridiculous implementation of owned and class DCs.

by James Tabor

Author: tkreuzer Date: Tue Feb 24 23:15:08 2015 New Revision: 66444 [USER32_APITEST] Add some test for GetDCEx that highlight the ridiculous implementation of owned and class DCs. Hello All! What is ridiculous is the attitude of our smart A__ developers! James

10 years, 1 month

2
3
0 0

win32k C++ suggestion

by Timo Kreuzer

Hi I'd like to propose introducing C++ to win32k. Don't worry, this is not a suggestion to rewrite everything from scratch in C++, but to gradually introduce C++. The reason is not "That's what Windows does", but the fact that especially GDI would heavily benefit in terms of code simplicity, clarily and quality from using C++. A lot of the interfaces are already in a C++ object style way, but still code can bypass interfaces and directly modify structure members, even if it is not supposed to be done that way. Unless there are strong objections, I'd post a design / style / roadmap suggestion soon. If people feel strongly about it, we can defer this to after a 0.4.0 release. Regards, Timo

10 years, 2 months

4
3
0 0

Re: [ros-dev] [ros-diffs] [jgardou] 66334: [NTOSKRNL/MM] - MiIsEntireRangeCommitted: Ensure the PTE we are checking is really faulted in. - Prefer MiPteToPde and MiPdeToPte (which should really be called MiFirstPteInPde) in...

by Alex Ionescu

it might fix an assert but the patch is incorrect. will this also take 6 months to revert? Best regards, Alex Ionescu On Tue, Feb 17, 2015 at 6:19 AM, <jgardou(a)svn.reactos.org> wrote: > Author: jgardou > Date: Tue Feb 17 14:19:05 2015 > New Revision: 66334 > > URL: http://svn.reactos.org/svn/reactos?rev=66334&view=rev > Log: > [NTOSKRNL/MM] > - MiIsEntireRangeCommitted: Ensure the PTE we are checking is really > faulted in. > - Prefer MiPteToPde and MiPdeToPte (which should really be called > MiFirstPteInPde) instead of MiAddressToPte and MiPteToAddress > Fixes weird failed ASSERT in page fault handler when using DPH. > > Modified: > trunk/reactos/ntoskrnl/mm/ARM3/virtual.c > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… > > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Feb 17 > 14:19:05 2015 > @@ -1994,14 +1994,13 @@ > if (OnBoundary) > { > /* Is this PDE demand zero? */ > - PointerPde = MiAddressToPte(PointerPte); > + PointerPde = MiPteToPde(PointerPte); > if (PointerPde->u.Long != 0) > { > /* It isn't -- is it valid? */ > if (PointerPde->u.Hard.Valid == 0) > { > /* Nope, fault it in */ > - PointerPte = MiPteToAddress(PointerPde); > MiMakeSystemAddressValid(PointerPte, Process); > } > } > @@ -2009,13 +2008,13 @@ > { > /* The PTE was already valid, so move to the next one */ > PointerPde++; > - PointerPte = MiPteToAddress(PointerPde); > + PointerPte = MiPdeToPte(PointerPde); > > /* Is the entire VAD committed? If not, fail */ > if (!Vad->u.VadFlags.MemCommit) return FALSE; > > - /* Everything is committed so far past the range, return > true */ > - if (PointerPte > LastPte) return TRUE; > + /* New loop iteration with our new, on-boundary PTE. */ > + continue; > } > } > > > >

10 years, 2 months

4
4
0 0

Re: [ros-dev] [ros-diffs] [tfaber] 66365: [KERNEL32] - Make BaseSetLastNTError return the converted Win32 error code. This will determine the upper 24 bits of EAX in functions that return BOOLEAN FALSE right after calling B...

by Timo Kreuzer

For me this looks like a hack. It might "do what Windows does", but the result is more based on luck / random compiler behaviour rather than deterministic behavior. We should think about returning a full ULONG in all functions that rely on this (like Wow64EnableWow64FsRedirection), containing the correct value, rather than relying on random stuff. Am 20.02.2015 um 08:03 schrieb tfaber(a)svn.reactos.org: > Author: tfaber > Date: Fri Feb 20 07:03:00 2015 > New Revision: 66365 > > URL: http://svn.reactos.org/svn/reactos?rev=66365&view=rev > Log: > [KERNEL32] > - Make BaseSetLastNTError return the converted Win32 error code. This will determine the upper 24 bits of EAX in functions that return BOOLEAN FALSE right after calling BaseSetLastNTError, e.g. Wow64EnableWow64FsRedirection. Fixes installers using WiX Toolset (e.g. VS2012 redist) on MSVC builds. > See http://wixtoolset.org/issues/4681/ for the WiX bug that causes this. > CORE-8010 > > Modified: > trunk/reactos/dll/win32/kernel32/client/except.c > trunk/reactos/dll/win32/kernel32/include/kernel32.h > > Modified: trunk/reactos/dll/win32/kernel32/client/except.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Fri Feb 20 07:03:00 2015 > @@ -682,12 +682,16 @@ > /* > * @implemented > */ > -VOID > +DWORD > WINAPI > BaseSetLastNTError(IN NTSTATUS Status) > { > + DWORD dwErrCode; > + > /* Convert from NT to Win32, then set */ > - SetLastError(RtlNtStatusToDosError(Status)); > + dwErrCode = RtlNtStatusToDosError(Status); > + SetLastError(dwErrCode); > + return dwErrCode; > } > > /* > > Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Fri Feb 20 07:03:00 2015 > @@ -353,7 +353,7 @@ > WINAPI > InitCommandLines(VOID); > > -VOID > +DWORD > WINAPI > BaseSetLastNTError(IN NTSTATUS Status); > > > >

10 years, 2 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [gadamopoulos] 66383: [SHELL32] - Implement progress dialogs for SHFileOperation - Patch by Hwu Davies CORE-4476

by Pierre Schweitzer

In such situations, please update all the langages files and not only English. This makes work easier for translators to track changes. On 21/02/2015 13:52, gadamopoulos(a)svn.reactos.org wrote: > Author: gadamopoulos > Date: Sat Feb 21 12:52:58 2015 > New Revision: 66383 > > URL: http://svn.reactos.org/svn/reactos?rev=66383&view=rev > Log: > [SHELL32] > - Implement progress dialogs for SHFileOperation > - Patch by Hwu Davies > CORE-4476 > > Modified: > trunk/reactos/dll/win32/shell32/lang/en-US.rc > > Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… > ============================================================================== > --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sat Feb 21 12:52:58 2015 > @@ -693,6 +693,13 @@ > IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" > IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" > > + IDS_FILEOOP_COPYING "Copying" > + IDS_FILEOOP_MOVING "Moving" > + IDS_FILEOOP_DELETING "Deleting" > + IDS_FILEOOP_FROM_TO "From %1 to %2" > + IDS_FILEOOP_FROM "From %1" > + IDS_FILEOOP_PREFLIGHT "Preflight" > + > /* message box strings */ > IDS_RESTART_TITLE "Restart" > IDS_RESTART_PROMPT "Do you want to restart the system?" > -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

10 years, 2 months

1
0
0 0

Where is the Patchbot??

by Hermès BÉLUSCA - MAÏTO

Hi guys ! Where is the Patchbot?? Dont you think its still needed? Thanks, Hermès.

10 years, 2 months

4
4
0 0

Re: [ros-dev] [jira] (ROSTESTS-153) gdi32_winetest:bitmap test_mono_bitmap skipped because it takes too long and spams the debug log with too many failures

by Thomas Faber

On 2015-02-16 10:27, zefklop (JIRA) wrote: > zefklop commented on ROSTESTS-153: > ---------------------------------- > > This and the advapi32:service disabled test call for (optional) per-test timeout parameter in rostests or testman.We can't afford skipping tests, that's an open door to all kind of regressions. I agree that skipping tests is a really bad idea. It should be used as a last resort only. And we need a proper process for it** -- I've been spending way too much time hunting down skipped tests recently, and way too many of them had their underlying bugs (and sometimes even Jira issue) fixed without re-enabling the test. However I don't see a practical way to implement your solution. For one, the timeout seems like it would have to cause a machine reboot, which significantly increases test time. I guess rosautotest could keep track of the time and kill the child process, but I don't know how reliable that would be. Secondly and more importantly, killing the test on timeout seems worse than skipping the offending part, because then any tests running _after_ the code causing the timeout would never be executed. That means instead of skipping a test that's known to be problematic, we skip completely unrelated and innocent tests. I'm not sure if there's a way to win this. Let me know if you have any ideas. As it stands I think skipping the offenders is an okay solution -- we just need to stay very aware of them and make sure to re-test more regularly than we do now. Thanks! -Thomas ** For the record, here's an example process that I try to keep to: - Create a ROSTESTS bug to indicate that a test was skipped - Link the ROSTESTS bug to ROSTESTS-125, the Skipped Tests Epic - Do not #if out the test, instead check for winetest_interactive, and skip the test only if it's not set - Make sure to call skip() with a message that references the ROSTESTS bug - Optionally create a CORE issue for the underlying problem if enough information is available; make sure it blocks the ROSTESTS issue - Do not under any circumstances close the ROSTESTS bug before the test code is actually restored and no longer skips the test in question This allows the issue to be actually found, by checking the Epic, or grepping for "ROSTESTS-" or "winetest_interactive". Skipped tests should be re-tested regularly, at the very least every time the test is Wine-synced. >> gdi32_winetest:bitmap test_mono_bitmap skipped because it takes too long and spams the debug log with too many failures >> ----------------------------------------------------------------------------------------------------------------------- >> >> Key: ROSTESTS-153 >> URL: https://jira.reactos.org/browse/ROSTESTS-153 >> Project: ReactOS Test Suite >> Issue Type: Bug >> Components: Wine Tests >> Reporter: Thomas Faber >> Assignee: Bug Zilla >> Labels: HACK >> >> If you close this task, that means the winetest_interactive check and skip() in test_mono_bitmap must be gone!

10 years, 2 months

2
2
0 0

Re: [ros-dev] [ros-diffs] [jgardou] 66342: [WIN32SS/NTGDI] - Reject bits data early in SetBitmapBits when it's clear that they can't fit in the destination bitmap. Fixes ugly Office 2007 rulers showing garbage.

by Timo Kreuzer

Is this a bug in Office 2007 or are we doing something wrong here? Am 17.02.2015 um 21:41 schrieb jgardou(a)svn.reactos.org: > Author: jgardou > Date: Tue Feb 17 20:41:51 2015 > New Revision: 66342 > > URL: http://svn.reactos.org/svn/reactos?rev=66342&view=rev > Log: > [WIN32SS/NTGDI] > - Reject bits data early in SetBitmapBits when it's clear that they can't fit in the destination bitmap. > Fixes ugly Office 2007 rulers showing garbage. > > Modified: > trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c > > Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… > ============================================================================== > --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) > +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Tue Feb 17 20:41:51 2015 > @@ -11,7 +11,8 @@ > #define NDEBUG > #include <debug.h> > > -void > +static > +int > NTAPI > UnsafeSetBitmapBits( > PSURFACE psurf, > @@ -32,6 +33,9 @@ > lDeltaDst = psurf->SurfObj.lDelta; > lDeltaSrc = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel); > > + if (cjBits && (cjBits < (lDeltaSrc * nHeight))) > + return 0; > + > while (nHeight--) > { > /* Copy one line */ > @@ -40,6 +44,7 @@ > pjDst += lDeltaDst; > } > > + return 1; > } > > HBITMAP > @@ -538,9 +543,8 @@ > > _SEH2_TRY > { > - ProbeForRead(pUnsafeBits, Bytes, 1); > - UnsafeSetBitmapBits(psurf, Bytes, pUnsafeBits); > - ret = 1; > + ProbeForRead(pUnsafeBits, Bytes, sizeof(WORD)); > + ret = UnsafeSetBitmapBits(psurf, Bytes, pUnsafeBits); > } > _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) > { > > >

10 years, 2 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [jgardou] 66323: [KERNEL32] Revert r64525 - Always allocate a guard page at the bottom of the stack.

by Alex Ionescu

Finally... Best regards, Alex Ionescu On Mon, Feb 16, 2015 at 1:12 PM, <jgardou(a)svn.reactos.org> wrote: > Author: jgardou > Date: Mon Feb 16 21:12:51 2015 > New Revision: 66323 > > URL: http://svn.reactos.org/svn/reactos?rev=66323&view=rev > Log: > [KERNEL32] > Revert r64525 - Always allocate a guard page at the bottom of the stack. > > Modified: > trunk/reactos/dll/win32/kernel32/client/utils.c > > Modified: trunk/reactos/dll/win32/kernel32/client/utils.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… > > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] > (original) > +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Mon > Feb 16 21:12:51 2015 > @@ -358,6 +358,7 @@ > NTSTATUS Status; > PIMAGE_NT_HEADERS Headers; > ULONG_PTR Stack; > + BOOLEAN UseGuard; > ULONG PageSize, Dummy, AllocationGranularity; > SIZE_T StackReserveHeader, StackCommitHeader, GuardPageSize, > GuaranteedStackCommit; > DPRINT("BaseCreateStack (hProcess: %p, Max: %lx, Current: %lx)\n", > @@ -425,6 +426,18 @@ > /* Update the Stack Position */ > Stack += StackReserve - StackCommit; > > + /* Check if we will need a guard page */ > + if (StackReserve > StackCommit) > + { > + Stack -= PageSize; > + StackCommit += PageSize; > + UseGuard = TRUE; > + } > + else > + { > + UseGuard = FALSE; > + } > + > /* Allocate memory for the stack */ > Status = NtAllocateVirtualMemory(hProcess, > (PVOID*)&Stack, > @@ -444,21 +457,25 @@ > InitialTeb->StackLimit = (PVOID)Stack; > > /* Create a guard page */ > - GuardPageSize = PageSize; > - Status = NtProtectVirtualMemory(hProcess, > - (PVOID*)&Stack, > - &GuardPageSize, > - PAGE_GUARD | PAGE_READWRITE, > - &Dummy); > - if (!NT_SUCCESS(Status)) > - { > - DPRINT1("Failure to set guard page\n"); > - return Status; > - } > - > - /* Update the Stack Limit keeping in mind the Guard Page */ > - InitialTeb->StackLimit = (PVOID)((ULONG_PTR)InitialTeb->StackLimit + > - GuardPageSize); > + if (UseGuard) > + { > + /* Set the guard page */ > + GuardPageSize = PAGE_SIZE; > + Status = NtProtectVirtualMemory(hProcess, > + (PVOID*)&Stack, > + &GuardPageSize, > + PAGE_GUARD | PAGE_READWRITE, > + &Dummy); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("Failure to set guard page\n"); > + return Status; > + } > + > + /* Update the Stack Limit keeping in mind the Guard Page */ > + InitialTeb->StackLimit = > (PVOID)((ULONG_PTR)InitialTeb->StackLimit + > + GuardPageSize); > + } > > /* We are done! */ > return STATUS_SUCCESS; > > >

10 years, 2 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [jimtabor] 66244: [NtUser] - Use a real timer for caret. This should cleanup message testing from those random system timer messages. See CORE-7447.

by Hermès BÉLUSCA - MAÏTO

Hi James! It would be nice if you could also do some cleanup in that caret code, because it seems (starting r66244): - there is somewhat duplicated caret painting in win32k and in user32, - the caret is sometimes drawn one or two pixels too high. And of course, everything should be done windows-compatible (not wine-compatible)!! Cheers, Hermès. ------------------------------------------ Author: jimtabor Date: Fri Feb 13 13:39:57 2015 New Revision: 66244 URL: http://svn.reactos.org/svn/reactos?rev=66244&view=rev Log: [NtUser] - Use a real timer for caret. This should cleanup message testing from those random system timer messages. See CORE-7447. Modified: trunk/reactos/win32ss/user/ntuser/caret.c Modified: trunk/reactos/win32ss/user/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/caret.c ?rev=66244&r1=66243&r2=66244&view=diff ============================================================================ == --- trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] Fri Feb 13 13:39:57 2015 @@ -16,6 +16,111 @@ /* FUNCTIONS *****************************************************************/ +VOID FASTCALL +co_IntDrawCaret(PWND pWnd, PTHRDCARETINFO CaretInfo) +{

10 years, 2 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 66250: [CMAKE] Add support for "module groups". These are meta targets that automatically include all targets using set_module_type() that are included between start_module_group(name) a...

by Jerome Gardou

Hey Timo, nice stuff, but I think you committed a bit too fast ;-) See inline: Le 13/02/2015 21:19, tkreuzer(a)svn.reactos.org a écrit : > Author: tkreuzer > Date: Fri Feb 13 20:19:51 2015 > New Revision: 66250 > > URL: http://svn.reactos.org/svn/reactos?rev=66250&view=rev > Log: > [CMAKE] > Add support for "module groups". These are meta targets that automatically include all targets using set_module_type() that are included between start_module_group(name) and end_module_group(). > > Modified: > trunk/reactos/cmake/CMakeMacros.cmake > > Modified: trunk/reactos/cmake/CMakeMacros.cmake > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… > ============================================================================== > --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) > +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Fri Feb 13 20:19:51 2015 > @@ -550,9 +550,14 @@ > message(STATUS "set_module_type : unparsed arguments ${__module_UNPARSED_ARGUMENTS}, module : ${MODULE}") > endif() > > + # Add the module to the module group list, if it is defined > + if(DEFINED CURRENT_MODULE_GROUP) > + set_property(GLOBAL APPEND PROPERTY ${CURRENT_MODULE_GROUP}_MODULE_LIST "${MODULE}") > + endif() > + > # Set subsystem. Also take this as an occasion > # to error out if someone gave a non existing type > - if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) > + if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) > OR (${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll)) > set(__subsystem native) > elseif(${TYPE} STREQUAL win32cui) > @@ -662,6 +667,21 @@ > > # do compiler specific stuff > set_module_type_toolchain(${MODULE} ${TYPE}) > +endfunction() > + > +function(start_module_group __name) > + if(DEFINED CURRENT_MODULE_GROUP) > + message(FATAL_ERROR "CURRENT_MODULE_GROUP is already set ('${CURRENT_MODULE_GROUP}')") > + endif() > + set(CURRENT_MODULE_GROUP rostests PARENT_SCOPE) > +endfunction() > + should be set(CURRENT_MODULE_GROUP ${__name} PARENT_SCOPE) > +function(end_module_group) > + get_property(__modulelist GLOBAL PROPERTY ${CURRENT_MODULE_GROUP}_MODULE_LIST) > + add_custom_target(${CURRENT_MODULE_GROUP}) > + foreach(__module ${__modulelist}) > + add_dependencies(${CURRENT_MODULE_GROUP} ${__module}) > + endforeach() > endfunction() You should unset CURRENT_MODULE_GROUP somewhere aroud here. > > function(preprocess_file __in __out) > >

10 years, 2 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 66240: [WINLOGON] - Implement KillComProcesses that just kills with force and without any notification back to winlogon, any remaining app that is still alive even if we asked before to ...

by Thomas Faber

On 2015-02-13 00:35, hbelusca(a)svn.reactos.org wrote: > + if (LSData->Session->UserToken != NULL && > + !ImpersonateLoggedOnUser(LSData->Session->UserToken)) > + { > + ERR("ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); > + return 0; > + } > + > + /* Attempt to kill remaining processes. No notifications needed. */ > + if (!ExitWindowsEx(EWX_CALLER_WINLOGON | EWX_NONOTIFY | EWX_FORCE | EWX_LOGOFF, 0)) > + { > + ERR("Unable to kill COM apps, error %lu\n", GetLastError()); > + RevertToSelf(); > + return 0; > + } > + > + if (LSData->Session->UserToken) > + RevertToSelf(); Sounds like the RevertToSelf() call in the error case should not be unconditional.

10 years, 2 months

2
1
0 0

Aleksey Bragin specially for Hacker Public Radio at FOSDEM2015

by Alexander Rechitskiy

10 years, 2 months

1
0
0 0

Can't access SVN via git-svn

by Timo Kreuzer

Hi, I tried to do an SVN DCommit (git-svn) using TGIT. It used to work flawlessly. I didn't change anything in my checkout, but suddenly it doesn't work anymore and I get an error: ERROR from SVN: Authorization failed: Cannot negotiate authentication mechanism I'd appeceate if someone could fix that. Otherwise ... you'll not get the nice fixes I have in my repo. I'm not going to move them over to SVN! Thanks, Timo

10 years, 2 months

2
1
0 0

The Mumble Server is live!

by Colin Finck

Hi all, The long-announced Mumble Server is finally live! I've put up all instructions on our Wiki: https://reactos.org/wiki/Mumble I've resembled the structure of our IRC channels, meaning there is a general "ReactOS" channel open for everybody and a channel "ReactOS-Dev" for authenticated users only. There will also be international channels for easier discussions in your native language. On top of this, everybody can create temporary channels for short discussions. You login with your ReactOS Development Account (aka SVN account) to become authenticated. If you don't have such an account, choose an arbitrary username and join the open channels. I'm also looking for ReactOS members willing to serve as Mumble administrators. Just like on IRC, this gives you additional rights, like creating permanent channels or kicking and banning people. As this also allows you to modify permissions, I don't like to give this status to every authenticated user. So far, only Pierre and me are administrators on Mumble. Volunteers are welcome! I think it makes no sense to set up even more rules right now before people have checked it out, so let's all give it a try and see how we can work with it. In a next step, we could announce it on the website and even use Mumble for the monthly meetings. Cheers, Colin

10 years, 2 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 66192: [WINLOGON][WIN32K] Move the shutdown privilege check from winlogon to win32k (function "UserInitiateShutdown") as it should be done. [WIN32K] - Introduce the pair of UserInitiateS...

by Thomas Faber

On 2015-02-07 16:26, hbelusca(a)svn.reactos.org wrote: > @@ -792,24 +791,54 @@ > case UserThreadInitiateShutdown: > { > ERR("Shutdown initiated\n"); > - STUB; > - Status = STATUS_NOT_IMPLEMENTED; > + > + if (ThreadInformationLength != sizeof(ULONG)) > + { > + Status = STATUS_INFO_LENGTH_MISMATCH; > + break; > + } > + > + Status = UserInitiateShutdown(Thread, (PULONG)ThreadInformation); > break; > } This looks like contrary to the other cases, ThreadInformation is neither probed, nor accessed inside SEH here?

10 years, 2 months

4
4
0 0

Google Summer of Code 2015

by Alexander Rechitskiy

10 years, 2 months

1
0
0 0

The ReactOS Project at FOSDEM 2015

by Colin Finck

Hi all, FOSDEM 2015 has ended some days ago. After five years of absence, the ReactOS Project was finally represented with a stand again, maintained by Aleksey Bragin, Giannis Adamopoulos, Pierre Schweitzer and me. Turns out that FOSDEM has significantly grown over the recent years, so our experiences really deserve a report - and should motivate others to join us next time! :) Our stand was born around 11 o'clock on Saturday when I arrived at the AW building. After walking several rounds in the building and neither finding known people nor a free table, it turned out that the coreboot guys next to us had tried to expand their presence a bit ;) Reclaiming our booth was a matter of a few words though, and soon we had a sweet spot in the building with enough space for the upcoming crowd. With Aleksey arriving shortly after that, along with several flags and pins, our empire was finally alive and marked! Giannis and Pierre arrived in the course of the day, right in time for the afternoon rush hour with lots of people interested in ReactOS. Our four person booth staff was really overwhelmed in these times. But let's see, maybe we even got new developers through this :) Our stock of 100 ReactOS demonstration CDs prepared by Hermès Bélusca-Maito and me already ran out during the first day. Given our experiences at other exhibitions and the general phase-out of CDs these days, this came totally unexpected. But it wouldn't be the ReactOS Project if we had no solution to the problem. On the same Saturday evening, Pierre and me went out on a little adventure into downtown Brussels in the hope of finding open stores that sell all we needed: Blank CDs, labels and paper sleeves. And we were successful! Returning with another 100 CDs, all disc drives of our laptops were working that evening and the full other day, busy with burning new ReactOS CDs. FOSDEM staff was kind enough to offer one of their printers for getting the additional labels done. And our booth on Sunday had partly turned into a CD manufacturing plant. With the consequence of people sometimes grabbing the CD labels and trying to read them before being presented with our real flyers :) At the end of the conference, around 170 ReactOS CDs were in the wild. Definitely much more than what we expected! Of course, the culinary supply also didn't come too short in the capital of Belgium. On Saturday evening, we met up with our friend Nuno Brito, who had already reserved a nice restaurant for us. Obviously, he had learned from last year! I well remember the evening, when five hungry geeks walked for half an hour through the city, trying to beat the unsolvable problem of finding the best restaurant for all of us. I've put up some of Aleksey's and my photos here: https://www.flickr.com/photos/colinfinck/sets/72157650656130121/ Maybe more to come in the next few days! I hope you're now all eager to join us next time to this wonderful event! Cheers, Colin P.S.: Feel free to use this for a news article about FOSDEM on our website

10 years, 2 months

5
4
0 0

Re: [ros-dev] [ros-diffs] [jgardou] 66161: [NTDLL] - use the edx register to store the function pointer to the syscall trampoline. This is how google Chrome checks if an exported function is a system call or not. See https:...

by Alex Ionescu

Wow, it almost sounds like... we have to copy the exact same assembly code from Microsoft... instead of being "more efficient" or "doing it our way" because "there's no point in copying such minute details". It..almost sounds like... something some developer was saying for almost a decade now? No, I must be imagining things... Best regards, Alex Ionescu On Wed, Feb 4, 2015 at 8:58 AM, <jgardou(a)svn.reactos.org> wrote: > Author: jgardou > Date: Wed Feb 4 16:58:41 2015 > New Revision: 66161 > > URL: http://svn.reactos.org/svn/reactos?rev=66161&view=rev > Log: > [NTDLL] > - use the edx register to store the function pointer to the syscall > trampoline. > This is how google Chrome checks if an exported function is a system call > or not. > See > https://chromium.googlesource.com/chromium/src.git/+/master/sandbox/win/src… > and https://bugs.winehq.org/show_bug.cgi?id=21232 for details > > Modified: > trunk/reactos/include/asm/syscalls.inc > > Modified: trunk/reactos/include/asm/syscalls.inc > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/syscalls.inc?r… > > ============================================================================== > --- trunk/reactos/include/asm/syscalls.inc [iso-8859-1] (original) > +++ trunk/reactos/include/asm/syscalls.inc [iso-8859-1] Wed Feb 4 > 16:58:41 2015 > @@ -1,109 +1,109 @@ > - > -#ifdef _M_IX86 > -#define KUSER_SHARED_SYSCALL HEX(7ffe0300) > -#define KGDT_R0_CODE 8 > -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > - StackBytes = 4 * ArgCount > - FPO 0, 0, 0, 0, 0, FRAME_FPO > - mov eax, SyscallId > - mov ecx, KUSER_SHARED_SYSCALL > - call dword ptr [ecx] > - ret StackBytes > -ENDM > -MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > - StackBytes = 4 * &ArgCount > - FPO 0, 0, 0, 0, 0, FRAME_FPO > - mov eax, SyscallId > - lea edx, [esp + 4] > - pushfd > - push KGDT_R0_CODE > - call _KiSystemService > - ret StackBytes > -ENDM > -#elif defined(_M_AMD64) > -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > - .ENDPROLOG > - mov eax, SyscallId > - mov r10, rcx > - syscall > - ret > -ENDM > -MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > - .ENDPROLOG > - EXTERN Nt&Name:PROC > - lea rax, Nt&Name[rip] > - mov r10, ArgCount * 8 > - jmp KiZwSystemService > -ENDM > -#elif defined(_M_ARM) > -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > - swi #SyscallId > - bx lr > -ENDM > -MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > - mov ip, lr > - swi #SyscallId > - bx ip > -ENDM > -#elif defined(_M_PPC) > -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > - stwu 1,-16(1) > - mflr 0 > - stw 0,0(1) > - li 0, SyscallId > - sc > - lwz 0,0(1) > - mtlr 0 > - addi 1,1,16 > - blr > -ENDM > -#define STUBCODE_K STUBCODE_U > -#elif defined(_M_MIPS) > -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > - li $8, KUSER_SHARED_SYSCALL > - lw $8,0($8) > - j $8 > - nop > -ENDM > -MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > - j KiSystemService > - nop > -ENDM > -#else > -#error unsupported architecture > -#endif > - > -#ifdef _M_IX86 > -MACRO(MAKE_LABEL, Name, StackBytes) > - PUBLIC _&Name&@&StackBytes > - _&Name&@&StackBytes: > -ENDM > -MACRO(START_PROC, Name, StackBytes) > - PUBLIC _&Name&@&StackBytes > - .PROC _&Name&@&StackBytes > -ENDM > -#else > -MACRO(MAKE_LABEL, Name, StackBytes) > - PUBLIC &Name > - &Name: > -ENDM > -MACRO(START_PROC, Name, StackBytes) > - PUBLIC &Name > - .PROC &Name > -ENDM > -#endif > - > -MACRO(STUB_U, Name, ArgCount) > - MAKE_LABEL Zw&Name, %ArgCount * 4 > - START_PROC Nt&Name, %ArgCount * 4 > - STUBCODE_U Name, SyscallId, %ArgCount > - .ENDP > - SyscallId = SyscallId + 1 > -ENDM > - > -MACRO(STUB_K, Name, ArgCount) > - START_PROC Zw&Name, %ArgCount * 4 > - STUBCODE_K Name, SyscallId, %ArgCount > - .ENDP > - SyscallId = SyscallId + 1 > -ENDM > + > +#ifdef _M_IX86 > +#define KUSER_SHARED_SYSCALL HEX(7ffe0300) > +#define KGDT_R0_CODE 8 > +MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > + StackBytes = 4 * ArgCount > + FPO 0, 0, 0, 0, 0, FRAME_FPO > + mov eax, SyscallId > + mov edx, KUSER_SHARED_SYSCALL > + call dword ptr [edx] > + ret StackBytes > +ENDM > +MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > + StackBytes = 4 * &ArgCount > + FPO 0, 0, 0, 0, 0, FRAME_FPO > + mov eax, SyscallId > + lea edx, [esp + 4] > + pushfd > + push KGDT_R0_CODE > + call _KiSystemService > + ret StackBytes > +ENDM > +#elif defined(_M_AMD64) > +MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > + .ENDPROLOG > + mov eax, SyscallId > + mov r10, rcx > + syscall > + ret > +ENDM > +MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > + .ENDPROLOG > + EXTERN Nt&Name:PROC > + lea rax, Nt&Name[rip] > + mov r10, ArgCount * 8 > + jmp KiZwSystemService > +ENDM > +#elif defined(_M_ARM) > +MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > + swi #SyscallId > + bx lr > +ENDM > +MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > + mov ip, lr > + swi #SyscallId > + bx ip > +ENDM > +#elif defined(_M_PPC) > +MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > + stwu 1,-16(1) > + mflr 0 > + stw 0,0(1) > + li 0, SyscallId > + sc > + lwz 0,0(1) > + mtlr 0 > + addi 1,1,16 > + blr > +ENDM > +#define STUBCODE_K STUBCODE_U > +#elif defined(_M_MIPS) > +MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > + li $8, KUSER_SHARED_SYSCALL > + lw $8,0($8) > + j $8 > + nop > +ENDM > +MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > + j KiSystemService > + nop > +ENDM > +#else > +#error unsupported architecture > +#endif > + > +#ifdef _M_IX86 > +MACRO(MAKE_LABEL, Name, StackBytes) > + PUBLIC _&Name&@&StackBytes > + _&Name&@&StackBytes: > +ENDM > +MACRO(START_PROC, Name, StackBytes) > + PUBLIC _&Name&@&StackBytes > + .PROC _&Name&@&StackBytes > +ENDM > +#else > +MACRO(MAKE_LABEL, Name, StackBytes) > + PUBLIC &Name > + &Name: > +ENDM > +MACRO(START_PROC, Name, StackBytes) > + PUBLIC &Name > + .PROC &Name > +ENDM > +#endif > + > +MACRO(STUB_U, Name, ArgCount) > + MAKE_LABEL Zw&Name, %ArgCount * 4 > + START_PROC Nt&Name, %ArgCount * 4 > + STUBCODE_U Name, SyscallId, %ArgCount > + .ENDP > + SyscallId = SyscallId + 1 > +ENDM > + > +MACRO(STUB_K, Name, ArgCount) > + START_PROC Zw&Name, %ArgCount * 4 > + STUBCODE_K Name, SyscallId, %ArgCount > + .ENDP > + SyscallId = SyscallId + 1 > +ENDM > > >

10 years, 2 months

3
2
0 0

Re: [ros-dev] [ros-diffs] [jgardou] 66161: [NTDLL] - use the edx register to store the function pointer to the syscall trampoline. This is how google Chrome checks if an exported function is a system call or not. See https:...

by Jérôme Gardou

Uh, sorry for the horriblly long diff. I guess someone initially committed the file with CRLF file endings :-/ Le 04/02/2015 17:58, jgardou(a)svn.reactos.org a écrit : > Author: jgardou > Date: Wed Feb 4 16:58:41 2015 > New Revision: 66161 > > URL: http://svn.reactos.org/svn/reactos?rev=66161&view=rev > Log: > [NTDLL] > - use the edx register to store the function pointer to the syscall trampoline. > This is how google Chrome checks if an exported function is a system call or not. > See https://chromium.googlesource.com/chromium/src.git/+/master/sandbox/win/src… and https://bugs.winehq.org/show_bug.cgi?id=21232 for details > > Modified: > trunk/reactos/include/asm/syscalls.inc > > Modified: trunk/reactos/include/asm/syscalls.inc > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/syscalls.inc?r… > ============================================================================== > --- trunk/reactos/include/asm/syscalls.inc [iso-8859-1] (original) > +++ trunk/reactos/include/asm/syscalls.inc [iso-8859-1] Wed Feb 4 16:58:41 2015 > @@ -1,109 +1,109 @@ > - > -#ifdef _M_IX86 > -#define KUSER_SHARED_SYSCALL HEX(7ffe0300) > -#define KGDT_R0_CODE 8 > -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > - StackBytes = 4 * ArgCount > - FPO 0, 0, 0, 0, 0, FRAME_FPO > - mov eax, SyscallId > - mov ecx, KUSER_SHARED_SYSCALL > - call dword ptr [ecx] > - ret StackBytes > -ENDM > -MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > - StackBytes = 4 * &ArgCount > - FPO 0, 0, 0, 0, 0, FRAME_FPO > - mov eax, SyscallId > - lea edx, [esp + 4] > - pushfd > - push KGDT_R0_CODE > - call _KiSystemService > - ret StackBytes > -ENDM > -#elif defined(_M_AMD64) > -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > - .ENDPROLOG > - mov eax, SyscallId > - mov r10, rcx > - syscall > - ret > -ENDM > -MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > - .ENDPROLOG > - EXTERN Nt&Name:PROC > - lea rax, Nt&Name[rip] > - mov r10, ArgCount * 8 > - jmp KiZwSystemService > -ENDM > -#elif defined(_M_ARM) > -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > - swi #SyscallId > - bx lr > -ENDM > -MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > - mov ip, lr > - swi #SyscallId > - bx ip > -ENDM > -#elif defined(_M_PPC) > -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > - stwu 1,-16(1) > - mflr 0 > - stw 0,0(1) > - li 0, SyscallId > - sc > - lwz 0,0(1) > - mtlr 0 > - addi 1,1,16 > - blr > -ENDM > -#define STUBCODE_K STUBCODE_U > -#elif defined(_M_MIPS) > -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > - li $8, KUSER_SHARED_SYSCALL > - lw $8,0($8) > - j $8 > - nop > -ENDM > -MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > - j KiSystemService > - nop > -ENDM > -#else > -#error unsupported architecture > -#endif > - > -#ifdef _M_IX86 > -MACRO(MAKE_LABEL, Name, StackBytes) > - PUBLIC _&Name&@&StackBytes > - _&Name&@&StackBytes: > -ENDM > -MACRO(START_PROC, Name, StackBytes) > - PUBLIC _&Name&@&StackBytes > - .PROC _&Name&@&StackBytes > -ENDM > -#else > -MACRO(MAKE_LABEL, Name, StackBytes) > - PUBLIC &Name > - &Name: > -ENDM > -MACRO(START_PROC, Name, StackBytes) > - PUBLIC &Name > - .PROC &Name > -ENDM > -#endif > - > -MACRO(STUB_U, Name, ArgCount) > - MAKE_LABEL Zw&Name, %ArgCount * 4 > - START_PROC Nt&Name, %ArgCount * 4 > - STUBCODE_U Name, SyscallId, %ArgCount > - .ENDP > - SyscallId = SyscallId + 1 > -ENDM > - > -MACRO(STUB_K, Name, ArgCount) > - START_PROC Zw&Name, %ArgCount * 4 > - STUBCODE_K Name, SyscallId, %ArgCount > - .ENDP > - SyscallId = SyscallId + 1 > -ENDM > + > +#ifdef _M_IX86 > +#define KUSER_SHARED_SYSCALL HEX(7ffe0300) > +#define KGDT_R0_CODE 8 > +MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > + StackBytes = 4 * ArgCount > + FPO 0, 0, 0, 0, 0, FRAME_FPO > + mov eax, SyscallId > + mov edx, KUSER_SHARED_SYSCALL > + call dword ptr [edx] > + ret StackBytes > +ENDM > +MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > + StackBytes = 4 * &ArgCount > + FPO 0, 0, 0, 0, 0, FRAME_FPO > + mov eax, SyscallId > + lea edx, [esp + 4] > + pushfd > + push KGDT_R0_CODE > + call _KiSystemService > + ret StackBytes > +ENDM > +#elif defined(_M_AMD64) > +MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > + .ENDPROLOG > + mov eax, SyscallId > + mov r10, rcx > + syscall > + ret > +ENDM > +MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > + .ENDPROLOG > + EXTERN Nt&Name:PROC > + lea rax, Nt&Name[rip] > + mov r10, ArgCount * 8 > + jmp KiZwSystemService > +ENDM > +#elif defined(_M_ARM) > +MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > + swi #SyscallId > + bx lr > +ENDM > +MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > + mov ip, lr > + swi #SyscallId > + bx ip > +ENDM > +#elif defined(_M_PPC) > +MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > + stwu 1,-16(1) > + mflr 0 > + stw 0,0(1) > + li 0, SyscallId > + sc > + lwz 0,0(1) > + mtlr 0 > + addi 1,1,16 > + blr > +ENDM > +#define STUBCODE_K STUBCODE_U > +#elif defined(_M_MIPS) > +MACRO(STUBCODE_U, Name, SyscallId, ArgCount) > + li $8, KUSER_SHARED_SYSCALL > + lw $8,0($8) > + j $8 > + nop > +ENDM > +MACRO(STUBCODE_K, Name, SyscallId, ArgCount) > + j KiSystemService > + nop > +ENDM > +#else > +#error unsupported architecture > +#endif > + > +#ifdef _M_IX86 > +MACRO(MAKE_LABEL, Name, StackBytes) > + PUBLIC _&Name&@&StackBytes > + _&Name&@&StackBytes: > +ENDM > +MACRO(START_PROC, Name, StackBytes) > + PUBLIC _&Name&@&StackBytes > + .PROC _&Name&@&StackBytes > +ENDM > +#else > +MACRO(MAKE_LABEL, Name, StackBytes) > + PUBLIC &Name > + &Name: > +ENDM > +MACRO(START_PROC, Name, StackBytes) > + PUBLIC &Name > + .PROC &Name > +ENDM > +#endif > + > +MACRO(STUB_U, Name, ArgCount) > + MAKE_LABEL Zw&Name, %ArgCount * 4 > + START_PROC Nt&Name, %ArgCount * 4 > + STUBCODE_U Name, SyscallId, %ArgCount > + .ENDP > + SyscallId = SyscallId + 1 > +ENDM > + > +MACRO(STUB_K, Name, ArgCount) > + START_PROC Zw&Name, %ArgCount * 4 > + STUBCODE_K Name, SyscallId, %ArgCount > + .ENDP > + SyscallId = SyscallId + 1 > +ENDM > >

10 years, 2 months

2
2
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 66144: [FREELDR] - Fix date format in CHANGELOG (that uses that #$@! of US format) - Diverse code style changes (whitespace, extra braces, C++ to C-style comments, ...)

by Aleksey Bragin

On 01.02.2015 23:22, hbelusca(a)svn.reactos.org wrote: > Author: hbelusca > Date: Sun Feb 1 20:22:13 2015 > New Revision: 66144 > > URL: http://svn.reactos.org/svn/reactos?rev=66144&view=rev > Log: > [FREELDR] > - Fix date format in CHANGELOG (that uses that #$@! of US format) > - Diverse code style changes (whitespace, extra braces, C++ to C-style comments, ...) > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/CHANGELOG [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/CHANGELOG [iso-8859-1] Sun Feb 1 20:22:13 2015 > @@ -1,4 +1,4 @@ > -Changes in v3.0+ (05/01/2015) (hbelusca) > +Changes in v3.0+ (01/05/2015) (hbelusca) Don't make our dear American contributors feel offended! :-) Also there is ISO 8601 standard, you know, the big-endian style YYYY-MM-DD. Regards, Aleksey Bragin

10 years, 2 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 66143: [FREELDR] - Remove an unexisting function declaration. - Move some boot methods back to suitable place. - Whitespace fixes.

by Timo Kreuzer

Why are you moving a file out of the i386 folder and then add #ifdef _M_IX86 around all the code??? Am 01.02.2015 um 18:49 schrieb hbelusca(a)svn.reactos.org: > --- trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/custom.c [iso-8859-1] Sun Feb 1 17:49:11 2015 > @@ -19,6 +19,7 @@ > > #include <freeldr.h> > > +#ifdef _M_IX86 > > const CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; > const CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; > @@ -448,3 +449,5 @@ > DiskStopFloppyMotor(); > Reboot(); > } > + > +#endif // _M_IX86

10 years, 2 months

2
1
0 0

Re: [ros-dev] ReactOS trademark and logo violation

by Daniel Reimer

I hope you are not talking about the ... Right arm? ^^Am 01.02.2015 00:27 schrieb Hermès BÉLUSCA - MAÏTO <hermes.belusca(a)sfr.fr>: > > And after that, people go to #reactos by mistake to ask for Java-related questions... By the way, if one believes Wikipedia, this ReactJS was created in 2013: http://en.wikipedia.org/wiki/ReactJS > > <troll>Now… look carefully at the video around 0:40 up to 0:50… \o ^^ </troll> > > > > De : Ros-dev [mailto:ros-dev-bounces@reactos.org] De la part de Timo Kreuzer > Envoyé : samedi 31 janvier 2015 22:50 > À : ReactOS Development List > Objet : Re: [ros-dev] ReactOS trademark and logo violation > > > > > I agree this is pretty nasty. Too much consonance for me to believe in accidental coincidence. ("ReactJS"? Srsly?) > > Are we going to sue them? > Let's make them PAY! :D > > > Am 31.01.2015 um 20:01 schrieb Alexander Rechitskiy: >> >> I clearly see that ReactOS trademark and logo are violated by Facebooks' ReactJS project >> >> >> >> http://www.youtube.com/watch?v=KVZ-P-ZI6W4 >> >> >> >> -- >> >> Best regards, >> Alexander Rechitskiy >> >> +79286331900 >> >> >> >> >> >> >> _______________________________________________ >> >> Ros-dev mailing list >> >> Ros-dev(a)reactos.org >> >> http://www.reactos.org/mailman/listinfo/ros-dev > >

10 years, 2 months

2
1
0 0

ReactOS trademark and logo violation

by Alexander Rechitskiy

10 years, 2 months

3
2
0 0

Re: [ros-dev] [ros-diffs] [pschweitzer] 66101: [CDMAKE] It's totally pointless to nullify after calloc

by Timo Kreuzer

This code change doesn't help to make the code more readable. Am 28.01.2015 um 21:41 schrieb pschweitzer(a)svn.reactos.org: > Author: pschweitzer > Date: Wed Jan 28 20:41:23 2015 > New Revision: 66101 > > URL: http://svn.reactos.org/svn/reactos?rev=66101&view=rev > Log: > [CDMAKE] > It's totally pointless to nullify after calloc > > Modified: > trunk/reactos/tools/cdmake/dirhash.c > > Modified: trunk/reactos/tools/cdmake/dirhash.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.c?rev… > ============================================================================== > --- trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) > +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Wed Jan 28 20:41:23 2015 > @@ -137,8 +137,6 @@ > free(parentcase); > > de = calloc(1, sizeof(*de)); > - de->head = NULL; > - de->child = NULL; > de->parent = parent_de; > de->normalized_name = strdup(targetnorm); > de->case_name = strdup(chop_filename(casename)); > > >

10 years, 2 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 65678: [MSGINA]: Update the function names of stubs, with (in comments) the number of parameters they take. See CORE-8459 for more information. CORE-8459 #resolve #comment Fixed in r65678.

by Thomas Faber

On 2014-12-15 22:07, hbelusca(a)svn.reactos.org wrote: > +1 stub -noname ShellGetUserList ; (long long long) For future reference, you might as well write this kind of thing as 1 stdcall -stub -noname ShellGetUserList(long long long) Then spec2def will create a stub that uses the correct calling convention and also prints out the arguments. Plus it's easier to change to the real thing when someone implements it ;)

10 years, 2 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [jimtabor] 66085: [Win32ss] - Fix window from point so it handles disabled windows correctly. - Cleanup processing mouse routine. - See CORE-7447.

by Thomas Faber

On 2015-01-25 16:57, jimtabor(a)svn.reactos.org wrote: > - if (*HitTest == HTNOWHERE) *HitTest = HTCLIENT; > + if (*HitTest == HTNOWHERE && pwndChild == NULL) *HitTest = HTCLIENT; pwndChild cannot be non-NULL here.

10 years, 2 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 66083: [CDMAKE] - Disable unused dir_hash_next_dir function and corresponding target_dir_traversal structure definition. - Be really sure de->head and de->child are initialized at NULL. ...

by Pierre Schweitzer

On 24/01/2015 01:15, hbelusca(a)svn.reactos.org wrote: > ============================================================================== > --- trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) > +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Sat Jan 24 00:15:08 2015 > @@ -138,12 +138,14 @@ > hashcode = djb_hash(targetnorm); > de = calloc(1, sizeof(*de)); > de->parent = parent_de; > + de->head = NULL; > + de->child = NULL; de has been allocated few lines upper with calloc. head & child CANNOT be different from NULL. This is non sense. > @@ -170,6 +172,7 @@ > tf->target_name = strdup(chop_filename(target)); > } > > +#if 0 > static struct target_dir_entry * > dir_hash_next_dir(struct target_dir_hash *dh, struct target_dir_traversal *t) > { > @@ -200,13 +203,13 @@ > return t->it; > } > } > +#endif Once again, this is trunk, not your working copy. If you 0 out, please add a comment explaining it's just unused and not buggy. And actually, because it's trunk & unusued, it would be better just to remove them. svn history can help finding them back if really needed. > ============================================================================== > --- trunk/reactos/tools/cdmake/dirhash.h [iso-8859-1] (original) > +++ trunk/reactos/tools/cdmake/dirhash.h [iso-8859-1] Sat Jan 24 00:15:08 2015 > @@ -26,11 +26,13 @@ > struct target_dir_entry root; > }; > > +#if 0 > struct target_dir_traversal > { > struct target_dir_entry *it; > int i; > }; > +#endif See comment above. Cheers, -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

10 years, 2 months

1
0
0 0

New Flyers for FOSDEM required

by Colin Finck

Hi all, We're still preparing merchandising products for FOSDEM, and flyers are probably most important here and still doable in time. Can somebody please take the template from https://svn.reactos.org/press-media/trunk/Events/2009%20-%20FOSDEM/Flyer/ and alter it a bit to reflect current ReactOS state? The best would be a flyer not including a certain ReactOS version number, so that it is universally usable. If you don't have InDesign to modify the file, just send me the modified text here. Thanks! Colin

10 years, 3 months

1
0
0 0

Security issue on ReactOS.org website

by Pierre Schweitzer

Dear all, Just to make sure you read it: https://www.reactos.org/node/928 The SVN accounts are not affected. Cheers, -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

10 years, 3 months

1
0
0 0

ReactOS Hybrid CDs

by Hermès BÉLUSCA - MAÏTO

Hi all ! Our build system is now able to build so-called hybrid cds . What are they? They are boot+live-cd all-in-one. In addition it is now possible with them to load the live cd as a ramdisk. For that the contents of the bootcd is placed into a bootcd/ directory, the contents of the livecd is placed into a livecd/ directory, and the livecd image itself is also included (this is the one that is used for livecd ramdisk). You can notice that makes a lot of redundancy, but its the best thing I could do for now. The best way would be to build some kind of flat HDD image that is used as the livecd ramdisk (and never use the livecd with reads from the cd as we currently do) . Anyways. So here it is ! In addition you can add extra custom files via the build process: just place your files into a <your_ROS_source>/modules/hybridcd_extras/ directory (this directory doesnt exist by default, its up to you to create and populate it; I think its better to create a directory somewhere else and then add a symlink hybridcd_extras to this directory, inside the modules/ directory, as you already do with rosapps and rostests). After that you configure a build, build the host-tools and then ninja hybridcd !! If then you need to change the custom files, do it and then reconfigure a build with the cmake . command (when youre inside <your_ROS_builddir>/reactos/ ) so that cmake can build again the list of files to be included into the hybridcd. See https://jira.reactos.org/browse/CORE-9069 for few more details. Cheers, Hermès.

10 years, 3 months

2
4
0 0

Revision 66026 - Directory Listing Modified Sun Jan 11 14:38:26 2015 UTC (3 days, 7 hours ago) by dreimer [RAPPS] Database Update. This fixes the now dead LibreOffice link, too. I completely skipped MirandaIM because they suck by deciding to do the same shit, Filezilla did. SF Malware "optimized" installer!

by Javier Agustìn Fernàndez Arroyo

Hello Daniel, There are links to filezilla which doesnt lead to the malware installer shit. This link ends with ".../download?nowrap" maybe adding this works for MirandaIM too http://sourceforge.net/projects/filezilla/files/FileZilla_Client/3.10.0.1/F…

10 years, 3 months

3
4
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