Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[ion] 60086: [KERNEL32/NTDLL]: Fix definition of RtlCreateActivationContext (although the code is still 100% incompatible with Windows, at least it won't destroy the stack anymore when Windows' ker...

by ion＠svn.reactos.org

Author: ion Date: Fri Sep 13 22:44:57 2013 New Revision: 60086 URL: http://svn.reactos.org/svn/reactos?rev=60086&view=rev Log: [KERNEL32/NTDLL]: Fix definition of RtlCreateActivationContext (although the code is still 100% incompatible with Windows, at least it won't destroy the stack anymore when Windows' kernel32.dll tries to call it). Take the Windows definition of ACTIVATION_CONTEXT and use it instead. Also do the Windows behavior of allocating an ACTIVATION_CONTEXT_WRAPPED structure (which has a magic header), and returning the internal ACTIVATION_CONTEXT (and then looking up the "WRAPPED" whenever we need to check the magic). Ran kernel32:actctx and no regressions seen. My hope is to get the Rtl* interfaces at least compatible enough to Kernel32 from Windows so that when using it in ROS, it doesn't immediately crash and burn, we'll see how far that goes. I don't want to rewrite 2500 lines of XML parsing. Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/dll/ntdll/ldr/ldrutils.c trunk/reactos/dll/win32/kernel32/client/actctx.c trunk/reactos/dll/win32/kernel32/wine/actctx.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Fri Sep 13 22:44:57 2013 @@ -473,7 +473,7 @@ @ stdcall RtlCopyString(ptr ptr) @ stdcall RtlCopyUnicodeString(ptr ptr) @ stdcall RtlCreateAcl(ptr long long) -@ stdcall RtlCreateActivationContext(ptr ptr) +@ stdcall RtlCreateActivationContext(long ptr long ptr ptr ptr) @ stdcall RtlCreateAndSetSD(ptr long ptr ptr ptr) @ stdcall RtlCreateAtomTable(long ptr) @ stdcall RtlCreateBootStatusDataFile() Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Fri Sep 13 22:44:57 2013 @@ -38,7 +38,7 @@ ctx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID | ACTCTX_FLAG_HMODULE_VALID; ctx.hModule = module->DllBase; ctx.lpResourceName = (LPCWSTR)ISOLATIONAWARE_MANIFEST_RESOURCE_ID; - status = RtlCreateActivationContext( &module->EntryPointActivationContext, &ctx ); + status = RtlCreateActivationContext(0, (PVOID)&ctx, 0, NULL, NULL, &module->EntryPointActivationContext); } return status; } Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] Fri Sep 13 22:44:57 2013 @@ -20,7 +20,6 @@ QUERY_ACTCTX_FLAG_NO_ADDREF) /* PRIVATE FUNCTIONS *********************************************************/ - VOID NTAPI Modified: trunk/reactos/dll/win32/kernel32/wine/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/ac… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/actctx.c [iso-8859-1] Fri Sep 13 22:44:57 2013 @@ -107,7 +107,7 @@ TRACE("%p %08x\n", pActCtx, pActCtx ? pActCtx->dwFlags : 0); - if ((status = RtlCreateActivationContext(&hActCtx, (PVOID*)pActCtx))) + if ((status = RtlCreateActivationContext(0, (PVOID)pActCtx, 0, NULL, NULL, &hActCtx))) { SetLastError(RtlNtStatusToDosError(status)); return INVALID_HANDLE_VALUE; Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Fri Sep 13 22:44:57 2013 @@ -3511,8 +3511,12 @@ NTSTATUS NTAPI RtlCreateActivationContext( - _Out_ PHANDLE Handle, - _Inout_ PVOID ReturnedData + _In_ ULONG Flags, + _In_ PACTIVATION_CONTEXT_DATA ActivationContextData, + _In_ ULONG ExtraBytes, + _In_ PVOID NotificationRoutine, + _In_ PVOID NotificationContext, + _Out_ PACTIVATION_CONTEXT *ActCtx ); NTSYSAPI Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Fri Sep 13 22:44:57 2013 @@ -902,6 +902,18 @@ LIST_ENTRY FrameListCache; } ACTIVATION_CONTEXT_STACK, *PACTIVATION_CONTEXT_STACK; #endif + +typedef struct _ACTIVATION_CONTEXT_DATA +{ + ULONG Magic; + ULONG HeaderSize; + ULONG FormatVersion; + ULONG TotalSize; + ULONG DefaultTocOffset; + ULONG ExtendedTocOffset; + ULONG AssemblyRosterOffset; + ULONG Flags; +} ACTIVATION_CONTEXT_DATA, *PACTIVATION_CONTEXT_DATA; #endif /* NTOS_MODE_USER */ Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=60086… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Fri Sep 13 22:44:57 2013 @@ -34,7 +34,7 @@ ACTCTX_FLAG_SOURCE_IS_ASSEMBLYREF |\ ACTCTX_FLAG_HMODULE_VALID ) -#define ACTCTX_MAGIC 0xC07E3E11 +#define ACTCTX_MAGIC_MARKER (PVOID)'gMcA' #define ACTCTX_FAKE_HANDLE ((HANDLE) 0xf00baa) #define ACTCTX_FAKE_COOKIE ((ULONG_PTR) 0xf00bad) @@ -148,16 +148,40 @@ struct entity_array entities; }; +typedef struct _ASSEMBLY_STORAGE_MAP_ENTRY +{ + ULONG Flags; + UNICODE_STRING DosPath; + HANDLE Handle; +} ASSEMBLY_STORAGE_MAP_ENTRY, *PASSEMBLY_STORAGE_MAP_ENTRY; + +typedef struct _ASSEMBLY_STORAGE_MAP +{ + ULONG Flags; + ULONG AssemblyCount; + PASSEMBLY_STORAGE_MAP_ENTRY *AssemblyArray; +} ASSEMBLY_STORAGE_MAP, *PASSEMBLY_STORAGE_MAP; + typedef struct _ACTIVATION_CONTEXT { - ULONG magic; - long ref_count; - struct file_info config; - struct file_info appdir; - struct assembly *assemblies; - unsigned int num_assemblies; - unsigned int allocated_assemblies; -} ACTIVATION_CONTEXT; + LONG RefCount; + ULONG Flags; + LIST_ENTRY Links; + PACTIVATION_CONTEXT_DATA ActivationContextData; + PVOID NotificationRoutine; + PVOID NotificationContext; + ULONG SentNotifications[8]; + ULONG DisabledNotifications[8]; + ASSEMBLY_STORAGE_MAP StorageMap; + PASSEMBLY_STORAGE_MAP_ENTRY InlineStorageMapEntries; + ULONG StackTraceIndex; + PVOID StackTraces[4][4]; + struct file_info config; + struct file_info appdir; + struct assembly *assemblies; + unsigned int num_assemblies; + unsigned int allocated_assemblies; +} ACTIVATION_CONTEXT, *PIACTIVATION_CONTEXT; struct actctx_loader { @@ -166,6 +190,60 @@ unsigned int num_dependencies; unsigned int allocated_dependencies; }; + +typedef struct _ACTIVATION_CONTEXT_WRAPPED +{ + PVOID MagicMarker; + ACTIVATION_CONTEXT ActivationContext; +} ACTIVATION_CONTEXT_WRAPPED, *PACTIVATION_CONTEXT_WRAPPED; + +VOID +NTAPI +RtlpSxsBreakOnInvalidMarker(IN PACTIVATION_CONTEXT ActCtx, + IN ULONG FailureCode) +{ + EXCEPTION_RECORD ExceptionRecord; + + /* Fatal SxS exception header */ + ExceptionRecord.ExceptionRecord = NULL; + ExceptionRecord.ExceptionCode = STATUS_SXS_CORRUPTION; + ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; + + /* With SxS-specific information plus the context itself */ + ExceptionRecord.ExceptionInformation[0] = 1; + ExceptionRecord.ExceptionInformation[1] = FailureCode; + ExceptionRecord.ExceptionInformation[2] = (ULONG_PTR)ActCtx; + ExceptionRecord.NumberParameters = 3; + + /* Raise it */ + RtlRaiseException(&ExceptionRecord); +} + +FORCEINLINE +VOID +RtlpValidateActCtx(IN PACTIVATION_CONTEXT ActCtx) +{ + PACTIVATION_CONTEXT_WRAPPED pActual; + + /* Get the caller-opaque header */ + pActual = CONTAINING_RECORD(ActCtx, + ACTIVATION_CONTEXT_WRAPPED, + ActivationContext); + + /* Check if the header matches as expected */ + if (pActual->MagicMarker != ACTCTX_MAGIC_MARKER) + { + /* Nope, print out a warning, assert, and then throw an exception */ + DbgPrint("%s : Invalid activation context marker %p found in activation context %p\n" + " This means someone stepped on the allocation, or someone is using a\n" + " deallocated activation context\n", + __FUNCTION__, + pActual->MagicMarker, + ActCtx); + ASSERT(pActual->MagicMarker == ACTCTX_MAGIC_MARKER); + RtlpSxsBreakOnInvalidMarker(ActCtx, 1); + } +} static const WCHAR assemblyW[] = {'a','s','s','e','m','b','l','y',0}; static const WCHAR assemblyIdentityW[] = {'a','s','s','e','m','b','l','y','I','d','e','n','t','i','t','y',0}; @@ -210,8 +288,8 @@ static const WCHAR dotManifestW[] = {'.','m','a','n','i','f','e','s','t',0}; static const WCHAR version_formatW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; -static ACTIVATION_CONTEXT system_actctx = { ACTCTX_MAGIC, 1 }; -static ACTIVATION_CONTEXT *process_actctx = &system_actctx; +static ACTIVATION_CONTEXT_WRAPPED system_actctx = { ACTCTX_MAGIC_MARKER, { 1 } }; +static ACTIVATION_CONTEXT *process_actctx = &system_actctx.ActivationContext; static WCHAR *strdupW(const WCHAR* str) { @@ -551,15 +629,19 @@ append_string( ret, versionW, version ); return ret; } - static ACTIVATION_CONTEXT *check_actctx( HANDLE h ) { ACTIVATION_CONTEXT *ret = NULL, *actctx = h; + PACTIVATION_CONTEXT_WRAPPED pActual; if (!h || h == INVALID_HANDLE_VALUE) return NULL; _SEH2_TRY { - if (actctx && actctx->magic == ACTCTX_MAGIC) ret = actctx; + if (actctx) + { + pActual = CONTAINING_RECORD(actctx, ACTIVATION_CONTEXT_WRAPPED, ActivationContext); + if (pActual->MagicMarker == ACTCTX_MAGIC_MARKER) ret = &pActual->ActivationContext; + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -571,12 +653,14 @@ static inline void actctx_addref( ACTIVATION_CONTEXT *actctx ) { - InterlockedExchangeAdd( &actctx->ref_count, 1 ); + InterlockedExchangeAdd( &actctx->RefCount, 1 ); } static void actctx_release( ACTIVATION_CONTEXT *actctx ) { - if (InterlockedExchangeAdd( &actctx->ref_count, -1 ) == 1) + PACTIVATION_CONTEXT_WRAPPED pActual; + + if (InterlockedExchangeAdd(&actctx->RefCount, -1) == 1) { unsigned int i, j; @@ -599,8 +683,9 @@ RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->config.info ); RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->appdir.info ); RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->assemblies ); - actctx->magic = 0; - RtlFreeHeap( RtlGetProcessHeap(), 0, actctx ); + pActual = CONTAINING_RECORD(actctx, ACTIVATION_CONTEXT_WRAPPED, ActivationContext); + pActual->MagicMarker = 0; + RtlFreeHeap(RtlGetProcessHeap(), 0, pActual); } } @@ -2238,15 +2323,26 @@ ctx.hModule = NtCurrentTeb()->ProcessEnvironmentBlock->ImageBaseAddress; ctx.lpResourceName = (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID; - if (!RtlCreateActivationContext( &handle, &ctx )) process_actctx = check_actctx(handle); + if (NT_SUCCESS(RtlCreateActivationContext(0, (PVOID)&ctx, 0, NULL, NULL, &handle))) + { + process_actctx = check_actctx(handle); + } } /* FUNCTIONS ***************************************************************/ -NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, void *ptr ) -{ - const ACTCTXW *pActCtx = ptr; +NTSTATUS +NTAPI +RtlCreateActivationContext(IN ULONG Flags, + IN PACTIVATION_CONTEXT_DATA ActivationContextData, + IN ULONG ExtraBytes, + IN PVOID NotificationRoutine, + IN PVOID NotificationContext, + OUT PACTIVATION_CONTEXT *ActCtx) +{ + const ACTCTXW *pActCtx = (PVOID)ActivationContextData; const WCHAR *directory = NULL; + PACTIVATION_CONTEXT_WRAPPED ActualActCtx; ACTIVATION_CONTEXT *actctx; UNICODE_STRING nameW; ULONG lang = 0; @@ -2261,11 +2357,13 @@ return STATUS_INVALID_PARAMETER; - if (!(actctx = RtlAllocateHeap( RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*actctx) ))) + if (!(ActualActCtx = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ActualActCtx)))) return STATUS_NO_MEMORY; - actctx->magic = ACTCTX_MAGIC; - actctx->ref_count = 1; + ActualActCtx->MagicMarker = ACTCTX_MAGIC_MARKER; + + actctx = &ActualActCtx->ActivationContext; + actctx->RefCount = 1; actctx->config.type = ACTIVATION_CONTEXT_PATH_TYPE_NONE; actctx->config.info = NULL; actctx->appdir.type = ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE; @@ -2346,7 +2444,7 @@ free_depend_manifests( &acl ); if (NT_SUCCESS(status)) - *handle = actctx; + *ActCtx = actctx; else actctx_release( actctx ); return status; @@ -2356,23 +2454,73 @@ return status; } +#if 0 +#define ACT_CTX_VALID(p) ((((ULONG_PTR)p - 1) | 7) != -1) + VOID NTAPI -RtlAddRefActivationContext(HANDLE handle) -{ - ACTIVATION_CONTEXT *actctx; - - if ((actctx = check_actctx( handle ))) actctx_addref( actctx ); +RtlAddRefActivationContext(IN PACTIVATION_CONTEXT Handle) +{ + PIACTIVATION_CONTEXT ActCtx = (PIACTIVATION_CONTEXT)Handle; + LONG OldRefCount, NewRefCount; + + if ((ActCtx) && (ACT_CTX_VALID(ActCtx)) && (ActCtx->RefCount != LONG_MAX)) + { + RtlpValidateActCtx(ActCtx); + + while (TRUE) + { + OldRefCount = ActCtx->RefCount; + ASSERT(OldRefCount > 0); + + if (OldRefCount == LONG_MAX) break; + + NewRefCount = OldRefCount + 1; + if (InterlockedCompareExchange(&ActCtx->RefCount, + NewRefCount, + OldRefCount) == OldRefCount) + { + break; + } + } + + NewRefCount = LONG_MAX; + ASSERT(NewRefCount > 0); + } } VOID NTAPI RtlReleaseActivationContext( HANDLE handle ) { + PIACTIVATION_CONTEXT ActCtx = (PIACTIVATION_CONTEXT) Handle; + + if ((ActCtx) && (ACT_CTX_VALID(ActCtx)) && (ActCtx->RefCount != LONG_MAX)) + { + RtlpValidateActCtx(ActCtx); + + actctx_release(ActCtx); + } +} +#else +VOID +NTAPI +RtlAddRefActivationContext( HANDLE handle ) +{ ACTIVATION_CONTEXT *actctx; - if ((actctx = check_actctx( handle ))) actctx_release( actctx ); -} + if ((actctx = check_actctx(handle))) actctx_addref(actctx); +} + +VOID +NTAPI +RtlReleaseActivationContext( HANDLE handle ) +{ + ACTIVATION_CONTEXT *actctx; + + if ((actctx = check_actctx(handle))) actctx_release(actctx); +} +#endif NTSTATUS NTAPI RtlActivateActivationContextEx( ULONG flags, PTEB tebAddress, HANDLE handle, PULONG_PTR cookie )

11 years

[hbelusca] 60085: [KERNEL32] - npipe.c: * Use RtlPrefixUnicodeString instead of RtlPrefixString with casts. * Check results of RtlCreateUnicodeString and RtlPrefixUnicodeString, return FALSE if the...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Sep 13 22:27:41 2013 New Revision: 60085 URL: http://svn.reactos.org/svn/reactos?rev=60085&view=rev Log: [KERNEL32] - npipe.c: * Use RtlPrefixUnicodeString instead of RtlPrefixString with casts. * Check results of RtlCreateUnicodeString and RtlPrefixUnicodeString, return FALSE if they fail and set an appropriate last error. * Free the string created with RtlCreateUnicodeString instead of leaking memory. * Fix a path type check (RtlPathTypeUncAbsolute instead of RtlPathTypeRootLocalDevice). - path.c: I prefer seeing the default case at the end of the switch (no functional changes). [NTOS:MM] - Use RtlPrefixUnicodeString instead of RtlPrefixString with casts. [RTL] - RtlPrefixString acts on general PSTRINGs (which are not UNICODE). - Remove extra spaces between names of functions and parentheses. - Clarify the fact that we run over characters. Modified: trunk/reactos/dll/win32/kernel32/client/file/npipe.c trunk/reactos/dll/win32/kernel32/client/path.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/unicode.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/dll/win32/kernel32/client/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/npipe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/npipe.c [iso-8859-1] Fri Sep 13 22:27:41 2013 @@ -382,7 +382,11 @@ /* Start by making a unicode string of the name */ TRACE("Sent path: %S\n", lpNamedPipeName); - RtlCreateUnicodeString(&NamedPipeName, lpNamedPipeName); + if (!RtlCreateUnicodeString(&NamedPipeName, lpNamedPipeName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } NameLength = NamedPipeName.Length / sizeof(WCHAR); /* All slashes must become backslashes */ @@ -401,7 +405,14 @@ { /* Make sure it's a valid prefix */ RtlInitUnicodeString(&PipePrefix, L"\\\\.\\pipe\\"); - RtlPrefixString((PANSI_STRING)&PipePrefix, (PANSI_STRING)&NewName, TRUE); + if (!RtlPrefixUnicodeString(&PipePrefix, &NewName, TRUE)) + { + /* The name is invalid */ + WARN("Invalid name!\n"); + RtlFreeUnicodeString(&NamedPipeName); + BaseSetLastNTError(STATUS_OBJECT_PATH_SYNTAX_BAD); + return FALSE; + } /* Move past it */ NewName.Buffer += 9; @@ -411,7 +422,7 @@ TRACE("NewName: %wZ\n", &NewName); RtlInitUnicodeString(&DevicePath, L"\\DosDevices\\pipe\\"); } - else if (Type == RtlPathTypeRootLocalDevice) + else if (Type == RtlPathTypeUncAbsolute) { /* The path is \\server\\pipe\name; find the pipename itself */ p = &NewName.Buffer[2]; @@ -436,6 +447,7 @@ { /* The name is invalid */ WARN("Invalid name!\n"); + RtlFreeUnicodeString(&NamedPipeName); BaseSetLastNTError(STATUS_OBJECT_PATH_SYNTAX_BAD); return FALSE; } @@ -445,6 +457,7 @@ else { WARN("Invalid path type\n"); + RtlFreeUnicodeString(&NamedPipeName); BaseSetLastNTError(STATUS_OBJECT_PATH_SYNTAX_BAD); return FALSE; } @@ -455,6 +468,7 @@ WaitPipeInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, WaitPipeInfoSize); if (WaitPipeInfo == NULL) { + RtlFreeUnicodeString(&NamedPipeName); SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -478,9 +492,9 @@ { /* Fail; couldn't open */ WARN("Status: %lx\n", Status); + RtlFreeHeap(RtlGetProcessHeap(), 0, WaitPipeInfo); + RtlFreeUnicodeString(&NamedPipeName); BaseSetLastNTError(Status); - RtlFreeUnicodeString(&NamedPipeName); - RtlFreeHeap(RtlGetProcessHeap(), 0, WaitPipeInfo); return FALSE; } @@ -537,7 +551,7 @@ { /* Failure to wait on the pipe */ WARN("Status: %lx\n", Status); - BaseSetLastNTError (Status); + BaseSetLastNTError(Status); return FALSE; } Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Fri Sep 13 22:27:41 2013 @@ -740,25 +740,9 @@ /* Check what kind of path this is and how many slashes to skip */ switch (RtlDetermineDosPathNameType_U(Path)) { - case RtlPathTypeDriveAbsolute: - return Path + 3; - - case RtlPathTypeDriveRelative: - return Path + 2; - - case RtlPathTypeRooted: - return Path + 1; - - case RtlPathTypeRelative: - return Path; - - case RtlPathTypeRootLocalDevice: - default: - return NULL; - case RtlPathTypeUncAbsolute: case RtlPathTypeLocalDevice: - + { /* Keep going until we bypass the path indicators */ for (ReturnPath = Path + 2, i = 2; (i > 0) && (*ReturnPath); ReturnPath++) { @@ -767,6 +751,23 @@ } return ReturnPath; + } + + case RtlPathTypeDriveAbsolute: + return Path + 3; + + case RtlPathTypeDriveRelative: + return Path + 2; + + case RtlPathTypeRooted: + return Path + 1; + + case RtlPathTypeRelative: + return Path; + + case RtlPathTypeRootLocalDevice: + default: + return NULL; } } Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Fri Sep 13 22:27:41 2013 @@ -2165,8 +2165,8 @@ BOOLEAN NTAPI RtlPrefixString( - PCANSI_STRING String1, - PCANSI_STRING String2, + PSTRING String1, + PSTRING String2, BOOLEAN CaseInsensitive ); Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=6008… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Fri Sep 13 22:27:41 2013 @@ -835,17 +835,18 @@ BOOLEAN NTAPI RtlPrefixString( - PANSI_STRING String1, - PANSI_STRING String2, - BOOLEAN CaseInsensitive) + PSTRING String1, + PSTRING String2, + BOOLEAN CaseInsensitive) { PCHAR pc1; PCHAR pc2; - ULONG Length; - - if (String2->Length < String1->Length) return FALSE; - - Length = String1->Length; + ULONG NumChars; + + if (String2->Length < String1->Length) + return FALSE; + + NumChars = String1->Length; pc1 = String1->Buffer; pc2 = String2->Buffer; @@ -853,15 +854,15 @@ { if (CaseInsensitive) { - while (Length--) + while (NumChars--) { - if (RtlUpperChar (*pc1++) != RtlUpperChar (*pc2++)) + if (RtlUpperChar(*pc1++) != RtlUpperChar(*pc2++)) return FALSE; } } else { - while (Length--) + while (NumChars--) { if (*pc1++ != *pc2++) return FALSE; @@ -889,7 +890,7 @@ { PWCHAR pc1; PWCHAR pc2; - ULONG NumChars; + ULONG NumChars; if (String2->Length < String1->Length) return FALSE; @@ -923,6 +924,7 @@ return FALSE; } + /* * @implemented */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Fri Sep 13 22:27:41 2013 @@ -827,9 +827,9 @@ InLoadOrderLinks); /* Check if it matches */ - if (RtlPrefixString((PSTRING)&ForwarderName, - (PSTRING)&LdrEntry->BaseDllName, - TRUE)) + if (RtlPrefixUnicodeString(&ForwarderName, + &LdrEntry->BaseDllName, + TRUE)) { /* Get the forwarder export directory */ ForwardExportDirectory =

11 years

[akhaldi] 60084: [HIDUSB][USBHUB] * Silence some debug prints.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Sep 13 22:03:47 2013 New Revision: 60084 URL: http://svn.reactos.org/svn/reactos?rev=60084&view=rev Log: [HIDUSB][USBHUB] * Silence some debug prints. Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/pdo.c Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Fri Sep 13 22:03:47 2013 @@ -1649,7 +1649,7 @@ // // done // - DPRINT1("[HIDUSB] SelectConfiguration %x\n", Status); + DPRINT("[HIDUSB] SelectConfiguration %x\n", Status); if (NT_SUCCESS(Status)) { Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Sep 13 22:03:47 2013 @@ -231,8 +231,8 @@ return; } - DPRINT1("Port %d Status %x\n", PortId, PortStatus.Status); - DPRINT1("Port %d Change %x\n", PortId, PortStatus.Change); + DPRINT("Port %d Status %x\n", PortId, PortStatus.Status); + DPRINT("Port %d Change %x\n", PortId, PortStatus.Change); // @@ -322,8 +322,8 @@ return; } - DPRINT1("Port %d Status %x\n", PortId, PortStatus.Status); - DPRINT1("Port %d Change %x\n", PortId, PortStatus.Change); + DPRINT("Port %d Status %x\n", PortId, PortStatus.Status); + DPRINT("Port %d Change %x\n", PortId, PortStatus.Change); // // Check that reset was cleared @@ -1268,8 +1268,8 @@ goto Cleanup; } - DumpDeviceDescriptor(&UsbChildExtension->DeviceDesc); - DumpConfigurationDescriptor(&ConfigDesc); + //DumpDeviceDescriptor(&UsbChildExtension->DeviceDesc); + //DumpConfigurationDescriptor(&ConfigDesc); // // FIXME: Support more than one configuration and one interface? Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Fri Sep 13 22:03:47 2013 @@ -237,22 +237,22 @@ // Debugging only // case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: - DPRINT1("URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE\n"); + DPRINT("URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE\n"); break; case URB_FUNCTION_CLASS_DEVICE: - DPRINT1("URB_FUNCTION_CLASS_DEVICE\n"); + DPRINT("URB_FUNCTION_CLASS_DEVICE\n"); break; case URB_FUNCTION_GET_STATUS_FROM_DEVICE: - DPRINT1("URB_FUNCTION_GET_STATUS_FROM_DEVICE\n"); + DPRINT("URB_FUNCTION_GET_STATUS_FROM_DEVICE\n"); break; case URB_FUNCTION_SELECT_CONFIGURATION: - DPRINT1("URB_FUNCTION_SELECT_CONFIGURATION\n"); + DPRINT("URB_FUNCTION_SELECT_CONFIGURATION\n"); break; case URB_FUNCTION_SELECT_INTERFACE: - DPRINT1("URB_FUNCTION_SELECT_INTERFACE\n"); + DPRINT("URB_FUNCTION_SELECT_INTERFACE\n"); break; case URB_FUNCTION_CLASS_OTHER: - DPRINT1("URB_FUNCTION_CLASS_OTHER\n"); + DPRINT("URB_FUNCTION_CLASS_OTHER\n"); break; case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: { @@ -273,7 +273,7 @@ } case URB_FUNCTION_CLASS_INTERFACE: - DPRINT1("URB_FUNCTION_CLASS_INTERFACE\n"); + DPRINT("URB_FUNCTION_CLASS_INTERFACE\n"); break; case URB_FUNCTION_VENDOR_DEVICE: DPRINT("URB_FUNCTION_VENDOR_DEVICE\n");

11 years

[hbelusca] 60083: [MOUNTMGR] - Clarify the code (use properly RtlPrefixUnicodeString) - 'if' level--;

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Sep 13 22:02:07 2013 New Revision: 60083 URL: http://svn.reactos.org/svn/reactos?rev=60083&view=rev Log: [MOUNTMGR] - Clarify the code (use properly RtlPrefixUnicodeString) - 'if' level--; Modified: trunk/reactos/drivers/filters/mountmgr/device.c trunk/reactos/drivers/filters/mountmgr/mountmgr.c trunk/reactos/drivers/filters/mountmgr/symlink.c Modified: trunk/reactos/drivers/filters/mountmgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] Fri Sep 13 22:02:07 2013 @@ -555,13 +555,21 @@ } /* Now everything is fine, start processing */ + if (RtlPrefixUnicodeString(&DeviceFloppy, &TargetDeviceName, TRUE)) { + /* If the device is a floppy, start with letter A */ DriveLetter = 'A'; } + else if (RtlPrefixUnicodeString(&DeviceCdRom, &TargetDeviceName, TRUE)) + { + /* If the device is a CD-ROM, start with letter D */ + DriveLetter = 'D'; + } else { - DriveLetter = 'C' + RtlPrefixUnicodeString(&DeviceCdRom, &TargetDeviceName, TRUE); + /* Finally, if it's a disk, use C */ + DriveLetter = 'C'; } /* We cannot set NO drive letter */ Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] Fri Sep 13 22:02:07 2013 @@ -169,19 +169,22 @@ } } - /* If caller didn't provide a letter, let's find one for him. - * If device is a floppy, start with letter A - */ + /* If caller didn't provide a letter, let's find one for him */ + if (RtlPrefixUnicodeString(&DeviceFloppy, DeviceName, TRUE)) { + /* If the device is a floppy, start with letter A */ Letter = 'A'; } + else if (RtlPrefixUnicodeString(&DeviceCdRom, DeviceName, TRUE)) + { + /* If the device is a CD-ROM, start with letter D */ + Letter = 'D'; + } else { - /* Otherwise, if device is a cd rom, then, start with D. - * Finally, if a disk, use C - */ - Letter = RtlPrefixUnicodeString(&DeviceCdRom, DeviceName, TRUE) + 'C'; + /* Finally, if it's a disk, use C */ + Letter = 'C'; } /* Try to affect a letter (up to Z, ofc) until it's possible */ Modified: trunk/reactos/drivers/filters/mountmgr/symlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/s… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/symlink.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/symlink.c [iso-8859-1] Fri Sep 13 22:02:07 2013 @@ -67,38 +67,35 @@ DosName->Length - DosDevices.Length); IntGlobal.Buffer[IntGlobal.Length / sizeof(WCHAR)] = UNICODE_NULL; } + else if (RtlPrefixUnicodeString(&Global, DosName, TRUE)) + { + /* Switch to DOS global */ + IntGlobal.Length = DosName->Length - Global.Length + DosGlobal.Length; + IntGlobal.MaximumLength = IntGlobal.Length + sizeof(WCHAR); + IntGlobal.Buffer = AllocatePool(IntGlobal.MaximumLength); + if (!IntGlobal.Buffer) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(IntGlobal.Buffer, DosGlobal.Buffer, DosGlobal.Length); + RtlCopyMemory(IntGlobal.Buffer + (DosGlobal.Length / sizeof(WCHAR)), + DosName->Buffer + (Global.Length / sizeof(WCHAR)), + DosName->Length - Global.Length); + IntGlobal.Buffer[IntGlobal.Length / sizeof(WCHAR)] = UNICODE_NULL; + } else { - if (RtlPrefixUnicodeString(&Global, DosName, TRUE)) - { - /* Switch to DOS global */ - IntGlobal.Length = DosName->Length - Global.Length + DosGlobal.Length; - IntGlobal.MaximumLength = IntGlobal.Length + sizeof(WCHAR); - IntGlobal.Buffer = AllocatePool(IntGlobal.MaximumLength); - if (!IntGlobal.Buffer) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCopyMemory(IntGlobal.Buffer, DosGlobal.Buffer, DosGlobal.Length); - RtlCopyMemory(IntGlobal.Buffer + (DosGlobal.Length / sizeof(WCHAR)), - DosName->Buffer + (Global.Length / sizeof(WCHAR)), - DosName->Length - Global.Length); - IntGlobal.Buffer[IntGlobal.Length / sizeof(WCHAR)] = UNICODE_NULL; - } - else - { - /* Simply duplicate string */ - IntGlobal.Length = DosName->Length; - IntGlobal.MaximumLength = DosName->MaximumLength; - IntGlobal.Buffer = AllocatePool(IntGlobal.MaximumLength); - if (!IntGlobal.Buffer) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCopyMemory(IntGlobal.Buffer, DosName->Buffer, IntGlobal.MaximumLength); - } + /* Simply duplicate string */ + IntGlobal.Length = DosName->Length; + IntGlobal.MaximumLength = DosName->MaximumLength; + IntGlobal.Buffer = AllocatePool(IntGlobal.MaximumLength); + if (!IntGlobal.Buffer) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(IntGlobal.Buffer, DosName->Buffer, IntGlobal.MaximumLength); } /* Return string */

11 years

[akhaldi] 60082: [XCOPY] * Move the resource files to the lang folder. CORE-7455 #resolve

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Sep 13 20:36:02 2013 New Revision: 60082 URL: http://svn.reactos.org/svn/reactos?rev=60082&view=rev Log: [XCOPY] * Move the resource files to the lang folder. CORE-7455 #resolve Added: trunk/reactos/base/applications/cmdutils/xcopy/lang/ (with props) trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/Da.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/De.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/De.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/En.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/En.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Es.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/Es.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Fr.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/It.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/It.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ja.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ko.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Lt.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Nl.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/No.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Pt.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ro.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ru.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Si.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/Si.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Sr.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/Sr.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Sv.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/Sv.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Uk.rc - copied unchanged from r60041, trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc Removed: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc trunk/reactos/base/applications/cmdutils/xcopy/De.rc trunk/reactos/base/applications/cmdutils/xcopy/En.rc trunk/reactos/base/applications/cmdutils/xcopy/Es.rc trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc trunk/reactos/base/applications/cmdutils/xcopy/It.rc trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc trunk/reactos/base/applications/cmdutils/xcopy/No.rc trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc trunk/reactos/base/applications/cmdutils/xcopy/Si.rc trunk/reactos/base/applications/cmdutils/xcopy/Sr.rc trunk/reactos/base/applications/cmdutils/xcopy/Sv.rc trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…

11 years

[akhaldi] 60081: [INCLUDES] * Deduplicate wpp.h and make the host one redirect to it.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Sep 13 20:32:30 2013 New Revision: 60081 URL: http://svn.reactos.org/svn/reactos?rev=60081&view=rev Log: [INCLUDES] * Deduplicate wpp.h and make the host one redirect to it. Modified: trunk/reactos/include/host/wine/wpp.h trunk/reactos/include/reactos/wine/wpp.h Modified: trunk/reactos/include/host/wine/wpp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/wine/wpp.h?re… ============================================================================== --- trunk/reactos/include/host/wine/wpp.h [iso-8859-1] (original) +++ trunk/reactos/include/host/wine/wpp.h [iso-8859-1] Fri Sep 13 20:32:30 2013 @@ -1,62 +1 @@ -/* - * Exported functions of the Wine preprocessor - * - * Copyright 2002 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_WPP_H -#define __WINE_WPP_H - -#include <stdio.h> -#include <stdarg.h> - -struct wpp_callbacks -{ - /* I/O callbacks */ - - /* Looks for a file to include, returning the path where it is found */ - /* parent_name is the directory of the parent source file (for local - * includes), includepath is an array of additional include paths */ - char *(*lookup)( const char *filename, const char *parent_name, - char **include_path, int include_path_count ); - /* Opens an include file */ - /* The type param is true if it is a local ("...") include */ - void *(*open)( const char *filename, int type ); - /* Closes a previously opened file */ - void (*close)( void *file ); - /* Reads buffer from the input */ - int (*read)( void *file, char *buffer, unsigned int len ); - /* Writes buffer to the output */ - void (*write)( const char *buffer, unsigned int len ); - - /* Error callbacks */ - void (*error)( const char *file, int line, int col, const char *near, const char *msg, va_list ap ); - void (*warning)( const char *file, int line, int col, const char *near, const char *msg, va_list ap ); -}; - -/* Return value == 0 means successful execution */ -extern int wpp_add_define( const char *name, const char *value ); -extern void wpp_del_define( const char *name ); -extern int wpp_add_cmdline_define( const char *value ); -extern void wpp_set_debug( int lex_debug, int parser_debug, int msg_debug ); -extern void wpp_set_pedantic( int on ); -extern int wpp_add_include_path( const char *path ); -extern char *wpp_find_include( const char *name, const char *parent_name ); -extern int wpp_parse( const char *input, FILE *output ); -extern void wpp_set_callbacks( const struct wpp_callbacks *callbacks ); - -#endif /* __WINE_WPP_H */ +#include "../../reactos/wine/wpp.h" Modified: trunk/reactos/include/reactos/wine/wpp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wpp.h… ============================================================================== --- trunk/reactos/include/reactos/wine/wpp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/wpp.h [iso-8859-1] Fri Sep 13 20:32:30 2013 @@ -22,15 +22,41 @@ #define __WINE_WPP_H #include <stdio.h> +#include <stdarg.h> -extern void wpp_add_define( const char *name, const char *value ); +struct wpp_callbacks +{ + /* I/O callbacks */ + + /* Looks for a file to include, returning the path where it is found */ + /* parent_name is the directory of the parent source file (for local + * includes), includepath is an array of additional include paths */ + char *(*lookup)( const char *filename, const char *parent_name, + char **include_path, int include_path_count ); + /* Opens an include file */ + /* The type param is true if it is a local ("...") include */ + void *(*open)( const char *filename, int type ); + /* Closes a previously opened file */ + void (*close)( void *file ); + /* Reads buffer from the input */ + int (*read)( void *file, char *buffer, unsigned int len ); + /* Writes buffer to the output */ + void (*write)( const char *buffer, unsigned int len ); + + /* Error callbacks */ + void (*error)( const char *file, int line, int col, const char *near, const char *msg, va_list ap ); + void (*warning)( const char *file, int line, int col, const char *near, const char *msg, va_list ap ); +}; + +/* Return value == 0 means successful execution */ +extern int wpp_add_define( const char *name, const char *value ); extern void wpp_del_define( const char *name ); -extern void wpp_add_cmdline_define( const char *value ); +extern int wpp_add_cmdline_define( const char *value ); extern void wpp_set_debug( int lex_debug, int parser_debug, int msg_debug ); extern void wpp_set_pedantic( int on ); -extern void wpp_add_include_path( const char *path ); +extern int wpp_add_include_path( const char *path ); extern char *wpp_find_include( const char *name, const char *parent_name ); extern int wpp_parse( const char *input, FILE *output ); -extern int wpp_parse_temp( const char *input, const char *output_base, char **output_name ); +extern void wpp_set_callbacks( const struct wpp_callbacks *callbacks ); #endif /* __WINE_WPP_H */

11 years

[akhaldi] 60080: [PSDK] * Add missing EDS_ROTATEDMODE definition.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Sep 13 20:10:57 2013 New Revision: 60080 URL: http://svn.reactos.org/svn/reactos?rev=60080&view=rev Log: [PSDK] * Add missing EDS_ROTATEDMODE definition. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Fri Sep 13 20:10:57 2013 @@ -2724,6 +2724,7 @@ #define MONITOR_DEFAULTTONEAREST 2 #define MONITORINFOF_PRIMARY 1 #define EDS_RAWMODE 0x00000002 +#define EDS_ROTATEDMODE 0x00000004 #define ISMEX_NOSEND 0x00000000 #define ISMEX_CALLBACK 0x00000004 #define ISMEX_NOTIFY 0x00000002

11 years

[tfaber] 60079: [QMGR_WINETEST] - Enable qmgr tests again. They all get skipped now instead of crashing. When npfs_new manages to run these, we know it's really working well ; ) CORE-6536

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Sep 13 12:54:33 2013 New Revision: 60079 URL: http://svn.reactos.org/svn/reactos?rev=60079&view=rev Log: [QMGR_WINETEST] - Enable qmgr tests again. They all get skipped now instead of crashing. When npfs_new manages to run these, we know it's really working well ;) CORE-6536 Modified: trunk/rostests/winetests/qmgr/testlist.c Modified: trunk/rostests/winetests/qmgr/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/testlist.c… ============================================================================== --- trunk/rostests/winetests/qmgr/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/qmgr/testlist.c [iso-8859-1] Fri Sep 13 12:54:33 2013 @@ -9,21 +9,12 @@ extern void func_job(void); extern void func_qmgr(void); -#ifdef __REACTOS__ -void func_skipped(void) { skip("qmgr tests skipped due to CORE-6536\n"); } -#endif - const struct test winetest_testlist[] = { -/* Skipped because of testbot timeouts. See CORE-6536. */ -#ifdef __REACTOS__ - { "skipped", func_skipped }, -#else { "enum_files", func_enum_files }, { "enum_jobs", func_enum_jobs }, { "file", func_file }, { "job", func_job }, { "qmgr", func_qmgr }, -#endif { 0, 0 } };

11 years

[tfaber] 60078: [NPFS_NEW] - Use documented functions

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Sep 13 12:46:32 2013 New Revision: 60078 URL: http://svn.reactos.org/svn/reactos?rev=60078&view=rev Log: [NPFS_NEW] - Use documented functions Modified: trunk/reactos/drivers/filesystems/npfs_new/secursup.c trunk/reactos/drivers/filesystems/npfs_new/strucsup.c trunk/reactos/drivers/filesystems/npfs_new/waitsup.c Modified: trunk/reactos/drivers/filesystems/npfs_new/secursup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/secursup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/secursup.c [iso-8859-1] Fri Sep 13 12:46:32 2013 @@ -48,7 +48,7 @@ ClientToken = ClientContext->ClientToken; if ((TokenType == TokenPrimary) || (ClientToken)) { - ObfDereferenceObject(ClientToken); + ObDereferenceObject(ClientToken); } ExFreePool(ClientContext); } Modified: trunk/reactos/drivers/filesystems/npfs_new/strucsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/strucsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/strucsup.c [iso-8859-1] Fri Sep 13 12:46:32 2013 @@ -56,7 +56,7 @@ { if (!Buffer) return FALSE; - ObfDereferenceObject(((PNP_EVENT_BUFFER)Buffer)->Event); + ObDereferenceObject(((PNP_EVENT_BUFFER)Buffer)->Event); return RtlDeleteElementGenericTable(Table, Buffer); } Modified: trunk/reactos/drivers/filesystems/npfs_new/waitsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/waitsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/waitsup.c [iso-8859-1] Fri Sep 13 12:46:32 2013 @@ -28,7 +28,7 @@ WaitQueue = (PNP_WAIT_QUEUE)Irp->Tail.Overlay.DriverContext[0]; - OldIrql = KfAcquireSpinLock(&WaitQueue->WaitLock); + KeAcquireSpinLock(&WaitQueue->WaitLock, &OldIrql); WaitEntry = (PNP_WAIT_QUEUE_ENTRY)Irp->Tail.Overlay.DriverContext[1]; if (WaitEntry) @@ -41,7 +41,7 @@ } } - KfReleaseSpinLock(&WaitQueue->WaitLock, OldIrql); + KeReleaseSpinLock(&WaitQueue->WaitLock, OldIrql); if (WaitEntry) { @@ -65,7 +65,7 @@ KIRQL OldIrql; PNP_WAIT_QUEUE_ENTRY WaitEntry = Context; - OldIrql = KfAcquireSpinLock(&WaitEntry->WaitQueue->WaitLock); + KeAcquireSpinLock(&WaitEntry->WaitQueue->WaitLock, &OldIrql); Irp = WaitEntry->Irp; if (Irp) @@ -79,7 +79,7 @@ } } - KfReleaseSpinLock(&WaitEntry->WaitQueue->WaitLock, OldIrql); + KeReleaseSpinLock(&WaitEntry->WaitQueue->WaitLock, OldIrql); if (Irp) { @@ -125,7 +125,7 @@ RtlInitEmptyUnicodeString(&DestinationString, Buffer, PipeName->Length); RtlUpcaseUnicodeString(&DestinationString, PipeName, FALSE); - OldIrql = KfAcquireSpinLock(&WaitQueue->WaitLock); + KeAcquireSpinLock(&WaitQueue->WaitLock, &OldIrql); for (NextEntry = WaitQueue->WaitList.Flink; NextEntry != &WaitQueue->WaitList; @@ -187,7 +187,7 @@ } } - KfReleaseSpinLock(&WaitQueue->WaitLock, OldIrql); + KeReleaseSpinLock(&WaitQueue->WaitLock, OldIrql); ExFreePool(DestinationString.Buffer); @@ -261,7 +261,7 @@ Irp->Tail.Overlay.DriverContext[0] = WaitQueue; Irp->Tail.Overlay.DriverContext[1] = WaitEntry; - OldIrql = KfAcquireSpinLock(&WaitQueue->WaitLock); + KeAcquireSpinLock(&WaitQueue->WaitLock, &OldIrql); IoSetCancelRoutine(Irp, NpCancelWaitQueueIrp); @@ -284,7 +284,7 @@ } - KfReleaseSpinLock(&WaitQueue->WaitLock, OldIrql); + KeReleaseSpinLock(&WaitQueue->WaitLock, OldIrql); if (WaitEntry) ExFreePool(WaitEntry); return Status;

11 years

[tfaber] 60077: [NPFS_NEW] - Fix another DataQueue->QueueState condition - Use IsListEmpty for readability

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Sep 13 12:41:44 2013 New Revision: 60077 URL: http://svn.reactos.org/svn/reactos?rev=60077&view=rev Log: [NPFS_NEW] - Fix another DataQueue->QueueState condition - Use IsListEmpty for readability Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] Fri Sep 13 12:41:44 2013 @@ -135,7 +135,7 @@ DataQueue->QuotaUsed -= QueueEntry->QuotaInEntry; - if (DataQueue->Queue.Flink == &DataQueue->Queue) + if (IsListEmpty(&DataQueue->Queue)) { DataQueue->QueueState = Empty; HasWrites = 0; @@ -239,7 +239,9 @@ ClientSecurityContext = DataEntry->ClientSecurityContext; CompleteWrites = 1; - if (!DataQueue->QueueState != WriteEntries || DataQueue->QuotaUsed < DataQueue->Quota || !DataEntry->QuotaInEntry) + if (DataQueue->QueueState != WriteEntries || + DataQueue->QuotaUsed < DataQueue->Quota || + !DataEntry->QuotaInEntry) { CompleteWrites = 0; } @@ -248,7 +250,7 @@ DataQueue->QuotaUsed -= DataEntry->QuotaInEntry; --DataQueue->EntriesInQueue; - if (DataQueue->Queue.Flink == &DataQueue->Queue) + if (IsListEmpty(&DataQueue->Queue)) { DataQueue->QueueState = Empty; ASSERT(DataQueue->BytesInQueue == 0); @@ -288,7 +290,7 @@ NpAddDataQueueEntry(IN ULONG NamedPipeEnd, IN PNP_CCB Ccb, IN PNP_DATA_QUEUE DataQueue, - IN ULONG Who, + IN ULONG Who, IN ULONG Type, IN ULONG DataSize, IN PIRP Irp, @@ -433,7 +435,7 @@ { ASSERT(DataQueue->BytesInQueue == 0); ASSERT(DataQueue->EntriesInQueue == 0); - ASSERT(IsListEmpty (&DataQueue->Queue)); + ASSERT(IsListEmpty(&DataQueue->Queue)); } else {

11 years

← Newer
1
...
38
39
40
41
42
43
44
...
56
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2013