Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[tkreuzer] 34738: - add some files, I forgot to commit - add media directory to build now we load some files and then stop due to missing fastfat.sys
by tkreuzer＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: tkreuzer Date: Thu Jul 24 07:27:40 2008 New Revision: 34738 URL: http://svn.reactos.org/svn/reactos?rev=34738&view=rev Log: - add some files, I forgot to commit - add media directory to build now we load some files and then stop due to missing fastfat.sys Added: branches/ros-amd64-bringup/reactos/boot/bootdata/hivecls_amd64.inf (with props) branches/ros-amd64-bringup/reactos/boot/bootdata/hivedef_amd64.inf (with props) branches/ros-amd64-bringup/reactos/boot/bootdata/hivesft_amd64.inf (with props) branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_amd64.inf (with props) Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… Added: branches/ros-amd64-bringup/reactos/boot/bootdata/hivecls_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Added: branches/ros-amd64-bringup/reactos/boot/bootdata/hivedef_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Added: branches/ros-amd64-bringup/reactos/boot/bootdata/hivesft_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Added: branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/…

1 0

[fireball] 34737: - MiGetLastKernelAddress was totally broken on x86 and always returned the highest available physical page, thus the PFN database always end up at the address 0x80000000 and higher (just before the kernel). And when PFN database's size was bigger than usual (e.g. 1Gb of RAM and more), the PFN database zeroed out the kernel. This logic was introduced by 32640 commit. - Fix the logic so it really gives the last kernel address, as function name suggests. If you want to change the
by fireball＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: fireball Date: Thu Jul 24 07:18:26 2008 New Revision: 34737 URL: http://svn.reactos.org/svn/reactos?rev=34737&view=rev Log: - MiGetLastKernelAddress was totally broken on x86 and always returned the highest available physical page, thus the PFN database always end up at the address 0x80000000 and higher (just before the kernel). And when PFN database's size was bigger than usual (e.g. 1Gb of RAM and more), the PFN database zeroed out the kernel. This logic was introduced by 32640 commit. - Fix the logic so it really gives the last kernel address, as function name suggests. If you want to change the logic of the function, then rename it accordingly. See issue #3507 for more details. Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Thu Jul 24 07:18:26 2008 @@ -342,19 +342,22 @@ PLIST_ENTRY NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR Md; ULONG_PTR LastKrnlPhysAddr = 0; - + for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; NextEntry = NextEntry->Flink) { Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - if (Md->MemoryType != LoaderFree) + + if (Md->MemoryType != LoaderFree && + Md->MemoryType != LoaderFirmwareTemporary && + Md->MemoryType != LoaderSpecialMemory) { if (Md->BasePage+Md->PageCount > LastKrnlPhysAddr) - LastKrnlPhysAddr = Md->BasePage+Md->PageCount; + LastKrnlPhysAddr = Md->BasePage+Md->PageCount; } } - + /* Convert to a physical address */ return LastKrnlPhysAddr << PAGE_SHIFT; }

1 0

[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

← Newer
1
...
23
24
25
26
27
28
29
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008