Ros-diffs January 2016

ros-diffs@reactos.org

13 participants
192 discussions

[spetreolle] 70669: [OPENGL] Free the variable arguments in vsnprintf implementation. Patch by Victor Martinez. CORE-10629

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Jan 31 19:14:24 2016 New Revision: 70669 URL: http://svn.reactos.org/svn/reactos?rev=70669&view=rev Log: [OPENGL] Free the variable arguments in vsnprintf implementation. Patch by Victor Martinez. CORE-10629 Modified: trunk/reactos/dll/opengl/mesa/main/vsnprintf.c Modified: trunk/reactos/dll/opengl/mesa/main/vsnprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/vsnpr… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/vsnprintf.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/vsnprintf.c [iso-8859-1] Sun Jan 31 19:14:24 2016 @@ -150,15 +150,16 @@ va_dcl #endif { + int nchar; va_list ap; #if __STDC__ va_start(ap, fmt); #else va_start(ap); #endif - - return (vsnprintf(str, n, fmt, ap)); + nchar = vsnprintf(str, n, fmt, ap) va_end(ap); + return (nchar); }

8 years, 7 months

[spetreolle] 70668: cmlib: Fix debug string becoming too big for testbot (doesn't fix successful-but-canceled ntdll:NtDeleteKey) Alex, do we have an actual free-security-descriptor function ?

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Jan 31 17:42:05 2016 New Revision: 70668 URL: http://svn.reactos.org/svn/reactos?rev=70668&view=rev Log: cmlib: Fix debug string becoming too big for testbot (doesn't fix successful-but-canceled ntdll:NtDeleteKey) Alex, do we have an actual free-security-descriptor function ? 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] Sun Jan 31 17:42:05 2016 @@ -215,7 +215,7 @@ } /* FIXME: This leaks the security desriptor! */ - DPRINT1("Potentially leaking key security descriptor. Please call CmpFreeSecurityDescriptor"); + DPRINT1("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;

8 years, 7 months

[hbelusca] 70667: [FOSDEM2016]: FOSDEM is over, tag the branch! I thank Colin for having given me access to a builder for making this ISO.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 31 15:08:25 2016 New Revision: 70667 URL: http://svn.reactos.org/svn/reactos?rev=70667&view=rev Log: [FOSDEM2016]: FOSDEM is over, tag the branch! I thank Colin for having given me access to a builder for making this ISO. Added: tags/ReactOS-0.4.0-FOSDEM2016/ (props changed) - copied from r70666, branches/ReactOS-0.4.0-FOSDEM2016/ Removed: branches/ReactOS-0.4.0-FOSDEM2016/ Propchange: tags/ReactOS-0.4.0-FOSDEM2016/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Jan 31 15:08:25 2016 @@ -0,0 +1 @@ +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641,70651

8 years, 7 months

[hbelusca] 70666: Forgot that we use RosBe 2.1.3

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 31 02:44:05 2016 New Revision: 70666 URL: http://svn.reactos.org/svn/reactos?rev=70666&view=rev Log: Forgot that we use RosBe 2.1.3 Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/de-DE.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/en-US.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/fr-FR.rc Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/de-DE.rc [iso-8859-1] Sun Jan 31 02:44:05 2016 @@ -51,7 +51,7 @@ BEGIN IDS_TOPICACTION0 "<msg>Sie mÃ¼ssen Ihren Computer mit der ReactOS-CD im Laufwerk neu starten, um die Installation zu starten.\n\nBITTE BEACHTEN SIE: Es wird dringend davon abgeraten, ReactOS auf einem Computer zu installieren, welcher wichtige Daten enthÃ¤lt!" IDS_TOPICACTION1 "\\extras\\ReactOS on QEMU\\ReactOS-040-FOSDEM2016RC-QEMU.7z" - IDS_TOPICACTION2 "\\extras\\ReactOS Build Environment\\RosBE-2.1.1.exe" + IDS_TOPICACTION2 "\\extras\\ReactOS Build Environment\\RosBE-2.1.3.exe" IDS_TOPICACTION3 "\\extras\\ReactOS Source Code\\ReactOS-040-FOSDEM2016RC-Source.7z" IDS_TOPICACTION4 "https://www.reactos.org/" IDS_TOPICACTION5 "explorer.exe" Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/en-US.rc [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/en-US.rc [iso-8859-1] Sun Jan 31 02:44:05 2016 @@ -51,7 +51,7 @@ BEGIN IDS_TOPICACTION0 "<msg>You have to restart your computer with the ReactOS CD in the drive to start the installation.\n\nPLEASE NOTE: You're highly advised to not install ReactOS on a computer that contains important data!" IDS_TOPICACTION1 "\\extras\\ReactOS on QEMU\\ReactOS-040-FOSDEM2016RC-QEMU.7z" - IDS_TOPICACTION2 "\\extras\\ReactOS Build Environment\\RosBE-2.1.1.exe" + IDS_TOPICACTION2 "\\extras\\ReactOS Build Environment\\RosBE-2.1.3.exe" IDS_TOPICACTION3 "\\extras\\ReactOS Source Code\\ReactOS-040-FOSDEM2016RC-Source.7z" IDS_TOPICACTION4 "https://www.reactos.org/" IDS_TOPICACTION5 "explorer.exe" Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/fr-FR.rc [iso-8859-1] Sun Jan 31 02:44:05 2016 @@ -51,7 +51,7 @@ BEGIN IDS_TOPICACTION0 "<msg>Vous ne pouvez pas encore installer ReactOS directement depuis ce CD ! Veuillez redÃ©marrer votre ordinateur depuis ce CD pour pouvoir installer ReactOS." IDS_TOPICACTION1 "\\extras\\ReactOS on QEMU\\ReactOS-040-FOSDEM2016RC-QEMU.7z" - IDS_TOPICACTION2 "\\extras\\ReactOS Build Environment\\RosBE-2.1.1.exe" + IDS_TOPICACTION2 "\\extras\\ReactOS Build Environment\\RosBE-2.1.3.exe" IDS_TOPICACTION3 "\\extras\\ReactOS Source Code\\ReactOS-040-FOSDEM2016RC-Source.7z" IDS_TOPICACTION4 "https://www.reactos.org/" IDS_TOPICACTION5 "explorer.exe"

8 years, 7 months

[hbelusca] 70665: [FOSDEM2016] Add the optional font (and readme) for the livecd. The other optional 3rd-party files (extra drivers, MFC 4.2 and 7.1 libraries, MS VB 5.0 and 6.0 runtime and MSVC++ ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 31 01:57:09 2016 New Revision: 70665 URL: http://svn.reactos.org/svn/reactos?rev=70665&view=rev Log: [FOSDEM2016] Add the optional font (and readme) for the livecd. The other optional 3rd-party files (extra drivers, MFC 4.2 and 7.1 libraries, MS VB 5.0 and 6.0 runtime and MSVC++ 7.1 runtime can be found in an "optional.7z" archive in IServ. Wine Gecko package is stored elsewhere and is kept up-to-date). Added: branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/ branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/DroidSansFallback.ttf (with props) branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/NOTICE_for_Droid_Font.txt (with props) Added: branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/DroidSansFallback.ttf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/DroidSansFallback.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/NOTICE_for_Droid_Font.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/NOTICE_for_Droid_Font.txt (added) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/NOTICE_for_Droid_Font.txt [iso-8859-1] Sun Jan 31 01:57:09 2016 @@ -0,0 +1,214 @@ + ========================================================================= + == NOTICE file corresponding to the section 4 d of == + == the Apache License, Version 2.0, == + == in this case for the Android-specific code. == + ========================================================================= + +Android Code +Copyright 2005-2009 The Android Open Source Project + +This product includes software developed as part of +The Android Open Source Project (http://source.android.com). + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. Propchange: branches/ReactOS-0.4.0-FOSDEM2016/reactos/modules/optional/NOTICE_for_Droid_Font.txt ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 7 months

[hbelusca] 70664: [WALLPAPERS]: Addendum for r70661: Since the FOSDEM wallpaper displays better when not being stretched but centered, use instead centered-style wallpaper.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 31 01:02:02 2016 New Revision: 70664 URL: http://svn.reactos.org/svn/reactos?rev=70664&view=rev Log: [WALLPAPERS]: Addendum for r70661: Since the FOSDEM wallpaper displays better when not being stretched but centered, use instead centered-style wallpaper. Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Sun Jan 31 01:02:02 2016 @@ -66,7 +66,7 @@ HKCU,"Control Panel\Desktop","Pattern",2,"(None)" HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Web\Wallpaper\ReactOS_CirclesBlue.bmp" HKCU,"Control Panel\Desktop","TileWallpaper",2,"0" -HKCU,"Control Panel\Desktop","WallpaperStyle",2,"2" +HKCU,"Control Panel\Desktop","WallpaperStyle",2,"0" HKCU,"Control Panel\Desktop","FontSmoothing",0,"1" HKCU,"Control Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","FontSmoothingType",0x00010003,0x00000001

8 years, 7 months

[spetreolle] 70663: [TASKMGR] Remove hacks for idle time.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Jan 30 17:18:08 2016 New Revision: 70663 URL: http://svn.reactos.org/svn/reactos?rev=70663&view=rev Log: [TASKMGR] Remove hacks for idle time. Modified: trunk/reactos/base/applications/taskmgr/perfdata.c Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Sat Jan 30 17:18:08 2016 @@ -302,12 +302,6 @@ /* CurrentCpuUsage% = 100 - (CurrentCpuIdle * 100) / NumberOfProcessors */ dbIdleTime = 100.0 - dbIdleTime * 100.0 / (double)SystemBasicInfo.NumberOfProcessors; /* + 0.5; */ dbKernelTime = 100.0 - dbKernelTime * 100.0 / (double)SystemBasicInfo.NumberOfProcessors; /* + 0.5; */ - - if (dbIdleTime < 0.0) dbIdleTime = 0.0; - if (dbIdleTime > 100.0) dbIdleTime = 100.0; - if (dbKernelTime < 0.0) dbKernelTime = 0.0; - if (dbKernelTime > 100.0) dbKernelTime = 100.0; - } /* Store new CPU's idle and system time */

8 years, 7 months

[spetreolle] 70662: [TASKMGR] protect some variables with the critical section Patch by Mark Jansen. CORE-10787

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Jan 30 17:01:04 2016 New Revision: 70662 URL: http://svn.reactos.org/svn/reactos?rev=70662&view=rev Log: [TASKMGR] protect some variables with the critical section Patch by Mark Jansen. CORE-10787 Modified: trunk/reactos/base/applications/taskmgr/perfdata.c Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Sat Jan 30 17:01:04 2016 @@ -477,17 +477,29 @@ ULONG PerfDataGetProcessCount(void) { - return ProcessCount; + ULONG Result; + EnterCriticalSection(&PerfDataCriticalSection); + Result = ProcessCount; + LeaveCriticalSection(&PerfDataCriticalSection); + return Result; } ULONG PerfDataGetProcessorUsage(void) { - return (ULONG)dbIdleTime; + ULONG Result; + EnterCriticalSection(&PerfDataCriticalSection); + Result = (ULONG)dbIdleTime; + LeaveCriticalSection(&PerfDataCriticalSection); + return Result; } ULONG PerfDataGetProcessorSystemUsage(void) { - return (ULONG)dbKernelTime; + ULONG Result; + EnterCriticalSection(&PerfDataCriticalSection); + Result = (ULONG)dbKernelTime; + LeaveCriticalSection(&PerfDataCriticalSection); + return Result; } BOOL PerfDataGetImageName(ULONG Index, LPWSTR lpImageName, ULONG nMaxCount)

8 years, 7 months

[hbelusca] 70661: [WALLPAPERS] - Update the wallpapers for FOSDEM 2016. - Since we don't have any mechanism at the moment to preselect a non-bitmap wallpaper to use, I'm forced to convert the wallp...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 29 13:24:17 2016 New Revision: 70661 URL: http://svn.reactos.org/svn/reactos?rev=70661&view=rev Log: [WALLPAPERS] - Update the wallpapers for FOSDEM 2016. - Since we don't have any mechanism at the moment to preselect a non-bitmap wallpaper to use, I'm forced to convert the wallpaper we want to use to bitmap first, and then add its entry into the registry (I cannot just use the jpg file in the registry). See r66772. Added: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue.bmp (with props) branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue.jpg - copied, changed from r70660, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue_1.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold.jpg - copied, changed from r70660, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold_1.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_Light_16-9.jpg - copied, changed from r70647, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Light_16-9.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_Light_4-3.jpg - copied, changed from r70647, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Light_4-3.jpg Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/1920px_Polarlicht.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/Angelus/ branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue_1.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue_2.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold_1.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold_2.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_Hexagons.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/grass.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/wallpapers.txt Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/CMakeLists.txt branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReadMe.txt Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Fri Jan 29 13:24:17 2016 @@ -64,7 +64,7 @@ HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000" HKCU,"Control Panel\Desktop","Pattern",2,"(None)" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Web\Wallpaper\ReactOS_CirclesBlue.bmp" HKCU,"Control Panel\Desktop","TileWallpaper",2,"0" HKCU,"Control Panel\Desktop","WallpaperStyle",2,"2" HKCU,"Control Panel\Desktop","FontSmoothing",0,"1" Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/1920px_Polarlicht.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Modified: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/CMakeLists.txt [iso-8859-1] Fri Jan 29 13:24:17 2016 @@ -1,2 +1,16 @@ -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_02_ROSWP_4-3_1024x768.jpg DESTINATION reactos/Web/Wallpaper FOR all) +list(APPEND WALLPAPER_FILES + Angelus_02_ROSWP_4-3_1440x1080.jpg + Angelus_02_ROSWP_4-3_1024x768.jpg + clouds.jpg + lake.jpg + ReactOS_CirclesBlue.bmp + ReactOS_CirclesBlue.jpg + ReactOS_CirclesGold.jpg + ReactOS_Light_4-3.jpg + ReactOS_Light_16-9.jpg + ReadMe.txt) + +foreach(item ${WALLPAPER_FILES}) + add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/Web/Wallpaper FOR all) +endforeach(item) Added: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Copied: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue.jpg (from r70660, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue_1.jpg) URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary files - no diff available. Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue_1.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue_2.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Copied: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold.jpg (from r70660, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold_1.jpg) URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary files - no diff available. Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold_1.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold_2.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_Hexagons.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Copied: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_Light_16-9.jpg (from r70647, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Light_16-9.jpg) URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary files - no diff available. Copied: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_Light_4-3.jpg (from r70647, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Light_4-3.jpg) URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReadMe.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReadMe.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReadMe.txt [iso-8859-1] Fri Jan 29 13:24:17 2016 @@ -1,17 +1,15 @@ Wallpapers =========== +Most of the wallpapers are adapted from the original ones for the FOSDEM 2016. + File Name | Author | Origin -------------------------------------------------------------------------------------------------------------------------------------------------- -Angelus collection | Forum user "Angelus" (jedi.knight(a)wanadoo.es) | http://www.reactos.org/forum/viewtopic.php?p=50543#p50543 -Angelus_02_ROSWP_4-3_1440x1080.jpg | See above | See above +Angelus_02_ROSWP_4-3_1440x1080.jpg | Forum user "Angelus" (jedi.knight(a)wanadoo.es) | http://www.reactos.org/forum/viewtopic.php?p=50543#p50543 Angelus_02_ROSWP_4-3_1024x768.jpg | See above | See above -1920px_Polarlicht.jpg | Public domain | https://jira.reactos.org/browse/CORE-8446 and links inside -grass.jpg | See above | See above clouds.jpg | Andreas Bjerkeholt (harteex(a)gmail.com) | http://www.reactos.org/forum/viewtopic.php?p=17732#p17732 -lake.jpg | Andreas Bjerkeholt (harteex(a)gmail.com) | http://www.reactos.org/forum/viewtopic.php?p=17732#p17732 -ReactOS_CirclesBlue_1.jpg | Forum user "henrytang5247" (Henry Tang) | http://www.reactos.org/forum/viewtopic.php?p=109529#p109529 -ReactOS_CirclesBlue_2.jpg | See above | See above -ReactOS_CirclesGold_1.jpg | See above | See above -ReactOS_CirclesGold_2.jpg | See above | See above -ReactOS_Hexagons.jpg | See above | http://www.reactos.org/forum/viewtopic.php?p=109866#p109866 +lake.jpg | See above | See above +ReactOS_CirclesBlue.jpg | Forum user "henrytang5247" (Henry Tang) | http://www.reactos.org/forum/viewtopic.php?p=109529#p109529 +ReactOS_CirclesGold.jpg | See above | See above +ReactOS_Light_4-3.jpg | Forum user "Angelus" (jedi.knight(a)wanadoo.es) | http://www.reactos.org/forum/viewtopic.php?p=50543#p50543 +ReactOS_Light_16-9.jpg | See above | See above Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/grass.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/wallpapers.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/wallpapers.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/wallpapers.txt (removed) @@ -1,69 +0,0 @@ -ReactOS Wallpapers suggestion: - - - -ReactOS Wallpapers for Version 0.3: - -* ReactOS Wallpaper (original with new text; GNU GPL) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wallp&… - -* ReactOS Computer Wallpaper #1 (GNU GPL) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wallp&… - -* hill and water (BSD-license) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wallp&… - -* ReactOS wallpaper - 3d with holes (GNU LGPL) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wallp&… - -* ReactOS Wallpapers (Earth) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wallp&… - -* Ros Nature (Flowers + Logo) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wallp&… - - - -GPL Wallpapers from kde-look.org: - -* Nature #1 (Fruit) - http://www.kde-look.org/content/files/16183-green.jpg - -* Nature #2 (Wood) - http://www.kde-look.org/content/files/10274-p1010076.jpg - -* Nature #3 (Sea) - http://arg0.net/users/vgough/images/2007-taupo.png - -* Nature #4 (Bees #1) - http://kdelook.org/content/files/16382-img_0511c1_xga.jpg - -* Nature #5 (Bees #2) - http://www.kde-look.org/content/files/16498-Beon.jpg - -* Nature #6 (Bees #3) - http://www.kde-look.org/content/files/6524-Bee%20in%20Flower.jpg - -* Nature #7 (Summer) - http://www.kde-look.org/content/files/20979-altabadia_summer_1200.jpg - - - -Some useful links: - -* GNOME-LOOK.ORG - http://www.gnome-look.org - -* KDE-LOOK.ORG - http://www.kde-look.org/ - -* Frik85's ReactOS Fanpage - http://frik85.reactos.at - (-> http://reactosde.re.funpic.de/mediagroup.php?sec=Graphic%20arts) - - - -History: - -2005-02-25 Klemens Friedl -2005-05-31 Klemens Friedl

8 years, 7 months

[hbelusca] 70660: [BOOTDATA]: Update readme.txt for FOSDEM 2016.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 29 03:00:41 2016 New Revision: 70660 URL: http://svn.reactos.org/svn/reactos?rev=70660&view=rev Log: [BOOTDATA]: Update readme.txt for FOSDEM 2016. Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/readme.txt Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/readme.txt [iso-8859-1] Fri Jan 29 03:00:41 2016 @@ -1,7 +1,23 @@ -======================== -ReactOS Version 0.4.x -Updated January 5, 2016 -======================== +================================================================================ +ReactOS Version 0.4.0-RC Preview +for FOSDEM 2016 +================================================================================ + +0. CD-ROM Contents +------------------ + +* ReactOS LiveCD and Installation +* ReactOS on QEMU virtual machine +* ReactOS Build Environment (RosBE) for Windows and Unix-like OSes +* ReactOS source code + +This CD-ROM starts an AutoRun program under Windows. Alternatively you can +browse the contents of this CD-ROM with any file browser. The folder names +should be self-explanatory. + +The source code of ReactOS can be compiled using the ReactOS Build Environment +under Windows or Unix-like operating systems such as Linux. + 1. What is ReactOS? ------------------- @@ -47,9 +63,3 @@ The tutorials contain more information on the project, compiling and testing ReactOS - amongst other topics. Contributors to the project are always welcome. - - -6. Author ---------- - -This document was written by Jason Filby (jasonfilby(a)yahoo.com).

8 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2016