Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mpiulachs] 33684: - move platform settings like included build languages to a user configurable rbuild file with fallback to platform.template.rbuild if no one is present.
by mpiulachs＠svn.reactos.org 25 May '08

25 May '08

Author: mpiulachs Date: Sat May 24 19:15:57 2008 New Revision: 33684 URL: http://svn.reactos.org/svn/reactos?rev=33684&view=rev Log: - move platform settings like included build languages to a user configurable rbuild file with fallback to platform.template.rbuild if no one is present. Added: branches/rbuild/reactos/platform.template.rbuild (with props) Modified: branches/rbuild/reactos/ReactOS-generic.rbuild Modified: branches/rbuild/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/ReactOS-generic.… ============================================================================== --- branches/rbuild/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ branches/rbuild/reactos/ReactOS-generic.rbuild [iso-8859-1] Sat May 24 19:15:57 2008 @@ -70,9 +70,9 @@ <xi:include href="subsystems/subsystems.rbuild" /> </directory> -  - <platformlanguage isoname="en-US" /> - <platformlanguage isoname="es-ES" /> - <platformlanguage isoname="de-DE" /> - + <xi:include href="platform.rbuild"> + <xi:fallback> + <xi:include href="platform.template.rbuild" /> + </xi:fallback> + </xi:include> </group> Added: branches/rbuild/reactos/platform.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/platform.templat… ============================================================================== --- branches/rbuild/reactos/platform.template.rbuild (added) +++ branches/rbuild/reactos/platform.template.rbuild [iso-8859-1] Sat May 24 19:15:57 2008 @@ -1,0 +1,22 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> +<group> + + + + +<platformlanguage isoname="en-US" /> +<platformlanguage isoname="es-ES" /> +<platformlanguage isoname="de-DE" /> + + +</group> Propchange: branches/rbuild/reactos/platform.template.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mpiulachs] 33683: - remove obsolete code
by mpiulachs＠svn.reactos.org 24 May '08

24 May '08

Author: mpiulachs Date: Sat May 24 18:53:40 2008 New Revision: 33683 URL: http://svn.reactos.org/svn/reactos?rev=33683&view=rev Log: - remove obsolete code Modified: branches/rbuild/reactos/boot/bootdata/bootdata.rbuild Modified: branches/rbuild/reactos/boot/bootdata/bootdata.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/boot/bootdata/bo… ============================================================================== --- branches/rbuild/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] (original) +++ branches/rbuild/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] Sat May 24 18:53:40 2008 @@ -12,15 +12,6 @@ <bootstrapfile>txtsetup.sif</bootstrapfile> <bootstrapfile>unattend.inf</bootstrapfile> -  - <directory name="bootcd"> <xi:include href="bootcd/bootcd.rbuild" /> </directory>

1 0

[mpiulachs] 33682: - Move module localization resources to an external rbuild file to make it easier to be created/edited by external tools. Our planed web translation frontend could then regenerate the file without editing the main and more complex module rbuild file.
by mpiulachs＠svn.reactos.org 24 May '08

24 May '08

Author: mpiulachs Date: Sat May 24 18:51:53 2008 New Revision: 33682 URL: http://svn.reactos.org/svn/reactos?rev=33682&view=rev Log: - Move module localization resources to an external rbuild file to make it easier to be created/edited by external tools. Our planed web translation frontend could then regenerate the file without editing the main and more complex module rbuild file. Added: branches/rbuild/reactos/dll/cpl/desk/lang/lang.rbuild (with props) Modified: branches/rbuild/reactos/dll/cpl/desk/desk.rbuild Modified: branches/rbuild/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/cpl/desk/des… ============================================================================== --- branches/rbuild/reactos/dll/cpl/desk/desk.rbuild [iso-8859-1] (original) +++ branches/rbuild/reactos/dll/cpl/desk/desk.rbuild [iso-8859-1] Sat May 24 18:51:53 2008 @@ -45,22 +45,7 @@ <metadata description="ReactOS Display ControlPanel Applet" /> -  - <localization isoname="bg-BG">lang/bg-BG.rc</localization> - <localization isoname="cs-CZ">lang/cs-CZ.rc</localization> - <localization isoname="de-DE">lang/de-DE.rc</localization> - <localization isoname="el-GR" dirty="true">lang/el-GR.rc</localization> - <localization isoname="en-US">lang/en-US.rc</localization> - <localization isoname="es-ES">lang/es-ES.rc</localization> - <localization isoname="fr-FR">lang/fr-FR.rc</localization> - <localization isoname="hu-HU">lang/hu-HU.rc</localization> - <localization isoname="id-ID">lang/id-ID.rc</localization> - <localization isoname="it-IT">lang/it-IT.rc</localization> - <localization isoname="ja-JP">lang/ja-JP.rc</localization> - <localization isoname="nl-NL">lang/nl-NL.rc</localization> - <localization isoname="pl-PL" dirty="true">lang/pl-PL.rc</localization> - <localization isoname="ru-RU">lang/ru-RU.rc</localization> - <localization isoname="sk-SK">lang/sk-SK.rc</localization> - <localization isoname="sv-SE">lang/sv-SE.rc</localization> - <localization isoname="uk-UA">lang/uk-UA.rc</localization> + <directory name="lang"> + <xi:include href="lang/lang.rbuild" /> + </directory> </module> Added: branches/rbuild/reactos/dll/cpl/desk/lang/lang.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/cpl/desk/lan… ============================================================================== --- branches/rbuild/reactos/dll/cpl/desk/lang/lang.rbuild (added) +++ branches/rbuild/reactos/dll/cpl/desk/lang/lang.rbuild [iso-8859-1] Sat May 24 18:51:53 2008 @@ -1,0 +1,22 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +  + <localization isoname="bg-BG">bg-BG.rc</localization> + <localization isoname="cs-CZ">cs-CZ.rc</localization> + <localization isoname="de-DE">de-DE.rc</localization> + <localization isoname="el-GR" dirty="true">el-GR.rc</localization> + <localization isoname="en-US">en-US.rc</localization> + <localization isoname="es-ES">es-ES.rc</localization> + <localization isoname="fr-FR">fr-FR.rc</localization> + <localization isoname="hu-HU">hu-HU.rc</localization> + <localization isoname="id-ID">id-ID.rc</localization> + <localization isoname="it-IT">it-IT.rc</localization> + <localization isoname="ja-JP">ja-JP.rc</localization> + <localization isoname="nl-NL">nl-NL.rc</localization> + <localization isoname="pl-PL" dirty="true">pl-PL.rc</localization> + <localization isoname="ru-RU">ru-RU.rc</localization> + <localization isoname="sk-SK">sk-SK.rc</localization> + <localization isoname="sv-SE">sv-SE.rc</localization> + <localization isoname="uk-UA">uk-UA.rc</localization> +</group> Propchange: branches/rbuild/reactos/dll/cpl/desk/lang/lang.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 33681: implemeted test for GdiDeleteLocalDC, GdiReleaseLocalDC, GdiSetAttrs tested in xp/vista/reactos and works no fault report.
by greatlrd＠svn.reactos.org 24 May '08

24 May '08

Author: greatlrd Date: Sat May 24 17:42:46 2008 New Revision: 33681 URL: http://svn.reactos.org/svn/reactos?rev=33681&view=rev Log: implemeted test for GdiDeleteLocalDC, GdiReleaseLocalDC, GdiSetAttrs tested in xp/vista/reactos and works no fault report. Added: trunk/rostests/apitests/gdi32api/tests/GdiDeleteLocalDC.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiReleaseLocalDC.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiSetAttrs.c (with props) Modified: trunk/rostests/apitests/gdi32api/gdi.h trunk/rostests/apitests/gdi32api/testlist.c Modified: trunk/rostests/apitests/gdi32api/gdi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/gdi.h?r… ============================================================================== --- trunk/rostests/apitests/gdi32api/gdi.h [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/gdi.h [iso-8859-1] Sat May 24 17:42:46 2008 @@ -208,6 +208,9 @@ HRGN WINAPI GdiConvertRegion(HRGN hregion); HBRUSH WINAPI GdiGetLocalBrush(HBRUSH hbr); HDC WINAPI GdiGetLocalDC(HDC hdc); - - - +BOOL WINAPI GdiDeleteLocalDC(HDC hdc); +BOOL WINAPI GdiReleaseLocalDC(HDC hdc); +BOOL WINAPI GdiSetAttrs(HDC hdc); + + + Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] Sat May 24 17:42:46 2008 @@ -18,8 +18,11 @@ #include "tests/GdiConvertFont.c" #include "tests/GdiConvertPalette.c" #include "tests/GdiConvertRegion.c" +#include "tests/GdiDeleteLocalDC.c" #include "tests/GdiGetLocalBrush.c" #include "tests/GdiGetLocalDC.c" +#include "tests/GdiReleaseLocalDC.c" +#include "tests/GdiSetAttrs.c" #include "tests/GetClipRgn.c" #include "tests/GetCurrentObject.c" #include "tests/GetDIBits.c" @@ -29,6 +32,7 @@ #include "tests/SetDCPenColor.c" #include "tests/SetSysColors.c" #include "tests/SetWorldTransform.c" + @@ -55,8 +59,11 @@ { L"GdiConvertFont", Test_GdiConvertFont }, { L"GdiConvertPalette", Test_GdiConvertPalette }, { L"GdiConvertRegion", Test_GdiConvertRegion }, + { L"GdiDeleteLocalDC", Test_GdiDeleteLocalDC }, { L"GdiGetLocalBrush", Test_GdiGetLocalBrush }, { L"GdiGetLocalDC", Test_GdiGetLocalDC }, + { L"GdiReleaseLocalDC", Test_GdiReleaseLocalDC }, + { L"GdiSetAttrs", Test_GdiSetAttrs }, { L"GetClipRgn", Test_GetClipRgn }, { L"GetCurrentObject", Test_GetCurrentObject }, { L"GetDIBits", Test_GetDIBits }, Added: trunk/rostests/apitests/gdi32api/tests/GdiDeleteLocalDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiDeleteLocalDC.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiDeleteLocalDC.c [iso-8859-1] Sat May 24 17:42:46 2008 @@ -1,0 +1,9 @@ +INT +Test_GdiDeleteLocalDC(PTESTINFO pti) +{ + RTEST(GdiDeleteLocalDC((HDC)-1) == TRUE); + RTEST(GdiDeleteLocalDC((HDC)0) == TRUE); + RTEST(GdiDeleteLocalDC((HDC)1) == TRUE); + RTEST(GdiDeleteLocalDC((HDC)2) == TRUE); + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/GdiDeleteLocalDC.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiReleaseLocalDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiReleaseLocalDC.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiReleaseLocalDC.c [iso-8859-1] Sat May 24 17:42:46 2008 @@ -1,0 +1,9 @@ +INT +Test_GdiReleaseLocalDC(PTESTINFO pti) +{ + RTEST(GdiReleaseLocalDC((HDC)-1) == TRUE); + RTEST(GdiReleaseLocalDC((HDC)0) == TRUE); + RTEST(GdiReleaseLocalDC((HDC)1) == TRUE); + RTEST(GdiReleaseLocalDC((HDC)2) == TRUE); + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/GdiReleaseLocalDC.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiSetAttrs.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiSetAttrs.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiSetAttrs.c [iso-8859-1] Sat May 24 17:42:46 2008 @@ -1,0 +1,9 @@ +INT +Test_GdiSetAttrs(PTESTINFO pti) +{ + RTEST(GdiSetAttrs((HDC)-1) == TRUE); + RTEST(GdiSetAttrs((HDC)0) == TRUE); + RTEST(GdiSetAttrs((HDC)1) == TRUE); + RTEST(GdiSetAttrs((HDC)2) == TRUE); + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/GdiSetAttrs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 33680: implemeted test for GdiConvertBitmap, GdiConvertBrush, GdiConvertDC, GdiConvertFont, GdiConvertPalette, GdiConvertRegion, GdiGetLocalBrush, GdiGetLocalDC tested in xp/vista/reactos and works no fault report.
by greatlrd＠svn.reactos.org 24 May '08

24 May '08

Author: greatlrd Date: Sat May 24 17:20:31 2008 New Revision: 33680 URL: http://svn.reactos.org/svn/reactos?rev=33680&view=rev Log: implemeted test for GdiConvertBitmap, GdiConvertBrush, GdiConvertDC, GdiConvertFont, GdiConvertPalette, GdiConvertRegion, GdiGetLocalBrush, GdiGetLocalDC tested in xp/vista/reactos and works no fault report. Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertBitmap.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiConvertBrush.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiConvertDC.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiConvertFont.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiConvertPalette.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiConvertRegion.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiGetLocalBrush.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiGetLocalDC.c (with props) Modified: trunk/rostests/apitests/gdi32api/gdi.h trunk/rostests/apitests/gdi32api/testlist.c Modified: trunk/rostests/apitests/gdi32api/gdi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/gdi.h?r… ============================================================================== --- trunk/rostests/apitests/gdi32api/gdi.h [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/gdi.h [iso-8859-1] Sat May 24 17:20:31 2008 @@ -200,4 +200,14 @@ // RECT VisRectRegion; // 1b8 } DC_ATTR, *PDC_ATTR; - +HDC WINAPI GdiConvertBitmap(HDC hdc); +HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr); +HDC WINAPI GdiConvertDC(HDC hdc); +HFONT WINAPI GdiConvertFont(HFONT hfont); +HPALETTE WINAPI GdiConvertPalette(HPALETTE hpal); +HRGN WINAPI GdiConvertRegion(HRGN hregion); +HBRUSH WINAPI GdiGetLocalBrush(HBRUSH hbr); +HDC WINAPI GdiGetLocalDC(HDC hdc); + + + Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -12,15 +12,29 @@ #include "tests/CreatePen.c" #include "tests/CreateRectRgn.c" #include "tests/ExtCreatePen.c" +#include "tests/GdiConvertBitmap.c" +#include "tests/GdiConvertBrush.c" +#include "tests/GdiConvertDC.c" +#include "tests/GdiConvertFont.c" +#include "tests/GdiConvertPalette.c" +#include "tests/GdiConvertRegion.c" +#include "tests/GdiGetLocalBrush.c" +#include "tests/GdiGetLocalDC.c" #include "tests/GetClipRgn.c" #include "tests/GetCurrentObject.c" +#include "tests/GetDIBits.c" #include "tests/GetObject.c" #include "tests/GetStockObject.c" -#include "tests/GetDIBits.c" #include "tests/SelectObject.c" #include "tests/SetDCPenColor.c" #include "tests/SetSysColors.c" #include "tests/SetWorldTransform.c" + + + + + + @@ -29,20 +43,28 @@ { { L"AddFontResourceA", Test_AddFontResourceA }, { L"AddFontResourceEx", Test_AddFontResourceEx }, - { L"CreateBitmapIndirect", Test_CreateBitmapIndirect }, + { L"CreateBitmapIndirect", Test_CreateBitmapIndirect }, { L"CreateCompatibleDC", Test_CreateCompatibleDC }, { L"CreateFont", Test_CreateFont }, { L"CreatePen", Test_CreatePen }, { L"CreateRectRgn", Test_CreateRectRgn }, { L"ExtCreatePen", Test_ExtCreatePen }, + { L"GdiConvertBitmap", Test_GdiConvertBitmap }, + { L"GdiConvertBrush", Test_GdiConvertBrush }, + { L"GdiConvertBrush", Test_GdiConvertDC }, + { L"GdiConvertFont", Test_GdiConvertFont }, + { L"GdiConvertPalette", Test_GdiConvertPalette }, + { L"GdiConvertRegion", Test_GdiConvertRegion }, + { L"GdiGetLocalBrush", Test_GdiGetLocalBrush }, + { L"GdiGetLocalDC", Test_GdiGetLocalDC }, { L"GetClipRgn", Test_GetClipRgn }, { L"GetCurrentObject", Test_GetCurrentObject }, + { L"GetDIBits", Test_GetDIBits }, { L"GetObject", Test_GetObject }, { L"GetStockObject", Test_GetStockObject }, - { L"GetDIBits", Test_GetDIBits }, - { L"SetSysColors", Test_SetSysColors }, { L"SelectObject", Test_SelectObject }, { L"SetDCPenColor", Test_SetDCPenColor }, + { L"SetSysColors", Test_SetSysColors }, { L"SetWorldTransform", Test_SetWorldTransform }, }; Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertBitmap.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertBitmap.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,10 @@ +INT +Test_GdiConvertBitmap(PTESTINFO pti) +{ + RTEST(GdiConvertBitmap((HDC)-1) == (HDC)-1); + RTEST(GdiConvertBitmap((HDC)0) == (HDC)0); + RTEST(GdiConvertBitmap((HDC)1) == (HDC)1); + RTEST(GdiConvertBitmap((HDC)2) == (HDC)2); + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertBitmap.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertBrush.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertBrush.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,9 @@ +INT +Test_GdiConvertBrush(PTESTINFO pti) +{ + RTEST(GdiConvertBrush((HBRUSH)-1) == (HBRUSH)-1); + RTEST(GdiConvertBrush((HBRUSH)0) == (HBRUSH)0); + RTEST(GdiConvertBrush((HBRUSH)1) == (HBRUSH)1); + RTEST(GdiConvertBrush((HBRUSH)2) == (HBRUSH)2); + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertBrush.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertDC.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertDC.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,10 @@ +INT +Test_GdiConvertDC(PTESTINFO pti) +{ + RTEST(GdiConvertDC((HDC)-1) == (HDC)-1); + RTEST(GdiConvertDC((HDC)0) == (HDC)0); + RTEST(GdiConvertDC((HDC)1) == (HDC)1); + RTEST(GdiConvertDC((HDC)2) == (HDC)2); + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertDC.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertFont.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertFont.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,9 @@ +INT +Test_GdiConvertFont(PTESTINFO pti) +{ + RTEST(GdiConvertFont((HFONT)-1) == (HFONT)-1); + RTEST(GdiConvertFont((HFONT)0) == (HFONT)0); + RTEST(GdiConvertFont((HFONT)1) == (HFONT)1); + RTEST(GdiConvertFont((HFONT)2) == (HFONT)2); + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertFont.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertPalette.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertPalette.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,9 @@ +INT +Test_GdiConvertPalette(PTESTINFO pti) +{ + RTEST(GdiConvertPalette((HPALETTE)-1) == (HPALETTE)-1); + RTEST(GdiConvertPalette((HPALETTE)0) == (HPALETTE)0); + RTEST(GdiConvertPalette((HPALETTE)1) == (HPALETTE)1); + RTEST(GdiConvertPalette((HPALETTE)2) == (HPALETTE)2); + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertPalette.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertRegion.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertRegion.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertRegion.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,12 @@ +INT +Test_GdiConvertRegion(PTESTINFO pti) +{ + RTEST(GdiConvertRegion((HRGN)-1) == (HRGN)-1); + RTEST(GdiConvertRegion((HRGN)0) == (HRGN)0); + RTEST(GdiConvertRegion((HRGN)1) == (HRGN)1); + RTEST(GdiConvertRegion((HRGN)2) == (HRGN)2); + RTEST(GdiConvertRegion((HRGN)3) == (HRGN)3); + RTEST(GdiConvertRegion((HRGN)4) == (HRGN)4); + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertRegion.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiGetLocalBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiGetLocalBrush.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiGetLocalBrush.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,11 @@ +INT +Test_GdiGetLocalBrush(PTESTINFO pti) +{ + RTEST(GdiGetLocalBrush((HBRUSH)-1) == (HBRUSH)-1); + RTEST(GdiGetLocalBrush((HBRUSH)0) == (HBRUSH)0); + RTEST(GdiGetLocalBrush((HBRUSH)1) == (HBRUSH)1); + RTEST(GdiGetLocalBrush((HBRUSH)2) == (HBRUSH)2); + RTEST(GdiGetLocalBrush((HBRUSH)3) == (HBRUSH)3); + RTEST(GdiGetLocalBrush((HBRUSH)4) == (HBRUSH)4); + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/GdiGetLocalBrush.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiGetLocalDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiGetLocalDC.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiGetLocalDC.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,11 @@ +INT +Test_GdiGetLocalDC(PTESTINFO pti) +{ + RTEST(GdiGetLocalDC((HDC)-1) == (HDC)-1); + RTEST(GdiGetLocalDC((HDC)0) == (HDC)0); + RTEST(GdiGetLocalDC((HDC)1) == (HDC)1); + RTEST(GdiGetLocalDC((HDC)2) == (HDC)2); + RTEST(GdiGetLocalDC((HDC)3) == (HDC)3); + RTEST(GdiGetLocalDC((HDC)4) == (HDC)4); + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/GdiGetLocalDC.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gedmurphy] 33678: Add functionality to allow dll injection for all apps which link to user32.
by gedmurphy＠svn.reactos.org 24 May '08

24 May '08

Author: gedmurphy Date: Sat May 24 16:21:58 2008 New Revision: 33678 URL: http://svn.reactos.org/svn/reactos?rev=33678&view=rev Log: Add functionality to allow dll injection for all apps which link to user32. Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Sat May 24 16:21:58 2008 @@ -1,6 +1,9 @@ #include <user32.h> #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(user32); + +#define KEY_LENGTH 1024 static ULONG User32TlsIndex; HINSTANCE User32Instance; @@ -9,6 +12,7 @@ PW32PROCESSINFO g_pi = NULL; /* User Mode Pointer */ PW32PROCESSINFO g_kpi = NULL; /* Kernel Mode Pointer */ PSERVERINFO g_psi = NULL; +WCHAR szAppInit[KEY_LENGTH]; PW32PROCESSINFO GetW32ProcessInfo(VOID); @@ -17,6 +21,137 @@ User32GetThreadData() { return ((PUSER32_THREAD_DATA)TlsGetValue(User32TlsIndex)); +} + + +BOOL +GetDllList() +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES Attributes; + BOOL bRet = FALSE; + BOOL bLoad; + HANDLE hKey = NULL; + DWORD dwSize; + PKEY_VALUE_PARTIAL_INFORMATION kvpInfo = NULL; + + UNICODE_STRING szKeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows"); + UNICODE_STRING szLoadName = RTL_CONSTANT_STRING(L"LoadAppInit_DLLs"); + UNICODE_STRING szDllsName = RTL_CONSTANT_STRING(L"AppInit_DLLs"); + + InitializeObjectAttributes(&Attributes, &szKeyName, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenKey(&hKey, KEY_READ, &Attributes); + if (NT_SUCCESS(Status)) + { + dwSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(DWORD); + kvpInfo = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (!kvpInfo) + goto end; + + Status = NtQueryValueKey(hKey, + &szLoadName, + KeyValuePartialInformation, + kvpInfo, + dwSize, + &dwSize); + if (!NT_SUCCESS(Status)) + goto end; + + RtlMoveMemory(&bLoad, + kvpInfo->Data, + kvpInfo->DataLength); + + HeapFree(GetProcessHeap(), 0, kvpInfo); + kvpInfo = NULL; + + if (bLoad) + { + Status = NtQueryValueKey(hKey, + &szDllsName, + KeyValuePartialInformation, + NULL, + 0, + &dwSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + goto end; + + kvpInfo = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (!kvpInfo) + goto end; + + Status = NtQueryValueKey(hKey, + &szDllsName, + KeyValuePartialInformation, + kvpInfo, + dwSize, + &dwSize); + if (NT_SUCCESS(Status)) + { + LPWSTR lpBuffer = (LPWSTR)kvpInfo->Data; + if (lpBuffer != UNICODE_NULL) + { + RtlMoveMemory(szAppInit, + kvpInfo->Data, + min(kvpInfo->DataLength, KEY_LENGTH)); + bRet = TRUE; + } + } + } + } + +end: + if (hKey) + NtClose(hKey); + + if (kvpInfo) + HeapFree(GetProcessHeap(), 0, kvpInfo); + + return bRet; +} + + +VOID +LoadAppInitDlls() +{ + szAppInit[0] = UNICODE_NULL; + + if (GetDllList()) + { + WCHAR buffer[KEY_LENGTH]; + LPWSTR ptr; + LPWSTR seps = L" ,"; + + RtlCopyMemory(buffer, szAppInit, KEY_LENGTH);; + + ptr = wcstok(buffer, seps); + while (ptr) + { + LoadLibraryW(ptr); + ptr = wcstok(NULL, seps); + } + } +} + +VOID +UnloadAppInitDlls() +{ + if (szAppInit[0] != UNICODE_NULL) + { + WCHAR buffer[KEY_LENGTH]; + HMODULE hModule; + LPWSTR ptr; + LPWSTR seps = L" ,"; + + RtlCopyMemory(buffer, szAppInit, KEY_LENGTH); + + ptr = wcstok(buffer, seps); + while (ptr) + { + hModule = GetModuleHandleW(ptr); + FreeLibrary(hModule); + ptr = wcstok(NULL, seps); + } + } } BOOL @@ -77,6 +212,7 @@ InitializeCriticalSection(&U32AccelCacheLock); GdiDllInitialize(NULL, DLL_PROCESS_ATTACH, NULL); InitStockObjects(); + LoadAppInitDlls(); return TRUE; } @@ -95,6 +231,7 @@ MenuCleanup(); MessageCleanup(); DeleteFrameBrushes(); + UnloadAppInitDlls(); GdiDllInitialize(NULL, DLL_PROCESS_DETACH, NULL); TlsFree(User32TlsIndex); }

1 0

[mpiulachs] 33677: - Move every x86 HAL to it's own .rbuild file - Take advantage of r33676
by mpiulachs＠svn.reactos.org 24 May '08

24 May '08

Author: mpiulachs Date: Sat May 24 15:32:44 2008 New Revision: 33677 URL: http://svn.reactos.org/svn/reactos?rev=33677&view=rev Log: - Move every x86 HAL to it's own .rbuild file - Take advantage of r33676 Added: trunk/reactos/hal/halx86/hal_generic.rbuild (with props) trunk/reactos/hal/halx86/hal_generic_pc.rbuild (with props) trunk/reactos/hal/halx86/hal_generic_up.rbuild (with props) trunk/reactos/hal/halx86/halmp.rbuild (with props) trunk/reactos/hal/halx86/halup.rbuild (with props) trunk/reactos/hal/halx86/halxbox.rbuild (with props) Removed: trunk/reactos/hal/halx86/directory.rbuild Modified: trunk/reactos/hal/hal.rbuild Modified: trunk/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.rbuild?rev=33677&r… ============================================================================== --- trunk/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -6,7 +6,12 @@ </directory> <if property="ARCH" value="i386"> <directory name="halx86"> - <xi:include href="halx86/directory.rbuild" /> + <xi:include href="halx86/hal_generic.rbuild" /> + <xi:include href="halx86/hal_generic_up.rbuild" /> + <xi:include href="halx86/hal_generic_pc.rbuild" /> + <xi:include href="halx86/halup.rbuild" /> + <xi:include href="halx86/halmp.rbuild" /> + <xi:include href="halx86/halxbox.rbuild" /> </directory> </if> <if property="ARCH" value="powerpc"> Removed: trunk/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuil… ============================================================================== --- trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/directory.rbuild (removed) @@ -1,69 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> -<group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="generic"> - <xi:include href="generic/generic.rbuild" /> - </directory> - - <module name="halup" type="kernelmodedll" entrypoint="0"> - <importlibrary definition="../hal/hal_i386.def" /> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>hal_generic_up</library> - <library>hal_generic_pc</library> - <library>ntoskrnl</library> - <directory name="up"> - <file>halinit_up.c</file> - <file>halup.rc</file> - </directory> - </module> - <module name="halmp" type="kernelmodedll" entrypoint="0"> - <importlibrary definition="../hal/hal_i386.def" /> - <bootstrap installbase="$(CDOUTPUT)" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="CONFIG_SMP" /> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>hal_generic_pc</library> - <library>ntoskrnl</library> - <directory name="mp"> - <file>apic.c</file> - <file>halinit_mp.c</file> - <file>ioapic.c</file> - <file>ipi_mp.c</file> - <file>mpconfig.c</file> - <file>mps.S</file> - <file>mpsboot.asm</file> - <file>mpsirql.c</file> - <file>processor_mp.c</file> - <file>spinlock.c</file> - <file>halmp.rc</file> - </directory> - </module> - <module name="halxbox" type="kernelmodedll" entrypoint="0" allowwarnings="true"> - <importlibrary definition="../hal/hal_i386.def" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_NTHAL_" /> - <define name="SARCH_XBOX" /> - <library>hal_generic</library> - <library>hal_generic_up</library> - <library>ntoskrnl</library> - <directory name="generic"> - <file>pci.c</file> - </directory> - <directory name="xbox"> - <file>halinit_xbox.c</file> - <file>part_xbox.c</file> - <file>halxbox.rc</file> - <pch>halxbox.h</pch> - </directory> - </module> -</group> Added: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild (added) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,31 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group> + <module name="hal_generic" type="objectlibrary"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <directory name="generic"> + <file>beep.c</file> + <file>bios.c</file> + <file>bus.c</file> + <file>cmos.c</file> + <file>dma.c</file> + <file>drive.c</file> + <file>display.c</file> + <file>halinit.c</file> + <file>misc.c</file> + <file>portio.c</file> + <file>profil.c</file> + <file>reboot.c</file> + <file>sysinfo.c</file> + <file>timer.c</file> + <file>systimer.S</file> + <file>v86.s</file> + </directory> + <directory name="include"> + <pch>hal.h</pch> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/hal_generic.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/hal/halx86/hal_generic_pc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_pc.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_pc.rbuild (added) +++ trunk/reactos/hal/halx86/hal_generic_pc.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group> + <module name="hal_generic_pc" type="objectlibrary"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <directory name="generic"> + <file>pci.c</file> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/hal_generic_pc.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_up.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_up.rbuild (added) +++ trunk/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group> + <module name="hal_generic_up" type="objectlibrary"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <directory name="generic"> + <file>irq.S</file> + <file>processor.c</file> + <file>spinlock.c</file> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/hal_generic_up.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/hal/halx86/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmp.rbuild?re… ============================================================================== --- trunk/reactos/hal/halx86/halmp.rbuild (added) +++ trunk/reactos/hal/halx86/halmp.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,29 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="halmp" type="kernelmodedll" entrypoint="0"> + <importlibrary base="hal" definition="hal_i386.def" /> + <bootstrap installbase="$(CDOUTPUT)" /> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="CONFIG_SMP" /> + <define name="_NTHAL_" /> + <library>hal_generic</library> + <library>hal_generic_pc</library> + <library>ntoskrnl</library> + <directory name="mp"> + <file>apic.c</file> + <file>halinit_mp.c</file> + <file>ioapic.c</file> + <file>ipi_mp.c</file> + <file>mpconfig.c</file> + <file>mps.S</file> + <file>mpsboot.asm</file> + <file>mpsirql.c</file> + <file>processor_mp.c</file> + <file>spinlock.c</file> + <file>halmp.rc</file> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/halmp.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/hal/halx86/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halup.rbuild?re… ============================================================================== --- trunk/reactos/hal/halx86/halup.rbuild (added) +++ trunk/reactos/hal/halx86/halup.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,20 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="halup" type="kernelmodedll" entrypoint="0"> + <importlibrary base="hal" definition="hal_i386.def" /> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <library>hal_generic</library> + <library>hal_generic_up</library> + <library>hal_generic_pc</library> + <library>ntoskrnl</library> + <directory name="up"> + <file>halinit_up.c</file> + <file>halup.rc</file> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/halup.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?… ============================================================================== --- trunk/reactos/hal/halx86/halxbox.rbuild (added) +++ trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,24 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="halxbox" type="kernelmodedll" entrypoint="0" allowwarnings="true"> + <importlibrary base="hal" definition="hal_i386.def" /> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <define name="SARCH_XBOX" /> + <library>hal_generic</library> + <library>hal_generic_up</library> + <library>ntoskrnl</library> + <directory name="generic"> + <file>pci.c</file> + </directory> + <directory name="xbox"> + <file>halinit_xbox.c</file> + <file>part_xbox.c</file> + <file>halxbox.rc</file> + <pch>halxbox.h</pch> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/halxbox.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mpiulachs] 33676: - Add "base" and "root" support to ImportLibrary. <importlibrary definition="../hal/hal_i386.def" /> -> <importlibrary base="hal" definition="hal_i386.def" />
by mpiulachs＠svn.reactos.org 24 May '08

24 May '08

Author: mpiulachs Date: Sat May 24 15:31:23 2008 New Revision: 33676 URL: http://svn.reactos.org/svn/reactos?rev=33676&view=rev Log: - Add "base" and "root" support to ImportLibrary. <importlibrary definition="../hal/hal_i386.def" /> -> <importlibrary base="hal" definition="hal_i386.def" /> Modified: trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Sat May 24 15:31:23 2008 @@ -791,7 +791,7 @@ e.location, "Only one <importlibrary> is valid per module" ); } - SetImportLibrary ( new ImportLibrary ( project, e, *this ) ); + SetImportLibrary ( new ImportLibrary ( project, e, this ) ); subs_invalid = true; } else if ( e.name == "if" ) @@ -1748,31 +1748,67 @@ ImportLibrary::ImportLibrary ( const Project& project, const XMLElement& node, - const Module& module ) + const Module* module ) : XmlNode ( project, node ), module (module) { + DirectoryLocation directory = SourceDirectory; + const Module* base = module; const XMLAttribute* dllname = node.GetAttribute ( "dllname", false ); const XMLAttribute* definition = node.GetAttribute ( "definition", true ); assert ( definition ); + string relative_path; + const XMLAttribute* att = node.GetAttribute ( "base", false ); + if ( att ) + { + base = project.LocateModule ( att->value ); + if ( !base ) + throw XMLInvalidBuildFileException ( + node.location, + "<importlibrary> attribute 'base' references non-existant module '%s'", + att->value.c_str() ); + + } + + if ( base ) + { + relative_path = base->output->relative_path; + if ( node.value.length () > 0 && node.value != "." ) + relative_path += sSep + node.value; + } + else + relative_path = node.value; + + att = node.GetAttribute ( "root", false ); + if ( att ) + { + if ( att->value == "intermediate" ) + directory = IntermediateDirectory; + else + throw InvalidAttributeValueException ( node.location, + "root", + att->value ); + } + else + { + size_t index = definition->value.rfind ( ".spec.def" ); + if ( index != string::npos ) + directory = IntermediateDirectory; + } + if ( dllname ) this->dllname = dllname->value; - else if ( module.type == StaticLibrary || module.type == HostStaticLibrary ) + else if ( module->type == StaticLibrary || module->type == HostStaticLibrary ) throw XMLInvalidBuildFileException ( node.location, "<importlibrary> dllname attribute required." ); - DirectoryLocation directory = SourceDirectory; - size_t index = definition->value.rfind ( ".spec.def" ); - if ( index != string::npos ) - directory = IntermediateDirectory; - - index = definition->value.find_last_of ( "/\\" ); + size_t index = definition->value.find_last_of ( "/\\" ); if ( index == string::npos ) { source = new FileLocation ( directory, - module.output->relative_path, + base->output->relative_path, definition->value, &node ); } @@ -1781,7 +1817,7 @@ string dir = definition->value.substr ( 0, index ); string name = definition->value.substr ( index + 1); source = new FileLocation ( directory, - NormalizeFilename ( module.output->relative_path + sSep + dir ), + NormalizeFilename ( base->output->relative_path + sSep + dir ), name, &node ); } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Sat May 24 15:31:23 2008 @@ -588,13 +588,13 @@ class ImportLibrary : public XmlNode { public: - const Module& module; + const Module* module; std::string dllname; FileLocation *source; ImportLibrary ( const Project& project, const XMLElement& node, - const Module& module ); + const Module* module ); ~ImportLibrary (); };

1 0

[greatlrd] 33675: merge from win32k-gdi-dx r33674 Implement GdiAddGlsBounds
by greatlrd＠svn.reactos.org 24 May '08

24 May '08

Author: greatlrd Date: Sat May 24 14:02:23 2008 New Revision: 33675 URL: http://svn.reactos.org/svn/reactos?rev=33675&view=rev Log: merge from win32k-gdi-dx r33674 Implement GdiAddGlsBounds Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] Sat May 24 14:02:23 2008 @@ -226,3 +226,12 @@ { NtCurrentTeb ()->LastErrorValue = (ULONG) dwErrCode; } + +BOOL +STDCALL +GdiAddGlsBounds(HDC hdc,LPRECT prc) +{ + //FIXME: Lookup what 0x8000 means + return NtGdiSetBoundsRect(hdc, prc, 0x8000 | DCB_ACCUMULATE ) ? TRUE : FALSE; +} + Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Sat May 24 14:02:23 2008 @@ -1078,20 +1078,6 @@ int STDCALL EndFormPage(HDC hdc) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - - -/* - * @unimplemented - */ -DWORD -STDCALL -GdiAddGlsBounds(HDC hdc,LPRECT prc) { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

1 0

[greatlrd] 33674: Implement GdiAddGlsBounds
by greatlrd＠svn.reactos.org 24 May '08

24 May '08

Author: greatlrd Date: Sat May 24 13:56:57 2008 New Revision: 33674 URL: http://svn.reactos.org/svn/reactos?rev=33674&view=rev Log: Implement GdiAddGlsBounds Modified: branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c branches/win32k-gdi-dx/dll/win32/gdi32/misc/stubs.c Modified: branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/m… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c [iso-8859-1] Sat May 24 13:56:57 2008 @@ -223,3 +223,15 @@ { NtCurrentTeb ()->LastErrorValue = (ULONG) dwErrCode; } + +/* + * @implemented + */ +BOOL +STDCALL +GdiAddGlsBounds(HDC hdc,LPRECT prc) +{ + //FIXME: Lookup what 0x8000 means + return NtGdiSetBoundsRect(hdc, prc, 0x8000 | DCB_ACCUMULATE ) ? TRUE : FALSE; +} + Modified: branches/win32k-gdi-dx/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/m… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Sat May 24 13:56:57 2008 @@ -1114,17 +1114,7 @@ -/* - * @unimplemented - */ -DWORD -STDCALL -GdiAddGlsBounds(HDC hdc,LPRECT prc) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented

1 0

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