Commit c3760e7d authored by Saulius Krasuckas's avatar Saulius Krasuckas Committed by Alexandre Julliard

Remove trailing backslash.

parent 0c206b94
...@@ -64,7 +64,14 @@ static BOOL file_exists(const CHAR *name) ...@@ -64,7 +64,14 @@ static BOOL file_exists(const CHAR *name)
/* initializes the tests */ /* initializes the tests */
static void init_shfo_tests(void) static void init_shfo_tests(void)
{ {
int len;
GetCurrentDirectoryA(MAX_PATH, CURR_DIR); GetCurrentDirectoryA(MAX_PATH, CURR_DIR);
len = lstrlenA(CURR_DIR);
if(len && (CURR_DIR[len-1] == '\\'))
CURR_DIR[len-1] = 0;
createTestFile(".\\test1.txt"); createTestFile(".\\test1.txt");
createTestFile(".\\test2.txt"); createTestFile(".\\test2.txt");
createTestFile(".\\test3.txt"); createTestFile(".\\test3.txt");
......
...@@ -621,9 +621,19 @@ static void test_EnumObjects_and_CompareIDs(void) ...@@ -621,9 +621,19 @@ static void test_EnumObjects_and_CompareIDs(void)
char cCurrDirA [MAX_PATH] = {0}; char cCurrDirA [MAX_PATH] = {0};
WCHAR cCurrDirW [MAX_PATH]; WCHAR cCurrDirW [MAX_PATH];
static const WCHAR cTestDirW[] = {'\\','t','e','s','t','d','i','r',0}; static const WCHAR cTestDirW[] = {'\\','t','e','s','t','d','i','r',0};
int len;
HRESULT hr; HRESULT hr;
GetCurrentDirectoryA(MAX_PATH, cCurrDirA); GetCurrentDirectoryA(MAX_PATH, cCurrDirA);
len = lstrlenA(cCurrDirA);
if(len == 0) {
trace("GetCurrentDirectoryA returned empty string. Skipping test_EnumObjects_and_CompareIDs\n");
return;
}
if(cCurrDirA[len-1] == '\\')
cCurrDirA[len-1] = 0;
MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cCurrDirW, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cCurrDirW, MAX_PATH);
strcatW(cCurrDirW, cTestDirW); strcatW(cCurrDirW, cTestDirW);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment