Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[jgardou] 47495: [WIN32K] UserDrawIconEx - There is no need to recalculate size of the Icon, we already have this piece of information - Draw monochrome cursor/icons, not only their mask.

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon May 31 16:19:37 2010 New Revision: 47495 URL: http://svn.reactos.org/svn/reactos?rev=47495&view=rev Log: [WIN32K] UserDrawIconEx - There is no need to recalculate size of the Icon, we already have this piece of information - Draw monochrome cursor/icons, not only their mask. Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Mon May 31 16:19:37 2010 @@ -1326,7 +1326,6 @@ HBITMAP hbmMask, hbmColor; BITMAP bmpColor, bm; BOOL DoFlickerFree; - SIZE IconSize; INT iOldBkColor = 0, iOldTxtColor = 0; HDC hMemDC, hDestDC = hDc; @@ -1356,17 +1355,6 @@ { DPRINT1("NtGdiCreateCompatibleDC failed!\n"); return FALSE; - } - - if (hbmColor) - { - IconSize.cx = bmpColor.bmWidth; - IconSize.cy = bmpColor.bmHeight; - } - else /* take it from mask */ - { - IconSize.cx = bm.bmWidth; - IconSize.cy = bm.bmHeight/2; } /* NtGdiCreateCompatibleBitmap will create a monochrome bitmap @@ -1407,11 +1395,11 @@ if (!cxWidth) cxWidth = ((diFlags & DI_DEFAULTSIZE) ? - UserGetSystemMetrics(SM_CXICON) : IconSize.cx); + UserGetSystemMetrics(SM_CXICON) : pIcon->Size.cx); if (!cyHeight) cyHeight = ((diFlags & DI_DEFAULTSIZE) ? - UserGetSystemMetrics(SM_CYICON) : IconSize.cy); + UserGetSystemMetrics(SM_CYICON) : pIcon->Size.cy); DoFlickerFree = (hbrFlickerFreeDraw && (GDI_HANDLE_GET_TYPE(hbrFlickerFreeDraw) == GDI_OBJECT_TYPE_BRUSH)); @@ -1453,8 +1441,8 @@ hMemDC, 0, 0, - IconSize.cx, - IconSize.cy, + pIcon->Size.cx, + pIcon->Size.cy, SRCAND, 0); NtGdiSelectBitmap(hMemDC, hTmpBmp); @@ -1535,8 +1523,8 @@ hMemDC, 0, 0, - IconSize.cx, - IconSize.cy, + pIcon->Size.cx, + pIcon->Size.cy, pixelblend, NULL); NtGdiSelectBitmap(hMemDC, hTmpBmp); @@ -1556,8 +1544,27 @@ hMemDC, 0, 0, - IconSize.cx, - IconSize.cy, + pIcon->Size.cx, + pIcon->Size.cy, + rop, + 0); + NtGdiSelectBitmap(hMemDC, hTmpBmp); + } + else + { + /* Mask bitmap holds the information in its second half */ + DWORD rop = (diFlags & DI_MASK) ? SRCINVERT : SRCCOPY ; + hTmpBmp = NtGdiSelectBitmap(hMemDC, hbmMask); + NtGdiStretchBlt(hDestDC, + x, + y, + cxWidth, + cyHeight, + hMemDC, + 0, + pIcon->Size.cy, + pIcon->Size.cx, + pIcon->Size.cy, rop, 0); NtGdiSelectBitmap(hMemDC, hTmpBmp);

14 years, 3 months

[tkreuzer] 47494: [MMENT4] Remove a "; " after an if (), that makes no sense and caused GetNt4SoundDeviceCapabilities to always return without doing anything.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 31 16:11:10 2010 New Revision: 47494 URL: http://svn.reactos.org/svn/reactos?rev=47494&view=rev Log: [MMENT4] Remove a ";" after an if (), that makes no sense and caused GetNt4SoundDeviceCapabilities to always return without doing anything. Modified: trunk/reactos/lib/drivers/sound/mment4/control.c Modified: trunk/reactos/lib/drivers/sound/mment4/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mment4/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mment4/control.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mment4/control.c [iso-8859-1] Mon May 31 16:11:10 2010 @@ -101,7 +101,7 @@ Result = GetSoundDeviceType(SoundDevice, &DeviceType); SND_ASSERT( Result == MMSYSERR_NOERROR ); - if ( ! MMSUCCESS(Result) ); + if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); /* Choose the appropriate IOCTL */

14 years, 3 months

[tkreuzer] 47493: [OSKITTCP] Improve the reactos-hack, by changing the "; " after an "if (...)" to "(void)0; " to tell the compiler that we intentionally do nothing in the if body.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 31 16:04:24 2010 New Revision: 47493 URL: http://svn.reactos.org/svn/reactos?rev=47493&view=rev Log: [OSKITTCP] Improve the reactos-hack, by changing the ";" after an "if (...)" to "(void)0;" to tell the compiler that we intentionally do nothing in the if body. Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/rtsock.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/rtsock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/rtsock.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/rtsock.c [iso-8859-1] Mon May 31 16:04:24 2010 @@ -277,7 +277,7 @@ #ifndef __REACTOS__ ifp = ifa->ifa_ifp; #else - ; + (void)0; #endif if (ifa) { register struct ifaddr *oifa = rt->rt_ifa;

14 years, 3 months

[tkreuzer] 47492: [LIBJPEG] Instead of disabling a warning when using "main" as something else then the main function, define it to mainptr (it's used as a pointer variable) globally, this approach is portable.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 31 16:00:50 2010 New Revision: 47492 URL: http://svn.reactos.org/svn/reactos?rev=47492&view=rev Log: [LIBJPEG] Instead of disabling a warning when using "main" as something else then the main function, define it to mainptr (it's used as a pointer variable) globally, this approach is portable. Modified: trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild Modified: trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/libjp… ============================================================================== --- trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild [iso-8859-1] Mon May 31 16:00:50 2010 @@ -1,11 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="libjpeg" type="win32dll" entrypoint="0" installbase="system32" installname="libjpeg.dll" allowwarnings="true" crt="msvcrt"> - <compilerflag compilerset="gcc">-Wno-main</compilerflag> <define name="WIN32" /> <define name="_WINDOWS" /> <define name="_MBCS" /> <define name="JPEG_DLL" /> + <define name="main">mainptr</define> <include base="libjpeg">.</include> <file>jcapimin.c</file> <file>jcapistd.c</file>

14 years, 3 months

[tkreuzer] 47491: [BATTC] - define _BATTERYCLASS_ to not get dllimport specifiers

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 31 15:57:33 2010 New Revision: 47491 URL: http://svn.reactos.org/svn/reactos?rev=47491&view=rev Log: [BATTC] - define _BATTERYCLASS_ to not get dllimport specifiers Modified: trunk/reactos/drivers/battery/battc/battc.rbuild Modified: trunk/reactos/drivers/battery/battc/battc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/batt… ============================================================================== --- trunk/reactos/drivers/battery/battc/battc.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/battery/battc/battc.rbuild [iso-8859-1] Mon May 31 15:57:33 2010 @@ -5,6 +5,7 @@ <library>hal</library> <importlibrary definition="battc.spec"/> <include base="battc">.</include> + <define name="_BATTERYCLASS_" /> <file>battc.c</file> <file>battc.rc</file> </module>

14 years, 3 months

[tkreuzer] 47490: [FORMAT] Fix "potentially insecure" usage of non-string-literals in printf.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 31 15:56:29 2010 New Revision: 47490 URL: http://svn.reactos.org/svn/reactos?rev=47490&view=rev Log: [FORMAT] Fix "potentially insecure" usage of non-string-literals in printf. Modified: trunk/reactos/base/system/format/format.c Modified: trunk/reactos/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/format/format.c [iso-8859-1] Mon May 31 15:56:29 2010 @@ -185,7 +185,7 @@ if( *status == FALSE ) { LoadString( GetModuleHandle(NULL), STRING_FORMAT_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg); + _tprintf("%s", szMsg); Error = TRUE; } break; @@ -204,7 +204,7 @@ case STRUCTUREPROGRESS: case CLUSTERSIZETOOSMALL: LoadString( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg); + _tprintf("%s", szMsg); return FALSE; } return TRUE; @@ -320,7 +320,7 @@ // if( !LoadFMIFSEntryPoints()) { LoadString( GetModuleHandle(NULL), STRING_FMIFS_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg); + _tprintf("%s", szMsg); return -1; } @@ -422,7 +422,7 @@ break; } LoadString( GetModuleHandle(NULL), STRING_ERROR_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg); + _tprintf("%s", szMsg); } } @@ -471,7 +471,7 @@ ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); } LoadString( GetModuleHandle(NULL), STRING_CREATE_FSYS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg); + _tprintf("%s", szMsg); } // @@ -489,7 +489,7 @@ #endif if( Error ) return -1; LoadString( GetModuleHandle(NULL), STRING_FMT_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg); + _tprintf("%s", szMsg); // // Enable compression if desired @@ -504,7 +504,7 @@ #endif LoadString( GetModuleHandle(NULL), STRING_VOL_COMPRESS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg); + _tprintf("%s", szMsg); } } @@ -514,7 +514,7 @@ if( !GotALabel ) { LoadString( GetModuleHandle(NULL), STRING_ENTER_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg); + _tprintf("%s", szMsg); _fgetts( input, sizeof(LabelString)/2, stdin ); input[ _tcslen(input)-1] = 0;

14 years, 3 months

[tkreuzer] 47489: [ACPI] - Add some missing NTAPI - Fix AcpiInterfaceConnectVector and AcpiInterfaceDisconnectVector parameters (ACPI_INTERFACE_STANDARD version 1 not version 2) - Patch by Amine Khaldi

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 31 15:54:38 2010 New Revision: 47489 URL: http://svn.reactos.org/svn/reactos?rev=47489&view=rev Log: [ACPI] - Add some missing NTAPI - Fix AcpiInterfaceConnectVector and AcpiInterfaceDisconnectVector parameters (ACPI_INTERFACE_STANDARD version 1 not version 2) - Patch by Amine Khaldi Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c trunk/reactos/drivers/bus/acpi/include/acpisys.h trunk/reactos/drivers/bus/acpi/interface.c trunk/reactos/drivers/bus/acpi/pnp.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Mon May 31 15:54:38 2010 @@ -457,6 +457,7 @@ -------------------------------------------------------------------------- */ void +NTAPI acpi_bus_generate_event_dpc(PKDPC Dpc, PVOID DeferredContext, PVOID SystemArgument1, Modified: trunk/reactos/drivers/bus/acpi/include/acpisys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/include/a… ============================================================================== --- trunk/reactos/drivers/bus/acpi/include/acpisys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/include/acpisys.h [iso-8859-1] Mon May 31 15:54:38 2010 @@ -130,6 +130,7 @@ ); NTSTATUS +NTAPI Bus_CompletionRoutine( PDEVICE_OBJECT DeviceObject, PIRP Irp, Modified: trunk/reactos/drivers/bus/acpi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/interface… ============================================================================== --- trunk/reactos/drivers/bus/acpi/interface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/interface.c [iso-8859-1] Mon May 31 15:54:38 2010 @@ -25,13 +25,14 @@ } NTSTATUS +NTAPI AcpiInterfaceConnectVector(PDEVICE_OBJECT Context, ULONG GpeNumber, KINTERRUPT_MODE Mode, BOOLEAN Shareable, PGPE_SERVICE_ROUTINE ServiceRoutine, PVOID ServiceContext, - PVOID *ObjectContext) + PVOID ObjectContext) { UNIMPLEMENTED @@ -39,8 +40,8 @@ } NTSTATUS -AcpiInterfaceDisconnectVector(PDEVICE_OBJECT Context, - PVOID ObjectContext) +NTAPI +AcpiInterfaceDisconnectVector(PVOID ObjectContext) { UNIMPLEMENTED @@ -48,6 +49,7 @@ } NTSTATUS +NTAPI AcpiInterfaceEnableEvent(PDEVICE_OBJECT Context, PVOID ObjectContext) { @@ -57,6 +59,7 @@ } NTSTATUS +NTAPI AcpiInterfaceDisableEvent(PDEVICE_OBJECT Context, PVOID ObjectContext) { @@ -66,6 +69,7 @@ } NTSTATUS +NTAPI AcpiInterfaceClearStatus(PDEVICE_OBJECT Context, PVOID ObjectContext) { @@ -75,6 +79,7 @@ } NTSTATUS +NTAPI AcpiInterfaceNotificationsRegister(PDEVICE_OBJECT Context, PDEVICE_NOTIFY_CALLBACK NotificationHandler, PVOID NotificationContext) @@ -85,6 +90,7 @@ } VOID +NTAPI AcpiInterfaceNotificationsUnregister(PDEVICE_OBJECT Context, PDEVICE_NOTIFY_CALLBACK NotificationHandler) { Modified: trunk/reactos/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/pnp.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] Mon May 31 15:54:38 2010 @@ -363,6 +363,7 @@ } NTSTATUS +NTAPI Bus_CompletionRoutine( PDEVICE_OBJECT DeviceObject, PIRP Irp,

14 years, 3 months

[tkreuzer] 47488: [MSCONFIG] Add header guards. They are not neccessary in this case, but better to have them, especially since it uses a compilation unit.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 31 15:45:29 2010 New Revision: 47488 URL: http://svn.reactos.org/svn/reactos?rev=47488&view=rev Log: [MSCONFIG] Add header guards. They are not neccessary in this case, but better to have them, especially since it uses a compilation unit. Modified: trunk/reactos/base/applications/msconfig/freeldrpage.h trunk/reactos/base/applications/msconfig/generalpage.h trunk/reactos/base/applications/msconfig/srvpage.h trunk/reactos/base/applications/msconfig/startuppage.h trunk/reactos/base/applications/msconfig/systempage.h trunk/reactos/base/applications/msconfig/toolspage.h Modified: trunk/reactos/base/applications/msconfig/freeldrpage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/freeldrpage.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/freeldrpage.h [iso-8859-1] Mon May 31 15:45:29 2010 @@ -1,3 +1,8 @@ +#ifndef _FREELDRPAGE_H_ +#define _FREELDRPAGE_H_ + extern HWND hFreeLdrPage; INT_PTR CALLBACK FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); + +#endif Modified: trunk/reactos/base/applications/msconfig/generalpage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/generalpage.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/generalpage.h [iso-8859-1] Mon May 31 15:45:29 2010 @@ -1,3 +1,8 @@ +#ifndef _GENERALPAGE_H_ +#define _GENERALPAGE_H_ + extern HWND hGeneralPage; INT_PTR CALLBACK GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); + +#endif Modified: trunk/reactos/base/applications/msconfig/srvpage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/srvpage.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/srvpage.h [iso-8859-1] Mon May 31 15:45:29 2010 @@ -1,4 +1,9 @@ +#ifndef _SVRPAGE_H_ +#define _SVRPAGE_H_ + extern HWND hServicesPage; extern HWND hServicesListCtrl; INT_PTR CALLBACK ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); + +#endif Modified: trunk/reactos/base/applications/msconfig/startuppage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/startuppage.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/startuppage.h [iso-8859-1] Mon May 31 15:45:29 2010 @@ -1,4 +1,9 @@ +#ifndef _STARTUPPAGE_H_ +#define _STARTUPPAGE_H_ + extern HWND hStartupPage; extern HWND hStartupPageListCtrl; INT_PTR CALLBACK StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); + +#endif Modified: trunk/reactos/base/applications/msconfig/systempage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/systempage.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/systempage.h [iso-8859-1] Mon May 31 15:45:29 2010 @@ -1,3 +1,8 @@ +#ifndef _SYSTEMPAGE_H_ +#define _SYSTEMPAGE_H_ + extern HWND hSystemPage; INT_PTR CALLBACK SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); + +#endif Modified: trunk/reactos/base/applications/msconfig/toolspage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/toolspage.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/toolspage.h [iso-8859-1] Mon May 31 15:45:29 2010 @@ -1,5 +1,9 @@ +#ifndef _TOOLSPAGE_H_ +#define _TOOLSPAGE_H_ + extern HWND hToolsPage; extern HWND hToolsListCtrl; INT_PTR CALLBACK ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +#endif

14 years, 3 months

[sginsberg] 47487: [NTOS] Re-enable the APC debug check in the system call exit code that somehow got removed in 46247. [NTOS] Use an inline for emitting the iret instruction in C code for portability. [NTOS] Simplify the MSC assembly in KiSwitchToBootStack.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon May 31 14:52:16 2010 New Revision: 47487 URL: http://svn.reactos.org/svn/reactos?rev=47487&view=rev Log: [NTOS] Re-enable the APC debug check in the system call exit code that somehow got removed in 46247. [NTOS] Use an inline for emitting the iret instruction in C code for portability. [NTOS] Simplify the MSC assembly in KiSwitchToBootStack. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Mon May 31 14:52:16 2010 @@ -774,8 +774,7 @@ VOID NTAPI KiSystemStartupBootStack(VOID); __asm { - mov ecx, InitialStack - mov esp, ecx + mov esp, InitialStack sub esp, (NPX_FRAME_LENGTH + KTRAP_FRAME_ALIGN + KTRAP_FRAME_LENGTH) push (CR0_EM | CR0_TS | CR0_MP) jmp KiSystemStartupBootStack @@ -786,6 +785,30 @@ } // +// Emits the iret instruction for C code +// +DECLSPEC_NORETURN +VOID +FORCEINLINE +KiIret(VOID) +{ +#if defined(__GNUC__) + __asm__ __volatile__ + ( + "iret\n" + ); +#elif defined(_MSC_VER) + __asm + { + iret + } +#else +#error Unsupported compiler +#endif + UNREACHABLE; +} + +// // Normally this is done by the HAL, but on x86 as an optimization, the kernel // initiates the end by calling back into the HAL and exiting the trap here. // Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Mon May 31 14:52:16 2010 @@ -8,7 +8,7 @@ #pragma once -//#define TRAP_DEBUG 1 +#define TRAP_DEBUG 0 // // Unreachable code hint for GCC 4.5.x, older GCC versions, and MSVC @@ -81,7 +81,7 @@ DbgPrint("V86Gs: %x\n", TrapFrame->V86Gs); } -#ifdef TRAP_DEBUG +#if TRAP_DEBUG VOID FORCEINLINE KiFillTrapFrameDebug(IN PKTRAP_FRAME TrapFrame) @@ -168,7 +168,7 @@ 0, 0); } -#if 0 + /* Make sure we're not attached and that APCs are not disabled */ if ((KeGetCurrentThread()->ApcStateIndex != CurrentApcEnvironment) || (KeGetCurrentThread()->CombinedApcDisable != 0)) @@ -180,7 +180,6 @@ KeGetCurrentThread()->CombinedApcDisable, 0); } -#endif } } #else @@ -200,9 +199,11 @@ DECLSPEC_NORETURN VOID FASTCALL KiTrapReturnNoSegments(IN PKTRAP_FRAME TrapFrame); typedef -VOID -(FASTCALL -*PFAST_SYSTEM_CALL_EXIT)(IN PKTRAP_FRAME TrapFrame); +DECLSPEC_NORETURN +VOID +(FASTCALL *PFAST_SYSTEM_CALL_EXIT)( + IN PKTRAP_FRAME TrapFrame +); extern PFAST_SYSTEM_CALL_EXIT KiFastCallExitHandler; @@ -222,7 +223,7 @@ while (TRUE) { /* Return if this isn't V86 mode anymore */ - if (!(TrapFrame->EFlags & EFLAGS_V86_MASK)) KiEoiHelper(TrapFrame);; + if (!(TrapFrame->EFlags & EFLAGS_V86_MASK)) KiEoiHelper(TrapFrame); /* Turn off the alerted state for kernel mode */ Thread->Alerted[KernelMode] = FALSE; Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Mon May 31 14:52:16 2010 @@ -547,7 +547,7 @@ // // Handled, return from interrupt // - __asm__ __volatile__ ("iret\n"); + KiIret(); } //

14 years, 3 months

[mjmartin] 47486: [win32k] - When processing and deleting timers use a seperate timer lock instead of using the global user lock.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Mon May 31 14:36:40 2010 New Revision: 47486 URL: http://svn.reactos.org/svn/reactos?rev=47486&view=rev Log: [win32k] - When processing and deleting timers use a seperate timer lock instead of using the global user lock. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Mon May 31 14:36:40 2010 @@ -31,12 +31,26 @@ static PVOID WindowLessTimersBitMapBuffer; static ULONG HintIndex = 0; +ERESOURCE TimerLock; #define IntLockWindowlessTimerBitmap() \ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&Mutex) #define IntUnlockWindowlessTimerBitmap() \ ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&Mutex) + +#define TimerEnterExclusive() \ +{ \ + KeEnterCriticalRegion(); \ + ExAcquireResourceExclusiveLite(&TimerLock, TRUE); \ +} + +#define TimerLeave() \ +{ \ + ExReleaseResourceLite(&TimerLock); \ + KeLeaveCriticalRegion(); \ +} + /* FUNCTIONS *****************************************************************/ static @@ -49,6 +63,7 @@ if (!FirstpTmr) { + ExInitializeResourceLite(&TimerLock); FirstpTmr = UserCreateObject(gHandleTable, NULL, &Handle, otTimer, sizeof(TIMER)); if (FirstpTmr) { @@ -96,7 +111,7 @@ { PLIST_ENTRY pLE; PTIMER pTmr = FirstpTmr, RetTmr = NULL; - KeEnterCriticalRegion(); + TimerEnterExclusive(); do { if (!pTmr) break; @@ -116,7 +131,7 @@ pLE = pTmr->ptmrList.Flink; pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); } while (pTmr != FirstpTmr); - KeLeaveCriticalRegion(); + TimerLeave(); return RetTmr; } @@ -127,7 +142,7 @@ { PLIST_ENTRY pLE; PTIMER pTmr = FirstpTmr; - KeEnterCriticalRegion(); + TimerEnterExclusive(); do { if (!pTmr) break; @@ -139,7 +154,7 @@ pLE = pTmr->ptmrList.Flink; pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); } while (pTmr != FirstpTmr); - KeLeaveCriticalRegion(); + TimerLeave(); return pTmr; } @@ -156,7 +171,7 @@ if (!pTmr) return FALSE; - KeEnterCriticalRegion(); + TimerEnterExclusive(); do { if ( (lParam == (LPARAM)pTmr->pfn) && @@ -167,7 +182,7 @@ pLE = pTmr->ptmrList.Flink; pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); } while (pTmr != FirstpTmr); - KeLeaveCriticalRegion(); + TimerLeave(); if (!pTmr) return FALSE; @@ -320,7 +335,7 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - UserEnterExclusive(); + TimerEnterExclusive(); do { @@ -343,7 +358,7 @@ pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); } while (pTmr != FirstpTmr); - UserLeave(); + TimerLeave(); return Hit; } @@ -360,7 +375,7 @@ if (!pTmr) return; - UserEnterExclusive(); + TimerEnterExclusive(); KeQueryTickCount(&TickCount); Time = MsqCalculateMessageTime(&TickCount); @@ -423,7 +438,7 @@ TimeLast = Time; - UserLeave(); + TimerLeave(); DPRINT("TimerCount = %d\n", TimerCount); } @@ -533,7 +548,7 @@ if ((FirstpTmr == NULL) || (Window == NULL)) return FALSE; - UserEnterExclusive(); + TimerEnterExclusive(); do { @@ -545,7 +560,7 @@ pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); } while (pTmr != FirstpTmr); - UserLeave(); + TimerLeave(); return TimersRemoved; } @@ -560,7 +575,7 @@ if (FirstpTmr == NULL) return FALSE; - UserEnterExclusive(); + TimerEnterExclusive(); do { @@ -572,7 +587,7 @@ pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); } while (pTmr != FirstpTmr); - UserLeave(); + TimerLeave(); return TimersRemoved; } @@ -683,16 +698,19 @@ TIMERPROC lpTimerFunc ) { + PWINDOW_OBJECT Window; DECLARE_RETURN(UINT_PTR); DPRINT("Enter NtUserSetTimer\n"); UserEnterExclusive(); - - RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, lpTimerFunc, TMRF_TIFROMWND)); + Window = UserGetWindowObject(hWnd); + UserLeave(); + + RETURN(IntSetTimer(Window, nIDEvent, uElapse, lpTimerFunc, TMRF_TIFROMWND)); CLEANUP: DPRINT("Leave NtUserSetTimer, ret=%i\n", _ret_); - UserLeave(); + END_CLEANUP; } @@ -710,14 +728,13 @@ DPRINT("Enter NtUserKillTimer\n"); UserEnterExclusive(); - Window = UserGetWindowObject(hWnd); + UserLeave(); RETURN(IntKillTimer(Window, uIDEvent, FALSE)); CLEANUP: DPRINT("Leave NtUserKillTimer, ret=%i\n", _ret_); - UserLeave(); END_CLEANUP; } @@ -734,14 +751,12 @@ DECLARE_RETURN(UINT_PTR); DPRINT("Enter NtUserSetSystemTimer\n"); - UserEnterExclusive(); // This is wrong, lpTimerFunc is NULL! RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM)); CLEANUP: DPRINT("Leave NtUserSetSystemTimer, ret=%i\n", _ret_); - UserLeave(); END_CLEANUP; }

14 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2010