Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 37930: #define _INTEGRAL_MAX_BITS in _mingw.h
by tkreuzer＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: tkreuzer Date: Mon Dec 8 02:02:40 2008 New Revision: 37930 URL: http://svn.reactos.org/svn/reactos?rev=37930&view=rev Log: #define _INTEGRAL_MAX_BITS in _mingw.h Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] Mon Dec 8 02:02:40 2008 @@ -6,6 +6,8 @@ #ifndef _INC_CRTDEFS #define _INC_CRTDEFS + +#define _INTEGRAL_MAX_BITS 64 #ifndef MINGW64 #define MINGW64

1 0

[tkreuzer] 37929: add framebased-gcchack.c to i386 build of pseh
by tkreuzer＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: tkreuzer Date: Mon Dec 8 02:02:07 2008 New Revision: 37929 URL: http://svn.reactos.org/svn/reactos?rev=37929&view=rev Log: add framebased-gcchack.c to i386 build of pseh Modified: branches/ros-amd64-bringup/reactos/lib/pseh/pseh.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/pseh/pseh.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/p… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/pseh/pseh.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/pseh/pseh.rbuild [iso-8859-1] Mon Dec 8 02:02:07 2008 @@ -6,6 +6,7 @@ <file>framebased.S</file> <file>framebased-gcchack.S</file> </directory> + <file>framebased-gcchack.c</file> </if> <if property="ARCH" value="powerpc"> <directory name="powerpc">

1 0

[jimtabor] 37928: - Please dont break functionality due to a compiler problem, just fix it.
by jimtabor＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: jimtabor Date: Mon Dec 8 01:57:18 2008 New Revision: 37928 URL: http://svn.reactos.org/svn/reactos?rev=37928&view=rev Log: - Please dont break functionality due to a compiler problem, just fix it. Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/palette.c [iso-8859-1] Mon Dec 8 01:57:18 2008 @@ -87,6 +87,8 @@ LPPALETTEENTRY ppe) { PALETTEENTRY ippe[256]; + // Make this work! + if ((INT)cEntries < 0 ) return 0; if ( GetDeviceCaps(hDC, RASTERCAPS) & RC_PALETTE ) return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE);

1 0

[tkreuzer] 37927: forward AttachThreadInput to win32k
by tkreuzer＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: tkreuzer Date: Mon Dec 8 01:39:37 2008 New Revision: 37927 URL: http://svn.reactos.org/svn/reactos?rev=37927&view=rev Log: forward AttachThreadInput to win32k Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.pspec Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Mon Dec 8 01:39:37 2008 @@ -9,7 +9,7 @@ @ stdcall AppendMenuA(long long long ptr) @ stdcall AppendMenuW(long long long ptr) @ stdcall ArrangeIconicWindows(long) -@ stdcall AttachThreadInput(long long long) +@ stdcall AttachThreadInput(long long long) NtUserAttachThreadInput @ stdcall BeginDeferWindowPos(long) @ stdcall BeginPaint(long ptr) @ stdcall BlockInput(long)

1 0

[tkreuzer] 37926: - fix *HOOKPROC definition - add 64 bit BitTest functions
by tkreuzer＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: tkreuzer Date: Mon Dec 8 01:37:16 2008 New Revision: 37926 URL: http://svn.reactos.org/svn/reactos?rev=37926&view=rev Log: - fix *HOOKPROC definition - add 64 bit BitTest functions Modified: branches/ros-amd64-bringup/reactos/include/ddk/wdm.h branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/wdm.h [iso-8859-1] Mon Dec 8 01:37:16 2008 @@ -181,9 +181,14 @@ #endif } +#endif + #define BitScanForward _BitScanForward #define BitScanReverse _BitScanReverse +#ifdef _M_AMD64 +#define InterlockedBitTestAndSet64 _interlockedbittestandset64 +#define InterlockedBitTestAndReset64 _interlockedbittestandreset64 #endif Modified: branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h [iso-8859-1] Mon Dec 8 01:37:16 2008 @@ -213,7 +213,7 @@ #define CommDlg_OpenSave_HideControl(d,i) ((void)SNDMSG((d),CDM_HIDECONTROL,(i),0)) #define CommDlg_OpenSave_SetDefExt(d,e) ((void)SNDMSG((d),CDM_SETDEFEXT,0,(LPARAM)(e))) -typedef UINT_PTR (APIENTRY *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM); +typedef UINT_PTR (CALLBACK *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM); typedef __CDHOOKPROC LPCCHOOKPROC; typedef __CDHOOKPROC LPCFHOOKPROC; typedef __CDHOOKPROC LPFRHOOKPROC;

1 0

[tkreuzer] 37925: - reduce differences to trunk
by tkreuzer＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: tkreuzer Date: Mon Dec 8 01:36:10 2008 New Revision: 37925 URL: http://svn.reactos.org/svn/reactos?rev=37925&view=rev Log: - reduce differences to trunk Modified: branches/ros-amd64-bringup/reactos/base/applications/control/control.h branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.spec Modified: branches/ros-amd64-bringup/reactos/base/applications/control/control.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/control/control.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/control/control.h [iso-8859-1] Mon Dec 8 01:36:10 2008 @@ -15,4 +15,4 @@ /* Macro for calling "rundll32.exe" According to MSDN, ShellExecute returns a value greater than 32 if the operation was successful. */ -#define RUNDLL(param) ((int)(INT_PTR)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32) +#define RUNDLL(param) ((INT_PTR)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32) Modified: branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] Mon Dec 8 01:36:10 2008 @@ -185,10 +185,10 @@ switch (PtrToLong(hRootKey)) { - case (((LONG_PTR)HKEY_LOCAL_MACHINE) & 0xff): + case PtrToLong(HKEY_LOCAL_MACHINE): _tcscpy(Path, _T("HKLM\\\0")); break; - case (((LONG_PTR)HKEY_CURRENT_USER) & 0xff): + case PtrToLong(HKEY_CURRENT_USER): _tcscpy(Path, _T("HKCU\\\0")); break; default: Modified: branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c [iso-8859-1] Mon Dec 8 01:36:10 2008 @@ -478,7 +478,7 @@ OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLETEMPLATE | OFN_ENABLEHOOK; saveas.lpstrDefExt = szDefaultExt; saveas.lpTemplateName = MAKEINTRESOURCE(DIALOG_ENCODING); - saveas.lpfnHook = (LPOFNHOOKPROC)DIALOG_FileSaveAs_Hook; + saveas.lpfnHook = DIALOG_FileSaveAs_Hook; if (GetSaveFileName(&saveas)) { SetFileName(szPath); Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c [iso-8859-1] Mon Dec 8 01:36:10 2008 @@ -307,7 +307,7 @@ ret = (hShExt)(NULL, _T("open"), filename, NULL, NULL, SW_SHOWNORMAL); - TRACE ("RunFile: ShellExecuteA/W returned %p\n", (DWORD_PTR)ret); + TRACE ("RunFile: ShellExecuteA/W returned 0x%p\n", ret); FreeLibrary(hShell32); return (((DWORD_PTR)ret) > 32); Modified: branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.spec [iso-8859-1] Mon Dec 8 01:36:10 2008 @@ -5,4 +5,4 @@ @ stdcall DbgPrompt(ptr ptr long) @ stdcall RtlAssert(ptr ptr long ptr) @ stdcall RtlUnwind(ptr ptr ptr ptr) -@ stdcall vDbgPrintExWithPrefix(ptr long long ptr ptr) +@ stdcall vDbgPrintExWithPrefix(ptr long long ptr ptr)

1 0

[tkreuzer] 37924: revert 37889 (still consuses rsym)
by tkreuzer＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: tkreuzer Date: Mon Dec 8 01:33:04 2008 New Revision: 37924 URL: http://svn.reactos.org/svn/reactos?rev=37924&view=rev Log: revert 37889 (still consuses rsym) Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Dec 8 01:33:04 2008 @@ -1434,9 +1434,6 @@ "ifneq ($(ROS_GENERATE_RSYM),no)\n" ); fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" ); - // FIXME! workaround until rsym can extract line numbers from DWARF - fprintf ( fMakefile, - "\t$(Q)${objcopy} -R .debug_abbrev -R .debug_aranges -R .debug_frame -R .debug_info -R .debug_line -R .debug_pubnames -R .debug_macinfo -R .debug_str -R .debug_loc -R .debug_pubtypes -R .debug_ranges -R .debug_static_func -R .debug_static_vars -R .debug_types -R .debug_weaknames $@\n\n" ); fprintf ( fMakefile, "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" ); fprintf ( fMakefile, @@ -2018,6 +2015,16 @@ linkerflags ); } + if ( IsStaticLibrary ( module ) && module.isStartupLib ) + { + fprintf ( fMakefile, + "%s += -Wno-main\n\n", + cflagsMacro.c_str () ); + fprintf ( fMakefile, + "%s += -Wno-main\n\n", + cxxflagsMacro.c_str () ); + } + fprintf ( fMakefile, "\n\n" ); // future references to the macros will be to get their values Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp [iso-8859-1] Mon Dec 8 01:33:04 2008 @@ -745,17 +745,13 @@ name = e.GetAttribute ( "property", true ); assert( name ); const Property *property = project.LookupProperty( name->value ); - const string *PropertyValue; - const string EmptyString; - - if (property) - { - PropertyValue = &property->value; - } - else - { - // Property does not exist, treat it as being empty - PropertyValue = &EmptyString; + if ( !property ) + { + // Property not found + throw InvalidOperationException ( __FILE__, + __LINE__, + "Test on unknown property '%s' at %s", + name->value.c_str (), e.location.c_str () ); } const XMLAttribute* value; @@ -763,7 +759,7 @@ assert( value ); bool negate = ( e.name == "ifnot" ); - bool equality = ( *PropertyValue == value->value ); + bool equality = ( property->value == value->value ); if ( equality == negate ) { // Failed, skip this element Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp [iso-8859-1] Mon Dec 8 01:33:04 2008 @@ -399,17 +399,13 @@ name = e.GetAttribute ( "property", true ); assert( name ); const Property *property = LookupProperty( name->value ); - const string *PropertyValue; - const string EmptyString; - - if (property) + if ( !property ) { - PropertyValue = &property->value; - } - else - { - // Property does not exist, treat it as being empty - PropertyValue = &EmptyString; + // Property not found + throw InvalidOperationException ( __FILE__, + __LINE__, + "Test on unknown property '%s' at %s", + name->value.c_str (), e.location.c_str () ); } const XMLAttribute* value; @@ -417,7 +413,7 @@ assert( value ); bool negate = ( e.name == "ifnot" ); - bool equality = ( *PropertyValue == value->value ); + bool equality = ( property->value == value->value ); if ( equality == negate ) { // Failed, skip this element

1 0

[tkreuzer] 37923: revert 37475 and 37818
by tkreuzer＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: tkreuzer Date: Mon Dec 8 01:32:09 2008 New Revision: 37923 URL: http://svn.reactos.org/svn/reactos?rev=37923&view=rev Log: revert 37475 and 37818 Modified: branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c Modified: branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] Mon Dec 8 01:32:09 2008 @@ -1265,7 +1265,7 @@ HARDWARE_PTE PageDirectoryPte; ULONGLONG Filler; }; - HANDLE Session; + ULONG Session; CHAR ImageFileName[16]; LIST_ENTRY JobLinks; PVOID LockedPagesList; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c [iso-8859-1] Mon Dec 8 01:32:09 2008 @@ -682,7 +682,7 @@ if (!NT_SUCCESS(Status)) break; /* Write the session ID in the EPROCESS */ - Process->Session = UlongToPtr(SessionInfo.SessionId); + Process->Session = SessionInfo.SessionId; /* Check if the process also has a PEB */ if (Process->Peb)

1 0

[jimtabor] 37922: - Patch by hto: Suspicious code in User32.dll, see bug 3935.
by jimtabor＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: jimtabor Date: Sun Dec 7 21:34:22 2008 New Revision: 37922 URL: http://svn.reactos.org/svn/reactos?rev=37922&view=rev Log: - Patch by hto: Suspicious code in User32.dll, see bug 3935. Modified: trunk/reactos/dll/win32/user32/windows/font.c Modified: trunk/reactos/dll/win32/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/f… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/font.c [iso-8859-1] Sun Dec 7 21:34:22 2008 @@ -676,9 +676,10 @@ assert (max >= n); max -= n; while (n--) + { if (*start_str++ == PREFIX && max--) start_str++; - else; + } start_count -= (start_str - str_on_entry); } else @@ -736,7 +737,6 @@ str++; ns--; } - else; i++; } return result;

1 0

[dgorbachev] 37921: Put inline functions into header files.
by dgorbachev＠svn.reactos.org 07 Dec '08

07 Dec '08

Author: dgorbachev Date: Sun Dec 7 17:40:23 2008 New Revision: 37921 URL: http://svn.reactos.org/svn/reactos?rev=37921&view=rev Log: Put inline functions into header files. Modified: trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/logport.c trunk/reactos/hal/halx86/include/apic.h trunk/reactos/hal/halx86/mp/apic.c Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Sun Dec 7 17:40:23 2008 @@ -162,9 +162,9 @@ DWORD dwDataSize, LPVOID lpRawData); -__inline void LogfFreeRecord(LPVOID Rec); +/* eventlog.c */ +extern HANDLE MyHeap; -/* eventlog.c */ VOID PRINT_HEADER(PFILE_HEADER header); VOID PRINT_RECORD(PEVENTLOGRECORD pRec); @@ -185,4 +185,9 @@ /* rpc.c */ DWORD WINAPI RpcThreadRoutine(LPVOID lpParameter); +static __inline void LogfFreeRecord(LPVOID Rec) +{ + HeapFree(MyHeap, 0, Rec); +} + #endif /* __EVENTLOG_H__ */ Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Sun Dec 7 17:40:23 2008 @@ -14,7 +14,6 @@ static LIST_ENTRY LogFileListHead; static CRITICAL_SECTION LogFileListCs; -extern HANDLE MyHeap; /* FUNCTIONS ****************************************************************/ @@ -898,8 +897,3 @@ *lpRecSize = dwRecSize; return Buffer; } - -__inline void LogfFreeRecord(LPVOID Rec) -{ - HeapFree(MyHeap, 0, Rec); -} Modified: trunk/reactos/base/services/eventlog/logport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/log… ============================================================================== --- trunk/reactos/base/services/eventlog/logport.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/logport.c [iso-8859-1] Sun Dec 7 17:40:23 2008 @@ -15,7 +15,6 @@ HANDLE ConnectPortHandle = NULL; HANDLE MessagePortHandle = NULL; -extern HANDLE MyHeap; extern BOOL onLiveCD; /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/hal/halx86/include/apic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/apic.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/apic.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/apic.h [iso-8859-1] Sun Dec 7 17:40:23 2008 @@ -93,10 +93,10 @@ #define APIC_LVT_VECTOR (0xFF << 0) /* Vector */ #define APIC_LVT_DS (0x1 << 12) /* Delivery Status */ -#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ -#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ -#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ -#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */ +#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ +#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ +#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ +#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */ #define APIC_LVT3_DM (0x7 << 8) #define APIC_LVT3_IIPP (0x1 << 13) @@ -117,10 +117,10 @@ #define APIC_LVT_VECTOR (0xFF << 0) /* Vector */ #define APIC_LVT_DS (0x1 << 12) /* Delivery Status */ -#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ -#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ -#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ -#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */ +#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ +#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ +#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ +#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */ #define APIC_LVT3_DM (0x7 << 8) #define APIC_LVT3_IIPP (0x1 << 13) @@ -185,30 +185,92 @@ } CPU_INFO, *PCPU_INFO; extern ULONG CPUCount; /* Total number of CPUs */ -extern ULONG BootCPU; /* Bootstrap processor */ +extern ULONG BootCPU; /* Bootstrap processor */ extern ULONG OnlineCPUs; /* Bitmask of online CPUs */ extern CPU_INFO CPUMap[MAX_CPU]; /* Map of all CPUs in the system */ +extern PULONG APICBase; /* Virtual address of local APIC */ +extern ULONG lastregr[MAX_CPU]; /* For debugging */ +extern ULONG lastvalr[MAX_CPU]; +extern ULONG lastregw[MAX_CPU]; +extern ULONG lastvalw[MAX_CPU]; /* Prototypes */ - -__inline VOID APICWrite(ULONG Offset, ULONG Value); -__inline ULONG APICRead(ULONG Offset); VOID APICSendIPI(ULONG Target, ULONG Mode); VOID APICSetup(VOID); VOID HaliInitBSP(VOID); VOID APICSyncArbIDs(VOID); -__inline VOID APICSendEOI(VOID); VOID APICCalibrateTimer(ULONG CPU); VOID HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack); +static __inline ULONG _APICRead(ULONG Offset) +{ + PULONG p; + + p = (PULONG)((ULONG)APICBase + Offset); + return *p; +} + +#if 0 +static __inline VOID APICWrite(ULONG Offset, + ULONG Value) +{ + PULONG p; + + p = (PULONG)((ULONG)APICBase + Offset); + + *p = Value; +} +#else +static __inline VOID APICWrite(ULONG Offset, + ULONG Value) +{ + PULONG p; + ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; + + lastregw[CPU] = Offset; + lastvalw[CPU] = Value; + + p = (PULONG)((ULONG)APICBase + Offset); + + *p = Value; +} +#endif + +#if 0 +static __inline ULONG APICRead(ULONG Offset) +{ + PULONG p; + + p = (PULONG)((ULONG)APICBase + Offset); + return *p; +} +#else +static __inline ULONG APICRead(ULONG Offset) +{ + PULONG p; + ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; + + lastregr[CPU] = Offset; + lastvalr[CPU] = 0; + + p = (PULONG)((ULONG)APICBase + Offset); + + lastvalr[CPU] = *p; + return lastvalr[CPU]; +} +#endif + static __inline ULONG ThisCPU(VOID) { return (APICRead(APIC_ID) & APIC_ID_MASK) >> 24; } - -#endif - +static __inline VOID APICSendEOI(VOID) +{ + // Send the EOI + APICWrite(APIC_EOI, 0); +} + +#endif /* __INTERNAL_HAL_APIC_H */ /* EOF */ - Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=3… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] Sun Dec 7 17:40:23 2008 @@ -223,72 +223,6 @@ APICWrite(APIC_SIVR, tmp); } - -__inline ULONG _APICRead(ULONG Offset) -{ - PULONG p; - - p = (PULONG)((ULONG)APICBase + Offset); - return *p; -} - -#if 0 -__inline VOID APICWrite(ULONG Offset, - ULONG Value) -{ - PULONG p; - - p = (PULONG)((ULONG)APICBase + Offset); - - *p = Value; -} -#else -__inline VOID APICWrite(ULONG Offset, - ULONG Value) -{ - PULONG p; - ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; - - lastregw[CPU] = Offset; - lastvalw[CPU] = Value; - - p = (PULONG)((ULONG)APICBase + Offset); - - *p = Value; -} -#endif - - -#if 0 -__inline ULONG APICRead(ULONG Offset) -{ - PULONG p; - - p = (PULONG)((ULONG)APICBase + Offset); - return *p; -} -#else -__inline ULONG APICRead(ULONG Offset) -{ - PULONG p; - ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; - - lastregr[CPU] = Offset; - lastvalr[CPU] = 0; - - p = (PULONG)((ULONG)APICBase + Offset); - - lastvalr[CPU] = *p; - return lastvalr[CPU]; -} -#endif - -__inline VOID APICSendEOI(VOID) -{ - // Send the EOI - APICWrite(APIC_EOI, 0); -} - static VOID APICDumpBit(ULONG base) { ULONG v, i, j; @@ -317,7 +251,6 @@ ULONG v, ver, maxlvt; ULONG r1, r2, w1, w2; ULONG CPU = ThisCPU();; - r1 = lastregr[CPU];

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