Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[greatlrd] 33877: add a NULL check in IntGdiInitBrushInstance if XlateObj is NULL fall back to use white as default color when GDIBRUSH_IS_SOLID are set.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 6 20:14:12 2008 New Revision: 33877 URL: http://svn.reactos.org/svn/reactos?rev=33877&view=rev Log: add a NULL check in IntGdiInitBrushInstance if XlateObj is NULL fall back to use white as default color when GDIBRUSH_IS_SOLID are set. Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Fri Jun 6 20:14:12 2008 @@ -173,11 +173,25 @@ ASSERT(BrushInst); ASSERT(BrushObj); if (BrushObj->flAttrs & GDIBRUSH_IS_NULL) + { BrushInst->BrushObject.iSolidColor = 0; + } else if (BrushObj->flAttrs & GDIBRUSH_IS_SOLID) - BrushInst->BrushObject.iSolidColor = XLATEOBJ_iXlate(XlateObj, BrushObj->BrushAttr.lbColor); + { + if (XlateObj) + { + BrushInst->BrushObject.iSolidColor = XLATEOBJ_iXlate(XlateObj, BrushObj->BrushAttr.lbColor); + } + else + { + BrushInst->BrushObject.iSolidColor = 0xFFFFFFFF; + } + } else + { BrushInst->BrushObject.iSolidColor = 0xFFFFFFFF; + } + BrushInst->BrushObject.pvRbrush = BrushObj->ulRealization; BrushInst->BrushObject.flColorType = 0; BrushInst->GdiBrushObject = BrushObj;

16 years, 6 months

[greatlrd] 33876: BitBlt Make it act bit more like windows, use PatBlt instead for BitBlt for no ROP source for it bit faster Thx irc Goplat found my bug in the macro.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 6 19:51:38 2008 New Revision: 33876 URL: http://svn.reactos.org/svn/reactos?rev=33876&view=rev Log: BitBlt Make it act bit more like windows, use PatBlt instead for BitBlt for no ROP source for it bit faster Thx irc Goplat found my bug in the macro. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/objects/bitmap.c Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Fri Jun 6 19:51:38 2008 @@ -29,6 +29,9 @@ #define METAFILE_MEMORY 1 #define METAFILE_DISK 2 + +/* MACRO ********************************************************************/ +#define ROP_USES_SOURCE(Rop) ((Rop << 2) ^ Rop) & 0xCC0000 /* TYPES *********************************************************************/ Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Fri Jun 6 19:51:38 2008 @@ -124,6 +124,9 @@ return hBitmap; } + + + /* * @implemented */ @@ -139,6 +142,12 @@ int nYSrc, /* y-coordinate of source upper-left corner */ DWORD dwRop) /* raster operation code */ { + /* use patBlt for no source blt Like windows does */ + if (!ROP_USES_SOURCE(dwRop)) + { + return PatBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, dwRop); + } + return NtGdiBitBlt(hdcDest, nXOriginDest, nYOriginDest,

16 years, 6 months

[greatlrd] 33875: thx irc nick : Goplat notice my macro was bit wrong for detect the source rop, did take to many short cut.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 6 19:42:37 2008 New Revision: 33875 URL: http://svn.reactos.org/svn/reactos?rev=33875&view=rev Log: thx irc nick : Goplat notice my macro was bit wrong for detect the source rop, did take to many short cut. Modified: branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h Modified: branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/i… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Fri Jun 6 19:42:37 2008 @@ -26,7 +26,7 @@ ); /* MACRO ********************************************************************/ -#define ROP_USES_SOURCE(Rop) (Rop & 0x00330000) +#define ROP_USES_SOURCE(Rop) ((Rop << 2) ^ Rop) & 0xCC0000 /* DEFINES *******************************************************************/

16 years, 6 months

[greatlrd] 33874: Change BitBlt so it act simluare to windows, but this changes will break trunk graphic, Waring Waring Waring Waring do not merge down this change to trunk until NtGdiPatBlt are bugfixed it seam it contain allot of graphic glitch and it seam it does not call on the hw gdi acclartions of PatBlt and some other issue.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 6 19:27:13 2008 New Revision: 33874 URL: http://svn.reactos.org/svn/reactos?rev=33874&view=rev Log: Change BitBlt so it act simluare to windows, but this changes will break trunk graphic, Waring Waring Waring Waring do not merge down this change to trunk until NtGdiPatBlt are bugfixed it seam it contain allot of graphic glitch and it seam it does not call on the hw gdi acclartions of PatBlt and some other issue. Modified: branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h branches/win32k-gdi-dx/dll/win32/gdi32/objects/bitmap.c Modified: branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/i… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Fri Jun 6 19:27:13 2008 @@ -24,6 +24,10 @@ INT iFunction, HANDLE hPageQuery ); + +/* MACRO ********************************************************************/ +#define ROP_USES_SOURCE(Rop) (Rop & 0x00330000) + /* DEFINES *******************************************************************/ Modified: branches/win32k-gdi-dx/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/o… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Fri Jun 6 19:27:13 2008 @@ -139,6 +139,12 @@ int nYSrc, /* y-coordinate of source upper-left corner */ DWORD dwRop) /* raster operation code */ { + /* use patBlt for no source blt Like windows does */ + if (!ROP_USES_SOURCE(dwRop)) + { + return PatBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, dwRop); + } + return NtGdiBitBlt(hdcDest, nXOriginDest, nYOriginDest, @@ -447,8 +453,9 @@ ColorUse, lpbmi->bmiHeader.biSizeImage, lpbmi->bmiHeader.biSize, - FALSE, + TRUE, NULL); } +

16 years, 6 months

[greatlrd] 33873: BugFix : NtGdiPatBlt did not call on NtGdiMaskBlt when source have been set in ROP

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 6 18:37:41 2008 New Revision: 33873 URL: http://svn.reactos.org/svn/reactos?rev=33873&view=rev Log: BugFix : NtGdiPatBlt did not call on NtGdiMaskBlt when source have been set in ROP Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Fri Jun 6 18:37:41 2008 @@ -1070,10 +1070,18 @@ DWORD ROP) { PGDIBRUSHOBJ BrushObj; - DC *dc = DC_LockDc(hDC); + DC *dc; PDC_ATTR Dc_Attr; + BOOL UsesSource = ROP3_USES_SOURCE(ROP); BOOL ret; + if (UsesSource) + { + /* in this case we call on GdiMaskBlt */ + return NtGdiMaskBlt(hDC, XLeft, YLeft, Width, Height, 0,0,0,0,0,0,ROP,0); + } + + dc = DC_LockDc(hDC); if (dc == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE);

16 years, 6 months

[greatlrd] 33872: BugFix : NtGdiBitblt follow member BitmapDest and BitmapSrc one of them can be NULL in NtGdiBitBlt logic so do not try access members in null pointer

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 6 18:09:42 2008 New Revision: 33872 URL: http://svn.reactos.org/svn/reactos?rev=33872&view=rev Log: BugFix : NtGdiBitblt follow member BitmapDest and BitmapSrc one of them can be NULL in NtGdiBitBlt logic so do not try access members in null pointer Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Fri Jun 6 18:09:42 2008 @@ -301,7 +301,7 @@ } /* Perform the bitblt operation */ - Status = IntEngBitBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, NULL, + Status = IntEngBitBlt( BitmapDest ? &BitmapDest->SurfObj : NULL, BitmapSrc ? &BitmapSrc->SurfObj : NULL, NULL, DCDest->CombinedClip, XlateObj, &DestRect, &SourcePoint, NULL, BrushObj ? &BrushInst.BrushObject : NULL,

16 years, 6 months

[fireball] 33871: - Fix KDBG's EIP munging. - Don't make single-step break into KDBG if it comes from user-mode. - Don't make KDBG return "continue" for breakpoint/singlestep, it should return "do not handle exception". - Add 20 new invalid instructions detected instead of crashing/"UNHANDLED CODE". - Fix DR registry handling (set DebugActive = TRUE when needed, and set Context->Dr7). - Fix set/get context: These two functions didn't work at all. Get actually performed a Set, and Vice-versa. Als

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jun 6 16:51:21 2008 New Revision: 33871 URL: http://svn.reactos.org/svn/reactos?rev=33871&view=rev Log: - Fix KDBG's EIP munging. - Don't make single-step break into KDBG if it comes from user-mode. - Don't make KDBG return "continue" for breakpoint/singlestep, it should return "do not handle exception". - Add 20 new invalid instructions detected instead of crashing/"UNHANDLED CODE". - Fix DR registry handling (set DebugActive = TRUE when needed, and set Context->Dr7). - Fix set/get context: These two functions didn't work at all. Get actually performed a Set, and Vice-versa. Also, Set would incorrectly set the frame of the caller, not the target thread. Also, the trap frame pointer wasn't being grabbed correctly for kernel-mode callers. - Move the code to a non-portable i386 directory, since the code is architecture-specific. - Move GET_SET_CTX_CONTENT out to ps.h. Added: trunk/reactos/ntoskrnl/ps/i386/ trunk/reactos/ntoskrnl/ps/i386/psctx.c (with props) Modified: trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/ntoskrnl/ps/debug.c Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] Fri Jun 6 16:51:21 2008 @@ -71,6 +71,17 @@ #define PSP_JOB_SCHEDULING_CLASSES 10 // +// Thread "Set/Get Context" Context Structure +// +typedef struct _GET_SET_CTX_CONTEXT +{ + KAPC Apc; + KEVENT Event; + KPROCESSOR_MODE Mode; + CONTEXT Context; +} GET_SET_CTX_CONTEXT, *PGET_SET_CTX_CONTEXT; + +// // Initialization Functions // VOID @@ -348,6 +359,16 @@ PsSuspendThread( IN PETHREAD Thread, OUT PULONG PreviousCount OPTIONAL +); + +VOID +NTAPI +PspGetOrSetContextKernelRoutine( + IN PKAPC Apc, + IN OUT PKNORMAL_ROUTINE* NormalRoutine, + IN OUT PVOID* NormalContext, + IN OUT PVOID* SystemArgument1, + IN OUT PVOID* SystemArgument2 ); // Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Fri Jun 6 16:51:21 2008 @@ -162,20 +162,11 @@ /* Bump EIP over int 3 if debugger did not already change it */ if (ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) { -#ifdef KDBG - if (Context->Eip == EipOld) - Context->Eip++; -#else - /* We simulate the original behaviour when KDBG is turned off. - Return var is set to kdHandleException, thus we always return FALSE */ -#ifdef _M_IX86 - Context->Eip = EipOld; -#endif -#endif + //DPRINT1("Address: %p. Return: %d\n", EipOld, Return); } /* Convert return to BOOLEAN */ - if (Return == kdContinue) return TRUE; + if (Return == kdDoNotHandleException) return FALSE; return FALSE; } @@ -204,7 +195,7 @@ } /* Convert return to BOOLEAN */ - if (Return == kdContinue) return TRUE; + if (Return == kdDoNotHandleException) return FALSE; return FALSE; } Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=33… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Fri Jun 6 16:51:21 2008 @@ -57,7 +57,7 @@ { /* First chance Last chance */ { KdbDoNotEnter, KdbEnterFromKmode }, /* Zero devide */ - { KdbEnterAlways, KdbDoNotEnter }, /* Debug trap */ + { KdbEnterFromKmode, KdbDoNotEnter }, /* Debug trap */ { KdbDoNotEnter, KdbEnterAlways }, /* NMI */ { KdbEnterFromKmode, KdbDoNotEnter }, /* INT3 */ { KdbDoNotEnter, KdbEnterFromKmode }, /* Overflow */ @@ -1485,7 +1485,7 @@ { if (!EnterConditionMet) { - return ContinueType; + return kdDoNotHandleException; } DbgPrint("Entered debugger on unexpected debug trap!\n"); } @@ -1499,7 +1499,7 @@ } if (!EnterConditionMet) { - return ContinueType; + return kdDoNotHandleException; } DbgPrint("Entered debugger on embedded INT3 at 0x%04x:0x%08x.\n", Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Fri Jun 6 16:51:21 2008 @@ -593,8 +593,8 @@ /* If we're in user-mode */ if (PreviousMode != KernelMode) { - /* FIXME: Save the mask */ - //KeGetCurrentThread()->DispatcherHeader.DebugActive = DrMask; + /* Save the mask */ + KeGetCurrentThread()->DispatcherHeader.DebugActive = DrMask; } } @@ -782,7 +782,7 @@ Context->Dr6 = TrapFrame->Dr6; /* Update DR7 */ - //Context->Dr7 = KiUpdateDr7(TrapFrame->Dr7); + Context->Dr7 = KiUpdateDr7(TrapFrame->Dr7); } else { @@ -947,21 +947,21 @@ /* User mode exception, was it first-chance? */ if (FirstChance) { - /* Enter Debugger if available */ - if (PsGetCurrentProcess()->DebugPort) - { - /* FIXME : TODO */ - //KEBUGCHECK(0); - } - else if (KiDebugRoutine(TrapFrame, - ExceptionFrame, - ExceptionRecord, - &Context, - PreviousMode, - FALSE)) - { - /* Exception was handled */ - goto Handled; + /* Make sure a debugger is present, and ignore user-mode if requested */ + if ((KiDebugRoutine) && + (!(PsGetCurrentProcess()->DebugPort))) + { + /* Call the debugger */ + if (KiDebugRoutine(TrapFrame, + ExceptionFrame, + ExceptionRecord, + &Context, + PreviousMode, + FALSE)) + { + /* Exception was handled */ + goto Handled; + } } /* Forward exception to user mode debugger */ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Fri Jun 6 16:51:21 2008 @@ -646,11 +646,19 @@ call _CommonDispatchException .endfunc -.func DispatchOneParam -_DispatchOneParam: +.func DispatchOneParamZero +_DispatchOneParamZero: /* Call the common dispatcher */ xor edx, edx mov ecx, 1 + call _CommonDispatchException +.endfunc + +.func DispatchTwoParamZero +_DispatchTwoParamZero: + /* Call the common dispatcher */ + xor edx, edx + mov ecx, 2 call _CommonDispatchException .endfunc @@ -1223,14 +1231,13 @@ /* Raise exception */ mov eax, STATUS_FLOAT_INVALID_OPERATION - jmp _DispatchOneParam + jmp _DispatchOneParamZero InvalidStack: /* Raise exception */ mov eax, STATUS_FLOAT_STACK_CHECK - xor edx, edx - jmp _DispatchTwoParam + jmp _DispatchTwoParamZero ValidNpxOpcode: @@ -1240,7 +1247,7 @@ /* Raise exception */ mov eax, STATUS_FLOAT_DIVIDE_BY_ZERO - jmp _DispatchOneParam + jmp _DispatchOneParamZero 1: /* Check for denormal */ @@ -1249,7 +1256,7 @@ /* Raise exception */ mov eax, STATUS_FLOAT_INVALID_OPERATION - jmp _DispatchOneParam + jmp _DispatchOneParamZero 1: /* Check for overflow */ @@ -1258,7 +1265,7 @@ /* Raise exception */ mov eax, STATUS_FLOAT_OVERFLOW - jmp _DispatchOneParam + jmp _DispatchOneParamZero 1: /* Check for underflow */ @@ -1267,7 +1274,7 @@ /* Raise exception */ mov eax, STATUS_FLOAT_UNDERFLOW - jmp _DispatchOneParam + jmp _DispatchOneParamZero 1: /* Check for precision fault */ @@ -1276,7 +1283,7 @@ /* Raise exception */ mov eax, STATUS_FLOAT_INEXACT_RESULT - jmp _DispatchOneParam + jmp _DispatchOneParamZero UnexpectedNpx: @@ -1446,11 +1453,7 @@ /* Otherwise, something is very wrong, raise an exception */ sti - mov ebx, [ebp+KTRAP_FRAME_EIP] - mov esi, -1 - mov eax, STATUS_ACCESS_VIOLATION - xor edx, edx - jmp _DispatchTwoParam + jmp SetException RaiseIrql: @@ -1494,7 +1497,7 @@ NotV86: /* Enter trap */ TRAP_PROLOG kitd_a, kitd_t - + /* Check if this was from kernel-mode */ test dword ptr [ebp+KTRAP_FRAME_CS], MODE_MASK jnz UserModeGpf @@ -1594,8 +1597,7 @@ mov esi, [ebp+KTRAP_FRAME_ERROR_CODE] and esi, 0xFFFF mov eax, STATUS_ACCESS_VIOLATION - xor edx, edx - jmp _DispatchTwoParam + jmp _DispatchTwoParamZero MsrCheck: @@ -1741,19 +1743,95 @@ /* If it's not a prefix byte, check other instructions */ jnz NotPrefixByte - - /* FIXME */ - UNHANDLED_PATH + + /* Keep looping */ + loop InstLoop + + /* Fixup the stack */ + pop PCR[KPCR_EXCEPTION_LIST] + add esp, 8 + + /* Illegal instruction */ + jmp KmodeOpcode NotPrefixByte: - /* FIXME: Check if it's a HLT */ + /* Check if it's a HLT */ + cmp al, 0x0F4 + je IsPrivInstruction /* Check if the instruction has two bytes */ cmp al, 0xF jne CheckRing3Io - - /* FIXME */ - UNHANDLED_PATH + + /* Check if this is a LLDT or LTR */ + lods byte ptr [esi] + cmp al, 0 + jne NotLldt + + /* Check if this is an LLDT */ + lods byte ptr [esi] + and al, 0x38 + cmp al, 0x10 + je IsPrivInstruction + + /* Check if this is an LTR */ + cmp al, 0x18 + je IsPrivInstruction + + /* Otherwise, access violation */ + jmp NotIoViolation + +NotLldt: + /* Check if this is LGDT or LIDT or LMSW */ + cmp al, 0x01 + jne NotGdt + + /* Check if this is an LGDT */ + lods byte ptr [esi] + and al, 0x38 + cmp al, 0x10 + je IsPrivInstruction + + /* Check if this is an LIDT */ + cmp al, 0x18 + je IsPrivInstruction + + /* Check if this is an LMSW */ + cmp al, 0x30 + je IsPrivInstruction + + /* Otherwise, access violation */ + jmp NotIoViolation + +NotGdt: + /* Check if it's INVD or WBINVD */ + cmp al, 0x8 + je IsPrivInstruction + cmp al, 0x9 + je IsPrivInstruction + + /* Check if it's sysexit */ + cmp al, 0x35 + je IsPrivInstruction + + /* Check if it's a DR move */ + cmp al, 0x26 + je IsPrivInstruction + + /* Check if it's a CLTS */ + cmp al, 0x6 + je IsPrivInstruction + + /* Check if it's a CR move */ + cmp al, 0x20 + jb NotIoViolation + + /* Check if it's a DR move */ + cmp al, 0x24 + jbe IsPrivInstruction + + /* Everything else is an access violation */ + jmp NotIoViolation CheckRing3Io: /* Get EFLAGS and IOPL */ @@ -1804,8 +1882,7 @@ mov ebx, [ebp+KTRAP_FRAME_EIP] mov esi, -1 mov eax, STATUS_ACCESS_VIOLATION - xor edx, edx - jmp _DispatchTwoParam + jmp _DispatchTwoParamZero DispatchV86Gpf: /* FIXME */ @@ -2123,7 +2200,7 @@ /* Raise exception */ mov eax, STATUS_FLOAT_MULTIPLE_TRAPS - jmp _DispatchOneParam + jmp _DispatchOneParamZero 1: /* Check for zero divide */ @@ -2132,7 +2209,7 @@ /* Raise exception */ mov eax, STATUS_FLOAT_MULTIPLE_TRAPS - jmp _DispatchOneParam + jmp _DispatchOneParamZero 1: /* Check for denormal */ @@ -2141,7 +2218,7 @@ /* Raise exception */ mov eax, STATUS_FLOAT_MULTIPLE_TRAPS - jmp _DispatchOneParam + jmp _DispatchOneParamZero 1: /* Check for overflow*/ @@ -2150,7 +2227,7 @@ /* Raise exception */ mov eax, STATUS_FLOAT_MULTIPLE_FAULTS - jmp _DispatchOneParam + jmp _DispatchOneParamZero 1: /* Check for denormal */ @@ -2159,7 +2236,7 @@ /* Raise exception */ mov eax, STATUS_FLOAT_MULTIPLE_FAULTS - jmp _DispatchOneParam + jmp _DispatchOneParamZero 1: /* Check for Precision */ @@ -2168,7 +2245,7 @@ /* Raise exception */ mov eax, STATUS_FLOAT_MULTIPLE_FAULTS - jmp _DispatchOneParam + jmp _DispatchOneParamZero UnexpectedXmmi: /* Strange result, bugcheck the OS */ Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Fri Jun 6 16:51:21 2008 @@ -398,6 +398,11 @@ <file>events.c</file> </directory> <directory name="ps"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>psctx.c</file> + </directory> + </if> <file>debug.c</file> <file>job.c</file> <file>kill.c</file> Modified: trunk/reactos/ntoskrnl/ps/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/debug.c?rev=33… ============================================================================== --- trunk/reactos/ntoskrnl/ps/debug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/debug.c [iso-8859-1] Fri Jun 6 16:51:21 2008 @@ -11,18 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> - -/* GLOBALS *****************************************************************/ - -/* Thread "Set/Get Context" Context Structure */ -typedef struct _GET_SET_CTX_CONTEXT -{ - KAPC Apc; - KEVENT Event; - KPROCESSOR_MODE Mode; - CONTEXT Context; -} GET_SET_CTX_CONTEXT, *PGET_SET_CTX_CONTEXT; +#include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ @@ -100,62 +89,6 @@ } } #endif - -VOID -NTAPI -PspGetOrSetContextKernelRoutine(IN PKAPC Apc, - IN OUT PKNORMAL_ROUTINE* NormalRoutine, - IN OUT PVOID* NormalContext, - IN OUT PVOID* SystemArgument1, - IN OUT PVOID* SystemArgument2) -{ -#if defined(_M_IX86) - PGET_SET_CTX_CONTEXT GetSetContext; - PKEVENT Event; - PCONTEXT Context; - PKTHREAD Thread; - KPROCESSOR_MODE Mode; - PKTRAP_FRAME TrapFrame; - PAGED_CODE(); - - /* Get the Context Structure */ - GetSetContext = CONTAINING_RECORD(Apc, GET_SET_CTX_CONTEXT, Apc); - Context = &GetSetContext->Context; - Event = &GetSetContext->Event; - Mode = GetSetContext->Mode; - Thread = Apc->SystemArgument2; - - /* Get the trap frame */ - TrapFrame = (PKTRAP_FRAME)((ULONG_PTR)KeGetCurrentThread()->InitialStack - - sizeof (FX_SAVE_AREA) - sizeof (KTRAP_FRAME)); - - /* Sanity check */ - ASSERT(((TrapFrame->SegCs & MODE_MASK) != KernelMode) || - (TrapFrame->EFlags & EFLAGS_V86_MASK)); - - /* Check if it's a set or get */ - if (SystemArgument1) - { - /* Get the Context */ - KeTrapFrameToContext(TrapFrame, NULL, Context); - } - else - { - /* Set the Context */ - KeContextToTrapFrame(Context, - NULL, - TrapFrame, - Context->ContextFlags, - Mode); - } - - /* Notify the Native API that we are done */ - KeSetEvent(Event, IO_NO_INCREMENT, FALSE); -#else - DPRINT1("PspGetOrSetContextKernelRoutine() not implemented!"); - for (;;); -#endif -} /* PUBLIC FUNCTIONS **********************************************************/ Added: trunk/reactos/ntoskrnl/ps/i386/psctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/i386/psctx.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ps/i386/psctx.c (added) +++ trunk/reactos/ntoskrnl/ps/i386/psctx.c [iso-8859-1] Fri Jun 6 16:51:21 2008 @@ -1,0 +1,93 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ps/i386/pxctx.c + * PURPOSE: Process Manager: Set/Get Context for i386 + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +PspGetContext(IN PKTRAP_FRAME TrapFrame, + IN PVOID NonVolatileContext, + IN OUT PCONTEXT Context) +{ + PAGED_CODE(); + + /* Convert the trap frame to a context */ + KeTrapFrameToContext(TrapFrame, NULL, Context); +} + +VOID +NTAPI +PspSetContext(OUT PKTRAP_FRAME TrapFrame, + OUT PVOID NonVolatileContext, + IN PCONTEXT Context, + IN KPROCESSOR_MODE Mode) +{ + PAGED_CODE(); + + /* Convert the context to a trap frame structure */ + KeContextToTrapFrame(Context, NULL, TrapFrame, Context->ContextFlags, Mode); +} + +VOID +NTAPI +PspGetOrSetContextKernelRoutine(IN PKAPC Apc, + IN OUT PKNORMAL_ROUTINE* NormalRoutine, + IN OUT PVOID* NormalContext, + IN OUT PVOID* SystemArgument1, + IN OUT PVOID* SystemArgument2) +{ + PGET_SET_CTX_CONTEXT GetSetContext; + PKEVENT Event; + PCONTEXT Context; + PKTHREAD Thread; + KPROCESSOR_MODE Mode; + PKTRAP_FRAME TrapFrame = NULL; + PAGED_CODE(); + + /* Get the Context Structure */ + GetSetContext = CONTAINING_RECORD(Apc, GET_SET_CTX_CONTEXT, Apc); + Context = &GetSetContext->Context; + Event = &GetSetContext->Event; + Mode = GetSetContext->Mode; + Thread = Apc->SystemArgument2; + + /* If this is a kernel-mode request, grab the saved trap frame */ + if (Mode == KernelMode) TrapFrame = Thread->TrapFrame; + + /* If we don't have one, grab it from the stack */ + if (!TrapFrame) + { + /* Trap frame is right under our initial stack */ + TrapFrame = (PKTRAP_FRAME)((ULONG_PTR)Thread->InitialStack - + ROUND_UP(sizeof(KTRAP_FRAME), KTRAP_FRAME_ALIGN) - + sizeof(FX_SAVE_AREA)); + } + + /* Check if it's a set or get */ + if (Apc->SystemArgument1) + { + /* Get the Context */ + PspSetContext(TrapFrame, NULL, Context, Mode); + } + else + { + /* Set the Context */ + PspGetContext(TrapFrame, NULL, Context); + } + + /* Notify the Native API that we are done */ + KeSetEvent(Event, IO_NO_INCREMENT, FALSE); +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/ps/i386/psctx.c ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 6 months

[fireball] 33870: - Fix a major bug while closing a process that was debugging another process, which would cause a bugcheck because it tried to kill itself while it was being killed -- instead, it should try killing the debuggee! fixes the bug that arty and I fought about when he said "process killing seems broken" and tried to add delayed-object-closing. Patch by Alex Ionescu. - Remove a leftover from kernel32 which assumed that if "BeingDebugged" was TRUE, the library was being tested on an X

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jun 6 16:43:37 2008 New Revision: 33870 URL: http://svn.reactos.org/svn/reactos?rev=33870&view=rev Log: - Fix a major bug while closing a process that was debugging another process, which would cause a bugcheck because it tried to kill itself while it was being killed -- instead, it should try killing the debuggee! fixes the bug that arty and I fought about when he said "process killing seems broken" and tried to add delayed-object-closing. Patch by Alex Ionescu. - Remove a leftover from kernel32 which assumed that if "BeingDebugged" was TRUE, the library was being tested on an XP machine. Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c trunk/reactos/ntoskrnl/dbgk/dbgkobj.c Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] Fri Jun 6 16:43:37 2008 @@ -257,42 +257,6 @@ { case DLL_PROCESS_ATTACH: -#ifdef _M_IX86 - /* OK, yes, this is really retarded but it works for now */ - InWindows = NtCurrentPeb()->BeingDebugged; - - /* - * CreateProcess will run in the real kernel32 and it will write - * its own BaseProcessStartThunk EIP in the CONTEXT that ZwContinue - * will get. We'll be first called by Ldr while initializing, and we'll - * be wrapped in 3 layers of SEH, followed by two frames, finally - * followed by our CONTEXT on the stack. We'll modify the EIP in it - * to match the correct one (our own) and then everything works. - * Tested on XP and 2K3, probably doesn't work in 2K. - */ - if (InWindows) - { - /* - * Due to yet another bug in how Windows handles .local, LDR will - * actually end up loading us twice. The second time will be the - * "official" load, at a totally different address. It will be, - * it will be at -that- address that all the APIs will be called. - * However, that address is dynamic while this one will be static, - * so we'll do initilization with this one. Plus, at this one, - * we know exactly that we're within 3 SEH layers. - */ - if (hDll == (HANDLE)0x7c800000) - { - PULONG Eip; - __debugbreak(); - Eip = (PULONG)*(PULONG)*(PULONG)NtCurrentTeb()->Tib.ExceptionList + - 0x9 + - FIELD_OFFSET(CONTEXT, Eip) / sizeof(ULONG); - *Eip = (ULONG)BaseProcessStartThunk; - } - } -#endif - /* Don't bother us for each thread */ LdrDisableThreadCalloutsForDll((PVOID)hDll); Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Fri Jun 6 16:43:37 2008 @@ -115,7 +115,7 @@ KeInitializeEvent(&DebugEvent->ContinueEvent, SynchronizationEvent, FALSE); DebugEvent->Process = Process; DebugEvent->Thread = Thread; - RtlCopyMemory(&DebugEvent->ApiMsg, Message, sizeof(DBGKM_MSG)); + DebugEvent->ApiMsg = *Message; DebugEvent->ClientId = Thread->Cid; /* Check if we have a port object */ @@ -176,7 +176,7 @@ NULL); /* Copy API Message back */ - RtlCopyMemory(Message, &DebugEvent->ApiMsg, sizeof(DBGKM_MSG)); + *Message = DebugEvent->ApiMsg; /* Set return status */ Status = DebugEvent->Status; @@ -1079,8 +1079,6 @@ DBGKTRACE(DBGK_OBJECT_DEBUG, "OwnerProcess: %p DebugObject: %p\n", OwnerProcess, DebugObject); - DPRINT("APC DISABLE: %d\n", ((PETHREAD)KeGetCurrentThread())->Tcb.CombinedApcDisable); - /* If this isn't the last handle, do nothing */ if (SystemHandleCount > 1) return; @@ -1124,13 +1122,13 @@ if (DebugPortCleared) { /* Mark this in the PEB */ - DbgkpMarkProcessPeb(OwnerProcess); + DbgkpMarkProcessPeb(Process); /* Check if we terminate on exit */ if (DebugObject->KillProcessOnExit) { /* Terminate the process */ - PsTerminateProcess(OwnerProcess, STATUS_DEBUGGER_INACTIVE); + PsTerminateProcess(Process, STATUS_DEBUGGER_INACTIVE); } /* Dereference the debug object */ @@ -1192,6 +1190,7 @@ if (NT_SUCCESS(Status)) { /* Acquire the global lock */ +ThreadScan: GlobalHeld = TRUE; ExAcquireFastMutex(&DbgkpProcessDebugPortMutex); @@ -1203,7 +1202,6 @@ } else { -ThreadScan: /* Otherwise, set the port and reference the thread */ Process->DebugPort = DebugObject; ObReferenceObject(LastThread); @@ -1235,14 +1233,7 @@ { /* Dereference the first thread and re-acquire the lock */ ObDereferenceObject(FirstThread); - GlobalHeld = TRUE; - ExAcquireFastMutex(&DbgkpProcessDebugPortMutex); - - /* Check if we should loop again */ - if (!Process->DebugPort) goto ThreadScan; - - /* Otherwise, we already have a port */ - Status = STATUS_PORT_ALREADY_SET; + goto ThreadScan; } } } @@ -1265,8 +1256,7 @@ { /* Set the process flags */ InterlockedOr((PLONG)&Process->Flags, - PSF_NO_DEBUG_INHERIT_BIT | - PSF_CREATE_REPORTED_BIT); + PSF_NO_DEBUG_INHERIT_BIT | PSF_CREATE_REPORTED_BIT); /* Reference the debug object */ ObDereferenceObject(DebugObject); @@ -2012,7 +2002,7 @@ StartTime = NewTime; /* Check if we've timed out */ - if (SafeTimeOut.QuadPart > 0) + if (SafeTimeOut.QuadPart >= 0) { /* We have, break out of the loop */ Status = STATUS_TIMEOUT; @@ -2037,9 +2027,7 @@ _SEH_TRY { /* Return our wait state change structure */ - RtlCopyMemory(StateChange, - &WaitStateChange, - sizeof(DBGUI_WAIT_STATE_CHANGE)); + *StateChange = WaitStateChange; } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) {

16 years, 6 months

[fireball] 33869: - Change the registry name from Registry to REGISTRY, which fixes almost all Wine registry tests and any other application using the registry in case-sensitive mode, because the real name is REGISTRY. - Add SEH to NtCreate/OpenKey, which fixes the rest of the wine registry tests. - Fix PnP Manager code that was doing case sensitive registry access with "Registry".

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jun 6 16:40:37 2008 New Revision: 33869 URL: http://svn.reactos.org/svn/reactos?rev=33869&view=rev Log: - Change the registry name from Registry to REGISTRY, which fixes almost all Wine registry tests and any other application using the registry in case-sensitive mode, because the real name is REGISTRY. - Add SEH to NtCreate/OpenKey, which fixes the rest of the wine registry tests. - Fix PnP Manager code that was doing case sensitive registry access with "Registry". Modified: trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Fri Jun 6 16:40:37 2008 @@ -860,7 +860,7 @@ } /* Create '\Registry' key. */ - RtlInitUnicodeString(&KeyName, L"\\Registry"); + RtlInitUnicodeString(&KeyName, L"\\REGISTRY"); SecurityDescriptor = CmpHiveRootSecurityDescriptor(); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -885,7 +885,7 @@ if (!KeyCell) return FALSE; /* Create the KCB */ - RtlInitUnicodeString(&KeyName, L"Registry"); + RtlInitUnicodeString(&KeyName, L"\\REGISTRY"); Kcb = CmpCreateKeyControlBlock(&CmiVolatileHive->Hive, RootIndex, KeyCell, 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] Fri Jun 6 16:40:37 2008 @@ -27,18 +27,55 @@ IN ULONG CreateOptions, OUT PULONG Disposition) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); CM_PARSE_CONTEXT ParseContext = {0}; HANDLE Handle; PAGED_CODE(); DPRINT("NtCreateKey(OB 0x%wZ)\n", ObjectAttributes->ObjectName); + /* Prepare to probe parameters */ + _SEH_TRY + { + /* Check for user-mode caller */ + if (PreviousMode == UserMode) + { + /* Check if we have a class */ + if (Class) + { + /* Probe it */ + ProbeForReadUnicodeString(Class); + ProbeForRead(ParseContext.Class.Buffer, + ParseContext.Class.Length, + sizeof(WCHAR)); + ParseContext.Class = *Class; + } + + /* Probe the key handle */ + ProbeForWriteHandle(KeyHandle); + *KeyHandle = NULL; + + /* Probe object attributes */ + ProbeForRead(ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), 4); + } + else + { + /* Save the class directly */ + if (Class) ParseContext.Class = *Class; + } + } + _SEH_HANDLE + { + /* Get the status */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) return Status; + /* Setup the parse context */ ParseContext.CreateOperation = TRUE; ParseContext.CreateOptions = CreateOptions; - if (Class) ParseContext.Class = *Class; - + /* Do the create */ Status = ObOpenObjectByName(ObjectAttributes, CmpKeyObjectType, @@ -62,9 +99,32 @@ { CM_PARSE_CONTEXT ParseContext = {0}; HANDLE Handle; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PAGED_CODE(); DPRINT("NtOpenKey(OB 0x%wZ)\n", ObjectAttributes->ObjectName); + + /* Prepare to probe parameters */ + _SEH_TRY + { + /* Check for user-mode caller */ + if (PreviousMode == UserMode) + { + /* Probe the key handle */ + ProbeForWriteHandle(KeyHandle); + *KeyHandle = NULL; + + /* Probe object attributes */ + ProbeForRead(ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), 4); + } + } + _SEH_HANDLE + { + /* Get the status */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) return Status; /* Just let the object manager handle this */ Status = ObOpenObjectByName(ObjectAttributes, Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Fri Jun 6 16:40:37 2008 @@ -3217,7 +3217,7 @@ HANDLE hEnum, hRoot, hHalAcpiDevice, hHalAcpiId, hLogConf; NTSTATUS Status; - InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_KERNEL_HANDLE, NULL, NULL); + InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwCreateKey(&hEnum, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); if (!NT_SUCCESS(Status)) { @@ -3225,7 +3225,7 @@ return Status; } - InitializeObjectAttributes(&ObjectAttributes, &RootPathU, OBJ_KERNEL_HANDLE, hEnum, NULL); + InitializeObjectAttributes(&ObjectAttributes, &RootPathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hEnum, NULL); Status = ZwCreateKey(&hRoot, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); ZwClose(hEnum); if (!NT_SUCCESS(Status)) @@ -3236,12 +3236,12 @@ if (IopIsAcpiComputer()) { - InitializeObjectAttributes(&ObjectAttributes, &HalAcpiDevice, OBJ_KERNEL_HANDLE, hRoot, NULL); + InitializeObjectAttributes(&ObjectAttributes, &HalAcpiDevice, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hRoot, NULL); Status = ZwCreateKey(&hHalAcpiDevice, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); ZwClose(hRoot); if (!NT_SUCCESS(Status)) return Status; - InitializeObjectAttributes(&ObjectAttributes, &HalAcpiId, OBJ_KERNEL_HANDLE, hHalAcpiDevice, NULL); + InitializeObjectAttributes(&ObjectAttributes, &HalAcpiId, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiDevice, NULL); Status = ZwCreateKey(&hHalAcpiId, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); ZwClose(hHalAcpiDevice); if (!NT_SUCCESS(Status)) @@ -3251,7 +3251,7 @@ Status = ZwSetValueKey(hHalAcpiId, &HardwareIDU, 0, REG_MULTI_SZ, HalAcpiHardwareID.Buffer, HalAcpiHardwareID.MaximumLength); if (NT_SUCCESS(Status)) { - InitializeObjectAttributes(&ObjectAttributes, &LogConfU, OBJ_KERNEL_HANDLE, hHalAcpiId, NULL); + InitializeObjectAttributes(&ObjectAttributes, &LogConfU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiId, NULL); Status = ZwCreateKey(&hLogConf, 0, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); if (NT_SUCCESS(Status)) ZwClose(hLogConf);

16 years, 6 months

[fireball] 33868: - Update RtlIsTextUnicode (fixes some ntdll rtlstr winetests).

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jun 6 16:33:43 2008 New Revision: 33868 URL: http://svn.reactos.org/svn/reactos?rev=33868&view=rev Log: - Update RtlIsTextUnicode (fixes some ntdll rtlstr winetests). Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Fri Jun 6 16:33:43 2008 @@ -1690,12 +1690,12 @@ ); NTSYSAPI -ULONG +BOOLEAN NTAPI RtlIsTextUnicode( - PVOID Buffer, - ULONG Length, - ULONG *Flags + LPCVOID Buffer, + INT Length, + INT *Flags ); NTSYSAPI Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=3386… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Fri Jun 6 16:33:43 2008 @@ -1055,57 +1055,84 @@ * RETURNS * The length of the string if all tests were passed, 0 otherwise. */ -ULONG NTAPI -RtlIsTextUnicode (PVOID Buffer, - ULONG Length, - ULONG *Flags) -{ - PWSTR s = Buffer; - ULONG in_flags = (ULONG)-1; - ULONG out_flags = 0; - - if (Length == 0) - goto done; - - if (Flags != 0) - in_flags = *Flags; - - /* - * Apply various tests to the text string. According to the - * docs, each test "passed" sets the corresponding flag in - * the output flags. But some of the tests are mutually - * exclusive, so I don't see how you could pass all tests ... - */ - - /* Check for an odd length ... pass if even. */ - if (!(Length & 1)) - out_flags |= IS_TEXT_UNICODE_ODD_LENGTH; - - /* Check for the BOM (byte order mark). */ - if (*s == 0xFEFF) - out_flags |= IS_TEXT_UNICODE_SIGNATURE; - -#if 0 - /* Check for the reverse BOM (byte order mark). */ - if (*s == 0xFFFE) - out_flags |= IS_TEXT_UNICODE_REVERSE_SIGNATURE; -#endif - - /* FIXME: Add more tests */ - - /* - * Check whether the string passed all of the tests. - */ - in_flags &= ITU_IMPLEMENTED_TESTS; - if ((out_flags & in_flags) != in_flags) - Length = 0; - -done: - if (Flags != 0) - *Flags = out_flags; - - return Length; -} +BOOLEAN +NTAPI +RtlIsTextUnicode( LPCVOID buf, INT len, INT *pf ) +{ + const WCHAR *s = buf; + int i; + unsigned int flags = ~0U, out_flags = 0; + + if (len < sizeof(WCHAR)) + { + /* FIXME: MSDN documents IS_TEXT_UNICODE_BUFFER_TOO_SMALL but there is no such thing... */ + if (pf) *pf = 0; + return FALSE; + } + if (pf) + flags = *pf; + /* + * Apply various tests to the text string. According to the + * docs, each test "passed" sets the corresponding flag in + * the output flags. But some of the tests are mutually + * exclusive, so I don't see how you could pass all tests ... + */ + + /* Check for an odd length ... pass if even. */ + if (len & 1) out_flags |= IS_TEXT_UNICODE_ODD_LENGTH; + + if (((char *)buf)[len - 1] == 0) + len--; /* Windows seems to do something like that to avoid e.g. false IS_TEXT_UNICODE_NULL_BYTES */ + + len /= sizeof(WCHAR); + /* Windows only checks the first 256 characters */ + if (len > 256) len = 256; + + /* Check for the special byte order unicode marks. */ + if (*s == 0xFEFF) out_flags |= IS_TEXT_UNICODE_SIGNATURE; + if (*s == 0xFFFE) out_flags |= IS_TEXT_UNICODE_REVERSE_SIGNATURE; + + /* apply some statistical analysis */ + if (flags & IS_TEXT_UNICODE_STATISTICS) + { + int stats = 0; + /* FIXME: checks only for ASCII characters in the unicode stream */ + for (i = 0; i < len; i++) + { + if (s[i] <= 255) stats++; + } + if (stats > len / 2) + out_flags |= IS_TEXT_UNICODE_STATISTICS; + } + + /* Check for unicode NULL chars */ + if (flags & IS_TEXT_UNICODE_NULL_BYTES) + { + for (i = 0; i < len; i++) + { + if (!(s[i] & 0xff) || !(s[i] >> 8)) + { + out_flags |= IS_TEXT_UNICODE_NULL_BYTES; + break; + } + } + } + + if (pf) + { + out_flags &= *pf; + *pf = out_flags; + } + /* check for flags that indicate it's definitely not valid Unicode */ + if (out_flags & (IS_TEXT_UNICODE_REVERSE_MASK | IS_TEXT_UNICODE_NOT_UNICODE_MASK)) return FALSE; + /* now check for invalid ASCII, and assume Unicode if so */ + if (out_flags & IS_TEXT_UNICODE_NOT_ASCII_MASK) return TRUE; + /* now check for Unicode flags */ + if (out_flags & IS_TEXT_UNICODE_UNICODE_MASK) return TRUE; + /* no flags set */ + return FALSE; +} + /* * @implemented

16 years, 6 months

← Newer
1
...
33
34
35
36
37
38
39
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2008