https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a551ec537a927c5833591…
commit a551ec537a927c5833591e76cd324f5f74f0de98
Author: Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Fri Jun 1 00:10:42 2018 +0300
Commit: Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Jun 3 20:32:39 2018 +0200
[CREDITS] Update the credits list
---
CREDITS | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/CREDITS b/CREDITS
index dab23a8a55..92da65f894 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,12 +1,15 @@
ReactOS is available thanks to the work of:
+Aleksandar Andrejevic <aandrejevic(a)reactos.org>
Aleksey Bragin <aleksey at reactos org>
Alex Ionescu <alex.ionescu(a)reactos.org>
+Alexander Shaposhnikov <sanchaez(a)reactos.org>
Amine Khaldi <amine.khaldi(a)reactos.org>
Andrew Greenwood <lists(a)silverblade.co.uk>
Andrew Munger <waxdragon(a)gmail.com>
Arindam Das
Art Yerkes <ayerkes(a)speakeasy.net>
+Benedikt Freisen <b.freisen(a)gmx.net>
Boudewijn Dekker (Ariadne)
Brandon Turner <turnerb7(a)msu.edu>
Brian Palmer <brianp(a)sginet.com>
@@ -15,6 +18,7 @@ Casper S. Hornstrup <chorns(a)users.sourceforge.net>
Christoph von Wittich <christoph_vw(a)reactos.org>
Colin Finck <colin(a)reactos.org>
Daniel Reimer <reimer.daniel(a)freenet.de>
+David Quintana <gigaherz(a)gmail.com>
David Welch <welch(a)cwcom.net>
Dmitry Chapyshev <dmitry(a)reactos.org>
Emanuele Aliberti <ea(a)iol.it>
@@ -24,12 +28,14 @@ Filip Navara <xnavara(a)volny.cz>
Frederik Leemans
Ge van Geldorp <ge(a)gse.nl>
Ged Murphy <gedmurphy(a)reactos.org>
+Giannis Adamopoulos <gadamopoulos(a)reactos.org>
Gregor Brunmar <gregor brunmar at home se>
Gregor Schneider <grschneider(a)gmail.com>
Guido de Jong
Gunnar Andre' Dalsnes <hardon(a)online.no>
Hans Kremer
Hartmut Birr <hartmut.birr(a)gmx.de>
+Hermes Belusca-Maito <hermes.belusca-maito(a)reactos.org>
Hernan Ochoa
Herve Poussineau <hpoussin(a)reactos.com>
Iwan Fatahi <i_fatahi(a)hotmail.com>
@@ -39,15 +45,19 @@ Jason Filby <jasonfilby(a)yahoo.com>
Jason Weiler
Jean Michault
Jeffrey Morlan <mrnobo1024(a)yahoo.com>
+Jerome Gardou <jerome.gardou(a)reactos.org>
Jim Noeth
+Joachim Henze <joachim.henze(a)reactos.org>
Johannes Anderwald <johannes.anderwald(a)reactos.org>
Jonathan Wilson <jonwil(a)tpgi.com.au>
Jurgen van Gael <jurgen.vangael(a)student.kuleuven.ac.be>
+Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
KJK::Hyperion <noog(a)libero.it>
Klemens R. Friedl <klemens_friedl(a)gmx.net>
Lauri Ojansivu <x(a)xet7.org>
Maarten Bosma <maarten.paul(a)bosma.de>
Magnus Olsen <magnus(a)greatlord.com>
+Mark Jansen <mark.jansen(a)reactos.org>
Mark Tempel <mtempel(a)visi.com>
Mark Weaver <mark(a)npsl.co.uk>
Martin Fuchs <martin-fuchs(a)gmx.net>
@@ -58,6 +68,7 @@ Mike Nordell <"tamlin">
Nathan Woods <npwoods(a)mess.org>
Pablo Borobia <pborobia(a)gmail.com>
Paolo Pantaleo <paolopan(a)freemail.it>
+Peter Hater <7element(a)mail.bg>
Peter Ward <dralnix(a)gmail.com>
Pierre Schweitzer <pschweitzer(a)reactos.org>
Phillip Susi <phreak(a)iag.net>
@@ -69,10 +80,13 @@ Robert Dickenson <robd(a)reactos.org>
Royce Mitchell III <royce3(a)ev1.net>
Samuel Serapi�n <samdwise51(a)gmail.com>
Saveliy Tretiakov <saveliyt(a)mail.ru>
+Stanislav Motylkov <x86corez(a)gmail.com>
Stefan Ginsberg <stefan.ginsberg(a)reactos.org>
Steven Edwards <winehacker(a)gmail.com>
+Thomas Faber <thomas.faber(a)reactos.org>
Thomas Weidenmueller <w3seek(a)users.sourceforge.net>
Timo Kreuzer <timo.kreuzer(a)reactos.org>
+Vadim Galyant <vgal(a)rambler.ru>
Victor Kirhenshtein <sauros(a)iname.com>
Vizzini <vizzini(a)plasmic.com>
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c151c9977bd537560278…
commit 1c151c9977bd537560278cbe88d1a368aeef680d
Author: Joachim Henze <Joachim.Henze(a)reactos.org>
AuthorDate: Sun Jun 3 14:27:34 2018 +0200
Commit: Joachim Henze <Joachim.Henze(a)reactos.org>
CommitDate: Sun Jun 3 14:27:34 2018 +0200
[COMCTL32] Simplify some ifdefs CORE-14649
Addendum to 16d6c9b5e05ffd7a0fff29531f69e18b010124c0
Giannis suggested and Thomas explained:
Before the Wine sync, comctl32/button.c was based on ROS's
user32/button.c, so _USER32_ would highlight changes between
user32 (originally based on Wine) and comctl32. Now our
comctl32/button.c is based on Wine's comctl32/button.c, so
__REACTOS__ is enough.
---
dll/win32/comctl32/button.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c
index 514d5a7785..b6c4f4e654 100644
--- a/dll/win32/comctl32/button.c
+++ b/dll/win32/comctl32/button.c
@@ -1177,7 +1177,7 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc)
UINT dtStyle = BUTTON_BStoDT( style, ex_style );
RECT r = *rc;
INT n;
-#if !defined(_USER32_) && defined(__REACTOS__)
+#ifdef __REACTOS__
BOOL bHasIml = BUTTON_DrawIml(hdc, &infoPtr->imlData, &r, TRUE, 0);
#endif
@@ -1229,7 +1229,7 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc)
default:
empty_rect:
-#if !defined(_USER32_) && defined(__REACTOS__)
+#ifdef __REACTOS__
if (bHasIml)
break;
#endif
@@ -1238,7 +1238,7 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc)
return (UINT)-1;
}
-#if !defined(_USER32_) && defined(__REACTOS__)
+#ifdef __REACTOS__
if (bHasIml)
{
if (infoPtr->imlData.uAlign == BUTTON_IMAGELIST_ALIGN_LEFT)
@@ -1322,7 +1322,7 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags,
* I don't have Win31 on hand to verify that, so I leave it as is.
*/
-#if !defined(_USER32_) && defined(__REACTOS__)
+#ifdef __REACTOS__
RECT rcText = *rc;
BUTTON_DrawIml(hdc, &infoPtr->imlData, &rcText, FALSE, 0);
#endif
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea42633bedd02ad9ee64d…
commit ea42633bedd02ad9ee64d39dc5ecc1ae489d7c8a
Author: Joachim Henze <Joachim.Henze(a)reactos.org>
AuthorDate: Sat Jun 2 22:03:03 2018 +0200
Commit: Joachim Henze <Joachim.Henze(a)reactos.org>
CommitDate: Sat Jun 2 22:03:03 2018 +0200
[ZIPFLDR] Fix text-cutoff + improve de-DE CORE-14682
---
dll/shellext/zipfldr/lang/de-DE.rc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dll/shellext/zipfldr/lang/de-DE.rc b/dll/shellext/zipfldr/lang/de-DE.rc
index 8c507b7a62..fc81d02a1c 100644
--- a/dll/shellext/zipfldr/lang/de-DE.rc
+++ b/dll/shellext/zipfldr/lang/de-DE.rc
@@ -27,8 +27,8 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN
LTEXT "Die Dateien wurden in das folgende Verzeichnis extrahiert:",IDC_STATIC,6,12,222,18
LTEXT "Zielverzeichnis",IDC_DESTDIR,6,36,222,8
- CONTROL "Extrahierte Dateien anzeigen",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10
- LTEXT "Abschließen drücken um fortzufahren.",IDC_STATIC,6,84,174,8
+ CONTROL "Extrahierte Dateien anzeigen",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,105,10
+ LTEXT "Klicken Sie auf 'Fertig' um fortzufahren.",IDC_STATIC,6,84,174,8
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56
@@ -61,7 +61,7 @@ BEGIN
IDS_WIZ_DEST_SUBTITLE "Dateien im ZIP-Archiv werden auf den von Ihnen hier angegebenen Pfad extrahiert."
IDS_WIZ_COMPL_TITLE "Extrahieren abgeschlossen"
IDS_WIZ_COMPL_SUBTITLE "Die Dateien des ZIP-Archives wurden extrahiert."
- IDS_WIZ_BROWSE_TITLE "Wählen Sie ein Ziel zum extrahieren der Dateien."
+ IDS_WIZ_BROWSE_TITLE "Wählen Sie ein Ziel zum Extrahieren der Dateien."
IDS_OVERWRITEFILE_TEXT "Dieser Ordner enthält bereits eine Datei '%1'.\nMöchten Sie die existierende Datei ersetzen?"