Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 33411: adding a new define DC_BITMAP for GetStockObject
by greatlrd＠svn.reactos.org 10 May '08

10 May '08

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

1 0

[greatlrd] 33410: adding a testcase for GetStockObject(21); it is 1x1 1Bpp Bitmap.
by greatlrd＠svn.reactos.org 10 May '08

10 May '08

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;

1 0

[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 10 May '08

10 May '08

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;

1 0

[cfinck] 33408: Attempt to fix build
by cfinck＠svn.reactos.org 10 May '08

10 May '08

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);

1 0

[greatlrd] 33407: adding a simple NtGdiGetStockObject it show undocumented stockobject exists in windows xp/2003 value 20 and 21
by greatlrd＠svn.reactos.org 10 May '08

10 May '08

Author: greatlrd Date: Sat May 10 09:01:40 2008 New Revision: 33407 URL: http://svn.reactos.org/svn/reactos?rev=33407&view=rev Log: adding a simple NtGdiGetStockObject it show undocumented stockobject exists in windows xp/2003 value 20 and 21 Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c (with props) Modified: trunk/rostests/apitests/w32knapi/testlist.c Added: 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 (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c [iso-8859-1] Sat May 10 09:01:40 2008 @@ -1,0 +1,30 @@ + +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); + 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); + RTEST(NtGdiGetStockObject(22) == 0); + RTEST(NtGdiGetStockObject(23) == 0); + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] Sat May 10 09:01:40 2008 @@ -23,6 +23,7 @@ #include "ntgdi/NtGdiSetBitmapBits.c" //#include "ntgdi/NtGdiSTROBJ_vEnumStart.c" #include "ntgdi/NtGdiGetDIBits.c" +#include "ntgdi/NtGdiGetStockObject.c" #include "ntuser/NtUserCallHwnd.c" #include "ntuser/NtUserCallHwndLock.c" @@ -50,7 +51,7 @@ /* ntgdi */ { L"NtGdiArcInternal", Test_NtGdiArcInternal }, { L"NtGdiBitBlt", Test_NtGdiBitBlt }, - { L"NtGdiCreateBitmap", Test_NtGdiCreateBitmap }, +{ L"NtGdiCreateBitmap", Test_NtGdiCreateBitmap }, { L"NtGdiCreateCompatibleBitmap", Test_NtGdiCreateCompatibleBitmap }, { L"NtGdiDoPalette", Test_NtGdiDoPalette }, { L"NtGdiEngCreatePalette", Test_NtGdiEngCreatePalette }, @@ -65,6 +66,7 @@ { L"NtGdiSelectPen", Test_NtGdiSelectPen }, // { L"NtGdiSTROBJ_vEnumStart", Test_NtGdiSTROBJ_vEnumStart }, { L"NtGdiGetDIBitsInternal", Test_NtGdiGetDIBitsInternal }, + { L"NtGdiGetStockObject", Test_NtGdiGetStockObject }, /* ntuser */ { L"NtUserCallHwnd", Test_NtUserCallHwnd },

1 0

[greatlrd] 33406: commit testcase for wdith negative and 0
by greatlrd＠svn.reactos.org 10 May '08

10 May '08

Author: greatlrd Date: Sat May 10 07:02:59 2008 New Revision: 33406 URL: http://svn.reactos.org/svn/reactos?rev=33406&view=rev Log: commit testcase for wdith negative and 0 Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c [iso-8859-1] Sat May 10 07:02:59 2008 @@ -158,6 +158,18 @@ TEST((hBmp = NtGdiCreateBitmap(1, -1, 1, 1, NULL)) == NULL); TEST(GetLastError() == ERROR_INVALID_PARAMETER); + /* Test witdth 0 params */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(0, 1, 1, 1, NULL)) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test witdth -1 params */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(-1, 0, 1, 1, NULL)) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + + return APISTATUS_NORMAL; }

1 0

[greatlrd] 33405: adding height -1 and height 0 test for create a bitmap
by greatlrd＠svn.reactos.org 10 May '08

10 May '08

Author: greatlrd Date: Sat May 10 06:55:58 2008 New Revision: 33405 URL: http://svn.reactos.org/svn/reactos?rev=33405&view=rev Log: adding height -1 and height 0 test for create a bitmap Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c [iso-8859-1] Sat May 10 06:55:58 2008 @@ -147,6 +147,17 @@ TEST(bitmap.bmBitsPixel == 8); DeleteObject(hBmp); + + /* Test height 0 params */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(1, 0, 1, 1, NULL)) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test height -1 params */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(1, -1, 1, 1, NULL)) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + return APISTATUS_NORMAL; }

1 0

[greatlrd] 33404: revert r33403 for it break abiword we need fixing gdi32.dll bugs before we can fix it correct
by greatlrd＠svn.reactos.org 10 May '08

10 May '08

Author: greatlrd Date: Sat May 10 06:42:00 2008 New Revision: 33404 URL: http://svn.reactos.org/svn/reactos?rev=33404&view=rev Log: revert r33403 for it break abiword we need fixing gdi32.dll bugs before we can fix it correct Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sat May 10 06:42:00 2008 @@ -43,24 +43,22 @@ SIZEL Size; LONG WidthBytes; - /* NOTE: Windows also doesn't store nr. of planes separately! */ BitsPixel = BITMAPOBJ_GetRealBitsPixel(BitsPixel * Planes); /* Check parameters */ - - if ( (Height <= 0) || (Width <= 0) || (Width > 0x7FFFFFFF) || - (Planes > 32) || (BitsPixel > 32) || (BitsPixel == 0) ) - { - DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", Width, Height, BitsPixel); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; - } + if (BitsPixel == 0 || Width < 0) + { + DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", Width, Height, BitsPixel); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } WidthBytes = BITMAPOBJ_GetWidthBytes(Width, Planes * BitsPixel); - Size.cx = Width; - Size.cy = Height; + Size.cx = abs(Width); + Size.cy = abs(Height); + /* Create the bitmap object. */ hBitmap = IntCreateBitmap(Size, WidthBytes, BitmapFormat(BitsPixel, BI_RGB), @@ -114,7 +112,14 @@ ProbeForRead(pUnsafeBits, cjBits, 1); } - hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); + if (0 == Width || 0 == Height) + { + hBitmap = IntGdiCreateBitmap (1, 1, 1, 1, NULL); + } + else + { + hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); + } } _SEH_HANDLE {

1 0

[greatlrd] 33403: 1. remove hack in NtGdiCreateBitmap 2. BugFix IntGdiCreateBitmap 1. Height can not be negative value 2. width can not be negative value 3. Planes or BitsPerPixel can not be biger that 32Bpp 4. BitsPerPixel can not be 0 5. width size is max 0x7FFFFFFF hex
by greatlrd＠svn.reactos.org 10 May '08

10 May '08

Author: greatlrd Date: Sat May 10 06:23:54 2008 New Revision: 33403 URL: http://svn.reactos.org/svn/reactos?rev=33403&view=rev Log: 1. remove hack in NtGdiCreateBitmap 2. BugFix IntGdiCreateBitmap 1. Height can not be negative value 2. width can not be negative value 3. Planes or BitsPerPixel can not be biger that 32Bpp 4. BitsPerPixel can not be 0 5. width size is max 0x7FFFFFFF hex Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sat May 10 06:23:54 2008 @@ -43,22 +43,24 @@ SIZEL Size; LONG WidthBytes; + /* NOTE: Windows also doesn't store nr. of planes separately! */ BitsPixel = BITMAPOBJ_GetRealBitsPixel(BitsPixel * Planes); /* Check parameters */ - if (BitsPixel == 0 || Width < 0) - { - DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", Width, Height, BitsPixel); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; - } + + if ( (Height <= 0) || (Width <= 0) || (Width > 0x7FFFFFFF) || + (Planes > 32) || (BitsPixel > 32) || (BitsPixel == 0) ) + { + DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", Width, Height, BitsPixel); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } WidthBytes = BITMAPOBJ_GetWidthBytes(Width, Planes * BitsPixel); - Size.cx = abs(Width); - Size.cy = abs(Height); - + Size.cx = Width; + Size.cy = Height; /* Create the bitmap object. */ hBitmap = IntCreateBitmap(Size, WidthBytes, BitmapFormat(BitsPixel, BI_RGB), @@ -112,14 +114,7 @@ ProbeForRead(pUnsafeBits, cjBits, 1); } - if (0 == Width || 0 == Height) - { - hBitmap = IntGdiCreateBitmap (1, 1, 1, 1, NULL); - } - else - { - hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); - } + hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); } _SEH_HANDLE {

1 0

[gbrunmar] 33402: Made user32.dll compile under MSVC (doesn't link though)
by gbrunmar＠svn.reactos.org 10 May '08

10 May '08

Author: gbrunmar Date: Sat May 10 05:29:19 2008 New Revision: 33402 URL: http://svn.reactos.org/svn/reactos?rev=33402&view=rev Log: Made user32.dll compile under MSVC (doesn't link though) Modified: trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/include/dde_private.h trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/misc/resources.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/spy.c trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sat May 10 05:29:19 2008 @@ -171,7 +171,7 @@ /* * These functions have trivial implementations * We still like to call them internally - * "static inline" makes them more like macro's + * "static __inline" makes them more like macro's */ static __inline BOOL EDIT_EM_CanUndo(EDITSTATE *es); static __inline void EDIT_EM_EmptyUndoBuffer(EDITSTATE *es); @@ -402,14 +402,14 @@ return version; } -static inline UINT get_text_length(EDITSTATE *es) +static __inline UINT get_text_length(EDITSTATE *es) { if(es->text_length == (UINT)-1) es->text_length = strlenW(es->text); return es->text_length; } -static inline void text_buffer_changed(EDITSTATE *es) +static __inline void text_buffer_changed(EDITSTATE *es) { es->text_length = (UINT)-1; } Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Sat May 10 05:29:19 2008 @@ -894,7 +894,7 @@ } } -static inline INT LISTBOX_lstrcmpiW( LCID lcid, LPCWSTR str1, LPCWSTR str2 ) +static __inline INT LISTBOX_lstrcmpiW( LCID lcid, LPCWSTR str1, LPCWSTR str2 ) { INT ret = CompareStringW( lcid, NORM_IGNORECASE, str1, -1, str2, -1 ); if (ret == CSTR_LESS_THAN) Modified: trunk/reactos/dll/win32/user32/include/dde_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/d… ============================================================================== --- trunk/reactos/dll/win32/user32/include/dde_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/dde_private.h [iso-8859-1] Sat May 10 05:29:19 2008 @@ -243,7 +243,7 @@ WPARAM wParam, LPARAM lParam); extern void WDML_NotifyThreadExit(DWORD tid); -static inline void WDML_ExtractAck(WORD status, DDEACK* da) +static __inline void WDML_ExtractAck(WORD status, DDEACK* da) { *da = *((DDEACK*)&status); } 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 05:29:19 2008 @@ -23,6 +23,7 @@ #include <windowsx.h> #include <winnls32.h> #include <ndk/ntndk.h> +#include <ddk/ntstatus.h> /* CSRSS Headers */ #include <csrss/csrss.h> @@ -37,6 +38,9 @@ /* Internal User32 Headers */ #include "user32p.h" + +#include <libs\pseh\pseh.h> +#include <libs\pseh\framebased.h> /* FIXME: Use ntgdi.h then cleanup... */ HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj); Modified: trunk/reactos/dll/win32/user32/misc/resources.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/reso… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] Sat May 10 05:29:19 2008 @@ -9,8 +9,8 @@ #define CR_INVALID_DATA 0x0000001F #endif -typedef DWORD STDCALL (*CMP_REGNOTIFY) (HANDLE, LPVOID, DWORD, PULONG); -typedef DWORD STDCALL (*CMP_UNREGNOTIFY) (ULONG ); +typedef DWORD (STDCALL *CMP_REGNOTIFY) (HANDLE, LPVOID, DWORD, PULONG); +typedef DWORD (STDCALL *CMP_UNREGNOTIFY) (ULONG ); /* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which does not seem to work properly for stack address space. */ Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat May 10 05:29:19 2008 @@ -1000,17 +1000,22 @@ DefWndScreenshot(HWND hWnd) { RECT rect; + HDC hdc; + INT w; + INT h; + HBITMAP hbitmap; + HDC hdc2; OpenClipboard(hWnd); EmptyClipboard(); - HDC hdc = GetWindowDC(hWnd); + hdc = GetWindowDC(hWnd); GetWindowRect(hWnd, &rect); - INT w = rect.right - rect.left; - INT h = rect.bottom - rect.top; - - HBITMAP hbitmap = CreateCompatibleBitmap(hdc, w, h); - HDC hdc2 = CreateCompatibleDC(hdc); + w = rect.right - rect.left; + h = rect.bottom - rect.top; + + hbitmap = CreateCompatibleBitmap(hdc, w, h); + hdc2 = CreateCompatibleDC(hdc); SelectObject(hdc2, hbitmap); BitBlt(hdc2, 0, 0, w, h, Modified: trunk/reactos/dll/win32/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/s… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/spy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/spy.c [iso-8859-1] Sat May 10 05:29:19 2008 @@ -1916,7 +1916,7 @@ /*********************************************************************** * get_indent_level */ -inline static INT_PTR get_indent_level(void) +__inline static INT_PTR get_indent_level(void) { return (INT_PTR)TlsGetValue( indent_tls_index ); } @@ -1925,7 +1925,7 @@ /*********************************************************************** * set_indent_level */ -inline static void set_indent_level( INT_PTR level ) +__inline static void set_indent_level( INT_PTR level ) { TlsSetValue( indent_tls_index, (void *)level ); } Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sat May 10 05:29:19 2008 @@ -277,6 +277,7 @@ { POINT mPos[2]; UINT id = 0; + HWND top_child; /* lpParams of WM_[NC]CREATE is different for MDI children. * MDICREATESTRUCT members have the originally passed values. @@ -309,7 +310,7 @@ WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX); } - HWND top_child = GetWindow(hWndParent, GW_CHILD); + top_child = GetWindow(hWndParent, GW_CHILD); if (top_child) { @@ -382,6 +383,7 @@ { POINT mPos[2]; UINT id = 0; + HWND top_child; /* lpParams of WM_[NC]CREATE is different for MDI children. * MDICREATESTRUCT members have the originally passed values. @@ -414,7 +416,7 @@ WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX); } - HWND top_child = GetWindow(hWndParent, GW_CHILD); + top_child = GetWindow(hWndParent, GW_CHILD); if (top_child) {

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