https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8e38b83012e768982f2f…
commit e8e38b83012e768982f2fa370930b62a4753f49b
Author: Joachim Henze <Joachim.Henze(a)reactos.org>
AuthorDate: Thu Dec 15 00:14:57 2022 +0100
Commit: Joachim Henze <Joachim.Henze(a)reactos.org>
CommitDate: Thu Dec 15 00:14:57 2022 +0100
[SYSSETUP] Fix missing comma in german translation de-DE.rc
The old string lacked a *mandatory* comma before the word "übereinstimmen"
as the part "die Sie nutzen wollen" is a relative clause,
relative to the noun "Anwendungen".
But we can fix it without having to add the comma by some shuffling.
That also improves the reading flow.
---
dll/win32/syssetup/lang/de-DE.rc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc
index 53eecdb9e4a..5540cdf18e0 100644
--- a/dll/win32/syssetup/lang/de-DE.rc
+++ b/dll/win32/syssetup/lang/de-DE.rc
@@ -73,7 +73,7 @@ CAPTION "ReactOS-Installation"
FONT 8, "MS Shell Dlg"
BEGIN
ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
- LTEXT "Die Spracheinstellungen des Systems sollten mit der Sprache der Anwendungen, die Sie nutzen wollen übereinstimmen. Die Nutzereinstellungen geben vor, wie Zahlen, Währungen und Datumsangaben dargestellt werden.", IDC_STATIC, 53, 6, 253, 30
+ LTEXT "Die Spracheinstellungen des Systems sollten mit der Sprache der Anwendungen übereinstimmen, die Sie nutzen wollen. Die Nutzereinstellungen geben vor, wie Zahlen, Währungen und Datumsangaben dargestellt werden.", IDC_STATIC, 53, 6, 253, 30
LTEXT "%s", IDC_LOCALETEXT, 53, 34, 250, 16
LTEXT "Klicken Sie auf Einstellen, um die regionalen Einstellungen zu ändern.", IDC_STATIC, 53, 57, 188, 16
PUSHBUTTON "&Einstellen...", IDC_CUSTOMLOCALE, 245, 57, 50, 14
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9762ef948094394987a6c…
commit 9762ef948094394987a6cf7594e85847c24cceb6
Author: Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Sat Dec 3 15:00:28 2022 +0200
Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Tue Dec 13 07:18:24 2022 +0100
[WIN32K] Workaround for broken/retarded (on non-x86) FLOATOBJ_GetFloat
The official definition in winddi.h always returns the result in an ULONG. This works to assign to a FLOATL on x86, which is also an ULONG, but it doesn't work on any other architecture, where FLOATL is actually a FLOAT, so the assignment would convert the ULONG encoding of the FLOAT to an actual float, which gives broken results. Work around this by simply replacing the definition with a sane one in win32k.
---
win32ss/pch.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/win32ss/pch.h b/win32ss/pch.h
index 60bdb37a8d6..31bf7246d8b 100644
--- a/win32ss/pch.h
+++ b/win32ss/pch.h
@@ -74,6 +74,12 @@ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
/* SEH support with PSEH */
#include <pseh/pseh2.h>
+/* The native x64 definition of FLOATOBJ_GetFloat in winddi.h is retarded. Use this instead. */
+#ifndef _M_IX86
+#undef FLOATOBJ_GetFloat
+#define FLOATOBJ_GetFloat(pf) (*(pf))
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif