Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 59367: [SHELL32] Properly disable DDE tests.
by spetreolle＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: spetreolle Date: Sat Jun 29 17:35:05 2013 New Revision: 59367 URL: http://svn.reactos.org/svn/reactos?rev=59367&view=rev Log: [SHELL32] Properly disable DDE tests. Modified: trunk/rostests/winetests/shell32/CMakeLists.txt trunk/rostests/winetests/shell32/progman_dde.c trunk/rostests/winetests/shell32/shlexec.c trunk/rostests/winetests/shell32/testlist.c Modified: trunk/rostests/winetests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] Sat Jun 29 17:35:05 2013 @@ -10,7 +10,7 @@ brsfolder.c ebrowser.c generated.c - #progman_dde.c FIXME: CORE-6559 + progman_dde.c recyclebin.c shelldispatch.c shelllink.c Modified: trunk/rostests/winetests/shell32/progman_dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/progman… ============================================================================== --- trunk/rostests/winetests/shell32/progman_dde.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/progman_dde.c [iso-8859-1] Sat Jun 29 17:35:05 2013 @@ -695,6 +695,11 @@ START_TEST(progman_dde) { + if(!winetest_interactive) + { + skip("Skipping progman_dde() until we have a sane DDE implementation. CORE-6559.\n"); + return; + } DWORD instance = 0; UINT err; HSZ hszProgman; Modified: trunk/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec… ============================================================================== --- trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] Sat Jun 29 17:35:05 2013 @@ -58,7 +58,7 @@ static char child_file[MAX_PATH]; static DLLVERSIONINFO dllver; static BOOL skip_noassoc_tests = FALSE; -//static HANDLE dde_ready_event; FIXME: CORE-6559 +static HANDLE dde_ready_event; /*** @@ -2079,7 +2079,6 @@ int todo; } dde_tests_t; -#if CORE_6559_IS_FIXED static dde_tests_t dde_tests[] = { /* Test passing and not passing command-line @@ -2276,7 +2275,6 @@ CloseHandle(map); hook_WaitForInputIdle((void *) WaitForInputIdle); } -#endif #define DDE_DEFAULT_APP_VARIANTS 2 typedef struct @@ -2287,7 +2285,6 @@ int rc[DDE_DEFAULT_APP_VARIANTS]; } dde_default_app_tests_t; -#if CORE_6559_IS_FIXED static dde_default_app_tests_t dde_default_app_tests[] = { /* Windows XP and 98 handle default DDE app names in different ways. @@ -2447,7 +2444,6 @@ assert(DdeFreeStringHandle(ddeInst, hszApplication)); assert(DdeUninitialize(ddeInst)); } -#endif static void init_test(void) { @@ -2662,12 +2658,16 @@ test_find_executable(); test_lnks(); test_exes(); -#if CORE_6559_IS_FIXED +if(winetest_interactive) +{ test_dde(); test_dde_default_app(); -#endif +} +else +{ win_skip("Skipping test_dde() until we have a sane DDE implementation. CORE-6559.\n"); win_skip("Skipping test_dde_default_app() until we have a sane DDE implementation. CORE-6559.\n"); +} test_directory(); cleanup_test(); Modified: trunk/rostests/winetests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/testlis… ============================================================================== --- trunk/rostests/winetests/shell32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/testlist.c [iso-8859-1] Sat Jun 29 17:35:05 2013 @@ -12,7 +12,7 @@ extern void func_brsfolder(void); extern void func_ebrowser(void); extern void func_generated(void); -//extern void func_progman_dde(void); FIXME: bug 7233 +extern void func_progman_dde(void); extern void func_recyclebin(void); extern void func_shelldispatch(void); extern void func_shelllink(void); @@ -34,7 +34,7 @@ { "brsfolder", func_brsfolder }, { "ebrowser", func_ebrowser }, { "generated", func_generated }, -// { "progman_dde", func_progman_dde }, FIXME: bug 7233 + { "progman_dde", func_progman_dde }, { "recyclebin", func_recyclebin }, { "shelldispatch", func_shelldispatch }, { "shelllink", func_shelllink },

1 0

[hbelusca] 59366: [RTL:PATH] - Use UNICODE markers for characters (the L'.' symbol for example) (i.e. fix code originating from Wine). - Accept NULL Path/FileName in RtlDosSearchPath_U (fixes some ...
by hbelusca＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: hbelusca Date: Sat Jun 29 15:29:09 2013 New Revision: 59366 URL: http://svn.reactos.org/svn/reactos?rev=59366&view=rev Log: [RTL:PATH] - Use UNICODE markers for characters (the L'.' symbol for example) (i.e. fix code originating from Wine). - Accept NULL Path/FileName in RtlDosSearchPath_U (fixes some ntdll_apitest tests, see after). Fixes for RtlGetFullPathName_Ustr: ================================== - Rework RtlGetFullPathName_Ustr by "reusing" little parts of the code of our old RtlGetFullPathName_U coming from Wine (and then make RtlGetFullPathName_U call RtlGetFullPathName_Ustr instead). - Include the get_full_path_helper code into RtlGetFullPathName_Ustr and NT'ify it, and fix it too: * Fix skipping trailing path separators (slashes / backslashes) at the end of pathes. * Zero-out the destination buffer * Fix retrieving the "Short Name" (ie. the file name) out from the given full path name. * Fix remaining UNC path handling (ie. correctly remove trailing points, spaces, in UNC paths). They fix the following tests: * kernel32:FindFiles (6 failures to full success) * ntdll:RtlDosPathNameToNtPathName_U (4 failures to full success) * ntdll:RtlDosSearchPath_U (6 failures to full success) * ntdll:RtlGetFullPathName_U (8 failures down to 2 failures because we don't correctly NULLify the user buffer when trimming unneeded chars) * ntdll:RtlGetFullPathName_UstrEx (6 failures down to 2 failures for the same reasons as the previous test) To Do: Finish to NT'ify the code originated from Wine, fix NULLification of the user buffer (when trimming unneeded characters), and "clean" the code ie. remove extra DPRINTs and added FIXMEs and NOTEs comments. Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=59366&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Sat Jun 29 15:29:09 2013 @@ -141,7 +141,7 @@ { /* Stop if we hit something else than a space or period */ c = PathCopy.Buffer[PathChars - 1]; - if ((c != '.') && (c != ' ')) break; + if ((c != L'.') && (c != L' ')) break; /* Fixup the lengths */ PathCopy.Length -= sizeof(WCHAR); @@ -160,7 +160,7 @@ { /* Check if the character is a path or drive separator */ c = *End; - if (IS_PATH_SEPARATOR(c) || ((c == ':') && (End == PathCopy.Buffer + 1))) + if (IS_PATH_SEPARATOR(c) || ((c == L':') && (End == PathCopy.Buffer + 1))) { /* Get the next lower case character */ End++; @@ -168,7 +168,7 @@ /* Check if it's a DOS device (LPT, COM, PRN, AUX, or NUL) */ if ((End < &PathCopy.Buffer[OriginalLength / sizeof(WCHAR)]) && - ((c == 'l') || (c == 'c') || (c == 'p') || (c == 'a') || (c == 'n'))) + ((c == L'l') || (c == L'c') || (c == L'p') || (c == L'a') || (c == L'n'))) { /* Calculate the offset */ ReturnOffset = (USHORT)((PCHAR)End - (PCHAR)PathCopy.Buffer); @@ -191,7 +191,7 @@ /* Get the next lower case character and check if it's a DOS device */ c = RtlDowncaseUnicodeChar(*PathCopy.Buffer); - if ((c != 'l') && (c != 'c') && (c != 'p') && (c != 'a') && (c != 'n')) + if ((c != L'l') && (c != L'c') && (c != L'p') && (c != L'a') && (c != L'n')) { /* Not LPT, COM, PRN, AUX, or NUL */ return 0; @@ -204,12 +204,12 @@ while (Start < End) { c = *Start; - if ((c == '.') || (c == ':')) break; + if ((c == L'.') || (c == L':')) break; Start++; } /* And then go backwards to get rid of spaces */ - while ((Start > PathCopy.Buffer) && (Start[-1] == ' ')) --Start; + while ((Start > PathCopy.Buffer) && (Start[-1] == L' ')) --Start; /* Finally see how many characters are left, and that's our size */ PathChars = (USHORT)(Start - PathCopy.Buffer); @@ -217,7 +217,7 @@ /* Check if this is a COM or LPT port, which has a digit after it */ if ((PathChars == 4) && - (iswdigit(PathCopy.Buffer[3]) && (PathCopy.Buffer[3] != '0'))) + (iswdigit(PathCopy.Buffer[3]) && (PathCopy.Buffer[3] != L'0'))) { /* Don't compare the number part, just check for LPT or COM */ PathCopy.Length -= sizeof(WCHAR); @@ -282,6 +282,122 @@ /* Return the status */ return Status; +} + + + +/****************************************************************** + * RtlpCollapsePath (from WINE) + * + * Helper for RtlGetFullPathName_U. + * 1) Convert slashes into backslashes + * 2) Get rid of duplicate backslashes + * 3) Get rid of . and .. components in the path. + */ +static VOID +RtlpCollapsePath(PWSTR path, ULONG mark, BOOLEAN SkipTrailingPathSeparators) +{ + PWSTR p, next; + + /* convert every / into a \ */ + for (p = path; *p; p++) + { + if (*p == L'/') *p = L'\\'; + } + + /* collapse duplicate backslashes */ + next = path + max( 1, mark ); + for (p = next; *p; p++) + { + if (*p != L'\\' || next[-1] != L'\\') *next++ = *p; + } + *next = UNICODE_NULL; + + p = path + mark; + while (*p) + { + if (*p == L'.') + { + switch(p[1]) + { + case UNICODE_NULL: /* final . */ + if (p > path + mark) p--; + *p = UNICODE_NULL; + continue; + case L'\\': /* .\ component */ + next = p + 2; + RtlMoveMemory( p, next, (wcslen(next) + 1) * sizeof(WCHAR) ); + continue; + case L'.': + if (p[2] == L'\\') /* ..\ component */ + { + next = p + 3; + if (p > path + mark) + { + p--; + while (p > path + mark && p[-1] != L'\\') p--; + } + RtlMoveMemory( p, next, (wcslen(next) + 1) * sizeof(WCHAR) ); + continue; + } + else if (!p[2]) /* final .. */ + { + if (p > path + mark) + { + p--; + while (p > path + mark && p[-1] != L'\\') p--; + if (p > path + mark) p--; + } + *p = UNICODE_NULL; + continue; + } + break; + } + } + /* skip to the next component */ + while (*p && *p != L'\\') p++; + if (*p == L'\\') + { + /* remove last dot in previous dir name */ + if (p > path + mark && p[-1] == L'.') + RtlMoveMemory( p-1, p, (wcslen(p) + 1) * sizeof(WCHAR) ); + else + p++; + } + } + + /* Remove trailing backslashes if needed (after the UNC part if it exists) */ + if (SkipTrailingPathSeparators) + { + while (p > path + mark && IS_PATH_SEPARATOR(p[-1])) *p-- = UNICODE_NULL; + } + + /* Remove trailing spaces and dots (for all the path) */ + while (p > path && (p[-1] == L' ' || p[-1] == L'.')) *p-- = UNICODE_NULL; + + /* Null-terminate the string */ + *p = UNICODE_NULL; +} + +/****************************************************************** + * RtlpSkipUNCPrefix (from WINE) + * + * Helper for RtlGetFullPathName_U + * Skip the \\share\dir part of a file name and return the new position + * (which can point on the last backslash of "dir\") + */ +static SIZE_T +RtlpSkipUNCPrefix(PCWSTR FileNameBuffer) +{ + PCWSTR UncPath = FileNameBuffer + 2; + DPRINT("RtlpSkipUNCPrefix(%S)\n", FileNameBuffer); + + while (*UncPath && !IS_PATH_SEPARATOR(*UncPath)) UncPath++; /* share name */ + while (IS_PATH_SEPARATOR(*UncPath)) UncPath++; + while (*UncPath && !IS_PATH_SEPARATOR(*UncPath)) UncPath++; /* dir name */ + /* while (IS_PATH_SEPARATOR(*UncPath)) UncPath++; */ + + return (UncPath - FileNameBuffer); } ULONG @@ -294,10 +410,26 @@ _Out_opt_ PBOOLEAN InvalidName, _Out_ RTL_PATH_TYPE *PathType) { + NTSTATUS Status; PWCHAR FileNameBuffer; ULONG FileNameLength, FileNameChars, DosLength, DosLengthOffset, FullLength; + BOOLEAN SkipTrailingPathSeparators; WCHAR c; - NTSTATUS Status; + + + ULONG reqsize = 0; + PCWSTR ptr; + + PCUNICODE_STRING CurDirName; + UNICODE_STRING EnvVarName, EnvVarValue; + WCHAR EnvVarNameBuffer[4]; + + ULONG PrefixCut = 0; // Where the path really starts (after the skipped prefix) + PWCHAR Prefix = NULL; // pointer to the string to be inserted as the new path prefix + ULONG PrefixLength = 0; + PWCHAR Source; + ULONG SourceLength; + /* For now, assume the name is valid */ DPRINT("Filename: %wZ\n", FileName); @@ -306,39 +438,48 @@ /* Handle initial path type and failure case */ *PathType = RtlPathTypeUnknown; - if (!(FileName->Length) || (FileName->Buffer[0] == UNICODE_NULL)) return 0; + if ((FileName->Length == 0) || (FileName->Buffer[0] == UNICODE_NULL)) return 0; /* Break filename into component parts */ FileNameBuffer = FileName->Buffer; FileNameLength = FileName->Length; - FileNameChars = FileNameLength / sizeof(WCHAR); + FileNameChars = FileNameLength / sizeof(WCHAR); /* Kill trailing spaces */ c = FileNameBuffer[FileNameChars - 1]; - while ((FileNameLength) && (c == L' ')) + while ((FileNameLength != 0) && (c == L' ')) { /* Keep going, ignoring the spaces */ FileNameLength -= sizeof(WCHAR); - if (FileNameLength) c = FileNameBuffer[FileNameLength / sizeof(WCHAR) - 1]; + if (FileNameLength != 0) c = FileNameBuffer[FileNameLength / sizeof(WCHAR) - 1]; } /* Check if anything is left */ - if (!FileNameLength) return 0; + if (FileNameLength == 0) return 0; + + /* + * Check whether we'll need to skip trailing path separators in the + * computed full path name. If the original file name already contained + * trailing separators, then we keep them in the full path name. On the + * other hand, if the original name didn't contain any trailing separators + * then we'll skip it in the full path name. + */ + SkipTrailingPathSeparators = !IS_PATH_SEPARATOR(FileNameBuffer[FileNameChars - 1]); /* Check if this is a DOS name */ DosLength = RtlIsDosDeviceName_Ustr(FileName); DPRINT("DOS length for filename: %lx %wZ\n", DosLength, FileName); - if (DosLength) + if (DosLength != 0) { /* Zero out the short name */ if (ShortName) *ShortName = NULL; /* See comment for RtlIsDosDeviceName_Ustr if this is confusing... */ - DosLengthOffset = DosLength >> 16; - DosLength = DosLength & 0xFFFF; + DosLengthOffset = HIWORD(DosLength); + DosLength = LOWORD(DosLength); /* Do we have a DOS length, and does the caller want validity? */ - if ((InvalidName) && (DosLengthOffset)) + if (InvalidName && (DosLengthOffset != 0)) { /* Do the check */ Status = RtlpCheckDeviceName(FileName, DosLengthOffset, InvalidName); @@ -370,13 +511,226 @@ return FullLength + sizeof(UNICODE_NULL); } - /* This should work well enough for our current needs */ + /* Zero out the destination buffer. FileName must be different from Buffer */ + RtlZeroMemory(Buffer, Size); + + /* Get the path type */ *PathType = RtlDetermineDosPathNameType_U(FileNameBuffer); - DPRINT("Path type: %lx\n", *PathType); - - /* This is disgusting... but avoids re-writing everything */ - DPRINT("Calling old API with '%S' and %lu and %S\n", FileNameBuffer, Size, Buffer); - return RtlGetFullPathName_U(FileNameBuffer, Size, Buffer, (PWSTR*)ShortName); + + + + /********************************************** + ** CODE REWRITTEN IS HAPPENING THERE ** + **********************************************/ + Source = FileNameBuffer; + SourceLength = FileNameLength; + EnvVarValue.Buffer = NULL; + + /* Lock the PEB to get the current directory */ + RtlAcquirePebLock(); + CurDirName = &NtCurrentPeb()->ProcessParameters->CurrentDirectory.DosPath; + + switch (*PathType) + { + case RtlPathTypeUncAbsolute: /* \\foo */ + PrefixCut = RtlpSkipUNCPrefix(FileNameBuffer); + break; + + case RtlPathTypeLocalDevice: /* \\.\foo */ + PrefixCut = 4; + break; + + case RtlPathTypeDriveAbsolute: /* c:\foo */ + ASSERT(FileNameBuffer[1] == L':'); + ASSERT(IS_PATH_SEPARATOR(FileNameBuffer[2])); + + Prefix = FileNameBuffer; + PrefixLength = 3 * sizeof(WCHAR); + Source += 3; + SourceLength -= 3 * sizeof(WCHAR); + + PrefixCut = 3; + break; + + case RtlPathTypeDriveRelative: /* c:foo */ + Source += 2; + SourceLength -= 2 * sizeof(WCHAR); + if (RtlUpcaseUnicodeChar(FileNameBuffer[0]) != RtlUpcaseUnicodeChar(CurDirName->Buffer[0]) || + CurDirName->Buffer[1] != L':') + { + EnvVarNameBuffer[0] = L'='; + EnvVarNameBuffer[1] = FileNameBuffer[0]; + EnvVarNameBuffer[2] = L':'; + EnvVarNameBuffer[3] = UNICODE_NULL; + + EnvVarName.Length = 3 * sizeof(WCHAR); + EnvVarName.MaximumLength = EnvVarName.Length + sizeof(WCHAR); + EnvVarName.Buffer = EnvVarNameBuffer; + + // FIXME: Is it possible to use the user-given buffer ? + // RtlInitEmptyUnicodeString(&EnvVarValue, NULL, Size); + EnvVarValue.Length = 0; + EnvVarValue.MaximumLength = (USHORT)Size; + EnvVarValue.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Size); + if (EnvVarValue.Buffer == NULL) + { + Prefix = NULL; + PrefixLength = 0; + goto Quit; + } + + Status = RtlQueryEnvironmentVariable_U(NULL, &EnvVarName, &EnvVarValue); + switch (Status) + { + case STATUS_SUCCESS: + /* + * (From Wine) + * FIXME: Win2k seems to check that the environment + * variable actually points to an existing directory. + * If not, root of the drive is used (this seems also + * to be the only spot in RtlGetFullPathName that the + * existence of a part of a path is checked). + */ + EnvVarValue.Buffer[EnvVarValue.Length / sizeof(WCHAR)] = L'\\'; + Prefix = EnvVarValue.Buffer; + PrefixLength = EnvVarValue.Length + sizeof(WCHAR); /* Append trailing '\\' */ + break; + + case STATUS_BUFFER_TOO_SMALL: + reqsize = EnvVarValue.Length + SourceLength + sizeof(UNICODE_NULL); + goto Quit; + + default: + DPRINT1("RtlQueryEnvironmentVariable_U returned 0x%08lx\n", Status); + + EnvVarNameBuffer[0] = FileNameBuffer[0]; + EnvVarNameBuffer[1] = L':'; + EnvVarNameBuffer[2] = L'\\'; + EnvVarNameBuffer[3] = UNICODE_NULL; + Prefix = EnvVarNameBuffer; + PrefixLength = 3 * sizeof(WCHAR); + + RtlFreeHeap(RtlGetProcessHeap(), 0, EnvVarValue.Buffer); + EnvVarValue.Buffer = NULL; + break; + } + PrefixCut = 3; + break; + } + /* Fall through */ + DPRINT1("RtlPathTypeDriveRelative - Using fall-through to RtlPathTypeRelative\n"); + + case RtlPathTypeRelative: /* foo */ + Prefix = CurDirName->Buffer; + PrefixLength = CurDirName->Length; + if (CurDirName->Buffer[1] != L':') + { + PrefixCut = RtlpSkipUNCPrefix(CurDirName->Buffer); + } + else + { + PrefixCut = 3; + } + break; + + case RtlPathTypeRooted: /* \xxx */ + if (CurDirName->Buffer[1] == L':') + { + // The path starts with "C:\" + ASSERT(CurDirName->Buffer[1] == L':'); + ASSERT(IS_PATH_SEPARATOR(CurDirName->Buffer[2])); + + Prefix = CurDirName->Buffer; + PrefixLength = 3 * sizeof(WCHAR); // Skip "C:\" + + PrefixCut = 3; // Source index location incremented of + 3 + } + else + { + PrefixCut = RtlpSkipUNCPrefix(CurDirName->Buffer); + PrefixLength = PrefixCut * sizeof(WCHAR); + Prefix = CurDirName->Buffer; + } + break; + + case RtlPathTypeRootLocalDevice: /* \\. */ + Prefix = DeviceRootString.Buffer; + PrefixLength = DeviceRootString.Length; + Source += 3; + SourceLength -= 3 * sizeof(WCHAR); + + PrefixCut = 4; + break; + + case RtlPathTypeUnknown: + goto Quit; + } + + /* Do we have enough space for storing the full path? */ + reqsize = PrefixLength; + if (reqsize + SourceLength + sizeof(WCHAR) > Size) + { + /* Not enough space, return needed size (including terminating '\0') */ + reqsize += SourceLength + sizeof(WCHAR); + goto Quit; + } + + /* + * Build the full path + */ + // if (ShortName) DPRINT1("buffer(1) = %S\n", Buffer); + /* Copy the path's prefix */ + if (PrefixLength) RtlMoveMemory(Buffer, Prefix, PrefixLength); + // if (ShortName) DPRINT1("buffer(2) = %S\n", Buffer); + /* Copy the remaining part of the path */ + RtlMoveMemory(Buffer + PrefixLength / sizeof(WCHAR), Source, SourceLength + sizeof(WCHAR)); + // if (ShortName) DPRINT1("buffer(3) = %S\n", Buffer); + + /* Some cleanup */ + Prefix = NULL; + if (EnvVarValue.Buffer) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, EnvVarValue.Buffer); + EnvVarValue.Buffer = NULL; + } + + /* + * Finally, put the path in canonical form, + * i.e. simplify redundant . and .., etc... + */ + // if (*PathType == RtlPathTypeUncAbsolute) DPRINT1("RtlpCollapsePath('%S', %lu)\n", Buffer, PrefixCut); + RtlpCollapsePath(Buffer, PrefixCut, SkipTrailingPathSeparators); + // if (ShortName) DPRINT1("buffer(4) = %S\n", Buffer); + + /* Get the length of the full path name, without its terminating null character */ + reqsize = wcslen(Buffer) * sizeof(WCHAR); + + /* Find the file part, which is present after the last path separator */ + if (ShortName) + { + ptr = wcsrchr(Buffer, L'\\'); + if (ptr) ++ptr; // Skip it + + /* + * For UNC paths, the file part is after the \\share\dir part of the path. + */ + PrefixCut = (*PathType == RtlPathTypeUncAbsolute ? PrefixCut : 3); + + if (ptr && *ptr && (ptr >= Buffer + PrefixCut)) + { + *ShortName = ptr; + } + else + { + /* Zero-out the short name */ + *ShortName = NULL; + } + } + +Quit: + /* Release PEB lock */ + RtlReleasePebLock(); + return (ULONG)reqsize; } NTSTATUS @@ -992,8 +1346,6 @@ return Length * sizeof(WCHAR); } - - /* * @implemented */ @@ -1195,284 +1547,6 @@ } return Status; -} - - -/****************************************************************** - * collapse_path - * - * Helper for RtlGetFullPathName_U. - * Get rid of . and .. components in the path. - */ -void FORCEINLINE collapse_path( WCHAR *path, UINT mark ) -{ - WCHAR *p, *next; - - /* convert every / into a \ */ - for (p = path; *p; p++) if (*p == '/') *p = '\\'; - - /* collapse duplicate backslashes */ - next = path + max( 1, mark ); - for (p = next; *p; p++) if (*p != '\\' || next[-1] != '\\') *next++ = *p; - *next = 0; - - p = path + mark; - while (*p) - { - if (*p == '.') - { - switch(p[1]) - { - case '\\': /* .\ component */ - next = p + 2; - memmove( p, next, (wcslen(next) + 1) * sizeof(WCHAR) ); - continue; - case 0: /* final . */ - if (p > path + mark) p--; - *p = 0; - continue; - case '.': - if (p[2] == '\\') /* ..\ component */ - { - next = p + 3; - if (p > path + mark) - { - p--; - while (p > path + mark && p[-1] != '\\') p--; - } - memmove( p, next, (wcslen(next) + 1) * sizeof(WCHAR) ); - continue; - } - else if (!p[2]) /* final .. */ - { - if (p > path + mark) - { - p--; - while (p > path + mark && p[-1] != '\\') p--; - if (p > path + mark) p--; - } - *p = 0; - continue; - } - break; - } - } - /* skip to the next component */ - while (*p && *p != '\\') p++; - if (*p == '\\') - { - /* remove last dot in previous dir name */ - if (p > path + mark && p[-1] == '.') memmove( p-1, p, (wcslen(p) + 1) * sizeof(WCHAR) ); - else p++; - } - } - - /* remove trailing spaces and dots (yes, Windows really does that, don't ask) */ - while (p > path + mark && (p[-1] == ' ' || p[-1] == '.')) p--; - *p = 0; -} - - - -/****************************************************************** - * skip_unc_prefix - * - * Skip the \\share\dir\ part of a file name. Helper for RtlGetFullPathName_U. - */ -static const WCHAR *skip_unc_prefix( const WCHAR *ptr ) -{ - ptr += 2; - while (*ptr && !IS_PATH_SEPARATOR(*ptr)) ptr++; /* share name */ - while (IS_PATH_SEPARATOR(*ptr)) ptr++; - while (*ptr && !IS_PATH_SEPARATOR(*ptr)) ptr++; /* dir name */ - while (IS_PATH_SEPARATOR(*ptr)) ptr++; - return ptr; -} - - -/****************************************************************** - * get_full_path_helper - * - * Helper for RtlGetFullPathName_U - * Note: name and buffer are allowed to point to the same memory spot - */ -static ULONG get_full_path_helper( - LPCWSTR name, - LPWSTR buffer, - ULONG size) -{ - SIZE_T reqsize = 0, mark = 0, dep = 0, deplen; - LPWSTR ins_str = NULL; - LPCWSTR ptr; - const UNICODE_STRING* cd; - WCHAR tmp[4]; - - /* return error if name only consists of spaces */ - for (ptr = name; *ptr; ptr++) if (*ptr != ' ') break; - if (!*ptr) return 0; - - RtlAcquirePebLock(); - - //cd = &((PCURDIR)&NtCurrentTeb()->ProcessEnvironmentBlock->ProcessParameters->CurrentDirectory.DosPath)->DosPath; - cd = &NtCurrentTeb()->ProcessEnvironmentBlock->ProcessParameters->CurrentDirectory.DosPath; - - switch (RtlDetermineDosPathNameType_U(name)) - { - case RtlPathTypeUncAbsolute: /* \\foo */ - ptr = skip_unc_prefix( name ); - mark = (ptr - name); - break; - - case RtlPathTypeLocalDevice: /* \\.\foo */ - mark = 4; - break; - - case RtlPathTypeDriveAbsolute: /* c:\foo */ - reqsize = sizeof(WCHAR); - tmp[0] = towupper(name[0]); - ins_str = tmp; - dep = 1; - mark = 3; - break; - - case RtlPathTypeDriveRelative: /* c:foo */ - dep = 2; - if (towupper(name[0]) != towupper(cd->Buffer[0]) || cd->Buffer[1] != ':') - { - UNICODE_STRING var, val; - - tmp[0] = '='; - tmp[1] = name[0]; - tmp[2] = ':'; - tmp[3] = '\0'; - var.Length = 3 * sizeof(WCHAR); - var.MaximumLength = 4 * sizeof(WCHAR); - var.Buffer = tmp; - val.Length = 0; - val.MaximumLength = (USHORT)size; - val.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, size); - if (val.Buffer == NULL) - { - reqsize = 0; - goto done; - } - - switch (RtlQueryEnvironmentVariable_U(NULL, &var, &val)) - { - case STATUS_SUCCESS: - /* FIXME: Win2k seems to check that the environment variable actually points - * to an existing directory. If not, root of the drive is used - * (this seems also to be the only spot in RtlGetFullPathName that the - * existence of a part of a path is checked) - */ - /* fall thru */ - case STATUS_BUFFER_TOO_SMALL: - reqsize = val.Length + sizeof(WCHAR); /* append trailing '\\' */ - val.Buffer[val.Length / sizeof(WCHAR)] = '\\'; - ins_str = val.Buffer; - break; - case STATUS_VARIABLE_NOT_FOUND: - reqsize = 3 * sizeof(WCHAR); - tmp[0] = name[0]; - tmp[1] = ':'; - tmp[2] = '\\'; - ins_str = tmp; - RtlFreeHeap(RtlGetProcessHeap(), 0, val.Buffer); - break; - default: - DPRINT1("Unsupported status code\n"); - RtlFreeHeap(RtlGetProcessHeap(), 0, val.Buffer); - break; - } - mark = 3; - break; - } - /* fall through */ - - case RtlPathTypeRelative: /* foo */ - reqsize = cd->Length; - ins_str = cd->Buffer; - if (cd->Buffer[1] != ':') - { - ptr = skip_unc_prefix( cd->Buffer ); - mark = ptr - cd->Buffer; - } - else mark = 3; - break; - - case RtlPathTypeRooted: /* \xxx */ -#ifdef __WINE__ - if (name[0] == '/') /* may be a Unix path */ - { - const WCHAR *ptr = name; - int drive = find_drive_root( &ptr ); - if (drive != -1) - { - reqsize = 3 * sizeof(WCHAR); - tmp[0] = 'A' + drive; - tmp[1] = ':'; - tmp[2] = '\\'; - ins_str = tmp; - mark = 3; - dep = ptr - name; - break; - } - } -#endif - if (cd->Buffer[1] == ':') - { - reqsize = 2 * sizeof(WCHAR); - tmp[0] = cd->Buffer[0]; - tmp[1] = ':'; - ins_str = tmp; - mark = 3; - } - else - { - ptr = skip_unc_prefix( cd->Buffer ); - reqsize = (ptr - cd->Buffer) * sizeof(WCHAR); - mark = reqsize / sizeof(WCHAR); - ins_str = cd->Buffer; - } - break; - - case RtlPathTypeRootLocalDevice: /* \\. */ - reqsize = 4 * sizeof(WCHAR); - dep = 3; - tmp[0] = '\\'; - tmp[1] = '\\'; - tmp[2] = '.'; - tmp[3] = '\\'; - ins_str = tmp; - mark = 4; - break; - - case RtlPathTypeUnknown: - goto done; - } - - /* enough space ? */ - deplen = wcslen(name + dep) * sizeof(WCHAR); - if (reqsize + deplen + sizeof(WCHAR) > size) - { - /* not enough space, return need size (including terminating '\0') */ - reqsize += deplen + sizeof(WCHAR); - goto done; - } - - memmove(buffer + reqsize / sizeof(WCHAR), name + dep, deplen + sizeof(WCHAR)); - if (reqsize) memcpy(buffer, ins_str, reqsize); - reqsize += deplen; - - if (ins_str && ins_str != tmp && ins_str != cd->Buffer) - RtlFreeHeap(RtlGetProcessHeap(), 0, ins_str); - - collapse_path( buffer, (ULONG)mark ); - reqsize = wcslen(buffer) * sizeof(WCHAR); - -done: - RtlReleasePebLock(); - return (ULONG)reqsize; } @@ -1488,60 +1562,33 @@ * * @implemented */ -ULONG NTAPI RtlGetFullPathName_U( - const WCHAR* name, - ULONG size, - WCHAR* buffer, - WCHAR** file_part) -{ - WCHAR* ptr; - ULONG dosdev; - ULONG reqsize; - - DPRINT("RtlGetFullPathName_U(%S %lu %p %p)\n", name, size, buffer, file_part); - - if (!name || !*name) return 0; - - /* Zero out the destination buffer (implies that "name" should be different from "buffer" to get this function well-behaving) */ - RtlZeroMemory(buffer, size); - - if (file_part) *file_part = NULL; - - /* check for DOS device name */ - dosdev = RtlIsDosDeviceName_U((WCHAR*)name); - if (dosdev) - { - DWORD offset = HIWORD(dosdev) / sizeof(WCHAR); /* get it in WCHARs, not bytes */ - DWORD sz = LOWORD(dosdev); /* in bytes */ - - if (8 + sz + 2 > size) return sz + 10; - wcscpy(buffer, DeviceRootW); - memmove(buffer + 4, name + offset, sz); - buffer[4 + sz / sizeof(WCHAR)] = '\0'; - /* file_part isn't set in this case */ - return sz + 8; - } - - reqsize = get_full_path_helper(name, buffer, size); - if (!reqsize) return 0; - if (reqsize > size) - { - LPWSTR tmp = RtlAllocateHeap(RtlGetProcessHeap(), 0, reqsize); - if (tmp == NULL) return 0; - reqsize = get_full_path_helper(name, tmp, reqsize); - if (reqsize + sizeof(WCHAR) > size) /* it may have worked the second time */ - { - RtlFreeHeap(RtlGetProcessHeap(), 0, tmp); - return reqsize + sizeof(WCHAR); - } - memcpy( buffer, tmp, reqsize + sizeof(WCHAR) ); - RtlFreeHeap(RtlGetProcessHeap(), 0, tmp); - } - - /* find file part */ - if (file_part && (ptr = wcsrchr(buffer, '\\')) != NULL && ptr >= buffer + 2 && *++ptr) - *file_part = ptr; - return reqsize; + +/* + * @implemented + */ +ULONG +NTAPI +RtlGetFullPathName_U( + _In_ PCWSTR FileName, + _In_ ULONG Size, + _Out_z_bytecap_(Size) PWSTR Buffer, + _Out_opt_ PWSTR *ShortName) +{ + NTSTATUS Status; + UNICODE_STRING FileNameString; + RTL_PATH_TYPE PathType; + + /* Build the string */ + Status = RtlInitUnicodeStringEx(&FileNameString, FileName); + if (!NT_SUCCESS(Status)) return 0; + + /* Call the extended function */ + return RtlGetFullPathName_Ustr(&FileNameString, + Size, + Buffer, + (PCWSTR*)ShortName, + NULL, + &PathType); } /* @@ -1646,9 +1693,6 @@ PWCHAR NewBuffer, BufferStart; PCWSTR p; - /* Validate the input */ - if (!(Path) || !(FileName)) return 0; - /* Check if this is an absolute path */ if (RtlDetermineDosPathNameType_U(FileName) != RtlPathTypeRelative) { @@ -1668,7 +1712,7 @@ while (*p) { /* Looking for an extension */ - if (*p == '.') + if (*p == L'.') { /* No extension string needed -- it's part of the filename */ Extension = NULL; @@ -1726,7 +1770,7 @@ if (*Path) { /* Loop as long as there's no semicolon */ - while (*Path != ';') + while (*Path != L';') { /* Copy the next character */ *BufferStart++ = *Path++; @@ -1734,7 +1778,7 @@ } /* We found a semi-colon, to stop path processing on this loop */ - if (*Path == ';') ++Path; + if (*Path == L';') ++Path; } /* Add a terminating slash if needed */ @@ -2054,7 +2098,7 @@ sizeof(StaticCandidateBuffer)); /* Initialize optional arguments */ - if (FullNameOut) *FullNameOut = NULL; + if (FullNameOut ) *FullNameOut = NULL; if (FilePartSize) *FilePartSize = 0; if (LengthNeeded) *LengthNeeded = 0; if (DynamicString) @@ -2449,7 +2493,7 @@ &StaticCandidateString, Status); } - DPRINT("STatus: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer); + DPRINT("Status: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer); } else { @@ -2472,7 +2516,7 @@ FileNameString, Status); } - DPRINT("STatus: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer); + DPRINT("Status: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer); } }

1 0

[tkreuzer] 59365: [CRT] Fix exponential notation precision in scanf Patch by dmitry216 CORE-7010 #resolve
by tkreuzer＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: tkreuzer Date: Sat Jun 29 14:55:01 2013 New Revision: 59365 URL: http://svn.reactos.org/svn/reactos?rev=59365&view=rev Log: [CRT] Fix exponential notation precision in scanf Patch by dmitry216 CORE-7010 #resolve Modified: trunk/reactos/lib/sdk/crt/string/scanf.h Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Sat Jun 29 14:55:01 2013 @@ -279,7 +279,7 @@ /* handle exponent */ if (width!=0 && (nch == 'e' || nch == 'E')) { int exponent = 0, negexp = 0; - float expcnt; + double expcnt, shift; nch = _GETC_(file); if (width>0) width--; /* possible sign on the exponent */ @@ -296,13 +296,15 @@ if (width>0) width--; } /* update 'cur' with this exponent. */ - expcnt = negexp ? 0.1f : 10.0f; + expcnt = 10; + shift = 1.0; while (exponent!=0) { if (exponent&1) - cur*=expcnt; + shift *= expcnt; exponent/=2; expcnt=expcnt*expcnt; } + cur = (negexp ? cur / shift : cur * shift); } st = 1; if (!suppress) {

1 0

[hbelusca] 59364: [MUP] Return STATUS_OBJECT_NAME_INVALID instead of STATUS_BAD_NETWORK_PATH, fixes some tests (kernel32:FindFiles in particular).
by hbelusca＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: hbelusca Date: Sat Jun 29 14:03:04 2013 New Revision: 59364 URL: http://svn.reactos.org/svn/reactos?rev=59364&view=rev Log: [MUP] Return STATUS_OBJECT_NAME_INVALID instead of STATUS_BAD_NETWORK_PATH, fixes some tests (kernel32:FindFiles in particular). Modified: trunk/reactos/drivers/filesystems/mup/create.c Modified: trunk/reactos/drivers/filesystems/mup/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/cr… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/create.c [iso-8859-1] Sat Jun 29 14:03:04 2013 @@ -51,9 +51,8 @@ FileObject = Stack->FileObject; - DPRINT("FileName: '%wZ'\n", &FileObject->FileName); - - Status = STATUS_BAD_NETWORK_PATH; + DPRINT1("MUP - Unimplemented (FileName: '%wZ')\n", &FileObject->FileName); + Status = STATUS_OBJECT_NAME_INVALID; // STATUS_BAD_NETWORK_PATH; Irp->IoStatus.Information = (NT_SUCCESS(Status)) ? FILE_OPENED : 0; Irp->IoStatus.Status = Status;

1 0

[tfaber] 59363: [GETUNAME] - Implement GetUName. Patch by Baruch Rutman. CORE-7264 #resolve #comment Awesome, thanks! Committed in r59363.
by tfaber＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: tfaber Date: Sat Jun 29 13:44:17 2013 New Revision: 59363 URL: http://svn.reactos.org/svn/reactos?rev=59363&view=rev Log: [GETUNAME] - Implement GetUName. Patch by Baruch Rutman. CORE-7264 #resolve #comment Awesome, thanks! Committed in r59363. Added: trunk/reactos/dll/win32/getuname/lang/ trunk/reactos/dll/win32/getuname/lang/en-US.rc (with props) Modified: trunk/reactos/dll/win32/getuname/CMakeLists.txt trunk/reactos/dll/win32/getuname/getuname.c trunk/reactos/dll/win32/getuname/getuname.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/getuname/CMakeLi… Modified: trunk/reactos/dll/win32/getuname/getuname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/getuname/getunam… Modified: trunk/reactos/dll/win32/getuname/getuname.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/getuname/getunam… Added: trunk/reactos/dll/win32/getuname/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/getuname/lang/en…

1 0

[tfaber] 59362: [KMTESTS:MM] - Gracefully handle file open failure in ZwCreateSection test. Patch by Aleksandar Andrejevic. ROSTESTS-115 #resolve
by tfaber＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: tfaber Date: Sat Jun 29 13:10:30 2013 New Revision: 59362 URL: http://svn.reactos.org/svn/reactos?rev=59362&view=rev Log: [KMTESTS:MM] - Gracefully handle file open failure in ZwCreateSection test. Patch by Aleksandar Andrejevic. ROSTESTS-115 #resolve Modified: trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c Modified: trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/ZwCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c [iso-8859-1] Sat Jun 29 13:10:30 2013 @@ -507,9 +507,12 @@ KmtInitTestFiles(&FileHandleReadOnly, &FileHandleWriteOnly, &FileHandleExecuteOnly); - FileSectionViewPermissionCheck(FileHandleReadOnly, FileHandleWriteOnly, FileHandleExecuteOnly); - SimpleErrorChecks(FileHandleReadOnly, FileHandleWriteOnly, FileHandleExecuteOnly); - BasicBehaviorChecks(FileHandleWriteOnly); + if (FileHandleReadOnly && FileHandleWriteOnly && FileHandleExecuteOnly) + { + FileSectionViewPermissionCheck(FileHandleReadOnly, FileHandleWriteOnly, FileHandleExecuteOnly); + SimpleErrorChecks(FileHandleReadOnly, FileHandleWriteOnly, FileHandleExecuteOnly); + BasicBehaviorChecks(FileHandleWriteOnly); + } if (FileHandleReadOnly) ZwClose(FileHandleReadOnly);

1 0

[tfaber] 59361: [DESK.CPL] - Fix wrong buffer usage CORE-7300 #resolve
by tfaber＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: tfaber Date: Sat Jun 29 13:05:52 2013 New Revision: 59361 URL: http://svn.reactos.org/svn/reactos?rev=59361&view=rev Log: [DESK.CPL] - Fix wrong buffer usage CORE-7300 #resolve Modified: trunk/reactos/dll/cpl/desk/general.c Modified: trunk/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/general.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/general.c [iso-8859-1] Sat Jun 29 13:05:52 2013 @@ -30,12 +30,13 @@ 0, KEY_READ, &hKey) == ERROR_SUCCESS) for (;;) { + TCHAR Buffer[LINE_LEN]; TCHAR Desc[LINE_LEN]; - if (SetupGetStringField(&Context, 0, Desc, sizeof(Desc), NULL) && + if (SetupGetStringField(&Context, 0, Buffer, sizeof(Buffer), NULL) && SetupGetIntField(&Context, 1, &ci)) { - _stprintf(Desc, _T("%s (%d DPI)"), Desc, ci); + _stprintf(Desc, _T("%s (%d DPI)"), Buffer, ci); i = SendMessage(hFontSize, CB_ADDSTRING, 0, (LPARAM)Desc); if (i != CB_ERR) SendMessage(hFontSize, CB_SETITEMDATA, (WPARAM)i, (LPARAM)ci);

1 0

[tfaber] 59360: [SVCHOST] - Fix various incorrect buffer size calculations - Don't expand environment variables in REG_SZ values - Repair all DPRINTs - Other misc fixes CORE-7296 #resolve
by tfaber＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: tfaber Date: Sat Jun 29 13:01:35 2013 New Revision: 59360 URL: http://svn.reactos.org/svn/reactos?rev=59360&view=rev Log: [SVCHOST] - Fix various incorrect buffer size calculations - Don't expand environment variables in REG_SZ values - Repair all DPRINTs - Other misc fixes CORE-7296 #resolve Modified: trunk/reactos/base/services/svchost/svchost.c trunk/reactos/base/services/svchost/svchost.h Modified: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] Sat Jun 29 13:01:35 2013 @@ -19,7 +19,6 @@ static PCWSTR SERVICE_KEY = L"SYSTEM\\CurrentControlSet\\Services\\"; static PCWSTR PARAMETERS_KEY = L"\\Parameters"; -#define SERVICE_KEY_LENGTH wcslen(SERVICE_KEY); #define REG_MAX_DATA_SIZE 2048 static PSERVICE FirstService = NULL; @@ -29,104 +28,143 @@ BOOL PrepareService(PCWSTR ServiceName) { HKEY hServiceKey; - WCHAR ServiceKeyBuffer[MAX_PATH + 1]; - DWORD LeftOfBuffer = sizeof(ServiceKeyBuffer) / sizeof(ServiceKeyBuffer[0]); - DWORD KeyType; - PWSTR Buffer = NULL; - DWORD BufferSize = MAX_PATH + 1; + WCHAR ServiceKeyBuffer[512]; + HRESULT Result; + DWORD ValueType; + PWSTR Buffer; + DWORD BufferSize; LONG RetVal; HINSTANCE hServiceDll; - WCHAR DllPath[MAX_PATH + 2]; /* See MSDN on ExpandEnvironmentStrings() for ANSI strings for more details on + 2 */ + PWSTR DllPath; + DWORD DllPathSize; LPSERVICE_MAIN_FUNCTION ServiceMainFunc; PSERVICE Service; + DWORD ServiceNameSize; /* Compose the registry path to the service's "Parameter" key */ - wcsncpy(ServiceKeyBuffer, SERVICE_KEY, LeftOfBuffer); - LeftOfBuffer -= wcslen(SERVICE_KEY); - wcsncat(ServiceKeyBuffer, ServiceName, LeftOfBuffer); - LeftOfBuffer -= wcslen(ServiceName); - wcsncat(ServiceKeyBuffer, PARAMETERS_KEY, LeftOfBuffer); - LeftOfBuffer -= wcslen(PARAMETERS_KEY); - - if (LeftOfBuffer < 0) - { - DPRINT1("Buffer overflow for service name: '%s'\n", ServiceName); + Result = StringCbCopy(ServiceKeyBuffer, sizeof(ServiceKeyBuffer), SERVICE_KEY); + if (FAILED(Result)) + { + DPRINT1("Buffer overflow for service name: '%ls'\n", ServiceName); + return FALSE; + } + Result = StringCbCat(ServiceKeyBuffer, sizeof(ServiceKeyBuffer), ServiceName); + if (FAILED(Result)) + { + DPRINT1("Buffer overflow for service name: '%ls'\n", ServiceName); + return FALSE; + } + Result = StringCbCat(ServiceKeyBuffer, sizeof(ServiceKeyBuffer), PARAMETERS_KEY); + if (FAILED(Result)) + { + DPRINT1("Buffer overflow for service name: '%ls'\n", ServiceName); return FALSE; } /* Open the service registry key to find the dll name */ - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, ServiceKeyBuffer, 0, KEY_READ, &hServiceKey) != ERROR_SUCCESS) - { - DPRINT1("Could not open service key (%s)\n", ServiceKeyBuffer); - return FALSE; - } - - do - { - if (Buffer) + RetVal = RegOpenKeyEx(HKEY_LOCAL_MACHINE, ServiceKeyBuffer, 0, KEY_READ, &hServiceKey); + if (RetVal != ERROR_SUCCESS) + { + DPRINT1("Could not open service key (%ls)\n", ServiceKeyBuffer); + return FALSE; + } + + BufferSize = 0; + RetVal = RegQueryValueEx(hServiceKey, L"ServiceDll", NULL, &ValueType, NULL, &BufferSize); + if (RetVal != ERROR_SUCCESS) + { + RegCloseKey(hServiceKey); + return FALSE; + } + + Buffer = HeapAlloc(GetProcessHeap(), 0, BufferSize); + if (Buffer == NULL) + { + DPRINT1("Not enough memory for service: %ls\n", ServiceName); + RegCloseKey(hServiceKey); + return FALSE; + } + + RetVal = RegQueryValueEx(hServiceKey, L"ServiceDll", NULL, &ValueType, (LPBYTE)Buffer, &BufferSize); + if (RetVal != ERROR_SUCCESS || BufferSize == 0) + { + DPRINT1("Could not read 'ServiceDll' value from service: %ls, ErrorCode: 0x%lx\n", ServiceName, RetVal); + RegCloseKey(hServiceKey); + HeapFree(GetProcessHeap(), 0, Buffer); + return FALSE; + } + RegCloseKey(hServiceKey); + + if (ValueType == REG_EXPAND_SZ) + { + /* Convert possible %SystemRoot% to a real path */ + DllPathSize = ExpandEnvironmentStrings(Buffer, NULL, 0); + if (DllPathSize == 0) + { + DPRINT1("Invalid ServiceDll path: %ls, ErrorCode: %lu\n", Buffer, GetLastError()); HeapFree(GetProcessHeap(), 0, Buffer); - - Buffer = HeapAlloc(GetProcessHeap(), 0, BufferSize); - if (Buffer == NULL) - { - DPRINT1("Not enough memory for service: %s\n", ServiceName); return FALSE; } - - RetVal = RegQueryValueEx(hServiceKey, L"ServiceDll", NULL, &KeyType, (LPBYTE)Buffer, &BufferSize); - - } while (RetVal == ERROR_MORE_DATA); - - - RegCloseKey(hServiceKey); - - if (RetVal != ERROR_SUCCESS || BufferSize == 0) - { - DPRINT1("Could not read 'ServiceDll' value from service: %s, ErrorCode: 0x%x\n", ServiceName, RetVal); + DllPath = HeapAlloc(GetProcessHeap(), 0, DllPathSize * sizeof(WCHAR)); + if (DllPath == NULL) + { + DPRINT1("Not enough memory for service: %ls\n", ServiceName); + HeapFree(GetProcessHeap(), 0, Buffer); + return FALSE; + } + if (ExpandEnvironmentStrings(Buffer, DllPath, DllPathSize) != DllPathSize) + { + DPRINT1("Invalid ServiceDll path: %ls, ErrorCode: %lu\n", Buffer, GetLastError()); + HeapFree(GetProcessHeap(), 0, DllPath); + HeapFree(GetProcessHeap(), 0, Buffer); + return FALSE; + } + HeapFree(GetProcessHeap(), 0, Buffer); - return FALSE; - } - - /* Convert possible %SystemRoot% to a real path */ - BufferSize = ExpandEnvironmentStrings(Buffer, DllPath, _countof(DllPath)); - if (BufferSize == 0) - { - DPRINT1("Invalid ServiceDll path: %s\n", Buffer); + } + else if (ValueType == REG_SZ) + { + DllPath = Buffer; + } + else + { + DPRINT1("Invalid ServiceDll value type %lu for service: %ls, ErrorCode: %lu\n", ValueType, ServiceName, GetLastError()); HeapFree(GetProcessHeap(), 0, Buffer); return FALSE; } - - HeapFree(GetProcessHeap(), 0, Buffer); /* Load the service dll */ DPRINT("Trying to load dll\n"); hServiceDll = LoadLibrary(DllPath); - if (hServiceDll == NULL) { - DPRINT1("Unable to load ServiceDll: %s, ErrorCode: %u\n", DllPath, GetLastError()); - return FALSE; - } + DPRINT1("Unable to load ServiceDll: %ls, ErrorCode: %lu\n", DllPath, GetLastError()); + HeapFree(GetProcessHeap(), 0, DllPath); + return FALSE; + } + HeapFree(GetProcessHeap(), 0, DllPath); ServiceMainFunc = (LPSERVICE_MAIN_FUNCTION)GetProcAddress(hServiceDll, "ServiceMain"); /* Allocate a service node in the linked list */ - Service = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE)); + Service = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SERVICE)); if (Service == NULL) { - DPRINT1("Not enough memory for service: %s\n", ServiceName); - return FALSE; - } - - memset(Service, 0, sizeof(SERVICE)); - Service->Name = HeapAlloc(GetProcessHeap(), 0, (wcslen(ServiceName)+1) * sizeof(WCHAR)); + DPRINT1("Not enough memory for service: %ls\n", ServiceName); + return FALSE; + } + + ServiceNameSize = (wcslen(ServiceName) + 1) * sizeof(WCHAR); + Service->Name = HeapAlloc(GetProcessHeap(), 0, ServiceNameSize); if (Service->Name == NULL) { - DPRINT1("Not enough memory for service: %s\n", ServiceName); + DPRINT1("Not enough memory for service: %ls\n", ServiceName); HeapFree(GetProcessHeap(), 0, Service); return FALSE; } - wcscpy(Service->Name, ServiceName); + Result = StringCbCopy(Service->Name, ServiceNameSize, ServiceName); + ASSERT(SUCCEEDED(Result)); + (VOID)Result; Service->hServiceDll = hServiceDll; Service->ServiceMainFunc = ServiceMainFunc; @@ -157,23 +195,26 @@ DWORD LoadServiceCategory(PCWSTR ServiceCategory) { HKEY hServicesKey; - DWORD KeyType; - DWORD BufferSize = REG_MAX_DATA_SIZE; + DWORD ValueType; WCHAR Buffer[REG_MAX_DATA_SIZE]; + DWORD BufferSize = sizeof(Buffer); PCWSTR ServiceName; DWORD BufferIndex = 0; DWORD NrOfServices = 0; + LONG RetVal; /* Get all the services in this category */ - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, SVCHOST_REG_KEY, 0, KEY_READ, &hServicesKey) != ERROR_SUCCESS) - { - DPRINT1("Could not open service category: %s\n", ServiceCategory); - return 0; - } - - if (RegQueryValueEx(hServicesKey, ServiceCategory, NULL, &KeyType, (LPBYTE)Buffer, &BufferSize) != ERROR_SUCCESS) - { - DPRINT1("Could not open service category (2): %s\n", ServiceCategory); + RetVal = RegOpenKeyEx(HKEY_LOCAL_MACHINE, SVCHOST_REG_KEY, 0, KEY_READ, &hServicesKey); + if (RetVal != ERROR_SUCCESS) + { + DPRINT1("Could not open service category: %ls\n", ServiceCategory); + return 0; + } + + RetVal = RegQueryValueEx(hServicesKey, ServiceCategory, NULL, &ValueType, (LPBYTE)Buffer, &BufferSize); + if (RetVal != ERROR_SUCCESS) + { + DPRINT1("Could not open service category (2): %ls\n", ServiceCategory); RegCloseKey(hServicesKey); return 0; } @@ -191,7 +232,7 @@ if (Length == 0) break; - if (PrepareService(ServiceName) == TRUE) + if (PrepareService(ServiceName)) ++NrOfServices; BufferIndex += Length + 1; @@ -213,7 +254,7 @@ return 0; } - if (wcscmp(argv[1], L"-k") != 0) + if (wcscmp(argv[1], L"-k")) { /* For now, we only handle "-k" */ return 0; @@ -226,7 +267,6 @@ return 0; ServiceTable = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE_TABLE_ENTRY) * (NrOfServices + 1)); - if (ServiceTable != NULL) { DWORD i; @@ -235,17 +275,18 @@ /* Fill the service table */ for (i = 0; i < NrOfServices; i++) { - DPRINT("Loading service: %s\n", Service->Name); + DPRINT("Loading service: %ls\n", Service->Name); ServiceTable[i].lpServiceName = Service->Name; ServiceTable[i].lpServiceProc = Service->ServiceMainFunc; Service = Service->Next; } + ASSERT(Service == NULL); /* Set a NULL entry to end the service table */ ServiceTable[i].lpServiceName = NULL; ServiceTable[i].lpServiceProc = NULL; - if (StartServiceCtrlDispatcher(ServiceTable) == FALSE) + if (!StartServiceCtrlDispatcher(ServiceTable)) DPRINT1("Failed to start service control dispatcher, ErrorCode: %lu\n", GetLastError()); HeapFree(GetProcessHeap(), 0, ServiceTable); Modified: trunk/reactos/base/services/svchost/svchost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] Sat Jun 29 13:01:35 2013 @@ -10,20 +10,15 @@ /* INCLUDES ******************************************************************/ -#if 0 -#define _CRT_SECURE_NO_DEPRECATE 1 -#endif - #include <stdlib.h> #include <stdarg.h> #include <windef.h> #include <winbase.h> #include <winreg.h> #include <winsvc.h> +#include <strsafe.h> /* DEFINES *******************************************************************/ - -#define CS_TIMEOUT 1000 typedef struct _SERVICE { PWSTR Name;

1 0

[tfaber] 59359: [SVCHOST] - Make WCHARs explicit
by tfaber＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: tfaber Date: Sat Jun 29 11:46:13 2013 New Revision: 59359 URL: http://svn.reactos.org/svn/reactos?rev=59359&view=rev Log: [SVCHOST] - Make WCHARs explicit Modified: trunk/reactos/base/services/svchost/svchost.c trunk/reactos/base/services/svchost/svchost.h Modified: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] Sat Jun 29 11:46:13 2013 @@ -15,38 +15,38 @@ /* DEFINES *******************************************************************/ -static LPCTSTR SVCHOST_REG_KEY = _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\SvcHost"); -static LPCTSTR SERVICE_KEY = _T("SYSTEM\\CurrentControlSet\\Services\\"); -static LPCTSTR PARAMETERS_KEY = _T("\\Parameters"); - -#define SERVICE_KEY_LENGTH _tcslen(SERVICE_KEY); +static PCWSTR SVCHOST_REG_KEY = L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\SvcHost"; +static PCWSTR SERVICE_KEY = L"SYSTEM\\CurrentControlSet\\Services\\"; +static PCWSTR PARAMETERS_KEY = L"\\Parameters"; + +#define SERVICE_KEY_LENGTH wcslen(SERVICE_KEY); #define REG_MAX_DATA_SIZE 2048 static PSERVICE FirstService = NULL; /* FUNCTIONS *****************************************************************/ -BOOL PrepareService(LPCTSTR ServiceName) +BOOL PrepareService(PCWSTR ServiceName) { HKEY hServiceKey; - TCHAR ServiceKeyBuffer[MAX_PATH + 1]; + WCHAR ServiceKeyBuffer[MAX_PATH + 1]; DWORD LeftOfBuffer = sizeof(ServiceKeyBuffer) / sizeof(ServiceKeyBuffer[0]); DWORD KeyType; - PTSTR Buffer = NULL; + PWSTR Buffer = NULL; DWORD BufferSize = MAX_PATH + 1; LONG RetVal; HINSTANCE hServiceDll; - TCHAR DllPath[MAX_PATH + 2]; /* See MSDN on ExpandEnvironmentStrings() for ANSI strings for more details on + 2 */ + WCHAR DllPath[MAX_PATH + 2]; /* See MSDN on ExpandEnvironmentStrings() for ANSI strings for more details on + 2 */ LPSERVICE_MAIN_FUNCTION ServiceMainFunc; PSERVICE Service; /* Compose the registry path to the service's "Parameter" key */ - _tcsncpy(ServiceKeyBuffer, SERVICE_KEY, LeftOfBuffer); - LeftOfBuffer -= _tcslen(SERVICE_KEY); - _tcsncat(ServiceKeyBuffer, ServiceName, LeftOfBuffer); - LeftOfBuffer -= _tcslen(ServiceName); - _tcsncat(ServiceKeyBuffer, PARAMETERS_KEY, LeftOfBuffer); - LeftOfBuffer -= _tcslen(PARAMETERS_KEY); + wcsncpy(ServiceKeyBuffer, SERVICE_KEY, LeftOfBuffer); + LeftOfBuffer -= wcslen(SERVICE_KEY); + wcsncat(ServiceKeyBuffer, ServiceName, LeftOfBuffer); + LeftOfBuffer -= wcslen(ServiceName); + wcsncat(ServiceKeyBuffer, PARAMETERS_KEY, LeftOfBuffer); + LeftOfBuffer -= wcslen(PARAMETERS_KEY); if (LeftOfBuffer < 0) { @@ -73,7 +73,7 @@ return FALSE; } - RetVal = RegQueryValueEx(hServiceKey, _T("ServiceDll"), NULL, &KeyType, (LPBYTE)Buffer, &BufferSize); + RetVal = RegQueryValueEx(hServiceKey, L"ServiceDll", NULL, &KeyType, (LPBYTE)Buffer, &BufferSize); } while (RetVal == ERROR_MORE_DATA); @@ -119,14 +119,14 @@ } memset(Service, 0, sizeof(SERVICE)); - Service->Name = HeapAlloc(GetProcessHeap(), 0, (_tcslen(ServiceName)+1) * sizeof(TCHAR)); + Service->Name = HeapAlloc(GetProcessHeap(), 0, (wcslen(ServiceName)+1) * sizeof(WCHAR)); if (Service->Name == NULL) { DPRINT1("Not enough memory for service: %s\n", ServiceName); HeapFree(GetProcessHeap(), 0, Service); return FALSE; } - _tcscpy(Service->Name, ServiceName); + wcscpy(Service->Name, ServiceName); Service->hServiceDll = hServiceDll; Service->ServiceMainFunc = ServiceMainFunc; @@ -154,13 +154,13 @@ /* * Returns the number of services successfully loaded from the category */ -DWORD LoadServiceCategory(LPCTSTR ServiceCategory) +DWORD LoadServiceCategory(PCWSTR ServiceCategory) { HKEY hServicesKey; DWORD KeyType; DWORD BufferSize = REG_MAX_DATA_SIZE; - TCHAR Buffer[REG_MAX_DATA_SIZE]; - LPCTSTR ServiceName; + WCHAR Buffer[REG_MAX_DATA_SIZE]; + PCWSTR ServiceName; DWORD BufferIndex = 0; DWORD NrOfServices = 0; @@ -183,11 +183,11 @@ /* Load services in the category */ ServiceName = Buffer; - while (ServiceName[0] != _T('\0')) + while (ServiceName[0] != UNICODE_NULL) { size_t Length; - - Length = _tcslen(ServiceName); + + Length = wcslen(ServiceName); if (Length == 0) break; @@ -202,7 +202,7 @@ return NrOfServices; } -int _tmain (int argc, LPTSTR argv []) +int wmain(int argc, wchar_t **argv) { DWORD NrOfServices; LPSERVICE_TABLE_ENTRY ServiceTable; @@ -213,7 +213,7 @@ return 0; } - if (_tcscmp(argv[1], _T("-k")) != 0) + if (wcscmp(argv[1], L"-k") != 0) { /* For now, we only handle "-k" */ return 0; Modified: trunk/reactos/base/services/svchost/svchost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] Sat Jun 29 11:46:13 2013 @@ -20,14 +20,13 @@ #include <winbase.h> #include <winreg.h> #include <winsvc.h> -#include <tchar.h> /* DEFINES *******************************************************************/ #define CS_TIMEOUT 1000 typedef struct _SERVICE { - PTSTR Name; + PWSTR Name; HINSTANCE hServiceDll; LPSERVICE_MAIN_FUNCTION ServiceMainFunc; struct _SERVICE *Next;

1 0

[tfaber] 59358: [SVCHOST] - Yoda logic fix you must. No functional changes.
by tfaber＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: tfaber Date: Sat Jun 29 11:41:05 2013 New Revision: 59358 URL: http://svn.reactos.org/svn/reactos?rev=59358&view=rev Log: [SVCHOST] - Yoda logic fix you must. No functional changes. Modified: trunk/reactos/base/services/svchost/svchost.c Modified: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] Sat Jun 29 11:41:05 2013 @@ -55,7 +55,7 @@ } /* Open the service registry key to find the dll name */ - if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, ServiceKeyBuffer, 0, KEY_READ, &hServiceKey)) + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, ServiceKeyBuffer, 0, KEY_READ, &hServiceKey) != ERROR_SUCCESS) { DPRINT1("Could not open service key (%s)\n", ServiceKeyBuffer); return FALSE; @@ -67,7 +67,7 @@ HeapFree(GetProcessHeap(), 0, Buffer); Buffer = HeapAlloc(GetProcessHeap(), 0, BufferSize); - if (NULL == Buffer) + if (Buffer == NULL) { DPRINT1("Not enough memory for service: %s\n", ServiceName); return FALSE; @@ -75,12 +75,12 @@ RetVal = RegQueryValueEx(hServiceKey, _T("ServiceDll"), NULL, &KeyType, (LPBYTE)Buffer, &BufferSize); - } while (ERROR_MORE_DATA == RetVal); + } while (RetVal == ERROR_MORE_DATA); RegCloseKey(hServiceKey); - if (ERROR_SUCCESS != RetVal || 0 == BufferSize) + if (RetVal != ERROR_SUCCESS || BufferSize == 0) { DPRINT1("Could not read 'ServiceDll' value from service: %s, ErrorCode: 0x%x\n", ServiceName, RetVal); HeapFree(GetProcessHeap(), 0, Buffer); @@ -89,7 +89,7 @@ /* Convert possible %SystemRoot% to a real path */ BufferSize = ExpandEnvironmentStrings(Buffer, DllPath, _countof(DllPath)); - if (0 == BufferSize) + if (BufferSize == 0) { DPRINT1("Invalid ServiceDll path: %s\n", Buffer); HeapFree(GetProcessHeap(), 0, Buffer); @@ -102,7 +102,7 @@ DPRINT("Trying to load dll\n"); hServiceDll = LoadLibrary(DllPath); - if (NULL == hServiceDll) + if (hServiceDll == NULL) { DPRINT1("Unable to load ServiceDll: %s, ErrorCode: %u\n", DllPath, GetLastError()); return FALSE; @@ -112,7 +112,7 @@ /* Allocate a service node in the linked list */ Service = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE)); - if (NULL == Service) + if (Service == NULL) { DPRINT1("Not enough memory for service: %s\n", ServiceName); return FALSE; @@ -120,7 +120,7 @@ memset(Service, 0, sizeof(SERVICE)); Service->Name = HeapAlloc(GetProcessHeap(), 0, (_tcslen(ServiceName)+1) * sizeof(TCHAR)); - if (NULL == Service->Name) + if (Service->Name == NULL) { DPRINT1("Not enough memory for service: %s\n", ServiceName); HeapFree(GetProcessHeap(), 0, Service); @@ -165,13 +165,13 @@ DWORD NrOfServices = 0; /* Get all the services in this category */ - if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, SVCHOST_REG_KEY, 0, KEY_READ, &hServicesKey)) + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, SVCHOST_REG_KEY, 0, KEY_READ, &hServicesKey) != ERROR_SUCCESS) { DPRINT1("Could not open service category: %s\n", ServiceCategory); return 0; } - if (ERROR_SUCCESS != RegQueryValueEx(hServicesKey, ServiceCategory, NULL, &KeyType, (LPBYTE)Buffer, &BufferSize)) + if (RegQueryValueEx(hServicesKey, ServiceCategory, NULL, &KeyType, (LPBYTE)Buffer, &BufferSize) != ERROR_SUCCESS) { DPRINT1("Could not open service category (2): %s\n", ServiceCategory); RegCloseKey(hServicesKey); @@ -183,15 +183,15 @@ /* Load services in the category */ ServiceName = Buffer; - while (_T('\0') != ServiceName[0]) + while (ServiceName[0] != _T('\0')) { size_t Length; Length = _tcslen(ServiceName); - if (0 == Length) + if (Length == 0) break; - if (TRUE == PrepareService(ServiceName)) + if (PrepareService(ServiceName) == TRUE) ++NrOfServices; BufferIndex += Length + 1; @@ -222,12 +222,12 @@ NrOfServices = LoadServiceCategory(argv[2]); DPRINT("NrOfServices: %lu\n", NrOfServices); - if (0 == NrOfServices) + if (NrOfServices == 0) return 0; ServiceTable = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE_TABLE_ENTRY) * (NrOfServices + 1)); - if (NULL != ServiceTable) + if (ServiceTable != NULL) { DWORD i; PSERVICE Service = FirstService; @@ -245,7 +245,7 @@ ServiceTable[i].lpServiceName = NULL; ServiceTable[i].lpServiceProc = NULL; - if (FALSE == StartServiceCtrlDispatcher(ServiceTable)) + if (StartServiceCtrlDispatcher(ServiceTable) == FALSE) DPRINT1("Failed to start service control dispatcher, ErrorCode: %lu\n", GetLastError()); HeapFree(GetProcessHeap(), 0, ServiceTable);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs