Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 57657: [win32k] - Use ONEPARAM_ROUTINE_GETCURSORPOS instead of ONEPARAM_ROUTINE_GETCURSORPOSITION in GetCursorPos - Correctly check if the current thread belongs to the active desktop
by gadamopoulos＠svn.reactos.org 31 Oct '12

31 Oct '12

Author: gadamopoulos Date: Wed Oct 31 14:55:23 2012 New Revision: 57657 URL: http://svn.reactos.org/svn/reactos?rev=57657&view=rev Log: [win32k] - Use ONEPARAM_ROUTINE_GETCURSORPOS instead of ONEPARAM_ROUTINE_GETCURSORPOSITION in GetCursorPos - Correctly check if the current thread belongs to the active desktop Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/user32/include/ntwrapper.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Wed Oct 31 14:55:23 2012 @@ -3251,7 +3251,6 @@ #define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0xfffe0008 #define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d #define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0xfffe000e -#define ONEPARAM_ROUTINE_GETCURSORPOSITION 0xfffe0048 // use ONEPARAM_ or TWOPARAM routine ? #define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050 #define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0xfffd0052 #define MSQ_STATE_CAPTURE 0x1 Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Wed Oct 31 14:55:23 2012 @@ -26,7 +26,7 @@ /* GLOBALS *******************************************************************/ /* Currently active desktop */ -PDESKTOP InputDesktop = NULL; +PDESKTOP gpdeskInputDesktop = NULL; HDESK InputDesktopHandle = NULL; HDC ScreenDeviceContext = NULL; PTHREADINFO gptiDesktopThread; @@ -420,7 +420,7 @@ PDESKTOP FASTCALL IntGetActiveDesktop(VOID) { - return InputDesktop; + return gpdeskInputDesktop; } /* @@ -1654,7 +1654,7 @@ InputWindowStation->ActiveDesktop = pdesk; /* Set the global state. */ - InputDesktop = pdesk; + gpdeskInputDesktop = pdesk; InputDesktopHandle = hdesk; TRACE("SwitchDesktop InputDesktopHandle 0x%p\n",InputDesktopHandle); ObDereferenceObject(pdesk); Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Wed Oct 31 14:55:23 2012 @@ -259,25 +259,6 @@ RETURN(Result); } - case ONEPARAM_ROUTINE_GETCURSORPOSITION: - { - BOOL ret = TRUE; - - _SEH2_TRY - { - ProbeForWrite((POINT*)Param,sizeof(POINT),1); - RtlCopyMemory((POINT*)Param,&gpsi->ptCursor,sizeof(POINT)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - ret = FALSE; - } - _SEH2_END; - - RETURN (ret); - } - case ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING: { BOOL Enable; @@ -334,9 +315,10 @@ BOOL Ret = TRUE; PPOINTL pptl; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - if (pti->hdesk != InputDesktopHandle) RETURN(FALSE); + if (pti->rpdesk != IntGetActiveDesktop()) RETURN(FALSE); _SEH2_TRY { + ProbeForWrite((POINT*)Param,sizeof(POINT),1); pptl = (PPOINTL)Param; *pptl = gpsi->ptCursor; } Modified: trunk/reactos/win32ss/user/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/ntwrapper.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/ntwrapper.h [iso-8859-1] Wed Oct 31 14:55:23 2012 @@ -806,7 +806,7 @@ EXTINLINE BOOL NtUserxGetCursorPos(POINT* lpPoint) { - return (BOOL)NtUserCallOneParam((DWORD_PTR)lpPoint, ONEPARAM_ROUTINE_GETCURSORPOSITION); + return (BOOL)NtUserCallOneParam((DWORD_PTR)lpPoint, ONEPARAM_ROUTINE_GETCURSORPOS); } EXTINLINE BOOL NtUserxSetMenuBarHeight(HMENU menu, INT height)

1 0

[gadamopoulos] 57656: [user32_apitest] - Add some tests to see how SetCursorPos is affected by the current desktop
by gadamopoulos＠svn.reactos.org 31 Oct '12

31 Oct '12

Author: gadamopoulos Date: Wed Oct 31 14:18:06 2012 New Revision: 57656 URL: http://svn.reactos.org/svn/reactos?rev=57656&view=rev Log: [user32_apitest] - Add some tests to see how SetCursorPos is affected by the current desktop Modified: trunk/rostests/apitests/user32/SetCursorPos.c Modified: trunk/rostests/apitests/user32/SetCursorPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetCursor… ============================================================================== --- trunk/rostests/apitests/user32/SetCursorPos.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetCursorPos.c [iso-8859-1] Wed Oct 31 14:18:06 2012 @@ -159,7 +159,48 @@ } +void Test_DesktopAccess() +{ + HDESK hDesk, hDeskInitial; + POINT curPoint, initialPoint; + BOOL ret; + + hDeskInitial = GetThreadDesktop(GetCurrentThreadId()); + ok(hDeskInitial != NULL, "Failed to retrieve the initial desktop\n"); + + ret = GetCursorPos(&initialPoint); + ok(ret == TRUE, "GetCursorPos should succed\n"); + + hDesk = CreateDesktopW(L"testDesktop", NULL, NULL, 0, 0x01ff, NULL); + ok(hDesk != 0, "Failed to create a new desktop\n"); + SetThreadDesktop(hDesk); + ok(GetThreadDesktop(GetCurrentThreadId()) == hDesk, "SetThreadDesktop had no effect\n"); + + SetLastError(0xdeadbeef); + + ret = GetCursorPos(&curPoint); + ok(ret == FALSE, "GetCursorPos should fail\n"); + + ok(GetLastError() == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED got 0x%lu\n", GetLastError()); + SetLastError(0xdeadbeef); + + ret = SetCursorPos(2,2); + ok(ret == FALSE, "SetCursorPos should fail\n"); + + ok(GetLastError() == 0xdeadbeef, "Wrong last error, got 0x%lu\n", GetLastError()); + + ret = GetCursorPos(&curPoint); + ok(ret == FALSE, "GetCursorPos should fail\n"); + + SetThreadDesktop(hDeskInitial); + + ret = GetCursorPos(&curPoint); + ok(ret == TRUE, "GetCursorPos should succed\n"); + ok(curPoint.x == initialPoint.x && curPoint.y == initialPoint.y, "Mouse position changed\n"); +} + START_TEST(SetCursorPos) { + Test_DesktopAccess(); Test_SetCursorPos(); }

1 0

[jgardou] 57655: [USER32_APITESTS] - Add some more test for DrawIconEx and CreateIconFromResourceEx
by jgardou＠svn.reactos.org 31 Oct '12

31 Oct '12

Author: jgardou Date: Wed Oct 31 14:08:31 2012 New Revision: 57655 URL: http://svn.reactos.org/svn/reactos?rev=57655&view=rev Log: [USER32_APITESTS] - Add some more test for DrawIconEx and CreateIconFromResourceEx Added: trunk/rostests/apitests/user32/CreateIconFromResourceEx.c (with props) trunk/rostests/apitests/user32/DrawIconEx.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Wed Oct 31 14:08:31 2012 @@ -2,8 +2,10 @@ list(APPEND SOURCE AttachThreadInput.c helper.c + CreateIconFromResourceEx.c DeferWindowPos.c DestroyCursorIcon.c + DrawIconEx.c desktop.c GetIconInfo.c GetKeyState.c Added: trunk/rostests/apitests/user32/CreateIconFromResourceEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CreateIco… ============================================================================== --- trunk/rostests/apitests/user32/CreateIconFromResourceEx.c (added) +++ trunk/rostests/apitests/user32/CreateIconFromResourceEx.c [iso-8859-1] Wed Oct 31 14:08:31 2012 @@ -1,0 +1,48 @@ +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> +#include "resource.h" + +START_TEST(CreateIconFromResourceEx) +{ + HCURSOR hcur1, hcur2; + HMODULE hMod; + HRSRC hResource; // handle to FindResource + HRSRC hMem; // handle to LoadResource + BYTE *lpResource; // pointer to resource data + + hMod = GetModuleHandle(NULL); + ok(hMod != NULL, "\n"); + /* Create a shared cursor */ + hcur1 = LoadCursor(hMod, "TESTCURSOR"); + ok(hcur1 != NULL, "\n"); + + /* Create it manually using CreateIconFromResourceEx */ + hResource = FindResourceA(hMod, + "TESTCURSOR", + RT_GROUP_CURSOR); + ok(hResource != NULL, "\n"); + + hMem = LoadResource(hMod, hResource); + ok(hMem != NULL, "\n"); + + lpResource = LockResource(hMem); + ok(lpResource != NULL, "\n"); + + /* MSDN states that LR_SHARED permits to not load twice the same cursor again. + * But CreateIconFromResourceEx still returns two different handles */ + hcur2 = CreateIconFromResourceEx(lpResource, SizeofResource(hMod, hResource), FALSE, 0x00030000, 0, 0, LR_SHARED); + ok(hcur2 != NULL, "\n"); + ok(hcur2 != hcur1, "\n"); + hcur1 = CreateIconFromResourceEx(lpResource, SizeofResource(hMod, hResource), FALSE, 0x00030000, 0, 0, LR_SHARED); + ok(hcur1 != NULL, "\n"); + ok(hcur2 != hcur1, "\n"); + + /* Try to destroy them multiple times (see DestroyCursor test) */ + ok(DestroyCursor(hcur1), "\n"); + ok(DestroyCursor(hcur1), "\n"); + ok(DestroyCursor(hcur2), "\n"); + ok(DestroyCursor(hcur2), "\n"); + + FreeResource(hResource); +} Propchange: trunk/rostests/apitests/user32/CreateIconFromResourceEx.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/DrawIconEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DrawIconE… ============================================================================== --- trunk/rostests/apitests/user32/DrawIconEx.c (added) +++ trunk/rostests/apitests/user32/DrawIconEx.c [iso-8859-1] Wed Oct 31 14:08:31 2012 @@ -1,0 +1,57 @@ +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> +#include "resource.h" + +START_TEST(DrawIconEx) +{ + HCURSOR hcursor; + HBITMAP hbmp; + ICONINFO ii; + HDC hdcScreen, hdc; + BOOL ret; + HBRUSH hbrush; + + ZeroMemory(&ii, sizeof(ii)); + + ii.hbmMask = CreateBitmap(8, 16, 1, 1, NULL); + ok(ii.hbmMask != NULL, "\n"); + hcursor = CreateIconIndirect(&ii); + ok(hcursor != NULL, "\n"); + DeleteObject(ii.hbmMask); + + hdcScreen = GetDC(0); + hbmp = CreateCompatibleBitmap(hdcScreen, 8, 8); + ok(hbmp != NULL, "\n"); + hdc = CreateCompatibleDC(hdcScreen); + ok(hdc != NULL, "\n"); + ReleaseDC(0, hdcScreen); + + hbmp = SelectObject(hdc, hbmp); + ok(hbmp != NULL, "\n"); + + hbrush = GetStockObject(DKGRAY_BRUSH); + ok(hbrush != NULL, "\n"); + + ret = DrawIconEx(hdc, 0, 0, hcursor, 8, 8, 0, hbrush, DI_NORMAL); + ok(ret, "\n"); + DestroyCursor(hcursor); + + /* Try with color */ + ii.hbmMask = CreateBitmap(8, 8, 1, 1, NULL); + ok(ii.hbmMask != NULL, "\n"); + ii.hbmColor = CreateBitmap(8, 8, 16, 1, NULL); + ok(ii.hbmColor != NULL, "\n"); + hcursor = CreateIconIndirect(&ii); + ok(hcursor != NULL, "\n"); + DeleteObject(ii.hbmMask); + DeleteObject(ii.hbmColor); + + ret = DrawIconEx(hdc, 0, 0, hcursor, 8, 8, 0, hbrush, DI_NORMAL); + ok(ret, "\n"); + DestroyCursor(hcursor); + + hbmp = SelectObject(hdc, hbmp); + DeleteObject(hbmp); + DeleteDC(hdc); +} Propchange: trunk/rostests/apitests/user32/DrawIconEx.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Wed Oct 31 14:08:31 2012 @@ -6,8 +6,10 @@ #include "wine/test.h" extern void func_AttachThreadInput(void); +extern void func_CreateIconFromResourceEx(void); extern void func_DeferWindowPos(void); extern void func_DestroyCursorIcon(void); +extern void func_DrawIconEx(void); extern void func_desktop(void); extern void func_GetIconInfo(void); extern void func_GetKeyState(void); @@ -28,9 +30,11 @@ const struct test winetest_testlist[] = { { "AttachThreadInput", func_AttachThreadInput }, - { "desktop", func_desktop }, + { "CreateIconFromResourceEx", func_CreateIconFromResourceEx }, { "DeferWindowPos", func_DeferWindowPos }, { "DestroyCursorIcon", func_DestroyCursorIcon }, + { "DrawIconEx", func_DrawIconEx }, + { "desktop", func_desktop }, { "GetIconInfo", func_GetIconInfo }, { "GetKeyState", func_GetKeyState }, { "GetPeekMessage", func_GetPeekMessage },

1 0

[hbelusca] 57654: Forgot two files.
by hbelusca＠svn.reactos.org 31 Oct '12

31 Oct '12

Author: hbelusca Date: Wed Oct 31 00:41:02 2012 New Revision: 57654 URL: http://svn.reactos.org/svn/reactos?rev=57654&view=rev Log: Forgot two files. Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/dll/win32/samsrv/samrpc.c branches/ros-csrss/win32ss/w32ksvc.h Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 31 00:41:02 2012 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:57561-57652 +/trunk/reactos:57561-57653 Modified: branches/ros-csrss/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/samr… ============================================================================== --- branches/ros-csrss/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/samsrv/samrpc.c [iso-8859-1] Wed Oct 31 00:41:02 2012 @@ -7,18 +7,18 @@ * PROGRAMMERS: Eric Kohl */ -/* INCLUDES ****************************************************************/ +/* INCLUDES ******************************************************************/ #include "samsrv.h" WINE_DEFAULT_DEBUG_CHANNEL(samsrv); -/* GLOBALS ********************************************************************/ +/* GLOBALS *******************************************************************/ static SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; -/* FUNCTIONS ***************************************************************/ +/* FUNCTIONS *****************************************************************/ VOID SampStartRpcServer(VOID) @@ -4187,9 +4187,125 @@ SamrRemoveMemberFromAlias(IN SAMPR_HANDLE AliasHandle, IN PRPC_SID MemberId) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + PSAM_DB_OBJECT AliasObject; + LPWSTR MemberIdString = NULL; + HANDLE MembersKeyHandle = NULL; + HANDLE MemberKeyHandle = NULL; + ULONG ulValueCount; + NTSTATUS Status; + + TRACE("SamrRemoveMemberFromAlias(%p %p)\n", + AliasHandle, MemberId); + + /* Validate the alias handle */ + Status = SampValidateDbObject(AliasHandle, + SamDbAliasObject, + ALIAS_REMOVE_MEMBER, + &AliasObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + ConvertSidToStringSidW(MemberId, &MemberIdString); + TRACE("Member SID: %S\n", MemberIdString); + + Status = SampRegOpenKey(AliasObject->MembersKeyHandle, + MemberIdString, + KEY_WRITE | KEY_QUERY_VALUE, + &MemberKeyHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegOpenKey failed with status 0x%08lx\n", Status); + goto done; + } + + Status = SampRegDeleteValue(MemberKeyHandle, + AliasObject->Name); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegDeleteValue failed with status 0x%08lx\n", Status); + goto done; + } + + Status = SampRegQueryKeyInfo(MemberKeyHandle, + NULL, + &ulValueCount); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegQueryKeyInfo failed with status 0x%08lx\n", Status); + goto done; + } + + if (ulValueCount == 0) + { + SampRegCloseKey(MemberKeyHandle); + MemberKeyHandle = NULL; + + Status = SampRegDeleteKey(AliasObject->MembersKeyHandle, + MemberIdString); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegDeleteKey failed with status 0x%08lx\n", Status); + goto done; + } + } + + Status = SampRegOpenKey(AliasObject->KeyHandle, + L"Members", + KEY_WRITE | KEY_QUERY_VALUE, + &MembersKeyHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegOpenKey failed with status 0x%08lx\n", Status); + goto done; + } + + Status = SampRegDeleteValue(MembersKeyHandle, + MemberIdString); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegDeleteValue failed with status 0x%08lx\n", Status); + goto done; + } + + Status = SampRegQueryKeyInfo(MembersKeyHandle, + NULL, + &ulValueCount); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegQueryKeyInfo failed with status 0x%08lx\n", Status); + goto done; + } + + if (ulValueCount == 0) + { + SampRegCloseKey(MembersKeyHandle); + MembersKeyHandle = NULL; + + Status = SampRegDeleteKey(AliasObject->KeyHandle, + L"Members"); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegDeleteKey failed with status 0x%08lx\n", Status); + goto done; + } + } + +done: + if (MemberKeyHandle != NULL) + SampRegCloseKey(MemberKeyHandle); + + if (MembersKeyHandle != NULL) + SampRegCloseKey(MembersKeyHandle); + + if (MemberIdString != NULL) + LocalFree(MemberIdString); + + return Status; +} + /* Function 33 */ NTSTATUS @@ -6338,9 +6454,27 @@ SamrRemoveMultipleMembersFromAlias(IN SAMPR_HANDLE AliasHandle, IN PSAMPR_PSID_ARRAY MembersBuffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + ULONG i; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("SamrRemoveMultipleMembersFromAlias(%p %p)\n", + AliasHandle, MembersBuffer); + + for (i = 0; i < MembersBuffer->Count; i++) + { + Status = SamrRemoveMemberFromAlias(AliasHandle, + ((PSID *)MembersBuffer->Sids)[i]); + + if (Status == STATUS_MEMBER_IN_ALIAS) + Status = STATUS_SUCCESS; + + if (!NT_SUCCESS(Status)) + break; + } + + return Status; +} + /* Function 54 */ NTSTATUS Modified: branches/ros-csrss/win32ss/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/w32ksvc.h?rev… ============================================================================== --- branches/ros-csrss/win32ss/w32ksvc.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/w32ksvc.h [iso-8859-1] Wed Oct 31 00:41:02 2012 @@ -517,7 +517,11 @@ SVC_(UserSetConsoleReserveKeys, 2) SVC_(UserSetCursor, 1) SVC_(UserSetCursorContents, 2) +#ifdef NEW_CURSORICON +SVC_(UserSetCursorIconData, 4) +#else SVC_(UserSetCursorIconData, 6) +#endif SVC_(UserSetDbgTag, 2) SVC_(UserSetFocus, 1) SVC_(UserSetImeHotKey, 5)

1 0

[hbelusca] 57653: Synchronize with trunk's revision r57652.
by hbelusca＠svn.reactos.org 31 Oct '12

31 Oct '12

Author: hbelusca Date: Wed Oct 31 00:26:38 2012 New Revision: 57653 URL: http://svn.reactos.org/svn/reactos?rev=57653&view=rev Log: Synchronize with trunk's revision r57652. Added: branches/ros-csrss/dll/opengl/glu32/ - copied from r57633, trunk/reactos/dll/opengl/glu32/ branches/ros-csrss/win32ss/user/ntuser/cursoricon_new.c - copied unchanged from r57652, trunk/reactos/win32ss/user/ntuser/cursoricon_new.c branches/ros-csrss/win32ss/user/user32/windows/cursoricon_new.c - copied unchanged from r57652, trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/dll/win32/kernel32/k32.h branches/ros-csrss/drivers/hid/hidparse/ (props changed) branches/ros-csrss/drivers/usb/usbhub/ (props changed) branches/ros-csrss/win32ss/CMakeLists.txt branches/ros-csrss/win32ss/gdi/ntgdi/misc.h branches/ros-csrss/win32ss/include/ntuser.h branches/ros-csrss/win32ss/user/ntuser/callproc.c branches/ros-csrss/win32ss/user/ntuser/clipboard.c branches/ros-csrss/win32ss/user/ntuser/cursoricon.c branches/ros-csrss/win32ss/user/ntuser/cursoricon.h branches/ros-csrss/win32ss/user/ntuser/hook.c branches/ros-csrss/win32ss/user/ntuser/msgqueue.c branches/ros-csrss/win32ss/user/ntuser/object.c branches/ros-csrss/win32ss/user/ntuser/object.h branches/ros-csrss/win32ss/user/ntuser/painting.c branches/ros-csrss/win32ss/user/ntuser/winsta.c branches/ros-csrss/win32ss/user/user32/CMakeLists.txt branches/ros-csrss/win32ss/user/user32/misc/exticon.c branches/ros-csrss/win32ss/user/user32/misc/object.c Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 31 00:26:38 2012 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:57561-57641 +/trunk/reactos:57561-57652 Modified: branches/ros-csrss/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/k3… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/k32.h [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/k32.h [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -41,7 +41,6 @@ #include <win/basemsg.h> #include <win/conmsg.h> #include <win/winmsg.h> -//#include <csr/csrss.h> // FIXME: data header. /* C Headers */ #include <ctype.h> Propchange: branches/ros-csrss/drivers/hid/hidparse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 31 00:26:38 2012 @@ -18,5 +18,5 @@ /branches/usb-bringup/drivers/hid/hidparse:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk/drivers/hid/hidparse:55020-55543,55548-55554 /branches/wlan-bringup/drivers/hid/hidparse:54809-54998 -/trunk/reactos/drivers/hid/hidparse:57561-57599 +/trunk/reactos/drivers/hid/hidparse:57561-57633 /trunk/reactos/drivers/usb/hidparse:48236-51323 Propchange: branches/ros-csrss/drivers/usb/usbhub/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 31 00:26:38 2012 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbhub:55524-55543,55548-55554 /branches/wlan-bringup/drivers/usb/usbhub:54809-54998 /branches/wlan-bringup/drivers/usb/usbhub_new:54809-54998 -/trunk/reactos/drivers/usb/usbhub:57561-57629 +/trunk/reactos/drivers/usb/usbhub:57561-57633 Modified: branches/ros-csrss/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/CMakeLists.tx… ============================================================================== --- branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -1,5 +1,6 @@ set(USE_DIBLIB FALSE) +set(USE_NEW_CURSORICON FALSE) # Give WIN32 subsystem its own project. PROJECT(WIN32SS) @@ -103,7 +104,6 @@ user/ntuser/class.c user/ntuser/clipboard.c user/ntuser/csr.c - user/ntuser/cursoricon.c user/ntuser/defwnd.c user/ntuser/desktop.c user/ntuser/display.c @@ -190,6 +190,13 @@ ${GENDIB_FILES}) endif() +if(USE_NEW_CURSORICON) + add_definitions(-DNEW_CURSORICON) + list(APPEND SOURCE user/ntuser/cursoricon_new.c) +else() + list(APPEND SOURCE user/ntuser/cursoricon.c) +endif() + if(ARCH STREQUAL "i386") list(APPEND SOURCE gdi/dib/i386/dib24bpp_hline.s Modified: branches/ros-csrss/win32ss/gdi/ntgdi/misc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/mis… ============================================================================== --- branches/ros-csrss/win32ss/gdi/ntgdi/misc.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/gdi/ntgdi/misc.h [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -163,6 +163,6 @@ #define LIST_FOR_EACH_SAFE(cursor, cursor2, list, type, field) \ for ((cursor) = CONTAINING_RECORD((list)->Flink, type, field), \ (cursor2) = CONTAINING_RECORD((cursor)->field.Flink, type, field); \ - &(cursor)->field != (list) && ((&((cursor)->field)) != NULL); \ + &(cursor)->field != (list); \ (cursor) = (cursor2), \ (cursor2) = CONTAINING_RECORD((cursor)->field.Flink, type, field)) Modified: branches/ros-csrss/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/include/ntuse… ============================================================================== --- branches/ros-csrss/win32ss/include/ntuser.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/include/ntuser.h [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -200,7 +200,6 @@ struct _DESKTOP *rpdesk; /* ReactOS */ LIST_ENTRY Chain; /* Hook chain entry */ - struct _ETHREAD* Thread; /* Thread owning the hook */ HOOKPROC Proc; /* Hook function */ BOOLEAN Ansi; /* Is it an Ansi hook? */ UNICODE_STRING ModuleName; /* Module name for global hooks */ @@ -2739,14 +2738,24 @@ HANDLE Handle, PICONINFO IconInfo); -#if 0 // Correct type. +#ifdef NEW_CURSORICON BOOL NTAPI NtUserSetCursorIconData( - HCURSOR hCursor, - PUNICODE_STRING ModuleName, - PUNICODE_STRING ResourceName, - PCURSORDATA pCursorData); + _In_ HCURSOR hCursor, + _In_ HINSTANCE hinst, + _In_ HRSRC hrsrc, + _In_ PICONINFO pii); +#else +BOOL +NTAPI +NtUserSetCursorIconData( + HANDLE Handle, + PBOOL fIcon, + POINT *Hotspot, + HMODULE hModule, + HRSRC hRsrc, + HRSRC hGroupRsrc); #endif DWORD @@ -3361,16 +3370,6 @@ IN HWND hWnd, IN DWORD dwFlags); -BOOL -NTAPI -NtUserSetCursorIconData( - HANDLE Handle, - PBOOL fIcon, - POINT *Hotspot, - HMODULE hModule, - HRSRC hRsrc, - HRSRC hGroupRsrc); - typedef struct _SETSCROLLBARINFO { int nTrackPos; Modified: branches/ros-csrss/win32ss/user/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/callproc.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/callproc.c [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -45,6 +45,9 @@ NewCallProc->wType |= Unicode ? UserGetCPDA2U : UserGetCPDU2A ; NewCallProc->spcpdNext = NULL; } + + /* Release the extra reference (UserCreateObject added 2 references) */ + UserDereferenceObject(NewCallProc); return NewCallProc; } Modified: branches/ros-csrss/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/clipboard.c [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -211,6 +211,9 @@ /* Add the clipboard data */ IntAddFormatedData(pWinStaObj, CF_DIB, hMem, TRUE, TRUE); + /* Release the extra reference (UserCreateObject added 2 references) */ + UserDereferenceObject(pClipboardData); + cleanup: UserReleaseDC(NULL, hdc, FALSE); } @@ -302,6 +305,9 @@ *((LCID*)pMemObj->Data) = NtCurrentTeb()->CurrentLocale; IntAddFormatedData(pWinStaObj, CF_LOCALE, hMem, TRUE, TRUE); } + + /* Release the extra reference (UserCreateObject added 2 references) */ + UserDereferenceObject(pMemObj); } /* Add CF_TEXT. Note: it is synthesized in user32.dll */ @@ -1099,6 +1105,9 @@ } _SEH2_END; + /* Release the extra reference (UserCreateObject added 2 references) */ + UserDereferenceObject(pMemObj); + /* If we failed to copy data, remove handle */ if (!pMemObj) { Modified: branches/ros-csrss/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -234,55 +234,54 @@ } BOOLEAN FASTCALL -IntDestroyCurIconObject(PCURICON_OBJECT CurIcon, BOOL ProcessCleanup) +IntDestroyCurIconObject(PCURICON_OBJECT CurIcon, PPROCESSINFO ppi) { PSYSTEM_CURSORINFO CurInfo; HBITMAP bmpMask, bmpColor; - BOOLEAN Ret; + BOOLEAN Ret, bListEmpty, bFound = FALSE; PCURICON_PROCESS Current = NULL; - PPROCESSINFO W32Process = PsGetCurrentProcessWin32Process(); - - /* Private objects can only be destroyed by their own process */ - if (NULL == CurIcon->hModule) - { - ASSERT(CurIcon->ProcessList.Flink->Flink == &CurIcon->ProcessList); - Current = CONTAINING_RECORD(CurIcon->ProcessList.Flink, CURICON_PROCESS, ListEntry); - if (Current->Process != W32Process) - { - ERR("Trying to destroy private icon/cursor of another process\n"); - return FALSE; - } - } - else if (! ProcessCleanup) - { - TRACE("Trying to destroy shared icon/cursor\n"); - return FALSE; - } + + /* For handles created without any data (error handling) */ + if(IsListEmpty(&CurIcon->ProcessList)) + goto emptyList; /* Now find this process in the list of processes referencing this object and remove it from that list */ LIST_FOR_EACH(Current, &CurIcon->ProcessList, CURICON_PROCESS, ListEntry) { - if (Current->Process == W32Process) - { - RemoveEntryList(&Current->ListEntry); + if (Current->Process == ppi) + { + bFound = TRUE; + bListEmpty = RemoveEntryList(&Current->ListEntry); break; } } + + if(!bFound) + { + /* This object doesn't belong to this process */ + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } ExFreeToPagedLookasideList(pgProcessLookasideList, Current); /* If there are still processes referencing this object we can't destroy it yet */ - if (! IsListEmpty(&CurIcon->ProcessList)) - { + if (!bListEmpty) + { + if(CurIcon->head.ppi == ppi) + { + /* Set the first process of the list as owner */ + Current = CONTAINING_RECORD(CurIcon->ProcessList.Flink, CURICON_PROCESS, ListEntry); + UserSetObjectOwner(CurIcon, otCursorIcon, Current->Process); + } + UserDereferenceObject(CurIcon); return TRUE; } - - if (! ProcessCleanup) - { - RemoveEntryList(&CurIcon->ListEntry); - } +emptyList: + /* Remove it from the list */ + RemoveEntryList(&CurIcon->ListEntry); CurInfo = IntGetSysCursorInfo(); @@ -320,33 +319,13 @@ IntCleanupCurIcons(struct _EPROCESS *Process, PPROCESSINFO Win32Process) { PCURICON_OBJECT CurIcon, tmp; - PCURICON_PROCESS ProcessData; - + + /* Run through the list of icon objects */ LIST_FOR_EACH_SAFE(CurIcon, tmp, &gCurIconList, CURICON_OBJECT, ListEntry) { UserReferenceObject(CurIcon); - // if(NT_SUCCESS(UserReferenceObjectByPointer(Object, otCursorIcon))) - { - LIST_FOR_EACH(ProcessData, &CurIcon->ProcessList, CURICON_PROCESS, ListEntry) - { - if (Win32Process == ProcessData->Process) - { - RemoveEntryList(&CurIcon->ListEntry); - IntDestroyCurIconObject(CurIcon, TRUE); - CurIcon = NULL; - break; - } - } - -// UserDereferenceObject(Object); - } - - if (CurIcon) - { - UserDereferenceObject(CurIcon); - } - } - + IntDestroyCurIconObject(CurIcon, Win32Process); + } } @@ -649,7 +628,7 @@ RETURN(FALSE); } - ret = IntDestroyCurIconObject(CurIcon, FALSE); + ret = IntDestroyCurIconObject(CurIcon, PsGetCurrentProcessWin32Process()); /* Note: IntDestroyCurIconObject will remove our reference for us! */ RETURN(ret); Modified: branches/ros-csrss/win32ss/user/ntuser/cursoricon.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/cursoricon.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/cursoricon.h [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -7,6 +7,31 @@ LIST_ENTRY ListEntry; PPROCESSINFO Process; } CURICON_PROCESS, *PCURICON_PROCESS; + +#ifdef NEW_CURSORICON +typedef struct _CURICON_FRAME +{ + HBITMAP hbmMask; + HBITMAP hbmColor; + HBITMAP hbmAlpha; +} CURICON_FRAME, *PCURICON_FRAME; + +typedef struct _CURICON_OBJECT +{ + PROCMARKHEAD head; + LIST_ENTRY ListEntry; + HANDLE Self; + LIST_ENTRY ProcessList; + HMODULE hModule; + HRSRC hRsrc; + SIZE Size; + BYTE Shadow; + BOOL bIcon; + POINTL ptlHotspot; + CURICON_FRAME aFrame[1]; +} CURICON_OBJECT, *PCURICON_OBJECT; + +#else typedef struct _CURICON_OBJECT { @@ -21,6 +46,7 @@ BYTE Shadow; ICONINFO IconInfo; } CURICON_OBJECT, *PCURICON_OBJECT; +#endif typedef struct _CURSORACCELERATION_INFO { Modified: branches/ros-csrss/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/h… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/hook.c [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -250,8 +250,8 @@ BOOL Block = FALSE; ULONG_PTR uResult = 0; - if (Hook->Thread) - pti = Hook->Thread->Tcb.Win32Thread; + if (Hook->ptiHooked) + pti = Hook->ptiHooked; else pti = Hook->head.pti; @@ -990,9 +990,9 @@ PLIST_ENTRY pLastHead, pElem; PTHREADINFO pti; - if (Hook->Thread) - { - pti = ((PTHREADINFO)Hook->Thread->Tcb.Win32Thread); + if (Hook->ptiHooked) + { + pti = Hook->ptiHooked; pLastHead = &pti->aphkStart[HOOKID_TO_INDEX(HookId)]; } else @@ -1035,9 +1035,9 @@ HookId = Hook->HookId; - if (Hook->Thread) // Local - { - pti = ((PTHREADINFO)Hook->Thread->Tcb.Win32Thread); + if (Hook->ptiHooked) // Local + { + pti = Hook->ptiHooked; IntFreeHook( Hook); @@ -1496,8 +1496,6 @@ ptiHook = Thread->Tcb.Win32Thread; - ObDereferenceObject(Thread); - if ( ptiHook->rpdesk != pti->rpdesk) // gptiCurrent->rpdesk) { ERR("Local hook wrong desktop HookId: %d\n",HookId); @@ -1577,7 +1575,6 @@ } Hook->ihmod = (INT)Mod; // Module Index from atom table, Do this for now. - Hook->Thread = Thread; /* Set Thread, Null is Global. */ Hook->HookId = HookId; Hook->rpdesk = ptiHook->rpdesk; Hook->phkNext = NULL; /* Dont use as a chain! Use link lists for chaining. */ @@ -1684,6 +1681,7 @@ CLEANUP: TRACE("Leave NtUserSetWindowsHookEx, ret=%i\n",_ret_); + if (Thread) ObDereferenceObject(Thread); UserLeave(); END_CLEANUP; } Modified: branches/ros-csrss/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -145,6 +145,15 @@ if (NewCursor) { /* Call GDI to set the new screen cursor */ +#ifdef NEW_CURSORICON + GreSetPointerShape(hdcScreen, + NewCursor->aFrame[0].hbmMask, + NewCursor->aFrame[0].hbmColor, + NewCursor->ptlHotspot.x, + NewCursor->ptlHotspot.y, + gpsi->ptCursor.x, + gpsi->ptCursor.y); +#else GreSetPointerShape(hdcScreen, NewCursor->IconInfo.hbmMask, NewCursor->IconInfo.hbmColor, @@ -152,6 +161,7 @@ NewCursor->IconInfo.yHotspot, gpsi->ptCursor.x, gpsi->ptCursor.y); +#endif } else /* Note: OldCursor != NewCursor so we have to hide cursor */ { @@ -571,13 +581,23 @@ if(CurInfo->CurrentCursorObject != MessageQueue->CursorObject) { /* Call GDI to set the new screen cursor */ +#ifdef NEW_CURSORICON GreSetPointerShape(hdcScreen, + MessageQueue->CursorObject->aFrame[0].hbmMask, + MessageQueue->CursorObject->aFrame[0].hbmColor, + MessageQueue->CursorObject->ptlHotspot.x, + MessageQueue->CursorObject->ptlHotspot.y, + gpsi->ptCursor.x, + gpsi->ptCursor.y); +#else + GreSetPointerShape(hdcScreen, MessageQueue->CursorObject->IconInfo.hbmMask, MessageQueue->CursorObject->IconInfo.hbmColor, MessageQueue->CursorObject->IconInfo.xHotspot, MessageQueue->CursorObject->IconInfo.yHotspot, gpsi->ptCursor.x, gpsi->ptCursor.y); +#endif } else GreMovePointer(hdcScreen, Msg->pt.x, Msg->pt.y); } Modified: branches/ros-csrss/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/o… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/object.c [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -516,6 +516,38 @@ return object; } +VOID +FASTCALL +UserSetObjectOwner(PVOID obj, USER_OBJECT_TYPE type, PVOID owner) +{ + PUSER_HANDLE_ENTRY entry = handle_to_entry(gHandleTable, ((PHEAD)obj)->h ); + PPROCESSINFO ppi, oldppi; + + /* This must be called with a valid object */ + ASSERT(entry); + + /* For now, only supported for CursorIcon object */ + switch(type) + { + case otCursorIcon: + ppi = (PPROCESSINFO)owner; + entry->pi = ppi; + oldppi = ((PPROCMARKHEAD)obj)->ppi; + ((PPROCMARKHEAD)obj)->ppi = ppi; + break; + default: + ASSERT(FALSE); + return; + } + + oldppi->UserHandleCount--; + ppi->UserHandleCount++; +#if DBG + oldppi->DbgHandleCount[type]--; + ppi->DbgHandleCount[type]++; +#endif +} + /* * NtUserValidateHandleSecure * Modified: branches/ros-csrss/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/o… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/object.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/object.h [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -40,6 +40,7 @@ BOOL FASTCALL UserCreateHandleTable(VOID); BOOL FASTCALL UserObjectInDestroy(HANDLE); void DbgUserDumpHandleTable(); +VOID FASTCALL UserSetObjectOwner(PVOID obj, USER_OBJECT_TYPE type, PVOID owner); static __inline VOID UserRefObjectCo(PVOID obj, PUSER_REFERENCE_ENTRY UserReferenceEntry) Modified: branches/ros-csrss/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/p… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/painting.c [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -2003,6 +2003,7 @@ LONG x = Rect.left - cx/2 + 1 + (Rect.bottom - Rect.top)/2; // this is really what Window does LONG y = (Rect.top + Rect.bottom)/2 - cy/2; // center UserDrawIconEx(hDc, x, y, pIcon, cx, cy, 0, NULL, DI_NORMAL); + UserDereferenceObject(pIcon); } } Modified: branches/ros-csrss/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/winsta.c [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -526,7 +526,7 @@ if (hWinSta == UserGetProcessWindowStation()) { - ERR("Attempted to close process window station"); + ERR("Attempted to close process window station\n"); return FALSE; } @@ -612,19 +612,13 @@ /* try windowstation */ TRACE("Trying to open window station 0x%x\n", hObject); - Status = IntValidateWindowStationHandle( + Status = ObReferenceObjectByHandle( hObject, + 0, + ExWindowStationObjectType, UserMode, - 0, - &WinStaObject); - - - if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_TYPE_MISMATCH) - { - TRACE("Failed: 0x%x\n", Status); - SetLastNtError(Status); - return FALSE; - } + (PVOID*)&WinStaObject, + NULL); if (Status == STATUS_OBJECT_TYPE_MISMATCH) { @@ -635,13 +629,15 @@ UserMode, 0, &DesktopObject); - if (!NT_SUCCESS(Status)) - { - TRACE("Failed: 0x%x\n", Status); - SetLastNtError(Status); - return FALSE; - } - } + } + + if (!NT_SUCCESS(Status)) + { + ERR("Failed: 0x%x\n", Status); + SetLastNtError(Status); + return FALSE; + } + TRACE("WinSta or Desktop opened!!\n"); /* get data */ @@ -713,8 +709,13 @@ if (DesktopObject != NULL) ObDereferenceObject(DesktopObject); - SetLastNtError(Status); - return NT_SUCCESS(Status); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + + return TRUE; } /* Modified: branches/ros-csrss/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/C… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -41,7 +41,7 @@ windows/caret.c windows/class.c windows/clipboard.c - windows/cursoricon.c +# windows/cursoricon.c windows/dc.c windows/defwnd.c windows/dialog.c @@ -64,6 +64,12 @@ user32.rc ${CMAKE_CURRENT_BINARY_DIR}/user32.def) +if(USE_NEW_CURSORICON) + list(APPEND SOURCE windows/cursoricon_new.c) +else() + list(APPEND SOURCE windows/cursoricon.c) +endif() + add_library(user32 SHARED ${SOURCE}) set_module_type(user32 win32dll UNICODE) Modified: branches/ros-csrss/win32ss/user/user32/misc/exticon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/misc/exticon.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/misc/exticon.c [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -29,30 +29,6 @@ /* Start of Hack section */ WINE_DEFAULT_DEBUG_CHANNEL(icon); - -#include "pshpack1.h" - -typedef struct -{ - BYTE bWidth; /* Width, in pixels, of the image */ - BYTE bHeight; /* Height, in pixels, of the image */ - BYTE bColorCount; /* Number of colors in image (0 if >=8bpp) */ - BYTE bReserved; /* Reserved ( must be 0) */ - WORD wPlanes; /* Color Planes */ - WORD wBitCount; /* Bits per pixel */ - DWORD dwBytesInRes; /* How many bytes in this resource? */ - DWORD dwImageOffset; /* Where in the file is this image? */ -} icoICONDIRENTRY, *LPicoICONDIRENTRY; - -typedef struct -{ - WORD idReserved; /* Reserved (must be 0) */ - WORD idType; /* Resource Type (RES_ICON or RES_CURSOR) */ - WORD idCount; /* How many images */ - icoICONDIRENTRY idEntries[1]; /* An entry for each image (idCount of 'em) */ -} icoICONDIR, *LPicoICONDIR; - -#include "poppack.h" #if 0 static void dumpIcoDirEnty ( LPicoICONDIRENTRY entry ) Modified: branches/ros-csrss/win32ss/user/user32/misc/object.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/misc/object.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/misc/object.c [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -48,7 +48,8 @@ LPDWORD lpnLengthNeeded) { LPWSTR buffer; - BOOL ret = TRUE; + BOOL ret = FALSE; + DWORD LengthNeeded; TRACE("GetUserObjectInformationA(%x %d %x %d %x)\n", hObj, nIndex, pvInfo, nLength, lpnLengthNeeded); @@ -65,17 +66,16 @@ } /* get unicode string */ - if (!GetUserObjectInformationW(hObj, nIndex, buffer, nLength*2, lpnLengthNeeded)) - ret = FALSE; - *lpnLengthNeeded /= 2; - - if (ret) + if (GetUserObjectInformationW(hObj, nIndex, buffer, nLength*2, lpnLengthNeeded)) { /* convert string */ - if (WideCharToMultiByte(CP_THREAD_ACP, 0, buffer, -1, - pvInfo, nLength, NULL, NULL) == 0) + LengthNeeded = WideCharToMultiByte(CP_THREAD_ACP, 0, buffer, -1, + pvInfo, nLength, NULL, NULL); + + if (LengthNeeded != 0) { - ret = FALSE; + *lpnLengthNeeded = LengthNeeded; + ret = TRUE; } }

1 0

[gadamopoulos] 57652: [win32k] - Fix the remaining tests that failed in user32:winstation
by gadamopoulos＠svn.reactos.org 30 Oct '12

30 Oct '12

Author: gadamopoulos Date: Tue Oct 30 16:50:11 2012 New Revision: 57652 URL: http://svn.reactos.org/svn/reactos?rev=57652&view=rev Log: [win32k] - Fix the remaining tests that failed in user32:winstation Modified: trunk/reactos/win32ss/user/ntuser/winsta.c trunk/reactos/win32ss/user/user32/misc/object.c Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Tue Oct 30 16:50:11 2012 @@ -526,7 +526,7 @@ if (hWinSta == UserGetProcessWindowStation()) { - ERR("Attempted to close process window station"); + ERR("Attempted to close process window station\n"); return FALSE; } @@ -612,19 +612,13 @@ /* try windowstation */ TRACE("Trying to open window station 0x%x\n", hObject); - Status = IntValidateWindowStationHandle( + Status = ObReferenceObjectByHandle( hObject, + 0, + ExWindowStationObjectType, UserMode, - 0, - &WinStaObject); - - - if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_TYPE_MISMATCH) - { - TRACE("Failed: 0x%x\n", Status); - SetLastNtError(Status); - return FALSE; - } + (PVOID*)&WinStaObject, + NULL); if (Status == STATUS_OBJECT_TYPE_MISMATCH) { @@ -635,13 +629,15 @@ UserMode, 0, &DesktopObject); - if (!NT_SUCCESS(Status)) - { - TRACE("Failed: 0x%x\n", Status); - SetLastNtError(Status); - return FALSE; - } - } + } + + if (!NT_SUCCESS(Status)) + { + ERR("Failed: 0x%x\n", Status); + SetLastNtError(Status); + return FALSE; + } + TRACE("WinSta or Desktop opened!!\n"); /* get data */ @@ -713,8 +709,13 @@ if (DesktopObject != NULL) ObDereferenceObject(DesktopObject); - SetLastNtError(Status); - return NT_SUCCESS(Status); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + + return TRUE; } /* Modified: trunk/reactos/win32ss/user/user32/misc/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/o… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/object.c [iso-8859-1] Tue Oct 30 16:50:11 2012 @@ -48,7 +48,8 @@ LPDWORD lpnLengthNeeded) { LPWSTR buffer; - BOOL ret = TRUE; + BOOL ret = FALSE; + DWORD LengthNeeded; TRACE("GetUserObjectInformationA(%x %d %x %d %x)\n", hObj, nIndex, pvInfo, nLength, lpnLengthNeeded); @@ -65,17 +66,16 @@ } /* get unicode string */ - if (!GetUserObjectInformationW(hObj, nIndex, buffer, nLength*2, lpnLengthNeeded)) - ret = FALSE; - *lpnLengthNeeded /= 2; - - if (ret) + if (GetUserObjectInformationW(hObj, nIndex, buffer, nLength*2, lpnLengthNeeded)) { /* convert string */ - if (WideCharToMultiByte(CP_THREAD_ACP, 0, buffer, -1, - pvInfo, nLength, NULL, NULL) == 0) + LengthNeeded = WideCharToMultiByte(CP_THREAD_ACP, 0, buffer, -1, + pvInfo, nLength, NULL, NULL); + + if (LengthNeeded != 0) { - ret = FALSE; + *lpnLengthNeeded = LengthNeeded; + ret = TRUE; } }

1 0

[gadamopoulos] 57651: [user32_apitest] - Add a test for LR_SHARED flag for LoadImage
by gadamopoulos＠svn.reactos.org 30 Oct '12

30 Oct '12

Author: gadamopoulos Date: Tue Oct 30 13:29:11 2012 New Revision: 57651 URL: http://svn.reactos.org/svn/reactos?rev=57651&view=rev Log: [user32_apitest] - Add a test for LR_SHARED flag for LoadImage Added: trunk/rostests/apitests/user32/LoadImage.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Tue Oct 30 13:29:11 2012 @@ -10,6 +10,7 @@ GetPeekMessage.c GetSystemMetrics.c InitializeLpkHooks.c + LoadImage.c RealGetWindowClass.c ScrollDC.c ScrollWindowEx.c Added: trunk/rostests/apitests/user32/LoadImage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/LoadImage… ============================================================================== --- trunk/rostests/apitests/user32/LoadImage.c (added) +++ trunk/rostests/apitests/user32/LoadImage.c [iso-8859-1] Tue Oct 30 13:29:11 2012 @@ -1,0 +1,38 @@ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> +#include "resource.h" + +START_TEST(LoadImage) +{ + char path[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFO si; + HANDLE handle; + + char **test_argv; + int argc = winetest_get_mainargs( &test_argv ); + + /* Now check its behaviour regarding Shared icons/cursors */ + handle = LoadImageW( GetModuleHandle(NULL), L"TESTCURSOR", IMAGE_CURSOR, 0, 0, LR_SHARED | LR_DEFAULTSIZE ); + ok(handle != 0, "\n"); + + if (argc >= 3) + { + HANDLE arg; + + sscanf (test_argv[2], "%lu", (ULONG_PTR*) &arg); + + ok(handle != arg, "Got same handles\n"); + + return; + } + + /* Start child process */ + sprintf( path, "%s LoadImage %lu", test_argv[0], (ULONG_PTR)handle ); + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + CreateProcessA( NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi ); + WaitForSingleObject (pi.hProcess, INFINITE); +} Propchange: trunk/rostests/apitests/user32/LoadImage.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Tue Oct 30 13:29:11 2012 @@ -14,6 +14,7 @@ extern void func_GetPeekMessage(void); extern void func_GetSystemMetrics(void); extern void func_InitializeLpkHooks(void); +extern void func_LoadImage(void); extern void func_RealGetWindowClass(void); extern void func_ScrollDC(void); extern void func_ScrollWindowEx(void); @@ -35,6 +36,7 @@ { "GetPeekMessage", func_GetPeekMessage }, { "GetSystemMetrics", func_GetSystemMetrics }, { "InitializeLpkHooks", func_InitializeLpkHooks }, + { "LoadImage", func_LoadImage }, { "RealGetWindowClass", func_RealGetWindowClass }, { "ScrollDC", func_ScrollDC }, { "ScrollWindowEx", func_ScrollWindowEx },

1 0

[jgardou] 57650: [W32K_APITEST] - Better test for NtUserGetIconInfo
by jgardou＠svn.reactos.org 30 Oct '12

30 Oct '12

Author: jgardou Date: Tue Oct 30 02:05:52 2012 New Revision: 57650 URL: http://svn.reactos.org/svn/reactos?rev=57650&view=rev Log: [W32K_APITEST] - Better test for NtUserGetIconInfo Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserGetIconInfo.c Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserGetIconInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserGetIconInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserGetIconInfo.c [iso-8859-1] Tue Oct 30 02:05:52 2012 @@ -109,7 +109,9 @@ TEST(hIcon != NULL); - RtlInitUnicodeString(&hInstStr, NULL); + hInstStr.Buffer = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + hInstStr.MaximumLength = MAX_PATH; + hInstStr.Length = 0; RtlInitUnicodeString(&ResourceStr, NULL); TEST(NtUserGetIconInfo(hIcon, @@ -119,15 +121,16 @@ &bpp, FALSE) == TRUE); - TESTX(hInstStr.Buffer == NULL, "hInstStr.buffer : %p\n", hInstStr.Buffer); - TEST(hInstStr.Length == 0); - TEST(hInstStr.MaximumLength == 0); + TEST(hInstStr.Length != 0); + hInstStr.Buffer[hInstStr.Length] = 0; + printf("%s,%i: hInstStr.buffer : %S\n", __FUNCTION__, __LINE__, hInstStr.Buffer); TEST((LPCTSTR)ResourceStr.Buffer == MAKEINTRESOURCE(293)); TEST(ResourceStr.Length == 0); TEST(ResourceStr.MaximumLength == 0); TEST(bpp == 32); - RtlInitUnicodeString(&hInstStr, NULL); + ZeroMemory(hInstStr.Buffer, MAX_PATH*sizeof(WCHAR)); + hInstStr.Length = 0; RtlInitUnicodeString(&ResourceStr, NULL); TEST(NtUserGetIconInfo(hIcon, @@ -137,9 +140,9 @@ &bpp, TRUE) == TRUE); - TESTX(hInstStr.Buffer == NULL, "hInstStr.buffer : %p\n", hInstStr.Buffer); - TEST(hInstStr.Length == 0); - TEST(hInstStr.MaximumLength == 0); + TEST(hInstStr.Length != 0); + hInstStr.Buffer[hInstStr.Length] = 0; + printf("%s,%i: hInstStr.buffer : %S\n", __FUNCTION__, __LINE__, hInstStr.Buffer); TEST((LPCTSTR)ResourceStr.Buffer == MAKEINTRESOURCE(293)); TEST(bpp == 32);

1 0

[jgardou] 57649: [USER32_APITEST] - Commit forgotten file
by jgardou＠svn.reactos.org 30 Oct '12

30 Oct '12

Author: jgardou Date: Tue Oct 30 01:39:28 2012 New Revision: 57649 URL: http://svn.reactos.org/svn/reactos?rev=57649&view=rev Log: [USER32_APITEST] - Commit forgotten file Modified: trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Tue Oct 30 01:39:28 2012 @@ -7,6 +7,7 @@ extern void func_AttachThreadInput(void); extern void func_DeferWindowPos(void); +extern void func_DestroyCursorIcon(void); extern void func_desktop(void); extern void func_GetIconInfo(void); extern void func_GetKeyState(void); @@ -28,6 +29,7 @@ { "AttachThreadInput", func_AttachThreadInput }, { "desktop", func_desktop }, { "DeferWindowPos", func_DeferWindowPos }, + { "DestroyCursorIcon", func_DestroyCursorIcon }, { "GetIconInfo", func_GetIconInfo }, { "GetKeyState", func_GetKeyState }, { "GetPeekMessage", func_GetPeekMessage },

1 0

[jgardou] 57648: [USER32_APITEST] - More thorough test for what really happens after the "destruction" of a shared cursor.
by jgardou＠svn.reactos.org 29 Oct '12

29 Oct '12

Author: jgardou Date: Mon Oct 29 16:14:54 2012 New Revision: 57648 URL: http://svn.reactos.org/svn/reactos?rev=57648&view=rev Log: [USER32_APITEST] - More thorough test for what really happens after the "destruction" of a shared cursor. Modified: trunk/rostests/apitests/user32/DestroyCursorIcon.c Modified: trunk/rostests/apitests/user32/DestroyCursorIcon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DestroyCu… ============================================================================== --- trunk/rostests/apitests/user32/DestroyCursorIcon.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/DestroyCursorIcon.c [iso-8859-1] Mon Oct 29 16:14:54 2012 @@ -41,7 +41,11 @@ ok(DestroyCursor(hcursor), "\n"); /* In fact, it's still there */ + ZeroMemory(&iconinfo, sizeof(iconinfo)); ok(GetIconInfo(hcursor, &iconinfo), "\n"); + ok(iconinfo.hbmMask != NULL, "\n"); + ok(iconinfo.hbmColor != NULL, "\n"); + ok(!iconinfo.fIcon, "\n"); /* clean up */ DeleteObject(iconinfo.hbmMask);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs