Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 34736: - Added more hook points. Setup WH_MOUSE with callbacks, seems to be preloaded. Started BroadcastSystemMessage. - Tested with Opera 9.51, FF, Seamonkey, Abiword, Miranda and the rest of our applications.
by jimtabor＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: jimtabor Date: Thu Jul 24 06:38:08 2008 New Revision: 34736 URL: http://svn.reactos.org/svn/reactos?rev=34736&view=rev Log: - Added more hook points. Setup WH_MOUSE with callbacks, seems to be preloaded. Started BroadcastSystemMessage. - Tested with Opera 9.51, FF, Seamonkey, Abiword, Miranda and the rest of our applications. Modified: trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Thu Jul 24 06:38:08 2008 @@ -422,6 +422,7 @@ PKBDLLHOOKSTRUCT KeyboardLlData; PMSLLHOOKSTRUCT MouseLlData; PMSG Msg; + PMOUSEHOOKSTRUCT MHook; Common = (PHOOKPROC_CALLBACK_ARGUMENTS) Arguments; @@ -502,6 +503,10 @@ MouseLlData = (PMSLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) MouseLlData); break; + case WH_MOUSE: + MHook = (PMOUSEHOOKSTRUCT)((PCHAR) Common + Common->lParam); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) MHook); + break; case WH_MSGFILTER: case WH_SYSMSGFILTER: case WH_GETMESSAGE: Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Thu Jul 24 06:38:08 2008 @@ -2560,15 +2560,6 @@ return IsDialogMessageW( hwndDlg, &msg ); } -typedef struct _BROADCASTPARM -{ - DWORD flags; - DWORD recipients; - HDESK hDesk; - HWND hWnd; - LUID luid; -} BROADCASTPARM, *PBROADCASTPARM; - LONG STDCALL IntBroadcastSystemMessage( Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Thu Jul 24 06:38:08 2008 @@ -392,7 +392,14 @@ ATOM Atom; } PROPERTY, *PPROPERTY; - +typedef struct _BROADCASTPARM +{ + DWORD flags; + DWORD recipients; + HDESK hDesk; + HWND hWnd; + LUID luid; +} BROADCASTPARM, *PBROADCASTPARM; PW32THREADINFO GetW32ThreadInfo(VOID); PW32PROCESSINFO GetW32ProcessInfo(VOID); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Thu Jul 24 06:38:08 2008 @@ -379,6 +379,9 @@ case WH_MOUSE_LL: ArgumentLength += sizeof(MSLLHOOKSTRUCT); break; + case WH_MOUSE: + ArgumentLength += sizeof(MOUSEHOOKSTRUCT); + break; case WH_MSGFILTER: case WH_SYSMSGFILTER: case WH_GETMESSAGE: @@ -444,6 +447,10 @@ RtlCopyMemory(Extra, (PVOID) lParam, sizeof(MSLLHOOKSTRUCT)); Common->lParam = (LPARAM) (Extra - (PCHAR) Common); break; + case WH_MOUSE: + RtlCopyMemory(Extra, (PVOID) lParam, sizeof(MOUSEHOOKSTRUCT)); + Common->lParam = (LPARAM) (Extra - (PCHAR) Common); + break; case WH_MSGFILTER: case WH_SYSMSGFILTER: case WH_GETMESSAGE: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Thu Jul 24 06:38:08 2008 @@ -658,6 +658,7 @@ BOOL Present, RemoveMessages; USER_REFERENCE_ENTRY Ref; USHORT HitTest; + MOUSEHOOKSTRUCT MHook; /* The queues and order in which they are checked are documented in the MSDN article on GetMessage() */ @@ -814,9 +815,51 @@ goto CheckMessages; } MsgExit: + if ( ISITHOOKED(WH_MOUSE) && + Msg->Msg.message >= WM_MOUSEFIRST && + Msg->Msg.message <= WM_MOUSELAST ) + { + MHook.pt = Msg->Msg.pt; + MHook.hwnd = Msg->Msg.hwnd; + MHook.wHitTestCode = HitTest; + MHook.dwExtraInfo = 0; + if (co_HOOK_CallHooks( WH_MOUSE, + RemoveMsg ? HC_ACTION : HC_NOREMOVE, + Msg->Msg.message, + (LPARAM)&MHook )) + { + if (ISITHOOKED(WH_CBT)) + { + MHook.pt = Msg->Msg.pt; + MHook.hwnd = Msg->Msg.hwnd; + MHook.wHitTestCode = HitTest; + MHook.dwExtraInfo = 0; + co_HOOK_CallHooks( WH_CBT, HCBT_CLICKSKIPPED, + Msg->Msg.message, (LPARAM)&MHook); + } + return FALSE; + } + } + if ( ISITHOOKED(WH_KEYBOARD) && + (Msg->Msg.message == WM_KEYDOWN || Msg->Msg.message == WM_KEYUP) ) + { + if (co_HOOK_CallHooks( WH_KEYBOARD, + RemoveMsg ? HC_ACTION : HC_NOREMOVE, + LOWORD(Msg->Msg.wParam), + Msg->Msg.lParam)) + { + if (ISITHOOKED(WH_CBT)) + { + /* skip this message */ + co_HOOK_CallHooks( WH_CBT, HCBT_KEYSKIPPED, + LOWORD(Msg->Msg.wParam), Msg->Msg.lParam ); + } + return FALSE; + } + } // The WH_GETMESSAGE hook enables an application to monitor messages about to // be returned by the GetMessage or PeekMessage function. - if(ISITHOOKED(WH_GETMESSAGE)) + if (ISITHOOKED(WH_GETMESSAGE)) { //DPRINT1("Peek WH_GETMESSAGE -> %x\n",&Msg); co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)&Msg->Msg); @@ -863,7 +906,6 @@ } Present = co_IntPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, RemoveMsg); - if (Present) { @@ -1506,8 +1548,7 @@ } else { - if(!co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result)) - { + if(!co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result)) { Result = 0; } } @@ -1863,14 +1904,93 @@ { return 0; } - UserRefObjectCo(Window, &Ref); switch(dwType) { case FNID_DEFWINDOWPROC: + UserRefObjectCo(Window, &Ref); lResult = IntDefWindowProc(Window, Msg, wParam, lParam, Ansi); + UserDerefObjectCo(Window); break; - } - UserDerefObjectCo(Window); + case FNID_BROADCASTSYSTEMMESSAGE: + { + PBROADCASTPARM parm; + BOOL BadChk = FALSE; + DWORD_PTR RetVal = 0; + lResult = -1; + + if (ResultInfo) + { + _SEH_TRY + { + ProbeForWrite((PVOID)ResultInfo, + sizeof(BROADCASTPARM), + 1); + parm = (PBROADCASTPARM)ResultInfo; + } + _SEH_HANDLE + { + BadChk = TRUE; + } + _SEH_END; + if (BadChk) break; + } + else + break; + + if ( parm->recipients & BSM_ALLDESKTOPS || + parm->recipients == BSM_ALLCOMPONENTS ) + { + } + else if (parm->recipients & BSM_APPLICATIONS) + { + if (parm->flags & BSF_QUERY) + { + if (parm->flags & BSF_FORCEIFHUNG || parm->flags & BSF_NOHANG) + { + co_IntSendMessageTimeout( HWND_BROADCAST, + Msg, + wParam, + lParam, + SMTO_ABORTIFHUNG, + 2000, + &RetVal); + } + else if (parm->flags & BSF_NOTIMEOUTIFNOTHUNG) + { +#define SMTO_NOTIMEOUTIFNOTHUNG 0x0008 + co_IntSendMessageTimeout( HWND_BROADCAST, + Msg, + wParam, + lParam, + SMTO_NOTIMEOUTIFNOTHUNG, + 2000, + &RetVal); + } + else + { + co_IntSendMessageTimeout( HWND_BROADCAST, + Msg, + wParam, + lParam, + SMTO_NORMAL, + 2000, + &RetVal); + } + } + else if (parm->flags & BSF_POSTMESSAGE) + { + lResult = UserPostMessage(HWND_BROADCAST, Msg, wParam, lParam); + } + else if ( parm->flags & BSF_SENDNOTIFYMESSAGE) + { + lResult = UserSendNotifyMessage(HWND_BROADCAST, Msg, wParam, lParam); + } + } + } + break; + case FNID_SENDMESSAGECALLBACK: + break; + } UserLeave(); return lResult; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Thu Jul 24 06:38:08 2008 @@ -70,7 +70,22 @@ static VOID FASTCALL IdlePing(VOID) { + HWND hWnd; + PWINDOW_OBJECT Window; PW32PROCESS W32d = PsGetCurrentProcessWin32Process(); + + hWnd = UserGetForegroundWindow(); + + Window = UserGetWindowObject(hWnd); + + if (Window && Window->Wnd && (Window->Wnd->ti == GetW32ThreadInfo())) + { + if (ISITHOOKED(WH_FOREGROUNDIDLE)) + { + co_HOOK_CallHooks(WH_FOREGROUNDIDLE,HC_ACTION,0,0); + } + } + if (W32d && W32d->InputIdleEvent) KePulseEvent( W32d->InputIdleEvent, EVENT_INCREMENT, TRUE); } @@ -159,6 +174,7 @@ LARGE_INTEGER LargeTickCount; KIRQL OldIrql; ULONG Prev; + EVENTMSG Event; IntLockSystemMessageQueue(OldIrql); @@ -175,6 +191,13 @@ KeQueryTickCount(&LargeTickCount); Msg->time = MsqCalculateMessageTime(&LargeTickCount); + + Event.message = Msg->message; + Event.time = Msg->time; + Event.hwnd = Msg->hwnd; + Event.paramL = Msg->pt.x; + Event.paramH = Msg->pt.y; + co_HOOK_CallHooks( WH_JOURNALRECORD, HC_ACTION, 0, (LPARAM)&Event); /* * If we got WM_MOUSEMOVE and there are already messages in the @@ -713,20 +736,36 @@ MSG Msg; LARGE_INTEGER LargeTickCount; KBDLLHOOKSTRUCT KbdHookData; + EVENTMSG Event; + + DPRINT("MsqPostKeyboardMessage(uMsg 0x%x, wParam 0x%x, lParam 0x%x)\n", + uMsg, wParam, lParam); // Condition may arise when calling MsqPostMessage and waiting for an event. if (!UserIsEntered()) UserEnterExclusive(); // Fixme: Not sure ATM if this thread is locked. - DPRINT("MsqPostKeyboardMessage(uMsg 0x%x, wParam 0x%x, lParam 0x%x)\n", - uMsg, wParam, lParam); + FocusMessageQueue = IntGetFocusMessageQueue(); Msg.hwnd = 0; + + if (FocusMessageQueue && (FocusMessageQueue->FocusWindow != (HWND)0)) + Msg.hwnd = FocusMessageQueue->FocusWindow; + Msg.message = uMsg; Msg.wParam = wParam; Msg.lParam = lParam; KeQueryTickCount(&LargeTickCount); Msg.time = MsqCalculateMessageTime(&LargeTickCount); + + Event.message = Msg.message; + Event.hwnd = Msg.hwnd; + Event.time = Msg.time; + Event.paramL = (Msg.wParam & 0xFF) | (HIWORD(Msg.lParam) << 8); + Event.paramH = Msg.lParam & 0x7FFF; + if (HIWORD(Msg.lParam) & 0x0100) Event.paramH |= 0x8000; + co_HOOK_CallHooks( WH_JOURNALRECORD, HC_ACTION, 0, (LPARAM)&Event); + /* We can't get the Msg.pt point here since we don't know thread (and thus the window station) the message will end up in yet. */ @@ -744,7 +783,6 @@ return; } - FocusMessageQueue = IntGetFocusMessageQueue(); if (FocusMessageQueue == NULL) { DPRINT("No focus message queue\n");

1 0

[tkreuzer] 34735: - mark special pages - move some definitions to arch/amd64.h
by tkreuzer＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: tkreuzer Date: Thu Jul 24 06:32:40 2008 New Revision: 34735 URL: http://svn.reactos.org/svn/reactos?rev=34735&view=rev Log: - mark special pages - move some definitions to arch/amd64.h Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch.h branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] Thu Jul 24 06:32:40 2008 @@ -2,10 +2,10 @@ .text .code16 +#define ASM +#include <arch.h> + //.org 0x8000 - -#define STACK16ADDR 0x7000 /* The 16-bit stack top will be at 0000:7000 */ -#define STACK64ADDR 0x74000 /* The 64-bit stack top will be at 0x74000 */ .global RealEntryPoint RealEntryPoint: @@ -95,16 +95,6 @@ * We define 512 2MB pages at the start of memory, so we can access the first * 1 GB as if paging was disabled */ - -#define PML4_PAGENUM 60 // Put it high enough so it doesn't interfere with freeldr - -#define PAGESIZE 4096 -#define PDP_PAGENUM (PML4_PAGENUM + 1) -#define PD_PAGENUM (PDP_PAGENUM + 1) -#define PML4_ADDRESS (PML4_PAGENUM * PAGESIZE) -#define PDP_ADDRESS (PDP_PAGENUM * PAGESIZE) -#define PML4_SEG (PML4_ADDRESS / 16) - x86_16_BuildPageTables: pusha push es @@ -117,9 +107,9 @@ /* One entry in the PML4 pointing to PDP */ mov eax, (PDP_PAGENUM << 12) | 0x00f stosd - xor ax,ax - mov cx, 0x07fe - rep stosw + xor eax, eax + mov cx, 0x03ff + rep stosd /* One entry in the PDP pointing to PD */ mov eax, (PD_PAGENUM << 12) | 0x00f @@ -148,11 +138,6 @@ popa ret - -#define LMODE_CS 0x08 -#define LMODE_DS 0x10 -#define RMODE_CS 0x18 /* RMode code selector, base 0 limit 64k */ -#define RMODE_DS 0x20 /* RMode data selector, base 0 limit 64k */ //.global x86_16_SwitchToLong x86_16_SwitchToLong: Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch.h [iso-8859-1] Thu Jul 24 06:32:40 2008 @@ -20,6 +20,10 @@ #ifndef __ARCH_H #define __ARCH_H + +#ifdef _M_AMD64 +#include <arch/amd64/amd64.h> +#endif /* Defines needed for switching between real and protected mode */ #define NULL_DESC 0x00 /* NULL descriptor */ @@ -55,35 +59,6 @@ #ifndef ASM #include <pshpack1.h> -#ifdef _M_AMD64 -typedef struct -{ - unsigned long rax; - unsigned long rbx; - unsigned long rcx; - unsigned long rdx; - - unsigned long rsi; - unsigned long rdi; - - unsigned long r8; - unsigned long r9; - unsigned long r10; - unsigned long r11; - unsigned long r12; - unsigned long r13; - unsigned long r14; - unsigned long r15; - - unsigned short ds; - unsigned short es; - unsigned short fs; - unsigned short gs; - - unsigned long rflags; - -} QWORDREGS; -#endif typedef struct { unsigned long eax; Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Thu Jul 24 06:32:40 2008 @@ -21,7 +21,54 @@ #ifndef __AMD64_AMD64_H_ #define __AMD64_AMD64_H_ +#define STACK64ADDR 0x74000 /* The 64-bit stack top will be at 0x74000 */ +#define LMODE_CS 0x08 +#define LMODE_DS 0x10 + +/* Where we put out initial page tables */ +#define PML4_PAGENUM 60 // Put it high enough so it doesn't interfere with freeldr + +#define PAGESIZE 4096 +#define PDP_PAGENUM (PML4_PAGENUM + 1) +#define PD_PAGENUM (PDP_PAGENUM + 1) +#define PML4_ADDRESS (PML4_PAGENUM * PAGESIZE) +#define PDP_ADDRESS (PDP_PAGENUM * PAGESIZE) +#define PML4_SEG (PML4_ADDRESS / 16) +#define PML4_PAGES 3 +#define PAGETABLE_SIZE PML4_PAGES * PAGESIZE + +#if 0 +#ifndef ASM +typedef struct +{ + unsigned long long rax; + unsigned long long rbx; + unsigned long long rcx; + unsigned long long rdx; + + unsigned long long rsi; + unsigned long long rdi; + + unsigned long long r8; + unsigned long long r9; + unsigned long long r10; + unsigned long long r11; + unsigned long long r12; + unsigned long long r13; + unsigned long long r14; + unsigned long long r15; + + unsigned short ds; + unsigned short es; + unsigned short fs; + unsigned short gs; + + unsigned long long rflags; + +} QWORDREGS; +#endif /* ! ASM */ +#endif #endif /* __AMD64_AMD64_H_ */ Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Thu Jul 24 06:32:40 2008 @@ -97,7 +97,7 @@ MmUpdateLastFreePageHint(PageLookupTableAddress, TotalPagesInLookupTable); // Add machine-dependent stuff -#ifdef __i386__ +#if defined (__i386__) || defined (_M_AMD64) MmMarkPagesInLookupTable(PageLookupTableAddress, 0x00, 1, LoaderFirmwarePermanent); // realmode int vectors MmMarkPagesInLookupTable(PageLookupTableAddress, 0x01, 7, LoaderFirmwareTemporary); // freeldr stack + cmdline MmMarkPagesInLookupTable(PageLookupTableAddress, 0x08, 0x70, LoaderLoadedProgram); // freeldr image (roughly max. 0x64 pages) @@ -106,6 +106,9 @@ MmMarkPagesInLookupTable(PageLookupTableAddress, 0x90, 0x10, LoaderOsloaderHeap); // Disk read buffer for int 13h. DISKREADBUFFER MmMarkPagesInLookupTable(PageLookupTableAddress, 0xA0, 0x60, LoaderFirmwarePermanent); // ROM / Video MmMarkPagesInLookupTable(PageLookupTableAddress, 0xFFF, 1, LoaderSpecialMemory); // unusable memory +#if defined (_M_AMD64) + MmMarkPagesInLookupTable(PageLookupTableAddress, PML4_PAGENUM, PML4_PAGES, LoaderSpecialMemory); // the page table +#endif #elif __arm__ MmMarkPagesInLookupTable(PageLookupTableAddress, 0x00, 1, LoaderFirmwarePermanent); // arm exception handlers MmMarkPagesInLookupTable(PageLookupTableAddress, 0x01, 7, LoaderFirmwareTemporary); // arm board block + freeldr stack + cmdline

1 0

[fireball] 34734: Dmitry Gorbachev - Fix warnings in host tools. See issue #3539 for more details.
by fireball＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: fireball Date: Thu Jul 24 06:05:22 2008 New Revision: 34734 URL: http://svn.reactos.org/svn/reactos?rev=34734&view=rev Log: Dmitry Gorbachev - Fix warnings in host tools. See issue #3539 for more details. Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/sysreg/os_support.cpp Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] Thu Jul 24 06:05:22 2008 @@ -1694,8 +1694,7 @@ return CAB_STATUS_INVALID_CAB; } - *(unsigned char**)&CurrentIBuffer += BytesRead; - + CurrentIBuffer = (unsigned char*)CurrentIBuffer + BytesRead; CurrentIBufferSize += (USHORT)BytesRead; if (CurrentIBufferSize == CAB_BLOCKSIZE) @@ -3573,8 +3572,8 @@ CurrentFolderNode->TotalFolderSize += (BytesWritten + sizeof(CFDATA)); CurrentFolderNode->Folder.DataBlockCount++; - *(unsigned char**)&CurrentOBuffer += DataNode->Data.CompSize; - CurrentOBufferSize -= DataNode->Data.CompSize; + CurrentOBuffer = (unsigned char*)CurrentOBuffer + DataNode->Data.CompSize; + CurrentOBufferSize -= DataNode->Data.CompSize; LastBlockStart += DataNode->Data.UncompSize; Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/os_support.cpp [iso-8859-1] Thu Jul 24 06:05:22 2008 @@ -22,6 +22,8 @@ size_t i; #if 0 // gettimeofday(&tm, 0); +#else + memset(&tm, 0, sizeof(tm)); #endif for (i = 0; i < s_Entries.size(); i++) {

1 0

[tkreuzer] 34733: - create 512 2 MB pages first, so we have a max of 1 GB available memory. This gets us much further through hardware detection. the setup screen loads and then it stops with "failed to load the ANSI codepage file"
by tkreuzer＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: tkreuzer Date: Thu Jul 24 05:26:15 2008 New Revision: 34733 URL: http://svn.reactos.org/svn/reactos?rev=34733&view=rev Log: - create 512 2 MB pages first, so we have a max of 1 GB available memory. This gets us much further through hardware detection. the setup screen loads and then it stops with "failed to load the ANSI codepage file" Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] Thu Jul 24 05:26:15 2008 @@ -92,8 +92,8 @@ /* - * We defines one 2MB page at the start of memory, so we can access the first - * 2MBs as if paging was disabled + * We define 512 2MB pages at the start of memory, so we can access the first + * 1 GB as if paging was disabled */ #define PML4_PAGENUM 60 // Put it high enough so it doesn't interfere with freeldr @@ -115,29 +115,33 @@ xor di, di /* One entry in the PML4 pointing to PDP */ - mov ax, ((PDP_PAGENUM << 12) & 0xffff) | 0x00f - stosw - mov ax, (PDP_PAGENUM >> 4) - stosw + mov eax, (PDP_PAGENUM << 12) | 0x00f + stosd xor ax,ax mov cx, 0x07fe rep stosw /* One entry in the PDP pointing to PD */ - mov ax, ((PD_PAGENUM << 12) & 0xffff) | 0x00f - stosw - mov ax, (PD_PAGENUM >> 4) - stosw - xor ax,ax - mov cx, 0x07fe - rep stosw - - /* One entry in the PD defining a 2MB page */ - mov ax, 0x018f - stosw - xor ax,ax - mov cx,0x07ff - rep stosw + mov eax, (PD_PAGENUM << 12) | 0x00f + stosd + + xor eax, eax + mov ecx, 0x03ff + rep stosd + + /* 512 entries in the PD defining a 2MB page each */ + mov ecx, 512 + mov eax, 0x008f + +Bpt2: + mov es: [di], eax + mov dword ptr es: [di + 4], 0 + add eax, 512 << 12 // add 512 4k pages + add di, 8 + + /* Loop it */ + dec cx + jnz Bpt2 /* Return */ pop es @@ -258,6 +262,7 @@ ret + /** Some data *****************************************************************/ .code64

1 0

[pschweitzer] 34732: Bugfix in FsRtlDissectDbcs and FsRtlDissectName: After tests, it appears that, on Windows, MaximumLength is set to Length. That way, we avoid some calculation problems that occurred.
by pschweitzer＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: pschweitzer Date: Thu Jul 24 03:45:26 2008 New Revision: 34732 URL: http://svn.reactos.org/svn/reactos?rev=34732&view=rev Log: Bugfix in FsRtlDissectDbcs and FsRtlDissectName: After tests, it appears that, on Windows, MaximumLength is set to Length. That way, we avoid some calculation problems that occurred. Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c branches/pierre-fsd/ntoskrnl/fsrtl/name.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/dbcsn… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Thu Jul 24 03:45:26 2008 @@ -85,14 +85,14 @@ /* Set up the first result string */ FirstPart->Buffer = Name.Buffer + SkipFirstSlash; FirstPart->Length = (FirstPosition - SkipFirstSlash) * sizeof(CHAR); - FirstPart->MaximumLength = Name.MaximumLength - FirstPart->Length; + FirstPart->MaximumLength = FirstPart->Length; /* And second one, if necessary */ if (FirstPosition < (Name.Length / sizeof(CHAR))) { RemainingPart->Buffer = Name.Buffer + FirstPosition + 1; RemainingPart->Length = Name.Length - (FirstPosition + 1) * sizeof(CHAR); - RemainingPart->MaximumLength = Name.MaximumLength - RemainingPart->Length; + RemainingPart->MaximumLength = RemainingPart->Length; } } Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/name.… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] Thu Jul 24 03:45:26 2008 @@ -173,14 +173,14 @@ /* Set up the first result string */ FirstPart->Buffer = Name.Buffer + SkipFirstSlash; FirstPart->Length = (FirstPosition - SkipFirstSlash) * sizeof(WCHAR); - FirstPart->MaximumLength = Name.MaximumLength - FirstPart->Length; + FirstPart->MaximumLength = FirstPart->Length; /* And second one, if necessary */ if (FirstPosition < (Name.Length / sizeof(WCHAR))) { RemainingPart->Buffer = Name.Buffer + FirstPosition + 1; RemainingPart->Length = Name.Length - (FirstPosition + 1) * sizeof(WCHAR); - RemainingPart->MaximumLength = Name.MaximumLength - RemainingPart->Length; + RemainingPart->MaximumLength = RemainingPart->Length; } }

1 0

[pschweitzer] 34731: Bugfix in FsRtlIsHpfsDbcsLegal and FsRtlIsFatDbcsLegal: First byte of double byte character cannot finish the string
by pschweitzer＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: pschweitzer Date: Thu Jul 24 03:19:00 2008 New Revision: 34731 URL: http://svn.reactos.org/svn/reactos?rev=34731&view=rev Log: Bugfix in FsRtlIsHpfsDbcsLegal and FsRtlIsFatDbcsLegal: First byte of double byte character cannot finish the string Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/dbcsn… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Thu Jul 24 03:19:00 2008 @@ -252,6 +252,8 @@ /* First make sure the character it's not the Lead DBCS */ if (FsRtlIsLeadDbcsCharacter(FirstPart.Buffer[i])) { + if (i == (FirstPart.Length / sizeof(CHAR)) - 1) + return FALSE; i++; } else if ((FirstPart.Buffer[i] < 0x1F) || (FirstPart.Buffer[i] == 0x22) || @@ -392,6 +394,8 @@ /* First make sure the character it's not the Lead DBCS */ if (FsRtlIsLeadDbcsCharacter(FirstPart.Buffer[i])) { + if (i == (FirstPart.Length / sizeof(CHAR)) - 1) + return FALSE; i++; } else if ((FirstPart.Buffer[i] < 0x1F) || (FirstPart.Buffer[i] == 0x22) ||

1 0

[sserapion] 34730: Fix Implicit declaration warnings. code->commit->????->profit!
by sserapion＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: sserapion Date: Thu Jul 24 03:10:16 2008 New Revision: 34730 URL: http://svn.reactos.org/svn/reactos?rev=34730&view=rev Log: Fix Implicit declaration warnings. code->commit->????->profit! Modified: branches/ros-amd64-bringup/reactos/tools/wmc/mcy.tab.c Modified: branches/ros-amd64-bringup/reactos/tools/wmc/mcy.tab.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/wmc/mcy.tab.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/wmc/mcy.tab.c [iso-8859-1] Thu Jul 24 03:10:16 2008 @@ -118,7 +118,7 @@ #include <stdio.h> #include <stdlib.h> #include <assert.h> - +#include <string.h> #include "utils.h" #include "wmc.h" #include "lang.h"

1 0

[gedmurphy] 34729: - dependencies is a double terminated string array - patch by bugboy <martinmnet at hotmail dot com>
by gedmurphy＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: gedmurphy Date: Thu Jul 24 02:57:20 2008 New Revision: 34729 URL: http://svn.reactos.org/svn/reactos?rev=34729&view=rev Log: - dependencies is a double terminated string array - patch by bugboy <martinmnet at hotmail dot com> Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Thu Jul 24 02:57:20 2008 @@ -502,7 +502,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } - MultiByteToWideChar(CP_ACP, 0, lpDependencies, -1, lpDependenciesW, dwDependenciesLength); + MultiByteToWideChar(CP_ACP, 0, lpDependencies, dwDependenciesLength, lpDependenciesW, dwDependenciesLength); } if (lpServiceStartName)

1 0

[tkreuzer] 34728: forgot this one: a stubbed out loader.c copied from i386
by tkreuzer＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: tkreuzer Date: Wed Jul 23 21:30:36 2008 New Revision: 34728 URL: http://svn.reactos.org/svn/reactos?rev=34728&view=rev Log: forgot this one: a stubbed out loader.c copied from i386 Added: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c (with props) Added: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c (added) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Wed Jul 23 21:30:36 2008 @@ -1,0 +1,216 @@ +/* + * FreeLoader + * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 2005 Alex Ionescu <alex(a)relsoft.net> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#define _NTSYSTEM_ +#include <freeldr.h> + +#define NDEBUG +#include <debug.h> +#undef DbgPrint + +/* Page Directory and Tables for non-PAE Systems */ +extern PAGE_DIRECTORY_X86 startup_pagedirectory; +extern PAGE_DIRECTORY_X86 lowmem_pagetable; +extern PAGE_DIRECTORY_X86 kernel_pagetable; +extern PAGE_DIRECTORY_X86 hyperspace_pagetable; +extern PAGE_DIRECTORY_X86 apic_pagetable; +extern PAGE_DIRECTORY_X86 kpcr_pagetable; +extern PAGE_DIRECTORY_X86 kuser_pagetable; +extern ULONG_PTR KernelBase; +extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; +/* FUNCTIONS *****************************************************************/ + +/*++ + * FrLdrStartup + * INTERNAL + * + * Prepares the system for loading the Kernel. + * + * Params: + * Magic - Multiboot Magic + * + * Returns: + * None. + * + * Remarks: + * None. + * + *--*/ +VOID +NTAPI +FrLdrStartup(ULONG Magic) +{ + ASSERT(FALSE); +#if 0 + /* Disable Interrupts */ + _disable(); + + /* Re-initalize EFLAGS */ + Ke386EraseFlags(); + + /* Initialize the page directory */ + FrLdrSetupPageDirectory(); + + /* Initialize Paging, Write-Protection and Load NTOSKRNL */ + FrLdrSetupPae(Magic); +#endif +} + +/*++ + * FrLdrSetupPae + * INTERNAL + * + * Configures PAE on a MP System, and sets the PDBR if it's supported, or if + * the system is UP. + * + * Params: + * Magic - Multiboot Magic + * + * Returns: + * None. + * + * Remarks: + * None. + * + *--*/ +VOID +FASTCALL +FrLdrSetupPae(ULONG Magic) +{ +#if 0 + ULONG_PTR PageDirectoryBaseAddress = (ULONG_PTR)&startup_pagedirectory; + + /* Set the PDBR */ + __writecr3(PageDirectoryBaseAddress); + + /* Enable Paging and Write Protect*/ + __writecr0(__readcr0() | X86_CR0_PG | X86_CR0_WP); + + /* Jump to Kernel */ + (*KernelEntryPoint)(Magic, &LoaderBlock); +#endif +} + +/*++ + * FrLdrSetupPageDirectory + * INTERNAL + * + * Sets up the ReactOS Startup Page Directory. + * + * Params: + * None. + * + * Returns: + * None. + * + * Remarks: + * We are setting PDEs, but using the equvivalent (for our purpose) PTE structure. + * As such, please note that PageFrameNumber == PageEntryNumber. + * + *--*/ +VOID +FASTCALL +FrLdrSetupPageDirectory(VOID) +{ +#if 0 + PPAGE_DIRECTORY_X86 PageDir; + ULONG KernelPageTableIndex; + ULONG i; + + /* Get the Kernel Table Index */ + KernelPageTableIndex = KernelBase >> PDE_SHIFT; + + /* Get the Startup Page Directory */ + PageDir = (PPAGE_DIRECTORY_X86)&startup_pagedirectory; + + /* Set up the Low Memory PDE */ + PageDir->Pde[LowMemPageTableIndex].Valid = 1; + PageDir->Pde[LowMemPageTableIndex].Write = 1; + PageDir->Pde[LowMemPageTableIndex].PageFrameNumber = PaPtrToPfn(lowmem_pagetable); + + /* Set up the Kernel PDEs */ + PageDir->Pde[KernelPageTableIndex].Valid = 1; + PageDir->Pde[KernelPageTableIndex].Write = 1; + PageDir->Pde[KernelPageTableIndex].PageFrameNumber = PaPtrToPfn(kernel_pagetable); + PageDir->Pde[KernelPageTableIndex + 1].Valid = 1; + PageDir->Pde[KernelPageTableIndex + 1].Write = 1; + PageDir->Pde[KernelPageTableIndex + 1].PageFrameNumber = PaPtrToPfn(kernel_pagetable + 4096); + + /* Set up the Startup PDE */ + PageDir->Pde[StartupPageTableIndex].Valid = 1; + PageDir->Pde[StartupPageTableIndex].Write = 1; + PageDir->Pde[StartupPageTableIndex].PageFrameNumber = PaPtrToPfn(startup_pagedirectory); + + /* Set up the Hyperspace PDE */ + PageDir->Pde[HyperspacePageTableIndex].Valid = 1; + PageDir->Pde[HyperspacePageTableIndex].Write = 1; + PageDir->Pde[HyperspacePageTableIndex].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable); + + /* Set up the HAL PDE */ + PageDir->Pde[HalPageTableIndex].Valid = 1; + PageDir->Pde[HalPageTableIndex].Write = 1; + PageDir->Pde[HalPageTableIndex].PageFrameNumber = PaPtrToPfn(apic_pagetable); + + /* Set up Low Memory PTEs */ + PageDir = (PPAGE_DIRECTORY_X86)&lowmem_pagetable; + for (i=0; i<1024; i++) + { + PageDir->Pde[i].Valid = 1; + PageDir->Pde[i].Write = 1; + PageDir->Pde[i].Owner = 1; + PageDir->Pde[i].PageFrameNumber = PaToPfn(i * PAGE_SIZE); + } + + /* Set up Kernel PTEs */ + PageDir = (PPAGE_DIRECTORY_X86)&kernel_pagetable; + for (i=0; i<1536; i++) + { + PageDir->Pde[i].Valid = 1; + PageDir->Pde[i].Write = 1; + PageDir->Pde[i].PageFrameNumber = PaToPfn(KERNEL_BASE_PHYS + i * PAGE_SIZE); + } + + /* Setup APIC Base */ + PageDir = (PPAGE_DIRECTORY_X86)&apic_pagetable; + PageDir->Pde[0].Valid = 1; + PageDir->Pde[0].Write = 1; + PageDir->Pde[0].CacheDisable = 1; + PageDir->Pde[0].WriteThrough = 1; + PageDir->Pde[0].PageFrameNumber = PaToPfn(HAL_BASE); + PageDir->Pde[0x200].Valid = 1; + PageDir->Pde[0x200].Write = 1; + PageDir->Pde[0x200].CacheDisable = 1; + PageDir->Pde[0x200].WriteThrough = 1; + PageDir->Pde[0x200].PageFrameNumber = PaToPfn(HAL_BASE + KERNEL_BASE_PHYS); + + /* Setup KUSER_SHARED_DATA Base */ + PageDir->Pde[0x1F0].Valid = 1; + PageDir->Pde[0x1F0].Write = 1; + PageDir->Pde[0x1F0].PageFrameNumber = 2; + + /* Setup KPCR Base*/ + PageDir->Pde[0x1FF].Valid = 1; + PageDir->Pde[0x1FF].Write = 1; + PageDir->Pde[0x1FF].PageFrameNumber = 1; + + /* Zero shared data */ + RtlZeroMemory((PVOID)(2 << MM_PAGE_SHIFT), PAGE_SIZE); +#endif +} + Propchange: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 34727: Implement a LoaderEntry, a function to setup a pagetable, a function to switch to long mode, a function to switch to real mode, Int386 to call interrupts, add some defines for amd64, enable full debug output. now setupldr should compile, and start it's work. It boots into long mode, reads the memory layout from bios and finally crashes, because the page table is limited to a single page of 2MB atm
by tkreuzer＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: tkreuzer Date: Wed Jul 23 21:27:00 2008 New Revision: 34727 URL: http://svn.reactos.org/svn/reactos?rev=34727&view=rev Log: Implement a LoaderEntry, a function to setup a pagetable, a function to switch to long mode, a function to switch to real mode, Int386 to call interrupts, add some defines for amd64, enable full debug output. now setupldr should compile, and start it's work. It boots into long mode, reads the memory layout from bios and finally crashes, because the page table is limited to a single page of 2MB atm Added: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S (with props) branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/int386.S (with props) Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/debug.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/disk.h branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/mm.h Added: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S (added) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] Wed Jul 23 21:27:00 2008 @@ -1,0 +1,303 @@ +.intel_syntax noprefix +.text +.code16 + +//.org 0x8000 + +#define STACK16ADDR 0x7000 /* The 16-bit stack top will be at 0000:7000 */ +#define STACK64ADDR 0x74000 /* The 64-bit stack top will be at 0x74000 */ + +.global RealEntryPoint +RealEntryPoint: + + cli + + /* Setup real mode segment registers */ + xor ax, ax + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax + + /* Setup a real mode stack */ + mov sp, stack16 + + /* Zero BootDrive and BootPartition */ + xor eax, eax + mov _BootDrive, eax + mov _BootPartition, eax + + /* Store the boot drive */ + mov _BootDrive, dl + + /* Store the boot partition */ + mov _BootPartition, dh + + /* Load the GDT */ + lgdt gdtptr + /* Load the IDT */ +// lidt idtptr + + call x86_16_EnableA20 + + call x86_16_BuildPageTables + + /* Switch to long mode */ + call x86_16_SwitchToLong + + .code64 + + /* GO! */ + xor rcx, rcx + call _BootMain + + /* Return into real mode */ + call x86_64_SwitchToReal + .code16 + +// int 0x19 + + /* We should never get here */ +stop: + jmp stop + nop + nop + + +/** 16 Bit helper functions ***************************************************/ +.code16 + +x86_16_Empty8042: + .word 0x00eb,0x00eb // jmp $+2, jmp $+2 + in al, 0x64 + cmp al, 0xff // legacy-free machine without keyboard + jz empty_8042_ret // controllers on Intel Macs read back 0xFF + test al, 0x02 + jnz x86_16_Empty8042 +empty_8042_ret: + ret + +x86_16_EnableA20: + pusha + call x86_16_Empty8042 + mov al, 0xD1 // command write + out 0x64, al + call x86_16_Empty8042 + mov al, 0xDF // A20 on + out 0x60, al + call x86_16_Empty8042 + popa + ret + + +/* + * We defines one 2MB page at the start of memory, so we can access the first + * 2MBs as if paging was disabled + */ + +#define PML4_PAGENUM 60 // Put it high enough so it doesn't interfere with freeldr + +#define PAGESIZE 4096 +#define PDP_PAGENUM (PML4_PAGENUM + 1) +#define PD_PAGENUM (PDP_PAGENUM + 1) +#define PML4_ADDRESS (PML4_PAGENUM * PAGESIZE) +#define PDP_ADDRESS (PDP_PAGENUM * PAGESIZE) +#define PML4_SEG (PML4_ADDRESS / 16) + +x86_16_BuildPageTables: + pusha + push es + + mov ax, PML4_SEG + mov es, ax + cld + xor di, di + + /* One entry in the PML4 pointing to PDP */ + mov ax, ((PDP_PAGENUM << 12) & 0xffff) | 0x00f + stosw + mov ax, (PDP_PAGENUM >> 4) + stosw + xor ax,ax + mov cx, 0x07fe + rep stosw + + /* One entry in the PDP pointing to PD */ + mov ax, ((PD_PAGENUM << 12) & 0xffff) | 0x00f + stosw + mov ax, (PD_PAGENUM >> 4) + stosw + xor ax,ax + mov cx, 0x07fe + rep stosw + + /* One entry in the PD defining a 2MB page */ + mov ax, 0x018f + stosw + xor ax,ax + mov cx,0x07ff + rep stosw + + /* Return */ + pop es + popa + ret + + +#define LMODE_CS 0x08 +#define LMODE_DS 0x10 +#define RMODE_CS 0x18 /* RMode code selector, base 0 limit 64k */ +#define RMODE_DS 0x20 /* RMode data selector, base 0 limit 64k */ + +//.global x86_16_SwitchToLong +x86_16_SwitchToLong: + cli + + xor ax,ax + mov ds,ax + mov es,ax + mov fs,ax + mov gs,ax + mov ss,ax + + /* Get the return address off the stack */ + pop word ptr code64ret + + /* Save 16-bit stack pointer */ + mov stack16, sp + + mov eax, 0x00a0 // Set PAE and PGE: 10100000b + mov cr4, eax + + mov edx, PML4_ADDRESS // Point cr3 at PML4 + mov cr3, edx + + mov ecx, 0xC0000080 // Specify EFER MSR + + rdmsr // Enable long mode + or eax, 0x00000100 + wrmsr + + mov ebx, cr0 // Activate long mode + or ebx, 0x80000001 // by enabling paging and protection simultaneously + mov cr0, ebx // skipping protected mode entirely + + jmp LMODE_CS:offset LongCat //Load CS with 64 bit segment and flush the instruction cache + +.code64 +LongCat: + /* Set up 64 bit stack */ + mov rsp, stack64 + + /* Put the return address back onto the stack */ + push qword ptr code64ret + + /* Now return in long mode! */ + ret + + +/** 64 But functions **********************************************************/ +.code64 + +.global x86_64_SwitchToReal +x86_64_SwitchToReal: + + /* Get the return address off the stack */ + pop qword ptr code64ret + + /* Save 64-bit stack pointer */ + mov stack64, rsp + + /* Step 1 - deactivate long mode, by disabling paging */ + mov rax, cr0 + and rax, 0x000000007fffffff //~0x80000000 + mov cr0, rax + + /* Step 2 - disable long mode in EFER MSR */ + mov rcx, 0xC0000080 // Specify EFER MSR + rdmsr + and eax, ~0x00000100 // Disable EFER.LME + wrmsr + + .code32 + /* jmp to 16-bit segment to set the limit correctly */ + jmp RMODE_CS: offset SwitchToReal2 + +SwitchToReal2: + .code16 + + /* Step 3 - Disable Protected Mode */ + mov eax, cr0 + and eax, ~0x00000001 + mov cr0, eax + + /* Clear prefetch queue & correct CS */ + jmp 0:offset BeReal + +BeReal: + /* Restore segment registers */ + mov ax, 0 + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax + + /* Rstore 16 bit stack */ + mov sp, stack16 + +// lidt rmode_idtptr /* Load IDTR with real mode value */ + +// sti /* These are ok now */ + + /* Put the return address back onto the stack */ + push word ptr code64ret + + /* Now return in real mode! */ + ret + + +/** Some data *****************************************************************/ + +.code64 + +stack16: + .quad STACK16ADDR + +stack64: + .quad STACK64ADDR + +code64ret: + .quad 0 + +gdt: + .quad 0x0000000000000000 + .quad 0x0020980000000000 + .quad 0x0000900000000000 + .word 0xFFFF, 0x0000, 0x9E00, 0x0000 /* 16-bit real mode CS */ + .word 0xFFFF, 0x0000, 0x9200, 0x0000 /* 16-bit real mode DS */ + +/* GDT table pointer */ +gdtptr: + .word 0x27 /* Limit */ + .long gdt /* Base Address */ + + +.global _BootDrive +_BootDrive: + .long 0 + +.global _BootPartition +_BootPartition: + .long 0 + + +/////////////////////////////////////////////////////////////////////////////// + +/* Need to include them here, because of linking issues between 64 / 16 bit */ +//#include "debug16.S" +#include "int386.S" +#include "boot.S" +#include "i386pnp.S" + Propchange: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/int386.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/int386.S (added) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/int386.S [iso-8859-1] Wed Jul 23 21:27:00 2008 @@ -1,0 +1,170 @@ +/* + * FreeLoader + * Copyright (C) 1998-2002 Brian Palmer <brianp(a)sginet.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + .intel_syntax noprefix + .text + .code16 + +#define ASM +#include <arch.h> + + +Int386_REGS: + +Int386_eax: + .long 0 +Int386_ebx: + .long 0 +Int386_ecx: + .long 0 +Int386_edx: + .long 0 + +Int386_esi: + .long 0 +Int386_edi: + .long 0 + +Int386_ds: + .word 0 +Int386_es: + .word 0 +Int386_fs: + .word 0 +Int386_gs: + .word 0 + +Int386_eflags: + .long 0 + +Int386_vector: + .quad 0 +Int386_regsin: + .quad 0 +Int386_regsout: + .quad 0 + +/* + * int Int386(int ivec, REGS* in, REGS* out); + */ +EXTERN(_Int386) + .code64 + + /* Get the function parameters */ + mov Int386_vector, rcx + mov Int386_vector_opcode, cl + mov Int386_regsin, rdx + mov Int386_regsout, r8 + + /* Save all registers + segment registers */ +// push ds +// push es + push fs + push gs + push rbx + push rcx + push rdx + push rsi + push rdi + + /* Copy the input regs to our variables */ + lea rdi, Int386_REGS + mov esi, Int386_regsin + mov ecx, 0x24 + rep movsb + + call x86_64_SwitchToReal + .code16 + + /* Setup the registers */ + mov ax, cs:Int386_ds + mov ds, ax /* DS register */ + mov ax, cs:Int386_es + mov es, ax /* ES register */ + mov ax, cs:Int386_fs + mov fs, ax /* FS register */ + mov ax, cs:Int386_gs + mov gs, ax /* GS register */ + + mov eax, cs:Int386_eax /* EAX register */ + mov ebx, cs:Int386_ebx /* EBX register */ + mov ecx, cs:Int386_ecx /* ECX register */ + mov edx, cs:Int386_edx /* EDX register */ + + mov esi, cs:Int386_esi /* ESI register */ + mov edi, cs:Int386_edi /* EDI register */ + + /* Do not set the flags register */ + /* only return its value in regsout */ + //pushl Int386_eflags + //popfl /* EFLAGS register */ + + /* Call the interrupt vector */ + /*int Int386_vector*/ +Int386_int_opcode: + .byte 0xcd +Int386_vector_opcode: + .byte 0x00 + + /* Save the registers */ + mov cs:Int386_eax, eax /* EAX register */ + mov cs:Int386_ebx, ebx /* EBX register */ + mov cs:Int386_ecx, ecx /* ECX register */ + mov cs:Int386_edx, edx /* EDX register */ + + mov cs:Int386_esi, esi /* ESI register */ + mov cs:Int386_edi, edi /* EDI register */ + + mov ax, ds /* DS register */ + mov cs:Int386_ds, ax + mov ax, es /* ES register */ + mov cs:Int386_es, ax + mov ax, fs /* FS register */ + mov cs:Int386_fs, ax + mov ax, gs /* GS register */ + mov cs:Int386_gs, ax + + pushf + pop cs:Int386_eflags /* EFLAGS register */ + + call x86_16_SwitchToLong + .code64 + + /* Copy the variables to the output regs */ + lea rsi, Int386_REGS + mov rdi, Int386_regsout + mov rcx, 0x24 + rep movsb + + /* Restore segment and all other registers */ + pop rdi + pop rsi + pop rdx + pop rcx + pop rbx + pop gs + pop fs +// pop es +// pop ds + + /* Get return value */ + xor rax, rax + mov eax, Int386_eax + + ret Propchange: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/int386.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Wed Jul 23 21:27:00 2008 @@ -23,11 +23,11 @@ #ifdef DBG -//#define DEBUG_ALL +#define DEBUG_ALL //#define DEBUG_INIFILE //#define DEBUG_REACTOS //#define DEBUG_CUSTOM -#define DEBUG_NONE +//#define DEBUG_NONE #if defined (DEBUG_ALL) ULONG DebugPrintMask = DPRINT_WARNING | DPRINT_MEMORY | DPRINT_FILESYSTEM | @@ -243,7 +243,7 @@ VOID DebugPrint(ULONG Mask, char *format, ...) { va_list ap; - char Buffer[4096]; + char Buffer[2096]; char *ptr = Buffer; // Mask out unwanted debug messages @@ -271,7 +271,7 @@ VOID DebugPrint1(char *format, ...) { va_list ap; - char Buffer[4096]; + char Buffer[2096]; char *ptr = Buffer; va_start(ap, format); Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Wed Jul 23 21:27:00 2008 @@ -84,6 +84,7 @@ <file>i386disk.c</file> <file>i386rtl.c</file> <file>i386vid.c</file> + <file>loader.c</file> <file>pccons.c</file> <file>pcdisk.c</file> <file>pcmem.c</file> Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild [iso-8859-1] Wed Jul 23 21:27:00 2008 @@ -26,7 +26,6 @@ <file>i386cpu.S</file> <file>i386idt.S</file> <file>i386trap.S</file> -  <file>mb.S</file> </directory> </if> Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/disk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] Wed Jul 23 21:27:00 2008 @@ -106,14 +106,14 @@ // i386 BIOS Disk Functions (i386disk.c) // /////////////////////////////////////////////////////////////////////////////////////// -#ifdef __i386__ +#if defined(__i386__) || defined(_M_AMD64) BOOLEAN DiskResetController(ULONG DriveNumber); BOOLEAN DiskInt13ExtensionsSupported(ULONG DriveNumber); //VOID DiskStopFloppyMotor(VOID); BOOLEAN DiskGetExtendedDriveParameters(ULONG DriveNumber, PVOID Buffer, USHORT BufferSize); -#endif // defined __i386__ +#endif // defined __i386__ || defined(_M_AMD64) /////////////////////////////////////////////////////////////////////////////////////// // Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Wed Jul 23 21:27:00 2008 @@ -49,6 +49,17 @@ ( ((a) >> MM_PAGE_SHIFT) + ((a) & MM_PAGE_MASK ? 1 : 0) ) #endif // defined __i386__ or _PPC_ or _MIPS_ + +#if defined (_AMD64_) + +#define MM_PAGE_SIZE 4096 +#define MM_PAGE_MASK 0xFFF +#define MM_PAGE_SHIFT 12 + +#define MM_SIZE_TO_PAGES(a) \ + ( ((a) >> MM_PAGE_SHIFT) + ((a) & MM_PAGE_MASK ? 1 : 0) ) + +#endif // HEAP and STACK size #define HEAP_PAGES 0x400

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