Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dquintana] 65065: [RSHELL] * Fix some small things that were getting in the way of fixing the start menu (which was broken and no one noticed). The actual fix will come tomorrow since my brain is ...
by dquintana＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: dquintana Date: Tue Oct 28 01:27:02 2014 New Revision: 65065 URL: http://svn.reactos.org/svn/reactos?rev=65065&view=rev Log: [RSHELL] * Fix some small things that were getting in the way of fixing the start menu (which was broken and no one noticed). The actual fix will come tomorrow since my brain is about to implode at this time. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp branches/shell-experiments/base/shell/rshell/precomp.h branches/shell-experiments/include/reactos/undocshell.h 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] Tue Oct 28 01:27:02 2014 @@ -909,6 +909,7 @@ HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType) { + CComPtr<CMenuBand> safeThis = this; HRESULT hr; if (m_dwFlags & SMINIT_VERTICAL) @@ -951,6 +952,7 @@ { m_subMenuParent->OnSelect(changeType); } + TRACE("Menu closed, executing item...\n"); m_hotBar->ExecuteItem(m_hotItem); break; 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] Tue Oct 28 01:27:02 2014 @@ -131,11 +131,15 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) { + HRESULT hr; + if (IsEqualGUID(guidService, SID_SMenuPopup) || IsEqualGUID(guidService, SID_SMenuBandParent) || IsEqualGUID(guidService, SID_STopLevelBrowser)) { - return this->QueryInterface(riid, ppvObject); + hr = this->QueryInterface(riid, ppvObject); + if (SUCCEEDED(hr)) + return hr; } if (IsEqualGUID(guidService, SID_SMenuBandBottom) || @@ -145,7 +149,9 @@ if (m_Client == NULL) return E_NOINTERFACE; - return IUnknown_QueryService(m_Client, guidService, riid, ppvObject); + hr = IUnknown_QueryService(m_Client, guidService, riid, ppvObject); + if (SUCCEEDED(hr)) + return hr; } @@ -484,6 +490,8 @@ * */ + CComPtr<IMenuPopup> oldParent = m_SubMenuParent; + switch (dwSelectType) { case MPOS_EXECUTE: @@ -498,8 +506,8 @@ case MPOS_SELECTLEFT: case MPOS_SELECTRIGHT: case MPOS_CHILDTRACKING: - if (m_SubMenuParent) - return m_SubMenuParent->OnSelect(dwSelectType); + if (oldParent) + return oldParent->OnSelect(dwSelectType); break; } Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Tue Oct 28 01:27:02 2014 @@ -832,6 +832,11 @@ DbgPrint("PopMenuBar %p\n", mb); + if (m_current == m_entryUnderMouse) + { + m_entryUnderMouse = NULL; + } + hr = PopFromArray(&type, &mbc, NULL); if (FAILED_UNEXPECTEDLY(hr)) { @@ -871,6 +876,11 @@ DbgPrint("PopMenuPopup %p\n", mb); + if (m_current == m_entryUnderMouse) + { + m_entryUnderMouse = NULL; + } + hr = PopFromArray(&type, &mbc, NULL); if (FAILED_UNEXPECTEDLY(hr)) { Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Tue Oct 28 01:27:02 2014 @@ -37,6 +37,11 @@ #define COBJMACROS +//#define DEBUG_CCOMOBJECT +//#define DEBUG_CCOMOBJECT_CREATION 1 +//#define DEBUG_CCOMOBJECT_DESTRUCTION 1 +//#define DEBUG_CCOMOBJECT_REFCOUNTING 0 + #include <windef.h> #include <winbase.h> #include <winreg.h> Modified: branches/shell-experiments/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… ============================================================================== --- branches/shell-experiments/include/reactos/undocshell.h [iso-8859-1] (original) +++ branches/shell-experiments/include/reactos/undocshell.h [iso-8859-1] Tue Oct 28 01:27:02 2014 @@ -626,6 +626,9 @@ public: CComDebugObject(void * = NULL) { +#if DEBUG_CCOMOBJECT_CREATION + DbgPrint("%S, this=%08p\n", __FUNCTION__, static_cast<Base*>(this)); +#endif _pAtlModule->Lock(); } @@ -638,25 +641,28 @@ STDMETHOD_(ULONG, AddRef)() { int rc = this->InternalAddRef(); - DbgPrint("RefCount is now %d(++)! %s\n", rc, __FUNCTION__); +#if DEBUG_CCOMOBJECT_REFCOUNTING + DbgPrint("%s, RefCount is now %d(--)! \n", __FUNCTION__, rc); +#endif return rc; } STDMETHOD_(ULONG, Release)() { - ULONG newRefCount; - - newRefCount = this->InternalRelease(); - if (newRefCount == 0) + int rc = this->InternalRelease(); + +#if DEBUG_CCOMOBJECT_REFCOUNTING + DbgPrint("%s, RefCount is now %d(--)! \n", __FUNCTION__, rc); +#endif + + if (rc == 0) { - DbgPrint("RefCount is now 0! Deleting! %s\n", newRefCount, __FUNCTION__); +#if DEBUG_CCOMOBJECT_DESTRUCTION + DbgPrint("%s, RefCount reached 0 Deleting!\n", __FUNCTION__); +#endif delete this; } - else - { - DbgPrint("RefCount is now %d(--)! %s\n", newRefCount, __FUNCTION__); - } - return newRefCount; + return rc; } STDMETHOD(QueryInterface)(REFIID iid, void **ppvObject) @@ -675,9 +681,9 @@ hResult = E_OUTOFMEMORY; newInstance = NULL; - ATLTRY(newInstance = new CComDebugObject<Base>()) - if (newInstance != NULL) - { + ATLTRY(newInstance = new CComDebugObject<Base>()); + if (newInstance != NULL) + { newInstance->SetVoid(NULL); newInstance->InternalFinalConstructAddRef(); hResult = newInstance->_AtlInitialConstruct(); @@ -691,7 +697,7 @@ delete newInstance; newInstance = NULL; } - } + } *pp = newInstance; return hResult; }

1 0

[gadamopoulos] 65064: [SHELL32] - Properly check for error in CDefaultContextMenu::DoCreateLink
by gadamopoulos＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: gadamopoulos Date: Tue Oct 28 00:58:19 2014 New Revision: 65064 URL: http://svn.reactos.org/svn/reactos?rev=65064&view=rev Log: [SHELL32] - Properly check for error in CDefaultContextMenu::DoCreateLink Modified: branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp Modified: branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Tue Oct 28 00:58:19 2014 @@ -1115,7 +1115,7 @@ return hr; } - psfTarget->QueryInterface(IID_PPV_ARG(IDropTarget, &pDT)); + hr = psfTarget->QueryInterface(IID_PPV_ARG(IDropTarget, &pDT)); if (FAILED(hr)) { ERR("no IDropTarget Interface\n");

1 0

[tkreuzer] 65063: [GDI32] - Use GdiGetDcAttr instead of GdiGetHandleUserData where appropriate - Add a few missing SetLastError() - Fix return failure return value of GetBkColor() - Improve order o...
by tkreuzer＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: tkreuzer Date: Tue Oct 28 00:55:22 2014 New Revision: 65063 URL: http://svn.reactos.org/svn/reactos?rev=65063&view=rev Log: [GDI32] - Use GdiGetDcAttr instead of GdiGetHandleUserData where appropriate - Add a few missing SetLastError() - Fix return failure return value of GetBkColor() - Improve order of operations in SelectObject (needs more fixing) Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] Tue Oct 28 00:55:22 2014 @@ -438,9 +438,12 @@ (uObjectType == OBJ_BRUSH) || (uObjectType == OBJ_COLORSPACE)) { - /* Get the dc attribute */ + /* Get the DC attribute */ pdcattr = GdiGetDcAttr(hdc); - if (!pdcattr) return NULL; + if (pdcattr == NULL) + { + return NULL; + } } /* Check what object was requested */ @@ -519,8 +522,14 @@ } else { - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return 0; + } + if (!(pdcattr->ulDirty_ & DC_PRIMARY_DISPLAY) ) return NtGdiGetDeviceCaps(hdc, nIndex); } @@ -966,8 +975,12 @@ PDC_ATTR pdcattr; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return CLR_INVALID; + } return pdcattr->ulBrushClr; } @@ -982,8 +995,13 @@ { PDC_ATTR pdcattr; - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return CLR_INVALID; + } return pdcattr->ulPenClr; } @@ -1001,8 +1019,12 @@ COLORREF crOldColor; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return CLR_INVALID; + } /* Get old color and store the new */ crOldColor = pdcattr->ulBrushClr; @@ -1062,8 +1084,12 @@ PDC_ATTR pdcattr; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) - return 0; + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Don't set LastError here! */ + return CLR_INVALID; + } return pdcattr->ulBackgroundClr; } @@ -1081,8 +1107,12 @@ COLORREF crOldColor; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return CLR_INVALID; + } #if 0 if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) @@ -1129,8 +1159,12 @@ PDC_ATTR pdcattr; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Don't set LastError here! */ return 0; + } return pdcattr->lBkMode; } @@ -1149,8 +1183,13 @@ INT iOldMode; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return 0; + } + #if 0 if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) { @@ -1193,6 +1232,7 @@ pdcattr = GdiGetDcAttr(hdc); if (pdcattr == NULL) { + /* Don't set LastError here! */ return 0; } @@ -1233,9 +1273,11 @@ } #endif - /* Get DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) - { + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -1264,9 +1306,11 @@ { PDC_ATTR pdcattr; - /* Get DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) - { + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Don't set LastError here! */ return 0; } @@ -1293,9 +1337,11 @@ return 0; } - /* Get DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) - { + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -1505,8 +1551,12 @@ PDC_ATTR pdcattr; /* Get the DC attribute */ - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &pdcattr)) + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return 0; + } return pdcattr->iMapMode; } @@ -1563,8 +1613,12 @@ PDC_ATTR pdcattr; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Don't set LastError here! */ return 0; + } return pdcattr->lStretchBltMode; } @@ -1600,8 +1654,13 @@ } } #endif - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return 0; + } iOldMode = pdcattr->lStretchBltMode; pdcattr->lStretchBltMode = iStretchMode; @@ -1624,8 +1683,10 @@ PDC_ATTR pdcattr; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) - { + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Don't set LastError here! */ return NULL; } @@ -1648,15 +1709,18 @@ HGDIOBJ hOldObj = NULL; UINT uType; - if(!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) - { - SetLastError(ERROR_INVALID_HANDLE); - return NULL; - } - + /* Fix up 16 bit handles */ hGdiObj = GdiFixUpHandle(hGdiObj); if (!GdiIsHandleValid(hGdiObj)) { + return NULL; + } + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return NULL; }

1 0

[aandrejevic] 65062: [FAST486] Fix a typo in r65061.
by aandrejevic＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: aandrejevic Date: Tue Oct 28 00:53:02 2014 New Revision: 65062 URL: http://svn.reactos.org/svn/reactos?rev=65062&view=rev Log: [FAST486] Fix a typo in r65061. Modified: trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Tue Oct 28 00:53:02 2014 @@ -3973,7 +3973,7 @@ return; } - if (Fast486LoadSegment(State, ModRegRm.Register, Selector)) + if (!Fast486LoadSegment(State, ModRegRm.Register, Selector)) { /* Exception occurred */ return;

1 0

[aandrejevic] 65061: [FAST486][NTVDM] Get rid of Fast486Interrupt, since it's not used anywhere. Also we can now remove workarounds for all of the bugs that it caused. Implement the "single-instruc...
by aandrejevic＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: aandrejevic Date: Tue Oct 28 00:33:03 2014 New Revision: 65061 URL: http://svn.reactos.org/svn/reactos?rev=65061&view=rev Log: [FAST486][NTVDM] Get rid of Fast486Interrupt, since it's not used anywhere. Also we can now remove workarounds for all of the bugs that it caused. Implement the "single-instruction interrupt delay" for instructions that load the stack segment only. Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h trunk/reactos/lib/fast486/fast486.c trunk/reactos/lib/fast486/opcodes.c trunk/reactos/subsystems/ntvdm/emulator.c trunk/reactos/subsystems/ntvdm/emulator.h trunk/reactos/subsystems/ntvdm/ntvdm.c Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Tue Oct 28 00:33:03 2014 @@ -168,14 +168,6 @@ FAST486_EXCEPTION_AC = 0x11, FAST486_EXCEPTION_MC = 0x12 } FAST486_EXCEPTIONS, *PFAST486_EXCEPTIONS; - -typedef enum _FAST486_INT_STATUS -{ - FAST486_INT_NONE = 0, - FAST486_INT_EXECUTE = 1, - FAST486_INT_SIGNAL = 2, - FAST486_INT_DELAYED = 3 -} FAST486_INT_STATUS, *PFAST486_INT_STATUS; typedef VOID @@ -495,8 +487,8 @@ ULONG PrefixFlags; FAST486_SEG_REGS SegmentOverride; BOOLEAN Halted; - FAST486_INT_STATUS IntStatus; - UCHAR PendingIntNum; + BOOLEAN IntSignaled; + BOOLEAN DoNotInterrupt; PULONG Tlb; #ifndef FAST486_NO_PREFETCH BOOLEAN PrefetchValid; @@ -550,10 +542,6 @@ VOID NTAPI -Fast486Interrupt(PFAST486_STATE State, UCHAR Number); - -VOID -NTAPI Fast486InterruptSignal(PFAST486_STATE State); VOID Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Tue Oct 28 00:33:03 2014 @@ -85,7 +85,12 @@ * Check if there is an interrupt to execute, or a hardware interrupt signal * while interrupts are enabled. */ - if (State->Flags.Tf && !State->Halted) + if (State->DoNotInterrupt) + { + /* Clear the interrupt delay flag */ + State->DoNotInterrupt = FALSE; + } + else if (State->Flags.Tf && !State->Halted) { /* Perform the interrupt */ Fast486PerformInterrupt(State, 0x01); @@ -99,29 +104,16 @@ */ State->Flags.Tf = FALSE; } - else if (State->IntStatus == FAST486_INT_EXECUTE) + else if (State->Flags.If && State->IntSignaled) { /* No longer halted */ State->Halted = FALSE; - /* Perform the interrupt */ - Fast486PerformInterrupt(State, State->PendingIntNum); + /* Acknowledge the interrupt and perform it */ + Fast486PerformInterrupt(State, State->IntAckCallback(State)); /* Clear the interrupt status */ - State->IntStatus = FAST486_INT_NONE; - } - else if (State->Flags.If && (State->IntStatus == FAST486_INT_SIGNAL)) - { - /* Acknowledge the interrupt to get the number */ - State->PendingIntNum = State->IntAckCallback(State); - - /* Set the interrupt status to execute on the next instruction */ - State->IntStatus = FAST486_INT_EXECUTE; - } - else if (State->IntStatus == FAST486_INT_DELAYED) - { - /* Restore the old state */ - State->IntStatus = FAST486_INT_EXECUTE; + State->IntSignaled = FALSE; } } while ((Command == FAST486_CONTINUE) || @@ -286,19 +278,9 @@ VOID NTAPI -Fast486Interrupt(PFAST486_STATE State, UCHAR Number) -{ - /* Set the interrupt status and the number */ - State->IntStatus = FAST486_INT_EXECUTE; - State->PendingIntNum = Number; -} - -VOID -NTAPI Fast486InterruptSignal(PFAST486_STATE State) { - /* Set the interrupt status */ - State->IntStatus = FAST486_INT_SIGNAL; + State->IntSignaled = TRUE; } VOID Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Tue Oct 28 00:33:03 2014 @@ -2635,7 +2635,11 @@ } /* Call the internal API */ - Fast486LoadSegment(State, FAST486_REG_SS, LOWORD(NewSelector)); + if (Fast486LoadSegment(State, FAST486_REG_SS, LOWORD(NewSelector))) + { + /* Inhibit all interrupts until the next instruction */ + State->DoNotInterrupt = TRUE; + } } FAST486_OPCODE_HANDLER(Fast486OpcodeSbbByteModrm) @@ -3953,7 +3957,11 @@ return; } - Fast486LoadSegment(State, ModRegRm.Register, LOWORD(Selector)); + if (!Fast486LoadSegment(State, ModRegRm.Register, LOWORD(Selector))) + { + /* Exception occurred */ + return; + } } else { @@ -3965,7 +3973,17 @@ return; } - Fast486LoadSegment(State, ModRegRm.Register, Selector); + if (Fast486LoadSegment(State, ModRegRm.Register, Selector)) + { + /* Exception occurred */ + return; + } + } + + if ((INT)ModRegRm.Register == FAST486_REG_SS) + { + /* Inhibit all interrupts until the next instruction */ + State->DoNotInterrupt = TRUE; } } @@ -4261,10 +4279,7 @@ * changes the CS:IP, the interrupt handler won't execute and the * stack pointer will never be restored. */ - if (State->IntStatus == FAST486_INT_EXECUTE) - { - State->IntStatus = FAST486_INT_DELAYED; - } + State->DoNotInterrupt = TRUE; return; } Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Tue Oct 28 00:33:03 2014 @@ -248,12 +248,6 @@ /* Stop the VDM */ CpuUnsimulate(); // Halt the CPU VdmRunning = FALSE; -} - -VOID EmulatorInterrupt(BYTE Number) -{ - /* Call the Fast486 API */ - Fast486Interrupt(&EmulatorContext, Number); } VOID EmulatorInterruptSignal(VOID) Modified: trunk/reactos/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.h [iso-8859-1] Tue Oct 28 00:33:03 2014 @@ -96,7 +96,6 @@ VOID EmulatorTerminate(VOID); -VOID EmulatorInterrupt(BYTE Number); VOID EmulatorInterruptSignal(VOID); VOID EmulatorSetA20(BOOLEAN Enabled); Modified: trunk/reactos/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] Tue Oct 28 00:33:03 2014 @@ -204,9 +204,9 @@ case CTRL_C_EVENT: case CTRL_BREAK_EVENT: { - /* Call INT 23h */ - DPRINT1("Ctrl-C/Break: Call INT 23h\n"); - EmulatorInterrupt(0x23); + /* HACK: Stop the VDM */ + EmulatorTerminate(); + break; } case CTRL_LAST_CLOSE_EVENT:

1 0

[jimtabor] 65060: [NtUser] - Revert 64363. See CORE-7797.
by jimtabor＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: jimtabor Date: Tue Oct 28 00:26:22 2014 New Revision: 65060 URL: http://svn.reactos.org/svn/reactos?rev=65060&view=rev Log: [NtUser] - Revert 64363. See CORE-7797. Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Tue Oct 28 00:26:22 2014 @@ -851,6 +851,17 @@ return TRUE; } + if ((ProcessMask & QS_MOUSE) && + co_MsqPeekMouseMove( pti, + RemoveMessages, + Window, + MsgFilterMin, + MsgFilterMax, + Msg )) + { + return TRUE; + } + /* Check for hardware events. */ if ((ProcessMask & QS_INPUT) && co_MsqPeekHardwareMessage( pti, @@ -860,17 +871,6 @@ MsgFilterMax, ProcessMask, Msg)) - { - return TRUE; - } - - if ((ProcessMask & QS_MOUSE) && - co_MsqPeekMouseMove( pti, - RemoveMessages, - Window, - MsgFilterMin, - MsgFilterMax, - Msg )) { return TRUE; }

1 0

[hbelusca] 65059: [FAST486]: We should invalidate the prefetch buffer *after* having fetched the BOP byte (but before calling its handler), not before fetching the byte :)
by hbelusca＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: hbelusca Date: Tue Oct 28 00:19:48 2014 New Revision: 65059 URL: http://svn.reactos.org/svn/reactos?rev=65059&view=rev Log: [FAST486]: We should invalidate the prefetch buffer *after* having fetched the BOP byte (but before calling its handler), not before fetching the byte :) Modified: trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Tue Oct 28 00:19:48 2014 @@ -4240,17 +4240,17 @@ { UCHAR BopCode; -#ifndef FAST486_NO_PREFETCH - /* Invalidate the prefetch since BOP handlers can alter the memory */ - State->PrefetchValid = FALSE; -#endif - /* Fetch the BOP code */ if (!Fast486FetchByte(State, &BopCode)) { /* Exception occurred */ return; } + +#ifndef FAST486_NO_PREFETCH + /* Invalidate the prefetch since BOP handlers can alter the memory */ + State->PrefetchValid = FALSE; +#endif /* Call the BOP handler */ State->BopCallback(State, BopCode);

1 0

[tkreuzer] 65058: [GDI32] - Handle GDILoObjType_LO_ALTDC_TYPE in GdiGetDcAttr - Rewrite GdiGetLDC using GdiGetDcAttr - Implement GdiSetLDC
by tkreuzer＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: tkreuzer Date: Tue Oct 28 00:16:18 2014 New Revision: 65058 URL: http://svn.reactos.org/svn/reactos?rev=65058&view=rev Log: [GDI32] - Handle GDILoObjType_LO_ALTDC_TYPE in GdiGetDcAttr - Rewrite GdiGetLDC using GdiGetDcAttr - Implement GdiSetLDC Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h trunk/reactos/win32ss/gdi/gdi32/misc/misc.c Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] Tue Oct 28 00:16:18 2014 @@ -213,6 +213,10 @@ FASTCALL GdiGetLDC(HDC hDC); +BOOL +FASTCALL +GdiSetLDC(HDC hdc, PVOID pvLDC); + HGDIOBJ WINAPI GdiFixUpHandle(HGDIOBJ hGO); @@ -369,9 +373,23 @@ PDC_ATTR GdiGetDcAttr(HDC hdc) { + GDILOOBJTYPE eDcObjType; PDC_ATTR pdcattr; - if (!GdiGetHandleUserData((HGDIOBJ)hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) return NULL; + /* Check DC object type */ + eDcObjType = GDI_HANDLE_GET_TYPE(hdc); + if ((eDcObjType != GDILoObjType_LO_DC_TYPE) && + (eDcObjType != GDILoObjType_LO_ALTDC_TYPE)) + { + return NULL; + } + + /* Get the DC attribute */ + if (!GdiGetHandleUserData((HGDIOBJ)hdc, eDcObjType, (PVOID*)&pdcattr)) + { + return NULL; + } + return pdcattr; } Modified: trunk/reactos/win32ss/gdi/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/mis… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/misc/misc.c [iso-8859-1] Tue Oct 28 00:16:18 2014 @@ -145,40 +145,39 @@ PLDC FASTCALL -GdiGetLDC(HDC hDC) -{ - PDC_ATTR Dc_Attr; - PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX((HGDIOBJ) hDC); - HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); - // Don't check the mask, just the object type. - if ( Entry->ObjectType == GDIObjType_DC_TYPE && - (pid == NULL || pid == CurrentProcessId) ) - { - BOOL Result = TRUE; - if (Entry->UserData) - { - volatile CHAR *Current = (volatile CHAR*)Entry->UserData; - _SEH2_TRY - { - *Current = *Current; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Result = FALSE; - } - _SEH2_END - } - else - Result = FALSE; - - if (Result) - { - Dc_Attr = (PDC_ATTR)Entry->UserData; - return Dc_Attr->pvLDC; - } - } - return NULL; -} +GdiGetLDC(HDC hdc) +{ + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + return NULL; + } + + /* Return the LDC pointer */ + return pdcattr->pvLDC; +} + +BOOL +FASTCALL +GdiSetLDC(HDC hdc, PVOID pvLDC) +{ + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + return FALSE; + } + + /* Set the LDC pointer */ + pdcattr->pvLDC = pvLDC; + return TRUE; +} + VOID GdiSAPCallback(PLDC pldc) {

1 0

[gadamopoulos] 65057: [win32k] - Revert a recent change in trunk that broke the new shell. Its a shame to see the new shell behave like crap because of win32k
by gadamopoulos＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: gadamopoulos Date: Mon Oct 27 23:49:06 2014 New Revision: 65057 URL: http://svn.reactos.org/svn/reactos?rev=65057&view=rev Log: [win32k] - Revert a recent change in trunk that broke the new shell. Its a shame to see the new shell behave like crap because of win32k Modified: branches/shell-experiments/win32ss/user/ntuser/message.c Modified: branches/shell-experiments/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/message.c [iso-8859-1] Mon Oct 27 23:49:06 2014 @@ -851,6 +851,17 @@ return TRUE; } + if ((ProcessMask & QS_MOUSE) && + co_MsqPeekMouseMove( pti, + RemoveMessages, + Window, + MsgFilterMin, + MsgFilterMax, + Msg )) + { + return TRUE; + } + /* Check for hardware events. */ if ((ProcessMask & QS_INPUT) && co_MsqPeekHardwareMessage( pti, @@ -860,17 +871,6 @@ MsgFilterMax, ProcessMask, Msg)) - { - return TRUE; - } - - if ((ProcessMask & QS_MOUSE) && - co_MsqPeekMouseMove( pti, - RemoveMessages, - Window, - MsgFilterMin, - MsgFilterMax, - Msg )) { return TRUE; }

1 0

[tkreuzer] 65056: [GDI32] Forgot to commit this...
by tkreuzer＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: tkreuzer Date: Mon Oct 27 23:39:21 2014 New Revision: 65056 URL: http://svn.reactos.org/svn/reactos?rev=65056&view=rev Log: [GDI32] Forgot to commit this... Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] Mon Oct 27 23:39:21 2014 @@ -236,11 +236,20 @@ DWORD WINAPI -GetAndSetDCDWord( HDC, INT, DWORD, DWORD, DWORD, DWORD ); +GetAndSetDCDWord( + _In_ HDC hdc, + _In_ UINT u, + _In_ DWORD dwIn, + _In_ ULONG ulMFId, + _In_ USHORT usMF16Id, + _In_ DWORD dwError); DWORD WINAPI -GetDCDWord( HDC, INT, DWORD); +GetDCDWord( + _In_ HDC hdc, + _In_ UINT u, + _In_ DWORD dwError); HGDIOBJ WINAPI

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