Ros-diffs March 2008

ros-diffs@reactos.org

22 participants
269 discussions

[dreimer] 32738: Small fix for Polish Resource File of USetup.
by dreimer＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: dreimer Date: Fri Mar 21 17:15:29 2008 New Revision: 32738 URL: http://svn.reactos.org/svn/reactos?rev=3D32738&view=3Drev Log: Small fix for Polish Resource File of USetup. Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/pl-PL.h?rev=3D32738&r1=3D32737&r2=3D32738&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Fri Mar 21 17:15:29 2008 @@ -363,31 +363,31 @@ TEXT_STYLE_NORMAL }, { - 8, + 24, 11, "Komputer:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { - 8, + 24, 12, "Ekran:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { - 8, + 24, 13, "Klawiatura:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { - 8, + 24, 14, "Uk=C2=88. klawiatury:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { - 8, + 24, 16, "Zapisz:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT

1 0

[dreimer] 32737: Update Polish and German Resources of USetup. Now working according to recent chnages. Polish Update by Olaf Siejka.
by dreimer＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: dreimer Date: Fri Mar 21 16:11:09 2008 New Revision: 32737 URL: http://svn.reactos.org/svn/reactos?rev=3D32737&view=3Drev Log: Update Polish and German Resources of USetup. Now working according to rece= nt chnages. Polish Update by Olaf Siejka. Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/pl-PL.h Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/de-DE.h?rev=3D32737&r1=3D32736&r2=3D32737&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Fri Mar 21 16:11:09 2008 @@ -36,8 +36,8 @@ { 0, 0, - " ENTER =3D Fortsetzen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortsetzen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -112,8 +112,8 @@ { 0, 0, - " ENTER =3D Fortsetzen R =3D Reparieren F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortsetzen R =3D Reparieren F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -125,12 +125,6 @@ = static MUI_ENTRY deDEIntroPageEntries[] =3D { - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, { 4, 3, @@ -212,8 +206,8 @@ { 0, 0, - " ENTER =3D Fortsetzen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortsetzen F3 =3D Beenden", + TEXT_TYPE_STATUS| TEXT_PADDING_BIG }, { 0, @@ -336,8 +330,8 @@ { 0, 0, - " ENTER =3D Zur=C2=81ck", - TEXT_TYPE_STATUS + "ENTER =3D Zur=C2=81ck", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -362,34 +356,34 @@ TEXT_STYLE_NORMAL }, { - 8, + 24, 11, - " Computer:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Computer:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 12, - " Bildschirm:", - TEXT_STYLE_NORMAL, - }, - { - 8, + "Bildschirm:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 13, - " Tastatur:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Tastatur:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 14, " Tastaturlayout:", - TEXT_STYLE_NORMAL - }, - { - 8, + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 16, - " Akzeptieren:", - TEXT_STYLE_NORMAL + "Akzeptieren:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 25, @@ -429,8 +423,8 @@ { 0, 0, - " ENTER =3D Fortsetzen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortsetzen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -493,8 +487,8 @@ { 0, 0, - " ESC =3D Hauptseite ENTER =3D Neustarten", - TEXT_TYPE_STATUS + "ESC =3D Hauptseite ENTER =3D Neustarten", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -544,8 +538,8 @@ { 0, 0, - " ENTER =3D Fortsetzen ESC =3D Abbrechen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortsetzen ESC =3D Abbrechen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -584,8 +578,8 @@ { 0, 0, - " Cache wird geleert", - TEXT_TYPE_STATUS + "Cache wird geleert", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -630,8 +624,8 @@ { 0, 0, - " Bitte warten ...", - TEXT_TYPE_STATUS, + "Bitte warten ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -681,8 +675,8 @@ { 0, 0, - " ENTER =3D Fortsetzen ESC =3D Abbrechen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortsetzen ESC =3D Abbrechen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -727,8 +721,8 @@ { 0, 0, - " ENTER =3D Computer neustarten", - TEXT_TYPE_STATUS + "ENTER =3D Computer neustarten", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -773,8 +767,8 @@ { 0, 0, - " ENTER =3D Fortsetzen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortsetzen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -832,8 +826,8 @@ { 0, 0, - " Bitte warten...", - TEXT_TYPE_STATUS + "Bitte warten...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -872,8 +866,8 @@ { 0, 0, - " ENTER =3D Fortfahren F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortfahren F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -918,8 +912,8 @@ { 0, 0, - " ENTER =3D Fortfahren F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortfahren F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -938,27 +932,27 @@ TEXT_STYLE_UNDERLINE }, { - 11, + 0, 12, "Bitte warten Sie w=C2=84hrend ReactOS Setup die ReactOS Dateien", - TEXT_STYLE_NORMAL - }, - { - 11, + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, 13, "in das Installationsverzeichnis kopiert.", - TEXT_STYLE_NORMAL - }, - { - 11, + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, 14, "Dieser Vorgang kann mehrere Minuten in Anspruch nehmen.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " \xB3 B= itte warten... ", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 50, + 0, + "\xB3 Bitte warten... ", TEXT_TYPE_STATUS }, { @@ -1004,8 +998,8 @@ { 0, 0, - " ENTER =3D Fortfahren F3 =3D Abbrechen", - TEXT_TYPE_STATUS + "ENTER =3D Fortfahren F3 =3D Abbrechen", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1056,8 +1050,8 @@ { 0, 0, - " ENTER =3D Fortfahren ESC =3D Abbrechen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortfahren ESC =3D Abbrechen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1108,8 +1102,8 @@ { 0, 0, - " ENTER =3D Fortfahren ESC =3D Abbrechen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortfahren ESC =3D Abbrechen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1137,8 +1131,8 @@ { 0, 0, - " Erstelle Liste der zu kopierenden Dateien...", - TEXT_TYPE_STATUS + "Erstelle Liste der zu kopierenden Dateien...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1184,8 +1178,8 @@ { 0, 0, - " ENTER =3D Fortfahren ESC =3D Abbrechen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortfahren ESC =3D Abbrechen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, = { @@ -1231,8 +1225,8 @@ { 0, 0, - " D =3D L=C2=94sche Partition ESC =3D Abbrechen F3 =3D Beend= en", - TEXT_TYPE_STATUS + "D =3D L=C2=94sche Partition ESC =3D Abbrechen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1259,8 +1253,8 @@ { 0, 0, - " Registry Hives erstellen...", - TEXT_TYPE_STATUS + "Registry Hives erstellen...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/pl-PL.h?rev=3D32737&r1=3D32736&r2=3D32737&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Fri Mar 21 16:11:09 2008 @@ -5,7 +5,6 @@ * IRC: irc.freenode.net #reactos-pl; */ = - #ifndef LANG_PL_PL_H__ #define LANG_PL_PL_H__ = @@ -44,8 +43,8 @@ { 0, 0, - " ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -120,8 +119,8 @@ { 0, 0, - " ENTER =3D Kontynuacja R =3D Naprawa F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja R =3D Naprawa F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -214,8 +213,8 @@ { 0, 0, - " ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS| TEXT_PADDING_BIG }, { 0, @@ -338,8 +337,8 @@ { 0, 0, - " ENTER =3D Powr=C2=A2t", - TEXT_TYPE_STATUS + "ENTER =3D Powr=C2=A2t", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -366,32 +365,32 @@ { 8, 11, - " Komputer:", - TEXT_STYLE_NORMAL + "Komputer:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 8, 12, - " Ekran:", - TEXT_STYLE_NORMAL, + "Ekran:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 8, 13, - " Klawiatura:", - TEXT_STYLE_NORMAL + "Klawiatura:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 8, 14, "Uk=C2=88. klawiatury:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 8, 16, - " Zapisz:", - TEXT_STYLE_NORMAL + "Zapisz:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 25, @@ -431,8 +430,8 @@ { 0, 0, - " ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -495,8 +494,8 @@ { 0, 0, - " ESC =3D Menu g=C2=88=C2=A2wne ENTER =3D Restart", - TEXT_TYPE_STATUS + "ESC =3D Menu g=C2=88=C2=A2wne ENTER =3D Restart", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -546,8 +545,8 @@ { 0, 0, - " ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98c= ie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -586,8 +585,8 @@ { 0, 0, - " Czyszczenie pami=C2=A9ci Cache", - TEXT_TYPE_STATUS + "Czyszczenie pami=C2=A9ci Cache", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -632,8 +631,8 @@ { 0, 0, - " Prosz=C2=A9 czeka=C2=86 ...", - TEXT_TYPE_STATUS, + "Prosz=C2=A9 czeka=C2=86 ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { 0, @@ -683,8 +682,8 @@ { 0, 0, - " ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98c= ie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -729,8 +728,8 @@ { 0, 0, - " ENTER =3D Restart komputera", - TEXT_TYPE_STATUS + "ENTER =3D Restart komputera", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -775,8 +774,8 @@ { 0, 0, - " ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -834,8 +833,8 @@ { 0, 0, - " Prosz=C2=A9 czeka=C2=86...", - TEXT_TYPE_STATUS + "Prosz=C2=A9 czeka=C2=86...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -868,8 +867,8 @@ { 0, 0, - " ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -920,8 +919,8 @@ { 0, 0, - " ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -943,24 +942,24 @@ 11, 12, "Prosz=C2=A9 czeka=C2=86, Instalator ReactOS kopiuje pliki do wybr= anego", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 30, 13, "katalogu.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 20, 14, "To mo=C2=BEe zaj=C2=A5=C2=86 kilka minut.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " \xB3 P= rosz=C2=A9 czeka=C2=86... ", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 50, + 0, + "\xB3 Please wait... ", TEXT_TYPE_STATUS }, { @@ -1006,8 +1005,8 @@ { 0, 0, - " ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1058,8 +1057,8 @@ { 0, 0, - " ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98c= ie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1110,8 +1109,8 @@ { 0, 0, - " ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98c= ie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1133,14 +1132,14 @@ { 6, 8, - "Instalator tw=C2=A2j komputer do skopiowania plik=C2=A2w systemu= . ", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " Tworzenie listy plik=C2=A2w do skopiowania...", - TEXT_TYPE_STATUS + "Instalator przygotuje tw=C2=A2j komputer do skopiowania plik=C2= =A2w systemu. ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Tworzenie listy plik=C2=A2w do skopiowania...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1186,8 +1185,8 @@ { 0, 0, - " ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98c= ie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, = { @@ -1233,8 +1232,8 @@ { 0, 0, - " D =3D Skasowanie partycji ESC =3D Anulowanie F3 =3D Wyj=C2= =98cie", - TEXT_TYPE_STATUS + "D =3D Skasowanie partycji ESC =3D Anulowanie F3 =3D Wyj=C2=98= cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1261,8 +1260,8 @@ { 0, 0, - " Tworzenie ga=C2=88=C2=A9zi rejestru...", - TEXT_TYPE_STATUS + "Tworzenie ga=C2=88=C2=A9zi rejestru...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0,

1 0

[hpoussin] 32736: Revert part of r32735 ; we can't use C preprocessor on .spec files, because comments also start with '#'
by hpoussin＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: hpoussin Date: Fri Mar 21 06:54:27 2008 New Revision: 32736 URL: http://svn.reactos.org/svn/reactos?rev=3D32736&view=3Drev Log: Revert part of r32735 ; we can't use C preprocessor on .spec files, because= comments also start with '#' Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32736&r1=3D32735&r2=3D32736&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Mar 21 0= 6:54:27 2008 @@ -1284,11 +1284,9 @@ "\t$(ECHO_WMC)\n" "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SE= P)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)= $(SEP)$(source_name_noext).rc $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext= ).h", NULL ); -Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERME= DIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" +Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERME= DIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" - "\t${gcc} -xc -E ${$(module_name)_RCFLAGS} $(source) = > $(TEMPORARY)$(SEP)$(module_name).spec.tmp\n" - "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E= $(TEMPORARY)$(SEP)$(module_name).spec.tmp\n" - "\t-@${rm} $(TEMPORARY)$(SEP)$(module_name).spec.tmp = 2>$(NUL)\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E= $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_na= me_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUIL= D_TARGET)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $= (source_path)$(SEP)$(source_name_noext).spec\n"

1 0

[hpoussin] 32735: Add preprocessor support for .spec files (exports can be different between architectures) MingwModuleHandler::GetDefinitionFilename() can return NULL if no <importlibrary> tag exist
by hpoussin＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: hpoussin Date: Fri Mar 21 04:28:42 2008 New Revision: 32735 URL: http://svn.reactos.org/svn/reactos?rev=3D32735&view=3Drev Log: Add preprocessor support for .spec files (exports can be different between = architectures) MingwModuleHandler::GetDefinitionFilename() can return NULL if no <importli= brary> tag exist Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32735&r1=3D32734&r2=3D32735&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Mar 21 0= 4:28:42 2008 @@ -1284,9 +1284,11 @@ "\t$(ECHO_WMC)\n" "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SE= P)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)= $(SEP)$(source_name_noext).rc $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext= ).h", NULL ); -Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERME= DIATE)$(SEP)$(source_dir)\n" +Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERME= DIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" "\t$(ECHO_WINEBLD)\n" - "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E= $(source_path)$(SEP)$(source_name_noext).spec\n" + "\t${gcc} -xc -E ${$(module_name)_RCFLAGS} $(source) = > $(TEMPORARY)$(SEP)$(module_name).spec.tmp\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E= $(TEMPORARY)$(SEP)$(module_name).spec.tmp\n" + "\t-@${rm} $(TEMPORARY)$(SEP)$(module_name).spec.tmp = 2>$(NUL)\n" "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_na= me_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUIL= D_TARGET)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $= (source_path)$(SEP)$(source_name_noext).spec\n" @@ -1672,7 +1674,7 @@ fprintf ( fMakefile, "%s: %s %s $(RSYM_TARGET) $(PEFIXUP_TARGET) | %s\n", target_macro.c_str (), - backend->GetFullName ( *definitionFilename ).c_str (), + definitionFilename ? backend->GetFullName ( *definitionFilename ).c_str = () : "", dependencies.c_str (), target_folder.c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); @@ -1700,7 +1702,7 @@ fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-exp %s%s%s\n", targetName.c_str (), - backend->GetFullName ( *definitionFilename ).c_str (), + definitionFilename ? backend->GetFullName ( *definitionFilenam= e ).c_str () : "", backend->GetFullName ( temp_exp ).c_str (), module.mangledSymbols ? "" : " --kill-at", module.underscoreSymbols ? " --add-underscore" : "" ); @@ -1750,7 +1752,8 @@ GenerateRunStripCode (); GenerateCleanObjectsAsYouGoCode (); = - delete definitionFilename; + if ( definitionFilename ) + delete definitionFilename; delete target_file; } = @@ -1856,22 +1859,22 @@ MingwModuleHandler::GenerateArchiveTarget () { const FileLocation *archiveFilename =3D GetModuleArchiveFilename (); + const FileLocation *definitionFilename =3D GetDefinitionFilename (); = arRule1.Execute ( fMakefile, backend, module, archiveFilename, clean_file= s ); = - if ( IsStaticLibrary ( module ) && module.importLibrary ) - { - const FileLocation *definitionFilename =3D GetDefinitionFilename (); - + if ( IsStaticLibrary ( module ) && definitionFilename ) + { fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-lib $@%s%s\n", module.importLibrary->dllname.c_str (), backend->GetFullName ( *definitionFilename ).c_str (), module.mangledSymbols ? "" : " --kill-at", module.underscoreSymbols ? " --add-underscore" : "" ); - + } + + if ( definitionFilename ) delete definitionFilename; - } = if(module.type =3D=3D HostStaticLibrary) arHostRule2.Execute ( fMakefile, backend, module, archiveFilename, clean= _files ); @@ -2357,20 +2360,18 @@ const FileLocation* MingwModuleHandler::GetDefinitionFilename () const { - if ( module.importLibrary !=3D NULL ) - { - DirectoryLocation directory; - if ( IsWineModule () ) - directory =3D IntermediateDirectory; - else - directory =3D SourceDirectory; - - return new FileLocation ( directory, - module.importLibrary->source->relative_path, - module.importLibrary->source->name ); - } + if ( module.importLibrary =3D=3D NULL ) + return NULL; + + DirectoryLocation directory; + if ( IsWineModule () ) + directory =3D IntermediateDirectory; else - return new FileLocation ( SourceDirectory, "tools" + sSep + "rbuild", "e= mpty.def" ); + directory =3D SourceDirectory; + + return new FileLocation ( directory, + module.importLibrary->source->relative_path, + module.importLibrary->source->name ); } = void @@ -2380,15 +2381,21 @@ { const FileLocation *library_target =3D GetImportLibraryFilename ( module= , &clean_files ); const FileLocation *defFilename =3D GetDefinitionFilename (); + string empty =3D "tools" + sSep + "rbuild" + sSep + "empty.def"; = vector<FileLocation> deps; GetDefinitionDependencies ( deps ); = fprintf ( fMakefile, "# IMPORT LIBRARY RULE:\n" ); = - fprintf ( fMakefile, "%s: %s", - backend->GetFullName ( *library_target ).c_str (), - backend->GetFullName ( *defFilename ).c_str () ); + fprintf ( fMakefile, "%s:", + backend->GetFullName ( *library_target ).c_str () ); + + if ( defFilename ) + { + fprintf ( fMakefile, " %s", + backend->GetFullName ( *defFilename ).c_str () ); + } = size_t i, iend =3D deps.size(); for ( i =3D 0; i < iend; i++ ) @@ -2403,12 +2410,14 @@ fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-lib %s%s%s\n\n", module.output->name.c_str (), - backend->GetFullName ( *defFilename ).c_str (), + defFilename ? backend->GetFullName ( *defFilename ).c_str () + : empty.c_str (), backend->GetFullName ( *library_target ).c_str (), module.mangledSymbols ? "" : " --kill-at", module.underscoreSymbols ? " --add-underscore" : "" ); = - delete defFilename; + if ( defFilename ) + delete defFilename; delete library_target; } }

1 0

[hpoussin] 32734: Fix warnings
by hpoussin＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: hpoussin Date: Fri Mar 21 04:25:17 2008 New Revision: 32734 URL: http://svn.reactos.org/svn/reactos?rev=3D32734&view=3Drev Log: Fix warnings Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.spec trunk/reactos/base/applications/screensavers/logon/logon.spec Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/3dtext/3dtext.spec?rev=3D32734&r1=3D32733&r2=3D32734&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.spec (origin= al) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.spec Fri Mar= 21 04:25:17 2008 @@ -1,2 +1,2 @@ @ stdcall ScreenSaverProc(ptr long ptr ptr) -@ stdcall ScreenSaverConfigureDialog(ptr long ptr ptr) +@ stdcall ScreenSaverConfigureDialog(ptr long ptr ptr) Modified: trunk/reactos/base/applications/screensavers/logon/logon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/logon/logon.spec?rev=3D32734&r1=3D32733&r2=3D32734&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/applications/screensavers/logon/logon.spec (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.spec Fri Mar 2= 1 04:25:17 2008 @@ -1,2 +1,2 @@ @ stdcall ScreenSaverProc(ptr long ptr ptr) -@ stdcall ScreenSaverConfigureDialog(ptr long ptr ptr) +@ stdcall ScreenSaverConfigureDialog(ptr long ptr ptr)

1 0

[jimtabor] 32733: Finish Stefan Ginsberg patch from rev 32726.
by jimtabor＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: jimtabor Date: Fri Mar 21 01:55:43 2008 New Revision: 32733 URL: http://svn.reactos.org/svn/reactos?rev=3D32733&view=3Drev Log: Finish Stefan Ginsberg patch from rev 32726. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntuser.h?rev=3D32733&r1=3D32732&r2=3D32733&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Fri Mar 21 01:55:43 2008 @@ -2370,11 +2370,6 @@ * ReactOS-specific NtUser calls and their related structures, both which= shouldn't exist. */ = -NTSTATUS -NTAPI -NtUserAcquireOrReleaseInputOwnership( - BOOLEAN Release); - DWORD NTAPI NtUserBuildMenuItemList( @@ -2642,17 +2637,6 @@ PNTUSERSENDMESSAGEINFO Info); = /* use NtUserMessageCall */ -BOOL -NTAPI -NtUserSendMessageCallback( - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - SENDASYNCPROC lpCallBack, - ULONG_PTR dwData); - -/* use NtUserMessageCall */ LRESULT NTAPI NtUserSendMessageTimeout(HWND hWnd, UINT Msg,

1 0

[jimtabor] 32732: Sorry Timo! I think I forgot to remove these months ago.
by jimtabor＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: jimtabor Date: Fri Mar 21 00:42:48 2008 New Revision: 32732 URL: http://svn.reactos.org/svn/reactos?rev=3D32732&view=3Drev Log: Sorry Timo! I think I forgot to remove these months ago. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntuser.h?rev=3D32732&r1=3D32731&r2=3D32732&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Fri Mar 21 00:42:48 2008 @@ -589,10 +589,7 @@ #define TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS 0x62 #define TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW 0x63 = -#define TWOPARAM_ROUTINE_SETDCPENCOLOR 0xfffd0045 /* Private ROS */ -#define TWOPARAM_ROUTINE_SETDCBRUSHCOLOR 0xfffd0046 -#define TWOPARAM_ROUTINE_GETDCCOLOR 0xfffd0047 -#define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 +#define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 /* Private ROS */ #define TWOPARAM_ROUTINE_GETWINDOWRGN 0xfffd0049 #define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050 #define TWOPARAM_ROUTINE_SETMENUITEMRECT 0xfffd0051 @@ -2373,25 +2370,6 @@ * ReactOS-specific NtUser calls and their related structures, both which= shouldn't exist. */ = -/* The following macros don't belong to ntuser, but are part of gdi */ - -/* Should be done in usermode */ -#define NtUserGetDCBrushColor(hbr) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_G= ETDCCOLOR) - -/* Should be done in usermode */ -#define NtUserGetDCPenColor(hbr) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_PEN, TWOPARAM_ROUTINE_GET= DCCOLOR) - -/* Should be done in usermode */ -#define NtUserSetDCBrushColor(hbr, crColor) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUT= INE_SETDCBRUSHCOLOR) - -/* Should be done in usermode */ -#define NtUserSetDCPenColor(hbr, crColor) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUT= INE_SETDCPENCOLOR) - - NTSTATUS NTAPI NtUserAcquireOrReleaseInputOwnership(

1 0

[tkreuzer] 32731: remove a reference to GDIOBJ_AllocObjDepricated
by tkreuzer＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: tkreuzer Date: Thu Mar 20 19:19:50 2008 New Revision: 32731 URL: http://svn.reactos.org/svn/reactos?rev=3D32731&view=3Drev Log: remove a reference to GDIOBJ_AllocObjDepricated Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/metafile.c?rev=3D32731&r1=3D32730&r2=3D32731&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/metafile.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/metafile.c Thu Mar 20 19:= 19:50 2008 @@ -230,23 +230,20 @@ NtClose( Dc->hFile ); } = - hmf =3D GDIOBJ_AllocObjDepricated(GdiHandleTable, GDI_OBJECT_TYPE_ENHMET= AFILE); - if (hmf !=3D NULL) + phmf =3D GDIOBJ_AllocObjWithHandle(GdiHandleTable, GDI_OBJECT_TYPE_ENHME= TAFILE); + if (phmf !=3D NULL) { - phmf =3D GDIOBJ_LockObj(GdiHandleTable, hmf, GDI_OBJECT_TYPE_ENHMETAF= ILE); - if (phmf !=3D NULL) - { - if (Dc->hFile !=3D NULL) - { - phmf->on_disk =3D TRUE; - } - else - { - phmf->on_disk =3D FALSE; - } - GDIOBJ_UnlockObjByPtr(GdiHandleTable, phmf); - phmf->emh =3D Dc->emh; - } + hmf =3D phmf->BaseObject.hHmgr; + if (Dc->hFile !=3D NULL) + { + phmf->on_disk =3D TRUE; + } + else + { + phmf->on_disk =3D FALSE; + } + phmf->emh =3D Dc->emh; + GDIOBJ_UnlockObjByPtr(GdiHandleTable, phmf); } = Dc->emh =3D NULL; /* So it won't be deleted */

1 0

[tkreuzer] 32730: ntuser/misc.c was huge, split it into sysparams.c, simplecall.c and misc.c
by tkreuzer＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: tkreuzer Date: Thu Mar 20 19:07:06 2008 New Revision: 32730 URL: http://svn.reactos.org/svn/reactos?rev=3D32730&view=3Drev Log: ntuser/misc.c was huge, split it into sysparams.c, simplecall.c and misc.c Added: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c - copied, changed from r32724, trunk/reactos/subsystems/win32/win32k/= ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c - copied, changed from r32724, trunk/reactos/subsystems/win32/win32k/= ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/misc.c?rev=3D32730&r1=3D32729&r2=3D32730&view=3Ddiff Copied: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c (from r32= 724, trunk/reactos/subsystems/win32/win32k/ntuser/misc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/simplecall.c?p2=3Dtrunk/reactos/subsystems/win32/win32k/ntuser/si= mplecall.c&p1=3Dtrunk/reactos/subsystems/win32/win32k/ntuser/misc.c&r1=3D32= 724&r2=3D32730&rev=3D32730&view=3Ddiff Copied: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c (from r327= 24, trunk/reactos/subsystems/win32/win32k/ntuser/misc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/sysparams.c?p2=3Dtrunk/reactos/subsystems/win32/win32k/ntuser/sys= params.c&p1=3Dtrunk/reactos/subsystems/win32/win32k/ntuser/misc.c&r1=3D3272= 4&r2=3D32730&rev=3D32730&view=3Ddiff Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/win32k.rbuild?rev=3D32730&r1=3D32729&r2=3D32730&view=3Ddiff

1 0

[tkreuzer] 32729: - started fixing NtUserCallXxx defines - moved bad NtUserXxx macros to bottom - added some comments to ntuser bad stuff
by tkreuzer＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: tkreuzer Date: Thu Mar 20 19:01:33 2008 New Revision: 32729 URL: http://svn.reactos.org/svn/reactos?rev=3D32729&view=3Drev Log: - started fixing NtUserCallXxx defines - moved bad NtUserXxx macros to bottom - added some comments to ntuser bad stuff Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntuser.h?rev=3D32729&r1=3D32728&r2=3D32729&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Thu Mar 20 19:01:33 2008 @@ -506,7 +506,7 @@ HWND NTAPI NtUserCallHwndOpt( - HWND Param, + HWND hWnd, DWORD Routine); = DWORD @@ -539,11 +539,14 @@ = #define NOPARAM_ROUTINE_CREATEMENU 0x0 #define NOPARAM_ROUTINE_CREATEMENUPOPUP 0x1 +//#define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0x2 #define NOPARAM_ROUTINE_MSQCLEARWAKEMASK 0x3 +//#define ONEPARAM_ROUTINE_ALLOWFOREGNDACTIVATION 0x04 +#define NOPARAM_ROUTINE_DESTROY_CARET 0x5 +#define NOPARAM_ROUTINE_INIT_MESSAGE_PUMP 0x1b +#define NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP 0x1c + #define NOPARAM_ROUTINE_REGISTER_PRIMITIVE 0xffff0001 /* Private ROS */ -#define NOPARAM_ROUTINE_DESTROY_CARET 0xffff0002 -#define NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP 0xffff0003 -#define NOPARAM_ROUTINE_INIT_MESSAGE_PUMP 0xffff0004 #define NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO 0xffff0005 #define NOPARAM_ROUTINE_ANYPOPUP 0xffff0006 #define NOPARAM_ROUTINE_CSRSS_INITIALIZED 0xffff0007 @@ -552,61 +555,62 @@ NtUserCallNoParam( DWORD Routine); = -#define ONEPARAM_ROUTINE_GETMENU 0x01 -#define ONEPARAM_ROUTINE_ISWINDOWUNICODE 0x02 -#define ONEPARAM_ROUTINE_WINDOWFROMDC 0x03 -#define ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID 0x04 -#define ONEPARAM_ROUTINE_SWAPMOUSEBUTTON 0x05 -#define ONEPARAM_ROUTINE_SETCARETBLINKTIME 0x06 -#define ONEPARAM_ROUTINE_GETCARETINFO 0x07 -#define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0x08 -#define ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS 0x09 -#define ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO 0x0a -#define ONEPARAM_ROUTINE_GETCURSORPOSITION 0x0b -#define ONEPARAM_ROUTINE_ISWINDOWINDESTROY 0x0c -#define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0x0d -#define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0x0e -#define ONEPARAM_ROUTINE_GETWINDOWINSTANCE 0x10 -#define ONEPARAM_ROUTINE_CREATECURICONHANDLE 0x25 -#define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0x27 -#define ONEPARAM_ROUTINE_GETKEYBOARDTYPE 0x28 -#define ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT 0x29 -#define ONEPARAM_ROUTINE_SHOWCURSOR 0x30 -#define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0x31 +#define ONEPARAM_ROUTINE_WINDOWFROMDC 0x1f +#define ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS 0x25 +#define ONEPARAM_ROUTINE_GETCURSORPOSITION 0x26 +#define ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT 0x28 +#define ONEPARAM_ROUTINE_GETKEYBOARDTYPE 0x29 #define ONEPARAM_ROUTINE_REALIZEPALETTE 0x35 #define ONEPARAM_ROUTINE_RELEASEDC 0x39 +#define ONEPARAM_ROUTINE_SETCARETBLINKTIME 0x3b +#define ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO 0x3e +#define ONEPARAM_ROUTINE_SHOWCURSOR 0x40 +#define ONEPARAM_ROUTINE_SWAPMOUSEBUTTON 0x42 +#define ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID 0x47 + +#define ONEPARAM_ROUTINE_GETMENU 0xfffe0001 /* Private ROS */ +#define ONEPARAM_ROUTINE_ISWINDOWUNICODE 0xfffe0002 +#define ONEPARAM_ROUTINE_GETCARETINFO 0xfffe0007 +#define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0xfffe0008 +#define ONEPARAM_ROUTINE_ISWINDOWINDESTROY 0xfffe000c +#define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d +#define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0xfffe000e +#define ONEPARAM_ROUTINE_GETWINDOWINSTANCE 0xfffe0010 +#define ONEPARAM_ROUTINE_CREATECURICONHANDLE 0xfffe0025 +#define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0xfffe0027 +#define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0xfffe0031 DWORD NTAPI NtUserCallOneParam( DWORD Param, DWORD Routine); = -#define TWOPARAM_ROUTINE_SETDCPENCOLOR 0x45 -#define TWOPARAM_ROUTINE_SETDCBRUSHCOLOR 0x46 -#define TWOPARAM_ROUTINE_GETDCCOLOR 0x47 -#define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0x48 -#define TWOPARAM_ROUTINE_GETWINDOWRGN 0x49 -#define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0x50 -#define TWOPARAM_ROUTINE_SETMENUITEMRECT 0x51 -#define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0x52 +#define TWOPARAM_ROUTINE_ENABLEWINDOW 0x60 +#define TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS 0x62 +#define TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW 0x63 + +#define TWOPARAM_ROUTINE_SETDCPENCOLOR 0xfffd0045 /* Private ROS */ +#define TWOPARAM_ROUTINE_SETDCBRUSHCOLOR 0xfffd0046 +#define TWOPARAM_ROUTINE_GETDCCOLOR 0xfffd0047 +#define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 +#define TWOPARAM_ROUTINE_GETWINDOWRGN 0xfffd0049 +#define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050 +#define TWOPARAM_ROUTINE_SETMENUITEMRECT 0xfffd0051 +#define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0xfffd0052 #define MSQ_STATE_CAPTURE 0x1 #define MSQ_STATE_ACTIVE 0x2 #define MSQ_STATE_FOCUS 0x3 #define MSQ_STATE_MENUOWNER 0x4 #define MSQ_STATE_MOVESIZE 0x5 #define MSQ_STATE_CARET 0x6 -#define TWOPARAM_ROUTINE_ENABLEWINDOW 0x53 -#define TWOPARAM_ROUTINE_UNKNOWN 0x54 -#define TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS 0x55 -#define TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW 0x56 -#define TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID 0x58 -#define TWOPARAM_ROUTINE_SETCARETPOS 0x60 -#define TWOPARAM_ROUTINE_GETWINDOWINFO 0x61 -#define TWOPARAM_ROUTINE_REGISTERLOGONPROC 0x62 -#define TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES 0x63 -#define TWOPARAM_ROUTINE_GETSYSCOLORPENS 0x64 -#define TWOPARAM_ROUTINE_GETSYSCOLORS 0x65 -#define TWOPARAM_ROUTINE_SETSYSCOLORS 0x66 +#define TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID 0xfffd0058 +#define TWOPARAM_ROUTINE_SETCARETPOS 0xfffd0060 +#define TWOPARAM_ROUTINE_GETWINDOWINFO 0xfffd0061 +#define TWOPARAM_ROUTINE_REGISTERLOGONPROC 0xfffd0062 +#define TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES 0xfffd0063 +#define TWOPARAM_ROUTINE_GETSYSCOLORPENS 0xfffd0064 +#define TWOPARAM_ROUTINE_GETSYSCOLORS 0xfffd0065 +#define TWOPARAM_ROUTINE_SETSYSCOLORS 0xfffd0066 // use NtUserSetSys= Colors #define TWOPARAM_ROUTINE_ROS_SHOWWINDOW 0x1000 #define TWOPARAM_ROUTINE_ROS_ISACTIVEICON 0x1001 #define TWOPARAM_ROUTINE_ROS_NCDESTROY 0x1002 @@ -919,7 +923,7 @@ LPCRECT lprcClip, MONITORENUMPROC lpfnEnum, LPARAM dwData );*/ -/* FIXME: The call below is ros-specific and should be rewritten to use t= he same params as the correct call above. */ = +/* FIXME: The call below is ros-specific and should be rewritten to use t= he same params as the correct call above. */ INT NTAPI NtUserEnumDisplayMonitors( @@ -2338,18 +2342,6 @@ DWORD NTAPI NtUserYieldTask(VOID); - -#define NtUserGetDCBrushColor(hbr) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_G= ETDCCOLOR) - -#define NtUserGetDCPenColor(hbr) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_PEN, TWOPARAM_ROUTINE_GET= DCCOLOR) - -#define NtUserSetDCBrushColor(hbr, crColor) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUT= INE_SETDCBRUSHCOLOR) - -#define NtUserSetDCPenColor(hbr, crColor) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUT= INE_SETDCPENCOLOR) = /* lParam of DDE messages */ typedef struct tagKMDDEEXECUTEDATA @@ -2381,6 +2373,24 @@ * ReactOS-specific NtUser calls and their related structures, both which= shouldn't exist. */ = +/* The following macros don't belong to ntuser, but are part of gdi */ + +/* Should be done in usermode */ +#define NtUserGetDCBrushColor(hbr) \ + (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_G= ETDCCOLOR) + +/* Should be done in usermode */ +#define NtUserGetDCPenColor(hbr) \ + (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_PEN, TWOPARAM_ROUTINE_GET= DCCOLOR) + +/* Should be done in usermode */ +#define NtUserSetDCBrushColor(hbr, crColor) \ + (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUT= INE_SETDCBRUSHCOLOR) + +/* Should be done in usermode */ +#define NtUserSetDCPenColor(hbr, crColor) \ + (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUT= INE_SETDCPENCOLOR) + = NTSTATUS NTAPI @@ -2393,13 +2403,14 @@ HMENU hMenu, PVOID Buffer, ULONG nBufSize, - DWORD Reserved); = - + DWORD Reserved); + +/* Use ONEPARAM_ROUTINE_CREATEEMPTYCURSOROBJECT (0x21) ? */ HANDLE NTAPI NtUserCreateCursorIconHandle( PICONINFO IconInfo, - BOOL Indirect); = + BOOL Indirect); = = typedef struct _WNDPROC_INFO @@ -2412,7 +2423,7 @@ NTAPI NtUserDereferenceWndProcHandle(IN HANDLE wpHandle, OUT PWNDPROC_INFO wpInf= o); = - +/* Use ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS */ UINT NTAPI NtUserEnumClipboardFormats( @@ -2426,14 +2437,17 @@ NTAPI NtUserGetCapture(VOID); = +/* Should be done in usermode */ ULONG_PTR NTAPI NtUserGetClassLong(HWND hWnd, INT Offset, BOOL Ansi); = +/* Should be done in usermode */ BOOL NTAPI NtUserGetClientOrigin(HWND hWnd, LPPOINT Point); = +/* Should be done in usermode */ BOOL NTAPI NtUserGetClientRect(HWND hWnd, LPRECT Rect); @@ -2467,6 +2481,7 @@ IN HMONITOR hMonitor, OUT LPMONITORINFO pMonitorInfo); = +/* Should be done in usermode */ HANDLE NTAPI NtUserGetProp(HWND hWnd, ATOM Atom); @@ -2494,10 +2509,12 @@ NTAPI NtUserGetWindow(HWND hWnd, UINT Relationship); = +/* Should be done in usermode */ LONG NTAPI NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi); = +/* Should be done in usermode */ BOOL NTAPI NtUserGetWindowRect(HWND hWnd, LPRECT Rect); @@ -2638,6 +2655,7 @@ WNDPROC Proc; } NTUSERSENDMESSAGEINFO, *PNTUSERSENDMESSAGEINFO; = +/* use NtUserMessageCall */ LRESULT NTAPI NtUserSendMessage(HWND hWnd, UINT Msg, @@ -2645,6 +2663,7 @@ LPARAM lParam, PNTUSERSENDMESSAGEINFO Info); = +/* use NtUserMessageCall */ BOOL NTAPI NtUserSendMessageCallback( @@ -2655,6 +2674,7 @@ SENDASYNCPROC lpCallBack, ULONG_PTR dwData); = +/* use NtUserMessageCall */ LRESULT NTAPI NtUserSendMessageTimeout(HWND hWnd, UINT Msg, @@ -2665,7 +2685,7 @@ ULONG_PTR *uResult, PNTUSERSENDMESSAGEINFO Info); = - +/* use NtUserMessageCall */ BOOL NTAPI NtUserSendNotifyMessage(

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
27
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2008