You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 6a04cf4a69205ddf6827fb2a4b97862fd1947c62
This commit is contained in:
@@ -1,18 +1,18 @@
|
||||
From 8f0f5577096155171dceb98ee28c570533a9a89c Mon Sep 17 00:00:00 2001
|
||||
From a539993bd7c60424fb6d592be8cb5040959e1b48 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Sun, 17 Apr 2016 19:58:15 +0800
|
||||
Subject: kernel32/tests: Add some tests for GetLongPathName/GetShortPathName
|
||||
called with a wildcard.
|
||||
Subject: [PATCH] kernel32/tests: Add some tests for
|
||||
GetLongPathName/GetShortPathName called with a wildcard.
|
||||
|
||||
---
|
||||
dlls/kernel32/tests/path.c | 24 ++++++++++++++++++++++--
|
||||
1 file changed, 22 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c
|
||||
index 079820f..0dc8802 100644
|
||||
index ca1cbf3..1e698bf 100644
|
||||
--- a/dlls/kernel32/tests/path.c
|
||||
+++ b/dlls/kernel32/tests/path.c
|
||||
@@ -1170,7 +1170,7 @@ static void test_GetTempPath(void)
|
||||
@@ -1186,7 +1186,7 @@ static void test_GetTempPath(void)
|
||||
static void test_GetLongPathNameA(void)
|
||||
{
|
||||
DWORD length, explength, hostsize;
|
||||
@@ -21,7 +21,7 @@ index 079820f..0dc8802 100644
|
||||
char longpath[MAX_PATH];
|
||||
char unc_prefix[MAX_PATH];
|
||||
char unc_short[MAX_PATH], unc_long[MAX_PATH];
|
||||
@@ -1181,7 +1181,17 @@ static void test_GetLongPathNameA(void)
|
||||
@@ -1197,7 +1197,17 @@ static void test_GetLongPathNameA(void)
|
||||
return;
|
||||
|
||||
GetTempPathA(MAX_PATH, tempfile);
|
||||
@@ -40,7 +40,7 @@ index 079820f..0dc8802 100644
|
||||
|
||||
file = CreateFileA(tempfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
|
||||
CloseHandle(file);
|
||||
@@ -1385,6 +1395,7 @@ static void test_GetShortPathNameW(void)
|
||||
@@ -1401,6 +1411,7 @@ static void test_GetShortPathNameW(void)
|
||||
static const WCHAR name[] = { 't', 'e', 's', 't', 0 };
|
||||
static const WCHAR backSlash[] = { '\\', 0 };
|
||||
static const WCHAR a_bcdeW[] = {'a','.','b','c','d','e',0};
|
||||
@@ -48,8 +48,8 @@ index 079820f..0dc8802 100644
|
||||
WCHAR path[MAX_PATH], tmppath[MAX_PATH], *ptr;
|
||||
WCHAR short_path[MAX_PATH];
|
||||
DWORD length;
|
||||
@@ -1447,6 +1458,15 @@ static void test_GetShortPathNameW(void)
|
||||
length = GetShortPathNameW( path, short_path, sizeof(short_path)/sizeof(*short_path) );
|
||||
@@ -1463,6 +1474,15 @@ static void test_GetShortPathNameW(void)
|
||||
length = GetShortPathNameW( path, short_path, ARRAY_SIZE( short_path ));
|
||||
ok( length, "GetShortPathNameW failed: %u.\n", GetLastError() );
|
||||
|
||||
+ lstrcpyW(ptr, wildW);
|
||||
@@ -65,5 +65,5 @@ index 079820f..0dc8802 100644
|
||||
ok( ret, "Cannot delete file.\n" );
|
||||
*ptr = 0;
|
||||
--
|
||||
2.7.1
|
||||
1.9.1
|
||||
|
||||
|
Reference in New Issue
Block a user