Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 62284: [NTOSKRNL] CORE-7932 #comment Silence UNIMPLEMENTED warning for SepAdtPrivilegedServiceAuditAlarm, since this function is called relatively often, spamming the debuglog, and it's ...
by tkreuzer＠svn.reactos.org 22 Feb '14

22 Feb '14

Author: tkreuzer Date: Sat Feb 22 09:36:42 2014 New Revision: 62284 URL: http://svn.reactos.org/svn/reactos?rev=62284&view=rev Log: [NTOSKRNL] CORE-7932 #comment Silence UNIMPLEMENTED warning for SepAdtPrivilegedServiceAuditAlarm, since this function is called relatively often, spamming the debuglog, and it's missing implementation does not directly affect the behavior for applications. Modified: trunk/reactos/ntoskrnl/se/audit.c Modified: trunk/reactos/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=62… ============================================================================== --- trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] Sat Feb 22 09:36:42 2014 @@ -206,7 +206,7 @@ _In_ PPRIVILEGE_SET Privileges, _In_ BOOLEAN AccessGranted) { - UNIMPLEMENTED; + DPRINT("SepAdtPrivilegedServiceAuditAlarm is unimplemented\n"); } VOID

1 0

[hbelusca] 62283: [NTVDM] ** WARNING! WARNING! WORK IN PROGRESS!! ** ** MEGA HUGE IRC SPAM IN SIGHT!! ** Commit a starting point implementation for 16-bit callbacks from 32-bit code that work toget...
by hbelusca＠svn.reactos.org 21 Feb '14

21 Feb '14

Author: hbelusca Date: Fri Feb 21 20:31:56 2014 New Revision: 62283 URL: http://svn.reactos.org/svn/reactos?rev=62283&view=rev Log: [NTVDM] ** WARNING! WARNING! WORK IN PROGRESS!! ** ** MEGA HUGE IRC SPAM IN SIGHT!! ** Commit a starting point implementation for 16-bit callbacks from 32-bit code that work together with the EmulatorSimulate / EmulatorUnsimulate functions. That needs HUUUGE reviewing (go to the END to skip details and going to the current drawbacks of the implementation) <-- [TheFlash], Vampyre, others... How it is intended to work: 1- Add callback.c to the CMakeLists.txt file, and remove int32.c from it. 2- In some 32-bit module that will get called by 16-bit code sooner or later (e.g. bios32 or dos32), include callback.h instead of int23.h. 3- Add a CALLBACK16 MyContext; // definition 4- In some initialization code for this module, call: InitializeContext(&MyContext, custom_segment, custom_offset); This allows you to define a zone of memory custom_segment:custom_offset that will be used as a trampoline zone. FIXME/TODO: we can return from this call the size of this zone (not implemented at the moment), so that we can know the zone that will be reserved for calls (it will be used in the following steps). 5- Now you can register e.g. 32-bit interrupt handlers with calls like: MyContext.NextOffset += RegisterInt32(MAKELONG(MyContext.NextOffset, MyContext.Segment), IntNumber, Int32Handler, NULL); Now comes the tricky part: since we want to be able to give precise memory addresses to where to put interrupt stubs (whose addresses will be stored in the IVT) (it's because it happens that some programs expect some few code interrupts to be placed at given places in memory; or one can argue that it is "for IBM bios compatibility"....), we pass a far pointer instead of the context structure as the first parameter. Then, currently the function returns the size of the written code (and it returns too via its last optional parameter). 6- You can do almost the same with RegisterInt16, where now instead of giving a 32-bit interrupt handler, you give the code of a 16-bit interrupt. What changes here is that in the 32-bit case, the 16-bit interrupt code was generated (to call back the 32-bit handler) whereas here you control it fully. For 16-bit interrupt code you need to use IRETs operands. 7- There is a RegisterCallback16 function, which registers at a given place in memory a chunk of 16-bit code. This code is expected to return with RETs. Its accompanying function RunCallback16 is untested at the moment. 8- Now the magic: Calling this code: an example is given in the following (from DosFastConOut fucntion of Dos32): <code_snip> /* Save AX and BX */ USHORT AX = getAX(); USHORT BX = getBX(); setBL(DOS_CHAR_ATTRIBUTE); setBH(Bda->VideoPage); setAH(0x0E); Int32Call(&DosContext, 0x10); /* Restore AX and BX */ setAX(AX); setBX(BX); </code_snip> Here (after saving some registers and setting some parameters for the INT 10h being called), we call interrupt 10h with Int32Call(&DosContext, 0x10); // where DosContext is a CALLBACK16 context. The call is done "synchronously", i.e. we restart here CPU simulation. The simulation then stops because the generated trampoline code has a suitable BOP_UNSIMULATE instruction. CURRENT DRAWBACKS: ================== 1- The module which is going to use those callbacks need to know where in memory the code will be placed. Nothing is done "automatically". Otherwise we would have to: * maintain a (gobal, and finite) table of callbacks (in some way or another), and/or * be able to place the code in some "shadowed" memory zone of the emulator that gets hidden for all the programs emulated BUT the emulator. 2- Linked to the previous second point comes the problem of trampoline code. It is needed because we need to put a BOP_UNSIMULATE operand after the code to stop the 16-bit code simulation and go back to 32-bit. We need also to call e.g. INT 0x10 from 16-bit to be able to run the interrupt that could be hooked by some program. Some may argue that one can first call EmulatorInterrupt(0x10); but then we would have to find a means of stopping the simulation as soon as the interrupt exits... 3- For calling "regular" 16-bit code (with RunCallback16) we need a suitable callback: "call far_pointer; BOP_UNSIMULATE" . 4- Currently we build the trampolines on-the-fly when calling either RunCallback16 or Int32Call, at the memory location given when initializing CALLBACK16 context. If a given 32-bit module calls some 16-bit code that calls in turn a 32-bit function from the SAME module which calls also a 16-bit callback, then the trampoline will be overwritten. In RunCallback16 (and Int32Call) we save it, push a new one and then call the 16-bit code, and then restore the old one after the call. It seems to work fine currently, but I've found a problem, I think, which is the following: * Suppose that a 16-bit program calls some VDD function, * this VDD function creates a thread, * the two running VDD functions then call back the 16-bit program, or trigger an interrupt from whatever nature which both call 32-bit functions from a given 32-bit module (bios, dos). In this situation many problems arise: a. Our current implementation of the emulator doesn't support that since you are going to play concurrently with the unique CONTEXT of the emulated CPU... (i.e. flags / registers corruption in sight) b. If the 32-bit functions (called concurrently, and which are from the same 32-bit module) call some 16-bit code / interrupt, then they are going to use the same memory zone for the trampoline stub and there are very high risks of corruption. A solution for that would be to generate the trampolines once and for all for each registered 16-bit interrupt stub / 16-bit generic callback, retrieve their addresses and store them in some place (that also get shared amongst all of the 32-bit modules of the NTVDM emulator), so that each (possible concurrent) call go to the trampoline and just make the CPU point at it... Voilà ! Added: branches/ntvdm/subsystems/ntvdm/callback.c - copied, changed from r62251, branches/ntvdm/subsystems/ntvdm/int32.c branches/ntvdm/subsystems/ntvdm/callback.h - copied, changed from r62251, branches/ntvdm/subsystems/ntvdm/int32.h Copied: branches/ntvdm/subsystems/ntvdm/callback.c (from r62251, branches/ntvdm/subsystems/ntvdm/int32.c) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/callback… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/callback.c [iso-8859-1] Fri Feb 21 20:31:56 2014 @@ -1,20 +1,21 @@ /* * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine - * FILE: int32.c - * PURPOSE: 32-bit Interrupt Handlers + * FILE: callback.c + * PURPOSE: 16 and 32-bit Callbacks Support * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/ -// #define NDEBUG +#define NDEBUG #include "emulator.h" -#include "int32.h" +#include "callback.h" #include "bop.h" +#include <isvbop.h> /* PRIVATE VARIABLES **********************************************************/ @@ -30,7 +31,234 @@ /* 32-bit Interrupt dispatcher function code for the Control BOP Handler */ #define BOP_CONTROL_INT32 0xFF + +// #define ALIGN(ptr) (((ULONG_PTR)(ptr) + 15) & ~15) +#define ALIGN(ptr) (ptr) + +#define BOP(num) LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), (num) +#define UnSimulate16 MAKELONG(EMULATOR_BOP, BOP_UNSIMULATE) // BOP(BOP_UNSIMULATE) + +#define CALL16_TRAMPOLINE_SIZE (2 * sizeof(ULONGLONG)) +#define INT16_TRAMPOLINE_SIZE (1 * sizeof(ULONGLONG)) + +/* 16-bit generic interrupt code for calling a 32-bit interrupt handler */ +BYTE Int16To32[] = +{ + 0xFA, // cli + + /* Push the value of the interrupt to be called */ + 0x6A, 0xFF, // push i (patchable to 0x6A, 0xIntNum) + + /* The counter variable (initialized to 0) */ + 0x6A, 0x00, // push 0 + + /* Stack variables */ + 0x83, 0xEC, 0x04, // sub sp, 4 + + /* The BOP Sequence */ +// BOP_SEQ: + 0xF8, // clc + BOP(BOP_CONTROL), // Control BOP + BOP_CONTROL_INT32, // 32-bit Interrupt dispatcher + + 0x73, 0x04, // jnc EXIT (offset +4) + + 0xFB, // sti + + // HACK: The following instruction should be HLT! + 0x90, // nop + + 0xEB, 0xF5, // jmp BOP_SEQ (offset -11) + +// EXIT: + 0x83, 0xC4, 0x08, // add sp, 8 + 0xCF, // iret +}; + /* PUBLIC FUNCTIONS ***********************************************************/ + +VOID +InitializeContext(IN PCALLBACK16 Context, + IN USHORT Segment, + IN USHORT Offset) +{ + Context->TrampolineFarPtr = MAKELONG(Offset, Segment); + Context->Segment = Segment; + Context->NextOffset = Offset + max(CALL16_TRAMPOLINE_SIZE, + INT16_TRAMPOLINE_SIZE); +} + +VOID +Call16(IN USHORT Segment, + IN USHORT Offset) +{ + /* Save CS:IP */ + USHORT OrgCS = getCS(); + USHORT OrgIP = getIP(); + + /* Set the new CS:IP */ + setCS(Segment); + setIP(Offset); + + DPRINT("Call16(0x%04X, 0x%04X)\n", Segment, Offset); + + /* Start simulation */ + EmulatorSimulate(); + + /* Restore CS:IP */ + setCS(OrgCS); + setIP(OrgIP); +} + + + +ULONG +RegisterCallback16(IN ULONG FarPtr, + IN LPBYTE CallbackCode, + IN SIZE_T CallbackSize, + OUT PSIZE_T CodeSize OPTIONAL) +{ + LPBYTE CodeStart = (LPBYTE)FAR_POINTER(FarPtr); + LPBYTE Code = CodeStart; + + SIZE_T OurCodeSize = CallbackSize; + + if (CallbackCode == NULL) CallbackSize = 0; + + if (CallbackCode) + { + /* 16-bit interrupt code */ + RtlCopyMemory(Code, CallbackCode, CallbackSize); + Code += CallbackSize; + } + + /* Return the real size of the code if needed */ + if (CodeSize) *CodeSize = OurCodeSize; // == (ULONG_PTR)Code - (ULONG_PTR)CodeStart; + + // /* Return the entry-point address for 32-bit calls */ + // return (ULONG_PTR)(CodeStart + CallbackSize); + return OurCodeSize; +} + +VOID +RunCallback16(IN PCALLBACK16 Context, + IN ULONG FarPtr) +{ + PUCHAR TrampolineBase = (PUCHAR)FAR_POINTER(Context->TrampolineFarPtr); + PUCHAR Trampoline = TrampolineBase; + UCHAR OldTrampoline[CALL16_TRAMPOLINE_SIZE]; + + /* Save the old trampoline */ + // RtlCopyMemory(OldTrampoline, TrampolineBase, sizeof(OldTrampoline)); + ((PULONGLONG)&OldTrampoline)[0] = ((PULONGLONG)TrampolineBase)[0]; + ((PULONGLONG)&OldTrampoline)[1] = ((PULONGLONG)TrampolineBase)[1]; + + /* Build the generic entry-point for 32-bit calls */ + *Trampoline++ = 0x9A; // Call far seg:off + *(PULONG)Trampoline = FarPtr; + Trampoline += sizeof(ULONG); + *(PULONG)Trampoline = UnSimulate16; + + /* Perform the call */ + Call16(HIWORD(Context->TrampolineFarPtr), + LOWORD(Context->TrampolineFarPtr)); + + /* Restore the old trampoline */ + // RtlCopyMemory(TrampolineBase, OldTrampoline, sizeof(OldTrampoline)); + ((PULONGLONG)TrampolineBase)[1] = ((PULONGLONG)&OldTrampoline)[1]; + ((PULONGLONG)TrampolineBase)[0] = ((PULONGLONG)&OldTrampoline)[0]; +} + + + +ULONG +RegisterInt16(IN ULONG FarPtr, + IN BYTE IntNumber, + IN LPBYTE CallbackCode, + IN SIZE_T CallbackSize, + OUT PSIZE_T CodeSize OPTIONAL) +{ + /* Get a pointer to the IVT and set the corresponding entry (far pointer) */ + LPDWORD IntVecTable = (LPDWORD)SEG_OFF_TO_PTR(0x0000, 0x0000); + IntVecTable[IntNumber] = FarPtr; + + /* Register the 16-bit callback */ + return RegisterCallback16(FarPtr, + CallbackCode, + CallbackSize, + CodeSize); +} + +ULONG +RegisterInt32(IN ULONG FarPtr, + IN BYTE IntNumber, + IN EMULATOR_INT32_PROC IntHandler, + OUT PSIZE_T CodeSize OPTIONAL) +{ + /* Array for holding our copy of the 16-bit interrupt callback */ + BYTE IntCallback[sizeof(Int16To32)/sizeof(BYTE)]; + + /* Check whether the 32-bit interrupt was already registered */ + // if (Int32Proc[IntNumber] != NULL) + // { + // DPRINT1("RegisterInt32: Interrupt 0x%X already registered!\n", IntNumber); + // return 0; + // } + + /* Register the 32-bit interrupt handler */ + Int32Proc[IntNumber] = IntHandler; + + /* Copy the generic 16-bit interrupt callback and patch it */ + RtlCopyMemory(IntCallback, Int16To32, sizeof(Int16To32)); + IntCallback[2] = IntNumber; + + /* Register the 16-bit interrupt callback */ + return RegisterInt16(FarPtr, + IntNumber, + IntCallback, + sizeof(IntCallback), + CodeSize); +} + +VOID +Int32Call(IN PCALLBACK16 Context, + IN BYTE IntNumber) +{ + PUCHAR TrampolineBase = (PUCHAR)FAR_POINTER(Context->TrampolineFarPtr); + PUCHAR Trampoline = TrampolineBase; + UCHAR OldTrampoline[INT16_TRAMPOLINE_SIZE]; + + DPRINT("Int32Call(0x%X)\n", IntNumber); + + /* Save the old trampoline */ + // RtlCopyMemory(OldTrampoline, TrampolineBase, sizeof(OldTrampoline)); + ((PULONGLONG)&OldTrampoline)[0] = ((PULONGLONG)TrampolineBase)[0]; + + /* Build the generic entry-point for 32-bit calls */ + if (IntNumber == 0x03) + { + /* We are redefining for INT 03h */ + *Trampoline++ = 0xCC; // Call INT 03h + /** *Trampoline++ = 0x90; // nop **/ + } + else + { + /* Normal interrupt */ + *Trampoline++ = 0xCD; // Call INT XXh + *Trampoline++ = IntNumber; + } + *(PULONG)Trampoline = UnSimulate16; + + /* Perform the call */ + Call16(HIWORD(Context->TrampolineFarPtr), + LOWORD(Context->TrampolineFarPtr)); + + /* Restore the old trampoline */ + // RtlCopyMemory(TrampolineBase, OldTrampoline, sizeof(OldTrampoline)); + ((PULONGLONG)TrampolineBase)[0] = ((PULONGLONG)&OldTrampoline)[0]; +} + + VOID WINAPI Int32Dispatch(LPWORD Stack) { @@ -41,7 +269,7 @@ if (Int32Proc[IntNum] != NULL) Int32Proc[IntNum](Stack); else - DPRINT("Unhandled 32-bit interrupt: 0x%02X, AX = 0x%04X\n", IntNum, getAX()); + DPRINT1("Unhandled 32-bit interrupt: 0x%02X, AX = 0x%04X\n", IntNum, getAX()); } VOID WINAPI ControlBop(LPWORD Stack) @@ -53,79 +281,14 @@ if (FuncNum == BOP_CONTROL_INT32) Int32Dispatch(Stack); else - DPRINT("Unassigned Control BOP Function: 0x%02X\n", FuncNum); -} - -VOID InitializeInt32(WORD BiosSegment) -{ - LPDWORD IntVecTable = (LPDWORD)BaseAddress; - LPBYTE BiosCode = (LPBYTE)SEG_OFF_TO_PTR(BiosSegment, 0); - USHORT i; - WORD BopSeqOffset, Offset = 0; - - /* Generate ISR stubs and fill the IVT */ - for (i = 0x00; i <= 0xFF; i++) - { - Offset = INT_HANDLER_OFFSET + (i << 4); - IntVecTable[i] = MAKELONG(Offset, BiosSegment); - - BiosCode[Offset++] = 0xFA; // cli - - BiosCode[Offset++] = 0x6A; // push i - BiosCode[Offset++] = (UCHAR)i; - - /* The counter variable (initialized to 0) */ - BiosCode[Offset++] = 0x6A; // push 0 - BiosCode[Offset++] = 0x00; - - /* Stack variables */ - BiosCode[Offset++] = 0x83; // sub sp, 4 - BiosCode[Offset++] = 0xEC; - BiosCode[Offset++] = 0x04; - - BopSeqOffset = COMMON_STUB_OFFSET - (Offset + 3); - - BiosCode[Offset++] = 0xE9; // jmp near BOP_SEQ - BiosCode[Offset++] = LOBYTE(BopSeqOffset); - BiosCode[Offset++] = HIBYTE(BopSeqOffset); - } - - /* Write the common stub code */ - Offset = COMMON_STUB_OFFSET; - -// BOP_SEQ: - BiosCode[Offset++] = 0xF8; // clc - - BiosCode[Offset++] = LOBYTE(EMULATOR_BOP); // BOP sequence - BiosCode[Offset++] = HIBYTE(EMULATOR_BOP); - BiosCode[Offset++] = BOP_CONTROL; // Control BOP - BiosCode[Offset++] = BOP_CONTROL_INT32; // 32-bit Interrupt dispatcher - - BiosCode[Offset++] = 0x73; // jnc EXIT (offset +4) - BiosCode[Offset++] = 0x04; - - BiosCode[Offset++] = 0xFB; // sti - - // HACK: The following instruction should be HLT! - BiosCode[Offset++] = 0x90; // nop - - BiosCode[Offset++] = 0xEB; // jmp BOP_SEQ (offset -11) - BiosCode[Offset++] = 0xF5; - -// EXIT: - BiosCode[Offset++] = 0x83; // add sp, 8 - BiosCode[Offset++] = 0xC4; - BiosCode[Offset++] = 0x08; - - BiosCode[Offset++] = 0xCF; // iret - + // DPRINT1("Unassigned Control BOP Function: 0x%02X\n", FuncNum); + DisplayMessage(L"Unassigned Control BOP Function: 0x%02X\n", FuncNum); +} + +VOID InitializeCallbacks(VOID) +{ /* Register the Control BOP */ RegisterBop(BOP_CONTROL, ControlBop); } -VOID RegisterInt32(BYTE IntNumber, EMULATOR_INT32_PROC IntHandler) -{ - Int32Proc[IntNumber] = IntHandler; -} - /* EOF */ Copied: branches/ntvdm/subsystems/ntvdm/callback.h (from r62251, branches/ntvdm/subsystems/ntvdm/int32.h) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/callback… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/int32.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/callback.h [iso-8859-1] Fri Feb 21 20:31:56 2014 @@ -1,14 +1,14 @@ /* * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine - * FILE: int32.h + * FILE: callback.h * PURPOSE: 32-bit Interrupt Handlers * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -#ifndef _INT32_H_ -#define _INT32_H_ +#ifndef _CALLBACK_H_ +#define _CALLBACK_H_ /* DEFINES ********************************************************************/ @@ -18,14 +18,38 @@ #define INT_HANDLER_OFFSET 0x1000 #define COMMON_STUB_OFFSET 0x2000 + +typedef struct _CALLBACK16 +{ + ULONG TrampolineFarPtr; // Where the trampoline zone is placed + USHORT Segment; + USHORT NextOffset; +} CALLBACK16, *PCALLBACK16; + + /* FUNCTIONS ******************************************************************/ typedef VOID (WINAPI *EMULATOR_INT32_PROC)(LPWORD Stack); +VOID +InitializeContext(IN PCALLBACK16 Context, + IN USHORT Segment, + IN USHORT Offset); + VOID WINAPI Int32Dispatch(LPWORD Stack); -VOID InitializeInt32(WORD BiosSegment); -VOID RegisterInt32(BYTE IntNumber, EMULATOR_INT32_PROC IntHandler); -#endif // _INT32_H_ +ULONG +RegisterInt32(IN ULONG FarPtr, + IN BYTE IntNumber, + IN EMULATOR_INT32_PROC IntHandler, + OUT PSIZE_T CodeSize OPTIONAL); + +VOID +Int32Call(IN PCALLBACK16 Context, + IN BYTE IntNumber); + +VOID InitializeCallbacks(VOID); + +#endif // _CALLBACK_H_ /* EOF */

1 0

[hbelusca] 62282: [NTVDM] Start to implement EmulatorSimulate / EmulatorUnsimulate (used by VDDSimulate16 and VDDUnsimualte16). This piece of code can be better written, but it works for what I'm g...
by hbelusca＠svn.reactos.org 21 Feb '14

21 Feb '14

Author: hbelusca Date: Fri Feb 21 19:27:27 2014 New Revision: 62282 URL: http://svn.reactos.org/svn/reactos?rev=62282&view=rev Log: [NTVDM] Start to implement EmulatorSimulate / EmulatorUnsimulate (used by VDDSimulate16 and VDDUnsimualte16). This piece of code can be better written, but it works for what I'm going to commit next. Modified: branches/ntvdm/subsystems/ntvdm/clock.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/clock.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/clock.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/clock.c [iso-8859-1] Fri Feb 21 19:27:27 2014 @@ -127,7 +127,6 @@ VgaHorizontalRetrace(); /* Continue CPU emulation */ - // EmulatorSimulate(); for (i = 0; (i < STEPS_PER_CYCLE) && VdmRunning; i++) { EmulatorStep(); Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Fri Feb 21 19:27:27 2014 @@ -177,12 +177,18 @@ VOID EmulatorSimulate(VOID) { - UNIMPLEMENTED; + // FIXME: Do not mix VdmRunning (i.e. ntvdm running) and CpuSimulate!! + while (VdmRunning) ClockUpdate(); + + /* This takes into account for reentrance */ + VdmRunning = TRUE; } VOID EmulatorUnsimulate(VOID) { - UNIMPLEMENTED; + /* Stop simulation */ + // FIXME: Do not mix VdmRunning (i.e. ntvdm running) and CpuSimulate!! + VdmRunning = FALSE; } VOID EmulatorInterrupt(BYTE Number) Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Fri Feb 21 19:27:27 2014 @@ -118,6 +118,8 @@ VOID EmulatorInterrupt(BYTE Number); VOID EmulatorInterruptSignal(VOID); VOID EmulatorStep(VOID); +VOID EmulatorSimulate(VOID); +VOID EmulatorUnsimulate(VOID); VOID EmulatorCleanup(VOID); VOID EmulatorSetA20(BOOLEAN Enabled); Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Fri Feb 21 19:27:27 2014 @@ -420,8 +420,8 @@ goto Cleanup; } - /* Main loop */ - while (VdmRunning) ClockUpdate(); + /* Start simulation */ + EmulatorSimulate(); /* Perform another screen refresh */ VgaRefreshDisplay();

1 0

[hbelusca] 62281: [FONTVIEW] Unescaped use of percent character in a format string causes percent glyph not to be displayed. Patch by André Guibert de Bruet. CORE-7934 #resolve #comment Fixed in re...
by hbelusca＠svn.reactos.org 21 Feb '14

21 Feb '14

Author: hbelusca Date: Fri Feb 21 15:49:06 2014 New Revision: 62281 URL: http://svn.reactos.org/svn/reactos?rev=62281&view=rev Log: [FONTVIEW] Unescaped use of percent character in a format string causes percent glyph not to be displayed. Patch by André Guibert de Bruet. CORE-7934 #resolve #comment Fixed in revision 62281, thanks ;) Modified: trunk/reactos/base/applications/fontview/display.c Modified: trunk/reactos/base/applications/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/display.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/display.c [iso-8859-1] Fri Feb 21 15:49:06 2014 @@ -113,7 +113,7 @@ TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption)); y += tm.tmHeight + 1; - swprintf(szCaption, L"0123456789.:,;(\"~!@#$%^&*')"); + swprintf(szCaption, L"0123456789.:,;(\"~!@#$%%^&*')"); TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption)); y += tm.tmHeight + 1;

1 0

[dquintana] 62280: [RSHELL] * CMenuBand, CMenuDeskBar: Improve the SubMenu hierarchy and OnSelect flow. Now the menu will spread a FullCancel or Execute upwards and close the whole start menu. CORE...
by dquintana＠svn.reactos.org 21 Feb '14

21 Feb '14

Author: dquintana Date: Fri Feb 21 10:00:00 2014 New Revision: 62280 URL: http://svn.reactos.org/svn/reactos?rev=62280&view=rev Log: [RSHELL] * CMenuBand, CMenuDeskBar: Improve the SubMenu hierarchy and OnSelect flow. Now the menu will spread a FullCancel or Execute upwards and close the whole start menu. CORE-7881 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Fri Feb 21 10:00:00 2014 @@ -140,7 +140,8 @@ CComPtr<IOleWindow> m_site; CComPtr<IShellMenuCallback> m_psmc; - CComPtr<IMenuPopup> m_childMenu; + CComPtr<IMenuPopup> m_subMenuChild; + CComPtr<IMenuPopup> m_subMenuParent; UINT m_uId; UINT m_uIdAncestor; @@ -269,7 +270,7 @@ HRESULT _GetTopLevelWindow(HWND*topLevel); HRESULT _OnHotItemChanged(CMenuToolbarBase * tb, INT id); HRESULT _MenuItemHotTrack(DWORD changeType); - HRESULT _OnPopupSubMenu(IMenuPopup * popup); + HRESULT _OnPopupSubMenu(IMenuPopup * popup, POINTL * pAt, RECTL * pExclude); BOOL UseBigIcons() { @@ -332,7 +333,7 @@ private: // TODO: make dynamic -#define MAX_RECURSE 100 +#define MAX_RECURSE 20 CMenuBand* m_bandStack[MAX_RECURSE]; int m_bandCount; @@ -357,6 +358,8 @@ if (pItem) *pItem = m_bandStack[m_bandCount]; + + m_bandStack[m_bandCount] = NULL; return S_OK; } @@ -676,7 +679,7 @@ case WM_TIMER: if (wParam == TIMERID_HOTTRACK) { - m_menuBand->_OnPopupSubMenu(NULL); + m_menuBand->_OnPopupSubMenu(NULL, NULL, NULL); PopupItem(m_hotItem); KillTimer(hWnd, TIMERID_HOTTRACK); } @@ -776,9 +779,7 @@ if (FAILED(hr)) return hr; - popup->Popup(&pt, &rcl, MPPF_TOP | MPPF_RIGHT); - - m_menuBand->_OnPopupSubMenu(popup); + m_menuBand->_OnPopupSubMenu(popup, &pt, &rcl); return S_OK; } @@ -1037,11 +1038,12 @@ HRESULT CMenuStaticToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - HRESULT hr = m_menuBand->_CallCBWithItemId(wParam, SMC_EXEC, 0, 0); - if (FAILED(hr)) - return hr; - - return CMenuToolbarBase::OnCommand(wParam, lParam, theResult); + HRESULT hr; + hr = CMenuToolbarBase::OnCommand(wParam, lParam, theResult); + if (FAILED(hr)) + return hr; + + return m_menuBand->_CallCBWithItemId(wParam, SMC_EXEC, 0, 0); } HRESULT CMenuStaticToolbar::PopupItem(UINT uItem) @@ -1099,12 +1101,8 @@ HRESULT CMenuSFToolbar::FillToolbar() { HRESULT hr; - TBBUTTON tbb = { 0 }; int i = 0; PWSTR MenuString; - - tbb.fsState = TBSTATE_ENABLED; - tbb.fsStyle = 0; IEnumIDList * eidl; m_shellFolder->EnumObjects(m_hwnd, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &eidl); @@ -1115,6 +1113,10 @@ { INT index = 0; INT indexOpen = 0; + + TBBUTTON tbb = { 0 }; + tbb.fsState = TBSTATE_ENABLED; + tbb.fsStyle = 0; CComPtr<IShellItem> psi; SHCreateShellItem(NULL, m_shellFolder, item, &psi); @@ -1222,9 +1224,12 @@ HRESULT CMenuSFToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - HRESULT hr = m_menuBand->_CallCBWithItemPidl(GetPidlFromId(wParam), SMC_SFEXEC, 0, 0); - - return CMenuToolbarBase::OnCommand(wParam, lParam, theResult); + HRESULT hr; + hr = CMenuToolbarBase::OnCommand(wParam, lParam, theResult); + if (FAILED(hr)) + return hr; + + return m_menuBand->_CallCBWithItemPidl(GetPidlFromId(wParam), SMC_SFEXEC, 0, 0); } HRESULT CMenuSFToolbar::PopupItem(UINT uItem) @@ -1299,7 +1304,7 @@ m_useBigIcons(FALSE), m_hotBar(NULL), m_hotItem(-1), - m_childMenu(NULL) + m_subMenuChild(NULL) { m_focusManager = CMenuFocusManager::AcquireManager(); } @@ -1321,7 +1326,8 @@ UINT uIdAncestor, DWORD dwFlags) { - m_psmc = psmc; + if (m_psmc != psmc) + m_psmc = psmc; m_uId = uId; m_uIdAncestor = uIdAncestor; m_dwFlags = dwFlags; @@ -1446,6 +1452,10 @@ return hr; } + hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &m_subMenuParent)); + if (FAILED(hr)) + return hr; + CComPtr<IOleWindow> pTopLevelWindow; hr = IUnknown_QueryService(m_site, SID_STopLevelBrowser, IID_PPV_ARG(IOleWindow, &pTopLevelWindow)); if (FAILED(hr)) @@ -1498,7 +1508,10 @@ if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeStaticY)); if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeShlFldY)); - int sy = max(prc->bottom - prc->top, sizeStaticY.cy + sizeShlFldY.cy); + int sy = min(prc->bottom - prc->top, sizeStaticY.cy + sizeShlFldY.cy); + + int syStatic = sizeStaticY.cy; + int syShlFld = sy - syStatic; if (hwndShlFld) { @@ -1506,7 +1519,7 @@ prc->left, prc->top, prc->right - prc->left, - sizeShlFldY.cy, + syShlFld, 0); DWORD btnSize = SendMessage(hwndShlFld, TB_GETBUTTONSIZE, 0, 0); SendMessage(hwndShlFld, TB_SETBUTTONSIZE, 0, MAKELPARAM(prc->right - prc->left, HIWORD(btnSize))); @@ -1515,9 +1528,9 @@ { SetWindowPos(hwndStatic, hwndShlFld, prc->left, - prc->top + sizeShlFldY.cy, + prc->top + syShlFld, prc->right - prc->left, - sy - sizeShlFldY.cy, + syStatic, 0); DWORD btnSize = SendMessage(hwndStatic, TB_GETBUTTONSIZE, 0, 0); SendMessage(hwndStatic, TB_SETBUTTONSIZE, 0, MAKELPARAM(prc->right - prc->left, HIWORD(btnSize))); @@ -1572,6 +1585,9 @@ if (hwndStatic) SendMessageW(hwndStatic, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&sizeStatic)); if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&sizeShlFld)); + + sizeStatic.cx += 64; + sizeShlFld.cx += 64; pdbi->ptMaxSize.x = max(sizeStatic.cx, sizeShlFld.cx); // ignored pdbi->ptMaxSize.y = sizeStatic.cy + sizeShlFld.cy; @@ -1629,7 +1645,7 @@ else hr = m_focusManager->PopMenu(this); - return hr; + return S_OK; } HRESULT STDMETHODCALLTYPE CMenuBand::CloseDW(DWORD dwReserved) @@ -1659,13 +1675,8 @@ HRESULT STDMETHODCALLTYPE CMenuBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) { HRESULT hr; - CComPtr<IMenuPopup> pmp; - - hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp)); - if (FAILED(hr)) - return hr; - - hr = pmp->SetSubMenu(this, fActivate); + + hr = m_subMenuParent->SetSubMenu(this, fActivate); if (FAILED(hr)) return hr; @@ -1776,17 +1787,30 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnSelect(DWORD dwSelectType) { - if (dwSelectType != MPOS_CANCELLEVEL) - { - if (dwSelectType == MPOS_SELECTLEFT) - { - dwSelectType = MPOS_CANCELLEVEL; - } - CComPtr<IMenuPopup> pmp; - HRESULT hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp)); - if (FAILED(hr)) - return hr; - return pmp->OnSelect(dwSelectType); + switch (dwSelectType) + { + case MPOS_CHILDTRACKING: + // TODO: Cancel timers? + return m_subMenuParent->OnSelect(dwSelectType); + case MPOS_SELECTLEFT: + if (m_subMenuChild) + m_subMenuChild->OnSelect(MPOS_CANCELLEVEL); + return m_subMenuParent->OnSelect(dwSelectType); + case MPOS_SELECTRIGHT: + if (m_hotBar && m_hotItem >= 0) + { + // TODO: popup the current child if it has subitems, otherwise spread up. + } + return m_subMenuParent->OnSelect(dwSelectType); + case MPOS_EXECUTE: + case MPOS_FULLCANCEL: + if (m_subMenuChild) + m_subMenuChild->OnSelect(dwSelectType); + return m_subMenuParent->OnSelect(dwSelectType); + case MPOS_CANCELLEVEL: + if (m_subMenuChild) + m_subMenuChild->OnSelect(dwSelectType); + break; } return S_FALSE; } @@ -2180,28 +2204,25 @@ } else { - CComPtr<IMenuPopup> pmp; - hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp)); + m_subMenuParent->OnSelect(changeType); + } + return S_OK; +} + + +HRESULT CMenuBand::_OnPopupSubMenu(IMenuPopup * popup, POINTL * pAt, RECTL * pExclude) +{ + if (m_subMenuChild) + { + HRESULT hr = m_subMenuChild->OnSelect(MPOS_CANCELLEVEL); if (FAILED(hr)) return hr; - pmp->OnSelect(changeType); - } - return S_OK; -} - - -HRESULT CMenuBand::_OnPopupSubMenu(IMenuPopup * popup) -{ - if (m_childMenu) - { - HRESULT hr = m_childMenu->OnSelect(MPOS_CANCELLEVEL); - if (FAILED(hr)) - return hr; - } - m_childMenu = popup; - if (m_childMenu) - { - return m_childMenu->SetSubMenu(this, TRUE); - } - return S_OK; -} + } + m_subMenuChild = popup; + if (popup) + { + IUnknown_SetSite(popup, m_subMenuParent); + popup->Popup(pAt, pExclude, MPPF_TOP | MPPF_RIGHT); + } + return S_OK; +} Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Fri Feb 21 10:00:00 2014 @@ -47,11 +47,14 @@ CComPtr<IUnknown> m_Site; CComPtr<IUnknown> m_Client; CComPtr<IMenuPopup> m_SubMenuParent; + CComPtr<IMenuPopup> m_SubMenuChild; HWND m_ClientWindow; DWORD m_IconSize; HBITMAP m_Banner; + + INT m_Level; public: CMenuDeskBar(); @@ -130,6 +133,8 @@ LRESULT _OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT _OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT _OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + + HRESULT _CloseBar(); }; extern "C" @@ -150,14 +155,18 @@ return hr; } +INT deskBarCount=0; + CMenuDeskBar::CMenuDeskBar() : m_Client(NULL), - m_Banner(NULL) + m_Banner(NULL), + m_Level(deskBarCount++) { } CMenuDeskBar::~CMenuDeskBar() { + deskBarCount--; } HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetWindow(HWND *lphwnd) @@ -316,7 +325,11 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSite(IUnknown *pUnkSite) { + // Windows closes the bar if this is called when the bar is shown + m_Site = pUnkSite; + + IUnknown_QueryService(m_Site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &m_SubMenuParent)); return S_OK; } @@ -468,12 +481,24 @@ int cx = rc.right; int cy = rc.bottom; - if (y < 0) - { - y = 0; - } - - // if (y+cy > work area height) cy = work area height - y + RECT rcWorkArea; + SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, 0); + + int waHeight = rcWorkArea.bottom - rcWorkArea.top; + + if (y < rcWorkArea.top) + { + y = rcWorkArea.top; + } + + if (cy > waHeight) + { + cy = waHeight; + } + else if (y + cy > rcWorkArea.bottom) + { + y = rcWorkArea.bottom - cy; + } this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW); @@ -533,70 +558,87 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect( DWORD dwSelectType) { - CComPtr<IMenuPopup> pmp; - CComPtr<IDeskBarClient> dbc; - HRESULT hr; + /* As far as I can tell, the submenu hierarchy looks like this: + + The DeskBar's Child is the Band it contains. + The DeskBar's Parent is the SID_SMenuPopup of the Site. + + The Band's Child is the IMenuPopup of the child submenu. + The Band's Parent is the SID_SMenuPopup of the Site (the DeskBar). + + When the DeskBar receives a selection event: + If it requires closing the window, it will notify the Child (Band) using CancelLevel. + If it has to spread upwards (everything but CancelLevel), it will notify the Parent. + + When the Band receives a selection event, this is where it gets fuzzy: + In which cases does it call the Parent? Probably not CancelLevel. + In which cases does it call the Child? + How does it react to calls? + + */ switch (dwSelectType) { case MPOS_EXECUTE: case MPOS_FULLCANCEL: case MPOS_CANCELLEVEL: - hr = IUnknown_QueryService(m_Client, SID_SMenuBandChild, IID_PPV_ARG(IMenuPopup, &pmp)); + + _CloseBar(); + + if (dwSelectType == MPOS_CANCELLEVEL) + return S_OK; + + case MPOS_SELECTLEFT: + case MPOS_SELECTRIGHT: + case MPOS_CHILDTRACKING: + if (m_SubMenuParent) + return m_SubMenuParent->OnSelect(dwSelectType); + break; + } + + return S_OK; +} + +HRESULT CMenuDeskBar::_CloseBar() +{ + CComPtr<IDeskBarClient> dbc; + HRESULT hr; + + if (m_SubMenuChild) + { + hr = m_SubMenuChild->OnSelect(MPOS_CANCELLEVEL); if (FAILED(hr)) return hr; - - hr = pmp->OnSelect(MPOS_CANCELLEVEL); - if (FAILED(hr)) - return hr; - - hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc)); - if (FAILED(hr)) - return hr; - - hr = dbc->UIActivateDBC(FALSE); - if (FAILED(hr)) - return hr; - - SetWindowPos(m_hWnd, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); - - UIActivateIO(FALSE, NULL); - - if (dwSelectType == MPOS_CANCELLEVEL) - break; - - case MPOS_SELECTLEFT: - case MPOS_SELECTRIGHT: - /*CComPtr<IMenuPopup> pmp; - hr = IUnknown_QueryService(m_Client, SID_SMenuBandChild, IID_PPV_ARG(IMenuPopup, &pmp)); - if (FAILED(hr)) - return hr;*/ - - hr = m_SubMenuParent->OnSelect(dwSelectType); - if (FAILED(hr)) - return hr; - case MPOS_CHILDTRACKING: - break; - } - - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSubMenu( - IMenuPopup *pmp, - BOOL fSet) -{ + } + + hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc)); + if (FAILED(hr)) + return hr; + + hr = dbc->UIActivateDBC(FALSE); + if (FAILED(hr)) + return hr; + + SetWindowPos(m_hWnd, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); + + return UIActivateIO(FALSE, NULL); +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSubMenu(IMenuPopup *pmp, BOOL fSet) +{ + // Called by the CHILD to notify the parent of the submenu object + if (fSet) { - m_SubMenuParent = pmp; + m_SubMenuChild = pmp; } else { - if (m_SubMenuParent) + if (m_SubMenuChild) { - if (SHIsSameObject(pmp, m_SubMenuParent)) + if (SHIsSameObject(pmp, m_SubMenuChild)) { - m_SubMenuParent = NULL; + m_SubMenuChild = NULL; } } } Modified: branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp [iso-8859-1] Fri Feb 21 10:00:00 2014 @@ -180,7 +180,7 @@ HRESULT STDMETHODCALLTYPE CMenuSiteWrap::QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) { - WrapLogEnter("CMenuSiteWrap<%p>::QueryBand(DWORD dwBandID=%d, IDeskBand **ppstb=%p, DWORD *pdwState=%p, LPWSTR pszName=%p, int cchName=%p)\n", this, dwBandID, ppstb, pdwState, pszName, cchName); + WrapLogEnter("CMenuSiteWrap<%p>::QueryBand(DWORD dwBandID=%d, IDeskBand **ppstb=%p, DWORD *pdwState=%p, LPWSTR pszName=%p, int cchName=%d)\n", this, dwBandID, ppstb, pdwState, pszName, cchName); HRESULT hr = m_IBandSite->QueryBand(dwBandID, ppstb, pdwState, pszName, cchName); if (ppstb) WrapLogPost("*ppstb=%p\n", *ppstb); if (pdwState) WrapLogPost("*pdwState=%d\n", *pdwState); @@ -190,7 +190,7 @@ HRESULT STDMETHODCALLTYPE CMenuSiteWrap::GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv) { - WrapLogEnter("CMenuSiteWrap<%p>::GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv)\n", this, dwBandID, riid, ppv); + WrapLogEnter("CMenuSiteWrap<%p>::GetBandObject(DWORD dwBandID=%d, REFIID riid=%s, VOID **ppv=%p)\n", this, dwBandID, Wrap(riid), ppv); HRESULT hr = m_IBandSite->GetBandObject(dwBandID, riid, ppv); if (ppv) WrapLogPost("*ppv=%p\n", *ppv); WrapLogExit("CMenuSiteWrap::GetBandObject()", hr); @@ -201,7 +201,7 @@ { WrapLogEnter("CMenuSiteWrap<%p>::GetBandSiteInfo(BANDSITEINFO *pbsinfo=%p)\n", this, pbsinfo); HRESULT hr = m_IBandSite->GetBandSiteInfo(pbsinfo); - if (pbsinfo) WrapLogPost("*pbsinfo=%p\n", *pbsinfo); + if (pbsinfo) WrapLogPost("*pbsinfo=%s\n", Wrap(*pbsinfo)); WrapLogExit("CMenuSiteWrap::GetBandSiteInfo()", hr); return hr; } @@ -236,7 +236,6 @@ { WrapLogEnter("CMenuSiteWrap<%p>::SetDeskBarSite(IUnknown *punkSite=%p)\n", this, punkSite); HRESULT hr = m_IDeskBarClient->SetDeskBarSite(punkSite); - if (punkSite) WrapLogPost("*punkSite=%p\n", *punkSite); WrapLogExit("CMenuSiteWrap::SetDeskBarSite()", hr); return hr; }

1 0

[aandrejevic] 62279: [FAST486] Add a macro ALIGNMENT_CHECK that checks for unaligned pointers and generates an exception.
by aandrejevic＠svn.reactos.org 21 Feb '14

21 Feb '14

Author: aandrejevic Date: Fri Feb 21 01:29:13 2014 New Revision: 62279 URL: http://svn.reactos.org/svn/reactos?rev=62279&view=rev Log: [FAST486] Add a macro ALIGNMENT_CHECK that checks for unaligned pointers and generates an exception. Modified: branches/ntvdm/lib/fast486/common.h Modified: branches/ntvdm/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.h [iso-8859-1] Fri Feb 21 01:29:13 2014 @@ -54,6 +54,15 @@ if (State->PrefixFlags & FAST486_PREFIX_ADSIZE) x = !x; #define SWAP(x, y) { (x) ^= (y); (y) ^= (x); (x) ^= (y); } + +#define ALIGNMENT_CHECK(x, a) if (State->Flags.Ac \ + && (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_AM)\ + && (State->Cpl == 3)\ + && (((x) % (a)) != 0))\ +{\ + Fast486Exception(State, FAST486_EXCEPTION_AC);\ + return FALSE;\ +} #define PAGE_ALIGN(x) ((x) & 0xFFFFF000) #define PAGE_OFFSET(x) ((x) & 0x00000FFF)

1 0

[aandrejevic] 62278: [FAST486] Update the AC flag in the POPF instruction.
by aandrejevic＠svn.reactos.org 21 Feb '14

21 Feb '14

Author: aandrejevic Date: Fri Feb 21 01:15:03 2014 New Revision: 62278 URL: http://svn.reactos.org/svn/reactos?rev=62278&view=rev Log: [FAST486] Update the AC flag in the POPF instruction. Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h branches/ntvdm/lib/fast486/opcodes.c Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Fri Feb 21 01:15:03 2014 @@ -378,8 +378,9 @@ ULONG Reserved2 : 1; ULONG Rf : 1; ULONG Vm : 1; - - // ULONG Reserved : 14; + ULONG Ac : 1; + + // ULONG Reserved : 13; }; } FAST486_FLAGS_REG, *PFAST486_FLAGS_REG; Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Fri Feb 21 01:15:03 2014 @@ -4284,6 +4284,7 @@ State->Flags.Df = NewFlags.Df; State->Flags.Of = NewFlags.Of; State->Flags.Nt = NewFlags.Nt; + State->Flags.Ac = NewFlags.Ac; if (Cpl == 0) State->Flags.Iopl = NewFlags.Iopl; if (Cpl <= State->Flags.Iopl) State->Flags.If = NewFlags.If;

1 0

[aandrejevic] 62277: [FAST486] Enable the Alignment Check flag. Apparently the 486 supports it.
by aandrejevic＠svn.reactos.org 21 Feb '14

21 Feb '14

Author: aandrejevic Date: Fri Feb 21 01:05:47 2014 New Revision: 62277 URL: http://svn.reactos.org/svn/reactos?rev=62277&view=rev Log: [FAST486] Enable the Alignment Check flag. Apparently the 486 supports it. Modified: branches/ntvdm/lib/fast486/common.h Modified: branches/ntvdm/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.h [iso-8859-1] Fri Feb 21 01:05:47 2014 @@ -29,8 +29,8 @@ #define SIGN_FLAG_BYTE 0x80 #define SIGN_FLAG_WORD 0x8000 #define SIGN_FLAG_LONG 0x80000000 -#define REAL_MODE_FLAGS_MASK 0x17FD5 -#define PROT_MODE_FLAGS_MASK 0x10DD5 +#define REAL_MODE_FLAGS_MASK 0x57FD5 +#define PROT_MODE_FLAGS_MASK 0x50DD5 /* Block size for string operations */ #define STRING_BLOCK_SIZE 4096

1 0

[tkreuzer] 62276: [NTOSKRNL] Improve some DPRINTs
by tkreuzer＠svn.reactos.org 20 Feb '14

20 Feb '14

Author: tkreuzer Date: Thu Feb 20 23:05:06 2014 New Revision: 62276 URL: http://svn.reactos.org/svn/reactos?rev=62276&view=rev Log: [NTOSKRNL] Improve some DPRINTs Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Thu Feb 20 23:05:06 2014 @@ -340,7 +340,8 @@ Status = IopOpenRegistryKeyEx(&CCSKey, NULL, &CCSName, KEY_READ); if (!NT_SUCCESS(Status)) { - DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with Status %08X\n", + &CCSName, Status); return Status; } @@ -348,7 +349,8 @@ Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ); if (!NT_SUCCESS(Status)) { - DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with Status %08X\n", + ServiceName, Status); ZwClose(CCSKey); return Status; }

1 0

[tkreuzer] 62275: [NTOSKRNL] Implement MmAdjustWorkingSetSize
by tkreuzer＠svn.reactos.org 20 Feb '14

20 Feb '14

Author: tkreuzer Date: Thu Feb 20 23:03:04 2014 New Revision: 62275 URL: http://svn.reactos.org/svn/reactos?rev=62275&view=rev Log: [NTOSKRNL] Implement MmAdjustWorkingSetSize Modified: trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c [iso-8859-1] Thu Feb 20 23:03:04 2014 @@ -15,6 +15,12 @@ #define MODULE_INVOLVED_IN_ARM3 #include "../ARM3/miarm.h" +/* GLOBALS ********************************************************************/ + +SIZE_T MmMinimumWorkingSetSize; +SIZE_T MmMaximumWorkingSetSize; +SIZE_T MmPagesAboveWsMinimum; + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -40,8 +46,111 @@ IN ULONG SystemCache, IN BOOLEAN IncreaseOkay) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + SIZE_T MinimumWorkingSetSize, MaximumWorkingSetSize; + SSIZE_T Delta; + PMMSUPPORT Ws; + NTSTATUS Status; + + /* Check for special case: empty the working set */ + if ((WorkingSetMinimumInBytes == -1) && + (WorkingSetMaximumInBytes == -1)) + { + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; + } + + /* Assume success */ + Status = STATUS_SUCCESS; + + /* Get the working set and lock it */ + Ws = &PsGetCurrentProcess()->Vm; + MiLockWorkingSet(PsGetCurrentThread(), Ws); + + /* Calculate the actual minimum and maximum working set size to set */ + MinimumWorkingSetSize = (WorkingSetMinimumInBytes != 0) ? + (WorkingSetMinimumInBytes / PAGE_SIZE) : Ws->MinimumWorkingSetSize; + MaximumWorkingSetSize = (WorkingSetMaximumInBytes != 0) ? + (WorkingSetMaximumInBytes / PAGE_SIZE) : Ws->MaximumWorkingSetSize; + + /* Check if the new maximum exceeds the global maximum */ + if (MaximumWorkingSetSize > MmMaximumWorkingSetSize) + { + MaximumWorkingSetSize = MmMaximumWorkingSetSize; + Status = STATUS_WORKING_SET_LIMIT_RANGE; + } + + /* Check if the new minimum is below the global minimum */ + if (MinimumWorkingSetSize < MmMinimumWorkingSetSize) + { + MinimumWorkingSetSize = MmMinimumWorkingSetSize; + Status = STATUS_WORKING_SET_LIMIT_RANGE; + } + + /* Check if the new minimum exceeds the new maximum */ + if (MinimumWorkingSetSize > MaximumWorkingSetSize) + { + DPRINT1("MinimumWorkingSetSize > MaximumWorkingSetSize\n"); + Status = STATUS_BAD_WORKING_SET_LIMIT; + goto Cleanup; + } + + /* Calculate the minimum WS size adjustment and check if we increase */ + Delta = MinimumWorkingSetSize - Ws->MinimumWorkingSetSize; + if (Delta > 0) + { + /* Is increasing ok? */ + if (!IncreaseOkay) + { + DPRINT1("Privilege for WS size increase not held\n"); + Status = STATUS_PRIVILEGE_NOT_HELD; + goto Cleanup; + } + + /* Check if the number of available pages is large enough */ + if (((SIZE_T)Delta / 1024) > (MmAvailablePages - 128)) + { + DPRINT1("Not enough available pages\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + /* Check if there are enough resident available pages */ + if ((SIZE_T)Delta > + (MmResidentAvailablePages - MmSystemLockPagesCount - 256)) + { + DPRINT1("Not enough resident pages\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + } + + /* Update resident available pages */ + if (Delta != 0) + { + InterlockedExchangeAddSizeT(&MmResidentAvailablePages, -Delta); + } + + /* Calculate new pages above minimum WS size */ + Delta += max((SSIZE_T)Ws->WorkingSetSize - MinimumWorkingSetSize, 0); + + /* Subtract old pages above minimum WS size */ + Delta -= max((SSIZE_T)Ws->WorkingSetSize - Ws->MinimumWorkingSetSize, 0); + + /* If it changed, add it to the global variable */ + if (Delta != 0) + { + InterlockedExchangeAddSizeT(&MmPagesAboveWsMinimum, Delta); + } + + /* Set the new working set size */ + Ws->MinimumWorkingSetSize = MinimumWorkingSetSize; + Ws->MaximumWorkingSetSize = MaximumWorkingSetSize; + +Cleanup: + + /* Unlock the working set and return the status */ + MiUnlockWorkingSet(PsGetCurrentThread(), Ws); + return Status; } /*

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