Rebase against 94b6a885a880728f5e0a865fc17a82532723e756.

[ntdll-InMemoryOrderModuleList]
Removed patch to sort InMemoryOrderModuleList in load order (accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-07-07 17:01:09 +02:00
parent cf457f4e1c
commit 867c8334a1
5 changed files with 39 additions and 171 deletions

View File

@@ -1,40 +0,0 @@
From afe971bbea3f26a27af206a56957d12e9e3627b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 16 May 2016 22:38:06 +0200
Subject: wininet/tests: Fix typo (lpszPath -> lpszUrlPath) in messages.
---
dlls/wininet/tests/url.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c
index 1deae67..00a457a 100644
--- a/dlls/wininet/tests/url.c
+++ b/dlls/wininet/tests/url.c
@@ -246,9 +246,9 @@ static void test_crack_url(const crack_url_test_t *test)
test->url, url.dwPasswordLength, test->pass_len);
if(test->path_off == -1)
- ok(!url.lpszUrlPath, "[%s] url.lpszPath = %p, expected NULL\n", test->url, url.lpszUrlPath);
+ ok(!url.lpszUrlPath, "[%s] url.lpszUrlPath = %p, expected NULL\n", test->url, url.lpszUrlPath);
else
- ok(url.lpszUrlPath == test->url+test->path_off, "[%s] url.lpszPath = %p, expected %p\n",
+ ok(url.lpszUrlPath == test->url+test->path_off, "[%s] url.lpszUrlPath = %p, expected %p\n",
test->url, url.lpszUrlPath, test->url+test->path_off);
ok(url.dwUrlPathLength == test->path_len, "[%s] url.lpszUrlPathLength = %d, expected %d\n",
test->url, url.dwUrlPathLength, test->path_len);
@@ -326,9 +326,9 @@ static void test_crack_url(const crack_url_test_t *test)
}
if(test->path_off == -1)
- ok(!urlw.lpszUrlPath, "[%s] urlw.lpszPath = %p, expected NULL\n", test->url, urlw.lpszUrlPath);
+ ok(!urlw.lpszUrlPath, "[%s] urlw.lpszUrlPath = %p, expected NULL\n", test->url, urlw.lpszUrlPath);
else
- ok(urlw.lpszUrlPath == buf+test->path_off, "[%s] urlw.lpszPath = %p, expected %p\n",
+ ok(urlw.lpszUrlPath == buf+test->path_off, "[%s] urlw.lpszUrlPath = %p, expected %p\n",
test->url, urlw.lpszUrlPath, buf+test->path_off);
ok(urlw.dwUrlPathLength == test->path_len, "[%s] urlw.lpszUrlPathLength = %d, expected %d\n",
test->url, urlw.dwUrlPathLength, test->path_len);
--
2.8.0