Ros-diffs

ros-diffs@reactos.org

81390 discussions

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

16 Jan '11

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

1 0

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

16 Jan '11

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

1 0

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

16 Jan '11

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

1 0

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

16 Jan '11

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

1 0

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

16 Jan '11

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

1 0

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

16 Jan '11

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

1 0

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

16 Jan '11

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

1 0

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

15 Jan '11

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

1 0

[fireball] 50394: - Solve one of the most visible and historical drawing problem of arwinss: improper clipping. E.g. child windows borders being "visible" in an explorer window is an example, FAP d...
by fireball＠svn.reactos.org 15 Jan '11

15 Jan '11

Author: fireball Date: Sat Jan 15 21:33:09 2011 New Revision: 50394 URL: http://svn.reactos.org/svn/reactos?rev=50394&view=rev Log: - Solve one of the most visible and historical drawing problem of arwinss: improper clipping. E.g. child windows borders being "visible" in an explorer window is an example, FAP drawing issues an another. All redrawing bugs should be retested to see what's fixed. - Add a "clipchildren" property to the DC. This property affects only those DCs which have a root window (screen) selected. A better name for this variable would be welcome. - Important! The change in behaviour introduced by ClipChildren is currently commented out until some issues it brings are solved. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Sat Jan 15 21:33:09 2011 @@ -169,6 +169,7 @@ /* Create an empty combined clipping region */ pNewDC->CombinedClip = EngCreateClip(); pNewDC->Clipping = NULL; + pNewDC->ClipChildren = FALSE; /* Set default palette */ pNewDC->dclevel.hpal = StockObjects[DEFAULT_PALETTE]; @@ -487,6 +488,12 @@ return; } + /* Root window's visibility may be ignored */ + if ((pDC->pWindow == &SwmRoot) && !pDC->ClipChildren) + { + //IgnoreVisibility = TRUE; + } + /* window visibility X user clipping (if any) X underlying surface */ /* Acquire SWM lock */ @@ -598,6 +605,10 @@ /* Set the clipping object */ pDC->Clipping = create_region_from_rects(pSafeRects, count); } + else + { + pDC->Clipping = create_empty_region(); + } DPRINT("RosGdiSetDeviceClipping() for DC %x, bounding rect (%d,%d)-(%d, %d)\n", physDev, rcSafeBounds.left, rcSafeBounds.top, rcSafeBounds.right, rcSafeBounds.bottom); @@ -693,6 +704,10 @@ pDC->pWindow = NULL; DPRINT("hdc %x, restricting any drawing\n", physDev); } + + pDC->ClipChildren = clipChildren; + + RosGdiUpdateClipping(pDC, FALSE); /* Release the object */ DC_UnlockDc(pDC); Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Sat Jan 15 21:33:09 2011 @@ -38,6 +38,7 @@ struct region *Clipping; CLIPOBJ *CombinedClip; PSWM_WINDOW pWindow; + BOOLEAN ClipChildren; } DC, *PDC; #define DC_LockDc(hDC) \

1 0

[gadamopoulos] 50393: swm isn't always the best solution. Instead of reinverting the well we can also use win32 api
by gadamopoulos＠svn.reactos.org 15 Jan '11

15 Jan '11

Author: gadamopoulos Date: Sat Jan 15 20:13:44 2011 New Revision: 50393 URL: http://svn.reactos.org/svn/reactos?rev=50393&view=rev Log: swm isn't always the best solution. Instead of reinverting the well we can also use win32 api Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c branches/arwinss/reactos/include/reactos/wine/rosuser.h branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] Sat Jan 15 20:13:44 2011 @@ -178,7 +178,7 @@ } /* get the window handle from cursor position */ - hwnd = SwmGetWindowFromPoint(pt.x, pt.y); + hwnd = ChildWindowFromPointEx(GetDesktopWindow(), pt, CWP_SKIPINVISIBLE); if (flags & MOUSEEVENTF_MOVE) { Modified: branches/arwinss/reactos/include/reactos/wine/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/rosuser.h [iso-8859-1] Sat Jan 15 20:13:44 2011 @@ -230,9 +230,6 @@ VOID NTAPI SwmPosChanged(GR_WINDOW_ID Wid, const RECT *WindowRect, const RECT *OldRect, HWND hWndAfter, UINT SwpFlags); -HWND NTAPI -SwmGetWindowFromPoint(LONG x, LONG y); - VOID NTAPI SwmShowWindow(GR_WINDOW_ID Wid, BOOLEAN Show, UINT SwpFlags); Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Sat Jan 15 20:13:44 2011 @@ -887,47 +887,6 @@ /* Release the lock */ SwmRelease(); -} - -HWND -NTAPI -SwmGetWindowFromPoint(LONG x, LONG y) -{ - PLIST_ENTRY Current; - PSWM_WINDOW Window; - - /* Acquire the lock */ - SwmAcquire(); - - /* Traverse the list to find our window */ - Current = SwmWindows.Flink; - while(Current != &SwmWindows) - { - Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); - - /* Skip hidden windows */ - if (Window->Hidden) - { - /* Advance to the next window */ - Current = Current->Flink; - continue; - } - - if (point_in_region(Window->Visible, x, y)) - { - /* Release the lock */ - SwmRelease(); - - return Window->hwnd; - } - /* Advance to the next window */ - Current = Current->Flink; - } - - /* Release the lock */ - SwmRelease(); - - return 0; } VOID Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Jan 15 20:13:44 2011 @@ -91,6 +91,5 @@ SwmDestroyWindow 1 SwmSetForeground 1 SwmPosChanged 5 -SwmGetWindowFromPoint 2 SwmShowWindow 3 NtUserInitialize 3

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