Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[akhaldi] 55177: [FUSION] * Sync to Wine 1.3.37.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 25 19:09:23 2012 New Revision: 55177 URL: http://svn.reactos.org/svn/reactos?rev=55177&view=rev Log: [FUSION] * Sync to Wine 1.3.37. Added: trunk/reactos/dll/win32/fusion/version.rc (with props) Removed: trunk/reactos/dll/win32/fusion/fusion_ros.diff Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt trunk/reactos/dll/win32/fusion/asmenum.c trunk/reactos/dll/win32/fusion/asmname.c trunk/reactos/dll/win32/fusion/fusion.rbuild trunk/reactos/dll/win32/fusion/fusionpriv.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Wed Jan 25 19:09:23 2012 @@ -14,6 +14,7 @@ assembly.c fusion.c fusion_main.c + version.rc ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/fusion.def) Modified: trunk/reactos/dll/win32/fusion/asmenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmenum.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmenum.c [iso-8859-1] Wed Jan 25 19:09:23 2012 @@ -236,9 +236,9 @@ DWORD size, i; size = sizeof(name1); - IAssemblyName_GetProperty(asmname1->name, ASM_NAME_NAME, &name1, &size); + IAssemblyName_GetProperty(asmname1->name, ASM_NAME_NAME, name1, &size); size = sizeof(name2); - IAssemblyName_GetProperty(asmname2->name, ASM_NAME_NAME, &name2, &size); + IAssemblyName_GetProperty(asmname2->name, ASM_NAME_NAME, name2, &size); if ((ret = strcmpiW(name1, name2))) return ret; Modified: trunk/reactos/dll/win32/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmname.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] Wed Jan 25 19:09:23 2012 @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(fusion); typedef struct { - const IAssemblyNameVtbl *lpIAssemblyNameVtbl; + IAssemblyName IAssemblyName_iface; LPWSTR path; @@ -67,10 +67,15 @@ #define CHARS_PER_PUBKEY 16 +static inline IAssemblyNameImpl *impl_from_IAssemblyName(IAssemblyName *iface) +{ + return CONTAINING_RECORD(iface, IAssemblyNameImpl, IAssemblyName_iface); +} + static HRESULT WINAPI IAssemblyNameImpl_QueryInterface(IAssemblyName *iface, REFIID riid, LPVOID *ppobj) { - IAssemblyNameImpl *This = (IAssemblyNameImpl *)iface; + IAssemblyNameImpl *This = impl_from_IAssemblyName(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); @@ -90,7 +95,7 @@ static ULONG WINAPI IAssemblyNameImpl_AddRef(IAssemblyName *iface) { - IAssemblyNameImpl *This = (IAssemblyNameImpl *)iface; + IAssemblyNameImpl *This = impl_from_IAssemblyName(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before = %u)\n", This, refCount - 1); @@ -100,7 +105,7 @@ static ULONG WINAPI IAssemblyNameImpl_Release(IAssemblyName *iface) { - IAssemblyNameImpl *This = (IAssemblyNameImpl *)iface; + IAssemblyNameImpl *This = impl_from_IAssemblyName(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before = %u)\n", This, refCount + 1); @@ -111,6 +116,7 @@ HeapFree(GetProcessHeap(), 0, This->displayname); HeapFree(GetProcessHeap(), 0, This->name); HeapFree(GetProcessHeap(), 0, This->culture); + HeapFree(GetProcessHeap(), 0, This->procarch); HeapFree(GetProcessHeap(), 0, This); } @@ -131,7 +137,7 @@ LPVOID pvProperty, LPDWORD pcbProperty) { - IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; + IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); TRACE("(%p, %d, %p, %p)\n", iface, PropertyId, pvProperty, pcbProperty); @@ -222,7 +228,7 @@ LPDWORD pccDisplayName, DWORD dwDisplayFlags) { - IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; + IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); WCHAR verstr[30]; DWORD size; LPWSTR cultureval = 0; @@ -362,7 +368,7 @@ LPDWORD lpcwBuffer, WCHAR *pwzName) { - IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; + IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); TRACE("(%p, %p, %p)\n", iface, lpcwBuffer, pwzName); @@ -383,7 +389,7 @@ LPDWORD pdwVersionHi, LPDWORD pdwVersionLow) { - IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; + IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); TRACE("(%p, %p, %p)\n", iface, pdwVersionHi, pdwVersionLow); @@ -430,11 +436,16 @@ }; /* Internal methods */ +static inline IAssemblyNameImpl *unsafe_impl_from_IAssemblyName(IAssemblyName *iface) +{ + assert(iface->lpVtbl == &AssemblyNameVtbl); + + return impl_from_IAssemblyName(iface); +} + HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) { - IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; - - assert(name->lpIAssemblyNameVtbl == &AssemblyNameVtbl); + IAssemblyNameImpl *name = unsafe_impl_from_IAssemblyName(iface); name->path = strdupW(path); if (!name->path) @@ -446,9 +457,7 @@ HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) { ULONG buffer_size = *len; - IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; - - assert(name->lpIAssemblyNameVtbl == &AssemblyNameVtbl); + IAssemblyNameImpl *name = unsafe_impl_from_IAssemblyName(iface); if (!name->path) return S_OK; @@ -561,7 +570,10 @@ str = strdupW(szAssemblyName); save = str; if (!str) - return E_OUTOFMEMORY; + { + hr = E_OUTOFMEMORY; + goto done; + } ptr = strchrW(str, ','); if (ptr) *ptr = '\0'; @@ -575,7 +587,10 @@ name->name = strdupW(str); if (!name->name) - return E_OUTOFMEMORY; + { + hr = E_OUTOFMEMORY; + goto done; + } if (!ptr) goto done; @@ -621,7 +636,8 @@ else if (!lstrcmpW(str, procarch)) { name->procarch = strdupW(ptr); - hr = S_OK; + if (!name->procarch) + hr = E_OUTOFMEMORY; } if (FAILED(hr)) @@ -664,7 +680,7 @@ if (!name) return E_OUTOFMEMORY; - name->lpIAssemblyNameVtbl = &AssemblyNameVtbl; + name->IAssemblyName_iface.lpVtbl = &AssemblyNameVtbl; name->ref = 1; hr = parse_display_name(name, szAssemblyName); @@ -674,7 +690,7 @@ return hr; } - *ppAssemblyNameObj = (IAssemblyName *)name; - - return S_OK; -} + *ppAssemblyNameObj = &name->IAssemblyName_iface; + + return S_OK; +} Modified: trunk/reactos/dll/win32/fusion/fusion.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion.rb… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion.rbuild [iso-8859-1] Wed Jan 25 19:09:23 2012 @@ -15,4 +15,5 @@ <file>assembly.c</file> <file>fusion.c</file> <file>fusion_main.c</file> + <file>version.rc</file> </module> Removed: trunk/reactos/dll/win32/fusion/fusion_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_ro… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion_ros.diff (removed) @@ -1,11 +1,0 @@ ---- dll\win32\fusion\fusion_main - Kopie.c Fr Sep 5 17:28:27 2008 -+++ dll\win32\fusion\fusion_main.c Mi Sep 10 10:38:55 2008 -@@ -34,8 +34,6 @@ - - switch (fdwReason) - { -- case DLL_WINE_PREATTACH: -- return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; Modified: trunk/reactos/dll/win32/fusion/fusionpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusionpri… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusionpriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusionpriv.h [iso-8859-1] Wed Jan 25 19:09:23 2012 @@ -428,16 +428,16 @@ struct tagASSEMBLY; typedef struct tagASSEMBLY ASSEMBLY; -HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file); -HRESULT assembly_release(ASSEMBLY *assembly); -HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name); -HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path); -HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version); -BYTE assembly_get_architecture(ASSEMBLY *assembly); -HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token); - -extern HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path); -extern HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len); +HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) DECLSPEC_HIDDEN; +HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN; +HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) DECLSPEC_HIDDEN; +HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) DECLSPEC_HIDDEN; +HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) DECLSPEC_HIDDEN; +BYTE assembly_get_architecture(ASSEMBLY *assembly) DECLSPEC_HIDDEN; +HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) DECLSPEC_HIDDEN; + +extern HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) DECLSPEC_HIDDEN; +extern HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) DECLSPEC_HIDDEN; static inline LPWSTR strdupW(LPCWSTR src) { @@ -461,7 +461,7 @@ { DWORD i; - static const WCHAR hexval[16] = { + static const WCHAR hexval[] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' }; Added: trunk/reactos/dll/win32/fusion/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/version.r… ============================================================================== --- trunk/reactos/dll/win32/fusion/version.rc (added) +++ trunk/reactos/dll/win32/fusion/version.rc [iso-8859-1] Wed Jan 25 19:09:23 2012 @@ -1,0 +1,26 @@ +/* + * Copyright 2010 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine assembly manager" +#define WINE_FILENAME_STR "fusion.dll" +#define WINE_FILEVERSION 2,0,50727,4016 +#define WINE_FILEVERSION_STR "2.0.50727.4016" +#define WINE_PRODUCTVERSION 2,0,50727,4016 +#define WINE_PRODUCTVERSION_STR "2.0.50727.4016" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/fusion/version.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Jan 25 19:09:23 2012 @@ -60,7 +60,7 @@ reactos/dll/win32/dbghelp # Autosync reactos/dll/win32/dciman32 # Autosync reactos/dll/win32/dwmapi # Synced to Wine-1.3.37 -reactos/dll/win32/fusion # Autosync +reactos/dll/win32/fusion # Synced to Wine-1.3.37 reactos/dll/win32/gdiplus # Autosync reactos/dll/win32/hhctrl.ocx # Autosync reactos/dll/win32/hlink # Autosync @@ -69,8 +69,8 @@ reactos/dll/win32/iccvid # Autosync reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.3.37 +reactos/dll/win32/imagehlp # Autosync reactos/dll/win32/imm32 # Autosync -reactos/dll/win32/imagehlp # Autosync reactos/dll/win32/inetcomm # Autosync reactos/dll/win32/inetmib1 # Autosync reactos/dll/win32/initpki # Autosync

12 years, 8 months

[janderwald] 55176: [USBOHCI] - Add alignment check

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Jan 25 18:56:56 2012 New Revision: 55176 URL: http://svn.reactos.org/svn/reactos?rev=55176&view=rev Log: [USBOHCI] - Add alignment check Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Wed Jan 25 18:56:56 2012 @@ -884,6 +884,14 @@ ULONG Index, FrameInterval; // + // alignment check + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET, 0xFFFFFFFF); + Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET)); + DPRINT1("HcHCCA Alignment %x\n", Control); + ASSERT((Control & 0xFFFFFFF0) == 0xFFFFFFF0); + + // // check context // Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET));

12 years, 8 months

[akhaldi] 55175: [MOUNTMGR] * Fix the CMake config.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 25 17:02:47 2012 New Revision: 55175 URL: http://svn.reactos.org/svn/reactos?rev=55175&view=rev Log: [MOUNTMGR] * Fix the CMake config. Modified: branches/usb-bringup-trunk/drivers/filters/mountmgr/CMakeLists.txt Modified: branches/usb-bringup-trunk/drivers/filters/mountmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/filte… ============================================================================== --- branches/usb-bringup-trunk/drivers/filters/mountmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/filters/mountmgr/CMakeLists.txt [iso-8859-1] Wed Jan 25 17:02:47 2012 @@ -9,10 +9,8 @@ uniqueid.c mountmgr.rc) +add_library(mountmgr SHARED ${SOURCE}) allow_warnings(mountmgr) - -add_library(mountmgr SHARED ${SOURCE}) - set_module_type(mountmgr kernelmodedriver) add_importlibs(mountmgr ntoskrnl hal)

12 years, 8 months

[tkreuzer] 55174: [NTOSKRNL] Refactor KeUpdateSystemTime, improving readability, fixing a concurrency issue and fixing the code for 64 bit.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jan 25 16:56:06 2012 New Revision: 55174 URL: http://svn.reactos.org/svn/reactos?rev=55174&view=rev Log: [NTOSKRNL] Refactor KeUpdateSystemTime, improving readability, fixing a concurrency issue and fixing the code for 64 bit. Modified: trunk/reactos/ntoskrnl/ke/time.c Modified: trunk/reactos/ntoskrnl/ke/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/time.c?rev=551… ============================================================================== --- trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] Wed Jan 25 16:56:06 2012 @@ -21,6 +21,45 @@ /* FUNCTIONS ******************************************************************/ VOID +FORCEINLINE +KiWriteSystemTime(volatile KSYSTEM_TIME *SystemTime, ULARGE_INTEGER NewTime) +{ +#ifdef _WIN64 + /* Do a single atomic write */ + *(ULONGLONG*)SystemTime = NewTime.QuadPart; +#else + /* Update in 3 steps, so that a reader can recognize partial updates */ + SystemTime->High1Time = NewTime.HighPart; + SystemTime->LowPart = NewTime.LowPart; + SystemTime->High2Time = NewTime.HighPart; +#endif +} + +VOID +FORCEINLINE +KiCheckForTimerExpiration( + PKPRCB Prcb, + PKTRAP_FRAME TrapFrame, + ULARGE_INTEGER InterruptTime) +{ + ULONG Hand; + + /* Check for timer expiration */ + Hand = KeTickCount.LowPart & (TIMER_TABLE_SIZE - 1); + if (KiTimerTableListHead[Hand].Time.QuadPart <= InterruptTime.QuadPart) + { + /* Check if we are already doing expiration */ + if (!Prcb->TimerRequest) + { + /* Request a DPC to handle this */ + Prcb->TimerRequest = (ULONG_PTR)TrapFrame; + Prcb->TimerHand = Hand; + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + } + } +} + +VOID FASTCALL KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, IN ULONG Increment, @@ -28,88 +67,46 @@ { PKPRCB Prcb = KeGetCurrentPrcb(); ULARGE_INTEGER CurrentTime, InterruptTime; - ULONG Hand, OldTickCount; + LONG OldTickOffset; /* Add the increment time to the shared data */ - InterruptTime.HighPart = SharedUserData->InterruptTime.High1Time; - InterruptTime.LowPart = SharedUserData->InterruptTime.LowPart; + InterruptTime.QuadPart = *(ULONGLONG*)&SharedUserData->InterruptTime; InterruptTime.QuadPart += Increment; - SharedUserData->InterruptTime.High1Time = InterruptTime.HighPart; - SharedUserData->InterruptTime.LowPart = InterruptTime.LowPart; - SharedUserData->InterruptTime.High2Time = InterruptTime.HighPart; - - /* Update tick count */ - InterlockedExchangeAdd(&KiTickOffset, -(LONG)Increment); - - /* Check for incomplete tick */ - OldTickCount = KeTickCount.LowPart; - if (KiTickOffset <= 0) + KiWriteSystemTime(&SharedUserData->InterruptTime, InterruptTime); + + /* Check for timer expiration */ + KiCheckForTimerExpiration(Prcb, TrapFrame, InterruptTime); + + /* Update the tick offset */ + OldTickOffset = InterlockedExchangeAdd(&KiTickOffset, -(LONG)Increment); + + /* Check for full tick */ + if (OldTickOffset <= (LONG)Increment) { /* Update the system time */ - CurrentTime.HighPart = SharedUserData->SystemTime.High1Time; - CurrentTime.LowPart = SharedUserData->SystemTime.LowPart; + CurrentTime.QuadPart = *(ULONGLONG*)&SharedUserData->SystemTime; CurrentTime.QuadPart += KeTimeAdjustment; - SharedUserData->SystemTime.High2Time = CurrentTime.HighPart; - SharedUserData->SystemTime.LowPart = CurrentTime.LowPart; - SharedUserData->SystemTime.High1Time = CurrentTime.HighPart; + KiWriteSystemTime(&SharedUserData->SystemTime, CurrentTime); /* Update the tick count */ - CurrentTime.HighPart = KeTickCount.High1Time; - CurrentTime.LowPart = OldTickCount; - CurrentTime.QuadPart += 1; - KeTickCount.High2Time = CurrentTime.HighPart; - KeTickCount.LowPart = CurrentTime.LowPart; - KeTickCount.High1Time = CurrentTime.HighPart; + CurrentTime.QuadPart = (*(ULONGLONG*)&KeTickCount) + 1; + KiWriteSystemTime(&KeTickCount, CurrentTime); /* Update it in the shared user data */ - SharedUserData->TickCount.High2Time = CurrentTime.HighPart; - SharedUserData->TickCount.LowPart = CurrentTime.LowPart; - SharedUserData->TickCount.High1Time = CurrentTime.HighPart; - - /* Check for timer expiration */ - Hand = OldTickCount & (TIMER_TABLE_SIZE - 1); - if (KiTimerTableListHead[Hand].Time.QuadPart <= InterruptTime.QuadPart) - { - /* Check if we are already doing expiration */ - if (!Prcb->TimerRequest) - { - /* Request a DPC to handle this */ - Prcb->TimerRequest = (ULONG_PTR)TrapFrame; - Prcb->TimerHand = Hand; - HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - } - } + KiWriteSystemTime(&SharedUserData->TickCount, CurrentTime); /* Check for expiration with the new tick count as well */ - OldTickCount++; - } - - /* Check for timer expiration */ - Hand = OldTickCount & (TIMER_TABLE_SIZE - 1); - if (KiTimerTableListHead[Hand].Time.QuadPart <= InterruptTime.QuadPart) - { - /* Check if we are already doing expiration */ - if (!Prcb->TimerRequest) - { - /* Request a DPC to handle this */ - Prcb->TimerRequest = (ULONG_PTR)TrapFrame; - Prcb->TimerHand = Hand; - HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - } - } - - /* Check if this was a full tick */ - if (KiTickOffset <= 0) - { - /* Update the tick offset */ + KiCheckForTimerExpiration(Prcb, TrapFrame, InterruptTime); + + /* Reset the tick offset */ KiTickOffset += KeMaximumIncrement; - /* Update system runtime */ + /* Update processor/thread runtime */ KeUpdateRunTime(TrapFrame, Irql); } else { - /* Increase interrupt count and exit */ + /* Increase interrupt count only */ Prcb->InterruptCount++; }

12 years, 8 months

[tkreuzer] 55173: [FREELDR] Fix wrong buffer size calculation that could lead to memory corruption Kudos go to Jardar for debugging the issue.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jan 25 16:45:42 2012 New Revision: 55173 URL: http://svn.reactos.org/svn/reactos?rev=55173&view=rev Log: [FREELDR] Fix wrong buffer size calculation that could lead to memory corruption Kudos go to Jardar for debugging the issue. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Wed Jan 25 16:45:42 2012 @@ -250,7 +250,8 @@ TRACE("Estimated buffer size %u\n", NodeSize * NodeCount); /* Set 'Configuration Data' value */ - Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + (NodeSize * NodeCount); + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + + sizeof(CM_PNP_BIOS_INSTALLATION_CHECK) + (NodeSize * NodeCount); PartialResourceList = MmHeapAlloc(Size); if (PartialResourceList == NULL) { @@ -268,8 +269,8 @@ PartialResourceList->PartialDescriptors[0].ShareDisposition = CmResourceShareUndetermined; - Ptr = (char *)(((ULONG_PTR)&PartialResourceList->PartialDescriptors[0]) + - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + /* The buffer starts after PartialResourceList->PartialDescriptors[0] */ + Ptr = (char *)(PartialResourceList + 1); /* Set instalation check data */ memcpy (Ptr, InstData, sizeof(CM_PNP_BIOS_INSTALLATION_CHECK)); @@ -291,6 +292,12 @@ DeviceNode->Node, DeviceNode->Size, DeviceNode->Size); + + if (PnpBufferSize + DeviceNode->Size > Size) + { + ERR("Buffer too small!\n"); + break; + } memcpy (Ptr, DeviceNode,

12 years, 8 months

[spetreolle] 55172: [WININET] Add zlib include path / link.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Jan 25 11:33:05 2012 New Revision: 55172 URL: http://svn.reactos.org/svn/reactos?rev=55172&view=rev Log: [WININET] Add zlib include path / link. Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt trunk/reactos/dll/win32/wininet/wininet.rbuild Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/wininet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/CMakeLists.txt [iso-8859-1] Wed Jan 25 11:33:05 2012 @@ -5,6 +5,7 @@ -Dclose=_close) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) spec2def(wininet.dll wininet.spec) @@ -29,7 +30,7 @@ add_library(wininet SHARED ${SOURCE}) set_module_type(wininet win32dll) -target_link_libraries(wininet wine ${PSEH_LIB}) +target_link_libraries(wininet wine ${PSEH_LIB} zlib) add_delay_importlibs(wininet secur32 crypt32) add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET wininet DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] Wed Jan 25 11:33:05 2012 @@ -6,6 +6,7 @@ <importlibrary definition="wininet.spec" /> <include base="wininet">.</include> <include base="ReactOS">include/reactos/wine</include> + <include base="zlib">.</include> <define name="__WINESRC__" /> <define name="_WINE" /> @@ -22,6 +23,7 @@ <library>secur32</library> <library>crypt32</library> <library>ws2_32</library> + <library>zlib</library> <library>pseh</library> <file>cookie.c</file> <file>dialogs.c</file>

12 years, 8 months

[janderwald] 55171: [USBOHCI] - No need to turn off interrupts - Check if bios is active - Check for timeouts when resetting host controller

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Jan 25 09:50:04 2012 New Revision: 55171 URL: http://svn.reactos.org/svn/reactos?rev=55171&view=rev Log: [USBOHCI] - No need to turn off interrupts - Check if bios is active - Check for timeouts when resetting host controller Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Wed Jan 25 09:50:04 2012 @@ -888,7 +888,6 @@ // Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)); - if ((Control & OHCI_INTERRUPT_ROUTING)) { // @@ -932,26 +931,100 @@ DPRINT1("SMM has given up ownership\n"); } } - - // - // turn off interrupts - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_DISABLE_OFFSET), OHCI_ALL_INTERRUPTS); - - // - // have a break - // - KeStallExecutionProcessor(100); - - // - // some controllers also depend on this - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_HC_FUNCTIONAL_STATE_RESET); - - // - // wait a bit - // - KeStallExecutionProcessor(100); + else + { + // + // read contents of control register + // + Control = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)) & OHCI_HC_FUNCTIONAL_STATE_MASK); + DPRINT1("Controller State %x\n", Control); + + if (Control != OHCI_HC_FUNCTIONAL_STATE_RESET) + { + // + // OHCI 5.1.1.3.4, no SMM, BIOS active + // + if (Control != OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL) + { + // + // lets resume + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_HC_FUNCTIONAL_STATE_RESUME); + Index = 0; + do + { + // + // wait untill its resumed + // + KeStallExecutionProcessor(10); + + // + // check control register + // + Control = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)) & OHCI_HC_FUNCTIONAL_STATE_MASK); + if (Control & OHCI_HC_FUNCTIONAL_STATE_RESUME) + { + // + // it has resumed + // + break; + } + + // + // check for time outs + // + Index++; + if(Index > 100) + { + DPRINT1("Failed to resume controller\n"); + break; + } + }while(TRUE); + } + } + else + { + // + // 5.1.1.3.5 OHCI, no SMM, no BIOS + // + Index = 0; + + // + // some controllers also depend on this + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_HC_FUNCTIONAL_STATE_RESET); + do + { + // + // wait untill its reset + // + KeStallExecutionProcessor(10); + + // + // check control register + // + Control = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)) & OHCI_HC_FUNCTIONAL_STATE_MASK); + if (Control == OHCI_HC_FUNCTIONAL_STATE_RESET) + { + // + // it has reset + // + break; + } + + // + // check for time outs + // + Index++; + if(Index > 100) + { + DPRINT1("Failed to reset controller\n"); + break; + } + + }while(TRUE); + } + } // // read from interval

12 years, 8 months

[cgutman] 55170: [USBOHCI] - Don't turn off interrupts before setting the OHCI_OWNERSHIP_CHANGE_REQUEST bit because it prevents the SMM driver from receiving the interrupt that tells it to give up ...

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Jan 25 06:35:00 2012 New Revision: 55170 URL: http://svn.reactos.org/svn/reactos?rev=55170&view=rev Log: [USBOHCI] - Don't turn off interrupts before setting the OHCI_OWNERSHIP_CHANGE_REQUEST bit because it prevents the SMM driver from receiving the interrupt that tells it to give up ownership of the host controller - This fix should be merged to Haiku also which has the same bug Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Wed Jan 25 06:35:00 2012 @@ -884,11 +884,6 @@ ULONG Index, FrameInterval; // - // first turn off all interrupts - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_DISABLE_OFFSET), OHCI_ALL_INTERRUPTS); - - // // check context // Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)); @@ -931,18 +926,17 @@ if (Control & OHCI_INTERRUPT_ROUTING) { DPRINT1("SMM not responding\n"); - // - // some controllers also depend on this - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_HC_FUNCTIONAL_STATE_RESET); - - // - // wait a bit - // - KeStallExecutionProcessor(100); } - } - + else + { + DPRINT1("SMM has given up ownership\n"); + } + } + + // + // turn off interrupts + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_DISABLE_OFFSET), OHCI_ALL_INTERRUPTS); // // have a break

12 years, 8 months

[cgutman] 55169: [USBSTOR] - Use the correct USBD_TRANSFER_DIRECTION value for write operations

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Jan 25 06:09:24 2012 New Revision: 55169 URL: http://svn.reactos.org/svn/reactos?rev=55169&view=rev Log: [USBSTOR] - Use the correct USBD_TRANSFER_DIRECTION value for write operations Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c [iso-8859-1] Wed Jan 25 06:09:24 2012 @@ -447,7 +447,7 @@ NULL, Context->TransferBufferMDL, Context->TransferDataLength, - USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, + ((Code == SCSIOP_WRITE) ? USBD_TRANSFER_DIRECTION_OUT : USBD_TRANSFER_DIRECTION_IN) | USBD_SHORT_TRANSFER_OK, NULL); //

12 years, 8 months

[janderwald] 55168: [USBHUB] - Partly revert 55167, it conflicts with hotplugging

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Jan 25 04:00:33 2012 New Revision: 55168 URL: http://svn.reactos.org/svn/reactos?rev=55168&view=rev Log: [USBHUB] - Partly revert 55167, it conflicts with hotplugging Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Wed Jan 25 04:00:33 2012 @@ -1443,10 +1443,11 @@ PVOID Context) { PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context; +/* NTSTATUS Status; - ULONG PortId; - PHUB_DEVICE_EXTENSION HubDeviceExtension; - PORT_STATUS_CHANGE StatusChange; + //ULONG PortId; + //PHUB_DEVICE_EXTENSION HubDeviceExtension; + //PORT_STATUS_CHANGE StatusChange; HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; @@ -1474,7 +1475,7 @@ } } } - +*/ // // Send the first SCE Request // @@ -1492,7 +1493,7 @@ PHUB_DEVICE_EXTENSION HubDeviceExtension; PDEVICE_OBJECT RootHubDeviceObject; PVOID HubInterfaceBusContext , UsbDInterfaceBusContext; - PORT_STATUS_CHANGE StatusChange; + //PORT_STATUS_CHANGE StatusChange; HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; @@ -1829,6 +1830,7 @@ } else { +/* // // reset ports // @@ -1854,7 +1856,7 @@ } } } - +*/ // // Send the first SCE Request //

12 years, 8 months

← Newer
1
...
16
17
18
19
20
21
22
...
56
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 January 2012