Ros-diffs April 2013

ros-diffs@reactos.org

14 participants
265 discussions

[hbelusca] 58856: [ADVAPI32-SERVICES] - Apply changes from http://code.reactos.org/cru/CR-30 - If an event object already exists, CreateEvent returns a valid handle to it. So that, if the returned ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Apr 25 23:13:58 2013 New Revision: 58856 URL: http://svn.reactos.org/svn/reactos?rev=58856&view=rev Log: [ADVAPI32-SERVICES] - Apply changes from http://code.reactos.org/cru/CR-30 - If an event object already exists, CreateEvent returns a valid handle to it. So that, if the returned handle is NULL, then automatically we are sure that it doesn't exist. Therefore remove unneeded checks. Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/driver.c trunk/reactos/base/system/services/services.c trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Thu Apr 25 23:13:58 2013 @@ -38,7 +38,7 @@ static RTL_RESOURCE DatabaseLock; static DWORD ResumeCount = 1; -/* The critical section synchronizes service controls commands */ +/* The critical section synchronizes service control requests */ static CRITICAL_SECTION ControlServiceCriticalSection; static DWORD PipeTimeout = 30000; /* 30 Seconds */ @@ -777,6 +777,7 @@ } else // if (Service->Status.dwServiceType == SERVICE_FILE_SYSTEM_DRIVER) { + ASSERT(Service->Status.dwServiceType == SERVICE_FILE_SYSTEM_DRIVER); RtlInitUnicodeString(&DirName, L"\\FileSystem"); } @@ -897,6 +898,7 @@ DPRINT("ScmControlService() called\n"); + /* Acquire the service control critical section, to synchronize requests */ EnterCriticalSection(&ControlServiceCriticalSection); /* Calculate the total length of the start command line */ @@ -1715,8 +1717,6 @@ ScmAutoStartServices(VOID) { DWORD dwError = ERROR_SUCCESS; - SC_RPC_LOCK Lock = NULL; - PLIST_ENTRY GroupEntry; PLIST_ENTRY ServiceEntry; PSERVICE_GROUP CurrentGroup; @@ -1725,26 +1725,14 @@ HKEY hKey; ULONG i; + /* + * This function MUST be called ONLY at initialization time. + * Therefore, no need to acquire the user service start lock. + */ + ASSERT(ScmInitialize); + /* Acquire the service control critical section, to synchronize starts */ EnterCriticalSection(&ControlServiceCriticalSection); - - /* - * Acquire the user service start lock while the service is starting, if - * needed (i.e. if we are not starting it during the initialization phase). - * If we don't success, bail out. - */ - if (!ScmInitialize) - { - /* - * Actually this code is never executed since we are called - * at initialization time, so that ScmInitialize == TRUE. - * But keep the code here if someday we are called later on - * for whatever reason... - */ - dwError = ScmAcquireServiceStartLock(TRUE, &Lock); - if (dwError != ERROR_SUCCESS) goto done; - } - /* Clear 'ServiceVisited' flag (or set if not to start in Safe Mode) */ ServiceEntry = ServiceListHead.Flink; @@ -1906,11 +1894,7 @@ ServiceEntry = ServiceEntry->Flink; } - - /* Release the service start lock, if needed, and the critical section */ - if (Lock) ScmReleaseServiceStartLock(&Lock); - -done: + /* Release the critical section */ LeaveCriticalSection(&ControlServiceCriticalSection); } Modified: trunk/reactos/base/system/services/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/drive… ============================================================================== --- trunk/reactos/base/system/services/driver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/driver.c [iso-8859-1] Thu Apr 25 23:13:58 2013 @@ -145,6 +145,7 @@ } else // if (lpService->Status.dwServiceType == SERVICE_FILE_SYSTEM_DRIVER) { + ASSERT(lpService->Status.dwServiceType == SERVICE_FILE_SYSTEM_DRIVER); RtlInitUnicodeString(&DirName, L"\\FileSystem"); } Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Thu Apr 25 23:13:58 2013 @@ -82,50 +82,11 @@ } -BOOL -ScmCreateControlEvent(PHANDLE Event, - LPCWSTR Name, - DWORD dwDesiredAccess) -{ - /* - * This function creates a generic non-inheritable event - * and return a handle to the caller. The caller must - * close this handle afterwards. - */ - - HANDLE hEvent; - - hEvent = CreateEventW(NULL, TRUE, FALSE, Name); - if (hEvent == NULL) - { - if (GetLastError() == ERROR_ALREADY_EXISTS) - { - hEvent = OpenEventW(dwDesiredAccess, FALSE, Name); - } - } - - if (hEvent) - { - DPRINT("SERVICES: Created event %S with handle %x\n", Name, hEvent); - *Event = hEvent; - return TRUE; - } - else - { - DPRINT1("SERVICES: Failed to create event %S (Error %lu)\n", Name, GetLastError()); - return FALSE; - } -} - - VOID ScmWaitForLsa(VOID) { - HANDLE hEvent; - - if (!ScmCreateControlEvent(&hEvent, - LSA_RPC_SERVER_ACTIVE, - SYNCHRONIZE)) + HANDLE hEvent = CreateEventW(NULL, TRUE, FALSE, LSA_RPC_SERVER_ACTIVE); + if (hEvent == NULL) { DPRINT1("Failed to create the notification event (Error %lu)\n", GetLastError()); } @@ -134,7 +95,6 @@ DPRINT("Wait for the LSA server!\n"); WaitForSingleObject(hEvent, INFINITE); DPRINT("LSA server running!\n"); - CloseHandle(hEvent); } @@ -357,9 +317,8 @@ ScmInitialize = TRUE; /* Create the start event */ - if (!ScmCreateControlEvent(&hScmStartEvent, - SCM_START_EVENT, - EVENT_ALL_ACCESS)) + hScmStartEvent = CreateEventW(NULL, TRUE, FALSE, SCM_START_EVENT); + if (hScmStartEvent == NULL) { DPRINT1("SERVICES: Failed to create the start event\n"); goto done; @@ -367,9 +326,8 @@ DPRINT("SERVICES: Created start event with handle %p.\n", hScmStartEvent); /* Create the auto-start complete event */ - if (!ScmCreateControlEvent(&hScmAutoStartCompleteEvent, - SCM_AUTOSTARTCOMPLETE_EVENT, - EVENT_ALL_ACCESS)) + hScmAutoStartCompleteEvent = CreateEventW(NULL, TRUE, FALSE, SCM_AUTOSTARTCOMPLETE_EVENT); + if (hScmAutoStartCompleteEvent = NULL) { DPRINT1("SERVICES: Failed to create the auto-start complete event\n"); goto done; @@ -380,7 +338,7 @@ hScmShutdownEvent = CreateEventW(NULL, TRUE, FALSE, NULL); if (hScmShutdownEvent == NULL) { - DPRINT1("SERVICES: Failed to create shutdown event\n"); + DPRINT1("SERVICES: Failed to create the shutdown event\n"); goto done; } Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Thu Apr 25 23:13:58 2013 @@ -1673,28 +1673,14 @@ TRACE("WaitForSCManager() called\n"); /* Try to open the existing event */ - hEvent = OpenEventW(SYNCHRONIZE, - FALSE, - SCM_START_EVENT); + hEvent = OpenEventW(SYNCHRONIZE, FALSE, SCM_START_EVENT); if (hEvent == NULL) { - if (GetLastError() != ERROR_FILE_NOT_FOUND) - return; + if (GetLastError() != ERROR_FILE_NOT_FOUND) return; /* Try to create a new event */ - hEvent = CreateEventW(NULL, - TRUE, - FALSE, - SCM_START_EVENT); - if (hEvent == NULL) - { - /* Try to open the existing event again */ - hEvent = OpenEventW(SYNCHRONIZE, - FALSE, - SCM_START_EVENT); - if (hEvent == NULL) - return; - } + hEvent = CreateEventW(NULL, TRUE, FALSE, SCM_START_EVENT); + if (hEvent == NULL) return; } /* Wait for 3 minutes */

11 years, 8 months

[akhaldi] 58855: [SHELL32] * Sync SH{Register, Revoke}DragDrop with Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 25 23:04:00 2013 New Revision: 58855 URL: http://svn.reactos.org/svn/reactos?rev=58855&view=rev Log: [SHELL32] * Sync SH{Register,Revoke}DragDrop with Wine 1.5.26. Modified: trunk/reactos/dll/win32/shell32/shellord.cpp Modified: trunk/reactos/dll/win32/shell32/shellord.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] Thu Apr 25 23:04:00 2013 @@ -405,13 +405,14 @@ } /************************************************************************* - * SHRegisterDragDrop [SHELL32.86] + * SHRegisterDragDrop [SHELL32.86] * * Probably equivalent to RegisterDragDrop but under Windows 95 it could use the * shell32 built-in "mini-COM" without the need to load ole32.dll - see SHLoadOLE * for details. Under Windows 98 this function initializes the true OLE when called * the first time, on XP always returns E_OUTOFMEMORY and it got removed from Vista. * + * We follow Windows 98 behaviour. * * NOTES * exported by ordinal @@ -420,20 +421,34 @@ * RegisterDragDrop, SHLoadOLE */ HRESULT WINAPI SHRegisterDragDrop( - HWND hWnd, - LPDROPTARGET pDropTarget) -{ - FIXME("(%p,%p):stub.\n", hWnd, pDropTarget); - return RegisterDragDrop(hWnd, pDropTarget); -} - -/************************************************************************* - * SHRevokeDragDrop [SHELL32.87] - * - * Probably equivalent to RevokeDragDrop but under Windows 9x it could use the + HWND hWnd, + LPDROPTARGET pDropTarget) +{ + static BOOL ole_initialized = FALSE; + HRESULT hr; + + TRACE("(%p,%p)\n", hWnd, pDropTarget); + + if (!ole_initialized) + { + hr = OleInitialize(NULL); + if (FAILED(hr)) + return hr; + ole_initialized = TRUE; + } + return RegisterDragDrop(hWnd, pDropTarget); +} + +/************************************************************************* + * SHRevokeDragDrop [SHELL32.87] + * + * Probably equivalent to RevokeDragDrop but under Windows 95 it could use the * shell32 built-in "mini-COM" without the need to load ole32.dll - see SHLoadOLE * for details. Function removed from Windows Vista. * + * We call ole32 RevokeDragDrop which seems to work even if OleInitialize was + * not called. + * * NOTES * exported by ordinal * @@ -442,7 +457,7 @@ */ HRESULT WINAPI SHRevokeDragDrop(HWND hWnd) { - FIXME("(%p):stub.\n",hWnd); + TRACE("(%p)\n", hWnd); return RevokeDragDrop(hWnd); }

11 years, 8 months

[akhaldi] 58854: [SHELL32] * Sync DoEnvironmentSubst{A, W} with Wine 1.5.26. Fixes issues spotted by Victor Martinez. CORE-7124 #resolve

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 25 22:52:34 2013 New Revision: 58854 URL: http://svn.reactos.org/svn/reactos?rev=58854&view=rev Log: [SHELL32] * Sync DoEnvironmentSubst{A,W} with Wine 1.5.26. Fixes issues spotted by Victor Martinez. CORE-7124 #resolve Modified: trunk/reactos/dll/win32/shell32/shellord.cpp Modified: trunk/reactos/dll/win32/shell32/shellord.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] Thu Apr 25 22:52:34 2013 @@ -1492,11 +1492,41 @@ } /************************************************************************ - * DoEnvironmentSubstA [SHELL32.@] - * - * Replace %KEYWORD% in the str with the value of variable KEYWORD - * from environment. If it is not found the %KEYWORD% is left - * intact. If the buffer is too small, str is not modified. + * DoEnvironmentSubstA [SHELL32.@] + * + * See DoEnvironmentSubstW. + */ +EXTERN_C DWORD WINAPI DoEnvironmentSubstA(LPSTR pszString, UINT cchString) +{ + LPSTR dst; + BOOL res = FALSE; + DWORD len = cchString; + + TRACE("(%s, %d)\n", debugstr_a(pszString), cchString); + if (pszString == NULL) /* Really return 0? */ + return 0; + if ((dst = (LPSTR)HeapAlloc(GetProcessHeap(), 0, cchString * sizeof(CHAR)))) + { + len = ExpandEnvironmentStringsA(pszString, dst, cchString); + /* len includes the terminating 0 */ + if (len && len < cchString) + { + res = TRUE; + memcpy(pszString, dst, len); + } + else + len = cchString; + + HeapFree(GetProcessHeap(), 0, dst); + } + return MAKELONG(len, res); +} + +/************************************************************************ + * DoEnvironmentSubstW [SHELL32.@] + * + * Replace all %KEYWORD% in the string with the value of the named + * environment variable. If the buffer is too small, the string is not modified. * * PARAMS * pszString [I] '\0' terminated string with %keyword%. @@ -1504,51 +1534,36 @@ * cchString [I] size of str. * * RETURNS - * cchString length in the HIWORD; - * TRUE in LOWORD if subst was successful and FALSE in other case - */ -EXTERN_C DWORD WINAPI DoEnvironmentSubstA(LPSTR pszString, UINT cchString) -{ - LPSTR dst; + * Success: The string in the buffer is updated + * HIWORD: TRUE + * LOWORD: characters used in the buffer, including space for the terminating 0 + * Failure: buffer too small. The string is not modified. + * HIWORD: FALSE + * LOWORD: provided size of the buffer in characters + */ +EXTERN_C DWORD WINAPI DoEnvironmentSubstW(LPWSTR pszString, UINT cchString) +{ + LPWSTR dst; BOOL res = FALSE; - FIXME("(%s, %d) stub\n", debugstr_a(pszString), cchString); - if (pszString == NULL) /* Really return 0? */ - return 0; - if ((dst = (LPSTR)HeapAlloc(GetProcessHeap(), 0, cchString * sizeof(CHAR)))) - { - DWORD num = ExpandEnvironmentStringsA(pszString, dst, cchString); - if (num && num < cchString) /* dest buffer is too small */ + DWORD len = cchString; + + TRACE("(%s, %d)\n", debugstr_w(pszString), cchString); + + if ((cchString < MAXLONG) && (dst = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, cchString * sizeof(WCHAR)))) + { + len = ExpandEnvironmentStringsW(pszString, dst, cchString); + /* len includes the terminating 0 */ + if (len && len <= cchString) { res = TRUE; - memcpy(pszString, dst, num); + memcpy(pszString, dst, len * sizeof(WCHAR)); } + else + len = cchString; + HeapFree(GetProcessHeap(), 0, dst); } - return MAKELONG(res,cchString); /* Always cchString? */ -} - -/************************************************************************ - * DoEnvironmentSubstW [SHELL32.@] - * - * See DoEnvironmentSubstA. - */ -EXTERN_C DWORD WINAPI DoEnvironmentSubstW(LPWSTR pszString, UINT cchString) -{ - LPWSTR dst; - BOOL res = FALSE; - FIXME("(%s, %d): stub\n", debugstr_w(pszString), cchString); - if ((dst = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, cchString * sizeof(WCHAR)))) - { - DWORD num = ExpandEnvironmentStringsW(pszString, dst, cchString); - if (num) - { - res = TRUE; - wcscpy(pszString, dst); - } - HeapFree(GetProcessHeap(), 0, dst); - } - - return MAKELONG(res,cchString); + return MAKELONG(len, res); } /************************************************************************

11 years, 8 months

[hbelusca] 58853: [PSDK] Clarify the meaning of the parameters of MAKEWORD/MAKELONG

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Apr 25 22:20:00 2013 New Revision: 58853 URL: http://svn.reactos.org/svn/reactos?rev=58853&view=rev Log: [PSDK] Clarify the meaning of the parameters of MAKEWORD/MAKELONG Modified: trunk/reactos/include/psdk/windef.h Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Thu Apr 25 22:20:00 2013 @@ -239,19 +239,19 @@ #ifndef NOMINMAX #ifndef max -#define max(a,b) (((a) > (b)) ? (a) : (b)) +#define max(a, b) (((a) > (b)) ? (a) : (b)) #endif #ifndef min -#define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif -#endif - -#define MAKEWORD(a,b) ((WORD)(((BYTE)((DWORD_PTR)(a) & 0xff)) | (((WORD)((BYTE)((DWORD_PTR)(b) & 0xff))) << 8))) -#define MAKELONG(a,b) ((LONG)(((WORD)((DWORD_PTR)(a) & 0xffff)) | (((DWORD)((WORD)((DWORD_PTR)(b) & 0xffff))) << 16))) -#define LOWORD(l) ((WORD)((DWORD_PTR)(l) & 0xffff)) -#define HIWORD(l) ((WORD)((DWORD_PTR)(l) >> 16)) -#define LOBYTE(w) ((BYTE)((DWORD_PTR)(w) & 0xff)) -#define HIBYTE(w) ((BYTE)((DWORD_PTR)(w) >> 8)) +#define min(a, b) (((a) < (b)) ? (a) : (b)) +#endif +#endif + +#define MAKEWORD(bLow, bHigh) ((WORD)(((BYTE)((DWORD_PTR)(bLow) & 0xff )) | (((WORD)((BYTE)((DWORD_PTR)(bHigh) & 0xff))) << 8 ))) +#define MAKELONG(wLow, wHigh) ((LONG)(((WORD)((DWORD_PTR)(wLow) & 0xffff)) | (((DWORD)((WORD)((DWORD_PTR)(wHigh) & 0xffff))) << 16))) +#define LOWORD(l) ((WORD)((DWORD_PTR)(l) & 0xffff)) +#define HIWORD(l) ((WORD)(((DWORD_PTR)(l) >> 16) & 0xffff)) +#define LOBYTE(w) ((BYTE)((DWORD_PTR)(w) & 0xff)) +#define HIBYTE(w) ((BYTE)(((DWORD_PTR)(w) >> 8) & 0xff)) #ifndef WIN_INTERNAL DECLARE_HANDLE (HWND);

11 years, 8 months

[jgardou] 58852: [NTOSKRNL] - Handle VME for the PUSHF and POPF instruction in virtual mode - There is no reason to set interrupt flag when handling POPF - Fix a typo in POPF case : mask out the ri...

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Apr 25 21:29:59 2013 New Revision: 58852 URL: http://svn.reactos.org/svn/reactos?rev=58852&view=rev Log: [NTOSKRNL] - Handle VME for the PUSHF and POPF instruction in virtual mode - There is no reason to set interrupt flag when handling POPF - Fix a typo in POPF case : mask out the right variable See http://www.rcollins.org/articles/vme1/ for reference Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Thu Apr 25 21:29:59 2013 @@ -53,16 +53,22 @@ { ULONG Esp, V86EFlags, TrapEFlags; - /* Check for VME support */ - ASSERT(KeI386VirtualIntExtensions == FALSE); - /* Get current V8086 flags and mask out interrupt flag */ V86EFlags = *KiNtVdmState; V86EFlags &= ~EFLAGS_INTERRUPT_MASK; - /* Get trap frame EFLags and leave only align, nested task and interrupt */ + /* Get trap frame EFLags */ TrapEFlags = TrapFrame->EFlags; - V86EFlags &= (EFLAGS_ALIGN_CHECK | EFLAGS_NESTED_TASK | EFLAGS_INTERRUPT_MASK); + /* Check for VME support */ + if(KeI386VirtualIntExtensions) + { + /* Copy the virtual interrupt flag to the interrupt flag */ + TrapEFlags &= ~EFLAGS_INTERRUPT_MASK; + if(TrapEFlags & EFLAGS_VIF) + TrapEFlags |= EFLAGS_INTERRUPT_MASK; + } + /* Leave only align, nested task and interrupt */ + TrapEFlags &= (EFLAGS_ALIGN_CHECK | EFLAGS_NESTED_TASK | EFLAGS_INTERRUPT_MASK); /* Add in those flags if they exist, and add in the IOPL flag */ V86EFlags |= TrapEFlags; @@ -133,10 +139,20 @@ TrapEFlags = TrapFrame->EFlags; /* Check for VME support */ - ASSERT(KeI386VirtualIntExtensions == FALSE); - - /* Add V86 and Interrupt flag */ - V86EFlags |= EFLAGS_V86_MASK | EFLAGS_INTERRUPT_MASK; + if(KeI386VirtualIntExtensions) + { + /* Copy the IF flag into the VIF one */ + V86EFlags &= ~EFLAGS_VIF; + if(V86EFlags & EFLAGS_INTERRUPT_MASK) + { + V86EFlags |= EFLAGS_VIF; + /* Don't set the interrupt flag */ + V86EFlags &= ~EFLAGS_INTERRUPT_MASK; + } + } + + /* Add V86 flag */ + V86EFlags |= EFLAGS_V86_MASK; /* Update EFlags in trap frame */ TrapFrame->EFlags = V86EFlags;

11 years, 8 months

[akhaldi] 58851: [NTOSKRNL] * Make sure that BaseAddress is at 64-k boundary in NtMapViewOfSection(). Fixes a couple NtMapViewOfSection tests. * Brought to you by Zhan Jianyu (aka larmbr) with revi...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 25 15:54:45 2013 New Revision: 58851 URL: http://svn.reactos.org/svn/reactos?rev=58851&view=rev Log: [NTOSKRNL] * Make sure that BaseAddress is at 64-k boundary in NtMapViewOfSection(). Fixes a couple NtMapViewOfSection tests. * Brought to you by Zhan Jianyu (aka larmbr) with review and improvement by Timo. CORE-7118 #resolve #comment A slightly improved fix was committed in r58851. Thanks ;) Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Thu Apr 25 15:54:45 2013 @@ -3040,6 +3040,13 @@ return STATUS_INVALID_PAGE_PROTECTION; } + /* Check for non-allocation-granularity-aligned BaseAddress */ + if (BaseAddress && (*BaseAddress != ALIGN_DOWN_POINTER_BY(*BaseAddress, MM_VIRTMEM_GRANULARITY))) + { + DPRINT("BaseAddress is not at 64-kilobyte address boundary."); + return STATUS_MAPPED_ALIGNMENT; + } + /* Now convert the protection mask into desired section access mask */ DesiredAccess = MmMakeSectionAccess[ProtectionMask & 0x7];

11 years, 8 months

[fireball] 58850: [RTL] - Apply similar fixes as in 58848 to RtlGetElementGenericTable (no need to make too fancy predecrements if they work incorrectly in this case when do/while loops were unnece...

by fireball＠svn.reactos.org

Author: fireball Date: Thu Apr 25 14:15:10 2013 New Revision: 58850 URL: http://svn.reactos.org/svn/reactos?rev=58850&view=rev Log: [RTL] - Apply similar fixes as in 58848 to RtlGetElementGenericTable (no need to make too fancy predecrements if they work incorrectly in this case when do/while loops were unnecessary at all). Modified: trunk/reactos/lib/rtl/generictable.c Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/generictable.c [iso-8859-1] Thu Apr 25 14:15:10 2013 @@ -451,21 +451,23 @@ { /* Do the search backwards, since this takes less iterations */ DeltaDown = OrderedElement - NextI; - do + while (DeltaDown) { /* Get next node */ OrderedNode = OrderedNode->Blink; - } while (--DeltaDown); + DeltaDown--; + } } else { /* Follow the list directly instead */ OrderedNode = &Table->InsertOrderList; - do + while (NextI) { /* Get next node */ OrderedNode = OrderedNode->Flink; - } while (--NextI); + NextI--; + } } } else @@ -478,21 +480,23 @@ if (DeltaUp <= DeltaDown) { /* Do the search forwards, since this takes less iterations */ - do + while (DeltaUp) { /* Get next node */ OrderedNode = OrderedNode->Blink; - } while (--DeltaUp); + DeltaUp--; + } } else { /* Do the search downwards, since this takes less iterations */ OrderedNode = &Table->InsertOrderList; - do + while (DeltaDown) { /* Get next node */ OrderedNode = OrderedNode->Blink; - } while (--DeltaDown); + DeltaDown--; + } } }

11 years, 8 months

[pschweitzer] 58849: [KMTESTS:FSRTL] Fix copy/paste mistakes

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Apr 25 10:08:05 2013 New Revision: 58849 URL: http://svn.reactos.org/svn/reactos?rev=58849&view=rev Log: [KMTESTS:FSRTL] Fix copy/paste mistakes Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlM… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c [iso-8859-1] Thu Apr 25 10:08:05 2013 @@ -28,10 +28,10 @@ ok(FsRtlAddLargeMcbEntry(&LargeMcb, 1, 1, 1024) == TRUE, "expected TRUE, got FALSE\n"); NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); ok(NbRuns == 2, "Expected 2 runs, got: %lu\n", NbRuns); - ok(FsRtlLookupLastLargeMcbEntry(&LargeMcb, &Vbn, &Lbn) == TRUE, "expected FALSE, got TRUE\n"); + ok(FsRtlLookupLastLargeMcbEntry(&LargeMcb, &Vbn, &Lbn) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 1024, "Expected Vbn 1024, got: %I64d\n", Vbn); ok(Lbn == 1024, "Expected Lbn 1024, got: %I64d\n", Lbn); - ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected FALSE, got TRUE\n"); + ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 1024, "Expected Vbn 1024, got: %I64d\n", Vbn); ok(Lbn == 1024, "Expected Lbn 1024, got: %I64d\n", Lbn); ok(Index == 1, "Expected Index 1, got: %lu\n", Index); @@ -39,10 +39,10 @@ ok(FsRtlAddLargeMcbEntry(&LargeMcb, 2048, 2, 1024) == TRUE, "expected TRUE, got FALSE\n"); NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); ok(NbRuns == 4, "Expected 4 runs, got: %lu\n", NbRuns); - ok(FsRtlLookupLastLargeMcbEntry(&LargeMcb, &Vbn, &Lbn) == TRUE, "expected FALSE, got TRUE\n"); + ok(FsRtlLookupLastLargeMcbEntry(&LargeMcb, &Vbn, &Lbn) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 3071, "Expected Vbn 3071, got: %I64d\n", Vbn); ok(Lbn == 1025, "Expected Lbn 1025, got: %I64d\n", Lbn); - ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected FALSE, got TRUE\n"); + ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 3071, "Expected Vbn 3071, got: %I64d\n", Vbn); ok(Lbn == 1025, "Expected Lbn 1025, got: %I64d\n", Lbn); ok(Index == 3, "Expected Index 3, got: %lu\n", Index); @@ -94,19 +94,19 @@ ok(StartingLbn == -1, "Expected StartingLbn -1, got: %I64d\n", StartingLbn); ok(CountFromStartingLbn == 2048, "Expected CountFromStartingLbn 2048, got: %I64d\n", CountFromStartingLbn); ok(Index == 0, "Expected Index 0, got: %lu\n", Index); - ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected FALSE, got TRUE\n"); + ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 3071, "Expected Vbn 3071, got: %I64d\n", Vbn); ok(Lbn == 1025, "Expected Lbn 1025, got: %I64d\n", Lbn); ok(Index == 1, "Expected Index 1, got: %lu\n", Index); - ok(FsRtlSplitLargeMcb(&LargeMcb, 2048, 1024) == TRUE, "expected FALSE, got TRUE\n"); + ok(FsRtlSplitLargeMcb(&LargeMcb, 2048, 1024) == TRUE, "expected TRUE, got FALSE\n"); NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); ok(NbRuns == 2, "Expected 2 runs, got: %lu\n", NbRuns); - ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected FALSE, got TRUE\n"); + ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 4095, "Expected Vbn 4095, got: %I64d\n", Vbn); ok(Lbn == 1025, "Expected Lbn 1025, got: %I64d\n", Lbn); ok(Index == 1, "Expected Index 1, got: %lu\n", Index); - ok(FsRtlLookupLargeMcbEntry(&LargeMcb, 2048, &Lbn, &SectorCount, &StartingLbn, &CountFromStartingLbn, &Index) == TRUE, "expected FALSE, got TRUE\n"); + ok(FsRtlLookupLargeMcbEntry(&LargeMcb, 2048, &Lbn, &SectorCount, &StartingLbn, &CountFromStartingLbn, &Index) == TRUE, "expected TRUE, got FALSE\n"); ok(Lbn == -1, "Expected Lbn -1, got: %I64d\n", Lbn); ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); ok(StartingLbn == -1, "Expected StartingLbn -1, got: %I64d\n", StartingLbn); @@ -124,10 +124,10 @@ ok(FsRtlAddLargeMcbEntry(&LargeMcb, 4095, 1025, 1024) == TRUE, "expected TRUE, got FALSE\n"); NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); ok(NbRuns == 2, "Expected 2 runs, got: %lu\n", NbRuns); - ok(FsRtlLookupLastLargeMcbEntry(&LargeMcb, &Vbn, &Lbn) == TRUE, "expected FALSE, got TRUE\n"); + ok(FsRtlLookupLastLargeMcbEntry(&LargeMcb, &Vbn, &Lbn) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 5118, "Expected Vbn 5118, got: %I64d\n", Vbn); ok(Lbn == 2048, "Expected Lbn 2048, got: %I64d\n", Lbn); - ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected FALSE, got TRUE\n"); + ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 5118, "Expected Vbn 5118, got: %I64d\n", Vbn); ok(Lbn == 2048, "Expected Lbn 2048, got: %I64d\n", Lbn); ok(Index == 1, "Expected Index 1, got: %lu\n", Index);

11 years, 8 months

[fireball] 58848: [RTL] - Do not set result variable NodeOrParent in RtlpFindGenericTableNodeOrParent in case the generic table is empty, just returning TableEmptyTree is enough. - Fix improper enu...

by fireball＠svn.reactos.org

Author: fireball Date: Wed Apr 24 22:56:43 2013 New Revision: 58848 URL: http://svn.reactos.org/svn/reactos?rev=58848&view=rev Log: [RTL] - Do not set result variable NodeOrParent in RtlpFindGenericTableNodeOrParent in case the generic table is empty, just returning TableEmptyTree is enough. - Fix improper enumeration of generic tables nodes. The way they were done previously clearly shows that noone was actually testing these APIs and a simple mistake (do/while instead of while loop) led to a NULL pointer access. Thanks to Pierre for developing MCB tests which revealed this problem. Rephrasing Vladimir Lenin: "Test, test and again test!" Modified: trunk/reactos/lib/rtl/generictable.c Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/generictable.c [iso-8859-1] Wed Apr 24 22:56:43 2013 @@ -34,7 +34,6 @@ /* Quick check to see if the table is empty */ if (RtlIsGenericTableEmpty(Table)) { - *NodeOrParent = NULL; return TableEmptyTree; } @@ -338,11 +337,11 @@ { /* Then find the leftmost element */ FoundNode = Table->TableRoot; - do + while(RtlLeftChild(FoundNode)) { /* Get the left child */ FoundNode = RtlLeftChild(FoundNode); - } while(RtlLeftChild(FoundNode)); + } /* Splay it */ _Analysis_assume_(FoundNode != NULL); @@ -377,11 +376,11 @@ { /* Then find the leftmost element */ FoundNode = Table->TableRoot; - do + while(RtlLeftChild(FoundNode)) { /* Get the left child */ FoundNode = RtlLeftChild(FoundNode); - } while(RtlLeftChild(FoundNode)); + } /* Splay it */ *RestartKey = FoundNode;

11 years, 8 months

[pschweitzer] 58847: [NTOSKRNL] Reimplement (yes, once more...) all the DOS wildcards in FsRtlIs*InExpression(). This time with a better understanding of MSDN (doc can be sometimes quite cryptic......

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Apr 24 20:36:33 2013 New Revision: 58847 URL: http://svn.reactos.org/svn/reactos?rev=58847&view=rev Log: [NTOSKRNL] Reimplement (yes, once more...) all the DOS wildcards in FsRtlIs*InExpression(). This time with a better understanding of MSDN (doc can be sometimes quite cryptic...). Which means that now the functions are passing all the tests and are even simpler. Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Wed Apr 24 20:36:33 2013 @@ -160,10 +160,9 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, IN PANSI_STRING Name) { - SHORT StarFound = -1; - PUSHORT BackTracking = NULL; - USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars; - BOOLEAN BeyondName; + SHORT StarFound = -1, DosStarFound = -1; + PUSHORT BackTracking = NULL, DosBackTracking = NULL; + USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, LastDot; PAGED_CODE(); ASSERT(Name->Length); @@ -222,129 +221,83 @@ /* Check DOS_STAR */ else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_STAR) { - /* We can only consume dot if that's not the last one - * Otherwise, we null match - */ - if (Name->Buffer[NamePosition] == '.') - { - MatchingChars = NamePosition + 1; - while (MatchingChars < Name->Length) - { - if (Name->Buffer[MatchingChars] == '.') - { - NamePosition++; - break; - } - MatchingChars++; - } - - /* In case we were already at last dot, simply accept it */ - if (MatchingChars == Name->Length) - { - NamePosition++; - } - } - else - { - /* XXX: Eat everything till the end */ - if (ExpressionPosition + 1 == Expression->Length) - { - NamePosition = Name->Length; - } - - /* Try to eat till the next matching char or . */ - MatchingChars = NamePosition; - while (MatchingChars < Name->Length) - { - if (ExpressionPosition + 1 < Expression->Length && - Name->Buffer[MatchingChars] == Expression->Buffer[ExpressionPosition + 1]) - { - NamePosition = MatchingChars; - break; - } - else if (Name->Buffer[MatchingChars] == '.') - { - NamePosition = MatchingChars + 1; - break; - } - MatchingChars++; - } - } - ExpressionPosition++; - } - /* Check DOS_DOT */ - else if (Expression->Buffer[ExpressionPosition] == DOS_DOT) - { - /* First try to find whether we are beyond last dot (beyond name) */ - BeyondName = TRUE; - MatchingChars = NamePosition + 1; + /* Skip contigous stars */ + while (ExpressionPosition + 1 < Expression->Length && Expression->Buffer[ExpressionPosition + 1] == ANSI_DOS_STAR) + { + ExpressionPosition++; + } + + /* Look for last dot */ + MatchingChars = 0; + LastDot = (USHORT)-1; while (MatchingChars < Name->Length) { if (Name->Buffer[MatchingChars] == '.') { - BeyondName = FALSE; - break; + LastDot = MatchingChars; + if (LastDot > NamePosition) + break; } + MatchingChars++; } - /* If we are beyond name, we null match */ - if (BeyondName) - { + /* If we don't have dots or we didn't find last yet + * start eating everything + */ + if (MatchingChars != Name->Length || LastDot == (USHORT)-1) + { + if (!DosBackTracking) DosBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + Expression->Length * sizeof(USHORT), 'nrSF'); + DosBackTracking[++DosStarFound] = ExpressionPosition++; + + /* Not the same char, start exploring */ + if (Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition]) + NamePosition++; + } + else + { + /* Else, if we are at last dot, eat it - otherwise, null match */ if (Name->Buffer[NamePosition] == '.') - { NamePosition++; - } - ExpressionPosition++; - continue; - } - /* If not, we only match a dot */ - else if (Name->Buffer[NamePosition] == '.') + + ExpressionPosition++; + } + } + /* Check DOS_DOT */ + else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT) + { + /* We only match dots */ + if (Name->Buffer[NamePosition] == '.') { NamePosition++; - ExpressionPosition++; - continue; - } - /* Otherwise, fail */ - else - { - break; - } + } + /* Try to explore later on for null matching */ + else if (ExpressionPosition + 1 < Expression->Length && + Name->Buffer[NamePosition] == Expression->Buffer[ExpressionPosition + 1]) + { + NamePosition++; + } + ExpressionPosition++; } /* Check DOS_QM */ else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) { - /* Check whether we are upon a dot */ - MatchingChars = 0; - while (MatchingChars < NamePosition) - { - if (Name->Buffer[MatchingChars] == '.') - { - break; - } - MatchingChars++; - } - - /* If not, we match a single char */ - if (MatchingChars == NamePosition && Name->Buffer[NamePosition] != '.') + /* We match everything except dots */ + if (Name->Buffer[NamePosition] != '.') { NamePosition++; - ExpressionPosition++; - } - else - { - /* If we are, we just go through QMs */ - while (ExpressionPosition < Expression->Length && - Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) - { - ExpressionPosition++; - } - } + } + ExpressionPosition++; } /* If nothing match, try to backtrack */ else if (StarFound >= 0) { ExpressionPosition = BackTracking[StarFound--]; + } + else if (DosStarFound >= 0) + { + ExpressionPosition = DosBackTracking[DosStarFound--]; } /* Otherwise, fail */ else @@ -378,6 +331,10 @@ if (BackTracking) { ExFreePoolWithTag(BackTracking, 'nrSF'); + } + if (DosBackTracking) + { + ExFreePoolWithTag(DosBackTracking, 'nrSF'); } return (ExpressionPosition == Expression->Length && NamePosition == Name->Length); Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Wed Apr 24 20:36:33 2013 @@ -23,12 +23,11 @@ IN BOOLEAN IgnoreCase, IN PWCHAR UpcaseTable OPTIONAL) { - SHORT StarFound = -1; - PUSHORT BackTracking = NULL; + SHORT StarFound = -1, DosStarFound = -1; + PUSHORT BackTracking = NULL, DosBackTracking = NULL; UNICODE_STRING IntExpression; - USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars; + USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, LastDot; WCHAR CompareChar; - BOOLEAN BeyondName; PAGED_CODE(); /* Check if we were given strings at all */ @@ -153,129 +152,85 @@ /* Check DOS_STAR */ else if (Expression->Buffer[ExpressionPosition] == DOS_STAR) { - /* We can only consume dot if that's not the last one - * Otherwise, we null match + /* Skip contigous stars */ + while ((ExpressionPosition + 1 < (USHORT)(Expression->Length / sizeof(WCHAR))) && + (Expression->Buffer[ExpressionPosition + 1] == DOS_STAR)) + { + ExpressionPosition++; + } + + /* Look for last dot */ + MatchingChars = 0; + LastDot = (USHORT)-1; + while (MatchingChars < Name->Length / sizeof(WCHAR)) + { + if (Name->Buffer[MatchingChars] == L'.') + { + LastDot = MatchingChars; + if (LastDot > NamePosition) + break; + } + + MatchingChars++; + } + + /* If we don't have dots or we didn't find last yet + * start eating everything */ - if (Name->Buffer[NamePosition] == L'.') - { - MatchingChars = NamePosition + 1; - while (MatchingChars < Name->Length / sizeof(WCHAR)) - { - if (Name->Buffer[MatchingChars] == L'.') - { - NamePosition++; - break; - } - MatchingChars++; - } - - /* In case we were already at last dot, simply accept it */ - if (MatchingChars == Name->Length / sizeof(WCHAR)) - { + if (MatchingChars != Name->Length || LastDot == (USHORT)-1) + { + if (!DosBackTracking) DosBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + (Expression->Length / sizeof(WCHAR)) * sizeof(USHORT), + 'nrSF'); + DosBackTracking[++DosStarFound] = ExpressionPosition++; + + /* Not the same char, start exploring */ + if (Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition]) NamePosition++; - } } else { - /* XXX: Eat everything till the end */ - if (ExpressionPosition + 1 == Expression->Length / sizeof(WCHAR)) - { - NamePosition = Name->Length; - } - - /* Try to eat till the next matching char or . */ - MatchingChars = NamePosition; - while (MatchingChars < Name->Length / sizeof(WCHAR)) - { - if (ExpressionPosition + 1 < Expression->Length / sizeof(WCHAR) && - Name->Buffer[MatchingChars] == Expression->Buffer[ExpressionPosition + 1]) - { - NamePosition = MatchingChars; - break; - } - else if (Name->Buffer[MatchingChars] == L'.') - { - NamePosition = MatchingChars + 1; - break; - } - MatchingChars++; - } - } - ExpressionPosition++; + /* Else, if we are at last dot, eat it - otherwise, null match */ + if (Name->Buffer[NamePosition] == '.') + NamePosition++; + + ExpressionPosition++; + } } /* Check DOS_DOT */ else if (Expression->Buffer[ExpressionPosition] == DOS_DOT) { - /* First try to find whether we are beyond last dot (beyond name) */ - BeyondName = TRUE; - MatchingChars = NamePosition + 1; - while (MatchingChars < Name->Length / sizeof(WCHAR)) - { - if (Name->Buffer[MatchingChars] == L'.') - { - BeyondName = FALSE; - break; - } - MatchingChars++; - } - - /* If we are beyond name, we null match */ - if (BeyondName) - { - if (Name->Buffer[NamePosition] == L'.') - { - NamePosition++; - } - ExpressionPosition++; - continue; - } - /* If not, we only match a dot */ - else if (Name->Buffer[NamePosition] == L'.') + /* We only match dots */ + if (Name->Buffer[NamePosition] == L'.') { NamePosition++; - ExpressionPosition++; - continue; - } - /* Otherwise, fail */ - else - { - break; - } + } + /* Try to explore later on for null matching */ + else if ((ExpressionPosition + 1 < (USHORT)(Expression->Length / sizeof(WCHAR))) && + (Name->Buffer[NamePosition] == Expression->Buffer[ExpressionPosition + 1])) + { + NamePosition++; + } + ExpressionPosition++; } /* Check DOS_QM */ else if (Expression->Buffer[ExpressionPosition] == DOS_QM) { - /* Check whether we are upon a dot */ - MatchingChars = 0; - while (MatchingChars < NamePosition) - { - if (Name->Buffer[MatchingChars] == L'.') - { - break; - } - MatchingChars++; - } - - /* If not, we match a single char */ - if (MatchingChars == NamePosition && Name->Buffer[NamePosition] != L'.') + /* We match everything except dots */ + if (Name->Buffer[NamePosition] != L'.') { NamePosition++; - ExpressionPosition++; - } - else - { - /* If we are, we just go through QMs */ - while (ExpressionPosition < Expression->Length / sizeof(WCHAR) && - Expression->Buffer[ExpressionPosition] == DOS_QM) - { - ExpressionPosition++; - } - } + } + ExpressionPosition++; } /* If nothing match, try to backtrack */ else if (StarFound >= 0) { ExpressionPosition = BackTracking[StarFound--]; + } + else if (DosStarFound >= 0) + { + ExpressionPosition = DosBackTracking[DosStarFound--]; } /* Otherwise, fail */ else @@ -310,6 +265,10 @@ if (BackTracking) { ExFreePoolWithTag(BackTracking, 'nrSF'); + } + if (DosBackTracking) + { + ExFreePoolWithTag(DosBackTracking, 'nrSF'); } return (ExpressionPosition == Expression->Length / sizeof(WCHAR) && NamePosition == Name->Length / sizeof(WCHAR));

11 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
27
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 April 2013