Ros-diffs March 2008

ros-diffs@reactos.org

22 participants
269 discussions

[tkreuzer] 32748: remove duplicate definitions
by tkreuzer＠svn.reactos.org 22 Mar '08

22 Mar '08

Author: tkreuzer Date: Sat Mar 22 09:59:02 2008 New Revision: 32748 URL: http://svn.reactos.org/svn/reactos?rev=3D32748&view=3Drev Log: remove duplicate definitions Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntuser.h?rev=3D32748&r1=3D32747&r2=3D32748&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Sat Mar 22 09:59:02 2008 @@ -2492,10 +2492,6 @@ #define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0xfffe0031 #define ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID 0xfffe0047 // use HWND_ROUTI= NE_GETWNDCONTEXTHLPID #define ONEPARAM_ROUTINE_GETCURSORPOSITION 0xfffe0048 // use ONEPARAM_ = or TWOPARAM routine ? - -#define TWOPARAM_ROUTINE_ENABLEWINDOW 0x60 -#define TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS 0x62 -#define TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW 0x63 #define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 // user mode #define TWOPARAM_ROUTINE_GETWINDOWRGN 0xfffd0049 // user mode #define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050

1 0

[greatlrd] 32747: Fixing a typo in ndis rename NdisGetSystemUptime to NdisGetSystemUpTime
by greatlrd＠svn.reactos.org 22 Mar '08

22 Mar '08

Author: greatlrd Date: Sat Mar 22 04:18:21 2008 New Revision: 32747 URL: http://svn.reactos.org/svn/reactos?rev=3D32747&view=3Drev Log: Fixing a typo in ndis rename NdisGetSystemUptime to NdisGetSystemUpTime Modified: trunk/reactos/drivers/network/ndis/ndis.def trunk/reactos/drivers/network/ndis/ndis/stubs.c trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/drivers/network/ndis/ndis.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/= ndis.def?rev=3D32747&r1=3D32746&r2=3D32747&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/network/ndis/ndis.def (original) +++ trunk/reactos/drivers/network/ndis/ndis.def Sat Mar 22 04:18:21 2008 @@ -100,7 +100,7 @@ NdisGetDriverHandle@8 NdisGetFirstBufferFromPacket@20 NdisGetReceivedPacket@8 -NdisGetSystemUptime@4 +NdisGetSystemUpTime@4 NdisIMAssociateMiniport@8 NdisIMCancelInitializeDeviceInstance@8 NdisIMCopySendCompletePerPacketInfo@8 Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/= ndis/stubs.c?rev=3D32747&r1=3D32746&r2=3D32747&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/network/ndis/ndis/stubs.c (original) +++ trunk/reactos/drivers/network/ndis/ndis/stubs.c Sat Mar 22 04:18:21 2008 @@ -526,7 +526,7 @@ */ VOID EXPORT -NdisGetSystemUptime( +NdisGetSystemUpTime( OUT PULONG pSystemUpTime) /* * FUNCTION: Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?re= v=3D32747&r1=3D32746&r2=3D32747&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/ddk/ndis.h (original) +++ trunk/reactos/include/ddk/ndis.h Sat Mar 22 04:18:21 2008 @@ -3192,7 +3192,7 @@ NDISAPI VOID DDKAPI -NdisGetSystemUptime( +NdisGetSystemUpTime( OUT PULONG pSystemUpTime); = NDISAPI

1 0

[tkreuzer] 32746: - add tests for SetWorldTransform - more tests for CreateCompatibleDC, GetClipRgn, SelectObject and SetDCPenColor
by tkreuzer＠svn.reactos.org 22 Mar '08

22 Mar '08

Author: tkreuzer Date: Fri Mar 21 22:21:52 2008 New Revision: 32746 URL: http://svn.reactos.org/svn/reactos?rev=3D32746&view=3Drev Log: - add tests for SetWorldTransform = - more tests for CreateCompatibleDC, GetClipRgn, SelectObject and SetDCPenC= olor Added: trunk/rostests/apitests/gdi32api/tests/SetWorldTransform.c (with prop= s) Modified: trunk/rostests/apitests/gdi32api/testlist.c trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c trunk/rostests/apitests/gdi32api/tests/SelectObject.c trunk/rostests/apitests/gdi32api/tests/SetDCPenColor.c Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/te= stlist.c?rev=3D32746&r1=3D32745&r2=3D32746&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/gdi32api/testlist.c (original) +++ trunk/rostests/apitests/gdi32api/testlist.c Fri Mar 21 22:21:52 2008 @@ -18,7 +18,7 @@ #include "tests/SelectObject.c" #include "tests/SetDCPenColor.c" #include "tests/SetSysColors.c" -//#include "tests/SetWorldTransform.c" +#include "tests/SetWorldTransform.c" = /* The List of tests */ TESTENTRY TestList[] =3D @@ -37,7 +37,7 @@ { L"SetSysColors", Test_SetSysColors }, { L"SelectObject", Test_SelectObject }, { L"SetDCPenColor", Test_SetDCPenColor }, -// { L"SetWorldTransform", Test_SetWorldTransform }, + { L"SetWorldTransform", Test_SetWorldTransform }, }; = /* The function that gives us the number of tests */ Modified: trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/te= sts/CreateCompatibleDC.c?rev=3D32746&r1=3D32745&r2=3D32746&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c (original) +++ trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c Fri Mar 21 = 22:21:52 2008 @@ -3,12 +3,23 @@ { HDC hDCScreen, hOldDC, hDC, hDC2; = - // Create a DC + /* Get screen DC */ hDCScreen =3D GetDC(NULL); - if (hDCScreen =3D=3D NULL) - { - return FALSE; - } + ASSERT(hDCScreen !=3D NULL); + + /* Test NULL DC handle */ + SetLastError(ERROR_SUCCESS); + hDC =3D CreateCompatibleDC(NULL); + TEST(hDC !=3D NULL); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + if(hDC) DeleteDC(hDC); + + /* Test invalid DC handle */ + SetLastError(ERROR_SUCCESS); + hDC =3D CreateCompatibleDC((HDC)0x123456); + TEST(hDC =3D=3D NULL); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + if(hDC) DeleteDC(hDC); = hDC =3D CreateCompatibleDC(hDCScreen); RTEST(hDC !=3D NULL); Modified: trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/te= sts/GetClipRgn.c?rev=3D32746&r1=3D32745&r2=3D32746&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c Fri Mar 21 22:21:52= 2008 @@ -13,8 +13,15 @@ hDC =3D GetDC(hWnd); hrgn =3D CreateRectRgn(0,0,0,0); = + /* Test invalid DC */ SetLastError(ERROR_SUCCESS); -// TEST(GetClipRgn(hDC) + TEST(GetClipRgn((HDC)0x12345, hrgn) =3D=3D -1); + TEST(GetLastError() =3D=3D ERROR_INVALID_PARAMETER); + + /* Test invalid hrgn */ + SetLastError(ERROR_SUCCESS); + TEST(GetClipRgn(hDC, (HRGN)0x12345) =3D=3D 0); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); = ReleaseDC(hWnd, hDC); DestroyWindow(hWnd); Modified: trunk/rostests/apitests/gdi32api/tests/SelectObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/te= sts/SelectObject.c?rev=3D32746&r1=3D32745&r2=3D32746&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/gdi32api/tests/SelectObject.c (original) +++ trunk/rostests/apitests/gdi32api/tests/SelectObject.c Fri Mar 21 22:21:= 52 2008 @@ -2,7 +2,7 @@ Test_SelectObject(PTESTINFO pti) { HGDIOBJ hOldObj, hNewObj; - HDC hScreenDC, hDC; + HDC hScreenDC, hDC, hDC2; PGDI_TABLE_ENTRY pEntry; PDC_ATTR pDc_Attr; HANDLE hcmXform; @@ -34,6 +34,16 @@ TEST(hOldObj =3D=3D GetStockObject(WHITE_BRUSH)); TEST(pDc_Attr->hbrush =3D=3D hNewObj); SelectObject(hDC, hOldObj); + + /* Test wrong hDC handle type */ + SetLastError(ERROR_SUCCESS); + hNewObj =3D GetStockObject(GRAY_BRUSH); + hDC2 =3D (HDC)((UINT_PTR)hDC & ~GDI_HANDLE_TYPE_MASK); + hDC2 =3D (HDC)((UINT_PTR)hDC2 | GDI_OBJECT_TYPE_PEN); + hOldObj =3D SelectObject(hDC2, hNewObj); + TEST(GetLastError() =3D=3D ERROR_INVALID_HANDLE); + TEST(hOldObj =3D=3D NULL); + TEST(pDc_Attr->hbrush =3D=3D GetStockObject(WHITE_BRUSH)); = /* Test wrong hobj handle type */ SetLastError(ERROR_SUCCESS); Modified: trunk/rostests/apitests/gdi32api/tests/SetDCPenColor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/te= sts/SetDCPenColor.c?rev=3D32746&r1=3D32745&r2=3D32746&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/gdi32api/tests/SetDCPenColor.c (original) +++ trunk/rostests/apitests/gdi32api/tests/SetDCPenColor.c Fri Mar 21 22:21= :52 2008 @@ -4,7 +4,9 @@ HDC hScreenDC, hDC; = // Test an incorrect DC + SetLastError(ERROR_SUCCESS); RTEST(SetDCPenColor(0, RGB(0,0,0)) =3D=3D CLR_INVALID); + TEST(GetLastError() =3D=3D ERROR_INVALID_PARAMETER); = // Get the Screen DC hScreenDC =3D GetDC(NULL); Added: trunk/rostests/apitests/gdi32api/tests/SetWorldTransform.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/te= sts/SetWorldTransform.c?rev=3D32746&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/gdi32api/tests/SetWorldTransform.c (added) +++ trunk/rostests/apitests/gdi32api/tests/SetWorldTransform.c Fri Mar 21 2= 2:21:52 2008 @@ -1,0 +1,20 @@ +INT +Test_SetWorldTransform(PTESTINFO pti) +{ + PGDI_TABLE_ENTRY pEntry; + HDC hScreenDC, hDC; + DC_ATTR* pDC_Attr; + + /* Create a DC */ + hScreenDC =3D GetDC(NULL); + hDC =3D CreateCompatibleDC(hScreenDC); + ReleaseDC(NULL, hScreenDC); + SetGraphicsMode(hDC, GM_ADVANCED); + + pEntry =3D GdiHandleTable + GDI_HANDLE_GET_INDEX(hDC); + pDC_Attr =3D pEntry->UserData; + + DeleteDC(hDC); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/SetWorldTransform.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native

1 0

[tkreuzer] 32745: - don't use shared locks, when modifying bitmaps - remove another reference to GDIOBJ_AllocObjDepricated
by tkreuzer＠svn.reactos.org 22 Mar '08

22 Mar '08

Author: tkreuzer Date: Fri Mar 21 22:14:57 2008 New Revision: 32745 URL: http://svn.reactos.org/svn/reactos?rev=3D32745&view=3Drev Log: - don't use shared locks, when modifying bitmaps - remove another reference to GDIOBJ_AllocObjDepricated Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/include/bitmaps.h Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/eng/surface.c?rev=3D32745&r1=3D32744&r2=3D32745&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/eng/surface.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c Fri Mar 21 22:14:57= 2008 @@ -298,11 +298,13 @@ if (Format =3D=3D 0) return 0; = - NewBitmap =3D BITMAPOBJ_AllocBitmapDepricated(); - if (NewBitmap =3D=3D NULL) + BitmapObj =3D BITMAPOBJ_AllocBitmapWithHandle(); + if (BitmapObj =3D=3D NULL) + { return 0; - - BitmapObj =3D BITMAPOBJ_LockBitmap(NewBitmap); + } + NewBitmap =3D BitmapObj->BaseObject.hHmgr; + if (! BITMAPOBJ_InitBitsLock(BitmapObj)) { BITMAPOBJ_UnlockBitmap(BitmapObj); Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/bitmaps.h?rev=3D32745&r1=3D32744&r2=3D32745&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h Fri Mar 21 22:1= 4:57 2008 @@ -34,8 +34,12 @@ = /* NOTE: Use shared locks! */ #define BITMAPOBJ_LockBitmap(hBMObj) \ + ((PBITMAPOBJ) GDIOBJ_LockObj ((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP)) +#define BITMAPOBJ_ShareLockBitmap(hBMObj) \ ((PBITMAPOBJ) GDIOBJ_ShareLockObj ((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BIT= MAP)) #define BITMAPOBJ_UnlockBitmap(pBMObj) \ + GDIOBJ_UnlockObjByPtr ((POBJ)pBMObj) +#define BITMAPOBJ_ShareUnlockBitmap(pBMObj) \ GDIOBJ_ShareUnlockObjByPtr ((POBJ)pBMObj) = BOOL INTERNAL_CALL BITMAP_Cleanup(PVOID ObjectBody);

1 0

[tkreuzer] 32744: add tests for NtUserCallHwnd, NtUserCallHwndLock, NtUserCallHwndOpt, NtUserCallHwndParam, NtUserCallHwndParamLock, NtUserCallNoParam, NtUserCallOneParam and NtUserSystemParametersInfo
by tkreuzer＠svn.reactos.org 22 Mar '08

22 Mar '08

Author: tkreuzer Date: Fri Mar 21 22:12:01 2008 New Revision: 32744 URL: http://svn.reactos.org/svn/reactos?rev=3D32744&view=3Drev Log: add tests for NtUserCallHwnd, NtUserCallHwndLock, NtUserCallHwndOpt, NtUser= CallHwndParam, NtUserCallHwndParamLock, NtUserCallNoParam, NtUserCallOnePar= am and NtUserSystemParametersInfo Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwnd.c (with props) trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndLock.c (with pr= ops) trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndOpt.c (with pro= ps) trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndParam.c (with p= rops) trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndParamLock.c (wi= th props) trunk/rostests/apitests/w32knapi/ntuser/NtUserCallNoParam.c (with pro= ps) trunk/rostests/apitests/w32knapi/ntuser/NtUserCallOneParam.c (with pr= ops) trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c = (with props) Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserScrollDC.c trunk/rostests/apitests/w32knapi/testlist.c trunk/rostests/apitests/w32knapi/w32knapi.c trunk/rostests/apitests/w32knapi/w32knapi.h trunk/rostests/apitests/w32knapi/w32knapi.rbuild Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/nt= user/NtUserCallHwnd.c?rev=3D32744&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwnd.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwnd.c Fri Mar 21 22:= 12:01 2008 @@ -1,0 +1,56 @@ + +INT +Test_HwndRoutine_DeregisterShellHookWindow(PTESTINFO pti, HWND hWnd) +{ + TEST(NtUserCallHwnd(hWnd, _HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW) =3D=3D= TRUE); + return APISTATUS_NORMAL; +} + +INT +Test_HwndRoutine_GetWindowContextHelpId (PTESTINFO pti, HWND hWnd) +{ + TEST(NtUserCallHwndParam(hWnd, 0xbadb00b, _HWNDPARAM_ROUTINE_SETWNDCONTEX= THLPID) =3D=3D TRUE); + TEST(NtUserCallHwnd(hWnd, _HWND_ROUTINE_GETWNDCONTEXTHLPID) =3D=3D 0xbadb= 00b); + return APISTATUS_NORMAL; +} + +INT +Test_HwndRoutine_SetMsgBox(PTESTINFO pti, HWND hWnd) +{ + TEST(NtUserCallHwnd(hWnd, 0x49) !=3D FALSE); + return APISTATUS_NORMAL; +} + + + +INT +Test_NtUserCallHwnd(PTESTINFO pti) +{ + HWND hWnd; + + hWnd =3D CreateWindowA("BUTTON", + "Test", + BS_PUSHBUTTON | WS_VISIBLE, + 0, + 0, + 50, + 30, + NULL, + NULL, + g_hInstance, + 0); + ASSERT(hWnd); + + SetLastError(ERROR_SUCCESS); + TEST(NtUserCallHwnd(hWnd, 0x44) =3D=3D FALSE); + Test_HwndRoutine_DeregisterShellHookWindow(pti, hWnd); /* 0x45 */ + TEST(NtUserCallHwnd(hWnd, 0x46) =3D=3D FALSE); // DWP_GetEnabledPopup + Test_HwndRoutine_GetWindowContextHelpId (pti, hWnd); /* 0x47 */ + TEST(NtUserCallHwnd(hWnd, 0x48) =3D=3D TRUE); + Test_HwndRoutine_SetMsgBox(pti, hWnd); /* 0x49 */ + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + + DestroyWindow(hWnd); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwnd.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndLock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/nt= user/NtUserCallHwndLock.c?rev=3D32744&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndLock.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndLock.c Fri Mar 21= 22:12:01 2008 @@ -1,0 +1,100 @@ + + +HMENU g_hMenu; + +INT +Test_HwndLockRoutine_WindowHasShadow (PTESTINFO pti, HWND hWnd) /* 0x53 */ +{ +// TEST(NtUserCallHwndLock(hWnd, 0x53) =3D=3D 0); + return APISTATUS_NORMAL; +} + + +INT +Test_HwndLockRoutine_ArrangeIconicWindows(PTESTINFO pti, HWND hWnd) /* 0x5= 4 */ +{ +// TEST(NtUserCallHwndLock(hWnd, _HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS) = =3D=3D 0); + return APISTATUS_NORMAL; +} + +INT +Test_HwndLockRoutine_DrawMenuBar(PTESTINFO pti, HWND hWnd) /* 0x55 */ +{ + TEST(NtUserCallHwndLock(hWnd, 0x55) =3D=3D 1); + return APISTATUS_NORMAL; +} + +INT +Test_HwndLockRoutine_CheckImeShowStatusInThread(PTESTINFO pti, HWND hWnd) = /* 0x56 */ +{ + TEST(NtUserCallHwndLock(hWnd, 0x56) !=3D 0); + return APISTATUS_NORMAL; +} + +INT +Test_HwndLockRoutine_GetSysMenuHandle(PTESTINFO pti, HWND hWnd) /* 0x57 */ +{ + NtUserCallHwndLock(hWnd, 0x5c); +// HMENU hMenu =3D (HMENU)NtUserCallHwndLock(hWnd, 0x57); +// TEST(hMenu !=3D 0); + return APISTATUS_NORMAL; +} + +INT +Test_HwndLockRoutine_RedrawFrame(PTESTINFO pti, HWND hWnd) /* 0x58 */ +{ +// TEST(NtUserCallHwndLock(hWnd, 0x68) !=3D 0); + return APISTATUS_NORMAL; +} + +INT +Test_HwndLockRoutine_UpdateWindow(PTESTINFO pti, HWND hWnd) /* 0x5e */ +{ + TEST(NtUserCallHwndLock(hWnd, 0x5e) =3D=3D 1); + return APISTATUS_NORMAL; +} + +INT +Test_NtUserCallHwndLock(PTESTINFO pti) +{ + HWND hWnd; + g_hMenu =3D CreateMenu(); + + hWnd =3D CreateWindowA("BUTTON", + "Test", + BS_PUSHBUTTON | WS_VISIBLE, + 0, + 0, + 50, + 30, + NULL, + g_hMenu, + g_hInstance, + 0); + ASSERT(hWnd); + + SetLastError(ERROR_SUCCESS); + TEST(NtUserCallHwndLock((HWND)-22, 999) =3D=3D 0); + TEST(GetLastError() =3D=3D ERROR_INVALID_WINDOW_HANDLE); + + SetLastError(ERROR_SUCCESS); + TEST(NtUserCallHwndLock((HWND)0, 0x55) =3D=3D 0); + TEST(GetLastError() =3D=3D ERROR_INVALID_WINDOW_HANDLE); + + SetLastError(ERROR_SUCCESS); + TEST(NtUserCallHwndLock(hWnd, 999) =3D=3D 0); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + + Test_HwndLockRoutine_WindowHasShadow (pti, hWnd); /* 0x53 */ + Test_HwndLockRoutine_ArrangeIconicWindows(pti, hWnd); + Test_HwndLockRoutine_DrawMenuBar(pti, hWnd); + Test_HwndLockRoutine_CheckImeShowStatusInThread(pti, hWnd); + Test_HwndLockRoutine_GetSysMenuHandle(pti, hWnd); + Test_HwndLockRoutine_RedrawFrame(pti, hWnd); + + Test_HwndLockRoutine_UpdateWindow(pti, hWnd); + + DestroyWindow(hWnd); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndLock.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndOpt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/nt= user/NtUserCallHwndOpt.c?rev=3D32744&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndOpt.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndOpt.c Fri Mar 21 = 22:12:01 2008 @@ -1,0 +1,25 @@ + + +INT +Test_HwndOptRoutine_SetProgmanWindow(PTESTINFO pti) /* 0x4a */ +{ +// NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETPROGMANWINDOW); + return APISTATUS_NORMAL; +} + +INT +Test_HwndOptRoutine_SetTaskmanWindow (PTESTINFO pti) /* 0x4b */ +{ +// NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETTASKMANWINDOW); + return APISTATUS_NORMAL; +} + +INT +Test_NtUserCallHwndOpt(PTESTINFO pti) +{ + + Test_HwndOptRoutine_SetProgmanWindow(pti); /* 0x4a */ + Test_HwndOptRoutine_SetTaskmanWindow (pti); /* 0x4b */ + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndOpt.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndParam.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/nt= user/NtUserCallHwndParam.c?rev=3D32744&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndParam.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndParam.c Fri Mar 2= 1 22:12:01 2008 @@ -1,0 +1,34 @@ + +INT +Test_HwndParamRoutine_SetWindowContextHelpId (PTESTINFO pti, HWND hWnd) +{ + TEST(NtUserCallHwndParam(hWnd, 12345, _HWNDPARAM_ROUTINE_SETWNDCONTEXTHLP= ID) =3D=3D TRUE); + TEST(NtUserCallHwnd(hWnd, _HWND_ROUTINE_GETWNDCONTEXTHLPID) =3D=3D 12345); + return APISTATUS_NORMAL; +} + + +INT +Test_NtUserCallHwndParam(PTESTINFO pti) +{ + HWND hWnd; + + hWnd =3D CreateWindowA("BUTTON", + "Test", + BS_PUSHBUTTON | WS_VISIBLE, + 0, + 0, + 50, + 30, + NULL, + NULL, + g_hInstance, + 0); + ASSERT(hWnd); + + Test_HwndParamRoutine_SetWindowContextHelpId (pti, hWnd); + + DestroyWindow(hWnd); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndParam.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndParamLock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/nt= user/NtUserCallHwndParamLock.c?rev=3D32744&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndParamLock.c (adde= d) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndParamLock.c Fri M= ar 21 22:12:01 2008 @@ -1,0 +1,7 @@ + + +INT +Test_NtUserCallHwndParamLock(PTESTINFO pti) +{ + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallHwndParamLock= .c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallNoParam.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/nt= user/NtUserCallNoParam.c?rev=3D32744&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/w32knapi/ntuser/NtUserCallNoParam.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCallNoParam.c Fri Mar 21 = 22:12:01 2008 @@ -1,0 +1,69 @@ + +INT +Test_NoParamRoutine_CreateMenu(PTESTINFO pti) /* 0 */ +{ + HMENU hMenu; + + hMenu =3D (HMENU)NtUserCallNoParam(_NOPARAM_ROUTINE_CREATEMENU); + TEST(IsMenu(hMenu) =3D=3D TRUE); + DestroyMenu(hMenu); + + return APISTATUS_NORMAL; +} + +INT +Test_NoParamRoutine_CreatePopupMenu(PTESTINFO pti) /* 1 */ +{ + HMENU hMenu; + + hMenu =3D (HMENU)NtUserCallNoParam(_NOPARAM_ROUTINE_CREATEMENUPOPUP); + TEST(IsMenu(hMenu) =3D=3D TRUE); + DestroyMenu(hMenu); + + return APISTATUS_NORMAL; +} + +INT +Test_NoParamRoutine_DisableProcessWindowsGhosting(PTESTINFO pti) /* 2 */ +{ + return APISTATUS_NORMAL; +} + +INT +Test_NoParamRoutine_ClearWakeMask(PTESTINFO pti) /* 3 */ +{ + return APISTATUS_NORMAL; +} + +INT +Test_NoParamRoutine_AllowForegroundActivation(PTESTINFO pti) /* 4 */ +{ + return APISTATUS_NORMAL; +} + +INT +Test_NoParamRoutine_DestroyCaret(PTESTINFO pti) /* 5 */ +{ + return APISTATUS_NORMAL; +} + +INT +Test_NoParamRoutine_LoadUserApiHook(PTESTINFO pti) /* 0x1d */ +{ + DWORD dwRet; + dwRet =3D NtUserCallNoParam(_NOPARAM_ROUTINE_LOADUSERAPIHOOK); + +// TEST(dwRet !=3D 0); + return APISTATUS_NORMAL; +} + + +INT +Test_NtUserCallNoParam(PTESTINFO pti) +{ + Test_NoParamRoutine_CreateMenu(pti); + Test_NoParamRoutine_CreatePopupMenu(pti); + Test_NoParamRoutine_LoadUserApiHook(pti); /* 0x1d */ + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallNoParam.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallOneParam.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/nt= user/NtUserCallOneParam.c?rev=3D32744&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/w32knapi/ntuser/NtUserCallOneParam.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCallOneParam.c Fri Mar 21= 22:12:01 2008 @@ -1,0 +1,73 @@ + +INT +Test_OneParamRoutine_BeginDeferWindowPos(PTESTINFO pti) /* 0x1e */ +{ + HDWP hWinPosInfo; + + hWinPosInfo =3D (HDWP)NtUserCallOneParam(5, 0x1e); + TEST(hWinPosInfo !=3D 0); + TEST(EndDeferWindowPos(hWinPosInfo) !=3D 0); + + return APISTATUS_NORMAL; +} + +INT +Test_OneParamRoutine_WindowFromDC(PTESTINFO pti) /* 0x1f */ +{ + HDC hDC =3D GetDC(NULL); + HWND hWnd; + + hWnd =3D (HWND)NtUserCallOneParam((DWORD)hDC, 0x1f); + TEST(hWnd !=3D 0); + TEST(IsWindow(hWnd)); + TEST(hWnd =3D=3D GetDesktopWindow()); + + return APISTATUS_NORMAL; +} + +INT +Test_OneParamRoutine_MapDesktopObject(PTESTINFO pti) /* 0x30 */ +{ + DWORD pObject; + HWND hWnd; + HMENU hMenu; + + hWnd =3D GetDesktopWindow(); + pObject =3D NtUserCallOneParam((DWORD)hWnd, _ONEPARAM_ROUTINE_MAPDEKTOPOB= JECT); + TEST(pObject > 0); + TEST(pObject < 0x80000000); + + hMenu =3D CreateMenu(); + pObject =3D NtUserCallOneParam((DWORD)hMenu, _ONEPARAM_ROUTINE_MAPDEKTOPO= BJECT); + TEST(pObject > 0); + TEST(pObject < 0x80000000); + + return APISTATUS_NORMAL; +} + +INT +Test_OneParamRoutine_SwapMouseButtons(PTESTINFO pti) /* 0x42 */ +{ + BOOL bInverse; + + NtUserCallOneParam(TRUE, _ONEPARAM_ROUTINE_SWAPMOUSEBUTTON); + bInverse =3D (BOOL)NtUserCallOneParam(FALSE, _ONEPARAM_ROUTINE_SWAPMOUSEB= UTTON); + TEST(bInverse =3D=3D TRUE); + bInverse =3D (BOOL)NtUserCallOneParam(FALSE, _ONEPARAM_ROUTINE_SWAPMOUSEB= UTTON); + TEST(bInverse =3D=3D FALSE); + + // TODO: test other values + return APISTATUS_NORMAL; +} + +INT +Test_NtUserCallOneParam(PTESTINFO pti) +{ + Test_OneParamRoutine_BeginDeferWindowPos(pti); /* 0x1e */ + Test_OneParamRoutine_WindowFromDC(pti); /* 0x1f */ + Test_OneParamRoutine_MapDesktopObject(pti); /* 0x30 */ + + Test_OneParamRoutine_SwapMouseButtons(pti); /* 0x42 */ + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallOneParam.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserScrollDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/nt= user/NtUserScrollDC.c?rev=3D32744&r1=3D32743&r2=3D32744&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/w32knapi/ntuser/NtUserScrollDC.c (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserScrollDC.c Fri Mar 21 22:= 12:01 2008 @@ -74,7 +74,6 @@ Result =3D NtUserScrollDC((HDC)0x123456, 10, 20, &rcScroll, &rcClip, hRgn= , &rcUpdate); RTEST(Result =3D=3D 0); RTEST(GetLastError() =3D=3D ERROR_SUCCESS); - printf("%ld\n", GetLastError()); = /* Test invalid update rect */ SetLastError(ERROR_SUCCESS); Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/nt= user/NtUserSystemParametersInfo.c?rev=3D32744&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c (a= dded) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c Fr= i Mar 21 22:12:01 2008 @@ -1,0 +1,359 @@ + +LONG +QueryUserRegValueW(LPWSTR pszSubKey, LPWSTR pszValueName, PVOID pData, LPD= WORD cbSize, LPDWORD pType) +{ + HKEY hKey; + LONG ret; + + RegOpenKeyExW(HKEY_CURRENT_USER, pszSubKey, 0, KEY_QUERY_VALUE, &hKey); + ret =3D RegQueryValueExW(hKey, pszValueName, NULL, pType, (LPBYTE)pData, = cbSize); + RegCloseKey(hKey); + return ret; +} + + +HWND +CreateTestWindow() +{ + WNDCLASSA wc; + + wc.style =3D 0; + wc.lpfnWndProc =3D DefWindowProcA; + wc.cbClsExtra =3D 0; + wc.cbWndExtra =3D 0; + wc.hInstance =3D g_hInstance; + wc.hIcon =3D NULL; + wc.hCursor =3D NULL; + wc.hbrBackground =3D NULL; + wc.lpszMenuName =3D NULL; + wc.lpszClassName =3D "testclass"; + + RegisterClassA(&wc); + return CreateWindowA("testclass", + "testwnd", + WS_VISIBLE, + 0, + 0, + 50, + 30, + NULL, + NULL, + g_hInstance, + 0); + +} + +void +Test_SPI_87_88(PTESTINFO pti) +{ + DWORD dwRet =3D 0xdeadbeef; + + TEST(NtUserSystemParametersInfo(87, 0, &dwRet, 0) =3D=3D TRUE); + TEST(dwRet =3D=3D 0xdeadbeef); + dwRet++; + TEST(NtUserSystemParametersInfo(87, 0, &dwRet, 0) =3D=3D TRUE); + + + dwRet--; + TEST(NtUserSystemParametersInfo(87, 0, &dwRet, 0) =3D=3D TRUE); + + +} + +void +Test_NtUserSystemParametersInfo_Params(PTESTINFO pti) +{ +// UINT uint; + DWORD data[1000]; + UINT i, uint; +#if 1 + /* Test normal */ + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(SPI_GETFOCUSBORDERHEIGHT, 0, &uint, 0) = =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + + /* Test invalid SPI code */ + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(7, 0, &data, 0) =3D=3D FALSE); + TEST(GetLastError() =3D=3D ERROR_INVALID_PARAMETER); + + /* Test wrong cbSize member */ + ACCESSTIMEOUT ato; + ato.cbSize =3D 1; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(SPI_GETACCESSTIMEOUT, 0, &ato, 0) =3D=3D = FALSE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); +#endif + /* Test undocumented, but valid SPI codes */ + for(i =3D 0; i < 1000; i++) data[i] =3D 0xdeadbeef; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4112, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] <=3D 1); + TEST(data[1] =3D=3D 0xdeadbeef); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xbeefdead; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4113, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] =3D=3D 0xbeefdead); + TEST(data[1] =3D=3D 0xbeefdead); + data[0] =3D 0; + NtUserSystemParametersInfo(4112, 0, &data, 0); + TEST(data[0] =3D=3D 1); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xdeadbeef; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4136, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] !=3D 0xdeadbeef); + TEST(data[1] =3D=3D 0xdeadbeef); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xbeefdead; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4137, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] =3D=3D 0xbeefdead); + TEST(data[1] =3D=3D 0xbeefdead); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xdeadbeef; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4138, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] !=3D 0xdeadbeef); + TEST(data[1] =3D=3D 0xdeadbeef); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xbeefdead; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4139, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] =3D=3D 0xbeefdead); + TEST(data[1] =3D=3D 0xbeefdead); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xdeadbeef; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4140, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] !=3D 0xdeadbeef); + TEST(data[1] =3D=3D 0xdeadbeef); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xbeefdead; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4141, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] =3D=3D 0xbeefdead); + TEST(data[1] =3D=3D 0xbeefdead); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xdeadbeef; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4142, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] !=3D 0xdeadbeef); + TEST(data[1] =3D=3D 0xdeadbeef); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xbeefdead; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4143, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] =3D=3D 0xbeefdead); + TEST(data[1] =3D=3D 0xbeefdead); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xdeadbeef; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4144, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] !=3D 0xdeadbeef); + TEST(data[1] =3D=3D 0xdeadbeef); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xbeefdead; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4145, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] =3D=3D 0xbeefdead); + TEST(data[1] =3D=3D 0xbeefdead); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xdeadbeef; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4146, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] !=3D 0xdeadbeef); + TEST(data[1] =3D=3D 0xdeadbeef); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xbeefdead; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4147, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] =3D=3D 0xbeefdead); + TEST(data[1] =3D=3D 0xbeefdead); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xdeadbeef; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4148, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] !=3D 0xdeadbeef); + TEST(data[1] =3D=3D 0xdeadbeef); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xbeefdead; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4149, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] =3D=3D 0xbeefdead); + TEST(data[1] =3D=3D 0xbeefdead); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xdeadbeef; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4150, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] !=3D 0xdeadbeef); + TEST(data[1] =3D=3D 0xdeadbeef); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xbeefdead; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4151, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] =3D=3D 0xbeefdead); + TEST(data[1] =3D=3D 0xbeefdead); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xdeadbeef; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4152, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] !=3D 0xdeadbeef); + TEST(data[1] =3D=3D 0xdeadbeef); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xbeefdead; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4153, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] =3D=3D 0xbeefdead); + TEST(data[1] =3D=3D 0xbeefdead); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xdeadbeef; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4154, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] !=3D 0xdeadbeef); + TEST(data[1] =3D=3D 0xdeadbeef); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xbeefdead; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4155, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] =3D=3D 0xbeefdead); + TEST(data[1] =3D=3D 0xbeefdead); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xdeadbeef; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4156, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] !=3D 0xdeadbeef); + TEST(data[1] =3D=3D 0xdeadbeef); + + for(i =3D 0; i < 1000; i++) data[i] =3D 0xbeefdead; + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(4157, 0, &data, 0) =3D=3D TRUE); + TEST(GetLastError() =3D=3D ERROR_SUCCESS); + TEST(data[0] =3D=3D 0xbeefdead); + TEST(data[1] =3D=3D 0xbeefdead); + + /* Test invalid pointer */ + SetLastError(ERROR_SUCCESS); + TEST(NtUserSystemParametersInfo(SPI_GETFOCUSBORDERHEIGHT, 0, (PVOID)0x800= 00000, 0) =3D=3D FALSE); + TEST(GetLastError() =3D=3D ERROR_NOACCESS); + for(i =3D 0; i < 1000; i++) data[i] =3D 0xdeadbeef; + + /* test wrong bools */ +} + +void +Test_NtUserSystemParametersInfo_fWinIni(PTESTINFO pti) +{ + ACCESSTIMEOUT ato; + UINT uFocusBorderHeight; + WCHAR Buffer[6]; + DWORD cbSize; + + ato.cbSize =3D sizeof(ato); + NtUserSystemParametersInfo(SPI_GETACCESSTIMEOUT, 0, &ato, 0); + ato.iTimeOutMSec++; + NtUserSystemParametersInfo(SPI_SETACCESSTIMEOUT, 0, &ato, 0); + ato.iTimeOutMSec--; + + NtUserSystemParametersInfo(SPI_GETFOCUSBORDERHEIGHT, 0, &uFocusBorderHeig= ht, 0); + NtUserSystemParametersInfo(SPI_SETFOCUSBORDERHEIGHT, 0, &uFocusBorderHeig= ht, SPIF_UPDATEINIFILE); + + NtUserSystemParametersInfo(SPI_SETACCESSTIMEOUT, 0, &ato, 0); + + cbSize =3D 6; + QueryUserRegValueW(L"Control Panel\\Accessibility\\TimeOut", L"TimeToWait= ", &Buffer, &cbSize, NULL); + +} + +void +Test_SPI_GETSETBEEP(PTESTINFO pti) +{ + BOOL bOrig, bTemp =3D 0; + WCHAR szReg[10]; + DWORD cbSize; + + /* Get original value */ + NtUserSystemParametersInfo(SPI_GETBEEP, 0, &bOrig, 0); + + /* Value 0 */ + NtUserSystemParametersInfo(SPI_SETBEEP, 0, NULL, SPIF_UPDATEINIFILE); + NtUserSystemParametersInfo(SPI_GETBEEP, 0, &bTemp, 0); + TEST(bTemp =3D=3D 0); + cbSize =3D sizeof(szReg); + TEST(QueryUserRegValueW(L"Control Panel\\Sound", L"Beep", &szReg, &cbSize= , NULL) =3D=3D ERROR_SUCCESS); + TEST(wcscmpi(szReg, L"No") =3D=3D 0); + + /* Value 1 */ + NtUserSystemParametersInfo(SPI_SETBEEP, 1, NULL, SPIF_UPDATEINIFILE); + NtUserSystemParametersInfo(SPI_GETBEEP, 0, &bTemp, 0); + TEST(bTemp =3D=3D 1); + cbSize =3D sizeof(szReg); + TEST(QueryUserRegValueW(L"Control Panel\\Sound", L"Beep", &szReg, &cbSize= , NULL) =3D=3D ERROR_SUCCESS); + TEST(wcscmpi(szReg, L"Yes") =3D=3D 0); + + /* Value 2 */ + NtUserSystemParametersInfo(SPI_SETBEEP, 2, NULL, SPIF_UPDATEINIFILE); + NtUserSystemParametersInfo(SPI_GETBEEP, 0, &bTemp, 0); + TEST(bTemp =3D=3D 1); + cbSize =3D sizeof(szReg); + TEST(QueryUserRegValueW(L"Control Panel\\Sound", L"Beep", &szReg, &cbSize= , NULL) =3D=3D ERROR_SUCCESS); + TEST(wcscmpi(szReg, L"Yes") =3D=3D 0); + + /* Restore original value */ + NtUserSystemParametersInfo(SPI_SETBEEP, 0, &bOrig, SPIF_UPDATEINIFILE); +} + +INT +Test_SPI_SETDESKWALLPAPER(PTESTINFO pti) +{ + /* Get old Wallpaper */ +// NtUserSystemParametersInfo(SPI_GET_DESKWALLPAPER, 0, + +// TEST(NtUserSystemParametersInfo(SPI_SETDESKWALLPAPER, 0, &hNewWallPaper= , 0) =3D=3D 0); + return 0; +} + +INT +Test_NtUserSystemParametersInfo(PTESTINFO pti) +{ + HWND hWnd; + + hWnd =3D CreateTestWindow(); +// ASSERT(hWnd); + Test_NtUserSystemParametersInfo_Params(pti); + + Test_NtUserSystemParametersInfo_fWinIni(pti); + + Test_SPI_GETSETBEEP(pti); + Test_SPI_SETDESKWALLPAPER(pti); + + Test_SPI_87_88(pti); + + DestroyWindow(hWnd); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersI= nfo.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/te= stlist.c?rev=3D32744&r1=3D32743&r2=3D32744&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Fri Mar 21 22:12:01 2008 @@ -24,10 +24,19 @@ //#include "ntgdi/NtGdiSTROBJ_vEnumStart.c" #include "ntgdi/NtGdiGetDIBits.c" = +#include "ntuser/NtUserCallHwnd.c" +#include "ntuser/NtUserCallHwndLock.c" +#include "ntuser/NtUserCallHwndOpt.c" +#include "ntuser/NtUserCallHwndParam.c" +#include "ntuser/NtUserCallHwndParamLock.c" +#include "ntuser/NtUserCallNoParam.c" +#include "ntuser/NtUserCallOneParam.c" #include "ntuser/NtUserCountClipboardFormats.c" +//#include "ntuser/NtUserCreateWindowEx.c" #include "ntuser/NtUserFindExistingCursorIcon.c" #include "ntuser/NtUserRedrawWindow.c" #include "ntuser/NtUserScrollDC.c" +#include "ntuser/NtUserSystemParametersInfo.c" #include "ntuser/NtUserToUnicodeEx.c" = /* The List of tests */ @@ -58,10 +67,19 @@ { L"NtGdiGetDIBitsInternal", Test_NtGdiGetDIBitsInternal }, = /* ntuser */ + { L"NtUserCallHwnd", Test_NtUserCallHwnd }, + { L"NtUserCallHwndLock", Test_NtUserCallHwndLock }, + { L"NtUserCallHwndOpt", Test_NtUserCallHwndOpt }, + { L"NtUserCallHwndParam", Test_NtUserCallHwndParam }, + { L"NtUserCallHwndParamLock", Test_NtUserCallHwndParamLock }, + { L"NtUserCallNoParam", Test_NtUserCallNoParam }, + { L"NtUserCallOneParam", Test_NtUserCallOneParam }, { L"NtUserCountClipboardFormats", Test_NtUserCountClipboardFormats }, +// { L"NtUserCreateWindowEx", Test_NtUserCreateWindowEx }, { L"NtUserFindExistingCursorIcon", Test_NtUserFindExistingCursoricon }, { L"NtUserRedrawWindow", Test_NtUserRedrawWindow }, { L"NtUserScrollDC", Test_NtUserScrollDC }, + { L"NtUserSystemParametersInfo", Test_NtUserSystemParametersInfo }, { L"NtUserToUnicodeEx", Test_NtUserToUnicodeEx } }; = Modified: trunk/rostests/apitests/w32knapi/w32knapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w3= 2knapi.c?rev=3D32744&r1=3D32743&r2=3D32744&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/w32knapi/w32knapi.c (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.c Fri Mar 21 22:12:01 2008 @@ -74,6 +74,9 @@ /* Convert to gui thread */ // IsGUIThread(TRUE); <- does not exists on win2k = + InitOsVersion(); + printf("g_OsIdx =3D %d\n", g_OsIdx); + g_hModule =3D LoadLibraryW(L"w32kdll.dll"); if (!g_hModule) { Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w3= 2knapi.h?rev=3D32744&r1=3D32743&r2=3D32744&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/w32knapi/w32knapi.h (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h Fri Mar 21 22:12:01 2008 @@ -38,5 +38,27 @@ = DWORD Syscall(LPWSTR lpszFunction, int cParams, void* pParams); BOOL InitOsVersion(); +extern UINT g_OsIdx; + +typedef UINT ASPI[5]; +extern ASPI gNOPARAM_ROUTINE_CREATEMENU; +extern ASPI gNOPARAM_ROUTINE_CREATEMENUPOPUP; +extern ASPI gNOPARAM_ROUTINE_LOADUSERAPIHOOK; +extern ASPI gONEPARAM_ROUTINE_MAPDEKTOPOBJECT; +extern ASPI gONEPARAM_ROUTINE_SWAPMOUSEBUTTON; +extern ASPI gHWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW; +extern ASPI gHWND_ROUTINE_GETWNDCONTEXTHLPID; +extern ASPI gHWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID; + +#define _NOPARAM_ROUTINE_CREATEMENU gNOPARAM_ROUTINE_CREATEMENU[g_OsIdx] +#define _NOPARAM_ROUTINE_CREATEMENUPOPUP gNOPARAM_ROUTINE_CREATEMENUPOPUP[= g_OsIdx] +#define _NOPARAM_ROUTINE_LOADUSERAPIHOOK gNOPARAM_ROUTINE_LOADUSERAPIHOOK[= g_OsIdx] +#define _ONEPARAM_ROUTINE_MAPDEKTOPOBJECT gONEPARAM_ROUTINE_MAPDEKTOPOBJEC= T[g_OsIdx] +#define _ONEPARAM_ROUTINE_SWAPMOUSEBUTTON gONEPARAM_ROUTINE_SWAPMOUSEBUTTO= N[g_OsIdx] +#define _HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW gHWND_ROUTINE_DEREGISTERSH= ELLHOOKWINDOW[g_OsIdx] +#define _HWND_ROUTINE_GETWNDCONTEXTHLPID gHWND_ROUTINE_GETWNDCONTEXTHLPID[= g_OsIdx] +#define _HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID gHWNDPARAM_ROUTINE_SETWNDCON= TEXTHLPID[g_OsIdx] + + = #endif /* _W32KNAPI_H */ Modified: trunk/rostests/apitests/w32knapi/w32knapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w3= 2knapi.rbuild?rev=3D32744&r1=3D32743&r2=3D32744&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rostests/apitests/w32knapi/w32knapi.rbuild (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.rbuild Fri Mar 21 22:12:01 20= 08 @@ -8,8 +8,11 @@ <library>user32</library> <library>gdi32</library> <library>shell32</library> + <library>advapi32</library> <library>w32kdll</library> + <library>dbghelp</library> <file>w32knapi.c</file> + <file>osver.c</file> <file>testlist.c</file> <file>w32knapi.rc</file> </module>

1 0

[tkreuzer] 32743: - make Simplecall definitions (NtUserCallXxx) compatible to different Win versions (currently XP and Vista), using an enum and conditional compiling - move incompatible definitions to the bottom of ntuser.h (bad section) - fix parameters of NtUserCallHwnd* and move the rest of them to simplecall.c
by tkreuzer＠svn.reactos.org 22 Mar '08

22 Mar '08

Author: tkreuzer Date: Fri Mar 21 21:53:56 2008 New Revision: 32743 URL: http://svn.reactos.org/svn/reactos?rev=3D32743&view=3Drev Log: - make Simplecall definitions (NtUserCallXxx) compatible to different Win v= ersions (currently XP and Vista), using an enum and conditional compiling - move incompatible definitions to the bottom of ntuser.h (bad section) - fix parameters of NtUserCallHwnd* and move the rest of them to simplecall= .c Modified: trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/wind= ows/hook.c?rev=3D32743&r1=3D32742&r2=3D32743&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/user32/windows/hook.c (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c Fri Mar 21 21:53:56 2008 @@ -197,7 +197,7 @@ STDCALL DeregisterShellHookWindow(HWND hWnd) { - return NtUserCallHwnd(HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW, (DWORD)hWn= d); + return NtUserCallHwnd(hWnd, HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW); } = /* @@ -207,7 +207,7 @@ STDCALL RegisterShellHookWindow(HWND hWnd) { - return NtUserCallHwnd(HWND_ROUTINE_REGISTERSHELLHOOKWINDOW, (DWORD)hWnd); + return NtUserCallHwnd(hWnd, HWND_ROUTINE_REGISTERSHELLHOOKWINDOW); } = /* Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntuser.h?rev=3D32743&r1=3D32742&r2=3D32743&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Fri Mar 21 21:53:56 2008 @@ -479,30 +479,199 @@ DWORD BufferSize, DWORD *Count); = -enum { +/* apfnSimpleCall indices from Windows XP SP 2 */ +/* TODO: Check for differences in Windows 2000, 2003 and 2008 */ +#define WIN32K_VERSION NTDDI_WINXPSP2 // FIXME: this should go somewhere e= lse + +enum SimpleCallRoutines +{ + NOPARAM_ROUTINE_CREATEMENU, + NOPARAM_ROUTINE_CREATEMENUPOPUP, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + NOPARAM_ROUTINE_ALLOWFOREGNDACTIVATION, + NOPARAM_ROUTINE_MSQCLEARWAKEMASK, + NOPARAM_ROUTINE_CREATESYSTEMTHREADS, + NOPARAM_ROUTINE_DESTROY_CARET, +#endif + NOPARAM_ROUTINE_ENABLEPROCWNDGHSTING, +#if (WIN32K_VERSION < NTDDI_VISTA) + NOPARAM_ROUTINE_MSQCLEARWAKEMASK, + NOPARAM_ROUTINE_ALLOWFOREGNDACTIVATION, + NOPARAM_ROUTINE_DESTROY_CARET, +#endif + NOPARAM_ROUTINE_GETDEVICECHANGEINFO, + NOPARAM_ROUTINE_GETIMESHOWSTATUS, + NOPARAM_ROUTINE_GETINPUTDESKTOP, + NOPARAM_ROUTINE_GETMSESSAGEPOS, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + NOPARAM_ROUTINE_HANDLESYSTHRDCREATFAIL, +#else + NOPARAM_ROUTINE_GETREMOTEPROCID, +#endif + NOPARAM_ROUTINE_HIDECURSORNOCAPTURE, + NOPARAM_ROUTINE_LOADCURSANDICOS, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + NOPARAM_ROUTINE_LOADUSERAPIHOOK, + NOPARAM_ROUTINE_PREPAREFORLOGOFF, /* 0x0f */ +#endif + NOPARAM_ROUTINE_RELEASECAPTURE, + NOPARAM_ROUTINE_RESETDBLCLICK, + NOPARAM_ROUTINE_ZAPACTIVEANDFOUS, + NOPARAM_ROUTINE_REMOTECONSHDWSTOP, + NOPARAM_ROUTINE_REMOTEDISCONNECT, + NOPARAM_ROUTINE_REMOTELOGOFF, + NOPARAM_ROUTINE_REMOTENTSECURITY, + NOPARAM_ROUTINE_REMOTESHDWSETUP, + NOPARAM_ROUTINE_REMOTESHDWSTOP, + NOPARAM_ROUTINE_REMOTEPASSTHRUENABLE, + NOPARAM_ROUTINE_REMOTEPASSTHRUDISABLE, + NOPARAM_ROUTINE_REMOTECONNECTSTATE, + NOPARAM_ROUTINE_UPDATEPERUSERIMMENABLING, + NOPARAM_ROUTINE_USERPWRCALLOUTWORKER, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + NOPARAM_ROUTINE_WAKERITFORSHTDWN, +#endif + NOPARAM_ROUTINE_INIT_MESSAGE_PUMP, + NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP, +#if (WIN32K_VERSION < NTDDI_VISTA) + NOPARAM_ROUTINE_LOADUSERAPIHOOK, +#endif + ONEPARAM_ROUTINE_BEGINDEFERWNDPOS, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + ONEPARAM_ROUTINE_GETSENDMSGRECVR, +#endif + ONEPARAM_ROUTINE_WINDOWFROMDC, + ONEPARAM_ROUTINE_ALLOWSETFOREGND, + ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT, +#if (WIN32K_VERSION < NTDDI_VISTA) + ONEPARAM_ROUTINE_CREATESYSTEMTHREADS, +#endif + ONEPARAM_ROUTINE_CSDDEUNINITIALIZE, + ONEPARAM_ROUTINE_DIRECTEDYIELD, + ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS, +#if (WIN32K_VERSION < NTDDI_VISTA) + ONEPARAM_ROUTINE_GETCURSORPOS, +#endif + ONEPARAM_ROUTINE_GETINPUTEVENT, + ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT, + ONEPARAM_ROUTINE_GETKEYBOARDTYPE, + ONEPARAM_ROUTINE_GETPROCDEFLAYOUT, + ONEPARAM_ROUTINE_GETQUEUESTATUS, + ONEPARAM_ROUTINE_GETWINSTAINFO, +#if (WIN32K_VERSION < NTDDI_VISTA) + ONEPARAM_ROUTINE_HANDLESYSTHRDCREATFAIL, +#endif + ONEPARAM_ROUTINE_LOCKFOREGNDWINDOW, + ONEPARAM_ROUTINE_LOADFONTS, + ONEPARAM_ROUTINE_MAPDEKTOPOBJECT, + ONEPARAM_ROUTINE_MESSAGEBEEP, + ONEPARAM_ROUTINE_PLAYEVENTSOUND, + ONEPARAM_ROUTINE_POSTQUITMESSAGE, +#if (WIN32K_VERSION < NTDDI_VISTA) + ONEPARAM_ROUTINE_PREPAREFORLOGOFF, +#endif + ONEPARAM_ROUTINE_REALIZEPALETTE, + ONEPARAM_ROUTINE_REGISTERLPK, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + ONEPARAM_ROUTINE_REGISTERSYSTEMTHREAD, +#endif + ONEPARAM_ROUTINE_REMOTERECONNECT, + ONEPARAM_ROUTINE_REMOTETHINWIRESTATUS, + ONEPARAM_ROUTINE_RELEASEDC, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + ONEPARAM_ROUTINE_REMOTENOTIFY, +#endif + ONEPARAM_ROUTINE_REPLYMESSAGE, + ONEPARAM_ROUTINE_SETCARETBLINKTIME, + ONEPARAM_ROUTINE_SETDBLCLICKTIME, +#if (WIN32K_VERSION < NTDDI_VISTA) + ONEPARAM_ROUTINE_SETIMESHOWSTATUS, +#endif + ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO, + ONEPARAM_ROUTINE_SETPROCDEFLAYOUT, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + ONEPARAM_ROUTINE_SETWATERMARKSTRINGS, +#endif + ONEPARAM_ROUTINE_SHOWCURSOR, + ONEPARAM_ROUTINE_SHOWSTARTGLASS, + ONEPARAM_ROUTINE_SWAPMOUSEBUTTON, + X_ROUTINE_WOWMODULEUNLOAD, +#if (WIN32K_VERSION < NTDDI_VISTA) + X_ROUTINE_REMOTENOTIFY, +#endif + HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW, + HWND_ROUTINE_DWP_GETENABLEDPOPUP, + HWND_ROUTINE_GETWNDCONTEXTHLPID, HWND_ROUTINE_REGISTERSHELLHOOKWINDOW, - HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW + HWND_ROUTINE_SETMSGBOX, + HWNDOPT_ROUTINE_SETPROGMANWINDOW, + HWNDOPT_ROUTINE_SETTASKMANWINDOW, + HWNDPARAM_ROUTINE_GETCLASSICOCUR, + HWNDPARAM_ROUTINE_CLEARWINDOWSTATE, + HWNDPARAM_ROUTINE_KILLSYSTEMTIMER, + HWNDPARAM_ROUTINE_SETDIALOGPOINTER, + HWNDPARAM_ROUTINE_SETVISIBLE, + HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID, + HWNDPARAM_ROUTINE_SETWINDOWSTATE, + HWNDLOCK_ROUTINE_WINDOWHASSHADOW, /* correct prefix ? */ + HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS, + HWNDLOCK_ROUTINE_DRAWMENUBAR, + HWNDLOCK_ROUTINE_CHECKIMESHOWSTATUSINTHRD, + HWNDLOCK_ROUTINE_GETSYSMENUHANDLE, + HWNDLOCK_ROUTINE_REDRAWFRAME, + HWNDLOCK_ROUTINE_REDRAWFRAMEANDHOOK, + HWNDLOCK_ROUTINE_SETDLGSYSMENU, + HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW, + HWNDLOCK_ROUTINE_SETSYSMENU, + HWNDLOCK_ROUTINE_UPDATECKIENTRECT, + HWNDLOCK_ROUTINE_UPDATEWINDOW, + X_ROUTINE_IMESHOWSTATUSCHANGE, + TWOPARAM_ROUTINE_ENABLEWINDOW, + TWOPARAM_ROUTINE_REDRAWTITLE, + TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS, + TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW, + TWOPARAM_ROUTINE_UPDATEWINDOWS, + TWOPARAM_ROUTINE_VALIDATERGN, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + TWOPARAM_ROUTINE_CHANGEWNDMSGFILTER, + TWOPARAM_ROUTINE_GETCURSORPOS, +#endif + TWOPARAM_ROUTINE_GETHDEVNAME, + TWOPARAM_ROUTINE_INITANSIOEM, + TWOPARAM_ROUTINE_NLSSENDIMENOTIFY, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + TWOPARAM_ROUTINE_REGISTERGHSTWND, +#endif + TWOPARAM_ROUTINE_REGISTERLOGONPROCESS, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + TWOPARAM_ROUTINE_REGISTERSBLFROSTWND, +#else + TWOPARAM_ROUTINE_REGISTERSYSTEMTHREAD, +#endif + TWOPARAM_ROUTINE_REGISTERUSERHUNGAPPHANDLERS, + TWOPARAM_ROUTINE_SHADOWCLEANUP, + TWOPARAM_ROUTINE_REMOTESHADOWSTART, + TWOPARAM_ROUTINE_SETCARETPOS, + TWOPARAM_ROUTINE_SETCURSORPOS, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + TWOPARAM_ROUTINE_SETPHYSCURSORPOS, +#endif + TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK, + TWOPARAM_ROUTINE_WOWCLEANUP }; = DWORD NTAPI NtUserCallHwnd( - DWORD Unknown0, - DWORD Unknown1); - -#define HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS 0x54 -#define HWNDLOCK_ROUTINE_DRAWMENUBAR 0x55 -#define HWNDLOCK_ROUTINE_REDRAWFRAME 0x58 -#define HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW 0x5B -#define HWNDLOCK_ROUTINE_UPDATEWINDOW 0x5E + HWND hWnd, + DWORD Routine); + BOOL NTAPI NtUserCallHwndLock( HWND hWnd, DWORD Routine); = -#define HWNDOPT_ROUTINE_SETPROGMANWINDOW 0x4A -#define HWNDOPT_ROUTINE_SETTASKMANWINDOW 0x4B HWND NTAPI NtUserCallHwndOpt( @@ -512,16 +681,16 @@ DWORD NTAPI NtUserCallHwndParam( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + HWND hWnd, + DWORD Param, + DWORD Routine); = DWORD NTAPI NtUserCallHwndParamLock( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + HWND hWnd, + DWORD Param, + DWORD Routine); = BOOL NTAPI @@ -537,82 +706,17 @@ WPARAM wParam, LPARAM lParam); = -#define NOPARAM_ROUTINE_CREATEMENU 0x0 -#define NOPARAM_ROUTINE_CREATEMENUPOPUP 0x1 -//#define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0x2 -#define NOPARAM_ROUTINE_MSQCLEARWAKEMASK 0x3 -//#define ONEPARAM_ROUTINE_ALLOWFOREGNDACTIVATION 0x04 -#define NOPARAM_ROUTINE_DESTROY_CARET 0x5 -#define NOPARAM_ROUTINE_INIT_MESSAGE_PUMP 0x1b -#define NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP 0x1c - -#define NOPARAM_ROUTINE_REGISTER_PRIMITIVE 0xffff0001 /* Private ROS */ -#define NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO 0xffff0005 -#define NOPARAM_ROUTINE_ANYPOPUP 0xffff0006 -#define NOPARAM_ROUTINE_CSRSS_INITIALIZED 0xffff0007 DWORD NTAPI NtUserCallNoParam( DWORD Routine); = -#define ONEPARAM_ROUTINE_WINDOWFROMDC 0x1f -#define ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS 0x25 -#define ONEPARAM_ROUTINE_GETCURSORPOSITION 0x26 -#define ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT 0x28 -#define ONEPARAM_ROUTINE_GETKEYBOARDTYPE 0x29 -#define ONEPARAM_ROUTINE_REALIZEPALETTE 0x35 -#define ONEPARAM_ROUTINE_RELEASEDC 0x39 -#define ONEPARAM_ROUTINE_SETCARETBLINKTIME 0x3b -#define ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO 0x3e -#define ONEPARAM_ROUTINE_SHOWCURSOR 0x40 -#define ONEPARAM_ROUTINE_SWAPMOUSEBUTTON 0x42 -#define ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID 0x47 - -#define ONEPARAM_ROUTINE_GETMENU 0xfffe0001 /* Private ROS */ -#define ONEPARAM_ROUTINE_ISWINDOWUNICODE 0xfffe0002 -#define ONEPARAM_ROUTINE_GETCARETINFO 0xfffe0007 -#define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0xfffe0008 -#define ONEPARAM_ROUTINE_ISWINDOWINDESTROY 0xfffe000c -#define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d -#define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0xfffe000e -#define ONEPARAM_ROUTINE_GETWINDOWINSTANCE 0xfffe0010 -#define ONEPARAM_ROUTINE_CREATECURICONHANDLE 0xfffe0025 -#define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0xfffe0027 -#define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0xfffe0031 DWORD NTAPI NtUserCallOneParam( DWORD Param, DWORD Routine); = -#define TWOPARAM_ROUTINE_ENABLEWINDOW 0x60 -#define TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS 0x62 -#define TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW 0x63 - -#define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 /* Private ROS */ -#define TWOPARAM_ROUTINE_GETWINDOWRGN 0xfffd0049 -#define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050 -#define TWOPARAM_ROUTINE_SETMENUITEMRECT 0xfffd0051 -#define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0xfffd0052 - #define MSQ_STATE_CAPTURE 0x1 - #define MSQ_STATE_ACTIVE 0x2 - #define MSQ_STATE_FOCUS 0x3 - #define MSQ_STATE_MENUOWNER 0x4 - #define MSQ_STATE_MOVESIZE 0x5 - #define MSQ_STATE_CARET 0x6 -#define TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID 0xfffd0058 -#define TWOPARAM_ROUTINE_SETCARETPOS 0xfffd0060 -#define TWOPARAM_ROUTINE_GETWINDOWINFO 0xfffd0061 -#define TWOPARAM_ROUTINE_REGISTERLOGONPROC 0xfffd0062 -#define TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES 0xfffd0063 -#define TWOPARAM_ROUTINE_GETSYSCOLORPENS 0xfffd0064 -#define TWOPARAM_ROUTINE_GETSYSCOLORS 0xfffd0065 -#define TWOPARAM_ROUTINE_SETSYSCOLORS 0xfffd0066 // use NtUserSetSys= Colors -#define TWOPARAM_ROUTINE_ROS_SHOWWINDOW 0x1000 -#define TWOPARAM_ROUTINE_ROS_ISACTIVEICON 0x1001 -#define TWOPARAM_ROUTINE_ROS_NCDESTROY 0x1002 -#define TWOPARAM_ROUTINE_ROS_REGSYSCLASSES 0x1003 -#define TWOPARAM_ROUTINE_ROS_UPDATEUISTATE 0x1004 DWORD NTAPI NtUserCallTwoParam( @@ -638,19 +742,20 @@ DWORD STDCALL NtUserCheckImeHotKey( - DWORD dwUnknown1, - DWORD dwUnknown2); + DWORD dwUnknown1, + DWORD dwUnknown2); = HWND NTAPI -NtUserChildWindowFromPointEx(HWND Parent, - LONG x, - LONG y, - UINT Flags); +NtUserChildWindowFromPointEx( + HWND Parent, + LONG x, + LONG y, + UINT Flags); = BOOL NTAPI NtUserClipCursor( - RECT *lpRect); + RECT *lpRect); = BOOL NTAPI @@ -669,9 +774,9 @@ DWORD NTAPI NtUserConsoleControl( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3); + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); = DWORD NTAPI @@ -2367,8 +2472,54 @@ = = /* NtUserBad -* ReactOS-specific NtUser calls and their related structures, both which= shouldn't exist. + * ReactOS-specific NtUser calls and their related structures, both which = shouldn't exist. */ + +#define NOPARAM_ROUTINE_REGISTER_PRIMITIVE 0xffff0001 +#define NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO 0xffff0005 +#define NOPARAM_ROUTINE_ANYPOPUP 0xffff0006 +#define NOPARAM_ROUTINE_CSRSS_INITIALIZED 0xffff0007 +#define ONEPARAM_ROUTINE_GETMENU 0xfffe0001 // usermode +#define ONEPARAM_ROUTINE_ISWINDOWUNICODE 0xfffe0002 +#define ONEPARAM_ROUTINE_GETCARETINFO 0xfffe0007 +#define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0xfffe0008 +#define ONEPARAM_ROUTINE_ISWINDOWINDESTROY 0xfffe000c +#define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d +#define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0xfffe000e +#define ONEPARAM_ROUTINE_GETWINDOWINSTANCE 0xfffe0010 +#define ONEPARAM_ROUTINE_CREATECURICONHANDLE 0xfffe0025 // CREATE_EMPTY_C= URSOR_OBJECT ? +#define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0xfffe0027 +#define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0xfffe0031 +#define ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID 0xfffe0047 // use HWND_ROUTI= NE_GETWNDCONTEXTHLPID +#define ONEPARAM_ROUTINE_GETCURSORPOSITION 0xfffe0048 // use ONEPARAM_ = or TWOPARAM routine ? + +#define TWOPARAM_ROUTINE_ENABLEWINDOW 0x60 +#define TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS 0x62 +#define TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW 0x63 +#define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 // user mode +#define TWOPARAM_ROUTINE_GETWINDOWRGN 0xfffd0049 // user mode +#define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050 +#define TWOPARAM_ROUTINE_SETMENUITEMRECT 0xfffd0051 +#define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0xfffd0052 + #define MSQ_STATE_CAPTURE 0x1 + #define MSQ_STATE_ACTIVE 0x2 + #define MSQ_STATE_FOCUS 0x3 + #define MSQ_STATE_MENUOWNER 0x4 + #define MSQ_STATE_MOVESIZE 0x5 + #define MSQ_STATE_CARET 0x6 +#define TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID 0xfffd0058 // use HWNDPARAM_RO= UTINE_SETWNDCONTEXTHLPID +#define TWOPARAM_ROUTINE_SETCARETPOS 0xfffd0060 +#define TWOPARAM_ROUTINE_GETWINDOWINFO 0xfffd0061 +#define TWOPARAM_ROUTINE_REGISTERLOGONPROC 0xfffd0062 +#define TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES 0xfffd0063 +#define TWOPARAM_ROUTINE_GETSYSCOLORPENS 0xfffd0064 +#define TWOPARAM_ROUTINE_GETSYSCOLORS 0xfffd0065 +#define TWOPARAM_ROUTINE_SETSYSCOLORS 0xfffd0066 // use NtUserSetSys= Colors +#define TWOPARAM_ROUTINE_ROS_SHOWWINDOW 0x1000 +#define TWOPARAM_ROUTINE_ROS_ISACTIVEICON 0x1001 +#define TWOPARAM_ROUTINE_ROS_NCDESTROY 0x1002 +#define TWOPARAM_ROUTINE_ROS_REGSYSCLASSES 0x1003 +#define TWOPARAM_ROUTINE_ROS_UPDATEUISTATE 0x1004 = DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/ntstubs.c?rev=3D32743&r1=3D32742&r2=3D32743&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Fri Mar 21 21:53= :56 2008 @@ -64,54 +64,6 @@ UNIMPLEMENTED; return 0; } - -DWORD -STDCALL -NtUserCallHwnd( - DWORD Unknown0, - DWORD Unknown1) -{ - switch (Unknown0) - { - case HWND_ROUTINE_REGISTERSHELLHOOKWINDOW: - if (IntIsWindow((HWND) Unknown1)) - return IntRegisterShellHookWindow((HWND) Unknown1); - return FALSE; - break; - case HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW: - if (IntIsWindow((HWND) Unknown1)) - return IntDeRegisterShellHookWindow((HWND) Unknown1); - return FALSE; - } - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserCallHwndParam( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserCallHwndParamLock( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - = DWORD STDCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/simplecall.c?rev=3D32743&r1=3D32742&r2=3D32743&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Fri Mar 21 21= :53:56 2008 @@ -823,21 +823,68 @@ HWND STDCALL NtUserCallHwndOpt( - HWND Param, + HWND hWnd, DWORD Routine) { switch (Routine) { case HWNDOPT_ROUTINE_SETPROGMANWINDOW: - GetW32ThreadInfo()->Desktop->hProgmanWindow =3D Param; + GetW32ThreadInfo()->Desktop->hProgmanWindow =3D hWnd; break; = case HWNDOPT_ROUTINE_SETTASKMANWINDOW: - GetW32ThreadInfo()->Desktop->hTaskManWindow =3D Param; - break; - } - - return Param; + GetW32ThreadInfo()->Desktop->hTaskManWindow =3D hWnd; + break; + } + + return hWnd; } = +DWORD +STDCALL +NtUserCallHwnd( + HWND hWnd, + DWORD Routine) +{ + switch (Routine) + { + case HWND_ROUTINE_REGISTERSHELLHOOKWINDOW: + if (IntIsWindow(hWnd)) + return IntRegisterShellHookWindow(hWnd); + return FALSE; + break; + case HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW: + if (IntIsWindow(hWnd)) + return IntDeRegisterShellHookWindow(hWnd); + return FALSE; + } + UNIMPLEMENTED; + + return 0; +} + +DWORD +STDCALL +NtUserCallHwndParam( + HWND hWnd, + DWORD Param, + DWORD Routine) +{ + UNIMPLEMENTED; + + return 0; +} + +DWORD +STDCALL +NtUserCallHwndParamLock( + HWND hWnd, + DWORD Param, + DWORD Routine) +{ + UNIMPLEMENTED; + + return 0; +} + /* EOF */

1 0

[tkreuzer] 32742: update NTDDI defines
by tkreuzer＠svn.reactos.org 22 Mar '08

22 Mar '08

Author: tkreuzer Date: Fri Mar 21 21:23:08 2008 New Revision: 32742 URL: http://svn.reactos.org/svn/reactos?rev=3D32742&view=3Drev Log: update NTDDI defines Modified: trunk/reactos/include/psdk/sdkddkver.h Modified: trunk/reactos/include/psdk/sdkddkver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sdkddkve= r.h?rev=3D32742&r1=3D32741&r2=3D32742&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/psdk/sdkddkver.h (original) +++ trunk/reactos/include/psdk/sdkddkver.h Fri Mar 21 21:23:08 2008 @@ -48,9 +48,28 @@ #define NTDDI_WINXP 0x05010000 #define NTDDI_WINXPSP1 0x05010100 #define NTDDI_WINXPSP2 0x05010200 +#define NTDDI_WINXPSP3 0x05010300 +#define NTDDI_WINXPSP4 0x05010400 #define NTDDI_WS03 0x05020000 #define NTDDI_WS03SP1 0x05020100 -#define NTDDI_LONGHORN 0x06000000 +#define NTDDI_WS03SP2 0x05020200 +#define NTDDI_WS03SP3 0x05020300 +#define NTDDI_WS03SP4 0x05020400 +#define NTDDI_WIN6 0x06000000 +#define NTDDI_WIN6SP1 0x06000100 +#define NTDDI_WIN6SP2 0x06000200 +#define NTDDI_WIN6SP3 0x06000300 +#define NTDDI_WIN6SP4 0x06000400 +#define NTDDI_LONGHORN NTDDI_WIN6 +#define NTDDI_VISTA NTDDI_WIN6 +#define NTDDI_VISTASP1 NTDDI_WIN6SP1 +#define NTDDI_VISTASP2 NTDDI_WIN6SP2 +#define NTDDI_VISTASP3 NTDDI_WIN6SP3 +#define NTDDI_VISTASP4 NTDDI_WIN6SP4 +#define NTDDI_WS08 NTDDI_WIN6SP1 +#define NTDDI_WS08SP2 NTDDI_WIN6SP2 +#define NTDDI_WS08SP3 NTDDI_WIN6SP3 +#define NTDDI_WS08SP4 NTDDI_WIN6SP4 = /* Macros to get the NTDDI for a given WIN32 */ #define NTDDI_VERSION_FROM_WIN32_WINNT2(ver) ver##0000

1 0

[greatlrd] 32741: implement NdisGetCurrentProcessorCounts
by greatlrd＠svn.reactos.org 22 Mar '08

22 Mar '08

Author: greatlrd Date: Fri Mar 21 19:38:09 2008 New Revision: 32741 URL: http://svn.reactos.org/svn/reactos?rev=3D32741&view=3Drev Log: implement NdisGetCurrentProcessorCounts Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h trunk/reactos/drivers/network/ndis/ndis/stubs.c Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/= include/ndissys.h?rev=3D32741&r1=3D32740&r2=3D32741&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/network/ndis/include/ndissys.h (original) +++ trunk/reactos/drivers/network/ndis/include/ndissys.h Fri Mar 21 19:38:0= 9 2008 @@ -507,6 +507,14 @@ KeReleaseSpinLock(_Lock, OldIrql); \ } = +/* missing protypes */ +VOID +NTAPI +ExGetCurrentProcessorCounts( + PULONG ThreadKernelTime, + PULONG TotalCpuTime, + PULONG ProcessorNumber); + #endif /* __NDISSYS_H */ = /* EOF */ Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/= ndis/stubs.c?rev=3D32741&r1=3D32740&r2=3D32741&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/network/ndis/ndis/stubs.c (original) +++ trunk/reactos/drivers/network/ndis/ndis/stubs.c Fri Mar 21 19:38:09 2008 @@ -462,7 +462,7 @@ = = /* - * @unimplemented + * @implemented */ VOID EXPORT @@ -477,7 +477,7 @@ * NDIS 5.0 */ { - UNIMPLEMENTED + ExGetCurrentProcessorCounts( (PULONG) pIdleCount, (PULONG) pKernelAndU= ser, (PULONG) pIndex); = } = =

1 0

[greatlrd] 32740: implemented NdisSystemProcessorCount
by greatlrd＠svn.reactos.org 22 Mar '08

22 Mar '08

Author: greatlrd Date: Fri Mar 21 19:26:53 2008 New Revision: 32740 URL: http://svn.reactos.org/svn/reactos?rev=3D32740&view=3Drev Log: implemented NdisSystemProcessorCount Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/= ndis/stubs.c?rev=3D32740&r1=3D32739&r2=3D32740&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/network/ndis/ndis/stubs.c (original) +++ trunk/reactos/drivers/network/ndis/ndis/stubs.c Fri Mar 21 19:26:53 2008 @@ -384,14 +384,14 @@ = = /* - * @unimplemented + * @implemented */ CCHAR EXPORT NdisSystemProcessorCount( VOID) { - return (CCHAR)1; + return (CCHAR)KeNumberProcessors; } = =

1 0

[greatlrd] 32739: implemented NdisGetSystemUptime, thx kjk for the help getting it faster against my frist code, that was never commited.
by greatlrd＠svn.reactos.org 22 Mar '08

22 Mar '08

Author: greatlrd Date: Fri Mar 21 19:17:18 2008 New Revision: 32739 URL: http://svn.reactos.org/svn/reactos?rev=3D32739&view=3Drev Log: implemented NdisGetSystemUptime, thx kjk for the help getting it faster aga= inst my frist code, that was never commited. = Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/= ndis/stubs.c?rev=3D32739&r1=3D32738&r2=3D32739&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/network/ndis/ndis/stubs.c (original) +++ trunk/reactos/drivers/network/ndis/ndis/stubs.c Fri Mar 21 19:17:18 2008 @@ -522,7 +522,7 @@ = = /* - * @unimplemented + * @implemented */ VOID EXPORT @@ -534,8 +534,9 @@ * NOTES: * NDIS 5.0 */ -{ - UNIMPLEMENTED +{ = + /* Get the uptime of the system in msec */ + *pSystemUpTime =3D ( (SharedUserData->TickCountLowDeprecated * Share= dUserData->TickCountMultiplier) / 0x1000000); = } = =

1 0

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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2008