Index: apitests/ntdll/CMakeLists.txt
===================================================================
--- apitests/ntdll/CMakeLists.txt	(revision 60347)
+++ apitests/ntdll/CMakeLists.txt	(working copy)
@@ -15,6 +15,7 @@
     RtlGetFullPathName_U.c
     RtlGetFullPathName_Ustr.c
     RtlGetFullPathName_UstrEx.c
+    RtlGetLengthWithoutTrailingPathSeperators.c
     RtlGetLongestNtPathLength.c
     RtlInitializeBitMap.c
     SystemInfo.c
Index: apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c
===================================================================
--- apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c	(revision 0)
+++ apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c	(working copy)
@@ -0,0 +1,183 @@
+/*
+ * PROJECT:         ReactOS api tests
+ * LICENSE:         GPLv2+ - See COPYING in the top level directory
+ * PURPOSE:         Test for RtlGetLengthWithoutTrailingPathSeperators
+ * PROGRAMMER:      David Quintana <gigaherz@gmail.com>
+ */
+
+#define WIN32_NO_STATUS
+#include <apitest.h>
+#include <ndk/rtlfuncs.h>
+
+#define MakeTestEntry_Success(str, expect) \
+    { str, expect, STATUS_SUCCESS, __LINE__ }
+
+struct test_data {
+    PWSTR input;
+    ULONG expected_output;
+    NTSTATUS expected_result;
+    int line;
+} test_entries[] = {
+
+    /* NULL in UNICODE_STRING */
+    MakeTestEntry_Success( NULL, 0 ),
+
+    /* Length tests */
+    MakeTestEntry_Success( L"", 0 ),
+    MakeTestEntry_Success( L"T", 1 ),
+    MakeTestEntry_Success( L"Te", 2 ),
+    MakeTestEntry_Success( L"Tes", 3 ),
+    MakeTestEntry_Success( L"Test", 4 ),
+
+    /* Separators tests */
+    MakeTestEntry_Success( L"\\.", 2 ),
+    MakeTestEntry_Success( L"\\.", 2 ),
+    MakeTestEntry_Success( L"\\.\\", 2 ),
+    MakeTestEntry_Success( L"\\.\\T", 4 ),
+    MakeTestEntry_Success( L"\\.\\Te", 5 ),
+    MakeTestEntry_Success( L"\\.\\Tes", 6 ),
+    MakeTestEntry_Success( L"\\.\\Test", 7 ),
+    MakeTestEntry_Success( L"\\.\\Test\\", 7 ),
+    MakeTestEntry_Success( L"\\.\\Test\\s", 9 ),
+    MakeTestEntry_Success( L"\\.\\T\\est", 8 ),
+    MakeTestEntry_Success( L"\\.\\T\\e\\st", 9 ),
+    MakeTestEntry_Success( L"\\.\\T\\e\\s\\t", 10 ),
+    MakeTestEntry_Success( L"\\.\\T\\e\\s\\t\\", 10 ),
+    MakeTestEntry_Success( L"\\Tests\\String\\", 13 ),
+    MakeTestEntry_Success( L"\\.\\Test\\String\\", 14 ),
+    MakeTestEntry_Success( L"\\.\\Tests\\String\\", 15 ),
+    MakeTestEntry_Success( L"\\.\\Tests\\String\\s", 17 ),
+    MakeTestEntry_Success( L"\\.\\Tests\\String\\as", 18 ),
+    MakeTestEntry_Success( L"\\.\\Tests\\String\\asd", 19 ),
+    MakeTestEntry_Success( L"\\.\\Tests\\String\\asdf", 20 ),
+    MakeTestEntry_Success( L"\\Tests\\String\\sdfsdf\\", 20 ),
+    MakeTestEntry_Success( L"C:\\Tests\\String\\sdfsdf\\", 22 ),
+
+    /* Separator-only tests */
+    MakeTestEntry_Success( L"\\", 0 ),
+    MakeTestEntry_Success( L"/", 0 ),
+
+    /* Mixed separators tests */
+    MakeTestEntry_Success( L"/Test/String", 12 ),
+    MakeTestEntry_Success( L"\\Test/String", 12 ),
+    MakeTestEntry_Success( L"/Test\\String", 12 ),
+    MakeTestEntry_Success( L"\\Test/String", 12 ),
+    MakeTestEntry_Success( L"/Test/String\\", 12 ),
+    MakeTestEntry_Success( L"\\Test/String\\", 12 ),
+    MakeTestEntry_Success( L"/Test\\String\\", 12 ),
+    MakeTestEntry_Success( L"\\Test/String\\", 12 ),
+    MakeTestEntry_Success( L"/Test/String/", 12 ),
+    MakeTestEntry_Success( L"\\Test/String/", 12 ),
+    MakeTestEntry_Success( L"/Test\\String/", 12 ),
+    MakeTestEntry_Success( L"\\Test/String/", 12 ),
+    MakeTestEntry_Success( L"\\Test/String/", 12 ),
+    MakeTestEntry_Success( L"\\Test\\\\String/", 13 ),
+
+    /* Common path formats tests */
+    MakeTestEntry_Success( L"Test\\String", 11 ),
+    MakeTestEntry_Success( L"\\Test\\String", 12 ),
+    MakeTestEntry_Success( L".\\Test\\String", 13 ),
+    MakeTestEntry_Success( L"\\.\\Test\\String", 14 ),
+    MakeTestEntry_Success( L"\\??\\Test\\String", 15 ),
+
+    /* Redundant trailing tests */
+    MakeTestEntry_Success( L"\\??\\Test\\String\\", 15 ),
+    MakeTestEntry_Success( L"\\??\\Test\\String\\\\", 15 ),
+    MakeTestEntry_Success( L"\\??\\Test\\String\\\\\\\\\\", 15 ),
+
+};
+
+int num_tests = sizeof(test_entries) / sizeof(struct test_data);
+
+START_TEST(RtlGetLengthWithoutTrailingPathSeperators)
+{
+    ULONG len;
+    UNICODE_STRING str;
+    NTSTATUS res;
+    int i;
+
+    struct test_data * pentry = test_entries;
+
+    for(i = 0; i < num_tests; i++, pentry++)
+    {
+        RtlInitUnicodeString(
+            &str, pentry->input);
+
+        len = 0xDEADBEEF;
+        
+        StartSeh()
+            res = RtlGetLengthWithoutTrailingPathSeperators(0, &str, &len);
+        EndSeh(STATUS_SUCCESS);
+         
+        ok(res == pentry->expected_result, 
+            "Unexpected result 0x%08x (expected 0x%08x) in [%d:%d]\n",
+            res, pentry->expected_result,
+            i, pentry->line);
+        ok(len == pentry->expected_output,
+            "Unexpected length %d (expected %d) in [%d:%d]\n", 
+            len, pentry->expected_output,
+            i, pentry->line);          
+    }
+
+    // Invalid parameters
+
+    len = 0xDEADBEEF;
+
+    StartSeh()
+        res = RtlGetLengthWithoutTrailingPathSeperators(0, NULL, &len);
+    EndSeh(STATUS_SUCCESS);
+
+    ok(res == STATUS_INVALID_PARAMETER, 
+        "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n",
+        res);
+    ok(len == 0, 
+        "Unexpected length %08x (expected 0)\n",
+        len);
+
+    StartSeh()
+        res = RtlGetLengthWithoutTrailingPathSeperators(0, &str, NULL);
+    EndSeh(STATUS_SUCCESS);
+
+    ok(res == STATUS_INVALID_PARAMETER, 
+        "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n",
+        res);
+
+    StartSeh()
+        res = RtlGetLengthWithoutTrailingPathSeperators(0, NULL, NULL);
+    EndSeh(STATUS_SUCCESS);
+
+    ok(res == STATUS_INVALID_PARAMETER, 
+        "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n",
+        res);
+
+    for(i = 0; i < 32; i++)
+    {
+        len = 0xDEADBEEF;
+
+        StartSeh()
+            res = RtlGetLengthWithoutTrailingPathSeperators(1<<i, &str, &len);
+        EndSeh(STATUS_SUCCESS);
+
+        ok(res == STATUS_INVALID_PARAMETER, 
+            "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n",
+            res);
+
+        ok(len == 0, 
+            "Unexpected length %08x (expected 0)\n",
+            len);
+    }
+
+    len = 0xDEADBEEF;
+
+    StartSeh()
+        res = RtlGetLengthWithoutTrailingPathSeperators(0xFFFFFFFF, &str, &len);
+    EndSeh(STATUS_SUCCESS);
+
+    ok(res == STATUS_INVALID_PARAMETER, 
+        "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n",
+        res);
+        
+    ok(len == 0, 
+        "Unexpected length %08x (expected 0)\n",
+        len);
+}
Index: apitests/ntdll/testlist.c
===================================================================
--- apitests/ntdll/testlist.c	(revision 60347)
+++ apitests/ntdll/testlist.c	(working copy)
@@ -19,6 +19,7 @@
 extern void func_RtlGetFullPathName_U(void);
 extern void func_RtlGetFullPathName_Ustr(void);
 extern void func_RtlGetFullPathName_UstrEx(void);
+extern void func_RtlGetLengthWithoutTrailingPathSeperators(void);
 extern void func_RtlGetLongestNtPathLength(void);
 extern void func_RtlInitializeBitMap(void);
 extern void func_TimerResolution(void);
@@ -42,6 +43,7 @@
     { "RtlGetFullPathName_U",           func_RtlGetFullPathName_U },
     { "RtlGetFullPathName_Ustr",        func_RtlGetFullPathName_Ustr },
     { "RtlGetFullPathName_UstrEx",      func_RtlGetFullPathName_UstrEx },
+    { "RtlGetLengthWithoutTrailingPathSeperators", func_RtlGetLengthWithoutTrailingPathSeperators },
     { "RtlGetLongestNtPathLength",      func_RtlGetLongestNtPathLength },
     { "RtlInitializeBitMap",            func_RtlInitializeBitMap },
     { "TimerResolution",                func_TimerResolution },