Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[fireball] 33418: - Get rid of duplicated (and different) NB_LAST_STOCK definitions in gdi32 and win32k, now it's defined to 22 (19 being a last public stock object, other 2 are internal). - Move a DEFAULT_BITMAP definiton from gdi32 into ntgdityp.h (not the best place, but could be moved to a better one later), and assign it a number 21, which it is on Windows XP (tested with a win32kntest framework, tests are committed). - Fix CreateBitmap to return a 1x1 stock bitmap object if the requested W

by fireball＠svn.reactos.org

Author: fireball Date: Sat May 10 14:03:58 2008 New Revision: 33418 URL: http://svn.reactos.org/svn/reactos?rev=33418&view=rev Log: - Get rid of duplicated (and different) NB_LAST_STOCK definitions in gdi32 and win32k, now it's defined to 22 (19 being a last public stock object, other 2 are internal). - Move a DEFAULT_BITMAP definiton from gdi32 into ntgdityp.h (not the best place, but could be moved to a better one later), and assign it a number 21, which it is on Windows XP (tested with a win32kntest framework, tests are committed). - Fix CreateBitmap to return a 1x1 stock bitmap object if the requested Width and Height are 0. - All of this work is based on Magnus Olsen's patches and Wine. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/include/reactos/win32k/ntgdityp.h trunk/reactos/subsystems/win32/win32k/include/object.h trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Sat May 10 14:03:58 2008 @@ -29,9 +29,6 @@ #define METAFILE_MEMORY 1 #define METAFILE_DISK 2 - -#define DEFAULT_BITMAP (STOCK_LAST+1) -#define NB_STOCK_OBJECTS (STOCK_LAST+2) /* TYPES *********************************************************************/ 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 10 14:03:58 2008 @@ -1936,7 +1936,15 @@ PCVOID pUnsafeBits) { /* FIXME some part should be done in user mode */ - return NtGdiCreateBitmap(Width, Height, Planes, BitsPixel, (LPBYTE) pUnsafeBits); + if (Width && Height) + { + return NtGdiCreateBitmap(Width, Height, Planes, BitsPixel, (LPBYTE) pUnsafeBits); + } + else + { + /* Return 1x1 bitmap */ + return GetStockObject(DEFAULT_BITMAP); + } } /* Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sat May 10 14:03:58 2008 @@ -159,10 +159,12 @@ typedef DWORD FULLSCREENCONTROL; typedef DWORD LFTYPE; -/* NOTE DC_BITMAP or the value are not documented in MSDN or ms header - * it return a 1x1 1Bpp Bitmap in all case from GetStockObject - */ -#define DC_BITMAP 21 +/* Public LAST_STOCK = 19, plus 2 more internal entries */ +#define NB_STOCK_OBJECTS 22 + +/* extra stock object: default 1x1 bitmap for memory DCs */ +#define DEFAULT_BITMAP (21) + /* DEFINES *******************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] Sat May 10 14:03:58 2008 @@ -7,11 +7,6 @@ #define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ #define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ - -/* Comments from reserve two extra entry for the stock default bitmap this is what Windows does too - * and verify if it is true it is not. in XP/2003 it is 22 stockobjects for each bitmap - */ -#define PRV_STOCK_LAST 22 #define USER_HEADER_TO_BODY(ObjectHeader) \ ((PVOID)(((PUSER_OBJECT_HEADER)ObjectHeader) + 1)) Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Sat May 10 14:03:58 2008 @@ -107,11 +107,6 @@ { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans -/* Comments from reserve two extra entry for the stock default bitmap this is what Windows does too - * and verify if it is true it is not. in XP/2003 it is 22 stockobjects for each bitmap - */ -#define NB_STOCK_OBJECTS (PRV_STOCK_LAST) - static HGDIOBJ StockObjects[NB_STOCK_OBJECTS]; /*! @@ -139,8 +134,8 @@ StockObjects[DC_PEN] = IntGdiExtCreatePen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); StockObjects[NULL_PEN] = IntGdiExtCreatePen(NullPen.lopnStyle, NullPen.lopnWidth.x, BS_SOLID, NullPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); - StockObjects[20] = NULL; - StockObjects[DC_BITMAP] = IntGdiCreateBitmap (1, 1, 1, 1, NULL); + StockObjects[20] = NULL; /* TODO: Unknown internal stock object */ + StockObjects[DEFAULT_BITMAP] = IntGdiCreateBitmap(1, 1, 1, 1, NULL); (void) TextIntCreateFontIndirect(&OEMFixedFont, (HFONT*)&StockObjects[OEM_FIXED_FONT]); (void) TextIntCreateFontIndirect(&AnsiFixedFont, (HFONT*)&StockObjects[ANSI_FIXED_FONT]);

16 years, 4 months

[greatlrd] 33416: move the undoc DC_BITMAP to ntgdityp.h header after advice from fireball and kjk

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 10 13:10:36 2008 New Revision: 33416 URL: http://svn.reactos.org/svn/reactos?rev=33416&view=rev Log: move the undoc DC_BITMAP to ntgdityp.h header after advice from fireball and kjk Modified: trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sat May 10 13:10:36 2008 @@ -813,12 +813,6 @@ #define SYSTEM_FONT 13 #define SYSTEM_FIXED_FONT 16 #define DEFAULT_PALETTE 15 - -/* NOTE DC_BITMAP or the value are not documented in MSDN or ms header - * it return a 1x1 1Bpp Bitmap in all case from GetStockObject - */ -#define DC_BITMAP 21 - #if (_WIN32_WINNT >= 0x0500) #define DC_BRUSH 18 #define DC_PEN 19 Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sat May 10 13:10:36 2008 @@ -158,6 +158,11 @@ /* FIXME: Unknown */ typedef DWORD FULLSCREENCONTROL; typedef DWORD LFTYPE; + +/* NOTE DC_BITMAP or the value are not documented in MSDN or ms header + * it return a 1x1 1Bpp Bitmap in all case from GetStockObject + */ +#define DC_BITMAP 21 /* DEFINES *******************************************************************/

16 years, 4 months

[greatlrd] 33415: fixing a memory overwrite bug I miskate intrudes the private size of stackobject list contain 22 object, and we do not want mix up the private size and the user mode size for different version.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 10 13:07:41 2008 New Revision: 33415 URL: http://svn.reactos.org/svn/reactos?rev=33415&view=rev Log: fixing a memory overwrite bug I miskate intrudes the private size of stackobject list contain 22 object, and we do not want mix up the private size and the user mode size for different version. Modified: trunk/reactos/subsystems/win32/win32k/include/object.h trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] Sat May 10 13:07:41 2008 @@ -8,6 +8,10 @@ #define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ #define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ +/* Comments from reserve two extra entry for the stock default bitmap this is what Windows does too + * and verify if it is true it is not. in XP/2003 it is 22 stockobjects for each bitmap + */ +#define PRV_STOCK_LAST 22 #define USER_HEADER_TO_BODY(ObjectHeader) \ ((PVOID)(((PUSER_OBJECT_HEADER)ObjectHeader) + 1)) Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Sat May 10 13:07:41 2008 @@ -107,10 +107,10 @@ { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans -/* Comments from wine reserve two extra entry for the stock default bitmap this is what Windows does too - * and verify if it it is true it is not. in XP/2003 it is 22 stockobjects for each bitmap +/* Comments from reserve two extra entry for the stock default bitmap this is what Windows does too + * and verify if it is true it is not. in XP/2003 it is 22 stockobjects for each bitmap */ -#define NB_STOCK_OBJECTS (STOCK_LAST + 3) +#define NB_STOCK_OBJECTS (PRV_STOCK_LAST) static HGDIOBJ StockObjects[NB_STOCK_OBJECTS]; @@ -139,6 +139,7 @@ StockObjects[DC_PEN] = IntGdiExtCreatePen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); StockObjects[NULL_PEN] = IntGdiExtCreatePen(NullPen.lopnStyle, NullPen.lopnWidth.x, BS_SOLID, NullPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); + StockObjects[20] = NULL; StockObjects[DC_BITMAP] = IntGdiCreateBitmap (1, 1, 1, 1, NULL); (void) TextIntCreateFontIndirect(&OEMFixedFont, (HFONT*)&StockObjects[OEM_FIXED_FONT]);

16 years, 4 months

[dchapyshev] 33414: - Add new layouts to bootcd

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat May 10 13:01:32 2008 New Revision: 33414 URL: http://svn.reactos.org/svn/reactos?rev=33414&view=rev Log: - Add new layouts to bootcd Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sat May 10 13:01:32 2008 @@ -38,6 +38,18 @@ HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB\Hardware Profiles\0000","FriendlyName",0x00000000,"New Hardware Profile" ; Keyboard Layouts +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000401","Layout File",0x00000000,"kbda1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000401","Layout Text",0x00000000,"Arabic (101)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000401","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5084" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010401","Layout File",0x00000000,"kbda2.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010401","Layout Text",0x00000000,"Arabic (102)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010401","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5085" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020401","Layout File",0x00000000,"kbda3.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020401","Layout Text",0x00000000,"Arabic (102) AZERTY" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020401","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5086" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00040402","Layout File",0x00000000,"kbdbgm.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00040402","Layout Text",0x00000000,"Bulgarian BDS 5237-1978" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00040402","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5136" @@ -188,6 +200,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010419","Layout Text",0x00000000,"Russian (Typewriter)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010419","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5056" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041a","Layout File",0x00000000,"kbdcr.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041a","Layout Text",0x00000000,"Croatian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041a","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5030" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout File",0x00000000,"kbdsk.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout Text",0x00000000,"Slovak" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5039" @@ -232,6 +248,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042b","Layout Text",0x00000000,"Armenian Eastern" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5120" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001042b","Layout File",0x00000000,"kbdarmw.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001042b","Layout Text",0x00000000,"Armenian Eastern" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001042b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5121" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042c","Layout File",0x00000000,"kbdazel.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042c","Layout Text",0x00000000,"Azeri Latin" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042c","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5117" @@ -248,6 +268,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout Text",0x00000000,"Georgian" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5119" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000439","Layout File",0x00000000,"kbdindev.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000439","Layout Text",0x00000000,"Devanagari - INSCRIPT" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000439","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5096" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000043f","Layout File",0x00000000,"kbdkaz.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000043f","Layout Text",0x00000000,"Kazakh" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000043f","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5113" @@ -259,6 +283,22 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000444","Layout File",0x00000000,"kbdtat.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000444","Layout Text",0x00000000,"Tatar" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000444","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5116" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000445","Layout File",0x00000000,"kbdinben.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000445","Layout Text",0x00000000,"Bengali" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000445","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5135" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000447","Layout File",0x00000000,"kbdinguj.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000447","Layout Text",0x00000000,"Gujarati" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000447","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5097" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000044c","Layout File",0x00000000,"kbdinmal.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000044c","Layout Text",0x00000000,"Malayalam" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000044c","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5139" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000044d","Layout File",0x00000000,"kbdinasa.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000044d","Layout Text",0x00000000,"ASSAMESE - INSCRIPT" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000044d","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5177" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout File",0x00000000,"kbdbur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout Text",0x00000000,"Burmese" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat May 10 13:01:32 2008 @@ -139,8 +139,12 @@ dll\directx\wine\wined3d\wined3d.dll 1 dll\directx\wine\d3d9\d3d9.dll 1 +dll\keyboard\kbda1\kbda1.dll 1 +dll\keyboard\kbda2\kbda2.dll 1 +dll\keyboard\kbda3\kbda3.dll 1 dll\keyboard\kbdal\kbdal.dll 1 dll\keyboard\kbdarme\kbdarme.dll 1 +dll\keyboard\kbdarmw\kbdarmw.dll 1 dll\keyboard\kbdaze\kbdaze.dll 1 dll\keyboard\kbdazel\kbdazel.dll 1 dll\keyboard\kbdbgm\kbdbgm.dll 1 @@ -151,6 +155,7 @@ dll\keyboard\kbdbe\kbdbe.dll 1 dll\keyboard\kbdbur\kbdbur.dll 1 dll\keyboard\kbdcan\kbdcan.dll 1 +dll\keyboard\kbdcr\kbdcr.dll 1 dll\keyboard\kbdcz1\kbdcz1.dll 1 dll\keyboard\kbdda\kbdda.dll 1 dll\keyboard\kbddv\kbddv.dll 1 @@ -168,6 +173,11 @@ dll\keyboard\kbdheb\kbdheb.dll 1 dll\keyboard\kbdhu\kbdhu.dll 1 dll\keyboard\kbdic\kbdic.dll 1 +dll\keyboard\kbdinasa\kbdinasa.dll 1 +dll\keyboard\kbdinben\kbdinben.dll 1 +dll\keyboard\kbdindev\kbdindev.dll 1 +dll\keyboard\kbdinguj\kbdinguj.dll 1 +dll\keyboard\kbdinmal\kbdinmal.dll 1 dll\keyboard\kbdit\kbdit.dll 1 dll\keyboard\kbdja\kbdja.dll 1 dll\keyboard\kbdkaz\kbdkaz.dll 1 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sat May 10 13:01:32 2008 @@ -156,18 +156,26 @@ [KeyboardLayout] 0000041C = "Albanian" +00000401 = "Arabic (101)" +00010401 = "Arabic (102)" +00020401 = "Arabic (102) AZERTY" 0000042B = "Armenian Eastern" +0001042B = "Armenian Western" +0000044D = "Assamese (Inscript)" 0000082C = "Azeri Cyrillic" 0000042C = "Azeri Latin" 00000423 = "Belarusian" +00000445 = "Bengali" 00040402 = "Bulgarian BDS 5237-1978" 00020402 = "Bulgarian phonetic classic" 00030402 = "Bulgarian phonetic BDS 5237-2006" 00000455 = "Burmese" 00000C0C = "Canadian French (Legacy)" 00011009 = "Canadian Multilingual Standard" +0000041A = "Croatian" 00000405 = "Czech (QWERTY)" 00000406 = "Danish (Denmark)" +00000439 = "Devanagari - INSCRIPT" 00000413 = "Dutch" 00000813 = "Dutch (Belgium)" 00000809 = "English (United Kingdom)" @@ -185,6 +193,7 @@ 00000807 = "German (Swiss)" 00000408 = "Greek" 00010408 = "Greek 220" +00000447 = "Gujarati" 0000040D = "Hebrew" 0000040E = "Hungarian" 0000040F = "Icelandic" @@ -194,6 +203,7 @@ 00000426 = "Latvian" 00000427 = "Lithuanian" 0000042F = "Macedonian (FYRO)" +0000044C = "Malayalam" 00000414 = "Norwegian" 00000415 = "Polish (programmer's)" 00010416 = "Portuguese (Brazilian ABNT2)" @@ -220,6 +230,9 @@ 0000042A = "Vietnamese" [Files.KeyboardLayout] +00000401 = kbda1.dll +00010401 = kbda2.dll +00020401 = kbda3.dll 00020402 = kbdbgt.dll 00030402 = kbdbga.dll 00040402 = kbdbgm.dll @@ -261,6 +274,7 @@ 00000419 = kbdru.dll 00010419 = kbdru1.dll 00000807 = kbdsg.dll +0000041A = kbdcr.dll 0000081A = kbdycl.dll 0000041B = kbdsk.dll 0000041D = kbdsw.dll @@ -273,13 +287,19 @@ 00000426 = kbdlv.dll 0000042A = kbdvntc.dll 0000042B = kbdarme.dll +0001042B = kbdarmw.dll 0000042C = kbdazel.dll 0000082C = kbdaze.dll 0000042F = kbdmac.dll 00000437 = kbdgeo.dll +00000439 = kbdindev.dll 0000043F = kbdkaz.dll 00000843 = kbduzb.dll 00000444 = kbdtat.dll +00000445 = kbdinben.dll +00000447 = kbdinguj.dll +0000044C = kbdinmal.dll +0000044D = kbdinasa.dll 00011009 = kbdcan.dll 00000C0C = kbdfc.dll 00000C1A = kbdycc.dll

16 years, 4 months

[dchapyshev] 33413: Add keyboard layouts: - Arabic (101) (by Alexey Komarov) - Arabic (102) (by Alexey Komarov) - Arabic (102) AZERTY (by Alexey Komarov) - Armenian Western (by Alexey Komarov) - Assamese (Inscript) - Bengali - Croatian - Devanagari - INSCRIPT - Gujarati - Malayalam

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat May 10 12:58:45 2008 New Revision: 33413 URL: http://svn.reactos.org/svn/reactos?rev=33413&view=rev Log: Add keyboard layouts: - Arabic (101) (by Alexey Komarov) - Arabic (102) (by Alexey Komarov) - Arabic (102) AZERTY (by Alexey Komarov) - Armenian Western (by Alexey Komarov) - Assamese (Inscript) - Bengali - Croatian - Devanagari - INSCRIPT - Gujarati - Malayalam Added: trunk/reactos/dll/keyboard/kbda1/ trunk/reactos/dll/keyboard/kbda1/kbda1.c (with props) trunk/reactos/dll/keyboard/kbda1/kbda1.def (with props) trunk/reactos/dll/keyboard/kbda1/kbda1.rbuild (with props) trunk/reactos/dll/keyboard/kbda1/kbda1.rc (with props) trunk/reactos/dll/keyboard/kbda2/ trunk/reactos/dll/keyboard/kbda2/kbda2.c (with props) trunk/reactos/dll/keyboard/kbda2/kbda2.def (with props) trunk/reactos/dll/keyboard/kbda2/kbda2.rbuild (with props) trunk/reactos/dll/keyboard/kbda2/kbda2.rc (with props) trunk/reactos/dll/keyboard/kbda3/ trunk/reactos/dll/keyboard/kbda3/kbda3.c (with props) trunk/reactos/dll/keyboard/kbda3/kbda3.def (with props) trunk/reactos/dll/keyboard/kbda3/kbda3.rbuild (with props) trunk/reactos/dll/keyboard/kbda3/kbda3.rc (with props) trunk/reactos/dll/keyboard/kbdarmw/ trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.c (with props) trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.def (with props) trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild (with props) trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.rc (with props) trunk/reactos/dll/keyboard/kbdcr/ trunk/reactos/dll/keyboard/kbdcr/kbdcr.c (with props) trunk/reactos/dll/keyboard/kbdcr/kbdcr.def (with props) trunk/reactos/dll/keyboard/kbdcr/kbdcr.rbuild (with props) trunk/reactos/dll/keyboard/kbdcr/kbdcr.rc (with props) trunk/reactos/dll/keyboard/kbdinasa/ trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.c (with props) trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.def (with props) trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild (with props) trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.rc (with props) trunk/reactos/dll/keyboard/kbdinben/ trunk/reactos/dll/keyboard/kbdinben/kbdinben.c (with props) trunk/reactos/dll/keyboard/kbdinben/kbdinben.def (with props) trunk/reactos/dll/keyboard/kbdinben/kbdinben.rbuild (with props) trunk/reactos/dll/keyboard/kbdinben/kbdinben.rc (with props) trunk/reactos/dll/keyboard/kbdindev/ trunk/reactos/dll/keyboard/kbdindev/kbdindev.c (with props) trunk/reactos/dll/keyboard/kbdindev/kbdindev.def (with props) trunk/reactos/dll/keyboard/kbdindev/kbdindev.rbuild (with props) trunk/reactos/dll/keyboard/kbdindev/kbdindev.rc (with props) trunk/reactos/dll/keyboard/kbdinguj/ trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.c (with props) trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.def (with props) trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild (with props) trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.rc (with props) trunk/reactos/dll/keyboard/kbdinmal/ trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.c (with props) trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.def (with props) trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild (with props) trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.rc (with props) Modified: trunk/reactos/dll/keyboard/keyboard.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/keyboard/kbda1/kbda1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda1/kbda1.c… Added: trunk/reactos/dll/keyboard/kbda1/kbda1.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda1/kbda1.d… Added: trunk/reactos/dll/keyboard/kbda1/kbda1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda1/kbda1.r… Added: trunk/reactos/dll/keyboard/kbda1/kbda1.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda1/kbda1.r… Added: trunk/reactos/dll/keyboard/kbda2/kbda2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda2/kbda2.c… Added: trunk/reactos/dll/keyboard/kbda2/kbda2.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda2/kbda2.d… Added: trunk/reactos/dll/keyboard/kbda2/kbda2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda2/kbda2.r… Added: trunk/reactos/dll/keyboard/kbda2/kbda2.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda2/kbda2.r… Added: trunk/reactos/dll/keyboard/kbda3/kbda3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda3/kbda3.c… Added: trunk/reactos/dll/keyboard/kbda3/kbda3.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda3/kbda3.d… Added: trunk/reactos/dll/keyboard/kbda3/kbda3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda3/kbda3.r… Added: trunk/reactos/dll/keyboard/kbda3/kbda3.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda3/kbda3.r… Added: trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdarmw/kbdar… Added: trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdarmw/kbdar… Added: trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdarmw/kbdar… Added: trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdarmw/kbdar… Added: trunk/reactos/dll/keyboard/kbdcr/kbdcr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcr/kbdcr.c… Added: trunk/reactos/dll/keyboard/kbdcr/kbdcr.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcr/kbdcr.d… Added: trunk/reactos/dll/keyboard/kbdcr/kbdcr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcr/kbdcr.r… Added: trunk/reactos/dll/keyboard/kbdcr/kbdcr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcr/kbdcr.r… Added: trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinasa/kbdi… Added: trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinasa/kbdi… Added: trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinasa/kbdi… Added: trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinasa/kbdi… Added: trunk/reactos/dll/keyboard/kbdinben/kbdinben.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinben/kbdi… Added: trunk/reactos/dll/keyboard/kbdinben/kbdinben.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinben/kbdi… Added: trunk/reactos/dll/keyboard/kbdinben/kbdinben.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinben/kbdi… Added: trunk/reactos/dll/keyboard/kbdinben/kbdinben.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinben/kbdi… Added: trunk/reactos/dll/keyboard/kbdindev/kbdindev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdindev/kbdi… Added: trunk/reactos/dll/keyboard/kbdindev/kbdindev.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdindev/kbdi… Added: trunk/reactos/dll/keyboard/kbdindev/kbdindev.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdindev/kbdi… Added: trunk/reactos/dll/keyboard/kbdindev/kbdindev.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdindev/kbdi… Added: trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinguj/kbdi… Added: trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinguj/kbdi… Added: trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinguj/kbdi… Added: trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinguj/kbdi… Added: trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinmal/kbdi… Added: trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinmal/kbdi… Added: trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinmal/kbdi… Added: trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinmal/kbdi… Modified: trunk/reactos/dll/keyboard/keyboard.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/keyboard.rbui…

16 years, 4 months

[greatlrd] 33412: implement DC_BITMAP for GetStockObject. it works for any apps want it. and using this undoc value testcase exists in w32knapi have been run in windows and reactos.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 10 12:39:38 2008 New Revision: 33412 URL: http://svn.reactos.org/svn/reactos?rev=33412&view=rev Log: implement DC_BITMAP for GetStockObject. it works for any apps want it. and using this undoc value testcase exists in w32knapi have been run in windows and reactos. Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Sat May 10 12:39:38 2008 @@ -107,7 +107,10 @@ { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans -#define NB_STOCK_OBJECTS (STOCK_LAST + 1) +/* Comments from wine reserve two extra entry for the stock default bitmap this is what Windows does too + * and verify if it it is true it is not. in XP/2003 it is 22 stockobjects for each bitmap + */ +#define NB_STOCK_OBJECTS (STOCK_LAST + 3) static HGDIOBJ StockObjects[NB_STOCK_OBJECTS]; @@ -135,6 +138,8 @@ StockObjects[BLACK_PEN] = IntGdiExtCreatePen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); StockObjects[DC_PEN] = IntGdiExtCreatePen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); StockObjects[NULL_PEN] = IntGdiExtCreatePen(NullPen.lopnStyle, NullPen.lopnWidth.x, BS_SOLID, NullPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); + + StockObjects[DC_BITMAP] = IntGdiCreateBitmap (1, 1, 1, 1, NULL); (void) TextIntCreateFontIndirect(&OEMFixedFont, (HFONT*)&StockObjects[OEM_FIXED_FONT]); (void) TextIntCreateFontIndirect(&AnsiFixedFont, (HFONT*)&StockObjects[ANSI_FIXED_FONT]);

16 years, 4 months

[greatlrd] 33411: adding a new define DC_BITMAP for GetStockObject

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 10 12:37:43 2008 New Revision: 33411 URL: http://svn.reactos.org/svn/reactos?rev=33411&view=rev Log: adding a new define DC_BITMAP for GetStockObject Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sat May 10 12:37:43 2008 @@ -813,6 +813,12 @@ #define SYSTEM_FONT 13 #define SYSTEM_FIXED_FONT 16 #define DEFAULT_PALETTE 15 + +/* NOTE DC_BITMAP or the value are not documented in MSDN or ms header + * it return a 1x1 1Bpp Bitmap in all case from GetStockObject + */ +#define DC_BITMAP 21 + #if (_WIN32_WINNT >= 0x0500) #define DC_BRUSH 18 #define DC_PEN 19

16 years, 4 months

[greatlrd] 33410: adding a testcase for GetStockObject(21); it is 1x1 1Bpp Bitmap.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 10 11:12:35 2008 New Revision: 33410 URL: http://svn.reactos.org/svn/reactos?rev=33410&view=rev Log: adding a testcase for GetStockObject(21); it is 1x1 1Bpp Bitmap. Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c [iso-8859-1] Sat May 10 11:12:35 2008 @@ -3,6 +3,7 @@ Test_NtGdiGetStockObject(PTESTINFO pti) { HANDLE handle = NULL; + BITMAP bitmap; /* BRUSH testing */ handle = (HANDLE) NtGdiGetStockObject(WHITE_BRUSH); @@ -114,11 +115,22 @@ RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_COLORSPACE); RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + /* value 21 is getting back 1x1 1Bpp Bitmap */ handle = (HANDLE) NtGdiGetStockObject(21); RTEST(handle != 0); RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_BITMAP); RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + RTEST(GetObject(handle, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + RTEST(bitmap.bmType == 0); + RTEST(bitmap.bmWidth == 1); + RTEST(bitmap.bmHeight == 1); + RTEST(bitmap.bmWidthBytes == 2); + RTEST(bitmap.bmPlanes == 1); + RTEST(bitmap.bmBitsPixel == 1); + RTEST(bitmap.bmBits == 0); + + RTEST(NtGdiGetStockObject(22) == 0); RTEST(NtGdiGetStockObject(23) == 0); return APISTATUS_NORMAL;

16 years, 4 months

[greatlrd] 33409: adding more testcase for NtGdiGetStockObject it testing what type for gdi object the handle return now and we manger figout what type of handle the value 20 and value 21 NtGdiGetStockObject(20) == GDI_OBJECT_TYPE_COLORSPACE NtGdiGetStockObject(21) == GDI_OBJECT_TYPE_BITMAP

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 10 10:21:49 2008 New Revision: 33409 URL: http://svn.reactos.org/svn/reactos?rev=33409&view=rev Log: adding more testcase for NtGdiGetStockObject it testing what type for gdi object the handle return now and we manger figout what type of handle the value 20 and value 21 NtGdiGetStockObject(20) == GDI_OBJECT_TYPE_COLORSPACE NtGdiGetStockObject(21) == GDI_OBJECT_TYPE_BITMAP Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c [iso-8859-1] Sat May 10 10:21:49 2008 @@ -2,28 +2,123 @@ INT Test_NtGdiGetStockObject(PTESTINFO pti) { - RTEST(NtGdiGetStockObject(WHITE_BRUSH) != 0); - RTEST(NtGdiGetStockObject(LTGRAY_BRUSH) != 0); - RTEST(NtGdiGetStockObject(GRAY_BRUSH) != 0); - RTEST(NtGdiGetStockObject(DKGRAY_BRUSH) != 0); - RTEST(NtGdiGetStockObject(BLACK_BRUSH) != 0); - RTEST(NtGdiGetStockObject(NULL_BRUSH) != 0); - RTEST(NtGdiGetStockObject(WHITE_PEN) != 0); - RTEST(NtGdiGetStockObject(BLACK_PEN) != 0); - RTEST(NtGdiGetStockObject(NULL_PEN) != 0); + HANDLE handle = NULL; + + /* BRUSH testing */ + handle = (HANDLE) NtGdiGetStockObject(WHITE_BRUSH); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_BRUSH); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + handle = (HANDLE) NtGdiGetStockObject(LTGRAY_BRUSH); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_BRUSH); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + handle = (HANDLE) NtGdiGetStockObject(GRAY_BRUSH); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_BRUSH); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + handle = (HANDLE) NtGdiGetStockObject(DKGRAY_BRUSH); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_BRUSH); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + handle = (HANDLE) NtGdiGetStockObject(BLACK_BRUSH); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_BRUSH); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + handle = (HANDLE) NtGdiGetStockObject(NULL_BRUSH); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_BRUSH); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + /* PEN testing */ + handle = (HANDLE) NtGdiGetStockObject(WHITE_PEN); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_PEN); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) != 0); + + handle = (HANDLE) NtGdiGetStockObject(BLACK_PEN); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_PEN); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) != 0); + + handle = (HANDLE) NtGdiGetStockObject(NULL_PEN); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_PEN); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + /* Not inuse ? */ RTEST(NtGdiGetStockObject(9) == 0); - RTEST(NtGdiGetStockObject(OEM_FIXED_FONT) != 0); - RTEST(NtGdiGetStockObject(ANSI_FIXED_FONT) != 0); - RTEST(NtGdiGetStockObject(ANSI_VAR_FONT) != 0); - RTEST(NtGdiGetStockObject(SYSTEM_FONT) != 0); - RTEST(NtGdiGetStockObject(DEVICE_DEFAULT_FONT) != 0); - RTEST(NtGdiGetStockObject(DEFAULT_PALETTE) != 0); - RTEST(NtGdiGetStockObject(SYSTEM_FIXED_FONT) != 0); - RTEST(NtGdiGetStockObject(DEFAULT_GUI_FONT) != 0); - RTEST(NtGdiGetStockObject(DC_BRUSH) != 0); - RTEST(NtGdiGetStockObject(DC_PEN) != 0); - RTEST(NtGdiGetStockObject(20) != 0); - RTEST(NtGdiGetStockObject(21) != 0); + + /* FONT testing */ + handle = (HANDLE) NtGdiGetStockObject(OEM_FIXED_FONT); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_FONT); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) != 0); + + handle = (HANDLE) NtGdiGetStockObject(ANSI_FIXED_FONT); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_FONT); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + handle = (HANDLE) NtGdiGetStockObject(ANSI_VAR_FONT); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_FONT); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + handle = (HANDLE) NtGdiGetStockObject(SYSTEM_FONT); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_FONT); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + handle = (HANDLE) NtGdiGetStockObject(DEVICE_DEFAULT_FONT); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_FONT); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + handle = (HANDLE) NtGdiGetStockObject(SYSTEM_FIXED_FONT); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_FONT); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + handle = (HANDLE) NtGdiGetStockObject(DEFAULT_GUI_FONT); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_FONT); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + /* PALETTE testing */ + handle = (HANDLE) NtGdiGetStockObject(DEFAULT_PALETTE); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_PALETTE); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + /* DC testing */ + handle = (HANDLE) NtGdiGetStockObject(DC_BRUSH); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_BRUSH); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + handle = (HANDLE) NtGdiGetStockObject(DC_PEN); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_PEN); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + + /* ? testing */ + handle = (HANDLE) NtGdiGetStockObject(20); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_COLORSPACE); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + + handle = (HANDLE) NtGdiGetStockObject(21); + RTEST(handle != 0); + RTEST(GDI_HANDLE_GET_TYPE(handle) == GDI_OBJECT_TYPE_BITMAP); + RTEST(GDI_HANDLE_IS_STOCKOBJ(handle) == TRUE); + RTEST(NtGdiGetStockObject(22) == 0); RTEST(NtGdiGetStockObject(23) == 0); return APISTATUS_NORMAL;

16 years, 4 months

[cfinck] 33408: Attempt to fix build

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat May 10 10:08:45 2008 New Revision: 33408 URL: http://svn.reactos.org/svn/reactos?rev=33408&view=rev Log: Attempt to fix build Modified: trunk/reactos/dll/win32/user32/include/user32.h Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Sat May 10 10:08:45 2008 @@ -39,8 +39,8 @@ /* Internal User32 Headers */ #include "user32p.h" -#include <libs\pseh\pseh.h> -#include <libs\pseh\framebased.h> +#include <libs/pseh/pseh.h> +#include <libs/pseh/framebased.h> /* FIXME: Use ntgdi.h then cleanup... */ HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj);

16 years, 4 months

← Newer
1
...
35
36
37
38
39
40
41
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008