Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 66171: [GDI32] CORE-8350 #comment Fix return value on error in RealizePalette. #resolve
by tkreuzer＠svn.reactos.org 05 Feb '15

05 Feb '15

Author: tkreuzer Date: Thu Feb 5 09:35:54 2015 New Revision: 66171 URL: http://svn.reactos.org/svn/reactos?rev=66171&view=rev Log: [GDI32] CORE-8350 #comment Fix return value on error in RealizePalette. #resolve Modified: trunk/reactos/win32ss/gdi/gdi32/objects/palette.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/palette.c [iso-8859-1] Thu Feb 5 09:35:54 2015 @@ -139,6 +139,12 @@ _In_ HDC hdc) /* [in] Handle of device context */ { HANDLE_METADC0P(UINT, RealizePalette, GDI_ERROR, hdc); + + if (GDI_HANDLE_GET_TYPE(hdc) != GDILoObjType_LO_DC_TYPE) + { + return GDI_ERROR; + } + return UserRealizePalette(hdc); }

1 0

[aandrejevic] 66170: [FAST486] Implement FRNDINT.
by aandrejevic＠svn.reactos.org 05 Feb '15

05 Feb '15

Author: aandrejevic Date: Thu Feb 5 01:03:09 2015 New Revision: 66170 URL: http://svn.reactos.org/svn/reactos?rev=66170&view=rev Log: [FAST486] Implement FRNDINT. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6617… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Thu Feb 5 01:03:09 2015 @@ -34,59 +34,24 @@ /* 0.00 */ static const FAST486_FPU_DATA_REG FpuZero = {0ULL, 0, FALSE}; -// { -// .Sign = FALSE, -// .Exponent = 0, -// .Mantissa = 0ULL -// }; /* 1.00 */ static const FAST486_FPU_DATA_REG FpuOne = {0x8000000000000000ULL, FPU_REAL10_BIAS, FALSE}; -// { -// .Sign = FALSE, -// .Exponent = FPU_REAL10_BIAS, -// .Mantissa = 0x8000000000000000ULL -// }; /* Pi */ static const FAST486_FPU_DATA_REG FpuPi = {0xC90FDAA22168C234ULL, FPU_REAL10_BIAS + 1, FALSE}; -// { -// .Sign = FALSE, -// .Exponent = FPU_REAL10_BIAS + 1, -// .Mantissa = 0xC90FDAA22168C234ULL -// }; /* lb(10) */ static const FAST486_FPU_DATA_REG FpuL2Ten = {0xD49A784BCD1D8AFEULL, FPU_REAL10_BIAS + 1, FALSE}; -// { -// .Sign = FALSE, -// .Exponent = FPU_REAL10_BIAS + 1, -// .Mantissa = 0xD49A784BCD1D8AFEULL -// }; /* lb(e) */ static const FAST486_FPU_DATA_REG FpuL2E = {0xB8AA3B295C17F0BBULL, FPU_REAL10_BIAS, FALSE}; -// { -// .Sign = FALSE, -// .Exponent = FPU_REAL10_BIAS, -// .Mantissa = 0xB8AA3B295C17F0BBULL -// }; /* lg(2) */ static const FAST486_FPU_DATA_REG FpuLgTwo = {0x9A209A84FBCFF798ULL, FPU_REAL10_BIAS - 2, FALSE}; -// { -// .Sign = FALSE, -// .Exponent = FPU_REAL10_BIAS - 2, -// .Mantissa = 0x9A209A84FBCFF798ULL -// }; /* ln(2) */ static const FAST486_FPU_DATA_REG FpuLnTwo = {0xB17217F7D1CF79ABULL, FPU_REAL10_BIAS - 1, FALSE}; -// { -// .Sign = FALSE, -// .Exponent = FPU_REAL10_BIAS - 1, -// .Mantissa = 0xB17217F7D1CF79ABULL -// }; /* PRIVATE FUNCTIONS **********************************************************/ @@ -201,6 +166,52 @@ } static inline VOID FASTCALL +Fast486FpuRound(PFAST486_STATE State, + PULONGLONG Result, + BOOLEAN Sign, + ULONGLONG Remainder, + INT RemainderHighBit) +{ + switch (State->FpuControl.Rc) + { + case FPU_ROUND_NEAREST: + { + /* Check if the highest bit of the remainder is set */ + if (Remainder & (1ULL << RemainderHighBit)) + { + (*Result)++; + + /* Check if all the other bits are clear */ + if (!(Remainder & ((1ULL << RemainderHighBit) - 1))) + { + /* Round to even */ + *Result &= ~1; + } + } + + break; + } + + case FPU_ROUND_DOWN: + { + if ((Remainder != 0ULL) && Sign) (*Result)++; + break; + } + + case FPU_ROUND_UP: + { + if ((Remainder != 0ULL) && !Sign) (*Result)++; + break; + } + + default: + { + /* Leave it truncated */ + } + } +} + +static inline VOID FASTCALL Fast486FpuFromInteger(PFAST486_STATE State, LONGLONG Value, PFAST486_FPU_DATA_REG Result) @@ -265,43 +276,8 @@ /* The result must be positive here */ ASSERT(*Result >= 0LL); - switch (State->FpuControl.Rc) - { - case FPU_ROUND_NEAREST: - { - /* Check if the highest bit of the remainder is set */ - if (Remainder & (1 << (Bits - 1))) - { - (*Result)++; - - /* Check if all the other bits are clear */ - if (!(Remainder & ((1 << (Bits - 1)) - 1))) - { - /* Round to even */ - *Result &= ~1; - } - } - - break; - } - - case FPU_ROUND_DOWN: - { - if ((Remainder != 0ULL) && Value->Sign) (*Result)++; - break; - } - - case FPU_ROUND_UP: - { - if ((Remainder != 0ULL) && !Value->Sign) (*Result)++; - break; - } - - default: - { - /* Leave it truncated */ - } - } + /* Perform rounding */ + Fast486FpuRound(State, (PULONGLONG)Result, Value->Sign, Remainder, Bits - 1); if (Value->Sign) *Result = -*Result; return TRUE; @@ -335,6 +311,7 @@ { ULONGLONG Remainder; SHORT UnbiasedExp = (SHORT)Value->Exponent - FPU_REAL10_BIAS; + ULONGLONG Result64; if (FPU_IS_ZERO(Value)) { @@ -392,43 +369,10 @@ /* Calculate the remainder */ Remainder = Value->Mantissa & ((1ULL << 40) - 1); - switch (State->FpuControl.Rc) - { - case FPU_ROUND_NEAREST: - { - /* Check if the highest bit of the remainder is set */ - if (Remainder & (1ULL << 39)) - { - (*Result)++; - - /* Check if all the other bits are clear */ - if (!(Remainder & ((1ULL << 39) - 1))) - { - /* Round to even */ - *Result &= ~1; - } - } - - break; - } - - case FPU_ROUND_DOWN: - { - if ((Remainder != 0ULL) && Value->Sign) (*Result)++; - break; - } - - case FPU_ROUND_UP: - { - if ((Remainder != 0ULL) && !Value->Sign) (*Result)++; - break; - } - - default: - { - /* Leave it truncated */ - } - } + /* Perform rounding */ + Result64 = (ULONGLONG)*Result; + Fast486FpuRound(State, &Result64, Value->Sign, Remainder, 39); + *Result = (ULONG)Result64; /* Store the biased exponent */ *Result |= (ULONG)(UnbiasedExp + FPU_REAL4_BIAS) << 23; @@ -524,43 +468,8 @@ /* Calculate the remainder */ Remainder = Value->Mantissa & ((1 << 11) - 1); - switch (State->FpuControl.Rc) - { - case FPU_ROUND_NEAREST: - { - /* Check if the highest bit of the remainder is set */ - if (Remainder & (1 << 10)) - { - (*Result)++; - - /* Check if all the other bits are clear */ - if (!(Remainder & ((1 << 10) - 1))) - { - /* Round to even */ - *Result &= ~1; - } - } - - break; - } - - case FPU_ROUND_DOWN: - { - if ((Remainder != 0ULL) && Value->Sign) (*Result)++; - break; - } - - case FPU_ROUND_UP: - { - if ((Remainder != 0ULL) && !Value->Sign) (*Result)++; - break; - } - - default: - { - /* Leave it truncated */ - } - } + /* Perform rounding */ + Fast486FpuRound(State, Result, Value->Sign, Remainder, 10); /* Store the biased exponent */ *Result |= (ULONGLONG)(UnbiasedExp + FPU_REAL8_BIAS) << 52; @@ -1628,8 +1537,44 @@ /* FRNDINT */ case 0x3C: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + INT Bits; + ULONGLONG Result = 0ULL; + ULONGLONG Remainder; + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + break; + } + + if (!FPU_IS_NORMALIZED(&FPU_ST(0))) + { + State->FpuStatus.De = TRUE; + + if (!State->FpuControl.Dm) + { + Fast486FpuException(State); + break; + } + } + + Bits = min(max(0, (INT)FPU_ST(0).Exponent - FPU_REAL10_BIAS + 1), 64); + if (Bits == 64) break; + + if (Bits) + { + Result = FPU_ST(0).Mantissa >> (64 - Bits); + Remainder = FPU_ST(0).Mantissa & ((1 << (64 - Bits)) - 1); + } + else Remainder = FPU_ST(0).Mantissa; + + /* Perform the rounding */ + Fast486FpuRound(State, &Result, FPU_ST(0).Sign, Remainder, 63 - Bits); + + State->FpuStatus.Pe = TRUE; + if (!State->FpuControl.Pm) Fast486FpuException(State); break; }

1 0

[hbelusca] 66169: [FREELDR]: Add some debug information when searching for PCI routing tables.
by hbelusca＠svn.reactos.org 05 Feb '15

05 Feb '15

Author: hbelusca Date: Thu Feb 5 00:43:39 2015 New Revision: 66169 URL: http://svn.reactos.org/svn/reactos?rev=66169&view=rev Log: [FREELDR]: Add some debug information when searching for PCI routing tables. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] Thu Feb 5 00:43:39 2015 @@ -44,7 +44,7 @@ if (Table->TableSize < FIELD_OFFSET(PCI_IRQ_ROUTING_TABLE, Slot) || Table->TableSize % 16 != 0) { - ERR("Invalid routing table size (%u) at %p. Continue searching...\n", Table->TableSize, Table); + ERR("Invalid routing table size (%u) at 0x%p. Continue searching...\n", Table->TableSize, Table); Table = (PPCI_IRQ_ROUTING_TABLE)((ULONG_PTR)Table + 0x10); continue; } @@ -58,11 +58,11 @@ if ((Sum & 0xFF) != 0) { - ERR("Invalid routing table checksum (%#lx) at %p. Continue searching...\n", Sum & 0xFF, Table); + ERR("Invalid routing table checksum (%#lx) at 0x%p. Continue searching...\n", Sum & 0xFF, Table); } else { - TRACE("Valid checksum\n"); + TRACE("Valid checksum (%#lx): found routing table at 0x%p\n", Sum & 0xFF, Table); return Table; } }

1 0

[jimtabor] 66168: - Missed this one.
by jimtabor＠svn.reactos.org 05 Feb '15

05 Feb '15

Author: jimtabor Date: Thu Feb 5 00:13:51 2015 New Revision: 66168 URL: http://svn.reactos.org/svn/reactos?rev=66168&view=rev Log: - Missed this one. Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Thu Feb 5 00:13:51 2015 @@ -1213,6 +1213,7 @@ case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: case WM_APPCOMMAND: + case WM_SETCURSOR: { LRESULT lResult; NtUserMessageCall( hWnd, Msg, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, !bUnicode);

1 0

[hbelusca] 66167: [DLLs]: Privatize the exports that should be so.
by hbelusca＠svn.reactos.org 05 Feb '15

05 Feb '15

Author: hbelusca Date: Thu Feb 5 00:12:12 2015 New Revision: 66167 URL: http://svn.reactos.org/svn/reactos?rev=66167&view=rev Log: [DLLs]: Privatize the exports that should be so. Modified: trunk/reactos/dll/directx/wine/d3drm/d3drm.spec trunk/reactos/dll/win32/msxml3/msxml3.spec trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/rsaenh/rsaenh.spec Modified: trunk/reactos/dll/directx/wine/d3drm/d3drm.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/d3d… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/d3drm.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/d3drm.spec [iso-8859-1] Thu Feb 5 00:12:12 2015 @@ -19,5 +19,5 @@ @ stdcall D3DRMVectorScale(ptr ptr float) @ stdcall D3DRMVectorSubtract(ptr ptr ptr) @ stdcall Direct3DRMCreate(ptr) -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stub -private DllCanUnloadNow +@ stub -private DllGetClassObject Modified: trunk/reactos/dll/win32/msxml3/msxml3.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.sp… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3.spec [iso-8859-1] Thu Feb 5 00:12:12 2015 @@ -7,6 +7,6 @@ 12 stub MSXML3_12 @ stdcall -private DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Thu Feb 5 00:12:12 2015 @@ -133,7 +133,7 @@ @ stdcall CreateStreamOnHGlobal(ptr long ptr) # DcomChannelSetHResult @ stdcall DllDebugObjectRPCHook(long ptr) -@ stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllGetClassObjectWOW @ stdcall -private DllRegisterServer() @ stdcall DoDragDrop(ptr ptr long ptr) Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.sp… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.spec [iso-8859-1] Thu Feb 5 00:12:12 2015 @@ -23,5 +23,5 @@ @ stdcall CPSetProvParam(long long ptr long) RSAENH_CPSetProvParam @ stdcall CPSignHash(long long long wstr long ptr ptr) RSAENH_CPSignHash @ stdcall CPVerifySignature(long long ptr long long wstr long) RSAENH_CPVerifySignature -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

[jimtabor] 66166: [Win32ss] - Setup system cursors and icons. Could help with Themes. - Set default cursor to the message queue structure. - Fix wine cursor icon tests. Fix ATI cursor passing issue...
by jimtabor＠svn.reactos.org 05 Feb '15

05 Feb '15

Author: jimtabor Date: Thu Feb 5 00:11:35 2015 New Revision: 66166 URL: http://svn.reactos.org/svn/reactos?rev=66166&view=rev Log: [Win32ss] - Setup system cursors and icons. Could help with Themes. - Set default cursor to the message queue structure. - Fix wine cursor icon tests. Fix ATI cursor passing issue. - Fix that sticky mouse cursor while the screen saver is on. - Move cursor code from User32 and shake that pop up window too. - Setup for window station security checking. - Dedicated to the great work by Jérôme Gardou. Doing ones best to preserve his original code! Modified: trunk/reactos/win32ss/include/callback.h trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/cursoricon.c trunk/reactos/win32ss/user/ntuser/cursoricon.h trunk/reactos/win32ss/user/ntuser/cursoricon_new.c trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/win32.h trunk/reactos/win32ss/user/ntuser/winsta.c trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/user32/misc/winsta.c trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/callback.h… ============================================================================== --- trunk/reactos/win32ss/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/callback.h [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -113,8 +113,13 @@ typedef struct _SETWNDICONS_CALLBACK_ARGUMENTS { + HICON hIconSample; + HICON hIconHand; + HICON hIconQuestion; + HICON hIconBang; + HICON hIconNote; + HICON hIconWindows; HICON hIconSmWindows; - HICON hIconWindows; } SETWNDICONS_CALLBACK_ARGUMENTS, *PSETWNDICONS_CALLBACK_ARGUMENTS; typedef struct _DDEPOSTGET_CALLBACK_ARGUMENTS 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] Thu Feb 5 00:11:35 2015 @@ -1006,6 +1006,7 @@ LIST_ENTRY PropListEntry; HANDLE Data; ATOM Atom; + WORD fs; } PROPERTY, *PPROPERTY; typedef struct _BROADCASTPARM @@ -3184,13 +3185,13 @@ HOOKPROC HookProc, BOOL Ansi); -DWORD +BOOL NTAPI NtUserSetWindowStationUser( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); + HWINSTA hWindowStation, + PLUID pluid, + PSID psid, + DWORD size); WORD NTAPI NtUserSetWindowWord(HWND hWnd, INT Index, WORD NewVal); Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Callback to usermode support - * FILE: subsystems/win32/win32k/ntuser/callback.c + * FILE: win32ss/user/ntuser/callback.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Thomas Weidenmueller (w3seek(a)users.sourceforge.net) * NOTES: Please use the Callback Memory Management functions for @@ -357,7 +357,7 @@ if (!NT_SUCCESS(Status)) { - ERR("Call to user mode failed!\n"); + ERR("Call to user mode failed! %p\n",Status); if (lParamBufferSize != -1) { IntCbFreeMemory(Arguments); @@ -1082,20 +1082,28 @@ UserEnterCo(); - /* FIXME: Need to setup Registry System Cursor & Icons via Callbacks at init time! */ + if (!NT_SUCCESS(Status)) + { + ERR("Set Window Icons callback failed!\n"); + IntCbFreeMemory(Argument); + return FALSE; + } + RtlMoveMemory(Common, ResultPointer, ArgumentLength); gpsi->hIconSmWindows = Common->hIconSmWindows; gpsi->hIconWindows = Common->hIconWindows; + IntLoadSystenIcons(Common->hIconSample, OIC_SAMPLE); + IntLoadSystenIcons(Common->hIconHand, OIC_HAND); + IntLoadSystenIcons(Common->hIconQuestion, OIC_QUES); + IntLoadSystenIcons(Common->hIconBang, OIC_BANG); + IntLoadSystenIcons(Common->hIconNote, OIC_NOTE); + IntLoadSystenIcons(gpsi->hIconWindows, OIC_WINLOGO); + IntLoadSystenIcons(gpsi->hIconSmWindows, OIC_WINLOGO+1); + ERR("hIconSmWindows %p hIconWindows %p \n",gpsi->hIconSmWindows,gpsi->hIconWindows); IntCbFreeMemory(Argument); - - if (!NT_SUCCESS(Status)) - { - ERR("Set Window Icons callback failed!\n"); - return FALSE; - } return TRUE; } Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Window classes - * FILE: subsystems/win32/win32k/ntuser/class.c + * FILE: win32ss/user/ntuser/class.c * PROGRAMER: Thomas Weidenmueller <w3seek(a)reactos.com> */ @@ -38,7 +38,7 @@ CS_GLOBALCLASS|CS_DBLCLKS, NULL, // Use User32 procs sizeof(ULONG)*2, - (HICON)IDC_ARROW, + (HICON)OCR_NORMAL, (HBRUSH)(COLOR_BACKGROUND), FNID_DESKTOP, ICLS_DESKTOP @@ -47,7 +47,7 @@ CS_VREDRAW|CS_HREDRAW|CS_SAVEBITS, NULL, // Use User32 procs sizeof(LONG), - (HICON)IDC_ARROW, + (HICON)OCR_NORMAL, NULL, FNID_SWITCH, ICLS_SWITCH @@ -56,7 +56,7 @@ CS_DBLCLKS|CS_SAVEBITS, NULL, // Use User32 procs sizeof(LONG), - (HICON)IDC_ARROW, + (HICON)OCR_NORMAL, (HBRUSH)(COLOR_MENU + 1), FNID_MENU, ICLS_MENU @@ -65,7 +65,7 @@ CS_DBLCLKS|CS_VREDRAW|CS_HREDRAW|CS_PARENTDC, NULL, // Use User32 procs sizeof(SBWND)-sizeof(WND), - (HICON)IDC_ARROW, + (HICON)OCR_NORMAL, NULL, FNID_SCROLLBAR, ICLS_SCROLLBAR @@ -75,7 +75,7 @@ CS_PARENTDC|CS_DBLCLKS, NULL, // Use User32 procs 0, - (HICON)IDC_ARROW, + (HICON)OCR_NORMAL, 0, FNID_TOOLTIPS, ICLS_TOOLTIPS @@ -85,7 +85,7 @@ 0, NULL, // Use User32 procs 0, - (HICON)IDC_ARROW, + (HICON)OCR_NORMAL, 0, FNID_ICONTITLE, ICLS_ICONTITLE @@ -94,7 +94,7 @@ CS_GLOBALCLASS, NULL, // Use User32 procs 0, - (HICON)IDC_ARROW, + (HICON)OCR_NORMAL, NULL, FNID_MESSAGEWND, ICLS_HWNDMESSAGE @@ -2424,7 +2424,8 @@ wc.cbClsExtra = 0; wc.cbWndExtra = DefaultServerClasses[i].ExtraBytes; wc.hIcon = NULL; - wc.hCursor = DefaultServerClasses[i].hCursor; + //// System Cursors should be initilized!!! + wc.hCursor = DefaultServerClasses[i].hCursor == (HICON)OCR_NORMAL ? UserHMGetHandle(SYSTEMCUR(ARROW)) : NULL; hBrush = DefaultServerClasses[i].hBrush; if (hBrush <= (HBRUSH)COLOR_MENUBAR) { Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -1593,4 +1593,16 @@ return 0; } +/* + * @unimplemented + */ +BOOL +APIENTRY +NtUserSetSystemCursor( + HCURSOR hcur, + DWORD id) +{ + return FALSE; +} + /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.h [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -114,6 +114,43 @@ BOOL ScreenSaverRunning; } SYSTEM_CURSORINFO, *PSYSTEM_CURSORINFO; +typedef struct { + DWORD type; + PCURICON_OBJECT handle; +} SYSTEMCURICO; + +extern SYSTEMCURICO gasysico[]; +extern SYSTEMCURICO gasyscur[]; + +#define ROIC_SAMPLE 0 +#define ROIC_HAND 1 +#define ROIC_QUES 2 +#define ROIC_BANG 3 +#define ROIC_NOTE 4 +#define ROIC_WINLOGO 5 + +#define ROCR_ARROW 0 +#define ROCR_IBEAM 1 +#define ROCR_WAIT 2 +#define ROCR_CROSS 3 +#define ROCR_UP 4 +#define ROCR_SIZE 5 +#define ROCR_ICON 6 +#define ROCR_SIZENWSE 7 +#define ROCR_SIZENESW 8 +#define ROCR_SIZEWE 9 +#define ROCR_SIZENS 10 +#define ROCR_SIZEALL 11 +#define ROCR_NO 12 +#define ROCR_HAND 13 +#define ROCR_APPSTARTING 14 +#define ROCR_HELP 15 + +#define SYSTEMCUR(func) (gasyscur[ROCR_ ## func].handle) +#define SYSTEMICO(func) (gasysico[ROIC_ ## func].handle) + +VOID IntLoadSystenIcons(HICON,DWORD); + BOOL InitCursorImpl(VOID); HANDLE IntCreateCurIconHandle(BOOLEAN Anim); Modified: trunk/reactos/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -24,6 +24,42 @@ SYSTEM_CURSORINFO gSysCursorInfo; +PCURICON_OBJECT gcurFirst = NULL; // After all is done, this should be WINLOGO! + +// +// System Cursors +// +SYSTEMCURICO gasyscur[] = { + {OCR_NORMAL, NULL}, + {OCR_IBEAM, NULL}, + {OCR_WAIT, NULL}, + {OCR_CROSS, NULL}, + {OCR_UP, NULL}, + {OCR_ICON, NULL}, + {OCR_SIZE, NULL}, + {OCR_SIZENWSE, NULL}, + {OCR_SIZENESW, NULL}, + {OCR_SIZEWE, NULL}, + {OCR_SIZENS, NULL}, + {OCR_SIZEALL, NULL}, + {OCR_NO, NULL}, + {OCR_HAND, NULL}, + {OCR_APPSTARTING,NULL}, + {OCR_HELP, NULL}, + }; + +// +// System Icons +// +SYSTEMCURICO gasysico[] = { + {OIC_SAMPLE, NULL}, + {OIC_HAND, NULL}, + {OIC_QUES, NULL}, + {OIC_BANG, NULL}, + {OIC_NOTE, NULL}, + {OIC_WINLOGO,NULL}, + }; + BOOL InitCursorImpl(VOID) { @@ -37,6 +73,57 @@ gSysCursorInfo.ClickLockTime = 0; return TRUE; +} + +VOID +IntLoadSystenIcons(HICON hcur, DWORD id) +{ + PCURICON_OBJECT pcur; + int i; + PPROCESSINFO ppi; + + if (hcur) + { + pcur = UserGetCurIconObject(hcur); + if (!pcur) + { + EngSetLastError(ERROR_INVALID_CURSOR_HANDLE); + return; + } + + ppi = PsGetCurrentProcessWin32Process(); + + if (!(ppi->W32PF_flags & W32PF_CREATEDWINORDC)) + return; + + // Set Small Window Icon and do not link. + if ( id == OIC_WINLOGO+1 ) + { + pcur->CURSORF_flags |= CURSORF_GLOBAL; + UserReferenceObject(pcur); + pcur->head.ppi = NULL; + return; + } + + for(i = 0 ; i < 6; i++) + { + if (gasysico[i].type == id) + { + gasysico[i].handle = pcur; + pcur->CURSORF_flags |= CURSORF_GLOBAL|CURSORF_LINKED; + UserReferenceObject(pcur); + // + // The active switch between LR shared and Global public. + // This is hacked around to support this while at the initial system start up. + // + pcur->head.ppi = NULL; + // + pcur->pcurNext = gcurFirst; + gcurFirst = pcur; + return; + } + } + } } PSYSTEM_CURSORINFO @@ -183,6 +270,7 @@ ASSERT(CacheCurIcon != NULL); UserDereferenceObject(CurIcon); } + CurIcon->CURSORF_flags &= ~CURSORF_LINKED; } /* We just mark the handle as being destroyed. @@ -456,7 +544,7 @@ BOOL bRet = FALSE; TRACE("Enter NtUserGetIconSize\n"); - UserEnterExclusive(); + UserEnterShared(); if (!(CurIcon = UserGetCurIconObject(hCurIcon))) { @@ -515,7 +603,7 @@ DECLARE_RETURN(BOOL); TRACE("Enter NtUserGetCursorInfo\n"); - UserEnterExclusive(); + UserEnterShared(); CurInfo = IntGetSysCursorInfo(); CurIcon = (PCURICON_OBJECT)CurInfo->CurrentCursorObject; @@ -562,9 +650,13 @@ UserClipCursor( RECTL *prcl) { - /* FIXME: Check if process has WINSTA_WRITEATTRIBUTES */ PSYSTEM_CURSORINFO CurInfo; PWND DesktopWindow = NULL; + + if (!CheckWinstaAttributeAccess(WINSTA_WRITEATTRIBUTES)) + { + return FALSE; + } CurInfo = IntGetSysCursorInfo(); @@ -667,6 +759,14 @@ if (!bForce) { + /* Can not destroy global objects */ + if (CurIcon->head.ppi == NULL) + { + ERR("Trying to delete global cursor!\n"); + ret = TRUE; + goto leave; + } + /* Maybe we have good reasons not to destroy this object */ if (CurIcon->head.ppi != PsGetCurrentProcessWin32Process()) { @@ -750,7 +850,7 @@ goto done; } - UserEnterExclusive(); + UserEnterShared(); CurIcon = pProcInfo->pCursorCache; while(CurIcon) { @@ -770,7 +870,7 @@ CurIcon = CurIcon->pcurNext; continue; } - + if (IS_INTRESOURCE(CurIcon->strName.Buffer)) { if (CurIcon->strName.Buffer == ustrRsrcSafe.Buffer) @@ -787,6 +887,47 @@ } CurIcon = CurIcon->pcurNext; } + // + // Now search Global Cursors or Icons. + // + if(CurIcon == NULL) + { + CurIcon = gcurFirst; + while(CurIcon) + { + /* Icon/cursor */ + if (paramSafe.bIcon != is_icon(CurIcon)) + { + CurIcon = CurIcon->pcurNext; + continue; + } + /* See if module names match */ + if (atomModName == CurIcon->atomModName) + { + /* They do. Now see if this is the same resource */ + if (IS_INTRESOURCE(CurIcon->strName.Buffer) != IS_INTRESOURCE(ustrRsrcSafe.Buffer)) + { + /* One is an INT resource and the other is not -> no match */ + CurIcon = CurIcon->pcurNext; + continue; + } + if (IS_INTRESOURCE(CurIcon->strName.Buffer)) + { + if (CurIcon->strName.Buffer == ustrRsrcSafe.Buffer) + { + /* INT resources match */ + break; + } + } + else if (RtlCompareUnicodeString(&ustrRsrcSafe, &CurIcon->strName, TRUE) == 0) + { + /* Resource name strings match */ + break; + } + } + CurIcon = CurIcon->pcurNext; + } + } if(CurIcon) Ret = CurIcon->head.h; UserLeave(); @@ -807,14 +948,18 @@ NtUserGetClipCursor( RECTL *lpRect) { - /* FIXME: Check if process has WINSTA_READATTRIBUTES */ PSYSTEM_CURSORINFO CurInfo; RECTL Rect; NTSTATUS Status; DECLARE_RETURN(BOOL); TRACE("Enter NtUserGetClipCursor\n"); - UserEnterExclusive(); + UserEnterShared(); + + if (!CheckWinstaAttributeAccess(WINSTA_READATTRIBUTES)) + { + RETURN(FALSE); + } if (!lpRect) RETURN(FALSE); @@ -881,6 +1026,21 @@ if (pcurOld) { hOldCursor = pcurOld->head.h; + /* + Problem: + + System Global Cursors start out having at least 2 lock counts. If a system + cursor is the default cursor and is returned to the caller twice in its + life, the count will reach zero. Causing an assert to occur in objects. + + This fixes a SeaMonkey crash while the mouse crosses a boundary. + */ + if (pcurOld->CURSORF_flags & CURSORF_GLOBAL) + { + TRACE("Returning Global Cursor hcur %p\n",hOldCursor); + goto leave; + } + /* See if it was destroyed in the meantime */ if (UserObjectInDestroy(hOldCursor)) hOldCursor = NULL; @@ -1015,6 +1175,11 @@ if(CurIcon->CURSORF_flags & CURSORF_LRSHARED) { IsShared = TRUE; + } + + // Support global public cursors and icons too. + if(!IsAnim || IsShared) + { if(pustrRsrc && pustrModule) { UNICODE_STRING ustrModuleSafe; @@ -1054,12 +1219,13 @@ UserReferenceObject(CurIcon); CurIcon->pcurNext = ppi->pCursorCache; ppi->pCursorCache = CurIcon; + CurIcon->CURSORF_flags |= CURSORF_LINKED; } Ret = TRUE; done: - if(!Ret && IsShared) + if(!Ret && (!IsAnim || IsShared)) { if(!IS_INTRESOURCE(CurIcon->strName.Buffer)) ExFreePoolWithTag(CurIcon->strName.Buffer, TAG_STRING); @@ -1555,7 +1721,7 @@ NTSTATUS Status = STATUS_SUCCESS; TRACE("Enter NtUserGetCursorFrameInfo\n"); - UserEnterExclusive(); + UserEnterShared(); if (!(CurIcon = UserGetCurIconObject(hCursor))) { @@ -1607,4 +1773,66 @@ return ret; } +/* + * @implemented + */ +BOOL +APIENTRY +NtUserSetSystemCursor( + HCURSOR hcur, + DWORD id) +{ + PCURICON_OBJECT pcur, pcurOrig = NULL; + int i; + PPROCESSINFO ppi; + BOOL Ret = FALSE; + UserEnterExclusive(); + + if (!CheckWinstaAttributeAccess(WINSTA_WRITEATTRIBUTES)) + { + goto Exit; + } + + if (hcur) + { + pcur = UserGetCurIconObject(hcur); + if (!pcur) + { + EngSetLastError(ERROR_INVALID_CURSOR_HANDLE); + goto Exit; + } + + ppi = PsGetCurrentProcessWin32Process(); + + for(i = 0 ; i < 16; i++) + { + if (gasyscur[i].type == id) + { + pcurOrig = gasyscur[i].handle; + + if (pcurOrig) break; + + if (ppi->W32PF_flags & W32PF_CREATEDWINORDC) + { + gasyscur[i].handle = pcur; + pcur->CURSORF_flags |= CURSORF_GLOBAL|CURSORF_LINKED; + UserReferenceObject(pcur); + pcur->head.ppi = NULL; + pcur->pcurNext = gcurFirst; + gcurFirst = pcur; + Ret = TRUE; + } + break; + } + } + if (pcurOrig) + { + FIXME("Need to copy cursor data or do something! pcurOrig %p new pcur %p\n",pcurOrig,pcur); + } + } +Exit: + UserLeave(); + return Ret; +} + /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -754,7 +754,6 @@ return(Hook ? 1 : 0); // Don't call us again from user space. } -#if 0 // Keep it for later! PWND FASTCALL co_IntFindChildWindowToOwner(PWND Root, PWND Owner) { @@ -767,6 +766,12 @@ if(!OwnerWnd) continue; + if (!(Child->style & WS_POPUP) || + !(Child->style & WS_VISIBLE) || + /* Fixes CMD pop up properties window from having foreground. */ + Owner->head.pti->MessageQueue != Child->head.pti->MessageQueue) + continue; + if(OwnerWnd == Owner) { Ret = Child; @@ -775,7 +780,128 @@ } return NULL; } -#endif + +LRESULT +DefWndHandleSetCursor(PWND pWnd, WPARAM wParam, LPARAM lParam) +{ + PWND pwndPopUP = NULL; + WORD Msg = HIWORD(lParam); + + /* Not for child windows. */ + if (UserHMGetHandle(pWnd) != (HWND)wParam) + { + return FALSE; + } + + switch((short)LOWORD(lParam)) + { + case HTERROR: + { + //// This is the real fix for CORE-6129! This was a "Code Whole". + USER_REFERENCE_ENTRY Ref; + + if (Msg == WM_LBUTTONDOWN) + { + // Find a pop up window to bring active. + pwndPopUP = co_IntFindChildWindowToOwner(UserGetDesktopWindow(), pWnd); + if (pwndPopUP) + { + // Not a child pop up from desktop. + if ( pwndPopUP != UserGetDesktopWindow()->spwndChild ) + { + // Get original active window. + PWND pwndOrigActive = gpqForeground->spwndActive; + + co_WinPosSetWindowPos(pWnd, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + UserRefObjectCo(pwndPopUP, &Ref); + //UserSetActiveWindow(pwndPopUP); + co_IntSetForegroundWindow(pwndPopUP); // HACK + UserDerefObjectCo(pwndPopUP); + + // If the change was made, break out. + if (pwndOrigActive != gpqForeground->spwndActive) + break; + } + } + } + //// + if (Msg == WM_LBUTTONDOWN || Msg == WM_MBUTTONDOWN || + Msg == WM_RBUTTONDOWN || Msg == WM_XBUTTONDOWN) + { + if (pwndPopUP) + { + FLASHWINFO fwi = + {sizeof(FLASHWINFO), + UserHMGetHandle(pwndPopUP), + FLASHW_ALL, + gspv.dwForegroundFlashCount, + (gpsi->dtCaretBlink >> 3)}; + + // Now shake that window! + IntFlashWindowEx(pwndPopUP, &fwi); + } + UserPostMessage(hwndSAS, WM_LOGONNOTIFY, LN_MESSAGE_BEEP, 0); + } + break; + } + + case HTCLIENT: + { + if (pWnd->pcls->spcur) + { + UserSetCursor(pWnd->pcls->spcur, FALSE); + } + return FALSE; + } + + case HTLEFT: + case HTRIGHT: + { + if (pWnd->style & WS_MAXIMIZE) + { + break; + } + UserSetCursor(SYSTEMCUR(SIZEWE), FALSE); + return TRUE; + } + + case HTTOP: + case HTBOTTOM: + { + if (pWnd->style & WS_MAXIMIZE) + { + break; + } + UserSetCursor(SYSTEMCUR(SIZENS), FALSE); + return TRUE; + } + + case HTTOPLEFT: + case HTBOTTOMRIGHT: + { + if (pWnd->style & WS_MAXIMIZE) + { + break; + } + UserSetCursor(SYSTEMCUR(SIZENWSE), FALSE); + return TRUE; + } + + case HTBOTTOMLEFT: + case HTTOPRIGHT: + { + if (pWnd->style & WS_MAXIMIZE) + { + break; + } + UserSetCursor(SYSTEMCUR(SIZENESW), FALSE); + return TRUE; + } + } + UserSetCursor(SYSTEMCUR(ARROW), FALSE); + return FALSE; +} VOID FASTCALL DefWndPrint( PWND pwnd, HDC hdc, ULONG uFlags) { @@ -886,6 +1012,23 @@ case WM_CTLCOLOR: return (LRESULT) DefWndControlColor((HDC)wParam, HIWORD(lParam)); + + case WM_SETCURSOR: + { + if (Wnd->style & WS_CHILD) + { + /* with the exception of the border around a resizable wnd, + * give the parent first chance to set the cursor */ + if (LOWORD(lParam) < HTLEFT || LOWORD(lParam) > HTBOTTOMRIGHT) + { + PWND parent = Wnd->spwndParent;//IntGetParent( Wnd ); + if (parent != UserGetDesktopWindow() && + co_IntSendMessage( UserHMGetHandle(parent), WM_SETCURSOR, wParam, lParam)) + return TRUE; + } + } + return DefWndHandleSetCursor(Wnd, wParam, lParam); + } case WM_ACTIVATE: /* The default action in Windows is to set the keyboard focus to @@ -1094,12 +1237,11 @@ { PCURICON_OBJECT pIcon = NULL; HICON hIcon; - // First thing to do, init the Window Logo icons. - if (!gpsi->hIconSmWindows) co_IntSetWndIcons(); //FIXME: Some callers use this function as if it returns a boolean saying "this window has an icon". //FIXME: Hence we must return a pointer with no reference count. //FIXME: This is bad and we should feel bad. + //FIXME: Stop whining over wine code. hIcon = UserGetProp(pWnd, gpsi->atomIconSmProp); if (!hIcon) hIcon = UserGetProp(pWnd, gpsi->atomIconProp); Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: General input functions - * FILE: subsystems/win32/win32k/ntuser/input.c + * FILE: win32ss/user/ntuser/input.c * PROGRAMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Rafal Harabien (rafalh(a)reactos.org) */ @@ -450,6 +450,7 @@ { MSG msg; PATTACHINFO pai; + PCURICON_OBJECT CurIcon; /* Can not be the same thread. */ if (ptiFrom == ptiTo) return STATUS_INVALID_PARAMETER; @@ -497,7 +498,6 @@ ERR("ptiFrom is Foreground\n"); ptiTo->MessageQueue->spwndActive = ptiFrom->MessageQueue->spwndActive; ptiTo->MessageQueue->spwndFocus = ptiFrom->MessageQueue->spwndFocus; - ptiTo->MessageQueue->CursorObject = ptiFrom->MessageQueue->CursorObject; ptiTo->MessageQueue->spwndCapture = ptiFrom->MessageQueue->spwndCapture; ptiTo->MessageQueue->QF_flags ^= ((ptiTo->MessageQueue->QF_flags ^ ptiFrom->MessageQueue->QF_flags) & QF_CAPTURELOCKED); ptiTo->MessageQueue->CaretInfo = ptiFrom->MessageQueue->CaretInfo; @@ -510,9 +510,23 @@ ERR("ptiFrom NOT Foreground\n"); } + CurIcon = ptiFrom->MessageQueue->CursorObject; + MsqDestroyMessageQueue(ptiFrom); + if (CurIcon && UserObjectInDestroy(UserHMGetHandle(CurIcon))) + { + CurIcon = NULL; + } + ptiFrom->MessageQueue = ptiTo->MessageQueue; + + // Pass cursor From if To is null. Pass test_SetCursor parent_id == current pti ID. + if (CurIcon && ptiTo->MessageQueue->CursorObject == NULL) + { + ptiTo->MessageQueue->CursorObject = CurIcon; + UserReferenceObject(CurIcon); + } ptiFrom->MessageQueue->cThreads++; ERR("ptiTo S Share count %d\n", ptiFrom->MessageQueue->cThreads); @@ -603,14 +617,14 @@ BOOL Ret = FALSE; UserEnterExclusive(); - ERR("Enter NtUserAttachThreadInput %s\n",(fAttach ? "TRUE" : "FALSE" )); + TRACE("Enter NtUserAttachThreadInput %s\n",(fAttach ? "TRUE" : "FALSE" )); pti = IntTID2PTI((HANDLE)idAttach); ptiTo = IntTID2PTI((HANDLE)idAttachTo); if ( !pti || !ptiTo ) { - ERR("AttachThreadInput pti or ptiTo NULL.\n"); + TRACE("AttachThreadInput pti or ptiTo NULL.\n"); EngSetLastError(ERROR_INVALID_PARAMETER); goto Exit; } @@ -618,13 +632,13 @@ Status = UserAttachThreadInput( pti, ptiTo, fAttach); if (!NT_SUCCESS(Status)) { - ERR("AttachThreadInput Error Status 0x%x. \n",Status); + TRACE("AttachThreadInput Error Status 0x%x. \n",Status); EngSetLastError(RtlNtStatusToDosError(Status)); } else Ret = TRUE; Exit: - ERR("Leave NtUserAttachThreadInput, ret=%d\n",Ret); + TRACE("Leave NtUserAttachThreadInput, ret=%d\n",Ret); UserLeave(); return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -86,12 +86,6 @@ pti = PsGetCurrentThreadWin32Thread(); MessageQueue = pti->MessageQueue; - /* Get the screen DC */ - if(!(hdcScreen = IntGetScreenDC())) - { - return NULL; - } - OldCursor = MessageQueue->CursorObject; /* Check if cursors are different */ @@ -105,10 +99,22 @@ if (MessageQueue->iCursorLevel < 0) return OldCursor; + // Fixes the error message "Not the same cursor!". + if (gpqCursor == NULL) + { + gpqCursor = MessageQueue; + } + /* Update cursor if this message queue controls it */ pWnd = IntTopLevelWindowFromPoint(gpsi->ptCursor.x, gpsi->ptCursor.y); if (pWnd && pWnd->head.pti->MessageQueue == MessageQueue) { + /* Get the screen DC */ + if (!(hdcScreen = IntGetScreenDC())) + { + return NULL; + } + if (NewCursor) { /* Call GDI to set the new screen cursor */ @@ -681,7 +687,7 @@ } else GreMovePointer(hdcScreen, Msg->pt.x, Msg->pt.y); } - /* Check if w have to hide cursor */ + /* Check if we have to hide cursor */ else if (CurInfo->ShowingCursor >= 0) GreMovePointer(hdcScreen, -1, -1); @@ -1053,20 +1059,21 @@ ASSERT(ptirec->pcti); // Send must have a client side to receive it!!!! /* Don't send from or to a dying thread */ - if (pti->TIF_flags & TIF_INCLEANUP || ptirec->TIF_flags & TIF_INCLEANUP) - { - // Unless we are dying and need to tell our parents. - if (pti->TIF_flags & TIF_INCLEANUP && !(ptirec->TIF_flags & TIF_INCLEANUP)) - { + if (pti->TIF_flags & TIF_INCLEANUP || ptirec->TIF_flags & TIF_INCLEANUP) + { + // Unless we are dying and need to tell our parents. + if (pti->TIF_flags & TIF_INCLEANUP && !(ptirec->TIF_flags & TIF_INCLEANUP)) + { // Parent notify is the big one. Fire and forget! TRACE("Send message from dying thread %d\n",Msg); co_MsqSendMessageAsync(ptirec, Wnd, Msg, wParam, lParam, NULL, 0, FALSE, HookMessage); - } - if (uResult) *uResult = -1; - TRACE("MsqSM: Msg %d Current pti %lu or Rec pti %lu\n", Msg, pti->TIF_flags & TIF_INCLEANUP, ptirec->TIF_flags & TIF_INCLEANUP); - return STATUS_UNSUCCESSFUL; - } - + } + if (uResult) *uResult = -1; + TRACE("MsqSM: Msg %d Current pti %lu or Rec pti %lu\n", Msg, pti->TIF_flags & TIF_INCLEANUP, ptirec->TIF_flags & TIF_INCLEANUP); + return STATUS_UNSUCCESSFUL; + } + + // Should we do the same for No Wait? if ( HookMessage == MSQ_NORMAL ) { pWnd = ValidateHwndNoErr(Wnd); @@ -1511,6 +1518,8 @@ // Null window or not the same "Hardware" message queue. if (pwndMsg == NULL || pwndMsg->head.pti->MessageQueue != pti->MessageQueue) { + // Crossing a boundary, so set cursor. See default message queue cursor. + UserSetCursor(SYSTEMCUR(ARROW), FALSE); /* Remove and ignore the message */ *RemoveMessages = TRUE; return FALSE; @@ -2074,7 +2083,12 @@ InitializeListHead(&MessageQueue->HardwareMessagesListHead); // Keep here! MessageQueue->spwndFocus = NULL; MessageQueue->iCursorLevel = 0; - MessageQueue->CursorObject = NULL; + MessageQueue->CursorObject = SYSTEMCUR(WAIT); // See test_initial_cursor. + if (MessageQueue->CursorObject) + { + TRACE("Default cursor hcur %p\n",UserHMGetHandle(MessageQueue->CursorObject)); + UserReferenceObject(MessageQueue->CursorObject); + } RtlCopyMemory(MessageQueue->afKeyState, gafAsyncKeyState, sizeof(gafAsyncKeyState)); MessageQueue->ptiMouse = pti; MessageQueue->ptiKeyboard = pti; Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -1111,25 +1111,6 @@ return(0); } -/* - * NtUserSetWindowStationUser - * - * Status - * @unimplemented - */ - -DWORD APIENTRY -NtUserSetWindowStationUser( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - STUB - - return 0; -} - BOOL APIENTRY NtUserAddClipboardFormatListener( HWND hwnd ) @@ -1156,16 +1137,4 @@ return FALSE; } -/* - * @unimplemented - */ -BOOL -APIENTRY -NtUserSetSystemCursor( - HCURSOR hcur, - DWORD id) -{ - return FALSE; -} - /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -252,10 +252,14 @@ ACCESS_MASK amwinsta; DWORD dwHotkey; HMONITOR hMonitor; + UINT iClipSerialNumber; struct _CURICON_OBJECT* pCursorCache; + PVOID pClientBase; + DWORD dwLpkEntryPoints; + PVOID pW32Job; + DWORD dwImeCompatFlags; LUID luidSession; USERSTARTUPINFO usi; - PVOID pW32Job; DWORD dwLayout; DWORD dwRegisteredClasses; 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] Thu Feb 5 00:11:35 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Window stations - * FILE: subsystems/win32/win32k/ntuser/winsta.c + * FILE: win32ss/user/ntuser/winsta.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * TODO: The process window station is created on * the first USER32/GDI32 call not related @@ -295,7 +295,7 @@ co_IntLoadDefaultCursors(); /* Setup the icons */ - //co_IntSetWndIcons(); + co_IntSetWndIcons(); /* Show the desktop */ pdesk = IntGetActiveDesktop(); @@ -1437,7 +1437,7 @@ } BOOL APIENTRY -NEW_NtUserSetWindowStationUser( +NtUserSetWindowStationUser( HWINSTA hWindowStation, PLUID pluid, PSID psid, Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -580,13 +580,18 @@ { PSETWNDICONS_CALLBACK_ARGUMENTS Common = Arguments; - if (!hIconSmWindows) + if (!gpsi->hIconSmWindows) { - hIconSmWindows = LoadImageW(0, IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); - hIconWindows = LoadImageW(0, IDI_WINLOGO, IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + Common->hIconSample = LoadImageW(0, IDI_APPLICATION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + Common->hIconHand = LoadImageW(0, IDI_HAND, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + Common->hIconQuestion = LoadImageW(0, IDI_QUESTION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + Common->hIconBang = LoadImageW(0, IDI_EXCLAMATION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + Common->hIconNote = LoadImageW(0, IDI_ASTERISK, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + Common->hIconWindows = LoadImageW(0, IDI_WINLOGO, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + Common->hIconSmWindows = LoadImageW(0, IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0); + hIconWindows = Common->hIconWindows; + hIconSmWindows = Common->hIconSmWindows; } - Common->hIconSmWindows = hIconSmWindows; - Common->hIconWindows = hIconWindows; ERR("hIconSmWindows %p hIconWindows %p \n",hIconSmWindows,hIconWindows); return ZwCallbackReturn(Arguments, ArgumentLength, STATUS_SUCCESS); } Modified: trunk/reactos/win32ss/user/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/w… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/winsta.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll - * FILE: lib/user32/misc/winsta.c + * FILE: win32ss/user/user32/misc/winsta.c * PURPOSE: Window stations * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * UPDATE HISTORY: @@ -388,16 +388,16 @@ /* * @unimplemented */ -DWORD +BOOL WINAPI SetWindowStationUser( - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4 + HWINSTA hWindowStation, + PLUID pluid, + PSID psid, + DWORD size ) { - return NtUserSetWindowStationUser(Unknown1, Unknown2, Unknown3, Unknown4); + return NtUserSetWindowStationUser(hWindowStation, pluid, psid, size); } /* EOF */ Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS user32.dll * COPYRIGHT: GPL - See COPYING in the top level directory - * FILE: dll/win32/user32/windows/cursoricon.c + * FILE: win32ss/user//user32/windows/cursoricon.c * PURPOSE: cursor and icons implementation * PROGRAMMER: JÃ©rÃ´me Gardou (jerome.gardou(a)reactos.org) */ @@ -19,6 +19,30 @@ #define MAKEINTRESOURCE MAKEINTRESOURCEW /************* USER32 INTERNAL FUNCTIONS **********/ + +VOID LoadSystemCursors(VOID) +{ + if (!gpsi->hIconSmWindows) + { + ERR("Loading System Cursors\n"); + NtUserSetSystemCursor(LoadImageW( 0, IDC_ARROW, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_NORMAL); + NtUserSetSystemCursor(LoadImageW( 0, IDC_IBEAM, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_IBEAM); + NtUserSetSystemCursor(LoadImageW( 0, IDC_WAIT, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_WAIT); + NtUserSetSystemCursor(LoadImageW( 0, IDC_CROSS, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_CROSS); + NtUserSetSystemCursor(LoadImageW( 0, IDC_UPARROW, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_UP); + NtUserSetSystemCursor(LoadImageW( 0, IDC_ICON, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_ICON); + NtUserSetSystemCursor(LoadImageW( 0, IDC_SIZE, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_SIZE); + NtUserSetSystemCursor(LoadImageW( 0, IDC_SIZENWSE, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_SIZENWSE); + NtUserSetSystemCursor(LoadImageW( 0, IDC_SIZENESW, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_SIZENESW); + NtUserSetSystemCursor(LoadImageW( 0, IDC_SIZEWE, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_SIZEWE); + NtUserSetSystemCursor(LoadImageW( 0, IDC_SIZENS, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_SIZENS); + NtUserSetSystemCursor(LoadImageW( 0, IDC_SIZEALL, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_SIZEALL); + NtUserSetSystemCursor(LoadImageW( 0, IDC_NO, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_NO); + NtUserSetSystemCursor(LoadImageW( 0, IDC_HAND, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_HAND); + NtUserSetSystemCursor(LoadImageW( 0, IDC_APPSTARTING, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_APPSTARTING); + NtUserSetSystemCursor(LoadImageW( 0, IDC_HELP, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_HELP); + } +} /* This callback routine is called directly after switching to gui mode */ NTSTATUS @@ -28,6 +52,9 @@ { BOOL *DefaultCursor = (BOOL*)Arguments; HCURSOR hCursor; + + /* Load system cursors first */ + LoadSystemCursors(); if(*DefaultCursor) { @@ -1397,29 +1424,25 @@ BOOL bStatus; UNICODE_STRING ustrRsrc; UNICODE_STRING ustrModule = {0, 0, NULL}; - + /* Fix width/height */ if(fuLoad & LR_DEFAULTSIZE) { if(!cxDesired) cxDesired = GetSystemMetrics(bIcon ? SM_CXICON : SM_CXCURSOR); if(!cyDesired) cyDesired = GetSystemMetrics(bIcon ? SM_CYICON : SM_CYCURSOR); } - + if(fuLoad & LR_LOADFROMFILE) { return CURSORICON_LoadFromFileW(lpszName, cxDesired, cyDesired, fuLoad, bIcon); } - + /* Check if caller wants OEM icons */ if(!hinst) hinst = User32Instance; - - if(fuLoad & LR_SHARED) - { - DWORD size = MAX_PATH; - FINDEXISTINGCURICONPARAM param; - - TRACE("Checking for an LR_SHARED cursor/icon.\n"); + + if(lpszName) + { /* Prepare the resource name string */ if(IS_INTRESOURCE(lpszName)) { @@ -1429,7 +1452,11 @@ } else RtlInitUnicodeString(&ustrRsrc, lpszName); - + } + + if(hinst) + { + DWORD size = MAX_PATH; /* Get the module name string */ while (TRUE) { @@ -1460,7 +1487,13 @@ ustrModule.MaximumLength = size * sizeof(WCHAR); break; } - + } + + if(fuLoad & LR_SHARED) + { + FINDEXISTINGCURICONPARAM param; + + TRACE("Checking for an LR_SHARED cursor/icon.\n"); /* Ask win32k */ param.bIcon = bIcon; param.cx = cxDesired; @@ -1469,7 +1502,7 @@ if(hCurIcon) { /* Woohoo, got it! */ - TRACE("MATCH!\n"); + TRACE("MATCH! %p\n",hCurIcon); HeapFree(GetProcessHeap(), 0, ustrModule.Buffer); return hCurIcon; } @@ -1484,18 +1517,18 @@ /* We let FindResource, LoadResource, etc. call SetLastError */ if(!hrsrc) goto done; - + handle = LoadResource(hinst, hrsrc); if(!handle) goto done; - + dir = LockResource(handle); if(!dir) goto done; - + wResId = LookupIconIdFromDirectoryEx((PBYTE)dir, bIcon, cxDesired, cyDesired, fuLoad); FreeResource(handle); - + /* Get the relevant resource pointer */ hrsrc = FindResourceW( hinst, @@ -1503,11 +1536,11 @@ bIcon ? RT_ICON : RT_CURSOR); if(!hrsrc) goto done; - + handle = LoadResource(hinst, hrsrc); if(!handle) goto done; - + bits = LockResource(handle); if(!bits) { @@ -1531,32 +1564,31 @@ cursorData.cx = cxDesired; cursorData.cy = cyDesired; cursorData.rt = (USHORT)((ULONG_PTR)(bIcon ? RT_ICON : RT_CURSOR)); - + /* Get the bitmaps */ bStatus = CURSORICON_GetCursorDataFromBMI( &cursorData, (BITMAPINFO*)bits); - + FreeResource( handle ); - + if(!bStatus) goto done; - + /* Create the handle */ hCurIcon = NtUserxCreateEmptyCurObject(FALSE); if(!hCurIcon) { goto end_error; } - + + if(fuLoad & LR_SHARED) + { + cursorData.CURSORF_flags |= CURSORF_LRSHARED; + } + /* Tell win32k */ - if(fuLoad & LR_SHARED) - { - cursorData.CURSORF_flags |= CURSORF_LRSHARED; - bStatus = NtUserSetCursorIconData(hCurIcon, &ustrModule, &ustrRsrc, &cursorData); - } - else - bStatus = NtUserSetCursorIconData(hCurIcon, NULL, NULL, &cursorData); + bStatus = NtUserSetCursorIconData(hCurIcon, hinst ? &ustrModule : NULL, lpszName ? &ustrRsrc : NULL, &cursorData); if(!bStatus) { @@ -1575,7 +1607,7 @@ DeleteObject(cursorData.hbmMask); if(cursorData.hbmColor) DeleteObject(cursorData.hbmColor); if(cursorData.hbmAlpha) DeleteObject(cursorData.hbmAlpha); - + return NULL; } @@ -2580,8 +2612,15 @@ _In_ DWORD id ) { - UNIMPLEMENTED; - return FALSE; + if (hcur == NULL) + { + hcur = LoadImageW( 0, MAKEINTRESOURCE(id), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ); + if (hcur == NULL) + { + return FALSE; + } + } + return NtUserSetSystemCursor(hcur,id); } BOOL WINAPI SetCursorPos( Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll - * FILE: dll/win32/user32/windows/defwnd.c + * FILE: win32ss/user/user32/windows/defwnd.c * PURPOSE: Window management * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * UPDATE HISTORY: @@ -181,109 +181,6 @@ } ERR("IDCWTO Nothing found\n"); return NULL; -} - -LRESULT -DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam, ULONG Style) -{ - /* Not for child windows. */ - if (hWnd != (HWND)wParam) - { - return 0; - } - - switch((short)LOWORD(lParam)) - { - case HTERROR: - { - //// This is the real fix for CORE-6129! - HWND hwndPopUP; - WORD Msg = HIWORD(lParam); - - if (Msg == WM_LBUTTONDOWN) - { - // Find a pop up window to bring active. - hwndPopUP = IntFindChildWindowToOwner(GetDesktopWindow(), hWnd); - if (hwndPopUP) - { - // Not a child pop up from desktop. - if ( hwndPopUP != GetWindow(GetDesktopWindow(), GW_CHILD) ) - { - // Get original active window. - HWND hwndOrigActive = GetActiveWindow(); - - SetWindowPos(hWnd, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); - - //SetActiveWindow(hwndPopUP); - SetForegroundWindow(hwndPopUP); // HACK - - // If the change was made, break out. - if (hwndOrigActive != GetActiveWindow()) - break; - } - } - } - //// - if (Msg == WM_LBUTTONDOWN || Msg == WM_MBUTTONDOWN || - Msg == WM_RBUTTONDOWN || Msg == WM_XBUTTONDOWN) - { - ERR("Beep!\n"); - MessageBeep(0); - } - break; - } - - case HTCLIENT: - { - HICON hCursor = (HICON)GetClassLongPtrW(hWnd, GCL_HCURSOR); - if (hCursor) - { - SetCursor(hCursor); - return TRUE; - } - return FALSE; - } - - case HTLEFT: - case HTRIGHT: - { - if (Style & WS_MAXIMIZE) - { - break; - } - return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZEWE))); - } - - case HTTOP: - case HTBOTTOM: - { - if (Style & WS_MAXIMIZE) - { - break; - } - return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENS))); - } - - case HTTOPLEFT: - case HTBOTTOMRIGHT: - { - if (Style & WS_MAXIMIZE) - { - break; - } - return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENWSE))); - } - case HTBOTTOMLEFT: - case HTTOPRIGHT: - { - if (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_MAXIMIZE) - { - break; - } - return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENESW))); - } - } - return((LRESULT)SetCursor(LoadCursorW(0, IDC_ARROW))); } /*********************************************************************** @@ -893,34 +790,6 @@ case WM_CTLCOLOR: return (LRESULT) DefWndControlColor((HDC)wParam, HIWORD(lParam)); - - case WM_SETCURSOR: - { - LONG_PTR Style = GetWindowLongPtrW(hWnd, GWL_STYLE); - - if (Style & WS_CHILD) - { - /* with the exception of the border around a resizable wnd, - * give the parent first chance to set the cursor */ - if (LOWORD(lParam) < HTLEFT || LOWORD(lParam) > HTBOTTOMRIGHT) - { - HWND parent = GetParent( hWnd ); - if (bUnicode) - { - if (parent != GetDesktopWindow() && - SendMessageW( parent, WM_SETCURSOR, wParam, lParam)) - return TRUE; - } - else - { - if (parent != GetDesktopWindow() && - SendMessageA( parent, WM_SETCURSOR, wParam, lParam)) - return TRUE; - } - } - } - return (DefWndHandleSetCursor(hWnd, wParam, lParam, Style)); - } case WM_SYSCOMMAND: return (DefWndHandleSysCommand(hWnd, wParam, lParam));

1 0

[hbelusca] 66165: [SPEC2DEF] - Warn about symbols that should be private. Patch by Thomas Faber. CORE-8445 #resolve #comment Committed in revision 66165. It's also nice/useful to get the warnings e...
by hbelusca＠svn.reactos.org 04 Feb '15

04 Feb '15

Author: hbelusca Date: Wed Feb 4 23:56:23 2015 New Revision: 66165 URL: http://svn.reactos.org/svn/reactos?rev=66165&view=rev Log: [SPEC2DEF] - Warn about symbols that should be private. Patch by Thomas Faber. CORE-8445 #resolve #comment Committed in revision 66165. It's also nice/useful to get the warnings even if we are not generating an import lib (example when building rsaenh): MSVC warns also in this case. - Improve error messages. - some_ptr = 0; ---> use NULL instead. - remove useless extra parentheses. Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Wed Feb 4 23:56:23 2015 @@ -6,6 +6,8 @@ #ifdef _MSC_VER #define strcasecmp _stricmp #endif + +#define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0])) typedef struct _STRING { @@ -38,11 +40,13 @@ typedef int (*PFNOUTLINE)(FILE *, EXPORT *); int gbMSComp = 0; int gbImportLib = 0; +int gbNotPrivateNoWarn = 0; int gbTracing = 0; int giArch = ARCH_X86; char *pszArchString = "i386"; char *pszArchString2; -char *pszDllName = 0; +char *pszSourceFileName = NULL; +char *pszDllName = NULL; char *gpszUnderscore = ""; int gbDebug; #define DbgPrint(...) (!gbDebug || fprintf(stderr, __VA_ARGS__)) @@ -80,13 +84,32 @@ ARG_FLOAT }; -char* astrCallingConventions[] = +const char* astrCallingConventions[] = { "STDCALL", "CDECL", "FASTCALL", "THISCALL", "EXTERN" +}; + +static const char* astrShouldBePrivate[] = +{ + "DllCanUnloadNow", + "DllGetClassObject", + "DllGetClassFactoryFromClassString", + "DllGetDocumentation", + "DllInitialize", + "DllInstall", + "DllRegisterServer", + "DllRegisterServerEx", + "DllRegisterServerExW", + "DllUnload", + "DllUnregisterServer", + "RasCustomDeleteEntryNotify", + "RasCustomDial", + "RasCustomDialDlg", + "RasCustomEntryDlg", }; static @@ -284,7 +307,7 @@ fprintf(file, "\tint retval;\n"); } fprintf(file, "\tif (TRACE_ON(relay))\n\t\tDPRINTF(\"%s: %.*s(", - pszDllName, pexp->strName.len, pexp->strName.buf); + pszDllName, pexp->strName.len, pexp->strName.buf); } for (i = 0; i < pexp->nArgCount; i++) @@ -352,12 +375,12 @@ if (pexp->uFlags & FL_RET64) { fprintf(file, "\tif (TRACE_ON(relay))\n\t\tDPRINTF(\"%s: %.*s: retval = %%\"PRIx64\"\\n\", retval);\n", - pszDllName, pexp->strName.len, pexp->strName.buf); + pszDllName, pexp->strName.len, pexp->strName.buf); } else { fprintf(file, "\tif (TRACE_ON(relay))\n\t\tDPRINTF(\"%s: %.*s: retval = 0x%%lx\\n\", retval);\n", - pszDllName, pexp->strName.len, pexp->strName.buf); + pszDllName, pexp->strName.len, pexp->strName.buf); } fprintf(file, "\treturn retval;\n}\n\n"); } @@ -380,8 +403,7 @@ } else if (giArch == ARCH_ARM) { - fprintf(file, - " AREA |.text|,ALIGN=2,CODE,READONLY\n\n"); + fprintf(file, " AREA |.text|,ALIGN=2,CODE,READONLY\n\n"); } } @@ -689,6 +711,7 @@ EXPORT exp; int included; char namebuffer[16]; + unsigned int i; //fprintf(stderr, "info: line %d, pcStart:'%.30s'\n", nLine, pcStart); @@ -703,7 +726,6 @@ exp.uFlags = 0; exp.nNumber++; - //if (!strncmp(pcLine, "22 stdcall @(long) MPR_Alloc",28)) // gbDebug = 1; @@ -734,7 +756,7 @@ /* Go to next token (type) */ if (!(pc = NextToken(pc))) { - fprintf(stderr, "error: line %d, unexpected end of line\n", nLine); + fprintf(stderr, "%s line %d : error: unexpected end of line\n", pszSourceFileName, nLine); return -10; } @@ -768,8 +790,8 @@ } else { - fprintf(stderr, "error: line %d, expected callconv, got '%.*s' %d\n", - nLine, TokenLength(pc), pc, *pc); + fprintf(stderr, "%s line %d : error: expected callconv, got '%.*s' %d\n", + pszSourceFileName, nLine, TokenLength(pc), pc, *pc); return -11; } @@ -879,14 +901,14 @@ /* Go to next token */ if (!(pc = NextToken(pc))) { - fprintf(stderr, "error: line %d, expected token\n", nLine); + fprintf(stderr, "%s line %d : error: expected token\n", pszSourceFileName, nLine); return -13; } /* Verify syntax */ if (*pc++ != '(') { - fprintf(stderr, "error: line %d, expected '('\n", nLine); + fprintf(stderr, "%s line %d : error: expected '('\n", pszSourceFileName, nLine); return -14; } @@ -937,7 +959,7 @@ exp.anArgs[exp.nArgCount] = ARG_FLOAT; } else - fprintf(stderr, "error: line %d, expected type, got: %.10s\n", nLine, pc); + fprintf(stderr, "%s line %d : error: expected type, got: %.10s\n", pszSourceFileName, nLine, pc); exp.nArgCount++; @@ -952,7 +974,7 @@ /* Check syntax */ if (*pc++ != ')') { - fprintf(stderr, "error: line %d, expected ')'\n", nLine); + fprintf(stderr, "%s line %d : error: expected ')'\n", pszSourceFileName, nLine); return -16; } } @@ -978,7 +1000,7 @@ exp.strName.len = (int)(p - pc); if (exp.strName.len < 1) { - fprintf(stderr, "error, @ in line %d\n", nLine); + fprintf(stderr, "%s line %d : error: unexpected @ found\n", pszSourceFileName, nLine); return -1; } exp.nStackBytes = atoi(p + 1); @@ -1001,7 +1023,7 @@ /* Check syntax (end of line) */ if (NextToken(pc)) { - fprintf(stderr, "error: line %d, additional tokens after ')'\n", nLine); + fprintf(stderr, "%s line %d : error: additional tokens after ')'\n", pszSourceFileName, nLine); return -17; } @@ -1010,15 +1032,28 @@ } else { - exp.strTarget.buf = 0; + exp.strTarget.buf = NULL; exp.strTarget.len = 0; } /* Check for no-name without ordinal */ if ((exp.uFlags & FL_ORDINAL) && (exp.nOrdinal == -1)) { - fprintf(stderr, "error: line %d, ordinal export without ordinal!\n", nLine); + fprintf(stderr, "%s line %d : error: ordinal export without ordinal!\n", pszSourceFileName, nLine); return -1; + } + + if (!gbNotPrivateNoWarn && !(exp.uFlags & FL_PRIVATE)) + { + for (i = 0; i < ARRAYSIZE(astrShouldBePrivate); i++) + { + if (strlen(astrShouldBePrivate[i]) == exp.strName.len && + strncmp(exp.strName.buf, astrShouldBePrivate[i], exp.strName.len) == 0) + { + fprintf(stderr, "%s line %d : warning: export of '%.*s' should be PRIVATE\n", + pszSourceFileName, nLine, exp.strName.len, exp.strName.buf); + } + } } OutputLine(fileDest, &exp); @@ -1028,26 +1063,26 @@ return 0; } - void usage(void) { printf("syntax: spec2def [<options> ...] <spec file>\n" "Possible options:\n" - " -h --help prints this screen\n" - " -l=<file> generates an asm lib stub\n" - " -d=<file> generates a def file\n" - " -s=<file> generates a stub file\n" - " --ms msvc compatibility\n" - " -n=<name> name of the dll\n" - " --implib generate a def file for an import library\n" - " -a=<arch> Set architecture to <arch>. (i386, x86_64, arm)\n" - " --with-tracing generates wine-like \"+relay\" trace trampolines. (necessitates -s)\n"); + " -h --help print this help screen\n" + " -l=<file> generate an asm lib stub\n" + " -d=<file> generate a def file\n" + " -s=<file> generate a stub file\n" + " --ms MSVC compatibility\n" + " -n=<name> name of the dll\n" + " --implib generate a def file for an import library\n" + " --no-private-warnings suppress warnings about symbols that should be -private\n" + " -a=<arch> set architecture to <arch> (i386, x86_64, arm)\n" + " --with-tracing generate wine-like \"+relay\" trace trampolines (needs -s)\n"); } int main(int argc, char *argv[]) { size_t nFileSize; - char *pszSource, *pszDefFileName = 0, *pszStubFileName = 0, *pszLibStubName = 0; + char *pszSource, *pszDefFileName = NULL, *pszStubFileName = NULL, *pszLibStubName = NULL; char achDllName[40]; FILE *file; int result = 0, i; @@ -1083,15 +1118,19 @@ { pszDllName = argv[i] + 3; } - else if ((strcasecmp(argv[i], "--implib") == 0)) + else if (strcasecmp(argv[i], "--implib") == 0) { gbImportLib = 1; } - else if ((strcasecmp(argv[i], "--ms") == 0)) + else if (strcasecmp(argv[i], "--ms") == 0) { gbMSComp = 1; } - else if ((strcasecmp(argv[i], "--with-tracing") == 0)) + else if (strcasecmp(argv[i], "--no-private-warnings") == 0) + { + gbNotPrivateNoWarn = 1; + } + else if (strcasecmp(argv[i], "--with-tracing") == 0) { if (!pszStubFileName) { @@ -1152,11 +1191,12 @@ pszDllName = achDllName; } - /* Open input file argv[1] */ - file = fopen(argv[i], "r"); + /* Open input file */ + pszSourceFileName = argv[i]; + file = fopen(pszSourceFileName, "r"); if (!file) { - fprintf(stderr, "error: could not open file %s ", argv[i]); + fprintf(stderr, "error: could not open file %s\n", pszSourceFileName); return -3; } @@ -1186,7 +1226,7 @@ file = fopen(pszDefFileName, "w"); if (!file) { - fprintf(stderr, "error: could not open output file %s ", argv[i + 1]); + fprintf(stderr, "error: could not open output file %s\n", argv[i + 1]); return -5; } @@ -1201,7 +1241,7 @@ file = fopen(pszStubFileName, "w"); if (!file) { - fprintf(stderr, "error: could not open output file %s ", argv[i + 1]); + fprintf(stderr, "error: could not open output file %s\n", argv[i + 1]); return -5; } @@ -1216,7 +1256,7 @@ file = fopen(pszLibStubName, "w"); if (!file) { - fprintf(stderr, "error: could not open output file %s ", argv[i + 1]); + fprintf(stderr, "error: could not open output file %s\n", argv[i + 1]); return -5; } @@ -1226,6 +1266,5 @@ fclose(file); } - return result; }

1 0

[jimtabor] 66164: [NtUser] - Add object handle information and set station user support.
by jimtabor＠svn.reactos.org 04 Feb '15

04 Feb '15

Author: jimtabor Date: Wed Feb 4 21:59:15 2015 New Revision: 66164 URL: http://svn.reactos.org/svn/reactos?rev=66164&view=rev Log: [NtUser] - Add object handle information and set station user support. Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/winsta.c trunk/reactos/win32ss/user/ntuser/winsta.h Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Wed Feb 4 21:59:15 2015 @@ -25,7 +25,7 @@ NTSTATUS Status; hWinSta = UserGetProcessWindowStation(); - Status = IntValidateWindowStationHandle(hWinSta, KernelMode, WINSTA_ACCESSCLIPBOARD, &pWinStaObj); + Status = IntValidateWindowStationHandle(hWinSta, KernelMode, WINSTA_ACCESSCLIPBOARD, &pWinStaObj, 0); if (!NT_SUCCESS(Status)) { ERR("Cannot open winsta\n"); Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Wed Feb 4 21:59:15 2015 @@ -1516,7 +1516,8 @@ Status = IntValidateWindowStationHandle( PsGetCurrentProcess()->Win32WindowStation, KernelMode, 0, - &WinStaObj); + &WinStaObj, + 0); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Wed Feb 4 21:59:15 2015 @@ -1407,7 +1407,8 @@ Status = IntValidateWindowStationHandle(CurrentProcess->Win32WindowStation, KernelMode, 0, - &WinStaObject); + &WinStaObject, + 0); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Wed Feb 4 21:59:15 2015 @@ -113,7 +113,6 @@ HBITMAP hPattern55AABitmap = NULL; NTSTATUS Status; -// Set W32PF_Flags |= (W32PF_READSCREENACCESSGRANTED | W32PF_IOWINSTA) // Create Event for Diconnect Desktop. Status = UserCreateWinstaDirectory(); Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Wed Feb 4 21:59:15 2015 @@ -3399,7 +3399,8 @@ NTSTATUS Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, KernelMode, 0, - &WinStaObject); + &WinStaObject, + 0); if (!NT_SUCCESS(Status)) { @@ -3448,7 +3449,8 @@ Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, KernelMode, 0, - &WinStaObject); + &WinStaObject, + 0); if (!NT_SUCCESS(Status)) { 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] Wed Feb 4 21:59:15 2015 @@ -104,6 +104,8 @@ PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)DeleteParameters->Object; TRACE("Deleting window station (0x%p)\n", WinSta); + + WinSta->Flags |= WSS_DYING; UserEmptyClipboardData(WinSta); @@ -214,7 +216,8 @@ HWINSTA WindowStation, KPROCESSOR_MODE AccessMode, ACCESS_MASK DesiredAccess, - PWINSTATION_OBJECT *Object) + PWINSTATION_OBJECT *Object, + POBJECT_HANDLE_INFORMATION pObjectHandleInfo) { NTSTATUS Status; @@ -231,7 +234,7 @@ ExWindowStationObjectType, AccessMode, (PVOID*)Object, - NULL); + pObjectHandleInfo); if (!NT_SUCCESS(Status)) SetLastNtError(Status); @@ -291,6 +294,9 @@ /* Setup the cursor */ co_IntLoadDefaultCursors(); + /* Setup the icons */ + //co_IntSetWndIcons(); + /* Show the desktop */ pdesk = IntGetActiveDesktop(); ASSERT(pdesk); @@ -317,6 +323,29 @@ { return ScreenDeviceContext; } + +BOOL FASTCALL +CheckWinstaAttributeAccess(ACCESS_MASK DesiredAccess) +{ + PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); + if ( gpidLogon != PsGetCurrentProcessId() ) + { + if (!(ppi->W32PF_flags & W32PF_IOWINSTA)) + { + ERR("Requires Interactive Window Station\n"); + EngSetLastError(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); + return FALSE; + } + if (!RtlAreAllAccessesGranted(ppi->amwinsta, DesiredAccess)) + { + ERR("Access Denied\n"); + EngSetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + } + return TRUE; +} + /* PUBLIC FUNCTIONS ***********************************************************/ @@ -458,10 +487,16 @@ if (InputWindowStation == NULL) { - TRACE("Initializeing input window station\n"); + ERR("Initializeing input window station\n"); InputWindowStation = WindowStationObject; + WindowStationObject->Flags &= ~WSS_NOIO; + InitCursorImpl(); + } + else + { + WindowStationObject->Flags |= WSS_NOIO; } TRACE("NtUserCreateWindowStation created object %p with name %wZ handle %p\n", @@ -563,7 +598,8 @@ hWinSta, KernelMode, 0, - &Object); + &Object, + 0); if (!NT_SUCCESS(Status)) { @@ -852,6 +888,7 @@ PPROCESSINFO ppi; NTSTATUS Status; HWINSTA hwinstaOld; + OBJECT_HANDLE_INFORMATION ObjectHandleInfo; PWINSTATION_OBJECT NewWinSta = NULL, OldWinSta; ppi = PsGetCurrentProcessWin32Process(); @@ -862,7 +899,8 @@ Status = IntValidateWindowStationHandle( hWindowStation, KernelMode, 0, - &NewWinSta); + &NewWinSta, + &ObjectHandleInfo); if (!NT_SUCCESS(Status)) { TRACE("Validation of window station handle (%p) failed\n", @@ -895,7 +933,26 @@ ppi->prpwinsta = NewWinSta; ppi->hwinsta = hWindowStation; - + ppi->amwinsta = ObjectHandleInfo.GrantedAccess; + ERR("WS : Granted Access %p\n",ppi->amwinsta); + + if (RtlAreAllAccessesGranted(ppi->amwinsta, WINSTA_READSCREEN)) + { + ppi->W32PF_flags |= W32PF_READSCREENACCESSGRANTED; + } + else + { + ppi->W32PF_flags &= ~W32PF_READSCREENACCESSGRANTED; + } + + if (NewWinSta && !(NewWinSta->Flags & WSS_NOIO) ) + { + ppi->W32PF_flags |= W32PF_IOWINSTA; + } + else // Might be closed if the handle is null. + { + ppi->W32PF_flags &= ~W32PF_IOWINSTA; + } return TRUE; } @@ -958,7 +1015,8 @@ hWindowStation, KernelMode, 0, - &Object); + &Object, + 0); if (!NT_SUCCESS(Status)) { TRACE("Validation of window station handle (%p) failed\n", @@ -1003,7 +1061,8 @@ hWindowStation, KernelMode, 0, - &Object); + &Object, + 0); if (!NT_SUCCESS(Status)) { TRACE("Validation of window station handle (%p) failed\n", @@ -1212,7 +1271,8 @@ Status = IntValidateWindowStationHandle(hWindowStation, KernelMode, 0, - &WindowStation); + &WindowStation, + 0); if (! NT_SUCCESS(Status)) { return Status; @@ -1376,4 +1436,75 @@ return ret; } +BOOL APIENTRY +NEW_NtUserSetWindowStationUser( + HWINSTA hWindowStation, + PLUID pluid, + PSID psid, + DWORD size) +{ + NTSTATUS Status; + PWINSTATION_OBJECT WindowStation = NULL; + BOOL Ret = FALSE; + + UserEnterExclusive(); + + if (gpidLogon != PsGetCurrentProcessId()) + { + EngSetLastError(ERROR_ACCESS_DENIED); + goto Leave; + } + + Status = IntValidateWindowStationHandle(hWindowStation, + KernelMode, + 0, + &WindowStation, + 0); + if (!NT_SUCCESS(Status)) + { + goto Leave; + } + + if (WindowStation->psidUser) + { + ExFreePoolWithTag(WindowStation->psidUser, USERTAG_SECURITY); + } + + WindowStation->psidUser = ExAllocatePoolWithTag(PagedPool, size, USERTAG_SECURITY); + if (WindowStation->psidUser == NULL) + { + EngSetLastError(ERROR_OUTOFMEMORY); + goto Leave; + } + + _SEH2_TRY + { + ProbeForRead( psid, size, 1); + ProbeForRead( pluid, sizeof(LUID), 1); + + RtlCopyMemory(WindowStation->psidUser, psid, size); + WindowStation->luidUser = *pluid; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(WindowStation->psidUser, 0); + WindowStation->psidUser = 0; + goto Leave; + } + + Ret = TRUE; + +Leave: + if (WindowStation) ObDereferenceObject(WindowStation); + UserLeave(); + return Ret; +} + + /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.h [iso-8859-1] Wed Feb 4 21:59:15 2015 @@ -4,8 +4,12 @@ #define SESSION_DIR L"\\Sessions" /* Window Station Status Flags */ -#define WSS_LOCKED (1) -#define WSS_NOINTERACTIVE (2) +#define WSS_LOCKED (1) +#define WSS_NOINTERACTIVE (2) +#define WSS_NOIO (4) +#define WSS_SHUTDOWN (8) +#define WSS_DYING (16) +#define WSS_REALSHUTDOWN (32) typedef struct _WINSTATION_OBJECT { @@ -31,6 +35,11 @@ INT iClipSequenceNumber; INT fClipboardChanged : 1; INT fInDelayedRendering : 1; + + PWND spwndClipboardListener; + LUID luidEndSession; + LUID luidUser; + PVOID psidUser; } WINSTATION_OBJECT, *PWINSTATION_OBJECT; @@ -95,10 +104,12 @@ HWINSTA WindowStation, KPROCESSOR_MODE AccessMode, ACCESS_MASK DesiredAccess, - PWINSTATION_OBJECT *Object); + PWINSTATION_OBJECT *Object, + POBJECT_HANDLE_INFORMATION pObjectHandleInfo); BOOL FASTCALL UserSetProcessWindowStation(HWINSTA hWindowStation); BOOL FASTCALL co_IntInitializeDesktopGraphics(VOID); VOID FASTCALL IntEndDesktopGraphics(VOID); +BOOL FASTCALL CheckWinstaAttributeAccess(ACCESS_MASK); /* EOF */

1 0

[hbelusca] 66163: [MSPAINT]: Improve help menu name in some languages. Patch by Jared. CORE-9087 #resolve #comment Fixed, thanks!
by hbelusca＠svn.reactos.org 04 Feb '15

04 Feb '15

Author: hbelusca Date: Wed Feb 4 21:34:22 2015 New Revision: 66163 URL: http://svn.reactos.org/svn/reactos?rev=66163&view=rev Log: [MSPAINT]: Improve help menu name in some languages. Patch by Jared. CORE-9087 #resolve #comment Fixed, thanks! Modified: trunk/reactos/base/applications/mspaint/lang/bg-BG.rc trunk/reactos/base/applications/mspaint/lang/de-DE.rc trunk/reactos/base/applications/mspaint/lang/en-GB.rc trunk/reactos/base/applications/mspaint/lang/en-US.rc trunk/reactos/base/applications/mspaint/lang/fr-FR.rc trunk/reactos/base/applications/mspaint/lang/he-IL.rc trunk/reactos/base/applications/mspaint/lang/hu-HU.rc trunk/reactos/base/applications/mspaint/lang/it-IT.rc trunk/reactos/base/applications/mspaint/lang/ja-JP.rc trunk/reactos/base/applications/mspaint/lang/nl-NL.rc trunk/reactos/base/applications/mspaint/lang/no-NO.rc trunk/reactos/base/applications/mspaint/lang/pl-PL.rc trunk/reactos/base/applications/mspaint/lang/pt-BR.rc trunk/reactos/base/applications/mspaint/lang/ro-RO.rc trunk/reactos/base/applications/mspaint/lang/sq-AL.rc Modified: trunk/reactos/base/applications/mspaint/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/bg-BG.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&ÐÐ¾Ð¼Ð¾Ñ" BEGIN MENUITEM "ÐÐ¾Ð¼Ð¾Ñ", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/de-DE.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Moderne Palette", IDM_COLORSMODERNPALETTE MENUITEM "Alte Palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Hilfe" BEGIN MENUITEM "Hilfethemen", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/en-GB.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Help" BEGIN MENUITEM "&Help topics", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/en-US.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Help" BEGIN MENUITEM "&Help topics", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/fr-FR.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -72,7 +72,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Aide" BEGIN MENUITEM "Rubriques d'aide", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/he-IL.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -72,7 +72,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&×¢××¨×" BEGIN MENUITEM "× ××©×× ×¢××¨×", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/hu-HU.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -72,7 +72,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&SegÃtsÃ©g" BEGIN MENUITEM "TÃ©makÃ¶rÃ¶k", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/it-IT.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Aiuto" BEGIN MENUITEM "Guida in linea", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ja-JP.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Help" BEGIN MENUITEM "ãã«ã ãããã¯(&H)", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/nl-NL.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Helpen" BEGIN MENUITEM "Help-onderwerpen", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/no-NO.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&Hjelp?" + POPUP "&Hjelp" BEGIN MENUITEM "Emner i hjelp", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/pl-PL.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -81,7 +81,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Pomoc" BEGIN MENUITEM "Tematy pomocy", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/pt-BR.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Ajuda" BEGIN MENUITEM "&TÃ³picos da Ajuda", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ro-RO.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "PaletÄ &modernÄ", IDM_COLORSMODERNPALETTE MENUITEM "PaletÄ &veche", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Ajutor" BEGIN MENUITEM "&Manualâ¦", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/sq-AL.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Paleta moderne", IDM_COLORSMODERNPALETTE MENUITEM "Paleta te vjetra", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&NdihmÃ«" BEGIN MENUITEM "NdihmÃ« me temÃ«", IDM_HELPHELPTOPICS MENUITEM SEPARATOR

1 0

[dreimer] 66162: [RAPPS] Fix broken link to Total Commander CORE-9123 #resolve #comment Please retry. Thx for help.
by dreimer＠svn.reactos.org 04 Feb '15

04 Feb '15

Author: dreimer Date: Wed Feb 4 21:27:20 2015 New Revision: 66162 URL: http://svn.reactos.org/svn/reactos?rev=66162&view=rev Log: [RAPPS] Fix broken link to Total Commander CORE-9123 #resolve #comment Please retry. Thx for help. Modified: trunk/reactos/base/applications/rapps/rapps/totalcommander.txt Modified: trunk/reactos/base/applications/rapps/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/totalcommander.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/totalcommander.txt [iso-8859-1] Wed Feb 4 21:27:20 2015 @@ -9,7 +9,7 @@ Size = 3.55 MB Category = 12 URLSite = http://www.ghisler.com/ -URLDownload = http://www.slo.ru/download/total_commander/tcm851ax32.exe +URLDownload = http://totalcmd2.s3.amazonaws.com/tcmd851ax32.exe CDPath = none [Section.0407]

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