Ros-diffs January 2011

ros-diffs@reactos.org

20 participants
336 discussions

[tkreuzer] 50404: [GDI32_APITEST] Add tests for DPtoLP - More tests for CombineTransform, CreateBitmapIndirect and SelectObject
by tkreuzer＠svn.reactos.org 16 Jan '11

16 Jan '11

Author: tkreuzer Date: Sun Jan 16 20:53:48 2011 New Revision: 50404 URL: http://svn.reactos.org/svn/reactos?rev=50404&view=rev Log: [GDI32_APITEST] Add tests for DPtoLP - More tests for CombineTransform, CreateBitmapIndirect and SelectObject Added: trunk/rostests/apitests/gdi32/DPtoLP.c (with props) Modified: trunk/rostests/apitests/gdi32/CombineTransform.c trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c trunk/rostests/apitests/gdi32/SelectObject.c trunk/rostests/apitests/gdi32/gdi32_apitest.rbuild trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CombineTransform.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineTra… ============================================================================== --- trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] Sun Jan 16 20:53:48 2011 @@ -12,10 +12,33 @@ #include <reactos/win32k/ntgdityp.h> #include <reactos/win32k/ntgdihdl.h> +#define ok_int(x, y) ok(x == y, "Wrong value for " #x ", expected " #y ", got %ld\n", (long)x); +#define ok_flt(x, y) ok(x == y, "Wrong value for " #x ", expected " #y ", got %f\n", (double)x); + +#define ok_xform(xform, m11, m12, m21, m22, dx, dy) \ + ok_flt(xform.eM11, m11); \ + ok_flt(xform.eM12, m12); \ + ok_flt(xform.eM21, m21); \ + ok_flt(xform.eM22, m22); \ + ok_flt(xform.eDx, dx); \ + ok_flt(xform.eDy, dy); + void Test_CombineTransform() { XFORM xform1, xform2, xform3; BOOL ret; + + /* Test NULL paramters */ + SetLastError(ERROR_SUCCESS); + ret = CombineTransform(&xform3, &xform1, NULL); + ok_int(ret, 0); + ret = CombineTransform(&xform3, NULL, &xform2); + ok_int(ret, 0); + ret = CombineTransform(NULL, &xform1, &xform2); + ok_int(ret, 0); + ret = CombineTransform(&xform3, &xform1, &xform2); + ok_int(ret, 0); + ok_int(GetLastError(), ERROR_SUCCESS); /* 2 Identity matrices */ xform1.eM11 = 1.0; @@ -27,80 +50,49 @@ xform2 = xform1; SetLastError(ERROR_SUCCESS); ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 1, "expected ret = 1, got %d\n", ret); - ok(xform3.eM11 == 1.0, "eM11: Expected 1.0, got %f\n", xform3.eM11); - ok(xform3.eM12 == 0, "eM11: Expected 0, got %f\n", xform3.eM12); - ok(xform3.eM21 == 0, "eM11: Expected 0, got %f\n", xform3.eM21); - ok(xform3.eM22 == 1.0, "eM11: Expected 1.0, got %f\n", xform3.eM22); - ok(xform3.eDx == 0, "eM11: Expected 0, got %f\n", xform3.eDx); - ok(xform3.eDy == 0, "eM11: Expected 0, got %f\n", xform3.eDy); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(ret, 1); + ok_xform(xform3, 1.0, 0., 0., 1.0, 0., 0.); + ok_int(GetLastError(), ERROR_SUCCESS); /* 2 Identity matrices with offsets */ xform1.eDx = 20.0; xform1.eDy = -100; ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 1, "expected ret = 1, got %d\n", ret); - ok(xform3.eM11 == 1.0, "eM11: Expected 1.0, got %f\n", xform3.eM11); - ok(xform3.eM12 == 0, "eM11: Expected 0, got %f\n", xform3.eM12); - ok(xform3.eM21 == 0, "eM11: Expected 0, got %f\n", xform3.eM21); - ok(xform3.eM22 == 1.0, "eM11: Expected 1.0, got %f\n", xform3.eM22); - ok(xform3.eDx == 20.0, "eM11: Expected 20.0, got %f\n", xform3.eDx); - ok(xform3.eDy == -100, "eM11: Expected -100, got %f\n", xform3.eDy); + ok_int(ret, 1); + ok_xform(xform3, 1.0, 0., 0., 1.0, 20.0, -100.0); + xform2.eDx = -60.0; xform2.eDy = -20; ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 1, "expected ret = 1, got %d\n", ret); - ok(xform3.eDx == -40.0, "eM11: Expected 40.0, got %f\n", xform3.eDx); - ok(xform3.eDy == -120.0, "eM11: Expected -120.0, got %f\n", xform3.eDy); + ok_int(ret, 1); + ok_flt(xform3.eDx, -40.0); + ok_flt(xform3.eDy, -120.0); /* add some stretching */ xform2.eM11 = 2; xform2.eM22 = 4; ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 1, "expected ret = 1, got %d\n", ret); - ok(xform3.eM11 == 2.0, "eM11: Expected 2.0, got %f\n", xform3.eM11); - ok(xform3.eM12 == 0, "eM11: Expected 0, got %f\n", xform3.eM12); - ok(xform3.eM21 == 0, "eM11: Expected 0, got %f\n", xform3.eM21); - ok(xform3.eM22 == 4.0, "eM11: Expected 4.0, got %f\n", xform3.eM22); - ok(xform3.eDx == -20.0, "eM11: Expected 20.0, got %f\n", xform3.eDx); - ok(xform3.eDy == -420.0, "eM11: Expected 420.0, got %f\n", xform3.eDy); + ok_int(ret, 1); + ok_xform(xform3, 2.0, 0., 0., 4.0, -20.0, -420.0); /* add some more stretching */ xform1.eM11 = -2.5; xform1.eM22 = 0.5; ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 1, "expected ret = 1, got %d\n", ret); - ok(xform3.eM11 == -5.0, "eM11: Expected -5.0, got %f\n", xform3.eM11); - ok(xform3.eM12 == 0, "eM11: Expected 0, got %f\n", xform3.eM12); - ok(xform3.eM21 == 0, "eM11: Expected 0, got %f\n", xform3.eM21); - ok(xform3.eM22 == 2.0, "eM11: Expected 2.0, got %f\n", xform3.eM22); - ok(xform3.eDx == -20.0, "eM11: Expected 20.0, got %f\n", xform3.eDx); - ok(xform3.eDy == -420.0, "eM11: Expected 420.0, got %f\n", xform3.eDy); + ok_int(ret, 1); + ok_xform(xform3, -5.0, 0., 0., 2.0, -20.0, -420.0); xform1.eM12 = 2.0; xform1.eM21 = -0.5; ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 1, "expected ret = 1, got %d\n", ret); - ok(xform3.eM11 == -5.0, "eM11: Expected -5.0, got %f\n", xform3.eM11); - ok(xform3.eM12 == 8.0, "eM11: Expected 8.0, got %f\n", xform3.eM12); - ok(xform3.eM21 == -1.0, "eM11: Expected -1.0, got %f\n", xform3.eM21); - ok(xform3.eM22 == 2.0, "eM11: Expected 2.0, got %f\n", xform3.eM22); - ok(xform3.eDx == -20.0, "eM11: Expected 20.0, got %f\n", xform3.eDx); - ok(xform3.eDy == -420.0, "eM11: Expected 420.0, got %f\n", xform3.eDy); + ok_int(ret, 1); + ok_xform(xform3, -5.0, 8.0, -1.0, 2.0, -20.0, -420.0); xform2.eM12 = 4.0; xform2.eM21 = 6.5; ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 1, "expected ret = 1, got %d\n", ret); - ok(xform3.eM11 == 8.0, "eM11: Expected 8.0, got %f\n", xform3.eM11); - ok(xform3.eM12 == -2.0, "eM11: Expected -2.0, got %f\n", xform3.eM12); - ok(xform3.eM21 == 2.25, "eM11: Expected 2.25, got %f\n", xform3.eM21); - ok(xform3.eM22 == 0.00, "eM11: Expected 0.00, got %f\n", xform3.eM22); - ok(xform3.eDx == -670.0, "eM11: Expected -670.0, got %f\n", xform3.eDx); - ok(xform3.eDy == -340.0, "eM11: Expected -340.0, got %f\n", xform3.eDy); - ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 1, "expected ret = 1, got %d\n", ret); + ok_int(ret, 1); + ok_xform(xform3, 8.0, -2.0, 2.25, 0.0, -670.0, -340.0); xform1.eM11 = 1.; xform1.eM12 = 0; @@ -118,48 +110,63 @@ xform1.eDx = 4294967167.999999762; ok(xform1.eDx == 4294967296.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 0, "expected ret = 0, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(ret, 0); + ok_int(GetLastError(), ERROR_SUCCESS); xform1.eDx = -4294967167.999999761; ok(xform1.eDx == -4294967040.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 1, "expected ret = 1, got %d\n", ret); + ok_int(ret, 1); xform1.eDx = -4294967167.999999762; ok(xform1.eDx == -4294967296.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 0, "expected ret = 0, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(ret, 0); + ok_int(GetLastError(), ERROR_SUCCESS); xform1.eDx = 0; xform1.eDy = 4294967167.999999761; ok(xform1.eDy == 4294967040.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 1, "expected ret = 1, got %d\n", ret); + ok_int(ret, 1); + + xform2.eDy = 1; + ret = CombineTransform(&xform3, &xform1, &xform2); + ok_int(ret, 1); xform1.eDy = 4294967167.999999762; ok(xform1.eDy == 4294967296.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 0, "expected ret = 0, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(ret, 0); + ok_int(GetLastError(), ERROR_SUCCESS); xform1.eDy = -4294967167.999999761; ok(xform1.eDy == -4294967040.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 1, "expected ret = 1, got %d\n", ret); + ok_int(ret, 1); xform1.eDy = -4294967167.999999762; ok(xform1.eDy == -4294967296.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 0, "expected ret = 0, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(ret, 0); + ok_int(GetLastError(), ERROR_SUCCESS); + + xform2.eDy = 10000; + ret = CombineTransform(&xform3, &xform1, &xform2); + ok_int(ret, 1); + + xform1.eDx = -4294967167.999999762; + xform1.eM11 = 1000.0; + xform2.eM11 = 1000.0; + ret = CombineTransform(&xform3, &xform1, &xform2); + ok_int(ret, 0); + ok_int(GetLastError(), ERROR_SUCCESS); xform1.eDx = 100000.0; xform2.eM11 = 100000.0; ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 0, "expected ret = 0, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(ret, 0); + ok_int(GetLastError(), ERROR_SUCCESS); /* Some undefined values */ *(DWORD*)&xform1.eM11 = 0xffc00000; // (0.0F/0.0F) @@ -171,14 +178,14 @@ xform2 = xform1; SetLastError(ERROR_SUCCESS); ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 1, "expected ret = 1, got %d\n", ret); + ok_int(ret, 1); ok(*(DWORD*)&xform3.eM11 == 0xffc00000, "eM11: Expected 0xffc00000, got 0x%lx\n", *(DWORD*)&xform3.eM11); ok(xform3.eM12 == 0, "eM12: Expected 0, got %f\n", xform3.eM12); ok(xform3.eM21 == 0, "eM21: Expected 0, got %f\n", xform3.eM21); ok(*(DWORD*)&xform3.eM22 == 0x7f800000, "eM22: Expected 0x7f800000, got 0x%lx\n", *(DWORD*)&xform3.eM22); ok(xform3.eDx == 0, "eDx: Expected 0, got %f\n", xform3.eDx); ok(xform3.eDy == 0, "eDy: Expected 0, got %f\n", xform3.eDy); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(GetLastError(), ERROR_SUCCESS); /* Some undefined values */ xform2.eM11 = 1.; @@ -186,14 +193,15 @@ xform2.eM12 = 1.; xform2.eM21 = 1.; ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 1, "expected ret = 1, got %d\n", ret); - ok(*(DWORD*)&xform3.eM11 == 0xffc00000, "eM11: Expected 0xffc00000, got 0x%lx\n", *(DWORD*)&xform3.eM11); - ok(*(DWORD*)&xform3.eM12 == 0xffc00000, "eM12: Expected 0xffc00000, got 0x%lx\n", *(DWORD*)&xform3.eM12); - ok(*(DWORD*)&xform3.eM21 == 0x7f800000, "eM21: Expected 0x7f800000, got 0x%lx\n", *(DWORD*)&xform3.eM21); - ok(*(DWORD*)&xform3.eM22 == 0x7f800000, "eM22: Expected 0x7f800000, got 0x%lx\n", *(DWORD*)&xform3.eM22); + ok_int(ret, 1); + + ok_int(*(DWORD*)&xform3.eM11, 0xffc00000); + ok_int(*(DWORD*)&xform3.eM12, 0xffc00000); + ok_int(*(DWORD*)&xform3.eM21, 0x7f800000); + ok_int(*(DWORD*)&xform3.eM22, 0x7f800000); ok(xform3.eDx == 0, "eDx: Expected 0, got %f\n", xform3.eDx); ok(xform3.eDy == 0, "eDy: Expected 0, got %f\n", xform3.eDy); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(GetLastError(), ERROR_SUCCESS); } Modified: trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c [iso-8859-1] Sun Jan 16 20:53:48 2011 @@ -59,6 +59,17 @@ win_hBmp = CreateBitmapIndirect(&win_bitmap); ok(win_hBmp != 0, "CreateBitmapIndirect failed\n"); + RtlZeroMemory(&win_bitmap,sizeof(BITMAP)); + win_bitmap.bmBits = 0; + win_bitmap.bmBitsPixel = 8; + win_bitmap.bmHeight = 0xF000; + win_bitmap.bmPlanes = 1; + win_bitmap.bmType = 1; + win_bitmap.bmWidth = 0x8000; + win_bitmap.bmWidthBytes = win_bitmap.bmWidth; + win_hBmp = CreateBitmapIndirect(&win_bitmap); + ok(win_hBmp != 0, "CreateBitmapIndirect failed\n"); + DeleteObject(win_hBmp); } Added: trunk/rostests/apitests/gdi32/DPtoLP.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/DPtoLP.c?r… ============================================================================== --- trunk/rostests/apitests/gdi32/DPtoLP.c (added) +++ trunk/rostests/apitests/gdi32/DPtoLP.c [iso-8859-1] Sun Jan 16 20:53:48 2011 @@ -1,0 +1,191 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for ... + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +#define ok_int(x, y) ok(x == y, "Wrong value for " #x ", expected " #y ", got %ld\n", (long)x); + +void Test_DPtoLP_Params() +{ + BOOL ret; + HDC hdc; + POINT apt[2]; + + apt[0].x = 0; + apt[0].y = 0; + apt[1].x = -1000; + apt[1].y = 1000; + + SetLastError(ERROR_SUCCESS); + ret = DPtoLP(NULL, NULL, 0); + ok(ret == 1, "Expected ret == 1, got %d\n", ret); + ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + + ret = DPtoLP(NULL, NULL, -1); + ok(ret == 1, "Expected ret == 1, got %d\n", ret); + ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + + ret = DPtoLP(NULL, (PVOID)0x80000000, -1); + ok(ret == 1, "Expected ret == 1, got %d\n", ret); + ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + + ret = DPtoLP(NULL, NULL, 2); + ok(ret == 0, "Expected ret == 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Exected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + + SetLastError(ERROR_SUCCESS); + ret = DPtoLP(NULL, apt, 2); + ok(ret == 0, "Expected ret == 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Exected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + + SetLastError(ERROR_SUCCESS); + ret = DPtoLP(NULL, apt, 0); + ok(ret == 1, "Expected ret == 1, got %d\n", ret); + ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + + SetLastError(ERROR_SUCCESS); + ret = DPtoLP(NULL, apt, -2); + ok(ret == 1, "Expected ret == 1, got %d\n", ret); + ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + + SetLastError(ERROR_SUCCESS); + ret = DPtoLP((HDC)-4, apt, -2); + ok(ret == 1, "Expected ret == 1, got %d\n", ret); + ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + + hdc = GetDC(0); + SetLastError(ERROR_SUCCESS); + ret = DPtoLP(hdc, NULL, 2); + ok(ret == 1, "Expected ret == 1, got %d\n", ret); + ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + + hdc = GetDC(0); + SetLastError(ERROR_SUCCESS); + ret = DPtoLP(hdc, (PVOID)0x80000000, 2); + ok(ret == 1, "Expected ret == 1, got %d\n", ret); + ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + + + ReleaseDC(0, hdc); +} + +void Test_DPtoLP() +{ + BOOL ret; + HDC hdc; + POINT apt[2]; + XFORM xform; + + apt[0].x = 1; + apt[0].y = 1; + apt[1].x = -1000; + apt[1].y = 1000; + + hdc = GetDC(0); + + SetMapMode(hdc, MM_TEXT); + ret = DPtoLP(hdc, apt, 2); + ok(ret == 1, "Expected ret == 1, got %d\n", ret); + ok_int(apt[0].x, 1); + ok_int(apt[0].y, 1); + ok_int(apt[1].x, -1000); + ok_int(apt[1].y, 1000); + + SetMapMode(hdc, MM_LOMETRIC); + ret = DPtoLP(hdc, apt, 2); + ok(ret == 1, "Expected ret == 1, got %d\n", ret); + ok_int(apt[0].x, 4); + ok_int(apt[0].y, -4); + ok_int(apt[1].x, -3527); + ok_int(apt[1].y, -3527); + + SetGraphicsMode(hdc, GM_ADVANCED); + SetMapMode(hdc, MM_ANISOTROPIC); + + xform.eM11 = 1.; + xform.eM12 = 0.; + xform.eM21 = 0.; + xform.eM22 = 1.; + xform.eDx = 4294967167.999999761; + xform.eDy = 1.; + ret = SetWorldTransform(hdc, &xform); + ok(ret == 1, "ret\n"); + + ret = DPtoLP(hdc, apt, 2); + ok(ret == 1, "Expected ret == 0, got %d\n", ret); + ok_int(apt[0].x, 526); + ok_int(apt[0].y, 13); + ok_int(apt[1].x, -11929); + ok_int(apt[1].y, 12440); + + xform.eM11 = 10000000.; + ret = SetWorldTransform(hdc, &xform); + ret = DPtoLP(hdc, apt, 2); + ok(ret == 1, "Expected ret == 0, got %d\n", ret); + ok_int(apt[0].x, -429); + ok_int(apt[0].y, -47); + ok_int(apt[1].x, -429); + ok_int(apt[1].y, -43881); + + xform.eM11 = 1.; + xform.eDx = 4294967167.999999762; // this is too big + ret = SetWorldTransform(hdc, &xform); + ok(ret == 1, "ret\n"); + ret = DPtoLP(hdc, apt, 2); + ok(ret == 0, "Expected ret == 0, got %d\n", ret); + ok_int(apt[0].x, -429); + ok_int(apt[0].y, -47); + ok_int(apt[1].x, -429); + ok_int(apt[1].y, -43881); + + xform.eM11 = 2.; + xform.eDx = 4294967167.999999762; + ret = SetWorldTransform(hdc, &xform); + ok(ret == 1, "ret\n"); + ret = DPtoLP(hdc, apt, 2); + ok(ret == 1, "Expected ret == 1, got %d\n", ret); + ok_int(apt[0].x, 2147482891); + ok_int(apt[0].y, 165); + ok_int(apt[1].x, 2147482891); + ok_int(apt[1].y, 154782); + + apt[0].x = 1; + apt[0].y = 1; + apt[1].x = -1000; + apt[1].y = 1000; + + xform.eM11 = 10000000.; + ret = SetWorldTransform(hdc, &xform); + ok(ret == 1, "ret\n"); + ret = DPtoLP(hdc, apt, 2); + ok(ret == 1, "Expected ret == 1, got %d\n", ret); + ok_int(apt[0].x, -429); + ok_int(apt[0].y, -5); + ok_int(apt[1].x, -429); + ok_int(apt[1].y, -3528); + + xform.eM11 = 1000000.; + ret = SetWorldTransform(hdc, &xform); + ok(ret == 1, "ret\n"); + ret = DPtoLP(hdc, apt, 2); + ok(ret == 1, "Expected ret == 1, got %d\n", ret); + ok_int(apt[0].x, -4295); + ok_int(apt[0].y, 17); + ok_int(apt[1].x, -4295); + ok_int(apt[1].y, 12443); + + ReleaseDC(0, hdc); +} + +START_TEST(DPtoLP) +{ + Test_DPtoLP_Params(); + Test_DPtoLP(); +} + Propchange: trunk/rostests/apitests/gdi32/DPtoLP.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/SelectObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SelectObje… ============================================================================== --- trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] Sun Jan 16 20:53:48 2011 @@ -113,6 +113,13 @@ hOldObj = SelectObject(hDC, hOldObj); RTEST(hOldObj == hNewObj); + /* Test invalid BITMAP */ + hNewObj = CreateBitmap(2, 2, 1, 4, &bmBits); + ok(hNewObj != NULL, "CreateBitmap failed. Skipping tests.\n"); + if (hNewObj == NULL) return; + hOldObj = SelectObject(hDC, hNewObj); + ok(hOldObj == NULL, "should fail\n"); + /* Test CLIOBJ */ /* Test PATH */ Modified: trunk/rostests/apitests/gdi32/gdi32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/gdi32_apit… ============================================================================== --- trunk/rostests/apitests/gdi32/gdi32_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/gdi32_apitest.rbuild [iso-8859-1] Sun Jan 16 20:53:48 2011 @@ -19,6 +19,7 @@ <file>CreateFontIndirect.c</file> <file>CreatePen.c</file> <file>CreateRectRgn.c</file> + <file>DPtoLP.c</file> <file>EngAcquireSemaphore.c</file> <file>EngCreateSemaphore.c</file> <file>EngDeleteSemaphore.c</file> Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Sun Jan 16 20:53:48 2011 @@ -15,6 +15,7 @@ extern void func_CreateFontIndirect(void); extern void func_CreatePen(void); extern void func_CreateRectRgn(void); +extern void func_DPtoLP(void); extern void func_EngAcquireSemaphore(void); extern void func_EngCreateSemaphore(void); extern void func_EngDeleteSemaphore(void); @@ -59,6 +60,7 @@ { "CreateFontIndirect", func_CreateFontIndirect }, { "CreatePen", func_CreatePen }, { "CreateRectRgn", func_CreateRectRgn }, + { "DPtoLP", func_DPtoLP }, { "EngAcquireSemaphore", func_EngAcquireSemaphore }, { "EngCreateSemaphore", func_EngCreateSemaphore }, { "EngDeleteSemaphore", func_EngDeleteSemaphore },

1 0

[tkreuzer] 50403: [AMD64] Add ksamd64.inc
by tkreuzer＠svn.reactos.org 16 Jan '11

16 Jan '11

Author: tkreuzer Date: Sun Jan 16 18:16:24 2011 New Revision: 50403 URL: http://svn.reactos.org/svn/reactos?rev=50403&view=rev Log: [AMD64] Add ksamd64.inc Added: trunk/reactos/include/reactos/ksamd64.inc (with props) Added: trunk/reactos/include/reactos/ksamd64.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/ksamd64.in… ============================================================================== --- trunk/reactos/include/reactos/ksamd64.inc (added) +++ trunk/reactos/include/reactos/ksamd64.inc [iso-8859-1] Sun Jan 16 18:16:24 2011 @@ -1,0 +1,1074 @@ + +/* Pointer size */ +SizeofPointer = 0x8 + +/* Breakpoints */ +BREAKPOINT_BREAK = 0x0 +BREAKPOINT_PRINT = 0x1 +BREAKPOINT_PROMPT = 0x2 +BREAKPOINT_LOAD_SYMBOLS = 0x3 +BREAKPOINT_UNLOAD_SYMBOLS = 0x4 +BREAKPOINT_COMMAND_STRING = 0x5 + +/* Context Frame Flags */ +CONTEXT_FULL = 0x10000b +CONTEXT_CONTROL = 0x100001 +CONTEXT_INTEGER = 0x100002 +CONTEXT_SEGMENTS = 0x100004 +CONTEXT_FLOATING_POINT = 0x100008 +CONTEXT_DEBUG_REGISTERS = 0x100010 + +/* Exception flags */ +EXCEPTION_NONCONTINUABLE = 0x1 +EXCEPTION_UNWINDING = 0x2 +EXCEPTION_EXIT_UNWIND = 0x4 +EXCEPTION_STACK_INVALID = 0x8 +EXCEPTION_NESTED_CALL = 0x10 +EXCEPTION_TARGET_UNWIND = 0x20 +EXCEPTION_COLLIDED_UNWIND = 0x20 +EXCEPTION_UNWIND = 0x6 +EXCEPTION_EXECUTE_HANDLER = 0x1 +EXCEPTION_CONTINUE_SEARCH = 0x0 +EXCEPTION_CONTINUE_EXECUTION = 0xffffffff + +/* Exception types */ +ExceptionContinueExecution = 0x0 +ExceptionContinueSearch = 0x1 +ExceptionNestedException = 0x2 +ExceptionCollidedUnwind = 0x3 + +/* Lock Queue */ +LOCK_QUEUE_WAIT = 0x1 +LOCK_QUEUE_OWNER = 0x2 +LockQueueDispatcherLock = 0x0 + +/* Process states */ +ProcessInMemory = 0x0 +ProcessOutOfMemory = 0x1 +ProcessInTransition = 0x2 + +/* Processor mode */ +KernelMode = 0x0 +UserMode = 0x1 + +/* Status codes */ +STATUS_ACCESS_VIOLATION = 0xc0000005 +STATUS_ASSERTION_FAILURE = 0xc0000420 +STATUS_ARRAY_BOUNDS_EXCEEDED = 0xc000008c +STATUS_BAD_COMPRESSION_BUFFER = 0xc0000242 +STATUS_BREAKPOINT = 0x80000003 +STATUS_CALLBACK_POP_STACK = 0xc0000423 +STATUS_DATATYPE_MISALIGNMENT = 0x80000002 +STATUS_FLOAT_DENORMAL_OPERAND = 0xc000008d +STATUS_FLOAT_DIVIDE_BY_ZERO = 0xc000008e +STATUS_FLOAT_INEXACT_RESULT = 0xc000008f +STATUS_FLOAT_INVALID_OPERATION = 0xc0000090 +STATUS_FLOAT_OVERFLOW = 0xc0000091 +STATUS_FLOAT_STACK_CHECK = 0xc0000092 +STATUS_FLOAT_UNDERFLOW = 0xc0000093 +STATUS_FLOAT_MULTIPLE_FAULTS = 0xc00002b4 +STATUS_FLOAT_MULTIPLE_TRAPS = 0xc00002b5 +STATUS_GUARD_PAGE_VIOLATION = 0x80000001 +STATUS_ILLEGAL_FLOAT_CONTEXT = 0xc000014a +STATUS_ILLEGAL_INSTRUCTION = 0xc000001d +STATUS_INSTRUCTION_MISALIGNMENT = 0xc00000aa +STATUS_INVALID_HANDLE = 0xc0000008 +STATUS_INVALID_LOCK_SEQUENCE = 0xc000001e +STATUS_INVALID_OWNER = 0xc000005a +STATUS_INVALID_PARAMETER = 0xc000000d +STATUS_INVALID_PARAMETER_1 = 0xc00000ef +STATUS_INVALID_SYSTEM_SERVICE = 0xc000001c +STATUS_INTEGER_DIVIDE_BY_ZERO = 0xc0000094 +STATUS_INTEGER_OVERFLOW = 0xc0000095 +STATUS_IN_PAGE_ERROR = 0xc0000006 +STATUS_KERNEL_APC = 0x100 +STATUS_LONGJUMP = 0x80000026 +STATUS_NO_CALLBACK_ACTIVE = 0xc0000258 +STATUS_NO_EVENT_PAIR = 0xc000014e +STATUS_PRIVILEGED_INSTRUCTION = 0xc0000096 +STATUS_SINGLE_STEP = 0x80000004 +STATUS_STACK_BUFFER_OVERRUN = 0xc0000409 +STATUS_STACK_OVERFLOW = 0xc00000fd +STATUS_SUCCESS = 0x0 +STATUS_THREAD_IS_TERMINATING = 0xc000004b +STATUS_TIMEOUT = 0x102 +STATUS_UNWIND = 0xc0000027 +STATUS_UNWIND_CONSOLIDATE = 0x80000029 +STATUS_USER_APC = 0xc0 +STATUS_WAKE_SYSTEM_DEBUGGER = 0x80000007 + +/* TLS defines */ +TLS_MINIMUM_AVAILABLE = 0x40 +TLS_EXPANSION_SLOTS = 0x400 + +/* Thread states */ +Initialized = 0x0 +Ready = 0x1 +Running = 0x2 +Standby = 0x3 +Terminated = 0x4 +Waiting = 0x5 + +/* Wait type / reason */ +WrExecutive = 0x7 +WrMutex = 0x1d +WrDispatchInt = 0x1f +WrQuantumEnd = 0x1e +WrEventPair = 0xe +WaitAny = 0x1 +WaitAll = 0x0 + +/* Interrupt object types */ +InLevelSensitive = 0x0 +InLatched = 0x1 + +/* Bug Check Codes */ +APC_INDEX_MISMATCH = 0x1 +INVALID_AFFINITY_SET = 0x3 +INVALID_DATA_ACCESS_TRAP = 0x4 +IRQL_NOT_GREATER_OR_EQUAL = 0x9 +IRQL_NOT_LESS_OR_EQUAL = 0xa +NO_USER_MODE_CONTEXT = 0xe +SPIN_LOCK_ALREADY_OWNED = 0xf +SPIN_LOCK_NOT_OWNED = 0x10 +THREAD_NOT_MUTEX_OWNER = 0x11 +TRAP_CAUSE_UNKNOWN = 0x12 +KMODE_EXCEPTION_NOT_HANDLED = 0x1e +KERNEL_APC_PENDING_DURING_EXIT = 0x20 +PANIC_STACK_SWITCH = 0x2b +DATA_BUS_ERROR = 0x2e +INSTRUCTION_BUS_ERROR = 0x2f +SYSTEM_EXIT_OWNED_MUTEX = 0x39 +PAGE_FAULT_WITH_INTERRUPTS_OFF = 0x49 +IRQL_GT_ZERO_AT_SYSTEM_SERVICE = 0x4a +DATA_COHERENCY_EXCEPTION = 0x55 +INSTRUCTION_COHERENCY_EXCEPTION = 0x56 +HAL1_INITIALIZATION_FAILED = 0x61 +UNEXPECTED_KERNEL_MODE_TRAP = 0x7f +NMI_HARDWARE_FAILURE = 0x80 +SPIN_LOCK_INIT_FAILURE = 0x81 +ATTEMPTED_SWITCH_FROM_DPC = 0xb8 + +/* IRQL */ +PASSIVE_LEVEL = 0x0 +APC_LEVEL = 0x1 +DISPATCH_LEVEL = 0x2 +CLOCK_LEVEL = 0xd +IPI_LEVEL = 0xe +POWER_LEVEL = 0xe +PROFILE_LEVEL = 0xf +HIGH_LEVEL = 0xf +#ifdef NT_UP +SYNCH_LEVEL = 0x2 +#else +SYNCH_LEVEL = 0xc +#endif + +/* Stack sizes */ +KERNEL_STACK_SIZE = 0x6000 +KERNEL_LARGE_STACK_SIZE = 0x12000 +KERNEL_LARGE_STACK_COMMIT = 0x6000 +KERNEL_MCA_EXCEPTION_STACK_SIZE = 0x2000 +NMI_STACK_SIZE = 0x2000 + +/* Miscellaneous Definitions */ +LOW_REALTIME_PRIORITY = 0x10 +CLOCK_QUANTUM_DECREMENT = 0x3 +WAIT_QUANTUM_DECREMENT = 0x1 +MAXIMUM_PROCESSORS = 0x40 +INITIAL_STALL_COUNT = 0x64 +KI_EXCEPTION_ACCESS_VIOLATION = 0x10000004 +Executive = 0x0 +FALSE = 0x0 +TRUE = 0x1 +DBG_STATUS_CONTROL_C = 0x1 +USER_SHARED_DATA = 0x7ffe0000 +PAGE_SIZE = 0x1000 +MAXIMUM_IDTVECTOR = 0xff +PRIMARY_VECTOR_BASE = 0x30 +RPL_MASK = 0x3 +MODE_MASK = 0x1 +NUMBER_SERVICE_TABLES = 0x2 +SERVICE_NUMBER_MASK = 0xfff +SERVICE_TABLE_SHIFT = 0x7 +SERVICE_TABLE_MASK = 0x20 +SERVICE_TABLE_TEST = 0x20 + +/* KAPC */ +ApType = 0x0 +ApSize = 0x2 +ApThread = 0x8 +ApApcListEntry = 0x10 +ApKernelRoutine = 0x20 +ApRundownRoutine = 0x28 +ApNormalRoutine = 0x30 +ApNormalContext = 0x38 +ApSystemArgument1 = 0x40 +ApSystemArgument2 = 0x48 +ApApcStateIndex = 0x50 +ApApcMode = 0x51 +ApInserted = 0x52 +ApcObjectLength = 0x58 + +/* KAPC_STATE */ +AsApcListHead = 0x0 +AsProcess = 0x20 +AsKernelApcInProgress = 0x28 +AsKernelApcPending = 0x29 +AsUserApcPending = 0x2a + +/* CLIENT_ID */ +CidUniqueProcess = 0x0 +CidUniqueThread = 0x8 + +/* RTL_CRITICAL_SECTION */ +CsDebugInfo = 0x0 +CsLockCount = 0x8 +CsRecursionCount = 0xc +CsOwningThread = 0x10 +CsLockSemaphore = 0x18 +CsSpinCount = 0x20 + +/* RTL_CRITICAL_SECTION_DEBUG */ +CsType = 0x0 +CsCreatorBackTraceIndex = 0x2 +CsCriticalSection = 0x8 +CsProcessLocksList = 0x10 +CsEntryCount = 0x20 +CsContentionCount = 0x24 + +/* KDEVICE_QUEUE_ENTRY */ +DeDeviceListEntry = 0x0 +DeSortKey = 0x10 +DeInserted = 0x14 +DeviceQueueEntryLength = 0x18 + +/* KDPC */ +DpType = 0x0 +DpImportance = 0x1 +DpNumber = 0x2 +DpDpcListEntry = 0x8 +DpDeferredRoutine = 0x18 +DpDeferredContext = 0x20 +DpSystemArgument1 = 0x28 +DpSystemArgument2 = 0x30 +DpDpcData = 0x38 +DpcObjectLength = 0x40 + +/* KDEVICE_QUEUE */ +DvType = 0x0 +DvSize = 0x2 +DvDeviceListHead = 0x8 +DvSpinLock = 0x18 +DvBusy = 0x20 +DeviceQueueObjectLength = 0x28 + +/* EXCEPTION_RECORD */ +ErExceptionCode = 0x0 +ErExceptionFlags = 0x4 +ErExceptionRecord = 0x8 +ErExceptionAddress = 0x10 +ErNumberParameters = 0x18 +ErExceptionInformation = 0x20 +ExceptionRecordLength = 0x98 +EXCEPTION_RECORD_LENGTH = 0x98 + +/* EPROCESS */ +EpDebugPort = 0x110 +EpVdmObjects = 0x1f0 +ExecutiveProcessObjectLength = 0x3a0 + +/* KEVENT */ +EvType = 0x0 +EvSize = 0x2 +EvSignalState = 0x4 +EvWaitListHead = 0x8 +EventObjectLength = 0x18 + +/* FAST_MUTEX */ +FmCount = 0x0 +FmOwner = 0x8 +FmContention = 0x10 +FmOldIrql = 0x30 + +/* KINTERRUPT */ +InType = 0x0 +InSize = 0x2 +InInterruptListEntry = 0x8 +InServiceRoutine = 0x18 +InServiceContext = 0x20 +InSpinLock = 0x28 +InTickCount = 0x30 +InActualLock = 0x38 +InDispatchAddress = 0x40 +InVector = 0x48 +InIrql = 0x4c +InSynchronizeIrql = 0x4d +InFloatingSave = 0x4e +InConnected = 0x4f +InNumber = 0x50 +InShareVector = 0x51 +InMode = 0x54 +InServiceCount = 0x58 +InDispatchCount = 0x5c +InDispatchCode = 0x60 +InterruptObjectLength = 0x208 + +/* IO_STATUS_BLOCK */ +IoStatus = 0x0 +IoPointer = 0x0 +IoInformation = 0x8 + +/* KNODE */ +KnPfnDereferenceSListHead = 0x10 +KnProcessorMask = 0x20 +KnColor = 0x28 +KnSeed = 0x2c +KnNodeNumber = 0x2d +KnFlags = 0x2e +knMmShiftedColor = 0x32 +KnFreeCount = 0x36 +KnPfnDeferredList = 0x3e +KNODE_SIZE = 0x46 + +/* KSPIN_LOCK_QUEUE */ +LqNext = 0x0 +LqLock = 0x8 + +/* KLOCK_QUEUE_HANDLE */ +LqhNext = 0x0 +LqhLock = 0x8 +LqhOldIrql = 0x10 +LOCK_QUEUE_HEADER_SIZE = 0x18 + +/* LARGE_INTEGER */ +LiLowPart = 0x0 +LiHighPart = 0x4 + +/* LIST_ENTRY */ +LsFlink = 0x0 +LsBlink = 0x8 + +/* PEB */ +PeKernelCallbackTable = 0x58 +ProcessEnvironmentBlockLength = 0x358 + +/* KPROFILE */ +PfType = 0x0 +PfSize = 0x2 +PfProfileListEntry = 0x8 +PfProcess = 0x18 +PfRangeBase = 0x20 +PfRangeLimit = 0x28 +PfBucketShift = 0x30 +PfBuffer = 0x38 +PfSegment = 0x40 +PfAffinity = 0x48 +PfSource = 0x50 +PfStarted = 0x54 +ProfileObjectLength = 0x58 + +/* PORT_MESSAGE */ +PmLength = 0x0 +PmZeroInit = 0x4 +PmClientId = 0x8 +PmProcess = 0x8 +PmThread = 0x10 +PmMessageId = 0x18 +PmClientViewSize = 0x1c +PortMessageLength = 0x24 + +/* KPROCESS */ +PrType = 0x0 +PrSize = 0x2 +PrSignalState = 0x4 +PrProfileListHead = 0x18 +PrDirectoryTableBase = 0x28 +PrActiveProcessors = 0x30 +PrKernelTime = 0x34 +PrUserTime = 0x38 +PrReadyListHead = 0x40 +PrSwapListEntry = 0x50 +PrThreadListHead = 0x60 +PrProcessLock = 0x70 +PrAffinity = 0x78 +PrProcessFlags = 0x80 +PrBasePriority = 0x84 +PrQuantumReset = 0x85 +PrState = 0x86 +PrStackCount = 0x8c +KernelProcessObjectLength = 0xa0 + +/* KQUEUE */ +QuType = 0x0 +QuSize = 0x2 +QuSignalState = 0x4 +QuEntryListHead = 0x18 +QuCurrentCount = 0x28 +QuMaximumCount = 0x2c +QuThreadListHead = 0x30 +QueueObjectLength = 0x40 + +/* STRING */ +StrLength = 0x0 +StrMaximumLength = 0x2 +StrBuffer = 0x8 + +/* TEB */ +TeCmTeb = 0x0 +TeStackBase = 0x8 +TeStackLimit = 0x10 +TeFiberData = 0x20 +TeSelf = 0x30 +TeEnvironmentPointer = 0x38 +TeClientId = 0x40 +TeActiveRpcHandle = 0x50 +TeThreadLocalStoragePointer = 0x58 +TeCountOfOwnedCriticalSections = 0x6c +TePeb = 0x60 +TeCsrClientThread = 0x70 +TeWOW32Reserved = 0x100 +TeExceptionCode = 0x2c0 +TeActivationContextStackPointer = 0x2c8 +TeGdiClientPID = 0x7f0 +TeGdiClientTID = 0x7f4 +TeGdiThreadLocalInfo = 0x7f8 +TeglDispatchTable = 0x9f0 +TeglReserved1 = 0x1138 +TeglReserved2 = 0x1220 +TeglSectionInfo = 0x1228 +TeglSection = 0x1230 +TeglTable = 0x1238 +TeglCurrentRC = 0x1240 +TeglContext = 0x1248 +TeDeallocationStack = 0x1478 +TeTlsSlots = 0x1480 +TeTlsExpansionSlots = 0x1780 +TeLastErrorValue = 0x68 +TeVdm = 0x1690 +TeInstrumentation = 0x16b8 +TeGdiBatchCount = 0x1740 +TeGuaranteedStackBytes = 0x1748 +TeFlsData = 0x17c8 +ThreadEnvironmentBlockLength = 0x17d8 + +/* TIME_FIELDS */ +TfSecond = 0xa +TfMinute = 0x8 +TfHour = 0x6 +TfWeekday = 0xe +TfDay = 0x4 +TfMonth = 0x2 +TfYear = 0x0 +TfMilliseconds = 0xc + +/* KTHREAD */ +ThType = 0x0 +ThSize = 0x2 +ThLock = 0x0 +ThDebugActive = 0x3 +ThSignalState = 0x4 +ThInitialStack = 0x28 +ThStackLimit = 0x30 +ThKernelStack = 0x38 +ThThreadLock = 0x40 +ThAlerted = 0x9e +ThApcState = 0x48 +ThPriority = 0x9b +ThSwapBusy = 0x9d +ThNextProcessor = 0x60 +ThDeferredProcessor = 0x61 +ThApcQueueLock = 0x78 +ThContextSwitches = 0x80 +ThState = 0x84 +ThNpxState = 0x85 +ThWaitIrql = 0x86 +ThWaitMode = 0x87 +ThWaitStatus = 0x88 +ThWaitBlockList = 0x90 +ThGateObject = 0x90 +ThWaitListEntry = 0xa0 +ThSwapListEntry = 0xa0 +ThQueue = 0xb0 +ThWaitTime = 0xb8 +ThCombinedApcDisable = 0xbc +ThKernelApcDisable = 0xbc +ThSpecialApcDisable = 0xbe +ThTeb = 0xc0 +ThTimer = 0xc8 +ThThreadFlags = 0xf0 +ThServiceTable = 0x1e8 +ThWaitBlock = 0x108 +ThResourceIndex = 0x14f +ThQueueListEntry = 0x1c8 +ThTrapFrame = 0x1d8 +ThCallbackStack = 0x1e0 +ThApcStateIndex = 0x1f0 +ThIdealProcessor = 0x1f1 +ThBasePriority = 0x1f5 +ThPriorityDecrement = 0x1f6 +ThAdjustReason = 0x62 +ThAdjustIncrement = 0x63 +ThPreviousMode = 0x137 +ThSaturation = 0x1f7 +ThFreezeCount = 0x237 +ThUserAffinity = 0x1f8 +ThProcess = 0x200 +ThAffinity = 0x208 +ThUserIdealProcessor = 0x239 +ThApcStatePointer = 0x210 +ThSavedApcState = 0x220 +ThWaitReason = 0x9a +ThSuspendCount = 0x238 +ThWin32Thread = 0x250 +ThStackBase = 0x258 +ThSuspendApc = 0x260 +ThPowerState = 0x28f +ThKernelTime = 0x264 +ThLegoData = 0x288 +ThLargeStack = 0x167 +ThUserTime = 0x290 +ThSuspendSemaphore = 0x2b8 +ThSListFaultCount = 0x2cc +ThThreadListEntry = 0x2d8 +ThMutantListHead = 0x18 +ThSListFaultAddress = 0x2e8 +KernelThreadObjectLength = 0x2f0 +ExecutiveThreadObjectLength = 0x3f8 + +/* KTIMER */ +TiType = 0x0 +TiSize = 0x2 +TiInserted = 0x3 +TiSignalState = 0x4 +TiDueTime = 0x18 +TiTimerListEntry = 0x20 +TiDpc = 0x30 +TiPeriod = 0x3c +TimerObjectLength = 0x40 + +/* TIME */ + +/* KUSER_SHARED_DATA */ +UsTickCountMultiplier = 0x4 +UsInterruptTime = 0x8 +UsSystemTime = 0x14 +UsTimeZoneBias = 0x20 +UsImageNumberLow = 0x2c +UsImageNumberHigh = 0x2e +UsNtSystemRoot = 0x30 +UsMaxStackTraceDepth = 0x238 +UsCryptoExponent = 0x23c +UsTimeZoneId = 0x240 +UsLargePageMinimum = 0x244 +UsReserved2 = 0x248 +UsNtProductType = 0x264 +UsProductTypeIsValid = 0x268 +UsNtMajorVersion = 0x26c +UsNtMinorVersion = 0x270 +UsProcessorFeatures = 0x274 +UsReserved1 = 0x2b4 +UsReserved3 = 0x2b8 +UsTimeSlip = 0x2bc +UsAlternativeArchitecture = 0x2c0 +UsSystemExpirationDate = 0x2c8 +UsSuiteMask = 0x2d0 +UsKdDebuggerEnabled = 0x2d4 +UsActiveConsoleId = 0x2d8 +UsDismountCount = 0x2dc +UsComPlusPackage = 0x2e0 +UsLastSystemRITEventTickCount = 0x2e4 +UsNumberOfPhysicalPages = 0x2e8 +UsSafeBootMode = 0x2ec +UsTestRetInstruction = 0x2f8 +UsSystemCall = 0x300 +UsSystemCallReturn = 0x304 +UsSystemCallPad = 0x308 +UsTickCount = 0x320 +UsTickCountQuad = 0x320 +UsWow64SharedInformation = 0x340 + +/* KWAIT_BLOCK */ +WbWaitListEntry = 0x0 +WbThread = 0x10 +WbObject = 0x18 +WbNextWaitBlock = 0x20 +WbWaitKey = 0x28 +WbWaitType = 0x2a + +/* CR0 flags */ +CR0_PE = 0x1 +CR0_MP = 0x2 +CR0_EM = 0x4 +CR0_TS = 0x8 +CR0_ET = 0x10 +CR0_NE = 0x20 +CR0_WP = 0x10000 +CR0_AM = 0x40000 +CR0_NW = 0x20000000 +CR0_CD = 0x40000000 +CR0_PG = 0x80000000 + +/* CR4 flags */ +CR4_VME = 0x1 +CR4_PVI = 0x2 +CR4_TSD = 0x4 +CR4_DE = 0x8 +CR4_PSE = 0x10 +CR4_PAE = 0x20 +CR4_MCE = 0x40 +CR4_PGE = 0x80 +CR4_FXSR = 0x200 +CR4_XMMEXCPT = 0x400 +CR4_CHANNELS = 0x800 + +/* KeFeatureBits flags */ +KF_RDTSC = 0x2 +KF_CR4 = 0x4 +KF_GLOBAL_PAGE = 0x10 +KF_LARGE_PAGE = 0x20 +KF_CMPXCHG8B = 0x80 +KF_FAST_SYSCALL = 0x1000 + +/* Machine type definitions */ +MACHINE_TYPE_ISA = 0x0 +MACHINE_TYPE_EISA = 0x1 +MACHINE_TYPE_MCA = 0x2 + +/* EFLAGS */ +EFLAGS_TF_MASK = 0x100 +EFLAGS_TF_SHIFT = 0x8 +EFLAGS_IF_MASK = 0x200 +EFLAGS_IF_SHIFT = 0x9 +EFLAGS_ID_MASK = 0x200000 + +/* Hypervisor Enlightenment Definitions */ + +/* KDGT selectors */ +KGDT64_NULL = 0x0 +KGDT64_R0_CODE = 0x10 +KGDT64_R0_DATA = 0x18 +KGDT64_R3_CMCODE = 0x20 +KGDT64_R3_DATA = 0x28 +KGDT64_R3_CODE = 0x30 +KGDT64_SYS_TSS = 0x40 +KGDT64_R3_CMTEB = 0x50 + +/* Machine Specific Register Numbers */ +MSR_EFER = 0xc0000080 +MSR_STAR = 0xc0000081 +MSR_LSTAR = 0xc0000082 +MSR_CSTAR = 0xc0000083 +MSR_SYSCALL_MASK = 0xc0000084 +MSR_FS_BASE = 0xc0000100 +MSR_GS_BASE = 0xc0000101 +MSR_GS_SWAP = 0xc0000102 +MSR_MCG_STATUS = 0x17a +MSR_AMD_ACCESS = 0x9c5a203a + +/* Flags for MSR_EFER */ +MSR_LMA = 0x400 +MSR_LME = 0x100 +MSR_SCE = 0x1 +MSR_NXE = 0x800 +MSR_PAT = 0x277 +MSR_DEGUG_CTL = 0x1d9 +MSR_LAST_BRANCH_FROM = 0x1db +MSR_LAST_BRANCH_TO = 0x1dc +MSR_LAST_EXCEPTION_FROM = 0x1dd +MSR_LAST_EXCEPTION_TO = 0x1de + +/* Flags for MSR_DEGUG_CTL */ + +/* Fatal exception codes */ +EXCEPTION_DIVIDED_BY_ZERO = 0x0 +EXCEPTION_DEBUG = 0x1 +EXCEPTION_NMI = 0x2 +EXCEPTION_INT3 = 0x3 +EXCEPTION_BOUND_CHECK = 0x5 +EXCEPTION_INVALID_OPCODE = 0x6 +EXCEPTION_NPX_NOT_AVAILABLE = 0x7 +EXCEPTION_DOUBLE_FAULT = 0x8 +EXCEPTION_NPX_OVERRUN = 0x9 +EXCEPTION_INVALID_TSS = 0xa +EXCEPTION_SEGMENT_NOT_PRESENT = 0xb +EXCEPTION_STACK_FAULT = 0xc +EXCEPTION_GP_FAULT = 0xd +EXCEPTION_RESERVED_TRAP = 0xf +EXCEPTION_NPX_ERROR = 0x10 +EXCEPTION_ALIGNMENT_CHECK = 0x11 + +/* Argument Home Address */ +P1Home = 0x0 +P2Home = 0x0 +P3Home = 0x0 +P4Home = 0x0 + +/* CONTEXT */ +CONTEXT_P1Home = 0x0 +CONTEXT_P2Home = 0x8 +CONTEXT_P3Home = 0x10 +CONTEXT_P4Home = 0x18 +CONTEXT_P5Home = 0x20 +CONTEXT_P6Home = 0x28 +CONTEXT_ContextFlags = 0x30 +CONTEXT_MxCsr = 0x34 +CONTEXT_SegCs = 0x38 +CONTEXT_SegDs = 0x3a +CONTEXT_SegEs = 0x3c +CONTEXT_SegFs = 0x3e +CONTEXT_SegGs = 0x40 +CONTEXT_SegSs = 0x42 +CONTEXT_EFlags = 0x44 +CONTEXT_Dr0 = 0x48 +CONTEXT_Dr1 = 0x50 +CONTEXT_Dr2 = 0x58 +CONTEXT_Dr3 = 0x60 +CONTEXT_Dr6 = 0x68 +CONTEXT_Dr7 = 0x70 +CONTEXT_Rax = 0x78 +CONTEXT_Rcx = 0x80 +CONTEXT_Rdx = 0x88 +CONTEXT_Rbx = 0x90 +CONTEXT_Rsp = 0x98 +CONTEXT_Rbp = 0xa0 +CONTEXT_Rsi = 0xa8 +CONTEXT_Rdi = 0xb0 +CONTEXT_R8 = 0xb8 +CONTEXT_R9 = 0xc0 +CONTEXT_R10 = 0xc8 +CONTEXT_R11 = 0xd0 +CONTEXT_R12 = 0xd8 +CONTEXT_R13 = 0xe0 +CONTEXT_R14 = 0xe8 +CONTEXT_R15 = 0xf0 +CONTEXT_Rip = 0xf8 +CONTEXT_FltSave = 0x100 +CONTEXT_Xmm0 = 0x1a0 +CONTEXT_Xmm1 = 0x1b0 +CONTEXT_Xmm2 = 0x1c0 +CONTEXT_Xmm3 = 0x1d0 +CONTEXT_Xmm4 = 0x1e0 +CONTEXT_Xmm5 = 0x1f0 +CONTEXT_Xmm6 = 0x200 +CONTEXT_Xmm7 = 0x210 +CONTEXT_Xmm8 = 0x220 +CONTEXT_Xmm9 = 0x230 +CONTEXT_Xmm10 = 0x240 +CONTEXT_Xmm11 = 0x250 +CONTEXT_Xmm12 = 0x260 +CONTEXT_Xmm13 = 0x270 +CONTEXT_Xmm14 = 0x280 +CONTEXT_Xmm15 = 0x290 +CONTEXT_DebugControl = 0x4a8 +CONTEXT_LastBranchToRip = 0x4b0 +CONTEXT_LastBranchFromRip = 0x4b8 +CONTEXT_LastExceptionToRip = 0x4c0 +CONTEXT_LastExceptionFromRip = 0x4c8 +CONTEXT_VectorControl = 0x4a0 +CONTEXT_VectorRegister = 0x300 +CONTEXT_FRAME_LENGTH = 0x4d0 + +/* DISPATCHER_CONTEXT */ +DcControlPc = 0x0 +DcImageBase = 0x8 +DcFunctionEntry = 0x10 +DcEstablisherFrame = 0x18 +DcTargetIp = 0x20 +DcContextRecord = 0x28 +DcLanguageHandler = 0x30 +DcHandlerData = 0x38 +DcHistoryTable = 0x40 +DcScopeIndex = 0x48 + +/* KEXCEPTION_FRAME */ +KEXCEPTION_FRAME_P1Home = 0x0 +KEXCEPTION_FRAME_P2Home = 0x8 +KEXCEPTION_FRAME_P3Home = 0x10 +KEXCEPTION_FRAME_P4Home = 0x18 +KEXCEPTION_FRAME_P5 = 0x20 +KEXCEPTION_FRAME_Xmm6 = 0x30 +KEXCEPTION_FRAME_Xmm7 = 0x40 +KEXCEPTION_FRAME_Xmm8 = 0x50 +KEXCEPTION_FRAME_Xmm9 = 0x60 +KEXCEPTION_FRAME_Xmm10 = 0x70 +KEXCEPTION_FRAME_Xmm11 = 0x80 +KEXCEPTION_FRAME_Xmm12 = 0x90 +KEXCEPTION_FRAME_Xmm13 = 0xa0 +KEXCEPTION_FRAME_Xmm14 = 0xb0 +KEXCEPTION_FRAME_Xmm15 = 0xc0 +KEXCEPTION_FRAME_MxCsr = 0xf0 +KEXCEPTION_FRAME_Rbp = 0xf8 +KEXCEPTION_FRAME_Rbx = 0x100 +KEXCEPTION_FRAME_Rdi = 0x108 +KEXCEPTION_FRAME_Rsi = 0x110 +KEXCEPTION_FRAME_R12 = 0x118 +KEXCEPTION_FRAME_R13 = 0x120 +KEXCEPTION_FRAME_R14 = 0x128 +KEXCEPTION_FRAME_R15 = 0x130 +KEXCEPTION_FRAME_Return = 0x138 +KEXCEPTION_FRAME_InitialStack = 0x28 +KEXCEPTION_FRAME_TrapFrame = 0xd0 +KEXCEPTION_FRAME_CallbackStack = 0xd8 +KEXCEPTION_FRAME_OutputBuffer = 0xe0 +KEXCEPTION_FRAME_OutputLength = 0xe8 +KEXCEPTION_FRAME_LENGTH = 0x140 + +/* JUMP_BUFFER */ +JbFrame = 0x0 +JbRbx = 0x8 +JbRsp = 0x10 +JbRbp = 0x18 +JbRsi = 0x20 +JbRdi = 0x28 +JbR12 = 0x30 +JbR13 = 0x38 +JbR14 = 0x40 +JbR15 = 0x48 +JbRip = 0x50 +JbXmm6 = 0x60 +JbXmm7 = 0x70 +JbXmm8 = 0x80 +JbXmm9 = 0x90 +JbXmm10 = 0xa0 +JbXmm11 = 0xb0 +JbXmm12 = 0xc0 +JbXmm13 = 0xd0 +JbXmm14 = 0xe0 +JbXmm15 = 0xf0 + +/* KGDTENTRY64 */ +KgdtBaseLow = 0x2 +KgdtBaseMiddle = 0x4 +KgdtBaseHigh = 0x7 +KgdtBaseUpper = 0x8 +KgdtLimitHigh = 0x6 +KgdtLimitLow = 0x0 + +/* KPRCB */ +PbMxCsr = 0x0 +PbNumber = 0x4 +PbInterruptRequest = 0x6 +PbIdleHalt = 0x7 +PbCurrentThread = 0x8 +PbNextThread = 0x10 +PbIdleThread = 0x18 +PbNestingLevel = 0x5 +PbRspBase = 0x28 +PbPrcbLock = 0x30 +PbSetMember = 0x38 +PbProcessorState = 0x40 +PbCpuType = 0x5f0 +PbCpuID = 0x5f1 +PbCpuStep = 0x5f2 +PbHalReserved = 0x5f8 +PbMinorVersion = 0x638 +PbMajorVersion = 0x63a +PbBuildType = 0x63c +PbCpuVendor = 0x63d +PbApicMask = 0x640 +PbCFlushSize = 0x644 +PbAcpiReserved = 0x648 +PbInitialApicId = 0x63e +PbLockQueue = 0x670 +PbPPLookasideList = 0x880 +PbPPNPagedLookasideList = 0x980 +PbPPPagedLookasideList = 0xb80 +PbPacketBarrier = 0xd80 +PbDeferredReadyListHead = 0xd88 +PbLookasideIrpFloat = 0xdc4 +PbTargetSet = 0xe00 +PbIpiFrozen = 0xe08 +PbRequestMailbox = 0xe80 +PbSenderSummary = 0x2680 +PbDpcStack = 0x2740 +PbMaximumDpcQueueDepth = 0x2750 +PbDpcRequestRate = 0x2754 +PbMinimumDpcRate = 0x2758 +PbDpcInterruptRequested = 0x275c +PbDpcThreadRequested = 0x275d +PbDpcRoutineActive = 0x275e +PbDpcThreadActive = 0x275f +PbTimerHand = 0x2760 +PbTimerRequest = 0x2768 +PbTickOffset = 0x2770 +PbMasterOffset = 0x2774 +PbDpcLastCount = 0x2778 +PbQuantumEnd = 0x277d +PbDpcSetEventRequest = 0x2780 +PbIdleSchedule = 0x277f +PbReadySummary = 0x2818 +PbDispatcherReadyListHead = 0x2820 +PbInterruptCount = 0x2a20 +PbKernelTime = 0x2a24 +PbUserTime = 0x2a28 +PbDpcTime = 0x2a2c +PbInterruptTime = 0x2a30 +PbAdjustDpcThreshold = 0x2a34 +PbSkipTick = 0x2a38 +PbPollSlot = 0x2a3a +PbParentNode = 0x2a48 +PbMultiThreadProcessorSet = 0x2a50 +PbMultiThreadSetMaster = 0x2a58 +PbPageColor = 0x2a6c +PbNodeColor = 0x2a70 +PbNodeShiftedColor = 0x2a74 +PbSecondaryColorMask = 0x2a78 +PbSleeping = 0x2a60 +PbVendorString = 0x2abc +PbPowerState = 0x2ad8 +ProcessorBlockLength = 0x2c88 + +/* KPCR */ +PcUserRsp = 0x10 +PcSelf = 0x18 +PcCurrentPrcb = 0x20 +PcLockArray = 0x28 +PcIrql = 0x50 +PcStallScaleFactor = 0x64 +PcHalReserved = 0xc0 + +/* KPROCESSOR_STATE */ +PsSpecialRegisters = 0x0 +PsCr0 = 0x0 +PsCr2 = 0x8 +PsCr3 = 0x10 +PsCr4 = 0x18 +PsKernelDr0 = 0x20 +PsKernelDr1 = 0x28 +PsKernelDr2 = 0x30 +PsKernelDr3 = 0x38 +PsKernelDr6 = 0x40 +PsKernelDr7 = 0x48 +PsGdtr = 0x50 +PsIdtr = 0x60 +PsTr = 0x70 +PsLdtr = 0x72 +PsMxCsr = 0x74 +PsContextFrame = 0xe0 +PsDebugControl = 0x78 +PsLastBranchToRip = 0x80 +PsLastBranchFromRip = 0x88 +PsLastExceptionToRip = 0x90 +PsLastExceptionFromRip = 0x98 +PsCr8 = 0xa0 +ProcessorStateLength = 0x5b0 + +/* KSTART_FRAME */ +SfP1Home = 0x0 +SfP2Home = 0x8 +SfP3Home = 0x10 +SfP4Home = 0x18 +SfReturn = 0x28 +KSTART_FRAME_LENGTH = 0x30 + +/* KSPECIAL_REGISTERS */ +SrKernelDr0 = 0x20 +SrKernelDr1 = 0x28 +SrKernelDr2 = 0x30 +SrKernelDr3 = 0x38 +SrKernelDr6 = 0x40 +SrKernelDr7 = 0x48 +SrGdtr = 0x50 +SrIdtr = 0x60 +SrTr = 0x70 +SrMxCsr = 0x74 +SrMsrGsBase = 0xa8 +SrMsrGsSwap = 0xb0 +SrMsrStar = 0xb8 +SrMsrLStar = 0xc0 +SrMsrCStar = 0xc8 +SrMsrSyscallMask = 0xd0 + +/* KSYSTEM_TIME */ +StLowTime = 0x0 +StHigh1Time = 0x4 +StHigh2Time = 0x8 + +/* KSWITCH_FRAME */ +SwP5Home = 0x20 +SwApcBypass = 0x28 +SwRbp = 0x30 +SwReturn = 0x38 +SwitchFrameLength = 0x40 +KSWITCH_FRAME_LENGTH = 0x40 + +/* KTRAP_FRAME */ +KTRAP_FRAME_P1Home = 0x0 +KTRAP_FRAME_P2Home = 0x8 +KTRAP_FRAME_P3Home = 0x10 +KTRAP_FRAME_P4Home = 0x18 +KTRAP_FRAME_P5 = 0x20 +KTRAP_FRAME_PreviousMode = 0x28 +KTRAP_FRAME_PreviousIrql = 0x29 +KTRAP_FRAME_FaultIndicator = 0x2a +KTRAP_FRAME_ExceptionActive = 0x2b +KTRAP_FRAME_MxCsr = 0x2c +KTRAP_FRAME_Rax = 0x30 +KTRAP_FRAME_Rcx = 0x38 +KTRAP_FRAME_Rdx = 0x40 +KTRAP_FRAME_R8 = 0x48 +KTRAP_FRAME_R9 = 0x50 +KTRAP_FRAME_R10 = 0x58 +KTRAP_FRAME_R11 = 0x60 +KTRAP_FRAME_GsBase = 0x68 +KTRAP_FRAME_GsSwap = 0x68 +KTRAP_FRAME_Xmm0 = 0x70 +KTRAP_FRAME_Xmm1 = 0x80 +KTRAP_FRAME_Xmm2 = 0x90 +KTRAP_FRAME_Xmm3 = 0xa0 +KTRAP_FRAME_Xmm4 = 0xb0 +KTRAP_FRAME_Xmm5 = 0xc0 +KTRAP_FRAME_FaultAddress = 0xd0 +KTRAP_FRAME_TimeStampCKCL = 0xd0 +KTRAP_FRAME_Dr0 = 0xd8 +KTRAP_FRAME_Dr1 = 0xe0 +KTRAP_FRAME_Dr2 = 0xe8 +KTRAP_FRAME_Dr3 = 0xf0 +KTRAP_FRAME_Dr6 = 0xf8 +KTRAP_FRAME_Dr7 = 0x100 +KTRAP_FRAME_DebugControl = 0x108 +KTRAP_FRAME_LastBranchToRip = 0x110 +KTRAP_FRAME_LastBranchFromRip = 0x118 +KTRAP_FRAME_LastExceptionToRip = 0x120 +KTRAP_FRAME_LastExceptionFromRip = 0x128 +KTRAP_FRAME_LastBranchControl = 0x108 +KTRAP_FRAME_LastBranchMSR = 0x110 +KTRAP_FRAME_SegDs = 0x130 +KTRAP_FRAME_SegEs = 0x132 +KTRAP_FRAME_SegFs = 0x134 +KTRAP_FRAME_SegGs = 0x136 +KTRAP_FRAME_TrapFrame = 0x138 +KTRAP_FRAME_Rbx = 0x140 +KTRAP_FRAME_Rdi = 0x148 +KTRAP_FRAME_Rsi = 0x150 +KTRAP_FRAME_Rbp = 0x158 +KTRAP_FRAME_ErrorCode = 0x160 +KTRAP_FRAME_TimeStampKlog = 0x160 +KTRAP_FRAME_Rip = 0x168 +KTRAP_FRAME_SegCs = 0x170 +KTRAP_FRAME_Logging = 0x173 +KTRAP_FRAME_EFlags = 0x178 +KTRAP_FRAME_Rsp = 0x180 +KTRAP_FRAME_SegSs = 0x188 +KTRAP_FRAME_CodePatchCycle = 0x18c +KTRAP_FRAME_LENGTH = 0x190 + +/* KTSS */ +TssRsp0 = 0x4 +TssRsp1 = 0xc +TssRsp2 = 0x14 +TssPanicStack = 0x24 +TssMcaStack = 0x2c +TssNmiStack = 0x34 +TssIoMapBase = 0x66 +TssLength = 0x68 + +/* EXCEPTION_RECORD */ +EXCEPTION_RECORD_ExceptionCode = 0x0 +EXCEPTION_RECORD_ExceptionFlags = 0x4 +EXCEPTION_RECORD_ExceptionRecord = 0x8 +EXCEPTION_RECORD_ExceptionAddress = 0x10 +EXCEPTION_RECORD_NumberParameters = 0x18 +EXCEPTION_RECORD_ExceptionInformation = 0x20 +KTHREAD_WAIT_IRQL = 0x86 Propchange: trunk/reactos/include/reactos/ksamd64.inc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mkupfer] 50402: - Fix replaced by more flexible code for arbitrary cursor sizes
by mkupfer＠svn.reactos.org 16 Jan '11

16 Jan '11

Author: mkupfer Date: Sun Jan 16 18:15:12 2011 New Revision: 50402 URL: http://svn.reactos.org/svn/reactos?rev=50402&view=rev Log: - Fix replaced by more flexible code for arbitrary cursor sizes Modified: trunk/reactos/dll/win32/user32/controls/static.c Modified: trunk/reactos/dll/win32/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] Sun Jan 16 18:15:12 2011 @@ -863,14 +863,10 @@ else { BITMAP bm; - if (info.fIcon) + GetObjectW(info.hbmMask, sizeof(BITMAP), &bm); + if (!info.fIcon) { - GetObjectW(info.hbmColor, sizeof(BITMAP), &bm); - } - else - { - bm.bmWidth = GetSystemMetrics(SM_CXCURSOR); - bm.bmHeight = GetSystemMetrics(SM_CYCURSOR); + bm.bmHeight /= 2; } if (style & SS_CENTERIMAGE) {

1 0

[tkreuzer] 50401: [CMAKE] Provide the asm offset constants that are used throughout the code instead the official ones. We'll have to decide which way to go later.
by tkreuzer＠svn.reactos.org 16 Jan '11

16 Jan '11

Author: tkreuzer Date: Sun Jan 16 18:07:15 2011 New Revision: 50401 URL: http://svn.reactos.org/svn/reactos?rev=50401&view=rev Log: [CMAKE] Provide the asm offset constants that are used throughout the code instead the official ones. We'll have to decide which way to go later. Modified: branches/cmake-bringup/include/asm/ksamd64.template.h Modified: branches/cmake-bringup/include/asm/ksamd64.template.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ksamd… ============================================================================== --- branches/cmake-bringup/include/asm/ksamd64.template.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/ksamd64.template.h [iso-8859-1] Sun Jan 16 18:07:15 2011 @@ -118,68 +118,68 @@ OFFSET(P4Home, CONTEXT, P1Home), HEADER("CONTEXT"), -OFFSET(CxP1Home, CONTEXT, P1Home), -OFFSET(CxP2Home, CONTEXT, P2Home), -OFFSET(CxP3Home, CONTEXT, P3Home), -OFFSET(CxP4Home, CONTEXT, P4Home), -OFFSET(CxP5Home, CONTEXT, P5Home), -OFFSET(CxP6Home, CONTEXT, P6Home), -OFFSET(CxContextFlags, CONTEXT, ContextFlags), -OFFSET(CxMxCsr, CONTEXT, MxCsr), -OFFSET(CxSegCs, CONTEXT, SegCs), -OFFSET(CxSegDs, CONTEXT, SegDs), -OFFSET(CxSegEs, CONTEXT, SegEs), -OFFSET(CxSegFs, CONTEXT, SegFs), -OFFSET(CxSegGs, CONTEXT, SegGs), -OFFSET(CxSegSs, CONTEXT, SegSs), -OFFSET(CxEFlags, CONTEXT, EFlags), -OFFSET(CxDr0, CONTEXT, Dr0), -OFFSET(CxDr1, CONTEXT, Dr1), -OFFSET(CxDr2, CONTEXT, Dr2), -OFFSET(CxDr3, CONTEXT, Dr3), -OFFSET(CxDr6, CONTEXT, Dr6), -OFFSET(CxDr7, CONTEXT, Dr7), -OFFSET(CxRax, CONTEXT, Rax), -OFFSET(CxRcx, CONTEXT, Rcx), -OFFSET(CxRdx, CONTEXT, Rdx), -OFFSET(CxRbx, CONTEXT, Rbx), -OFFSET(CxRsp, CONTEXT, Rsp), -OFFSET(CxRbp, CONTEXT, Rbp), -OFFSET(CxRsi, CONTEXT, Rsi), -OFFSET(CxRdi, CONTEXT, Rdi), -OFFSET(CxR8, CONTEXT, R8), -OFFSET(CxR9, CONTEXT, R9), -OFFSET(CxR10, CONTEXT, R10), -OFFSET(CxR11, CONTEXT, R11), -OFFSET(CxR12, CONTEXT, R12), -OFFSET(CxR13, CONTEXT, R13), -OFFSET(CxR14, CONTEXT, R14), -OFFSET(CxR15, CONTEXT, R15), -OFFSET(CxRip, CONTEXT, Rip), -OFFSET(CxFltSave, CONTEXT, FltSave), -OFFSET(CxXmm0, CONTEXT, Xmm0), -OFFSET(CxXmm1, CONTEXT, Xmm1), -OFFSET(CxXmm2, CONTEXT, Xmm2), -OFFSET(CxXmm3, CONTEXT, Xmm3), -OFFSET(CxXmm4, CONTEXT, Xmm4), -OFFSET(CxXmm5, CONTEXT, Xmm5), -OFFSET(CxXmm6, CONTEXT, Xmm6), -OFFSET(CxXmm7, CONTEXT, Xmm7), -OFFSET(CxXmm8, CONTEXT, Xmm8), -OFFSET(CxXmm9, CONTEXT, Xmm9), -OFFSET(CxXmm10, CONTEXT, Xmm10), -OFFSET(CxXmm11, CONTEXT, Xmm11), -OFFSET(CxXmm12, CONTEXT, Xmm12), -OFFSET(CxXmm13, CONTEXT, Xmm13), -OFFSET(CxXmm14, CONTEXT, Xmm14), -OFFSET(CxXmm15, CONTEXT, Xmm15), -OFFSET(CxDebugControl, CONTEXT, DebugControl), -OFFSET(CxLastBranchToRip, CONTEXT, LastBranchToRip), -OFFSET(CxLastBranchFromRip, CONTEXT, LastBranchFromRip), -OFFSET(CxLastExceptionToRip, CONTEXT, LastExceptionToRip), -OFFSET(CxLastExceptionFromRip, CONTEXT, LastExceptionFromRip), -OFFSET(CxVectorControl, CONTEXT, VectorControl), -OFFSET(CxVectorRegister, CONTEXT, VectorRegister), +OFFSET(CONTEXT_P1Home, CONTEXT, P1Home), +OFFSET(CONTEXT_P2Home, CONTEXT, P2Home), +OFFSET(CONTEXT_P3Home, CONTEXT, P3Home), +OFFSET(CONTEXT_P4Home, CONTEXT, P4Home), +OFFSET(CONTEXT_P5Home, CONTEXT, P5Home), +OFFSET(CONTEXT_P6Home, CONTEXT, P6Home), +OFFSET(CONTEXT_ContextFlags, CONTEXT, ContextFlags), +OFFSET(CONTEXT_MxCsr, CONTEXT, MxCsr), +OFFSET(CONTEXT_SegCs, CONTEXT, SegCs), +OFFSET(CONTEXT_SegDs, CONTEXT, SegDs), +OFFSET(CONTEXT_SegEs, CONTEXT, SegEs), +OFFSET(CONTEXT_SegFs, CONTEXT, SegFs), +OFFSET(CONTEXT_SegGs, CONTEXT, SegGs), +OFFSET(CONTEXT_SegSs, CONTEXT, SegSs), +OFFSET(CONTEXT_EFlags, CONTEXT, EFlags), +OFFSET(CONTEXT_Dr0, CONTEXT, Dr0), +OFFSET(CONTEXT_Dr1, CONTEXT, Dr1), +OFFSET(CONTEXT_Dr2, CONTEXT, Dr2), +OFFSET(CONTEXT_Dr3, CONTEXT, Dr3), +OFFSET(CONTEXT_Dr6, CONTEXT, Dr6), +OFFSET(CONTEXT_Dr7, CONTEXT, Dr7), +OFFSET(CONTEXT_Rax, CONTEXT, Rax), +OFFSET(CONTEXT_Rcx, CONTEXT, Rcx), +OFFSET(CONTEXT_Rdx, CONTEXT, Rdx), +OFFSET(CONTEXT_Rbx, CONTEXT, Rbx), +OFFSET(CONTEXT_Rsp, CONTEXT, Rsp), +OFFSET(CONTEXT_Rbp, CONTEXT, Rbp), +OFFSET(CONTEXT_Rsi, CONTEXT, Rsi), +OFFSET(CONTEXT_Rdi, CONTEXT, Rdi), +OFFSET(CONTEXT_R8, CONTEXT, R8), +OFFSET(CONTEXT_R9, CONTEXT, R9), +OFFSET(CONTEXT_R10, CONTEXT, R10), +OFFSET(CONTEXT_R11, CONTEXT, R11), +OFFSET(CONTEXT_R12, CONTEXT, R12), +OFFSET(CONTEXT_R13, CONTEXT, R13), +OFFSET(CONTEXT_R14, CONTEXT, R14), +OFFSET(CONTEXT_R15, CONTEXT, R15), +OFFSET(CONTEXT_Rip, CONTEXT, Rip), +OFFSET(CONTEXT_FltSave, CONTEXT, FltSave), +OFFSET(CONTEXT_Xmm0, CONTEXT, Xmm0), +OFFSET(CONTEXT_Xmm1, CONTEXT, Xmm1), +OFFSET(CONTEXT_Xmm2, CONTEXT, Xmm2), +OFFSET(CONTEXT_Xmm3, CONTEXT, Xmm3), +OFFSET(CONTEXT_Xmm4, CONTEXT, Xmm4), +OFFSET(CONTEXT_Xmm5, CONTEXT, Xmm5), +OFFSET(CONTEXT_Xmm6, CONTEXT, Xmm6), +OFFSET(CONTEXT_Xmm7, CONTEXT, Xmm7), +OFFSET(CONTEXT_Xmm8, CONTEXT, Xmm8), +OFFSET(CONTEXT_Xmm9, CONTEXT, Xmm9), +OFFSET(CONTEXT_Xmm10, CONTEXT, Xmm10), +OFFSET(CONTEXT_Xmm11, CONTEXT, Xmm11), +OFFSET(CONTEXT_Xmm12, CONTEXT, Xmm12), +OFFSET(CONTEXT_Xmm13, CONTEXT, Xmm13), +OFFSET(CONTEXT_Xmm14, CONTEXT, Xmm14), +OFFSET(CONTEXT_Xmm15, CONTEXT, Xmm15), +OFFSET(CONTEXT_DebugControl, CONTEXT, DebugControl), +OFFSET(CONTEXT_LastBranchToRip, CONTEXT, LastBranchToRip), +OFFSET(CONTEXT_LastBranchFromRip, CONTEXT, LastBranchFromRip), +OFFSET(CONTEXT_LastExceptionToRip, CONTEXT, LastExceptionToRip), +OFFSET(CONTEXT_LastExceptionFromRip, CONTEXT, LastExceptionFromRip), +OFFSET(CONTEXT_VectorControl, CONTEXT, VectorControl), +OFFSET(CONTEXT_VectorRegister, CONTEXT, VectorRegister), SIZE(CONTEXT_FRAME_LENGTH, CONTEXT), HEADER("DISPATCHER_CONTEXT"), @@ -195,36 +195,36 @@ OFFSET(DcScopeIndex, DISPATCHER_CONTEXT, ScopeIndex), HEADER("KEXCEPTION_FRAME"), -OFFSET(ExP1Home, KEXCEPTION_FRAME, P1Home), -OFFSET(ExP2Home, KEXCEPTION_FRAME, P2Home), -OFFSET(ExP3Home, KEXCEPTION_FRAME, P3Home), -OFFSET(ExP4Home, KEXCEPTION_FRAME, P4Home), -OFFSET(ExP5, KEXCEPTION_FRAME, P5), -OFFSET(ExXmm6, KEXCEPTION_FRAME, Xmm6), -OFFSET(ExXmm7, KEXCEPTION_FRAME, Xmm7), -OFFSET(ExXmm8, KEXCEPTION_FRAME, Xmm8), -OFFSET(ExXmm9, KEXCEPTION_FRAME, Xmm9), -OFFSET(ExXmm10, KEXCEPTION_FRAME, Xmm10), -OFFSET(ExXmm11, KEXCEPTION_FRAME, Xmm11), -OFFSET(ExXmm12, KEXCEPTION_FRAME, Xmm12), -OFFSET(ExXmm13, KEXCEPTION_FRAME, Xmm13), -OFFSET(ExXmm14, KEXCEPTION_FRAME, Xmm14), -OFFSET(ExXmm15, KEXCEPTION_FRAME, Xmm15), -OFFSET(ExMxCsr, KEXCEPTION_FRAME, MxCsr), -OFFSET(ExRbp, KEXCEPTION_FRAME, Rbp), -OFFSET(ExRbx, KEXCEPTION_FRAME, Rbx), -OFFSET(ExRdi, KEXCEPTION_FRAME, Rdi), -OFFSET(ExRsi, KEXCEPTION_FRAME, Rsi), -OFFSET(ExR12, KEXCEPTION_FRAME, R12), -OFFSET(ExR13, KEXCEPTION_FRAME, R13), -OFFSET(ExR14, KEXCEPTION_FRAME, R14), -OFFSET(ExR15, KEXCEPTION_FRAME, R15), -OFFSET(ExReturn, KEXCEPTION_FRAME, Return), -OFFSET(CuInitialStack, KEXCEPTION_FRAME, InitialStack), -OFFSET(CuTrapFrame, KEXCEPTION_FRAME, TrapFrame), -OFFSET(CuCallbackStack, KEXCEPTION_FRAME, CallbackStack), -OFFSET(CuOutputBuffer, KEXCEPTION_FRAME, OutputBuffer), -OFFSET(CuOutputLength, KEXCEPTION_FRAME, OutputLength), +OFFSET(KEXCEPTION_FRAME_P1Home, KEXCEPTION_FRAME, P1Home), +OFFSET(KEXCEPTION_FRAME_P2Home, KEXCEPTION_FRAME, P2Home), +OFFSET(KEXCEPTION_FRAME_P3Home, KEXCEPTION_FRAME, P3Home), +OFFSET(KEXCEPTION_FRAME_P4Home, KEXCEPTION_FRAME, P4Home), +OFFSET(KEXCEPTION_FRAME_P5, KEXCEPTION_FRAME, P5), +OFFSET(KEXCEPTION_FRAME_Xmm6, KEXCEPTION_FRAME, Xmm6), +OFFSET(KEXCEPTION_FRAME_Xmm7, KEXCEPTION_FRAME, Xmm7), +OFFSET(KEXCEPTION_FRAME_Xmm8, KEXCEPTION_FRAME, Xmm8), +OFFSET(KEXCEPTION_FRAME_Xmm9, KEXCEPTION_FRAME, Xmm9), +OFFSET(KEXCEPTION_FRAME_Xmm10, KEXCEPTION_FRAME, Xmm10), +OFFSET(KEXCEPTION_FRAME_Xmm11, KEXCEPTION_FRAME, Xmm11), +OFFSET(KEXCEPTION_FRAME_Xmm12, KEXCEPTION_FRAME, Xmm12), +OFFSET(KEXCEPTION_FRAME_Xmm13, KEXCEPTION_FRAME, Xmm13), +OFFSET(KEXCEPTION_FRAME_Xmm14, KEXCEPTION_FRAME, Xmm14), +OFFSET(KEXCEPTION_FRAME_Xmm15, KEXCEPTION_FRAME, Xmm15), +OFFSET(KEXCEPTION_FRAME_MxCsr, KEXCEPTION_FRAME, MxCsr), +OFFSET(KEXCEPTION_FRAME_Rbp, KEXCEPTION_FRAME, Rbp), +OFFSET(KEXCEPTION_FRAME_Rbx, KEXCEPTION_FRAME, Rbx), +OFFSET(KEXCEPTION_FRAME_Rdi, KEXCEPTION_FRAME, Rdi), +OFFSET(KEXCEPTION_FRAME_Rsi, KEXCEPTION_FRAME, Rsi), +OFFSET(KEXCEPTION_FRAME_R12, KEXCEPTION_FRAME, R12), +OFFSET(KEXCEPTION_FRAME_R13, KEXCEPTION_FRAME, R13), +OFFSET(KEXCEPTION_FRAME_R14, KEXCEPTION_FRAME, R14), +OFFSET(KEXCEPTION_FRAME_R15, KEXCEPTION_FRAME, R15), +OFFSET(KEXCEPTION_FRAME_Return, KEXCEPTION_FRAME, Return), +OFFSET(KEXCEPTION_FRAME_InitialStack, KEXCEPTION_FRAME, InitialStack), +OFFSET(KEXCEPTION_FRAME_TrapFrame, KEXCEPTION_FRAME, TrapFrame), +OFFSET(KEXCEPTION_FRAME_CallbackStack, KEXCEPTION_FRAME, CallbackStack), +OFFSET(KEXCEPTION_FRAME_OutputBuffer, KEXCEPTION_FRAME, OutputBuffer), +OFFSET(KEXCEPTION_FRAME_OutputLength, KEXCEPTION_FRAME, OutputLength), SIZE(KEXCEPTION_FRAME_LENGTH, KEXCEPTION_FRAME), HEADER("JUMP_BUFFER"), @@ -491,64 +491,64 @@ SIZE(KSWITCH_FRAME_LENGTH, KSWITCH_FRAME), HEADER("KTRAP_FRAME"), -OFFSET(TrP1Home, KTRAP_FRAME, P1Home), -OFFSET(TrP2Home, KTRAP_FRAME, P2Home), -OFFSET(TrP3Home, KTRAP_FRAME, P3Home), -OFFSET(TrP4Home, KTRAP_FRAME, P4Home), -OFFSET(TrP5, KTRAP_FRAME, P5), -OFFSET(TrPreviousMode, KTRAP_FRAME, PreviousMode), -OFFSET(TrPreviousIrql, KTRAP_FRAME, PreviousIrql), -OFFSET(TrFaultIndicator, KTRAP_FRAME, FaultIndicator), -OFFSET(TrExceptionActive, KTRAP_FRAME, ExceptionActive), -OFFSET(TrMxCsr, KTRAP_FRAME, MxCsr), -OFFSET(TrRax, KTRAP_FRAME, Rax), -OFFSET(TrRcx, KTRAP_FRAME, Rcx), -OFFSET(TrRdx, KTRAP_FRAME, Rdx), -OFFSET(TrR8, KTRAP_FRAME, R8), -OFFSET(TrR9, KTRAP_FRAME, R9), -OFFSET(TrR10, KTRAP_FRAME, R10), -OFFSET(TrR11, KTRAP_FRAME, R11), -OFFSET(TrGsBase, KTRAP_FRAME, GsBase), -OFFSET(TrGsSwap, KTRAP_FRAME,GsSwap), -OFFSET(TrXmm0, KTRAP_FRAME, Xmm0), -OFFSET(TrXmm1, KTRAP_FRAME, Xmm1), -OFFSET(TrXmm2, KTRAP_FRAME, Xmm2), -OFFSET(TrXmm3, KTRAP_FRAME, Xmm3), -OFFSET(TrXmm4, KTRAP_FRAME, Xmm4), -OFFSET(TrXmm5, KTRAP_FRAME, Xmm5), -OFFSET(TrFaultAddress, KTRAP_FRAME, FaultAddress), -OFFSET(TrTimeStampCKCL, KTRAP_FRAME, TimeStampCKCL), -OFFSET(TrDr0, KTRAP_FRAME, Dr0), -OFFSET(TrDr1, KTRAP_FRAME, Dr1), -OFFSET(TrDr2, KTRAP_FRAME, Dr2), -OFFSET(TrDr3, KTRAP_FRAME, Dr3), -OFFSET(TrDr6, KTRAP_FRAME, Dr6), -OFFSET(TrDr7, KTRAP_FRAME, Dr7), -OFFSET(TrDebugControl, KTRAP_FRAME, DebugControl), -OFFSET(TrLastBranchToRip, KTRAP_FRAME, LastBranchToRip), -OFFSET(TrLastBranchFromRip, KTRAP_FRAME, LastBranchFromRip), -OFFSET(TrLastExceptionToRip, KTRAP_FRAME, LastExceptionToRip), -OFFSET(TrLastExceptionFromRip, KTRAP_FRAME, LastExceptionFromRip), -OFFSET(TrLastBranchControl, KTRAP_FRAME, LastBranchControl), -OFFSET(TrLastBranchMSR, KTRAP_FRAME, LastBranchMSR), -OFFSET(TrSegDs, KTRAP_FRAME, SegDs), -OFFSET(TrSegEs, KTRAP_FRAME, SegEs), -OFFSET(TrSegFs, KTRAP_FRAME, SegFs), -OFFSET(TrSegGs, KTRAP_FRAME, SegGs), -OFFSET(TrTrapFrame, KTRAP_FRAME, TrapFrame), -OFFSET(TrRbx, KTRAP_FRAME, Rbx), -OFFSET(TrRdi, KTRAP_FRAME, Rdi), -OFFSET(TrRsi, KTRAP_FRAME, Rsi), -OFFSET(TrRbp, KTRAP_FRAME, Rbp), -OFFSET(TrErrorCode, KTRAP_FRAME, ErrorCode), -OFFSET(TrTimeStampKlog, KTRAP_FRAME, TimeStampKlog), -OFFSET(TrRip, KTRAP_FRAME, Rip), -OFFSET(TrSegCs, KTRAP_FRAME, SegCs), -OFFSET(TrLogging, KTRAP_FRAME, Logging), -OFFSET(TrEFlags, KTRAP_FRAME, EFlags), -OFFSET(TrRsp, KTRAP_FRAME, Rsp), -OFFSET(TrSegSs, KTRAP_FRAME, SegSs), -OFFSET(TrCodePatchCycle, KTRAP_FRAME, CodePatchCycle), +OFFSET(KTRAP_FRAME_P1Home, KTRAP_FRAME, P1Home), +OFFSET(KTRAP_FRAME_P2Home, KTRAP_FRAME, P2Home), +OFFSET(KTRAP_FRAME_P3Home, KTRAP_FRAME, P3Home), +OFFSET(KTRAP_FRAME_P4Home, KTRAP_FRAME, P4Home), +OFFSET(KTRAP_FRAME_P5, KTRAP_FRAME, P5), +OFFSET(KTRAP_FRAME_PreviousMode, KTRAP_FRAME, PreviousMode), +OFFSET(KTRAP_FRAME_PreviousIrql, KTRAP_FRAME, PreviousIrql), +OFFSET(KTRAP_FRAME_FaultIndicator, KTRAP_FRAME, FaultIndicator), +OFFSET(KTRAP_FRAME_ExceptionActive, KTRAP_FRAME, ExceptionActive), +OFFSET(KTRAP_FRAME_MxCsr, KTRAP_FRAME, MxCsr), +OFFSET(KTRAP_FRAME_Rax, KTRAP_FRAME, Rax), +OFFSET(KTRAP_FRAME_Rcx, KTRAP_FRAME, Rcx), +OFFSET(KTRAP_FRAME_Rdx, KTRAP_FRAME, Rdx), +OFFSET(KTRAP_FRAME_R8, KTRAP_FRAME, R8), +OFFSET(KTRAP_FRAME_R9, KTRAP_FRAME, R9), +OFFSET(KTRAP_FRAME_R10, KTRAP_FRAME, R10), +OFFSET(KTRAP_FRAME_R11, KTRAP_FRAME, R11), +OFFSET(KTRAP_FRAME_GsBase, KTRAP_FRAME, GsBase), +OFFSET(KTRAP_FRAME_GsSwap, KTRAP_FRAME,GsSwap), +OFFSET(KTRAP_FRAME_Xmm0, KTRAP_FRAME, Xmm0), +OFFSET(KTRAP_FRAME_Xmm1, KTRAP_FRAME, Xmm1), +OFFSET(KTRAP_FRAME_Xmm2, KTRAP_FRAME, Xmm2), +OFFSET(KTRAP_FRAME_Xmm3, KTRAP_FRAME, Xmm3), +OFFSET(KTRAP_FRAME_Xmm4, KTRAP_FRAME, Xmm4), +OFFSET(KTRAP_FRAME_Xmm5, KTRAP_FRAME, Xmm5), +OFFSET(KTRAP_FRAME_FaultAddress, KTRAP_FRAME, FaultAddress), +OFFSET(KTRAP_FRAME_TimeStampCKCL, KTRAP_FRAME, TimeStampCKCL), +OFFSET(KTRAP_FRAME_Dr0, KTRAP_FRAME, Dr0), +OFFSET(KTRAP_FRAME_Dr1, KTRAP_FRAME, Dr1), +OFFSET(KTRAP_FRAME_Dr2, KTRAP_FRAME, Dr2), +OFFSET(KTRAP_FRAME_Dr3, KTRAP_FRAME, Dr3), +OFFSET(KTRAP_FRAME_Dr6, KTRAP_FRAME, Dr6), +OFFSET(KTRAP_FRAME_Dr7, KTRAP_FRAME, Dr7), +OFFSET(KTRAP_FRAME_DebugControl, KTRAP_FRAME, DebugControl), +OFFSET(KTRAP_FRAME_LastBranchToRip, KTRAP_FRAME, LastBranchToRip), +OFFSET(KTRAP_FRAME_LastBranchFromRip, KTRAP_FRAME, LastBranchFromRip), +OFFSET(KTRAP_FRAME_LastExceptionToRip, KTRAP_FRAME, LastExceptionToRip), +OFFSET(KTRAP_FRAME_LastExceptionFromRip, KTRAP_FRAME, LastExceptionFromRip), +OFFSET(KTRAP_FRAME_LastBranchControl, KTRAP_FRAME, LastBranchControl), +OFFSET(KTRAP_FRAME_LastBranchMSR, KTRAP_FRAME, LastBranchMSR), +OFFSET(KTRAP_FRAME_SegDs, KTRAP_FRAME, SegDs), +OFFSET(KTRAP_FRAME_SegEs, KTRAP_FRAME, SegEs), +OFFSET(KTRAP_FRAME_SegFs, KTRAP_FRAME, SegFs), +OFFSET(KTRAP_FRAME_SegGs, KTRAP_FRAME, SegGs), +OFFSET(KTRAP_FRAME_TrapFrame, KTRAP_FRAME, TrapFrame), +OFFSET(KTRAP_FRAME_Rbx, KTRAP_FRAME, Rbx), +OFFSET(KTRAP_FRAME_Rdi, KTRAP_FRAME, Rdi), +OFFSET(KTRAP_FRAME_Rsi, KTRAP_FRAME, Rsi), +OFFSET(KTRAP_FRAME_Rbp, KTRAP_FRAME, Rbp), +OFFSET(KTRAP_FRAME_ErrorCode, KTRAP_FRAME, ErrorCode), +OFFSET(KTRAP_FRAME_TimeStampKlog, KTRAP_FRAME, TimeStampKlog), +OFFSET(KTRAP_FRAME_Rip, KTRAP_FRAME, Rip), +OFFSET(KTRAP_FRAME_SegCs, KTRAP_FRAME, SegCs), +OFFSET(KTRAP_FRAME_Logging, KTRAP_FRAME, Logging), +OFFSET(KTRAP_FRAME_EFlags, KTRAP_FRAME, EFlags), +OFFSET(KTRAP_FRAME_Rsp, KTRAP_FRAME, Rsp), +OFFSET(KTRAP_FRAME_SegSs, KTRAP_FRAME, SegSs), +OFFSET(KTRAP_FRAME_CodePatchCycle, KTRAP_FRAME, CodePatchCycle), SIZE(KTRAP_FRAME_LENGTH, KTRAP_FRAME), #if (NTDDI_VERSION >= NTDDI_WIN7) @@ -570,3 +570,12 @@ OFFSET(TssIoMapBase, KTSS64, IoMapBase), SIZE(TssLength, KTSS64), +HEADER("EXCEPTION_RECORD"), +OFFSET(EXCEPTION_RECORD_ExceptionCode, EXCEPTION_RECORD, ExceptionCode), +OFFSET(EXCEPTION_RECORD_ExceptionFlags, EXCEPTION_RECORD, ExceptionFlags), +OFFSET(EXCEPTION_RECORD_ExceptionRecord, EXCEPTION_RECORD, ExceptionRecord), +OFFSET(EXCEPTION_RECORD_ExceptionAddress, EXCEPTION_RECORD, ExceptionAddress), +OFFSET(EXCEPTION_RECORD_NumberParameters, EXCEPTION_RECORD, NumberParameters), +OFFSET(EXCEPTION_RECORD_ExceptionInformation, EXCEPTION_RECORD, ExceptionInformation), + +OFFSET(KTHREAD_WAIT_IRQL, KTHREAD, WaitIrql),

1 0

[tkreuzer] 50400: [CMAKE] Convert crtdll to spec
by tkreuzer＠svn.reactos.org 16 Jan '11

16 Jan '11

Author: tkreuzer Date: Sun Jan 16 18:02:17 2011 New Revision: 50400 URL: http://svn.reactos.org/svn/reactos?rev=50400&view=rev Log: [CMAKE] Convert crtdll to spec Modified: branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crtdll/… ============================================================================== --- branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] Sun Jan 16 18:02:17 2011 @@ -1,3 +1,5 @@ + +spec2def(crtdll.dll crtdll.spec) add_definitions( -DUSE_MSVCRT_PREFIX @@ -13,7 +15,7 @@ list(APPEND SOURCE dllmain.c crtdll.rc - crtdll.def) + ${CMAKE_CURRENT_BINARY_DIR}/crtdll.def) if(NOT MSVC) set_source_files_properties(crtdll.def PROPERTIES EXTERNAL_OBJECT TRUE)

1 0

[weiden] 50399: Implement GetClassLongPtrA/W
by weiden＠svn.reactos.org 16 Jan '11

16 Jan '11

Author: weiden Date: Sun Jan 16 17:08:07 2011 New Revision: 50399 URL: http://svn.reactos.org/svn/reactos?rev=50399&view=rev Log: Implement GetClassLongPtrA/W Modified: trunk/reactos/dll/win32/user32/windows/class.c Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Sun Jan 16 17:08:07 2011 @@ -339,6 +339,161 @@ return (gcpd ? gcpd : Ret); } +static ULONG_PTR FASTCALL +IntGetClassLongA(PWND Wnd, PCLS Class, int nIndex) +{ + ULONG_PTR Ret = 0; + + if (nIndex >= 0) + { + if (nIndex + sizeof(ULONG_PTR) < nIndex || + nIndex + sizeof(ULONG_PTR) > Class->cbclsExtra) + { + SetLastError(ERROR_INVALID_PARAMETER); + } + else + Ret = *(PULONG_PTR)((ULONG_PTR)(Class + 1) + nIndex); + } + else + { + switch (nIndex) + { + case GCL_CBWNDEXTRA: + Ret = (ULONG_PTR)Class->cbwndExtra; + break; + + case GCL_CBCLSEXTRA: + Ret = (ULONG_PTR)Class->cbclsExtra; + break; + + case GCL_HBRBACKGROUND: + Ret = (ULONG_PTR)Class->hbrBackground; + if (Ret != 0 && Ret < 0x4000) + Ret = (ULONG_PTR)GetSysColorBrush((ULONG)Ret - 1); + break; + + case GCL_HMODULE: + //ERR("Cls 0x%x GCL_HMODULE 0x%x\n", Wnd->pcls, Class->hModule); + Ret = (ULONG_PTR)Class->hModule; + break; + + case GCL_MENUNAME: + Ret = (ULONG_PTR)Class->lpszClientAnsiMenuName; + break; + + case GCL_STYLE: + Ret = (ULONG_PTR)Class->style; + break; + + case GCW_ATOM: + Ret = (ULONG_PTR)Class->atomClassName; + break; + + case GCLP_HCURSOR: + /* FIXME - get handle from pointer to CURSOR object */ + Ret = (ULONG_PTR)Class->hCursor; + break; + + case GCLP_HICON: + /* FIXME - get handle from pointer to ICON object */ + Ret = (ULONG_PTR)Class->hIcon; + break; + + case GCLP_HICONSM: + /* FIXME - get handle from pointer to ICON object */ + Ret = (ULONG_PTR)Class->hIconSm; + break; + + case GCLP_WNDPROC: + Ret = IntGetClsWndProc(Wnd, Class, TRUE); + break; + + default: + SetLastError(ERROR_INVALID_INDEX); + break; + } + } + + return Ret; +} + +static ULONG_PTR FASTCALL +IntGetClassLongW (PWND Wnd, PCLS Class, int nIndex) +{ + ULONG_PTR Ret = 0; + + if (nIndex >= 0) + { + if (nIndex + sizeof(ULONG_PTR) < nIndex || + nIndex + sizeof(ULONG_PTR) > Class->cbclsExtra) + { + SetLastError(ERROR_INVALID_PARAMETER); + } + else + Ret = *(PULONG_PTR)((ULONG_PTR)(Class + 1) + nIndex); + } + else + { + switch (nIndex) + { + case GCL_CBWNDEXTRA: + Ret = (ULONG_PTR)Class->cbwndExtra; + break; + + case GCL_CBCLSEXTRA: + Ret = (ULONG_PTR)Class->cbclsExtra; + break; + + case GCLP_HBRBACKGROUND: + Ret = (ULONG_PTR)Class->hbrBackground; + if (Ret != 0 && Ret < 0x4000) + Ret = (ULONG_PTR)GetSysColorBrush((ULONG)Ret - 1); + break; + + case GCL_HMODULE: + Ret = (ULONG_PTR)Class->hModule; + break; + + case GCLP_MENUNAME: + Ret = (ULONG_PTR)Class->lpszClientUnicodeMenuName; + break; + + case GCL_STYLE: + Ret = (ULONG_PTR)Class->style; + break; + + case GCW_ATOM: + Ret = (ULONG_PTR)Class->atomClassName; + break; + + case GCLP_HCURSOR: + /* FIXME - get handle from pointer to CURSOR object */ + Ret = (ULONG_PTR)Class->hCursor; + break; + + case GCLP_HICON: + /* FIXME - get handle from pointer to ICON object */ + Ret = (ULONG_PTR)Class->hIcon; + break; + + case GCLP_HICONSM: + /* FIXME - get handle from pointer to ICON object */ + Ret = (ULONG_PTR)Class->hIconSm; + break; + + case GCLP_WNDPROC: + Ret = IntGetClsWndProc(Wnd, Class, FALSE); + break; + + default: + SetLastError(ERROR_INVALID_INDEX); + break; + } + } + + return Ret; +} + /* * @implemented */ @@ -360,75 +515,26 @@ Class = DesktopPtrToUser(Wnd->pcls); if (Class != NULL) { - if (nIndex >= 0) - { - if (nIndex + sizeof(ULONG_PTR) < nIndex || - nIndex + sizeof(ULONG_PTR) > Class->cbclsExtra) - { - SetLastError(ERROR_INVALID_PARAMETER); - } - else - Ret = *(PULONG_PTR)((ULONG_PTR)(Class + 1) + nIndex); - } - else - { - switch (nIndex) - { - case GCL_CBWNDEXTRA: - Ret = (ULONG_PTR)Class->cbwndExtra; - break; - - case GCL_CBCLSEXTRA: - Ret = (ULONG_PTR)Class->cbclsExtra; - break; - - case GCL_HBRBACKGROUND: - Ret = (ULONG_PTR)Class->hbrBackground; - if (Ret != 0 && Ret < 0x4000) - Ret = (ULONG_PTR)GetSysColorBrush((ULONG)Ret - 1); - break; - - case GCL_HMODULE: - //ERR("Cls 0x%x GCL_HMODULE 0x%x\n", Wnd->pcls, Class->hModule); - Ret = (ULONG_PTR)Class->hModule; - break; - - case GCL_MENUNAME: - Ret = (ULONG_PTR)Class->lpszClientAnsiMenuName; - break; - - case GCL_STYLE: - Ret = (ULONG_PTR)Class->style; - break; - - case GCW_ATOM: - Ret = (ULONG_PTR)Class->atomClassName; - break; - - case GCLP_HCURSOR: - /* FIXME - get handle from pointer to CURSOR object */ - Ret = (ULONG_PTR)Class->hCursor; - break; - - case GCLP_HICON: - /* FIXME - get handle from pointer to ICON object */ - Ret = (ULONG_PTR)Class->hIcon; - break; - - case GCLP_HICONSM: - /* FIXME - get handle from pointer to ICON object */ - Ret = (ULONG_PTR)Class->hIconSm; - break; - - case GCLP_WNDPROC: - Ret = IntGetClsWndProc(Wnd, Class, TRUE); - break; - - default: - SetLastError(ERROR_INVALID_INDEX); - break; - } - } +#ifdef _WIN64 + switch (nIndex) + { + case GCLP_HBRBACKGROUND: + case GCLP_HCURSOR: + case GCLP_HICON: + case GCLP_HICONSM: + case GCLP_HMODULE: + case GCLP_MENUNAME: + case GCLP_WNDPROC: + SetLastError(ERROR_INVALID_INDEX); + break; + + default: + Ret = IntGetClassLongA(Wnd, Class, nIndex); + break; + } +#else + Ret = IntGetClassLongA(Wnd, Class, nIndex); +#endif } else { @@ -441,7 +547,7 @@ } _SEH2_END; - return Ret; + return (DWORD)Ret; } /* @@ -465,74 +571,26 @@ Class = DesktopPtrToUser(Wnd->pcls); if (Class != NULL) { - if (nIndex >= 0) - { - if (nIndex + sizeof(ULONG_PTR) < nIndex || - nIndex + sizeof(ULONG_PTR) > Class->cbclsExtra) - { - SetLastError(ERROR_INVALID_PARAMETER); - } - else - Ret = *(PULONG_PTR)((ULONG_PTR)(Class + 1) + nIndex); - } - else - { - switch (nIndex) - { - case GCL_CBWNDEXTRA: - Ret = (ULONG_PTR)Class->cbwndExtra; - break; - - case GCL_CBCLSEXTRA: - Ret = (ULONG_PTR)Class->cbclsExtra; - break; - - case GCL_HBRBACKGROUND: - Ret = (ULONG_PTR)Class->hbrBackground; - if (Ret != 0 && Ret < 0x4000) - Ret = (ULONG_PTR)GetSysColorBrush((ULONG)Ret - 1); - break; - - case GCL_HMODULE: - Ret = (ULONG_PTR)Class->hModule; - break; - - case GCL_MENUNAME: - Ret = (ULONG_PTR)Class->lpszClientUnicodeMenuName; - break; - - case GCL_STYLE: - Ret = (ULONG_PTR)Class->style; - break; - - case GCW_ATOM: - Ret = (ULONG_PTR)Class->atomClassName; - break; - - case GCLP_HCURSOR: - /* FIXME - get handle from pointer to CURSOR object */ - Ret = (ULONG_PTR)Class->hCursor; - break; - - case GCLP_HICON: - /* FIXME - get handle from pointer to ICON object */ - Ret = (ULONG_PTR)Class->hIcon; - break; - - case GCLP_HICONSM: - /* FIXME - get handle from pointer to ICON object */ - Ret = (ULONG_PTR)Class->hIconSm; - break; - - case GCLP_WNDPROC: - Ret = IntGetClsWndProc(Wnd, Class, FALSE); - break; - - default: - SetLastError(ERROR_INVALID_INDEX); - break; - } - } +#ifdef _WIN64 + switch (nIndex) + { + case GCLP_HBRBACKGROUND: + case GCLP_HCURSOR: + case GCLP_HICON: + case GCLP_HICONSM: + case GCLP_HMODULE: + case GCLP_MENUNAME: + case GCLP_WNDPROC: + SetLastError(ERROR_INVALID_INDEX); + break; + + default: + Ret = IntGetClassLongW(Wnd, Class, nIndex); + break; + } +#else + Ret = IntGetClassLongW(Wnd, Class, nIndex); +#endif } else { @@ -541,35 +599,90 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + Ret = 0; } _SEH2_END; - return Ret; + return (DWORD)Ret; } #ifdef _WIN64 /* - * @unimplemented + * @implemented */ ULONG_PTR WINAPI GetClassLongPtrA(HWND hWnd, INT nIndex) { - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented + PWND Wnd; + PCLS Class; + ULONG_PTR Ret = 0; + + TRACE("%p %d\n", hWnd, nIndex); + + Wnd = ValidateHwnd(hWnd); + if (!Wnd) + return 0; + + _SEH2_TRY + { + Class = DesktopPtrToUser(Wnd->pcls); + if (Class != NULL) + { + Ret = IntGetClassLongA(Wnd, Class, nIndex); + } + else + { + WARN("Invalid class for hwnd 0x%p!\n", hWnd); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = 0; + } + _SEH2_END; + + return Ret; +} + +/* + * @implemented */ ULONG_PTR WINAPI GetClassLongPtrW(HWND hWnd, INT nIndex) { - UNIMPLEMENTED; - return 0; + PWND Wnd; + PCLS Class; + ULONG_PTR Ret = 0; + + TRACE("%p %d\n", hWnd, nIndex); + + Wnd = ValidateHwnd(hWnd); + if (!Wnd) + return 0; + + _SEH2_TRY + { + Class = DesktopPtrToUser(Wnd->pcls); + if (Class != NULL) + { + Ret = IntGetClassLongW(Wnd, Class, nIndex); + } + else + { + WARN("Invalid class for hwnd 0x%p!\n", hWnd); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = 0; + } + _SEH2_END; + + return Ret; } #endif

1 0

[mkupfer] 50398: - Fix draw of cursors in static controls - Last part of fix for bug #4874
by mkupfer＠svn.reactos.org 16 Jan '11

16 Jan '11

Author: mkupfer Date: Sun Jan 16 12:51:14 2011 New Revision: 50398 URL: http://svn.reactos.org/svn/reactos?rev=50398&view=rev Log: - Fix draw of cursors in static controls - Last part of fix for bug #4874 Modified: trunk/reactos/dll/win32/user32/controls/static.c Modified: trunk/reactos/dll/win32/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] Sun Jan 16 12:51:14 2011 @@ -863,7 +863,15 @@ else { BITMAP bm; - if (!GetObjectW(info.hbmColor, sizeof(BITMAP), &bm)) return; + if (info.fIcon) + { + GetObjectW(info.hbmColor, sizeof(BITMAP), &bm); + } + else + { + bm.bmWidth = GetSystemMetrics(SM_CXCURSOR); + bm.bmHeight = GetSystemMetrics(SM_CYCURSOR); + } if (style & SS_CENTERIMAGE) { iconRect.left = (rc.right - rc.left) / 2 - bm.bmWidth / 2;

1 0

[weiden] 50397: Create a security descriptor for the desktops rather than passing the ACLs in as a security descriptor
by weiden＠svn.reactos.org 16 Jan '11

16 Jan '11

Author: weiden Date: Sun Jan 16 02:51:58 2011 New Revision: 50397 URL: http://svn.reactos.org/svn/reactos?rev=50397&view=rev Log: Create a security descriptor for the desktops rather than passing the ACLs in as a security descriptor Modified: trunk/reactos/base/system/winlogon/wlx.c Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] Sun Jan 16 02:51:58 2011 @@ -961,7 +961,9 @@ DWORD SidSize, AclSize; PACL pDefaultAcl = NULL; PACL pUserDesktopAcl = NULL; + SECURITY_DESCRIPTOR DefaultSecurityDescriptor; SECURITY_ATTRIBUTES DefaultSecurity; + SECURITY_DESCRIPTOR UserDesktopSecurityDescriptor; SECURITY_ATTRIBUTES UserDesktopSecurity; BOOL ret = FALSE; @@ -1008,8 +1010,24 @@ ERR("WL: AddAccessAllowedAce() failed (error %lu)\n", GetLastError()); goto cleanup; } + + /* + * Create the default security descriptor + */ + if (!InitializeSecurityDescriptor(&DefaultSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION)) + { + ERR("WL: InitializeSecurityDescriptor() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + if (!SetSecurityDescriptorDacl(&DefaultSecurityDescriptor, TRUE, pDefaultAcl, FALSE)) + { + ERR("WL: SetSecurityDescriptorDacl() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + DefaultSecurity.nLength = sizeof(SECURITY_ATTRIBUTES); - DefaultSecurity.lpSecurityDescriptor = pDefaultAcl; + DefaultSecurity.lpSecurityDescriptor = &DefaultSecurityDescriptor; DefaultSecurity.bInheritHandle = TRUE; /* @@ -1021,8 +1039,24 @@ ERR("WL: AddAccessAllowedAce() failed (error %lu)\n", GetLastError()); goto cleanup; } + + /* + * Create the user desktop security descriptor + */ + if (!InitializeSecurityDescriptor(&UserDesktopSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION)) + { + ERR("WL: InitializeSecurityDescriptor() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + if (!SetSecurityDescriptorDacl(&UserDesktopSecurityDescriptor, TRUE, pUserDesktopAcl, FALSE)) + { + ERR("WL: SetSecurityDescriptorDacl() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + UserDesktopSecurity.nLength = sizeof(SECURITY_ATTRIBUTES); - UserDesktopSecurity.lpSecurityDescriptor = pUserDesktopAcl; + UserDesktopSecurity.lpSecurityDescriptor = &UserDesktopSecurityDescriptor; UserDesktopSecurity.bInheritHandle = TRUE; /*

1 0

[weiden] 50396: Portability bugfixes
by weiden＠svn.reactos.org 16 Jan '11

16 Jan '11

Author: weiden Date: Sun Jan 16 01:32:45 2011 New Revision: 50396 URL: http://svn.reactos.org/svn/reactos?rev=50396&view=rev Log: Portability bugfixes Modified: trunk/reactos/lib/rtl/srw.c Modified: trunk/reactos/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/srw.c?rev=50396&r1… ============================================================================== --- trunk/reactos/lib/rtl/srw.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/srw.c [iso-8859-1] Sun Jan 16 01:32:45 2011 @@ -131,7 +131,7 @@ } } - (void)_InterlockedExchange((PLONG)&SRWLock->Ptr, NewValue); + (void)_InterlockedExchangePointer(&SRWLock->Ptr, (PVOID)NewValue); if (FirstWaitBlock->Exclusive) { @@ -186,7 +186,7 @@ NewValue = RTL_SRWLOCK_OWNED; } - (void)_InterlockedExchange((PLONG)&SRWLock->Ptr, NewValue); + (void)_InterlockedExchangePointer(&SRWLock->Ptr, (PVOID)NewValue); (void)InterlockedOr(&FirstWaitBlock->Wake, TRUE); @@ -420,9 +420,9 @@ NewValue = (CurrentValue >> RTL_SRWLOCK_BITS) + 1; NewValue = (NewValue << RTL_SRWLOCK_BITS) | (CurrentValue & RTL_SRWLOCK_MASK); - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, - NewValue, - CurrentValue) == CurrentValue) + if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { /* Successfully incremented the shared count, we acquired the lock */ break; @@ -499,9 +499,9 @@ ASSERT_SRW_WAITBLOCK(&StackWaitBlock); NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, - NewValue, - CurrentValue) == CurrentValue) + if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { RtlpAcquireSRWLockSharedWait(SRWLock, &StackWaitBlock, @@ -521,9 +521,9 @@ RTL_SRWLOCK_SHARED nor the RTL_SRWLOCK_OWNED bit is set */ ASSERT(!(CurrentValue & RTL_SRWLOCK_CONTENDED)); - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, - NewValue, - CurrentValue) == CurrentValue) + if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { /* Successfully set the shared count, we acquired the lock */ break; @@ -580,9 +580,9 @@ NewValue = (NewValue << RTL_SRWLOCK_BITS) | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_OWNED; } - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, - NewValue, - CurrentValue) == CurrentValue) + if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { /* Successfully released the lock */ break; @@ -639,9 +639,9 @@ NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_CONTENDED | RTL_SRWLOCK_OWNED; - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, - NewValue, - CurrentValue) == CurrentValue) + if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { RtlpAcquireSRWLockExclusiveWait(SRWLock, &StackWaitBlock); @@ -697,9 +697,9 @@ ASSERT_SRW_WAITBLOCK(&StackWaitBlock); NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, - NewValue, - CurrentValue) == CurrentValue) + if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { RtlpAcquireSRWLockExclusiveWait(SRWLock, &StackWaitBlock); @@ -767,9 +767,9 @@ ASSERT(!(CurrentValue & ~RTL_SRWLOCK_OWNED)); NewValue = 0; - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, - NewValue, - CurrentValue) == CurrentValue) + if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { /* We released the lock */ break;

1 0

[fireball] 50395: - It's a really bad idea to use freed data, so fix that.
by fireball＠svn.reactos.org 15 Jan '11

15 Jan '11

Author: fireball Date: Sat Jan 15 22:00:23 2011 New Revision: 50395 URL: http://svn.reactos.org/svn/reactos?rev=50395&view=rev Log: - It's a really bad idea to use freed data, so fix that. Modified: branches/arwinss/reactos/dll/win32/winent.drv/window.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/window.c [iso-8859-1] Sat Jan 15 22:00:23 2011 @@ -274,9 +274,8 @@ if (!data) return; /* Remove property and free its data */ + destroy_whole_window( data, FALSE ); associate_destroy( data ); - - destroy_whole_window( data, FALSE ); } /***********************************************************************

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2011