Skip to content

Commit

Permalink
Merge Service Pack 2a into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@errortek
errortek committed Oct 21, 2023
2 parents 5964817 + 03d904a commit 73e4878
Show file tree
Hide file tree
Showing 136 changed files with 2,952 additions and 1,941 deletions.
26 changes: 20 additions & 6 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,22 @@ endif()

project(REACTOS)

if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
if(CMAKE_C_COMPILER_VERSION VERSION_LESS "13.0.1")
message(FATAL_ERROR "Unsupported old ${CMAKE_C_COMPILER_ID} compiler: ${CMAKE_C_COMPILER_VERSION}")
endif()
elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
if(CMAKE_C_COMPILER_VERSION VERSION_LESS "8.4")
message(FATAL_ERROR "Unsupported old ${CMAKE_C_COMPILER_ID} compiler: ${CMAKE_C_COMPILER_VERSION}")
endif()
elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
if(CMAKE_C_COMPILER_VERSION VERSION_LESS "19.0") # v14 (2015)
message(FATAL_ERROR "Unsupported old ${CMAKE_C_COMPILER_ID} compiler: ${CMAKE_C_COMPILER_VERSION}")
endif()
else()
message(WARNING "Unknown ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} compiler, skipping compiler version check...")
endif()

set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
set(CMAKE_SHARED_LIBRARY_PREFIX "")
Expand Down Expand Up @@ -76,9 +92,9 @@ add_definitions(

# There doesn't seem to be a standard for __FILE__ being relative or absolute, so detect it at runtime.
file(RELATIVE_PATH _PATH_PREFIX ${REACTOS_BINARY_DIR} ${REACTOS_SOURCE_DIR})
if (NOT MSVC AND ((CMAKE_C_COMPILER_ID STREQUAL "GNU") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0")
OR (CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "10.0.0")))
# Thankfully, GCC has this
if(NOT MSVC AND (CMAKE_C_COMPILER_ID STREQUAL "GNU"
OR CMAKE_C_COMPILER_ID STREQUAL "Clang"))
# Thankfully, CLANG and GCC have this
add_compile_options(-ffile-prefix-map=${REACTOS_SOURCE_DIR}=)
add_compile_options(-ffile-prefix-map=${_PATH_PREFIX}=)
else()
Expand Down Expand Up @@ -141,9 +157,7 @@ if(NOT CMAKE_CROSSCOMPILING)
elseif(ARCH STREQUAL "amd64")
add_definitions(-D_AMD64_ -D__x86_64__ /DWIN32 -D_WINDOWS)
endif()
if(MSVC_VERSION GREATER 1699)
add_definitions(/D_ALLOW_KEYWORD_MACROS)
endif()
add_definitions(/D_ALLOW_KEYWORD_MACROS)
endif()
add_subdirectory(sdk/include/host)

Expand Down
144 changes: 37 additions & 107 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,136 +1,66 @@
<p align=center>
<a href="https://reactos.org/">
<img alt="ReactOS" src="https://reactos.org/wiki/images/0/02/ReactOS_logo.png">
</a>
</p>

---
What is Windivs?

<p align=center>
<a href="https://reactos.org/project-news/reactos-0414-released/">
<img alt="ReactOS 0.4.14 Release" src="https://img.shields.io/badge/release-0.4.14-0688CB.svg">
</a>
<a href="https://reactos.org/download/">
<img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg">
</a>
<a href="https://sourceforge.net/projects/reactos/">
<img alt="SourceForge Download" src="https://img.shields.io/sourceforge/dm/reactos.svg?colorB=0688CB">
</a>
<a href="https://github.com/reactos/reactos/blob/master/COPYING">
<img alt="License" src="https://img.shields.io/badge/license-GNU_GPL_2.0-0688CB.svg">
</a>
<a href="https://reactos.org/donate/">
<img alt="Donate" src="https://img.shields.io/badge/%24-donate-E44E4A.svg">
</a>
<a href="https://twitter.com/reactos">
<img alt="Follow on Twitter" src="https://img.shields.io/twitter/follow/reactos.svg?style=social&label=Follow%20%40reactos">
</a>
</p>
Windivs™ is an Open Source effort to develop a quality operating system that is compatible with applications and drivers written for the Microsoft® Windows™ NT family of operating systems (NT4, 2000, XP, 2003, Vista, 7).

## Quick Links
[Website](https://reactos.org/) &bull;
[Official chat](https://chat.reactos.org/) &bull;
[Wiki](https://reactos.org/wiki/) &bull;
[Forum](https://reactos.org/forum/) &bull;
[Community Discord](https://discord.gg/7knjvhT) &bull;
[JIRA Bug Tracker](https://jira.reactos.org/issues/) &bull;
[ReactOS Git mirror](https://git.reactos.org/) &bull;
[Testman](https://reactos.org/testman/)
The Windivs project, although currently focused on Windows Server 2003 compatibility, is always keeping an eye toward compatibility with Windows Vista and future Windows NT releases.

## What is ReactOS?
The code of Windivs is licensed under GNU GPL 2.0.

ReactOS™ is an Open Source effort to develop a quality operating system that is compatible with applications and drivers written for the Microsoft® Windows™ NT family of operating systems (NT4, 2000, XP, 2003, Vista, 7).
Product quality warning
Windivs is currently an Alpha quality operating system. This means that Windivs is under heavy development, and you have to be ready to encounter some problems. Different things may not work well, and it can corrupt the data present on your hard disk. It is HIGHLY recommended to test Windivs on a virtual machine or on a computer with no sensitive or critical data!

The ReactOS project, although currently focused on Windows Server 2003 compatibility, is always keeping an eye toward compatibility with Windows Vista and future Windows NT releases.
Building
Build rosbewin.badge rosbeunix.badge coverity.badge

The code of ReactOS is licensed under [GNU GPL 2.0](https://github.com/reactos/reactos/blob/master/COPYING).
To build the system, it is strongly advised to use the Windivs Build Environment (WinBE). Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: "Build Environment".

### Product quality warning
Alternatively, one can use Microsoft Visual C++ (MSVC) version 2015+. Building with MSVC is covered here: "Visual Studio or Microsoft Visual C++".

**ReactOS is currently an Alpha quality operating system.** This means that ReactOS is under heavy development and you have to be ready to encounter some problems. Different things may not work well and it can corrupt the data present on your hard disk. It is HIGHLY recommended to test ReactOS on a virtual machine or on a computer with no sensitive or critical data!
See the "Building Windivs" article for more details.

## Building
Binaries
To build Windivs, you must run the configure script in the directory you want to have your build files. Choose configure.cmd or configure.sh depending on your system. Then run ninja <modulename> to build a module you want or just ninja to build all modules.

![Build](https://github.com/reactos/reactos/workflows/Build/badge.svg) [![rosbewin.badge]][rosbewin.link] [![rosbeunix.badge]][rosbeunix.link] [![coverity.badge]][coverity.link]
Bootable images
To build a bootable CD image, run ninja bootcd from the build directory. This will create a CD image with a filename bootcd.iso.

To build the system it is strongly advised to use the _ReactOS Build Environment (RosBE)._
Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: ["Build Environment"](https://reactos.org/wiki/Build_Environment).
You can always download fresh binary builds of bootable images from the "Daily builds" page.

Alternatively one can use Microsoft Visual C++ (MSVC) version 2015+. Building with MSVC is covered here: ["Visual Studio or Microsoft Visual C++"](https://reactos.org/wiki/CMake#Visual_Studio_or_Microsoft_Visual_C.2B.2B).
Installing
By default, Windivs currently can only be installed on a machine that has a FAT16 or FAT32 partition as the active (bootable) partition. The partition on which Windivs is to be installed (which may or may not be the bootable partition) must also be formatted as FAT16 or FAT32. Windivs Setup can format the partitions if needed.

See ["Building ReactOS"](https://reactos.org/wiki/Building_ReactOS) article for more details.
Starting with 0.4.10, Windivs can be installed using the BtrFS file system. But consider this as an experimental feature, and thus regressions not triggered on FAT setup may be observed.

### Binaries
To install Windivs from the bootable CD distribution, extract the archive contents. Then burn the CD image, boot from it, and follow the instructions.

To build ReactOS you must run the `configure` script in the directory you want to have your build files. Choose `configure.cmd` or `configure.sh` depending on your system. Then run `ninja <modulename>` to build a module you want or just `ninja` to build all modules.
See the "Installing Windivs" Wiki page or INSTALL for more details.

### Bootable images
Testing
If you discover a bug in Windivs, search on JIRA first - it might be reported already. If not, report the bug providing logs and as much information as possible.

To build a bootable CD image run `ninja bootcd` from the build directory. This will create a CD image with a filename `bootcd.iso`.
See "File Bugs" for a guide.

You can always download fresh binary builds of bootable images from the ["Daily builds"](https://reactos.org/getbuilds/) page.
NOTE: The bug tracker is not for discussions. Please use our official chat or our forum.

## Installing
Contributing prwelcome.badge
We are always looking for developers! Check how to contribute if you are willing to participate.

By default, ReactOS currently can only be installed on a machine that has a FAT16 or FAT32 partition as the active (bootable) partition.
The partition on which ReactOS is to be installed (which may or may not be the bootable partition) must also be formatted as FAT16 or FAT32.
ReactOS Setup can format the partitions if needed.
Legal notice: If you have seen proprietary Microsoft Windows source code (including but not limited to the leaked Windows NT 3.5, NT 4, 2000 source code and the Windows Research Kernel), your contribution won't be accepted because of potential copyright violation.

Starting with 0.4.10, ReactOS can be installed using the BtrFS file system. But consider this as an experimental feature and thus regressions not triggered on FAT setup may be observed.
Try out cloud-based Windivs development using Gitpod and Docker:

To install ReactOS from the bootable CD distribution, extract the archive contents. Then burn the CD image, boot from it, and follow the instructions.
Open in Gitpod

See ["Installing ReactOS"](https://reactos.org/wiki/Installing_ReactOS) Wiki page or [INSTALL](INSTALL) for more details.
You can also support Windivs by donating! We rely on our backers to maintain our servers and accelerate development by hiring full-time devs.

## Testing
More information
Windivs is a Free and Open Source operating system based on the Windows architecture, providing support for existing applications and drivers, and an alternative to the current dominant consumer operating system.

If you discover a bug in ReactOS search on JIRA first - it might be reported already. If not report the bug providing logs and as much information as possible.
It is not another wrapper built on Linux, like WINE. It does not attempt or plan to compete with WINE; in fact, the user-mode part of Windivs is almost entirely WINE-based, and our two teams have cooperated closely in the past.

See ["File Bugs"](https://reactos.org/wiki/File_Bugs) for a guide.
Windivs is also not "yet another OS." It does not attempt to be a third player like any other alternative OS out there. People are not meant to uninstall Linux and use Windivs instead; Windivs is a replacement for Windows users who want a Windows replacement that behaves just like Windows.

__NOTE:__ The bug tracker is _not_ for discussions. Please use our [official chat](https://chat.reactos.org/) or our [forum](https://reactos.org/forum/).
More information is available at: windivs.org.

## Contributing [![prwelcome.badge]](https://reactos.org/wiki/Commiting_Changes)

We are always looking for developers! Check [how to contribute](CONTRIBUTING.md) if you are willing to participate.

__Legal notice__: If you have seen proprietary Microsoft Windows source code (including but not limited to the leaked Windows NT 3.5, NT 4, 2000 source code and the Windows Research Kernel), your contribution won't be accepted because of potential copyright violation.

Try out cloud-based ReactOS development using Gitpod and Docker:

[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/reactos/reactos)

You can also support ReactOS by [donating](https://reactos.org/donate/)! We rely on our backers to maintain our servers and accelerate development by [hiring full-time devs](https://reactos.org/contributing/#paid-jobs).

## More information

ReactOS is a Free and Open Source operating system based on the Windows architecture,
providing support for existing applications and drivers, and an alternative to the current dominant consumer operating system.

It is not another wrapper built on Linux, like WINE. It does not attempt or plan to compete with WINE; in fact, the user-mode part of ReactOS is almost entirely WINE-based and our two teams have cooperated closely in the past.

ReactOS is also not "yet another OS". It does not attempt to be a third player like any other alternative OS out there. People are not meant to uninstall Linux and use ReactOS instead; ReactOS is a replacement for Windows users who want a Windows replacement that behaves just like Windows.

More information is available at: [reactos.org](https://reactos.org/).

Also see the [media/doc](/media/doc/) subdirectory for some sparse notes.

## Who is responsible

Active devs are listed as members of [GitHub organization](https://github.com/orgs/reactos/people).
See also the [CREDITS](CREDITS) file for others.

## Code mirrors

The main development is done on [GitHub](https://github.com/reactos/reactos). We have an [alternative mirror](https://git.reactos.org/?p=reactos.git) in case GitHub is down.

There is also an obsolete [SVN archive repository](https://svn.reactos.org/reactos/) that is kept for historical purposes.

[coverity.badge]: https://scan.coverity.com/projects/205/badge.svg?flat=1
[rosbewin.badge]: https://img.shields.io/badge/RosBE_Windows-2.2.0-0688CB.svg
[rosbeunix.badge]: https://img.shields.io/badge/RosBE_Unix-2.2-0688CB.svg
[prwelcome.badge]: https://img.shields.io/badge/PR-welcome-0688CB.svg

[coverity.link]: https://scan.coverity.com/projects/205
[rosbewin.link]: https://sourceforge.net/projects/reactos/files/RosBE-Windows/i386/2.2.0/
[rosbeunix.link]: https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.2/
Also see the media/doc subdirectory for some sparse notes.
2 changes: 1 addition & 1 deletion base/applications/games/solitaire/lang/tr-TR.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ BEGIN
END

IDD_CARDBACK DIALOGEX 6, 6, 345, 185
CAPTION "Kağıt Sırtını Seç"
CAPTION "Kağıt Destesini Seç"
FONT 8, "MS Shell Dlg"
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
BEGIN
Expand Down
Loading

0 comments on commit 73e4878

Please sign in to comment.