Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 47198: [WINLOGON] - Store all environment variables that were passed from msgina.dll in the volatile environment key. - Add the APPDATA environment variable to the volatile environment. Unfortunately SHGetFolderPath does not seem to expand the appdata path. Bug or Feature?? - Create the environment block for the shell process after the volatile environment key has been filled, so its variables are included. - Yet another step to fixing bug #4102.
by ekohl＠svn.reactos.org 14 May '10

14 May '10

Author: ekohl Date: Fri May 14 19:08:20 2010 New Revision: 47198 URL: http://svn.reactos.org/svn/reactos?rev=47198&view=rev Log: [WINLOGON] - Store all environment variables that were passed from msgina.dll in the volatile environment key. - Add the APPDATA environment variable to the volatile environment. Unfortunately SHGetFolderPath does not seem to expand the appdata path. Bug or Feature?? - Create the environment block for the shell process after the volatile environment key has been filled, so its variables are included. - Yet another step to fixing bug #4102. Modified: trunk/reactos/base/system/winlogon/environment.c trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.h Modified: trunk/reactos/base/system/winlogon/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/envir… ============================================================================== --- trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] Fri May 14 19:08:20 2010 @@ -11,6 +11,7 @@ /* INCLUDES *****************************************************************/ #include "winlogon.h" +#include <shlobj.h> #include <wine/debug.h> @@ -18,74 +19,104 @@ /* GLOBALS ******************************************************************/ +typedef HRESULT (WINAPI *PFSHGETFOLDERPATHW)(HWND, int, HANDLE, DWORD, LPWSTR); + /* FUNCTIONS ****************************************************************/ +static VOID +BuildVolatileEnvironment(IN PWLSESSION Session, + IN HKEY hKey) +{ + HINSTANCE hShell32 = NULL; + PFSHGETFOLDERPATHW pfSHGetFolderPathW = NULL; + WCHAR szPath[MAX_PATH + 1]; + LPCWSTR wstr; + SIZE_T size; + + WCHAR szEnvKey[MAX_PATH]; + WCHAR szEnvValue[1024]; + + SIZE_T length; + LPWSTR eqptr, endptr; + + if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && + Session->Profile->pszEnvironment != NULL) + { + wstr = Session->Profile->pszEnvironment; + while (*wstr != UNICODE_NULL) + { + size = wcslen(wstr) + 1; + + eqptr = wcschr(wstr, L'='); + + if (eqptr != NULL) + { + endptr = eqptr; + + endptr--; + while (iswspace(*endptr)) + endptr--; + + length = (SIZE_T)(endptr - wstr + 1); + + wcsncpy(szEnvKey, wstr, length); + szEnvKey[length] = 0; + + eqptr++; + while (iswspace(*eqptr)) + eqptr++; + wcscpy(szEnvValue, eqptr); + + RegSetValueExW(hKey, + szEnvKey, + 0, + REG_SZ, + (LPBYTE)szEnvValue, + (wcslen(szEnvValue) + 1) * sizeof(WCHAR)); + } + + wstr += size; + } + } + + + hShell32 = LoadLibraryW(L"shell32.dll"); + if (hShell32 != NULL) + { + pfSHGetFolderPathW = (PFSHGETFOLDERPATHW)GetProcAddress(hShell32, + "SHGetFolderPathW"); + if (pfSHGetFolderPathW != NULL) + { + if (pfSHGetFolderPathW(NULL, + CSIDL_APPDATA | CSIDL_FLAG_DONT_VERIFY, + Session->UserToken, + 0, + szPath) == S_OK) + { + RegSetValueExW(hKey, + L"APPDATA", + 0, + REG_SZ, + (LPBYTE)szPath, + (wcslen(szPath) + 1) * sizeof(WCHAR)); + } + } + + FreeLibrary(hShell32); + } +} + + BOOL -CreateUserEnvironment(IN PWLSESSION Session, - IN LPVOID *lpEnvironment, - IN LPWSTR *lpFullEnv) +CreateUserEnvironment(IN PWLSESSION Session) { - LPCWSTR wstr; - SIZE_T EnvBlockSize = 0, ProfileSize = 0; - LPVOID lpEnviron = NULL; - LPWSTR lpFullEnviron = NULL; HKEY hKey; DWORD dwDisp; LONG lError; HKEY hKeyCurrentUser; TRACE("WL: CreateUserEnvironment called\n"); - - /* Create environment block for the user */ - if (!CreateEnvironmentBlock(&lpEnviron, - Session->UserToken, - TRUE)) - { - WARN("WL: CreateEnvironmentBlock() failed\n"); - return FALSE; - } - - if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment) - { - /* Count required size for full environment */ - wstr = (LPCWSTR)lpEnviron; - while (*wstr != UNICODE_NULL) - { - SIZE_T size = wcslen(wstr) + 1; - wstr += size; - EnvBlockSize += size; - } - - wstr = Session->Profile->pszEnvironment; - while (*wstr != UNICODE_NULL) - { - SIZE_T size = wcslen(wstr) + 1; - wstr += size; - ProfileSize += size; - } - - /* Allocate enough memory */ - lpFullEnviron = HeapAlloc(GetProcessHeap(), 0, (EnvBlockSize + ProfileSize + 1) * sizeof(WCHAR)); - if (!lpFullEnviron) - { - TRACE("HeapAlloc() failed\n"); - return FALSE; - } - - /* Fill user environment block */ - CopyMemory(lpFullEnviron, - lpEnviron, - EnvBlockSize * sizeof(WCHAR)); - CopyMemory(&lpFullEnviron[EnvBlockSize], - Session->Profile->pszEnvironment, - ProfileSize * sizeof(WCHAR)); - lpFullEnviron[EnvBlockSize + ProfileSize] = UNICODE_NULL; - } - else - { - lpFullEnviron = (LPWSTR)lpEnviron; - } /* Impersonate the new user */ ImpersonateLoggedOnUser(Session->UserToken); @@ -107,6 +138,9 @@ &dwDisp); if (lError == ERROR_SUCCESS) { + BuildVolatileEnvironment(Session, + hKey); + RegCloseKey(hKey); } else @@ -120,9 +154,6 @@ /* Revert the impersonation */ RevertToSelf(); - *lpEnvironment = lpEnviron; - *lpFullEnv = lpFullEnviron; - TRACE("WL: CreateUserEnvironment done\n"); return TRUE; Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Fri May 14 19:08:20 2010 @@ -170,7 +170,6 @@ { PROFILEINFOW ProfileInfo; LPVOID lpEnvironment = NULL; - LPWSTR lpFullEnv = NULL; BOOLEAN Old; BOOL ret = FALSE; @@ -208,9 +207,16 @@ } /* Create environment block for the user */ - if (!CreateUserEnvironment(Session, &lpEnvironment, &lpFullEnv)) + if (!CreateUserEnvironment(Session)) { WARN("WL: SetUserEnvironment() failed\n"); + goto cleanup; + } + + /* Create environment block for the user */ + if (!CreateEnvironmentBlock(&lpEnvironment, Session->UserToken, TRUE)) + { + WARN("WL: CreateEnvironmentBlock() failed\n"); goto cleanup; } @@ -233,7 +239,7 @@ Session->Gina.Context, L"Default", NULL, /* FIXME */ - lpFullEnv)) + lpEnvironment)) { //WCHAR StatusMsg[256]; WARN("WL: WlxActivateUserShell() failed\n"); @@ -260,8 +266,6 @@ { UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); } - if (lpFullEnv != lpEnvironment) - HeapFree(GetProcessHeap(), 0, lpFullEnv); if (lpEnvironment) DestroyEnvironmentBlock(lpEnvironment); RemoveStatusMessage(Session); Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Fri May 14 19:08:20 2010 @@ -182,9 +182,7 @@ /* environment.c */ BOOL -CreateUserEnvironment(IN PWLSESSION Session, - IN LPVOID *lpEnvironment, - IN LPWSTR *lpFullEnv); +CreateUserEnvironment(IN PWLSESSION Session); /* sas.c */ BOOL

1 0

[janderwald] 47197: [PORTCLS] - Don't request initializing delayed service request as this is the task of the miniport driver - Reimplement the service group object: - Use the initialized timer object when RequestService is called - Fix possible race conditions when adding / removing a service sink by protecting it with a lock - Acquire the service group list lock when executing the shared dpc routine
by janderwald＠svn.reactos.org 14 May '10

14 May '10

Author: janderwald Date: Fri May 14 17:47:00 2010 New Revision: 47197 URL: http://svn.reactos.org/svn/reactos?rev=47197&view=rev Log: [PORTCLS] - Don't request initializing delayed service request as this is the task of the miniport driver - Reimplement the service group object: - Use the initialized timer object when RequestService is called - Fix possible race conditions when adding / removing a service sink by protecting it with a lock - Acquire the service group list lock when executing the shared dpc routine Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp [iso-8859-1] Fri May 14 17:47:00 2010 @@ -602,7 +602,6 @@ DPRINT("Failed to add pin to service group\n"); return Status; } - m_ServiceGroup->SupportDelayedService(); } Status = m_IrpQueue->Init(ConnectDetails, 0, 0, NULL); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Fri May 14 17:47:00 2010 @@ -1213,7 +1213,6 @@ return Status; } - m_ServiceGroup->SupportDelayedService(); m_Stream->SetState(KSSTATE_STOP); m_State = KSSTATE_STOP; m_CommonBufferOffset = 0; @@ -1224,6 +1223,8 @@ m_Delay = Int32x32To64(10, -10000); Status = m_Stream->SetNotificationFreq(10, &m_FrameSize); + PC_ASSERT(NT_SUCCESS(Status)); + PC_ASSERT(m_FrameSize); SilenceBuffer = AllocateItem(NonPagedPool, m_FrameSize, TAG_PORTCLASS); if (!SilenceBuffer) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] Fri May 14 17:47:00 2010 @@ -815,7 +815,6 @@ DPRINT("Failed to add pin to service group\n"); return Status; } - m_ServiceGroup->SupportDelayedService(); } // delay of 10 milisec Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp [iso-8859-1] Fri May 14 17:47:00 2010 @@ -54,12 +54,10 @@ LIST_ENTRY m_ServiceSinkHead; - BOOL m_Initialized; - BOOL m_TimerActive; + BOOL m_TimerInitialized; KTIMER m_Timer; KDPC m_Dpc; - KEVENT m_Event; - LONG m_ThreadActive; + KSPIN_LOCK m_Lock; friend VOID NTAPI IServiceGroupDpc(IN struct _KDPC *Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); @@ -105,9 +103,16 @@ CServiceGroup::CServiceGroup(IUnknown * OuterUnknown) { + // initialize dpc KeInitializeDpc(&m_Dpc, IServiceGroupDpc, (PVOID)this); + + // set highest importance KeSetImportanceDpc(&m_Dpc, HighImportance); - KeInitializeEvent(&m_Event, NotificationEvent, FALSE); + + // initialize service group list lock + KeInitializeSpinLock(&m_Lock); + + // initialize service group list InitializeListHead(&m_ServiceSinkHead); } @@ -119,15 +124,34 @@ DPRINT("CServiceGroup::RequestService() Dpc at Level %u\n", KeGetCurrentIrql()); - if (KeGetCurrentIrql() > DISPATCH_LEVEL) - { - KeInsertQueueDpc(&m_Dpc, NULL, NULL); - return; - } - - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - KeInsertQueueDpc(&m_Dpc, NULL, NULL); - KeLowerIrql(OldIrql); + if (m_TimerInitialized) + { + LARGE_INTEGER DueTime; + + // no due time + DueTime.QuadPart = 0LL; + + // delayed service requested + KeSetTimer(&m_Timer, DueTime, &m_Dpc); + } + else + { + // check curent irql + if (KeGetCurrentIrql() > DISPATCH_LEVEL) + { + //insert dpc to queue + KeInsertQueueDpc(&m_Dpc, NULL, NULL); + } + else + { + // raise irql to dispatch level to make dpc fire immediately + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + // insert dpc to queue + KeInsertQueueDpc(&m_Dpc, NULL, NULL); + // lower irql to old level + KeLowerIrql(OldIrql); + } + } } //--------------------------------------------------------------- @@ -140,17 +164,32 @@ IN PSERVICESINK pServiceSink) { PGROUP_ENTRY Entry; - + KIRQL OldLevel; + + // sanity check PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + // allocate service sink entry Entry = (PGROUP_ENTRY)AllocateItem(NonPagedPool, sizeof(GROUP_ENTRY), TAG_PORTCLASS); if (!Entry) + { + // out of memory return STATUS_INSUFFICIENT_RESOURCES; - + } + + // initialize service sink entry Entry->pServiceSink = pServiceSink; + // increment reference count pServiceSink->AddRef(); + // acquire service group list lock + KeAcquireSpinLock(&m_Lock, &OldLevel); + + // insert into service sink list InsertTailList(&m_ServiceSinkHead, &Entry->Entry); + + // release service group list lock + KeReleaseSpinLock(&m_Lock, OldLevel); return STATUS_SUCCESS; } @@ -162,22 +201,44 @@ { PLIST_ENTRY CurEntry; PGROUP_ENTRY Entry; - + KIRQL OldLevel; + + // sanity check PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + // acquire service group list lock + KeAcquireSpinLock(&m_Lock, &OldLevel); + + // grab first entry CurEntry = m_ServiceSinkHead.Flink; + + // loop list until the passed entry is found while (CurEntry != &m_ServiceSinkHead) { + // grab entry Entry = CONTAINING_RECORD(CurEntry, GROUP_ENTRY, Entry); + + // check if it matches the passed entry if (Entry->pServiceSink == pServiceSink) { + // remove entry from list RemoveEntryList(&Entry->Entry); + + // release service sink reference pServiceSink->Release(); + + // free service sink entry FreeItem(Entry, TAG_PORTCLASS); - return; + + // leave loop + break; } + // move to next entry CurEntry = CurEntry->Flink; } + + // release service group list lock + KeReleaseSpinLock(&m_Lock, OldLevel); } @@ -194,73 +255,40 @@ PGROUP_ENTRY Entry; CServiceGroup * This = (CServiceGroup*)DeferredContext; + // acquire service group list lock + KeAcquireSpinLockAtDpcLevel(&This->m_Lock); + + // grab first entry CurEntry = This->m_ServiceSinkHead.Flink; + + // loop the list and call the attached service sink/group while (CurEntry != &This->m_ServiceSinkHead) { + //grab current entry Entry = (PGROUP_ENTRY)CONTAINING_RECORD(CurEntry, GROUP_ENTRY, Entry); + + // call service sink/group Entry->pServiceSink->RequestService(); + + // move to next entry CurEntry = CurEntry->Flink; } -} - - -#if 0 -VOID -NTAPI -ServiceGroupThread(IN PVOID StartContext) -{ - NTSTATUS Status; - KWAIT_BLOCK WaitBlockArray[2]; - PVOID WaitObjects[2]; - CServiceGroup * This = (CServiceGroup*)StartContext; - - // Set thread state - InterlockedIncrement(&This->m_ThreadActive); - - // Setup the wait objects - WaitObjects[0] = &m_Timer; - WaitObjects[1] = &m_Event; - - do - { - // Wait on our objects - Status = KeWaitForMultipleObjects(2, WaitObjects, WaitAny, Executive, KernelMode, FALSE, NULL, WaitBlockArray); - - switch(Status) - { - case STATUS_WAIT_0: - IServiceGroupDpc(&This->m_Dpc, (PVOID)This, NULL, NULL); - break; - case STATUS_WAIT_1: - PsTerminateSystemThread(STATUS_SUCCESS); - return; - } - }while(TRUE); -} - -#endif + + // release service group list lock + KeReleaseSpinLockFromDpcLevel(&This->m_Lock); +} + VOID NTAPI CServiceGroup::SupportDelayedService() { - //NTSTATUS Status; - //HANDLE ThreadHandle; - PC_ASSERT_IRQL(DISPATCH_LEVEL); - if (m_Initialized) - return; - - KeInitializeTimerEx(&m_Timer, NotificationTimer); - -#if 0 - Status = PsCreateSystemThread(&ThreadHandle, THREAD_ALL_ACCESS, NULL, 0, NULL, ServiceGroupThread, (PVOID)This); - if (NT_SUCCESS(Status)) - { - ZwClose(ThreadHandle); - m_Initialized = TRUE; - } -#endif + // initialize the timer + KeInitializeTimer(&m_Timer); + + // use the timer to perform service requests + m_TimerInitialized = TRUE; } VOID @@ -270,17 +298,14 @@ { LARGE_INTEGER DueTime; + // sanity check PC_ASSERT_IRQL(DISPATCH_LEVEL); + PC_ASSERT(m_TimerInitialized); DueTime.QuadPart = ullDelay; - if (m_Initialized) - { - if (KeGetCurrentIrql() <= DISPATCH_LEVEL) - KeSetTimer(&m_Timer, DueTime, &m_Dpc); - else - KeInsertQueueDpc(&m_Dpc, NULL, NULL); - } + // set the timer + KeSetTimer(&m_Timer, DueTime, &m_Dpc); } VOID @@ -288,11 +313,10 @@ CServiceGroup::CancelDelayedService() { PC_ASSERT_IRQL(DISPATCH_LEVEL); - - if (m_Initialized) - { - KeCancelTimer(&m_Timer); - } + PC_ASSERT(m_TimerInitialized); + + // cancel the timer + KeCancelTimer(&m_Timer); } NTSTATUS @@ -303,19 +327,31 @@ { CServiceGroup * This; NTSTATUS Status; + DPRINT("PcNewServiceGroup entered\n"); + //FIXME support aggregation + PC_ASSERT(OuterUnknown == NULL); + + // allocate a service group object This = new(NonPagedPool, TAG_PORTCLASS)CServiceGroup(OuterUnknown); + if (!This) + { + // out of memory return STATUS_INSUFFICIENT_RESOURCES; - + } + + // request IServiceSink interface Status = This->QueryInterface(IID_IServiceSink, (PVOID*)OutServiceGroup); if (!NT_SUCCESS(Status)) { + // failed to acquire service sink interface delete This; return Status; } + // done return Status; }

1 0

[akhaldi] 47196: [INTRIN_ARM] - Implement __yield and __break arm intrinsics. [DDK] - Relax INTERLOCKED_RESULT conditional definition. [PSDK] - Fix some nasty structure misalignments. - Fix YieldProcessor definition for ARM. [ARMDDK] - Add several missing definitions.
by akhaldi＠svn.reactos.org 14 May '10

14 May '10

Author: akhaldi Date: Fri May 14 13:45:14 2010 New Revision: 47196 URL: http://svn.reactos.org/svn/reactos?rev=47196&view=rev Log: [INTRIN_ARM] - Implement __yield and __break arm intrinsics. [DDK] - Relax INTERLOCKED_RESULT conditional definition. [PSDK] - Fix some nasty structure misalignments. - Fix YieldProcessor definition for ARM. [ARMDDK] - Add several missing definitions. Modified: branches/header-work/include/crt/mingw32/intrin_arm.h branches/header-work/include/ddk/ntddk.h branches/header-work/include/psdk/winnt.h branches/header-work/include/reactos/arm/armddk.h Modified: branches/header-work/include/crt/mingw32/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/crt/mingw32… ============================================================================== --- branches/header-work/include/crt/mingw32/intrin_arm.h [iso-8859-1] (original) +++ branches/header-work/include/crt/mingw32/intrin_arm.h [iso-8859-1] Fri May 14 13:45:14 2010 @@ -34,6 +34,10 @@ #define _ReturnAddress() (__builtin_return_address(0)) #define _ReadWriteBarrier() __sync_synchronize() + +__INTRIN_INLINE void __yield(void) { __asm__ __volatile__("yield"); } + +__INTRIN_INLINE void __break(unsigned int value) { __asm__ __volatile__("bkpt %0": : "M" (value)); } __INTRIN_INLINE unsigned short _byteswap_ushort(unsigned short value) { Modified: branches/header-work/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h… ============================================================================== --- branches/header-work/include/ddk/ntddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntddk.h [iso-8859-1] Fri May 14 13:45:14 2010 @@ -3289,13 +3289,11 @@ #define RESULT_POSITIVE 2 #endif -#if defined(_X86_) || defined(_IA64_) || defined(_M_AMD64) && !defined(RC_INVOKED) && !defined(MIDL_PASS) typedef enum _INTERLOCKED_RESULT { ResultNegative = RESULT_NEGATIVE, ResultZero = RESULT_ZERO, ResultPositive = RESULT_POSITIVE } INTERLOCKED_RESULT; -#endif #ifdef _X86_ Modified: branches/header-work/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winnt.… ============================================================================== --- branches/header-work/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/winnt.h [iso-8859-1] Fri May 14 13:45:14 2010 @@ -3760,6 +3760,7 @@ } IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; #include <pshpack2.h> + typedef struct _IMAGE_SYMBOL { union { BYTE ShortName[8]; @@ -3818,6 +3819,17 @@ } Section; } IMAGE_AUX_SYMBOL,*PIMAGE_AUX_SYMBOL; +typedef struct _IMAGE_RELOCATION { + _ANONYMOUS_UNION union { + DWORD VirtualAddress; + DWORD RelocCount; + } DUMMYUNIONNAME; + DWORD SymbolTableIndex; + WORD Type; +} IMAGE_RELOCATION,*PIMAGE_RELOCATION; + +#include <poppack.h> + #ifndef __IMAGE_COR20_HEADER_DEFINED__ #define __IMAGE_COR20_HEADER_DEFINED__ @@ -3884,16 +3896,6 @@ DWORD RvaToFirstByteOfData; DWORD RvaToLastByteOfData; } IMAGE_COFF_SYMBOLS_HEADER,*PIMAGE_COFF_SYMBOLS_HEADER; - -typedef struct _IMAGE_RELOCATION { - _ANONYMOUS_UNION union { - DWORD VirtualAddress; - DWORD RelocCount; - } DUMMYUNIONNAME; - DWORD SymbolTableIndex; - WORD Type; -} IMAGE_RELOCATION,*PIMAGE_RELOCATION; -#include <poppack.h> typedef struct _IMAGE_BASE_RELOCATION { DWORD VirtualAddress; @@ -5081,7 +5083,7 @@ #elif defined(_M_MIPS) #define YieldProcessor() __asm__ __volatile__("nop"); #elif defined(_M_ARM) -#define YieldProcessor() +#define YieldProcessor __yield #else #error Unknown architecture #endif Modified: branches/header-work/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/arm… ============================================================================== --- branches/header-work/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ branches/header-work/include/reactos/arm/armddk.h [iso-8859-1] Fri May 14 13:45:14 2010 @@ -189,6 +189,36 @@ NTAPI KeGetCurrentThread(VOID); +extern volatile struct _KSYSTEM_TIME KeTickCount; + +#ifndef YieldProcessor +#define YieldProcessor __yield +#endif + +#define ASSERT_BREAKPOINT BREAKPOINT_COMMAND_STRING + 1 + +#define DbgRaiseAssertionFailure() __break(ASSERT_BREAKPOINT) + +#define PCR_MINOR_VERSION 1 +#define PCR_MAJOR_VERSION 1 + +#define RESULT_ZERO 0 +#define RESULT_NEGATIVE 1 +#define RESULT_POSITIVE 2 + +DECLSPEC_IMPORT +VOID +__fastcall +KfReleaseSpinLock( + IN OUT ULONG_PTR* SpinLock, + IN KIRQL NewIrql); + +DECLSPEC_IMPORT +KIRQL +__fastcall +KfAcquireSpinLock( + IN OUT ULONG_PTR* SpinLock); + #ifndef _WINNT_H // // IRQL Support on ARM is similar to MIPS/ALPHA

1 0

[cgutman] 47195: [IPHLPAPI] - Implement GetAdaptersAddresses - Fixes the last iphlpapi winetest
by cgutman＠svn.reactos.org 14 May '10

14 May '10

Author: cgutman Date: Fri May 14 03:30:37 2010 New Revision: 47195 URL: http://svn.reactos.org/svn/reactos?rev=47195&view=rev Log: [IPHLPAPI] - Implement GetAdaptersAddresses - Fixes the last iphlpapi winetest Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Fri May 14 03:30:37 2010 @@ -2301,17 +2301,196 @@ } /* - * @unimplemented + * @implemented */ DWORD WINAPI GetAdaptersAddresses(ULONG Family,ULONG Flags,PVOID Reserved,PIP_ADAPTER_ADDRESSES pAdapterAddresses,PULONG pOutBufLen) { + InterfaceIndexTable *indexTable; + IFInfo ifInfo; + int i; + ULONG ret, requiredSize = 0; + PIP_ADAPTER_ADDRESSES currentAddress; + PUCHAR currentLocation; + HANDLE tcpFile; + if (!pOutBufLen) return ERROR_INVALID_PARAMETER; - if (!pAdapterAddresses || *pOutBufLen == 0) - return ERROR_BUFFER_OVERFLOW; if (Reserved) return ERROR_INVALID_PARAMETER; - FIXME(":stub\n"); - return ERROR_NO_DATA; + indexTable = getNonLoopbackInterfaceIndexTable(); //I think we want non-loopback here + if (!indexTable) + return ERROR_NOT_ENOUGH_MEMORY; + + ret = openTcpFile(&tcpFile); + if (!NT_SUCCESS(ret)) + return ERROR_NO_DATA; + + for (i = indexTable->numIndexes; i >= 0; i--) + { + if (NT_SUCCESS(getIPAddrEntryForIf(tcpFile, + NULL, + indexTable->indexes[i], + &ifInfo))) + { + /* The whole struct */ + requiredSize += sizeof(IP_ADAPTER_ADDRESSES); + + /* Friendly name */ + if (!(Flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) + requiredSize += strlen((char *)ifInfo.if_info.ent.if_descr) + 1; //FIXME + + /* Adapter name */ + requiredSize += strlen((char *)ifInfo.if_info.ent.if_descr) + 1; + + /* Unicast address */ + if (!(Flags & GAA_FLAG_SKIP_UNICAST)) + requiredSize += sizeof(IP_ADAPTER_UNICAST_ADDRESS); + + /* FIXME: Implement multicast, anycast, and dns server stuff */ + + /* FIXME: Implement dns suffix and description */ + requiredSize += 2 * sizeof(WCHAR); + + /* We're only going to implement what's required for XP SP0 */ + } + } + + if (*pOutBufLen < requiredSize) + { + *pOutBufLen = requiredSize; + closeTcpFile(tcpFile); + free(indexTable); + return ERROR_BUFFER_OVERFLOW; + } + + RtlZeroMemory(pAdapterAddresses, requiredSize); + + /* Let's set up the pointers */ + currentAddress = pAdapterAddresses; + for (i = indexTable->numIndexes; i >= 0; i--) + { + if (NT_SUCCESS(getIPAddrEntryForIf(tcpFile, + NULL, + indexTable->indexes[i], + &ifInfo))) + { + currentLocation = (PUCHAR)currentAddress + (ULONG_PTR)sizeof(IP_ADAPTER_ADDRESSES); + + /* FIXME: Friendly name */ + if (!(Flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) + { + currentAddress->FriendlyName = (PVOID)currentLocation; + currentLocation += sizeof(WCHAR); + } + + /* Adapter name */ + currentAddress->AdapterName = (PVOID)currentLocation; + currentLocation += strlen((char *)ifInfo.if_info.ent.if_descr) + 1; + + /* Unicast address */ + if (!(Flags & GAA_FLAG_SKIP_UNICAST)) + { + currentAddress->FirstUnicastAddress = (PVOID)currentLocation; + currentLocation += sizeof(IP_ADAPTER_UNICAST_ADDRESS); + currentAddress->FirstUnicastAddress->Address.lpSockaddr = (PVOID)currentLocation; + currentLocation += sizeof(struct sockaddr); + } + + /* FIXME: Implement multicast, anycast, and dns server stuff */ + + /* FIXME: Implement dns suffix and description */ + currentAddress->DnsSuffix = (PVOID)currentLocation; + currentLocation += sizeof(WCHAR); + + currentAddress->Description = (PVOID)currentLocation; + currentLocation += sizeof(WCHAR); + + currentAddress->Next = (PVOID)currentLocation; + + /* We're only going to implement what's required for XP SP0 */ + + currentAddress = currentAddress->Next; + } + } + + /* Terminate the last address correctly */ + if (currentAddress) + currentAddress->Next = NULL; + + /* Now again, for real this time */ + + currentAddress = pAdapterAddresses; + for (i = indexTable->numIndexes; i >= 0; i--) + { + if (NT_SUCCESS(getIPAddrEntryForIf(tcpFile, + NULL, + indexTable->indexes[i], + &ifInfo))) + { + /* Make sure we're not looping more than we hoped for */ + ASSERT(currentAddress); + + /* Alignment information */ + currentAddress->Length = sizeof(IP_ADAPTER_ADDRESSES); + currentAddress->IfIndex = indexTable->indexes[i]; + + /* Adapter name */ + strcpy(currentAddress->AdapterName, (char *)ifInfo.if_info.ent.if_descr); + + if (!(Flags & GAA_FLAG_SKIP_UNICAST)) + { + currentAddress->FirstUnicastAddress->Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); + currentAddress->FirstUnicastAddress->Flags = 0; //FIXME + currentAddress->FirstUnicastAddress->Next = NULL; //FIXME: Support more than one address per adapter + currentAddress->FirstUnicastAddress->Address.lpSockaddr->sa_family = AF_INET; + memcpy(currentAddress->FirstUnicastAddress->Address.lpSockaddr->sa_data, + &ifInfo.ip_addr.iae_addr, + sizeof(ifInfo.ip_addr.iae_addr)); + currentAddress->FirstUnicastAddress->Address.iSockaddrLength = sizeof(ifInfo.ip_addr.iae_addr) + sizeof(USHORT); + currentAddress->FirstUnicastAddress->PrefixOrigin = IpPrefixOriginOther; //FIXME + currentAddress->FirstUnicastAddress->SuffixOrigin = IpPrefixOriginOther; //FIXME + currentAddress->FirstUnicastAddress->DadState = IpDadStatePreferred; //FIXME + currentAddress->FirstUnicastAddress->ValidLifetime = 0xFFFFFFFF; //FIXME + currentAddress->FirstUnicastAddress->PreferredLifetime = 0xFFFFFFFF; //FIXME + currentAddress->FirstUnicastAddress->LeaseLifetime = 0xFFFFFFFF; //FIXME + } + + /* FIXME: Implement multicast, anycast, and dns server stuff */ + currentAddress->FirstAnycastAddress = NULL; + currentAddress->FirstMulticastAddress = NULL; + currentAddress->FirstDnsServerAddress = NULL; + + /* FIXME: Implement dns suffix, description, and friendly name */ + currentAddress->DnsSuffix[0] = UNICODE_NULL; + currentAddress->Description[0] = UNICODE_NULL; + currentAddress->FriendlyName[0] = UNICODE_NULL; + + /* Physical Address */ + memcpy(currentAddress->PhysicalAddress, ifInfo.if_info.ent.if_physaddr, ifInfo.if_info.ent.if_physaddrlen); + currentAddress->PhysicalAddressLength = ifInfo.if_info.ent.if_physaddrlen; + + /* Flags */ + currentAddress->Flags = 0; //FIXME + + /* MTU */ + currentAddress->Mtu = ifInfo.if_info.ent.if_mtu; + + /* Interface type */ + currentAddress->IfType = ifInfo.if_info.ent.if_type; + + /* Operational status */ + currentAddress->OperStatus = ifInfo.if_info.ent.if_operstatus; + + /* We're only going to implement what's required for XP SP0 */ + + /* Move to the next address */ + currentAddress = currentAddress->Next; + } + } + + closeTcpFile(tcpFile); + free(indexTable); + + return NO_ERROR; } /* Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Fri May 14 03:30:37 2010 @@ -59,6 +59,15 @@ #define TCP_REQUEST_QUERY_INFORMATION_INIT { { { 0 } } } #define TCP_REQUEST_SET_INFORMATION_INIT { { 0 } } + +/* FIXME: ROS headers suck */ +#ifndef GAA_FLAG_SKIP_UNICAST +#define GAA_FLAG_SKIP_UNICAST 0x0001 +#endif + +#ifndef GAA_FLAG_SKIP_FRIENDLY_NAME +#define GAA_FLAG_SKIP_FRIENDLY_NAME 0x0020 +#endif // As in the mib from RFC 1213 @@ -138,6 +147,10 @@ PWCHAR NameServer, PVOID Data ); void EnumNameServers( HANDLE RegHandle, PWCHAR Interface, PVOID Data, EnumNameServersFunc cb ); +NTSTATUS getIPAddrEntryForIf(HANDLE tcpFile, + char *name, + DWORD index, + IFInfo *ifInfo); #include <w32api.h> /* This is here until we switch to version 2.5 of the mingw headers */

1 0

[ekohl] 47194: [USERENV] CreateEnvironmentBlock: Also add the volatile environment values to the users environment block.
by ekohl＠svn.reactos.org 13 May '10

13 May '10

Author: ekohl Date: Thu May 13 22:38:16 2010 New Revision: 47194 URL: http://svn.reactos.org/svn/reactos?rev=47194&view=rev Log: [USERENV] CreateEnvironmentBlock: Also add the volatile environment values to the users environment block. Modified: trunk/reactos/dll/win32/userenv/environment.c Modified: trunk/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environm… ============================================================================== --- trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] Thu May 13 22:38:16 2010 @@ -439,12 +439,15 @@ FALSE); } - - /* Set user environment variables */ SetUserEnvironment(lpEnvironment, hKeyUser, L"Environment"); + + /* Set user volatile environment variables */ + SetUserEnvironment(lpEnvironment, + hKeyUser, + L"Volatile Environment"); RegCloseKey(hKeyUser);

1 0

[cgutman] 47193: [REACTOS.DFF] - Add usbohci.sys, usbuhci.sys, usbport.sys, usbd.sys, and usbstor.sys to bootcd - Remove usbdriver.sys from bootcd
by cgutman＠svn.reactos.org 13 May '10

13 May '10

Author: cgutman Date: Thu May 13 04:49:14 2010 New Revision: 47193 URL: http://svn.reactos.org/svn/reactos?rev=47193&view=rev Log: [REACTOS.DFF] - Add usbohci.sys, usbuhci.sys, usbport.sys, usbd.sys, and usbstor.sys to bootcd - Remove usbdriver.sys from bootcd Modified: branches/aicom-hardware-fun/boot/bootdata/packages/reactos.dff Modified: branches/aicom-hardware-fun/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/boot/bootdat… ============================================================================== --- branches/aicom-hardware-fun/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/aicom-hardware-fun/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu May 13 04:49:14 2010 @@ -520,11 +520,12 @@ drivers\storage\ide\pciide\pciide.sys 2 drivers\storage\ide\pciidex\pciidex.sys 2 -;drivers\usb\miniport\usbohci\usbohci.sys 2 -;drivers\usb\miniport\usbuhci\usbuhci.sys 2 -;drivers\usb\usbhub\usbhub.sys 2 -;drivers\usb\usbport\usbport.sys 2 -drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 +drivers\usb\usbd\usbd.sys 2 +drivers\usb\miniport\usbohci\usbohci.sys 2 +drivers\usb\miniport\usbuhci\usbuhci.sys 2 +drivers\usb\usbhub\usbhub.sys 2 +drivers\usb\usbport\usbport.sys 2 +drivers\usb\usbstor\usbstor.sys 2 drivers\video\displays\vga\vgaddi.dll 1 drivers\video\displays\framebuf\framebuf.dll 1

1 0

[cgutman] 47192: [USBD] - Fix usbd build and enable it
by cgutman＠svn.reactos.org 13 May '10

13 May '10

Author: cgutman Date: Thu May 13 04:47:35 2010 New Revision: 47192 URL: http://svn.reactos.org/svn/reactos?rev=47192&view=rev Log: [USBD] - Fix usbd build and enable it Modified: branches/aicom-hardware-fun/drivers/usb/directory.rbuild branches/aicom-hardware-fun/drivers/usb/usbd/usbd.c branches/aicom-hardware-fun/drivers/usb/usbd/usbd.spec Modified: branches/aicom-hardware-fun/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… ============================================================================== --- branches/aicom-hardware-fun/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ branches/aicom-hardware-fun/drivers/usb/directory.rbuild [iso-8859-1] Thu May 13 04:47:35 2010 @@ -7,9 +7,9 @@ <directory name="nt4compat"> <xi:include href="nt4compat/directory.rbuild" /> </directory> -  + </directory> <directory name="usbhub"> <xi:include href="usbhub/usbhub.rbuild" /> </directory> Modified: branches/aicom-hardware-fun/drivers/usb/usbd/usbd.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… ============================================================================== --- branches/aicom-hardware-fun/drivers/usb/usbd/usbd.c [iso-8859-1] (original) +++ branches/aicom-hardware-fun/drivers/usb/usbd/usbd.c [iso-8859-1] Thu May 13 04:47:35 2010 @@ -51,26 +51,8 @@ /* * @implemented */ -DWORD NTAPI -DllInitialize(DWORD Unknown) -{ - return 0; -} - -/* - * @implemented - */ -DWORD NTAPI -DllUnload(VOID) -{ - return 0; -} - -/* - * @implemented - */ PVOID NTAPI -USBD_Debug_GetHeap(DWORD Unknown1, POOL_TYPE PoolType, ULONG NumberOfBytes, +USBD_Debug_GetHeap(ULONG Unknown1, POOL_TYPE PoolType, ULONG NumberOfBytes, ULONG Tag) { return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); @@ -80,7 +62,7 @@ * @implemented */ VOID NTAPI -USBD_Debug_RetHeap(PVOID Heap, DWORD Unknown2, DWORD Unknown3) +USBD_Debug_RetHeap(PVOID Heap, ULONG Unknown2, ULONG Unknown3) { ExFreePool(Heap); } @@ -98,7 +80,7 @@ * @implemented */ PVOID NTAPI -USBD_AllocateDeviceName(DWORD Unknown) +USBD_AllocateDeviceName(ULONG Unknown) { return NULL; } @@ -106,20 +88,20 @@ /* * @implemented */ -DWORD NTAPI +ULONG NTAPI USBD_CalculateUsbBandwidth( ULONG MaxPacketSize, UCHAR EndpointType, BOOLEAN LowSpeed ) { - DWORD OverheadTable[] = { + ULONG OverheadTable[] = { 0x00, /* UsbdPipeTypeControl */ 0x09, /* UsbdPipeTypeIsochronous */ 0x00, /* UsbdPipeTypeBulk */ 0x0d /* UsbdPipeTypeInterrupt */ }; - DWORD Result; + ULONG Result; if (OverheadTable[EndpointType] != 0) { @@ -134,8 +116,8 @@ /* * @implemented */ -DWORD NTAPI -USBD_Dispatch(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, DWORD Unknown4) +ULONG NTAPI +USBD_Dispatch(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3, ULONG Unknown4) { return 1; } @@ -167,8 +149,8 @@ /* * @implemented */ -DWORD NTAPI -USBD_GetSuspendPowerState(DWORD Unknown1) +ULONG NTAPI +USBD_GetSuspendPowerState(ULONG Unknown1) { return 0; } @@ -177,56 +159,56 @@ * @implemented */ NTSTATUS NTAPI -USBD_InitializeDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, - DWORD Unknown4, DWORD Unknown5, DWORD Unknown6) -{ - return STATUS_NOT_SUPPORTED; -} - -/* - * @implemented - */ -NTSTATUS NTAPI -USBD_RegisterHostController(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, - DWORD Unknown4, DWORD Unknown5, DWORD Unknown6, DWORD Unknown7, - DWORD Unknown8, DWORD Unknown9, DWORD Unknown10) -{ - return STATUS_NOT_SUPPORTED; -} - -/* - * @implemented - */ -NTSTATUS NTAPI -USBD_GetDeviceInformation(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) -{ - return STATUS_NOT_SUPPORTED; -} - -/* - * @implemented - */ -NTSTATUS NTAPI -USBD_CreateDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, - DWORD Unknown4, DWORD Unknown5) -{ - return STATUS_NOT_SUPPORTED; -} - -/* - * @implemented - */ -NTSTATUS NTAPI -USBD_RemoveDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) -{ - return STATUS_NOT_SUPPORTED; -} - -/* - * @implemented - */ -VOID NTAPI -USBD_CompleteRequest(DWORD Unknown1, DWORD Unknown2) +USBD_InitializeDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3, + ULONG Unknown4, ULONG Unknown5, ULONG Unknown6) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +NTSTATUS NTAPI +USBD_RegisterHostController(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3, + ULONG Unknown4, ULONG Unknown5, ULONG Unknown6, ULONG Unknown7, + ULONG Unknown8, ULONG Unknown9, ULONG Unknown10) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +NTSTATUS NTAPI +USBD_GetDeviceInformation(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +NTSTATUS NTAPI +USBD_CreateDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3, + ULONG Unknown4, ULONG Unknown5) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +NTSTATUS NTAPI +USBD_RemoveDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +VOID NTAPI +USBD_CompleteRequest(ULONG Unknown1, ULONG Unknown2) { } @@ -245,15 +227,15 @@ * @implemented */ VOID NTAPI -USBD_SetSuspendPowerState(DWORD Unknown1, DWORD Unknown2) -{ -} - -/* - * @implemented - */ -NTSTATUS NTAPI -USBD_MakePdoName(DWORD Unknown1, DWORD Unknown2) +USBD_SetSuspendPowerState(ULONG Unknown1, ULONG Unknown2) +{ +} + +/* + * @implemented + */ +NTSTATUS NTAPI +USBD_MakePdoName(ULONG Unknown1, ULONG Unknown2) { return STATUS_NOT_SUPPORTED; } @@ -289,17 +271,17 @@ * @implemented */ NTSTATUS NTAPI -USBD_RestoreDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) -{ - return STATUS_NOT_SUPPORTED; -} - -/* - * @implemented - */ -VOID NTAPI -USBD_RegisterHcDeviceCapabilities(DWORD Unknown1, DWORD Unknown2, - DWORD Unknown3) +USBD_RestoreDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +VOID NTAPI +USBD_RegisterHcDeviceCapabilities(ULONG Unknown1, ULONG Unknown2, + ULONG Unknown3) { } @@ -315,8 +297,8 @@ ) { PURB Urb; - DWORD UrbSize; - DWORD InterfaceCount; + ULONG UrbSize; + ULONG InterfaceCount; for (InterfaceCount = 0; InterfaceList[InterfaceCount].InterfaceDescriptor != NULL; @@ -363,7 +345,7 @@ { ULONG_PTR Current; PUSB_INTERFACE_DESCRIPTOR CurrentDescriptor = InterfaceDescriptor; - DWORD Length = CurrentDescriptor->bLength; + ULONG Length = CurrentDescriptor->bLength; // USB_ENDPOINT_DESCRIPTOR_TYPE if (CurrentDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) @@ -478,7 +460,7 @@ /* * @implemented */ -DWORD NTAPI +ULONG NTAPI USBD_GetPdoRegistryParameter( PDEVICE_OBJECT PhysicalDeviceObject, PVOID Parameter, Modified: branches/aicom-hardware-fun/drivers/usb/usbd/usbd.spec URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… ============================================================================== --- branches/aicom-hardware-fun/drivers/usb/usbd/usbd.spec [iso-8859-1] (original) +++ branches/aicom-hardware-fun/drivers/usb/usbd/usbd.spec [iso-8859-1] Thu May 13 04:47:35 2010 @@ -1,9 +1,9 @@ -USBD_Debug_GetHeap(long long long long) -USBD_Debug_RetHeap(ptr long long) -USBD_CalculateUsbBandwidth(long long long) -USBD_CreateConfigurationRequestEx(ptr ptr) -USBD_CreateConfigurationRequest(ptr ptr) -USBD_GetInterfaceLength(ptr ptr) -USBD_ParseConfigurationDescriptorEx(ptr ptr long long long long long) -USBD_ParseDescriptors(ptr long ptr long) -;USBD_GetPdoRegistryParameters +@ stdcall USBD_Debug_GetHeap(long long long long) +@ stdcall USBD_Debug_RetHeap(ptr long long) +@ stdcall USBD_CalculateUsbBandwidth(long long long) +@ stdcall USBD_CreateConfigurationRequestEx(ptr ptr) +@ stdcall USBD_CreateConfigurationRequest(ptr ptr) +@ stdcall USBD_GetInterfaceLength(ptr ptr) +@ stdcall USBD_ParseConfigurationDescriptorEx(ptr ptr long long long long long) +@ stdcall USBD_ParseDescriptors(ptr long ptr long) +@ stdcall USBD_GetPdoRegistryParameter(ptr ptr long ptr long)

1 0

[cgutman] 47191: [USB] - Add the cromwell stack that was removed previously - Needed some simple changes to make it build (STDCALL -> NTAPI, debug.h after ntddk.h, etc) - This is completely untested; all that I know is that it builds
by cgutman＠svn.reactos.org 13 May '10

13 May '10

Author: cgutman Date: Thu May 13 04:19:45 2010 New Revision: 47191 URL: http://svn.reactos.org/svn/reactos?rev=47191&view=rev Log: [USB] - Add the cromwell stack that was removed previously - Needed some simple changes to make it build (STDCALL -> NTAPI, debug.h after ntddk.h, etc) - This is completely untested; all that I know is that it builds Added: branches/aicom-hardware-fun/drivers/usb/miniport/ branches/aicom-hardware-fun/drivers/usb/miniport/common/ branches/aicom-hardware-fun/drivers/usb/miniport/common/common.rbuild (with props) branches/aicom-hardware-fun/drivers/usb/miniport/common/fdo.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/common/main.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/common/misc.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/common/pdo.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/common/usbcommon.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/common/usbcommon_types.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/directory.rbuild (with props) branches/aicom-hardware-fun/drivers/usb/miniport/linux/ branches/aicom-hardware-fun/drivers/usb/miniport/linux/asm/ branches/aicom-hardware-fun/drivers/usb/miniport/linux/asm/bitops.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/linux/bitops.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/linux/boot.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/linux/consts.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/linux/cromwell_types.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/linux/errno.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/linux/linux_wrapper.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/linux/list.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/linux/pci_hal.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/linux/pci_ids.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/linux/usb.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/linux/usb_ch9.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/sys/ branches/aicom-hardware-fun/drivers/usb/miniport/sys/BootUSB.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/sys/linuxwrapper.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/sys/risefall.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/sys/ros_wrapper.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/sys/sys.rbuild (with props) branches/aicom-hardware-fun/drivers/usb/miniport/sys/usbkey.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/sys/usbwrapper.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/sys/xpad.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/sys/xremote.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usb_wrapper.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/makefile.crom (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci-dbg.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci-hcd.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci-hub.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci-mem.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci-pci.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci-q.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci.rc (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci_config.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/usbohci.rbuild (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/ branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci-debug.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci-hcd.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci-hcd.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci-hub.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci.c (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci.rc (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci_config.h (with props) branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/usbuhci.rbuild (with props) branches/aicom-hardware-fun/drivers/usb/usbport/ branches/aicom-hardware-fun/drivers/usb/usbport/buffer_simple.c (with props) branches/aicom-hardware-fun/drivers/usb/usbport/config.c (with props) branches/aicom-hardware-fun/drivers/usb/usbport/core_drivers/ branches/aicom-hardware-fun/drivers/usb/usbport/core_drivers/usbkey.c (with props) branches/aicom-hardware-fun/drivers/usb/usbport/core_drivers/usbmouse.c (with props) branches/aicom-hardware-fun/drivers/usb/usbport/hcd-pci.c (with props) branches/aicom-hardware-fun/drivers/usb/usbport/hcd.c (with props) branches/aicom-hardware-fun/drivers/usb/usbport/hcd.h (with props) branches/aicom-hardware-fun/drivers/usb/usbport/hub.c (with props) branches/aicom-hardware-fun/drivers/usb/usbport/hub.h (with props) branches/aicom-hardware-fun/drivers/usb/usbport/makefile.crom (with props) branches/aicom-hardware-fun/drivers/usb/usbport/message.c (with props) branches/aicom-hardware-fun/drivers/usb/usbport/urb.c (with props) branches/aicom-hardware-fun/drivers/usb/usbport/usb-debug.c (with props) branches/aicom-hardware-fun/drivers/usb/usbport/usb.c (with props) branches/aicom-hardware-fun/drivers/usb/usbport/usb.h (with props) branches/aicom-hardware-fun/drivers/usb/usbport/usbcore.c (with props) branches/aicom-hardware-fun/drivers/usb/usbport/usbcore.rc (with props) branches/aicom-hardware-fun/drivers/usb/usbport/usbport.def (with props) branches/aicom-hardware-fun/drivers/usb/usbport/usbport.rbuild (with props) Modified: branches/aicom-hardware-fun/drivers/usb/directory.rbuild branches/aicom-hardware-fun/drivers/usb/usbstor/usbstor.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/aicom-hardware-fun/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/common/common.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/common/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/common/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/common/misc.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/common/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/common/usbcommon.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/common/usbcommon_types.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/linux/asm/bitops.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/linux/bitops.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/linux/boot.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/linux/consts.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/linux/cromwell_types.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/linux/errno.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/linux/linux_wrapper.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/linux/list.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/linux/pci_hal.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/linux/pci_ids.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/linux/usb.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/linux/usb_ch9.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/sys/BootUSB.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/sys/linuxwrapper.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/sys/risefall.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/sys/ros_wrapper.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/sys/sys.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/sys/usbkey.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/sys/usbwrapper.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/sys/xpad.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/sys/xremote.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usb_wrapper.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/makefile.crom URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci-dbg.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci-hcd.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci-hub.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci-mem.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci-pci.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci-q.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci.rc URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/ohci_config.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbohci/usbohci.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci-debug.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci-hcd.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci-hcd.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci-hub.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci.rc URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/uhci_config.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/miniport/usbuhci/usbuhci.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/buffer_simple.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/config.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/core_drivers/usbkey.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/core_drivers/usbmouse.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/hcd-pci.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/hcd.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/hcd.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/hub.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/hub.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/makefile.crom URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/message.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/urb.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/usb-debug.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/usb.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/usb.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/usbcore.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/usbcore.rc URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/usbport.def URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Added: branches/aicom-hardware-fun/drivers/usb/usbport/usbport.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… Modified: branches/aicom-hardware-fun/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/…

1 0

[jgardou] 47190: [WIN32K] - Get rid of hDIBPalette in SURFACE structure This allows more code cleanness
by jgardou＠svn.reactos.org 12 May '10

12 May '10

Author: jgardou Date: Thu May 13 00:56:24 2010 New Revision: 47190 URL: http://svn.reactos.org/svn/reactos?rev=47190&view=rev Log: [WIN32K] - Get rid of hDIBPalette in SURFACE structure This allows more code cleanness Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Thu May 13 00:56:24 2010 @@ -35,11 +35,7 @@ pebo->psurfTrg = pdc->dclevel.pSurface; ASSERT(pebo->psurfTrg); - if (pebo->psurfTrg->hDIBPalette) - { - pebo->ppalSurf = PALETTE_ShareLockPalette(pebo->psurfTrg->hDIBPalette); - } - else if (pebo->psurfTrg->ppal) + if (pebo->psurfTrg->ppal) { pebo->ppalSurf = pebo->psurfTrg->ppal; GDIOBJ_IncrementShareCount(&pebo->ppalSurf->BaseObject); Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Thu May 13 00:56:24 2010 @@ -130,10 +130,6 @@ ExFreePool(psurf->SurfObj.pvBits); } - if (psurf->hDIBPalette != NULL) - { - GreDeleteObject(psurf->hDIBPalette); - } } /* Free palette */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Thu May 13 00:56:24 2010 @@ -618,11 +618,7 @@ return; } - if (psurfSrc->hDIBPalette) - { - ppalSrc = PALETTE_ShareLockPalette(psurfSrc->hDIBPalette); - } - else if (psurfSrc->ppal) + if (psurfSrc->ppal) { ppalSrc = psurfSrc->ppal; GDIOBJ_IncrementShareCount(&ppalSrc->BaseObject); @@ -633,11 +629,7 @@ if(!ppalSrc) return; - if (psurfDst->hDIBPalette) - { - ppalDst = PALETTE_ShareLockPalette(psurfDst->hDIBPalette); - } - else if (psurfDst->ppal) + if (psurfDst->ppal) { ppalDst = psurfDst->ppal; GDIOBJ_IncrementShareCount(&ppalDst->BaseObject); @@ -697,7 +689,7 @@ COLORREF crForegroundClr, COLORREF crBackgroundClr) { - PPALETTE ppalDst, ppalPattern; + PPALETTE ppalDst; SURFACE *psurfPattern; ASSERT(pexlo); @@ -707,11 +699,7 @@ EXLATEOBJ_vInitTrivial(pexlo); - if (psurfDst->hDIBPalette) - { - ppalDst = PALETTE_ShareLockPalette(psurfDst->hDIBPalette); - } - else if (psurfDst->ppal) + if (psurfDst->ppal) { ppalDst = psurfDst->ppal; GDIOBJ_IncrementShareCount(&ppalDst->BaseObject); @@ -766,11 +754,9 @@ else { /* Default: use the patterns' palette */ - ppalPattern = PALETTE_LockPalette(psurfPattern->hDIBPalette); - if (ppalPattern) - { - EXLATEOBJ_vInitialize(pexlo, &gpalRGB, ppalDst, 0, 0, 0); - PALETTE_UnlockPalette(ppalPattern); + if (psurfPattern->ppal) + { + EXLATEOBJ_vInitialize(pexlo, psurfPattern->ppal, ppalDst, 0, 0, 0); } } Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h [iso-8859-1] Thu May 13 00:56:24 2010 @@ -37,7 +37,6 @@ DWORD dwOffset; /* reactos specific */ - HPALETTE hDIBPalette; DWORD dsBitfields[3]; // hack, should probably use palette instead DWORD biClrUsed; DWORD biClrImportant; Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Thu May 13 00:56:24 2010 @@ -394,9 +394,7 @@ goto done; } - if (BitmapSrc->hDIBPalette) - PalSourceGDI = PALETTE_ShareLockPalette(BitmapSrc->hDIBPalette); - else if (BitmapSrc->ppal) + if (BitmapSrc->ppal) { GDIOBJ_IncrementShareCount(&BitmapSrc->ppal->BaseObject); PalSourceGDI = BitmapSrc->ppal ; Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Thu May 13 00:56:24 2010 @@ -219,14 +219,16 @@ { /* Copy the color table */ UINT Index; - PPALETTE PalGDI = PALETTE_LockPalette(psurf->hDIBPalette); - - if (!PalGDI) + PPALETTE PalGDI; + + if (!psurf->ppal) { ExFreePoolWithTag(bi, TAG_TEMP); SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } + + PalGDI = PALETTE_LockPalette(psurf->ppal->BaseObject.hHmgr); for (Index = 0; Index < 256 && Index < PalGDI->NumColors; @@ -363,9 +365,7 @@ if (psurf) { pso = &psurf->SurfObj; - if(psurf->hDIBPalette) - ppal = PALETTE_ShareLockPalette(psurf->hDIBPalette); - else if (psurf->ppal) + if (psurf->ppal) { ppal = psurf->ppal; GDIOBJ_IncrementShareCount(&ppal->BaseObject); @@ -881,9 +881,7 @@ ExFreePoolWithTag(buf,TAG_BITMAP); resBitmap->flFlags = Bitmap->flFlags; /* Copy palette */ - if(Bitmap->hDIBPalette) - resBitmap->ppal = PALETTE_ShareLockPalette(Bitmap->hDIBPalette); - else if (Bitmap->ppal) + if (Bitmap->ppal) { resBitmap->ppal = Bitmap->ppal ; GDIOBJ_IncrementShareCount(&Bitmap->ppal->BaseObject); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Thu May 13 00:56:24 2010 @@ -1,9 +1,9 @@ -/* +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS win32 subsystem * PURPOSE: Functions for brushes * FILE: subsystem/win32/win32k/objects/brush.c - * PROGRAMER: + * PROGRAMER: */ #include <win32k.h> @@ -19,7 +19,7 @@ DWORD nEntries; PVOID AttrList[GDIOBJATTRFREE]; } GDI_OBJ_ATTR_FREELIST, *PGDI_OBJ_ATTR_FREELIST; - + typedef struct _GDI_OBJ_ATTR_ENTRY { RGN_ATTR Attr[GDIOBJATTRFREE]; @@ -46,7 +46,7 @@ PGDI_OBJ_ATTR_FREELIST pGdiObjAttrFreeList; PGDI_OBJ_ATTR_ENTRY pGdiObjAttrEntry; int i; - + pti = PsGetCurrentThreadWin32Thread(); if (pti->pgdiBrushAttr) { @@ -127,9 +127,9 @@ PGDI_OBJ_ATTR_FREELIST pGdiObjAttrFreeList; pti = PsGetCurrentThreadWin32Thread(); - + if (!pti) return; - + if (!pti->pgdiBrushAttr) { // If it is null, just cache it for the next time. pti->pgdiBrushAttr = pAttr; @@ -382,6 +382,7 @@ UINT PaletteEntryCount; PSURFACE psurfPattern; INT PaletteType; + HPALETTE hpal ; if (BitmapInfo->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) { @@ -417,7 +418,10 @@ psurfPattern = SURFACE_LockSurface(hPattern); ASSERT(psurfPattern != NULL); - psurfPattern->hDIBPalette = BuildDIBPalette(BitmapInfo, &PaletteType); + hpal = BuildDIBPalette(BitmapInfo, &PaletteType); + psurfPattern->ppal = PALETTE_ShareLockPalette(hpal); + /* Lazy delete palette, it will be freed when its shared reference is zeroed */ + GreDeleteObject(hpal); SURFACE_UnlockSurface(psurfPattern); pbrush = BRUSH_AllocBrushWithHandle(); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu May 13 00:56:24 2010 @@ -109,13 +109,14 @@ if (StartIndex + Entries > (1 << biBitCount)) Entries = (1 << biBitCount) - StartIndex; - PalGDI = PALETTE_LockPalette(psurf->hDIBPalette); - if (PalGDI == NULL) + if (psurf->ppal == NULL) { DC_UnlockDc(dc); SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } + + PalGDI = PALETTE_LockPalette(psurf->ppal->BaseObject.hHmgr); for (Index = StartIndex; Index < StartIndex + Entries && Index < PalGDI->NumColors; @@ -181,13 +182,14 @@ if (StartIndex + Entries > (1 << biBitCount)) Entries = (1 << biBitCount) - StartIndex; - PalGDI = PALETTE_LockPalette(psurf->hDIBPalette); - if (PalGDI == NULL) + if (psurf->ppal == NULL) { DC_UnlockDc(dc); SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } + + PalGDI = PALETTE_LockPalette(psurf->ppal->BaseObject.hHmgr); for (Index = StartIndex; Index < StartIndex + Entries && Index < PalGDI->NumColors; @@ -276,12 +278,7 @@ return 0; } - // Use hDIBPalette if it exists - if (bitmap->hDIBPalette) - { - ppalDDB = PALETTE_ShareLockPalette(bitmap->hDIBPalette); - } - else if (bitmap->ppal) + if (bitmap->ppal) { ppalDDB = bitmap->ppal; GDIOBJ_IncrementShareCount(&ppalDDB->BaseObject); @@ -523,11 +520,7 @@ } /* Obtain destination palette */ - if (pSurf && pSurf->hDIBPalette) - { - ppalDDB = PALETTE_ShareLockPalette(pSurf->hDIBPalette); - } - else if (pSurf && pSurf->ppal) + if (pSurf && pSurf->ppal) { ppalDDB = pSurf->ppal; GDIOBJ_IncrementShareCount(&ppalDDB->BaseObject); @@ -672,11 +665,7 @@ return 0; } - if (psurf->hDIBPalette) - { - ppalSrc = PALETTE_ShareLockPalette(psurf->hDIBPalette); - } - else if (psurf->ppal) + if (psurf->ppal) { ppalSrc = psurf->ppal; GDIOBJ_IncrementShareCount(&ppalSrc->BaseObject); @@ -1357,6 +1346,7 @@ SURFACE *bmp = NULL; void *mapBits = NULL; PDC_ATTR pdcattr; + HPALETTE hpal ; // Fill BITMAP32 structure with DIB data BITMAPINFOHEADER *bi = &bmi->bmiHeader; @@ -1525,7 +1515,7 @@ ExFreePoolWithTag(lpRGB, TAG_COLORMAP); } SetLastWin32Error(ERROR_INVALID_HANDLE); - GreDeleteObject(bmp); + GreDeleteObject(res); return NULL; } @@ -1554,15 +1544,19 @@ if (bi->biClrUsed != 0) { - bmp->hDIBPalette = PALETTE_AllocPaletteIndexedRGB(ColorCount, lpRGB); + hpal = PALETTE_AllocPaletteIndexedRGB(ColorCount, lpRGB); } else { - bmp->hDIBPalette = PALETTE_AllocPalette(PAL_BITFIELDS, 0, NULL, + hpal = PALETTE_AllocPalette(PAL_BITFIELDS, 0, NULL, dsBitfields[0], dsBitfields[1], dsBitfields[2]); } + + bmp->ppal = PALETTE_ShareLockPalette(hpal); + /* Lazy delete hpal, it will be freed at surface release */ + GreDeleteObject(hpal); // Clean up in case of errors if (!res || !bmp || !bm.bmBits) Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Thu May 13 00:56:24 2010 @@ -935,11 +935,7 @@ /* FIXME - psurf can be NULL!!! Don't assert but handle this case gracefully! */ ASSERT(psurf); - if (psurf->hDIBPalette) - { - PalDestGDI = PALETTE_ShareLockPalette(psurf->hDIBPalette); - } - else if (psurf->ppal) + if (psurf->ppal) { PalDestGDI = psurf->ppal; GDIOBJ_IncrementShareCount(&PalDestGDI->BaseObject); @@ -1142,11 +1138,7 @@ goto cleanup; } - if (psurf->hDIBPalette) - { - ppal = PALETTE_ShareLockPalette(psurf->hDIBPalette); - } - else if (psurf->ppal) + if (psurf->ppal) { ppal = psurf->ppal; GDIOBJ_IncrementShareCount(&ppal->BaseObject); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Thu May 13 00:56:24 2010 @@ -3439,11 +3439,7 @@ SurfObj = &psurf->SurfObj ; /* Create the xlateobj */ - if (psurf->hDIBPalette) - { - ppalDst = PALETTE_ShareLockPalette(psurf->hDIBPalette); - } - else if (psurf->ppal) + if (psurf->ppal) { ppalDst = psurf->ppal; GDIOBJ_IncrementShareCount(&ppalDst->BaseObject);

1 0

[sir_richard] 47189: [NTOS]: Fix definition of unused MI_MAKE_SOFTWARE_PTE macro. [NTOS]: Correctly setup the PFN entries for freshly allocated paged pool pages. Fixes a problem where the page could've still had stale/garbage data. [NTOS]: Add some extra assertions in the code to catch memory corruption and detect invalid logic. [NTOS]: Fix some typos in the code (comments/whitespace). [NTOS]: Make the dreaded page fault message that breaks paged pool on some systems more verbose for future debu
by sir_richard＠svn.reactos.org 12 May '10

12 May '10

Author: sir_richard Date: Thu May 13 00:47:46 2010 New Revision: 47189 URL: http://svn.reactos.org/svn/reactos?rev=47189&view=rev Log: [NTOS]: Fix definition of unused MI_MAKE_SOFTWARE_PTE macro. [NTOS]: Correctly setup the PFN entries for freshly allocated paged pool pages. Fixes a problem where the page could've still had stale/garbage data. [NTOS]: Add some extra assertions in the code to catch memory corruption and detect invalid logic. [NTOS]: Fix some typos in the code (comments/whitespace). [NTOS]: Make the dreaded page fault message that breaks paged pool on some systems more verbose for future debugging. Modified: trunk/reactos/ntoskrnl/mm/ARM3/contmem.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/contmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/contmem.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] Thu May 13 00:47:46 2010 @@ -491,7 +491,7 @@ StartPfn = Pfn1; Pfn1->u3.e1.StartOfAllocation = 0; - /* Look the PFNs until we find the one that marks the end of the allocation */ + /* Loop the PFNs until we find the one that marks the end of the allocation */ do { /* Make sure these are the pages we setup in the allocation routine */ @@ -530,14 +530,14 @@ // // Loop all the pages // - LastPage = PageFrameIndex + PageCount; + LastPage = PageFrameIndex + PageCount; do { // // Free each one, and move on // - MmReleasePageMemoryConsumer(MC_NPPOOL, PageFrameIndex); - } while (++PageFrameIndex < LastPage); + MmReleasePageMemoryConsumer(MC_NPPOOL, PageFrameIndex++); + } while (PageFrameIndex < LastPage); // // Release the PFN lock Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu May 13 00:47:46 2010 @@ -117,7 +117,7 @@ // // Creates a software PTE with the given protection // -#define MI_MAKE_SOFTWARE_PTE(x) ((x) << MM_PTE_SOFTWARE_PROTECTION_BITS) +#define MI_MAKE_SOFTWARE_PTE(p, x) ((p)->u.Long = (x << MM_PTE_SOFTWARE_PROTECTION_BITS)) // // Special values for LoadedImports Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Thu May 13 00:47:46 2010 @@ -324,7 +324,7 @@ // // This might happen...not sure yet // - DPRINT1("FAULT ON PAGE TABLES!\n"); + DPRINT1("FAULT ON PAGE TABLES: %p %lx %lx!\n", Address, *PointerPte, *PointerPde); // // Map in the page table Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Thu May 13 00:47:46 2010 @@ -595,14 +595,15 @@ // PageFrameNumber = MmAllocPage(MC_NPPOOL); - // - // Get the PFN entry for it - // + /* Get the PFN entry for it and fill it out */ Pfn1 = MiGetPfnEntry(PageFrameNumber); - - // - // Write the PTE for it - // + Pfn1->u3.e2.ReferenceCount = 1; + Pfn1->u2.ShareCount = 1; + Pfn1->PteAddress = PointerPte; + Pfn1->u3.e1.PageLocation = ActiveAndValid; + Pfn1->u4.VerifierAllocation = 0; + + /* Write the PTE for it */ TempPte.u.Hard.PageFrameNumber = PageFrameNumber; ASSERT(PointerPte->u.Hard.Valid == 0); ASSERT(TempPte.u.Hard.Valid == 1); Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Thu May 13 00:47:46 2010 @@ -153,7 +153,6 @@ // Next PTE // PointerPte++; - ASSERT(PointerPte->u.Hard.Valid == 0); // // Get a page @@ -164,6 +163,8 @@ // // Write it // + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); *PointerPte = TempPte; } @@ -243,26 +244,21 @@ // Acquire the PFN DB lock // OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - + // // Loop each stack page // while (LimitPte >= NewLimitPte) { - // - // Sanity check - // - ASSERT(LimitPte->u.Hard.Valid == 0); - // // Get a page // PageFrameIndex = MmAllocPage(MC_NPPOOL); TempPte.u.Hard.PageFrameNumber = PageFrameIndex; - // - // Write it - // + /* Write the valid PTE */ + ASSERT(LimitPte->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); *LimitPte-- = TempPte; }

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