Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 35629: - NtLoadKey: Call NtLoadKeyEx directly instead of calling NtLoadKey2 (which forwards to NtLoadKeyEx)
by sginsberg＠svn.reactos.org 25 Aug '08

25 Aug '08

Author: sginsberg Date: Mon Aug 25 10:10:27 2008 New Revision: 35629 URL: http://svn.reactos.org/svn/reactos?rev=35629&view=rev Log: - NtLoadKey: Call NtLoadKeyEx directly instead of calling NtLoadKey2 (which forwards to NtLoadKeyEx) Modified: trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Mon Aug 25 10:10:27 2008 @@ -707,7 +707,7 @@ IN POBJECT_ATTRIBUTES FileObjectAttributes) { /* Call the newer API */ - return NtLoadKey2(KeyObjectAttributes, FileObjectAttributes, 0); + return NtLoadKeyEx(KeyObjectAttributes, FileObjectAttributes, 0, NULL); } NTSTATUS

1 0

[tkreuzer] 35628: merge 34702 and 34987 from ros-amd64-bringup branch: - convert LDR_RESOURCE_INFO members from ULONG to ULONG_PTR - fix SECURITY_DESCRIPTOR_RELATIVE and KDPC_DATA
by tkreuzer＠svn.reactos.org 25 Aug '08

25 Aug '08

Author: tkreuzer Date: Mon Aug 25 09:51:22 2008 New Revision: 35628 URL: http://svn.reactos.org/svn/reactos?rev=35628&view=rev Log: merge 34702 and 34987 from ros-amd64-bringup branch: - convert LDR_RESOURCE_INFO members from ULONG to ULONG_PTR - fix SECURITY_DESCRIPTOR_RELATIVE and KDPC_DATA Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=35… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Mon Aug 25 09:51:22 2008 @@ -787,10 +787,10 @@ BYTE Revision; BYTE Sbz1; SECURITY_DESCRIPTOR_CONTROL Control; - DWORD Owner; - DWORD Group; - DWORD Sacl; - DWORD Dacl; + DWORD_PTR Owner; + DWORD_PTR Group; + DWORD_PTR Sacl; + DWORD_PTR Dacl; } SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE; typedef enum _TOKEN_INFORMATION_CLASS { TokenUser=1,TokenGroups,TokenPrivileges,TokenOwner, Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Mon Aug 25 09:51:22 2008 @@ -558,7 +558,7 @@ typedef struct _KDPC_DATA { LIST_ENTRY DpcListHead; - ULONG DpcLock; + ULONG_PTR DpcLock; volatile ULONG DpcQueueDepth; ULONG DpcCount; } KDPC_DATA, *PKDPC_DATA; Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Mon Aug 25 09:51:22 2008 @@ -138,8 +138,8 @@ // typedef struct _LDR_RESOURCE_INFO { - ULONG Type; - ULONG Name; + ULONG_PTR Type; + ULONG_PTR Name; ULONG Language; } LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO;

1 0

[sginsberg] 35627: - Sync ntgdi.h to trunk, and add missing APIENTRY for a couple of functions
by sginsberg＠svn.reactos.org 25 Aug '08

25 Aug '08

Author: sginsberg Date: Mon Aug 25 09:04:24 2008 New Revision: 35627 URL: http://svn.reactos.org/svn/reactos?rev=35627&view=rev Log: - Sync ntgdi.h to trunk, and add missing APIENTRY for a couple of functions Modified: branches/nwin32/include/psdk/ntgdi.h branches/nwin32/subsystems/win32/win32k/ntgdi/gdidc.c branches/nwin32/subsystems/win32/win32k/ntgdi/gdifont.c branches/nwin32/subsystems/win32/win32k/ntgdi/gditext.c Modified: branches/nwin32/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/psdk/ntgdi.h?rev… ============================================================================== --- branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] (original) +++ branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] Mon Aug 25 09:04:24 2008 @@ -2843,6 +2843,7 @@ W32KAPI DWORD +APIENTRY NtGdiGetCharSet( IN HDC hdc ); @@ -2897,6 +2898,7 @@ #if (_WIN32_WINNT >= 0x0500) W32KAPI DWORD +APIENTRY NtGdiGetFontUnicodeRanges( IN HDC hdc, OUT OPTIONAL LPGLYPHSET pgs @@ -2906,6 +2908,7 @@ #ifdef LANGPACK W32KAPI BOOL +APIENTRY NtGdiGetRealizationInfo( IN HDC hdc, OUT PREALIZATION_INFO pri, @@ -2915,6 +2918,7 @@ W32KAPI BOOL +APIENTRY NtGdiAddRemoteMMInstanceToDC( IN HDC hdc, IN DOWNLOADDESIGNVECTOR *pddv, @@ -3518,6 +3522,7 @@ W32KAPI DHPDEV +APIENTRY NtGdiGetDhpdev( IN HDEV hdev ); Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdidc.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntgdi/gdidc.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdidc.c [iso-8859-1] Mon Aug 25 09:04:24 2008 @@ -252,7 +252,7 @@ } BOOL -/* Missing APIENTRY! */ +APIENTRY NtGdiAddRemoteMMInstanceToDC(IN HDC hdc, IN DOWNLOADDESIGNVECTOR *pddv, IN ULONG cjDDV) @@ -262,7 +262,7 @@ } DHPDEV -/* Missing APIENTRY! */ +APIENTRY NtGdiGetDhpdev(IN HDEV hdev) { UNIMPLEMENTED; Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdifont.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntgdi/gdifont.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdifont.c [iso-8859-1] Mon Aug 25 09:04:24 2008 @@ -274,7 +274,7 @@ } DWORD -/* Missing APIENTRY! */ +APIENTRY NtGdiGetFontUnicodeRanges(IN HDC hdc, OUT OPTIONAL LPGLYPHSET pgs) { @@ -443,7 +443,7 @@ } BOOL -/* Missing APIENTRY! */ +APIENTRY NtGdiGetRealizationInfo(IN HDC hdc, OUT PREALIZATION_INFO pri, IN HFONT hf) Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gditext.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntgdi/gditext.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntgdi/gditext.c [iso-8859-1] Mon Aug 25 09:04:24 2008 @@ -157,7 +157,7 @@ } DWORD -/* Missing APIENTRY! */ +APIENTRY NtGdiGetCharSet(IN HDC hdc) { UNIMPLEMENTED;

1 0

[sginsberg] 35626: - Undefine KdPrint before redefining it.
by sginsberg＠svn.reactos.org 25 Aug '08

25 Aug '08

Author: sginsberg Date: Mon Aug 25 08:42:17 2008 New Revision: 35626 URL: http://svn.reactos.org/svn/reactos?rev=35626&view=rev Log: - Undefine KdPrint before redefining it. Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Mon Aug 25 08:42:17 2008 @@ -137,6 +137,10 @@ #endif // _DBGNT_ #else // _DEBUG + +#ifdef KdPrint +#undef KdPrint +#endif #define PRINT_PREFIX "UniATA: "

1 0

[pschweitzer] 35625: - Reimplemented FsRtlIsNameInExpression to get rid of recursion, and to handle all wild cards. - Updated its comments.
by pschweitzer＠svn.reactos.org 25 Aug '08

25 Aug '08

Author: pschweitzer Date: Mon Aug 25 04:27:35 2008 New Revision: 35625 URL: http://svn.reactos.org/svn/reactos?rev=35625&view=rev Log: - Reimplemented FsRtlIsNameInExpression to get rid of recursion, and to handle all wild cards. - Updated its comments. Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c 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] Mon Aug 25 04:27:35 2008 @@ -5,6 +5,7 @@ * PURPOSE: Provides name parsing and other support routines for FSDs * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Filip Navara (navaraf(a)reactos.org) + * Pierre Schweitzer (heis_spiter(a)hotmail.com) */ /* INCLUDES ******************************************************************/ @@ -224,13 +225,20 @@ * @name FsRtlIsNameInExpression * @implemented * - * FILLME - * - * @param DeviceObject - * FILLME - * - * @param Irp - * FILLME + * Check if the Name string is in the Expression string. + * + * @param Expression + * The string in which we've to find Name. It can contains wildcards + * + * @param Name + * The string to find. It cannot contain wildcards + * + * @param IgnoreCase + * If set to TRUE, case will be ignore with upcasing both strings + * + * @param UpcaseTable + * If not NULL, and if IgnoreCase is set to TRUE, it will be used to + * upcase the both strings * * @return TRUE if Name is in Expression, FALSE otherwise * @@ -246,85 +254,80 @@ IN BOOLEAN IgnoreCase, IN PWCHAR UpcaseTable OPTIONAL) { - USHORT ExpressionPosition, NamePosition; - UNICODE_STRING TempExpression, TempName; - - ExpressionPosition = 0; - NamePosition = 0; - while (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && - NamePosition < (Name->Length / sizeof(WCHAR))) - { - if (Expression->Buffer[ExpressionPosition] == L'*') - { - ExpressionPosition++; - if (ExpressionPosition == (Expression->Length / sizeof(WCHAR))) - { - return TRUE; - } - while (NamePosition < (Name->Length / sizeof(WCHAR))) - { - TempExpression.Length = - TempExpression.MaximumLength = - Expression->Length - (ExpressionPosition * sizeof(WCHAR)); - TempExpression.Buffer = Expression->Buffer + ExpressionPosition; - TempName.Length = - TempName.MaximumLength = - Name->Length - (NamePosition * sizeof(WCHAR)); - TempName.Buffer = Name->Buffer + NamePosition; - /* FIXME: Rewrite to get rid of recursion */ - if (FsRtlIsNameInExpression(&TempExpression, &TempName, - IgnoreCase, UpcaseTable)) + ULONG i, j, k = 0; + UNICODE_STRING IntExpression, IntName; + WCHAR IntExprBuffer[Expression->Length / sizeof(WCHAR)], IntNameBuffer[Name->Length / sizeof(WCHAR)]; + + ASSERT(!FsRtlDoesNameContainWildCards(Name)); + + /* We'll first upcase the both strings, if necessary. + In all cases, we'll create internal strings to work on. */ + if (IgnoreCase) + { + IntExpression.Buffer = IntExprBuffer; + IntName.Buffer = IntNameBuffer; + if (!UpcaseTable) + { + RtlUpcaseUnicodeString(&IntExpression, Expression, FALSE); + RtlUpcaseUnicodeString(&IntName, Name, FALSE); + + } + else + { + for (i = 0 ; i < Expression->Length / sizeof (WCHAR) + 1 ; i++) + { + IntExpression.Buffer[i] = UpcaseTable[Expression->Buffer[i]]; + } + IntExpression.Length = Expression->Length; + IntExpression.MaximumLength = Expression->MaximumLength; + for (i = 0 ; i < Name->Length / sizeof (WCHAR) + 1 ; i++) + { + IntName.Buffer[i] = UpcaseTable[Name->Buffer[i]]; + } + IntName.Length = Name->Length; + IntName.MaximumLength = Name->MaximumLength; + } + } + else + { + IntExpression.Length = Expression->Length; + IntExpression.MaximumLength = Expression->MaximumLength; + IntExpression.Buffer = Expression->Buffer; + IntName.Length = Name->Length; + IntName.MaximumLength = Name->MaximumLength; + IntName.Buffer = Name->Buffer; + } + + for (i = 0 ; i < IntExpression.Length / sizeof(WCHAR) ; i++) + { + if ((IntExpression.Buffer[i] == IntName.Buffer[k]) || (IntExpression.Buffer[i] == '?') || + (IntExpression.Buffer[i] == ANSI_DOS_QM) || + (IntExpression.Buffer[i] == ANSI_DOS_DOT && (IntName.Buffer[k] == '.' || IntName.Buffer[k] == '0'))) + { + k++; + } + else if (IntExpression.Buffer[i] == '*') + { + k = IntName.Length / sizeof(WCHAR); + } + else if (IntExpression.Buffer[i] == ANSI_DOS_STAR) + { + for (j = k ; j < IntName.Length / sizeof(WCHAR) ; j++) + { + if (IntName.Buffer[j] == '.') { - return TRUE; + k = j; } - NamePosition++; } } else { - if (Expression->Buffer[ExpressionPosition] == L'?' || ( - IgnoreCase && !UpcaseTable && - RtlUpcaseUnicodeChar(Expression->Buffer[ExpressionPosition]) == - RtlUpcaseUnicodeChar(Name->Buffer[NamePosition])) || - (!IgnoreCase && Expression->Buffer[ExpressionPosition] == - Name->Buffer[NamePosition])) - { - NamePosition++; - ExpressionPosition++; - } - else if (IgnoreCase && UpcaseTable) - { - if (UpcaseTable[Expression->Buffer[ExpressionPosition]] == - UpcaseTable[Name->Buffer[NamePosition]]) - { - NamePosition++; - ExpressionPosition++; - } - } - else - { - return FALSE; - } - } - } - - /* Handle matching of "f0_*.*" expression to "f0_000" file name. */ - if (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && - Expression->Buffer[ExpressionPosition] == L'.') - { - while (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && - (Expression->Buffer[ExpressionPosition] == L'.' || - Expression->Buffer[ExpressionPosition] == L'*' || - Expression->Buffer[ExpressionPosition] == L'?')) - { - ExpressionPosition++; - } - } - - if (ExpressionPosition == (Expression->Length / sizeof(WCHAR)) && - NamePosition == (Name->Length / sizeof(WCHAR))) - { - return TRUE; + k = 0; + } + if (k == IntName.Length / sizeof(WCHAR)) + { + return TRUE; + } } return FALSE;

1 0

[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

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