Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[janderwald] 35624: - Partly fix launching control panel applets
by janderwald＠svn.reactos.org 25 Aug '08

25 Aug '08

Author: janderwald Date: Mon Aug 25 02:54:19 2008 New Revision: 35624 URL: http://svn.reactos.org/svn/reactos?rev=35624&view=rev Log: - Partly fix launching control panel applets Modified: trunk/reactos/dll/win32/shell32/control.c Modified: trunk/reactos/dll/win32/shell32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] Mon Aug 25 02:54:19 2008 @@ -348,7 +348,7 @@ LPWSTR beg = NULL; LPWSTR end; WCHAR ch; - LPWSTR ptr, ptr2; + LPCWSTR ptr, ptr2; WCHAR szName[MAX_PATH]; unsigned sp = 0; LPWSTR extraPmts = NULL; @@ -359,22 +359,32 @@ ptr = wcsrchr(wszCmd, L'\\'); ptr2 = wcsrchr(wszCmd, L','); - if (!ptr || !ptr2) - return; - - Length = (ptr2 - ptr - 1); + if (!ptr2) + { + ptr2 = wszCmd + wcslen(wszCmd) + 1; + } + + if (ptr) + ptr++; + else + ptr = wszCmd; + + Length = (ptr2 - ptr); if (Length >= MAX_PATH) return; - memcpy(szName, ptr + 1, Length * sizeof(WCHAR)); + memcpy(szName, (LPVOID)ptr, Length * sizeof(WCHAR)); szName[Length] = L'\0'; hMutex = CreateMutexW(NULL, FALSE, szName); if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) return; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); - if (!buffer) return; - + if (!buffer) + { + CloseHandle(hMutex); + return; + } end = lstrcpyW(buffer, wszCmd); for (;;) { ch = *end; @@ -399,10 +409,10 @@ end++; } while ((ptr = StrChrW(buffer, '"'))) - memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + memmove((LPVOID)ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); while ((ptr = StrChrW(extraPmts, '"'))) - memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + memmove((LPVOID)ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); TRACE("cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp);

1 0

[amunger] 35623: Add odbc32 to the build system and bootcd. It builds and it's mere presence allows php to load. Please have a look at the .rbuild, it probably needs tweaked.
by amunger＠svn.reactos.org 25 Aug '08

25 Aug '08

Author: amunger Date: Mon Aug 25 02:49:46 2008 New Revision: 35623 URL: http://svn.reactos.org/svn/reactos?rev=35623&view=rev Log: Add odbc32 to the build system and bootcd. It builds and it's mere presence allows php to load. Please have a look at the .rbuild, it probably needs tweaked. Added: trunk/reactos/dll/win32/odbc32/odbc32.rbuild (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Aug 25 02:49:46 2008 @@ -291,6 +291,7 @@ dll\win32\ntdsapi\ntdsapi.dll 1 dll\win32\ntmarta\ntmarta.dll 1 dll\win32\objsel\objsel.dll 1 +dll\win32\odbc32\odbc32.dll 1 dll\win32\odbccp32\odbccp32.dll 1 dll\win32\ole32\ole32.dll 1 dll\win32\oleacc\oleacc.dll 1 Added: trunk/reactos/dll/win32/odbc32/odbc32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/odbc32.rb… ============================================================================== --- trunk/reactos/dll/win32/odbc32/odbc32.rbuild (added) +++ trunk/reactos/dll/win32/odbc32/odbc32.rbuild [iso-8859-1] Mon Aug 25 02:49:46 2008 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="odbc32" type="win32dll" baseaddress="${BASEADDRESS_ODBC32}" installbase="system32" installname="odbc32.dll" allowwarnings="true" > + <importlibrary definition="odbc32.spec.def" /> + <include base="odbc32">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <library>wine</library> + <library>kernel32</library> + <file>proxyodbc.c</file> + <file>odbc32.spec</file> +</module> +</group> Propchange: trunk/reactos/dll/win32/odbc32/odbc32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Mon Aug 25 02:49:46 2008 @@ -211,6 +211,9 @@ <directory name="odbccp32"> <xi:include href="odbccp32/odbccp32.rbuild" /> </directory> +<directory name="odbc32"> + <xi:include href="odbc32/odbc32.rbuild" /> +</directory> <directory name="ole32"> <xi:include href="ole32/ole32.rbuild" /> </directory>

1 0

[tkreuzer] 35622: Move some Pcr init code into KiInitializePcr, use __sldt instead of Ke386SetLocaldescriptorTable, enable KdInitSystem
by tkreuzer＠svn.reactos.org 25 Aug '08

25 Aug '08

Author: tkreuzer Date: Sun Aug 24 20:30:57 2008 New Revision: 35622 URL: http://svn.reactos.org/svn/reactos?rev=35622&view=rev Log: Move some Pcr init code into KiInitializePcr, use __sldt instead of Ke386SetLocaldescriptorTable, enable KdInitSystem Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Sun Aug 24 20:30:57 2008 @@ -378,6 +378,10 @@ /* Setup the processor set */ Pcr->Prcb.MultiThreadProcessorSet = Pcr->Prcb.SetMember; + + /* Clear DR6/7 to cleanup bootloader debugging */ + Pcr->Prcb.ProcessorState.SpecialRegisters.KernelDr6 = 0; + Pcr->Prcb.ProcessorState.SpecialRegisters.KernelDr7 = 0; } VOID @@ -701,10 +705,6 @@ /* Set us as the current process */ InitialThread->ApcState.Process = &KiInitialProcess.Pcb; - /* Clear DR6/7 to cleanup bootloader debugging */ - Pcr->Prcb.ProcessorState.SpecialRegisters.KernelDr6 = 0; - Pcr->Prcb.ProcessorState.SpecialRegisters.KernelDr7 = 0; - /* Setup the IDT */ KeInitExceptions(); @@ -714,7 +714,7 @@ // Ke386SetFs(KGDT_32_R3_TEB | RPL_MASK); /* LDT is unused */ - Ke386SetLocalDescriptorTable(0); + __sldt(0); /* Save NMI and double fault traps */ // RtlCopyMemory(&NmiEntry, &Idt[2], sizeof(KIDTENTRY)); @@ -753,7 +753,7 @@ if (Cpu == 0) { /* Initialize debugging system */ -// KdInitSystem(0, KeLoaderBlock); + KdInitSystem(0, KeLoaderBlock); /* Check for break-in */ // if (KdPollBreakIn()) DbgBreakPointWithStatus(1);

1 0

[tkreuzer] 35621: Update stubs file
by tkreuzer＠svn.reactos.org 25 Aug '08

25 Aug '08

Author: tkreuzer Date: Sun Aug 24 20:06:49 2008 New Revision: 35621 URL: http://svn.reactos.org/svn/reactos?rev=35621&view=rev Log: Update stubs file Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Sun Aug 24 20:06:49 2008 @@ -32,7 +32,6 @@ STUB(NtVdmControl) STUB(KiSwapProcess) STUB(KeGetCurrentProcessorNumber) -STUB(Ke386InitThreadWithContext) STUB(ExpInterlockedPopEntrySList) STUB(ExAllocateFromNPagedLookasideList) STUB(RtlGetCallersAddress) @@ -251,7 +250,6 @@ STUB(KeAcquireInStackQueuedSpinLock) STUB(KeReleaseInStackQueuedSpinLock) STUB(KfAcquireSpinLock) -STUB(KiSaveProcessorControlState) STUB(KeProcessorArchitecture) STUB(KeProcessorLevel) STUB(KeProcessorRevision)

1 0

[tkreuzer] 35620: It's really not good coding style to pass an OUT parameter "by value" to a macro like Ke386GetGlobalDescriptorTable. The Funny thing is that due to a missing memory barrier this macro actually handled this like a "by value" parameter. Of cause this is totally incorrect and led to the strange results I was experiencing. Use __sgdt and __sidt instead and remove the old hack.
by tkreuzer＠svn.reactos.org 25 Aug '08

25 Aug '08

Author: tkreuzer Date: Sun Aug 24 19:25:49 2008 New Revision: 35620 URL: http://svn.reactos.org/svn/reactos?rev=35620&view=rev Log: It's really not good coding style to pass an OUT parameter "by value" to a macro like Ke386GetGlobalDescriptorTable. The Funny thing is that due to a missing memory barrier this macro actually handled this like a "by value" parameter. Of cause this is totally incorrect and led to the strange results I was experiencing. Use __sgdt and __sidt instead and remove the old hack. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Sun Aug 24 19:25:49 2008 @@ -497,7 +497,7 @@ DPRINT1("SMP Boot support not yet present\n"); } FrLdrDbgPrint("before KeInitializeThread\n"); -for(;;); + /* Setup the Idle Thread */ KeInitializeThread(InitProcess, InitThread, @@ -507,6 +507,7 @@ NULL, NULL, IdleStack); +FrLdrDbgPrint("after KeInitializeThread\n"); InitThread->NextProcessor = Number; InitThread->Priority = HIGH_PRIORITY; InitThread->State = Running; @@ -596,15 +597,8 @@ USHORT Tr = 0; /* Get GDT and IDT descriptors */ - Ke386GetGlobalDescriptorTable(GdtDescriptor.Limit); - Ke386GetInterruptDescriptorTable(IdtDescriptor.Limit); - - // FIXME: for some strange reason the gdt needs some time before it's finished... - if (!GdtDescriptor.Base) - { - FrLdrDbgPrint("1. Base = %p, Limit = 0x%x\n", GdtDescriptor.Base, GdtDescriptor.Limit); - } - FrLdrDbgPrint("2. Base = %p, Limit = 0x%x\n", GdtDescriptor.Base, GdtDescriptor.Limit); + __sgdt(&GdtDescriptor.Limit); + __sidt(&IdtDescriptor.Limit); /* Save IDT and GDT */ *Gdt = (PKGDTENTRY)GdtDescriptor.Base;

1 0

[tkreuzer] 35619: - Fix comments and comment out stmxcsr, as it crashes for some reason.
by tkreuzer＠svn.reactos.org 25 Aug '08

25 Aug '08

Author: tkreuzer Date: Sun Aug 24 19:12:33 2008 New Revision: 35619 URL: http://svn.reactos.org/svn/reactos?rev=35619&view=rev Log: - Fix comments and comment out stmxcsr, as it crashes for some reason. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Sun Aug 24 19:12:33 2008 @@ -495,14 +495,14 @@ NTAPI KiRestoreProcessorControlState(PKPROCESSOR_STATE ProcessorState) { - /* Save the CR registers */ + /* Restore the CR registers */ __writecr0(ProcessorState->SpecialRegisters.Cr0); // __writecr2(ProcessorState->SpecialRegisters.Cr2); __writecr3(ProcessorState->SpecialRegisters.Cr3); __writecr4(ProcessorState->SpecialRegisters.Cr4); __writecr8(ProcessorState->SpecialRegisters.Cr8); - /* Save the DR registers */ + /* Restore the DR registers */ __writedr(0, ProcessorState->SpecialRegisters.KernelDr0); __writedr(1, ProcessorState->SpecialRegisters.KernelDr1); __writedr(2, ProcessorState->SpecialRegisters.KernelDr2); @@ -510,7 +510,7 @@ __writedr(6, ProcessorState->SpecialRegisters.KernelDr6); __writedr(7, ProcessorState->SpecialRegisters.KernelDr7); - /* Save GDT, IDT, LDT and TSS */ + /* Restore GDT, IDT, LDT and TSS */ __lgdt(&ProcessorState->SpecialRegisters.Gdtr.Limit); __lldt(&ProcessorState->SpecialRegisters.Ldtr); __ltr(&ProcessorState->SpecialRegisters.Tr); @@ -522,6 +522,8 @@ // ProcessorState->SpecialRegisters.LastBranchFromRip // ProcessorState->SpecialRegisters.LastExceptionToRip // ProcessorState->SpecialRegisters.LastExceptionFromRip + + /* Restore MSRs */ __writemsr(X86_MSR_GSBASE, ProcessorState->SpecialRegisters.MsrGsBase); __writemsr(X86_MSR_KERNEL_GSBASE, ProcessorState->SpecialRegisters.MsrGsSwap); __writemsr(X86_MSR_STAR, ProcessorState->SpecialRegisters.MsrStar); @@ -556,12 +558,14 @@ __str(&ProcessorState->SpecialRegisters.Tr); __sidt(&ProcessorState->SpecialRegisters.Idtr.Limit); - __stmxcsr(&ProcessorState->SpecialRegisters.MxCsr); +// __stmxcsr(&ProcessorState->SpecialRegisters.MxCsr); // ProcessorState->SpecialRegisters.DebugControl = // ProcessorState->SpecialRegisters.LastBranchToRip = // ProcessorState->SpecialRegisters.LastBranchFromRip = // ProcessorState->SpecialRegisters.LastExceptionToRip = // ProcessorState->SpecialRegisters.LastExceptionFromRip = + + /* Save MSRs */ ProcessorState->SpecialRegisters.MsrGsBase = __readmsr(X86_MSR_GSBASE); ProcessorState->SpecialRegisters.MsrGsSwap = __readmsr(X86_MSR_KERNEL_GSBASE); ProcessorState->SpecialRegisters.MsrStar = __readmsr(X86_MSR_STAR);

1 0

[tkreuzer] 35618: Add X86_MSR constants, implement __lgdt, __sgdt, __lldt, __sldt, __ldmxcsr, __stmxcsr, __ltr, __str intrinsics.
by tkreuzer＠svn.reactos.org 25 Aug '08

25 Aug '08

Author: tkreuzer Date: Sun Aug 24 19:10:15 2008 New Revision: 35618 URL: http://svn.reactos.org/svn/reactos?rev=35618&view=rev Log: Add X86_MSR constants, implement __lgdt, __sgdt, __lldt, __sldt, __ldmxcsr, __stmxcsr, __ltr, __str intrinsics. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] Sun Aug 24 19:10:15 2008 @@ -11,25 +11,45 @@ #if defined(__GNUC__) -#define Ke386SetInterruptDescriptorTable(X) \ - __asm__("lidt %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); - -#define Ke386GetInterruptDescriptorTable(X) \ - __asm__("sidt %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); - -#define Ke386SetGlobalDescriptorTable(X) \ - __asm__("lgdt %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); - -#define Ke386GetGlobalDescriptorTable(X) \ - __asm__("sgdt %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); +static __inline__ __attribute__((always_inline)) void __lgdt(void *Source) +{ + __asm__ __volatile__("lgdt %0" : : "m"(*(short*)Source)); +} + +static __inline__ __attribute__((always_inline)) void __sgdt(void *Destination) +{ + __asm__ __volatile__("sgdt %0" : : "m"(*(short*)Destination) : "memory"); +} + +static __inline__ __attribute__((always_inline)) void __lldt(void *Source) +{ + __asm__ __volatile__("lldt %0" : : "m"(*(short*)Source)); +} + +static __inline__ __attribute__((always_inline)) void __sldt(void *Destination) +{ + __asm__ __volatile__("sldt %0" : : "m"(*(short*)Destination) : "memory"); +} + +static __inline__ __attribute__((always_inline)) void __ldmxcsr(unsigned long *Source) +{ + __asm__ __volatile__("ldmxcsr %0" : : "m"(*Source)); +} + +static __inline__ __attribute__((always_inline)) void __stmxcsr(unsigned long *Destination) +{ + __asm__ __volatile__("stmxcsr %0" : : "m"(*Destination) : "memory"); +} + +static __inline__ __attribute__((always_inline)) void __ltr(unsigned short *Source) +{ + __asm__ __volatile__("ltr %0" : : "m"(*Source)); +} + +static __inline__ __attribute__((always_inline)) void __str(unsigned short *Destination) +{ + __asm__ __volatile__("str %0" : : "m"(*Destination) : "memory"); +} #define Ke386GetLocalDescriptorTable(X) \ __asm__("sldt %0\n\t" \ @@ -61,7 +81,7 @@ #define _Ke386GetDr(N) ({ \ unsigned int __d; \ - __asm__("movl %%dr" #N ",%0\n\t" :"=r" (__d)); \ + __asm__("movq %%dr" #N ",%0\n\t" :"=r" (__d)); \ __d; \ }) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Sun Aug 24 19:10:15 2008 @@ -45,6 +45,10 @@ #define X86_MSR_GSBASE 0xC0000101 #define X86_MSR_KERNEL_GSBASE 0xC0000102 +#define X86_MSR_STAR 0xC0000081 +#define X86_MSR_LSTAR 0xC0000082 +#define X86_MSR_CSTAR 0xC0000083 +#define X86_MSR_SFMASK 0xC0000084 #ifndef __ASM__

1 0

[tkreuzer] 35617: Implement KiSaveProcessorControlState and KiRestoreProcessorControlState
by tkreuzer＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: tkreuzer Date: Sun Aug 24 18:51:55 2008 New Revision: 35617 URL: http://svn.reactos.org/svn/reactos?rev=35617&view=rev Log: Implement KiSaveProcessorControlState and KiRestoreProcessorControlState Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Sun Aug 24 18:51:55 2008 @@ -493,6 +493,86 @@ VOID NTAPI +KiRestoreProcessorControlState(PKPROCESSOR_STATE ProcessorState) +{ + /* Save the CR registers */ + __writecr0(ProcessorState->SpecialRegisters.Cr0); +// __writecr2(ProcessorState->SpecialRegisters.Cr2); + __writecr3(ProcessorState->SpecialRegisters.Cr3); + __writecr4(ProcessorState->SpecialRegisters.Cr4); + __writecr8(ProcessorState->SpecialRegisters.Cr8); + + /* Save the DR registers */ + __writedr(0, ProcessorState->SpecialRegisters.KernelDr0); + __writedr(1, ProcessorState->SpecialRegisters.KernelDr1); + __writedr(2, ProcessorState->SpecialRegisters.KernelDr2); + __writedr(3, ProcessorState->SpecialRegisters.KernelDr3); + __writedr(6, ProcessorState->SpecialRegisters.KernelDr6); + __writedr(7, ProcessorState->SpecialRegisters.KernelDr7); + + /* Save GDT, IDT, LDT and TSS */ + __lgdt(&ProcessorState->SpecialRegisters.Gdtr.Limit); + __lldt(&ProcessorState->SpecialRegisters.Ldtr); + __ltr(&ProcessorState->SpecialRegisters.Tr); + __lidt(&ProcessorState->SpecialRegisters.Idtr.Limit); + + __ldmxcsr(&ProcessorState->SpecialRegisters.MxCsr); +// ProcessorState->SpecialRegisters.DebugControl +// ProcessorState->SpecialRegisters.LastBranchToRip +// ProcessorState->SpecialRegisters.LastBranchFromRip +// ProcessorState->SpecialRegisters.LastExceptionToRip +// ProcessorState->SpecialRegisters.LastExceptionFromRip + __writemsr(X86_MSR_GSBASE, ProcessorState->SpecialRegisters.MsrGsBase); + __writemsr(X86_MSR_KERNEL_GSBASE, ProcessorState->SpecialRegisters.MsrGsSwap); + __writemsr(X86_MSR_STAR, ProcessorState->SpecialRegisters.MsrStar); + __writemsr(X86_MSR_LSTAR, ProcessorState->SpecialRegisters.MsrLStar); + __writemsr(X86_MSR_CSTAR, ProcessorState->SpecialRegisters.MsrCStar); + __writemsr(X86_MSR_SFMASK, ProcessorState->SpecialRegisters.MsrSyscallMask); + +} + +VOID +NTAPI +KiSaveProcessorControlState(OUT PKPROCESSOR_STATE ProcessorState) +{ + /* Save the CR registers */ + ProcessorState->SpecialRegisters.Cr0 = __readcr0(); + ProcessorState->SpecialRegisters.Cr2 = __readcr2(); + ProcessorState->SpecialRegisters.Cr3 = __readcr3(); + ProcessorState->SpecialRegisters.Cr4 = __readcr4(); + ProcessorState->SpecialRegisters.Cr8 = __readcr8(); + + /* Save the DR registers */ + ProcessorState->SpecialRegisters.KernelDr0 = __readdr(0); + ProcessorState->SpecialRegisters.KernelDr1 = __readdr(1); + ProcessorState->SpecialRegisters.KernelDr2 = __readdr(2); + ProcessorState->SpecialRegisters.KernelDr3 = __readdr(3); + ProcessorState->SpecialRegisters.KernelDr6 = __readdr(6); + ProcessorState->SpecialRegisters.KernelDr7 = __readdr(7); + + /* Save GDT, IDT, LDT and TSS */ + __sgdt(&ProcessorState->SpecialRegisters.Gdtr.Limit); + __sldt(&ProcessorState->SpecialRegisters.Ldtr); + __str(&ProcessorState->SpecialRegisters.Tr); + __sidt(&ProcessorState->SpecialRegisters.Idtr.Limit); + + __stmxcsr(&ProcessorState->SpecialRegisters.MxCsr); +// ProcessorState->SpecialRegisters.DebugControl = +// ProcessorState->SpecialRegisters.LastBranchToRip = +// ProcessorState->SpecialRegisters.LastBranchFromRip = +// ProcessorState->SpecialRegisters.LastExceptionToRip = +// ProcessorState->SpecialRegisters.LastExceptionFromRip = + ProcessorState->SpecialRegisters.MsrGsBase = __readmsr(X86_MSR_GSBASE); + ProcessorState->SpecialRegisters.MsrGsSwap = __readmsr(X86_MSR_KERNEL_GSBASE); + ProcessorState->SpecialRegisters.MsrStar = __readmsr(X86_MSR_STAR); + ProcessorState->SpecialRegisters.MsrLStar = __readmsr(X86_MSR_LSTAR); + ProcessorState->SpecialRegisters.MsrCStar = __readmsr(X86_MSR_CSTAR); + ProcessorState->SpecialRegisters.MsrSyscallMask = __readmsr(X86_MSR_SFMASK); +} + + +VOID +NTAPI KiInitializeMachineType(VOID) { /* Set the Machine Type we got from NTLDR */

1 0

[tkreuzer] 35616: merge __readcr and __writecr x86 / x64 definitions, because they are the same. Implement __readdr and __writedr for x64.
by tkreuzer＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: tkreuzer Date: Sun Aug 24 18:40:42 2008 New Revision: 35616 URL: http://svn.reactos.org/svn/reactos?rev=35616&view=rev Log: merge __readcr and __writecr x86 / x64 definitions, because they are the same. Implement __readdr and __writedr for x64. Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Sun Aug 24 18:40:42 2008 @@ -1089,106 +1089,129 @@ /*** Protected memory management ***/ +static __inline__ __attribute__((always_inline)) void __writecr0(const unsigned __int64 Data) +{ + __asm__("mov %[Data], %%cr0" : : [Data] "q" (Data) : "memory"); +} + +static __inline__ __attribute__((always_inline)) void __writecr3(const unsigned __int64 Data) +{ + __asm__("mov %[Data], %%cr3" : : [Data] "q" (Data) : "memory"); +} + +static __inline__ __attribute__((always_inline)) void __writecr4(const unsigned __int64 Data) +{ + __asm__("mov %[Data], %%cr4" : : [Data] "q" (Data) : "memory"); +} + #ifdef _M_AMD64 -static __inline__ __attribute__((always_inline)) void __writecr0(const unsigned long long Data) -{ - __asm__("movq %q[Data], %%cr0" : : [Data] "q" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writecr3(const unsigned long long Data) -{ - __asm__("movq %q[Data], %%cr3" : : [Data] "q" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writecr4(const unsigned long long Data) -{ - __asm__("movq %q[Data], %%cr4" : : [Data] "q" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writecr8(const unsigned long long Data) -{ - __asm__("movq %q[Data], %%cr8" : : [Data] "q" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) unsigned long long __readcr0(void) -{ - unsigned long long value; - __asm__ __volatile__("movq %%cr0, %q[value]" : [value] "=q" (value)); +static __inline__ __attribute__((always_inline)) void __writecr8(const unsigned __int64 Data) +{ + __asm__("mov %[Data], %%cr8" : : [Data] "q" (Data) : "memory"); +} +#endif + +static __inline__ __attribute__((always_inline)) unsigned __int64 __readcr0(void) +{ + unsigned __int64 value; + __asm__ __volatile__("mov %%cr0, %[value]" : [value] "=q" (value)); return value; } -static __inline__ __attribute__((always_inline)) unsigned long long __readcr2(void) -{ - unsigned long long value; - __asm__ __volatile__("movq %%cr2, %q[value]" : [value] "=q" (value)); +static __inline__ __attribute__((always_inline)) unsigned __int64 __readcr2(void) +{ + unsigned __int64 value; + __asm__ __volatile__("mov %%cr2, %[value]" : [value] "=q" (value)); return value; } -static __inline__ __attribute__((always_inline)) unsigned long long __readcr3(void) -{ - unsigned long long value; - __asm__ __volatile__("movq %%cr3, %q[value]" : [value] "=q" (value)); +static __inline__ __attribute__((always_inline)) unsigned __int64 __readcr3(void) +{ + unsigned __int64 value; + __asm__ __volatile__("mov %%cr3, %[value]" : [value] "=q" (value)); return value; } -static __inline__ __attribute__((always_inline)) unsigned long long __readcr4(void) -{ - unsigned long long value; - __asm__ __volatile__("movq %%cr4, %q[value]" : [value] "=q" (value)); +static __inline__ __attribute__((always_inline)) unsigned __int64 __readcr4(void) +{ + unsigned __int64 value; + __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=q" (value)); return value; } -static __inline__ __attribute__((always_inline)) unsigned long long __readcr8(void) -{ - unsigned long long value; +#ifdef _M_AMD64 +static __inline__ __attribute__((always_inline)) unsigned __int64 __readcr8(void) +{ + unsigned __int64 value; __asm__ __volatile__("movq %%cr8, %q[value]" : [value] "=q" (value)); return value; } - -#else -static __inline__ __attribute__((always_inline)) void __writecr0(const unsigned long long Data) -{ - __asm__("mov %[Data], %%cr0" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF)) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writecr3(const unsigned long long Data) -{ - __asm__("mov %[Data], %%cr3" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF)) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writecr4(const unsigned long long Data) -{ - __asm__("mov %[Data], %%cr4" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF)) : "memory"); -} - -static __inline__ __attribute__((always_inline)) unsigned long __readcr0(void) -{ - unsigned long value; - __asm__ __volatile__("mov %%cr0, %[value]" : [value] "=q" (value)); +#endif + +#ifdef _M_AMD64 +static __inline__ __attribute__((always_inline)) unsigned __int64 __readdr(unsigned int reg) +{ + unsigned __int64 value; + switch (reg) + { + case 0: + __asm__ __volatile__("movq %%dr0, %q[value]" : [value] "=q" (value)); + break; + case 1: + __asm__ __volatile__("movq %%dr1, %q[value]" : [value] "=q" (value)); + break; + case 2: + __asm__ __volatile__("movq %%dr2, %q[value]" : [value] "=q" (value)); + break; + case 3: + __asm__ __volatile__("movq %%dr3, %q[value]" : [value] "=q" (value)); + break; + case 4: + __asm__ __volatile__("movq %%dr4, %q[value]" : [value] "=q" (value)); + break; + case 5: + __asm__ __volatile__("movq %%dr5, %q[value]" : [value] "=q" (value)); + break; + case 6: + __asm__ __volatile__("movq %%dr6, %q[value]" : [value] "=q" (value)); + break; + case 7: + __asm__ __volatile__("movq %%dr7, %q[value]" : [value] "=q" (value)); + break; + } return value; } -static __inline__ __attribute__((always_inline)) unsigned long __readcr2(void) -{ - unsigned long value; - __asm__ __volatile__("mov %%cr2, %[value]" : [value] "=q" (value)); - return value; -} - -static __inline__ __attribute__((always_inline)) unsigned long __readcr3(void) -{ - unsigned long value; - __asm__ __volatile__("mov %%cr3, %[value]" : [value] "=q" (value)); - return value; -} - -static __inline__ __attribute__((always_inline)) unsigned long __readcr4(void) -{ - unsigned long value; - __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=q" (value)); - return value; -} - +static __inline__ __attribute__((always_inline)) void __writedr(unsigned reg, unsigned __int64 value) +{ + switch (reg) + { + case 0: + __asm__("movq %q[value], %%dr0" : : [value] "q" (value) : "memory"); + break; + case 1: + __asm__("movq %q[value], %%dr1" : : [value] "q" (value) : "memory"); + break; + case 2: + __asm__("movq %q[value], %%dr2" : : [value] "q" (value) : "memory"); + break; + case 3: + __asm__("movq %q[value], %%dr3" : : [value] "q" (value) : "memory"); + break; + case 4: + __asm__("movq %q[value], %%dr4" : : [value] "q" (value) : "memory"); + break; + case 5: + __asm__("movq %q[value], %%dr5" : : [value] "q" (value) : "memory"); + break; + case 6: + __asm__("movq %q[value], %%dr6" : : [value] "q" (value) : "memory"); + break; + case 7: + __asm__("movq %q[value], %%dr7" : : [value] "q" (value) : "memory"); + break; + } +} #endif static __inline__ __attribute__((always_inline)) void __invlpg(void * const Address) @@ -1247,7 +1270,7 @@ static __inline__ __attribute__((always_inline)) void __sidt(void *Destination) { - __asm__ __volatile__("sidt %0" : : "m"(*(short*)Destination)); + __asm__ __volatile__("sidt %0" : : "m"(*(short*)Destination) : "memory"); } #endif /* KJK_INTRIN_X86_H_ */

1 0

[ekohl] 35615: Add "Boot Acceptance Application for Registry". Such a big name for such a small utility ; )
by ekohl＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: ekohl Date: Sun Aug 24 18:07:39 2008 New Revision: 35615 URL: http://svn.reactos.org/svn/reactos?rev=35615&view=rev Log: Add "Boot Acceptance Application for Registry". Such a big name for such a small utility ;) Added: trunk/reactos/base/system/bootok/ (with props) trunk/reactos/base/system/bootok/bootok.c (with props) trunk/reactos/base/system/bootok/bootok.rbuild (with props) trunk/reactos/base/system/bootok/bootok.rc (with props) Modified: trunk/reactos/base/system/system.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff Propchange: trunk/reactos/base/system/bootok/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Aug 24 18:07:39 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/system/bootok/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/system/bootok/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/system/bootok/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/system/bootok/bootok.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/bootok/bootok.… ============================================================================== --- trunk/reactos/base/system/bootok/bootok.c (added) +++ trunk/reactos/base/system/bootok/bootok.c [iso-8859-1] Sun Aug 24 18:07:39 2008 @@ -1,0 +1,31 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/bootok/bootok.c + * PURPOSE: Boot Acceptance Application + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include <stdio.h> +#include <tchar.h> +#define WIN32_NO_STATUS +#include <windows.h> + +/* FUNCTIONS ****************************************************************/ + +int +_tmain(int argc, TCHAR *argv[]) +{ + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + if (!NotifyBootConfigStatus(TRUE)) + { + _tprintf(_T("NotifyBootConfigStatus failed! (Error: %lu)\n"), + GetLastError()); + } + + return 0; +} Propchange: trunk/reactos/base/system/bootok/bootok.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/bootok/bootok.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/bootok/bootok.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/bootok/bootok.… ============================================================================== --- trunk/reactos/base/system/bootok/bootok.rbuild (added) +++ trunk/reactos/base/system/bootok/bootok.rbuild [iso-8859-1] Sun Aug 24 18:07:39 2008 @@ -1,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="bootok" type="win32cui" installbase="system32" installname="bootok.exe" unicode="yes"> + <include base="bootok">.</include> + <define name="WINVER">0x600</define> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <library>kernel32</library> + <library>advapi32</library> + <file>bootok.c</file> + <file>bootok.rc</file> +</module> Propchange: trunk/reactos/base/system/bootok/bootok.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/bootok/bootok.rbuild ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/bootok/bootok.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/bootok/bootok.… ============================================================================== --- trunk/reactos/base/system/bootok/bootok.rc (added) +++ trunk/reactos/base/system/bootok/bootok.rc [iso-8859-1] Sun Aug 24 18:07:39 2008 @@ -1,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "Boot Acceptance Application for Registry\0" +#define REACTOS_STR_INTERNAL_NAME "bootok\0" +#define REACTOS_STR_ORIGINAL_FILENAME "bootok.exe\0" +#include <reactos/version.rc> Propchange: trunk/reactos/base/system/bootok/bootok.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/bootok/bootok.rc ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/base/system/system.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/system.rbuild?… ============================================================================== --- trunk/reactos/base/system/system.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/system.rbuild [iso-8859-1] Sun Aug 24 18:07:39 2008 @@ -3,6 +3,9 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="autochk"> <xi:include href="autochk/autochk.rbuild" /> + </directory> + <directory name="bootok"> + <xi:include href="bootok/bootok.rbuild" /> </directory> <directory name="expand"> <xi:include href="expand/expand.rbuild" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Aug 24 18:07:39 2008 @@ -92,6 +92,7 @@ base\shell\explorer-new\explorer_new.exe 4 optional base\system\autochk\autochk.exe 1 +base\system\bootok\bootok.exe 1 base\system\format\format.exe 1 base\system\lsass\lsass.exe 1 base\system\msiexec\msiexec.exe 1

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
86
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 August 2008