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 9c98d632779862aae15e9e3a25f59065fae03386.
[mmsystem.dll16-Fix_Argument_Order] Removed patch to fix argument order in GlobalAlloc16 call (accepted upstream). [msvideo-MCIWNDM_SETTIMEFORMATA] Removed patch to translate 16 bit address in lparam for MCIWNDM_SETTIMEFORMATA message (accepted upstream). [vcomp-Atomic_I8] Removed patch to implement 64-bit atomic instructions in OpenMP (accepted upstream). [wined3d-CSMT_Main] Temporarily disable patchset, needs rebasing.
This commit is contained in:
Sebastian Lackner
@@ -1,16 +1,16 @@
|
||||
From 37837138f0124582ae9af34643710d619b5b48bc Mon Sep 17 00:00:00 2001
|
||||
From d9e16cb2bde3371d403da8dbbc2c7d63b9a29a27 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Mon, 16 Mar 2015 03:46:36 +0100
|
||||
Subject: ntdll: Fix return value for missing
|
||||
ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION key.
|
||||
|
||||
---
|
||||
dlls/kernel32/tests/actctx.c | 68 ++++++++++++++++----------------------------
|
||||
dlls/ntdll/actctx.c | 3 ++
|
||||
2 files changed, 27 insertions(+), 44 deletions(-)
|
||||
dlls/kernel32/tests/actctx.c | 36 ++++++++++++++++--------------------
|
||||
dlls/ntdll/actctx.c | 3 +++
|
||||
2 files changed, 19 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c
|
||||
index 7512aed..6d5f2da 100644
|
||||
index af3dadf..b68c895 100644
|
||||
--- a/dlls/kernel32/tests/actctx.c
|
||||
+++ b/dlls/kernel32/tests/actctx.c
|
||||
@@ -2067,7 +2067,7 @@ static HANDLE create_manifest(const char *filename, const char *data, int line)
|
||||
@@ -22,39 +22,23 @@ index 7512aed..6d5f2da 100644
|
||||
{
|
||||
UNICODE_STRING string_to_findW;
|
||||
ACTCTX_SECTION_KEYED_DATA data;
|
||||
@@ -2084,13 +2084,8 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
|
||||
@@ -2084,7 +2084,6 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
|
||||
err = GetLastError();
|
||||
ok_(__FILE__, line)(ret == should_find,
|
||||
"FindActCtxSectionStringA: expected ret = %u, got %u\n", should_find, ret);
|
||||
- if (todo)
|
||||
- todo_wine
|
||||
- ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
|
||||
- "FindActCtxSectionStringA: unexpected error %u\n", err);
|
||||
- else
|
||||
- ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
|
||||
- "FindActCtxSectionStringA: unexpected error %u\n", err);
|
||||
+ ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
|
||||
+ "FindActCtxSectionStringA: unexpected error %u\n", err);
|
||||
- todo_wine_if(todo)
|
||||
ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
|
||||
"FindActCtxSectionStringA: unexpected error %u\n", err);
|
||||
|
||||
memset(&data, 0xfe, sizeof(data));
|
||||
data.cbSize = sizeof(data);
|
||||
@@ -2100,13 +2095,8 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
|
||||
@@ -2096,7 +2095,6 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
|
||||
err = GetLastError();
|
||||
ok_(__FILE__, line)(ret == should_find,
|
||||
"FindActCtxSectionStringW: expected ret = %u, got %u\n", should_find, ret);
|
||||
- if (todo)
|
||||
- todo_wine
|
||||
- ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
|
||||
- "FindActCtxSectionStringW: unexpected error %u\n", err);
|
||||
- else
|
||||
- ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
|
||||
- "FindActCtxSectionStringW: unexpected error %u\n", err);
|
||||
+ ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
|
||||
+ "FindActCtxSectionStringW: unexpected error %u\n", err);
|
||||
- todo_wine_if(todo)
|
||||
ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
|
||||
"FindActCtxSectionStringW: unexpected error %u\n", err);
|
||||
|
||||
SetLastError(0);
|
||||
ret = pFindActCtxSectionStringA(0, NULL, section, string_to_find, NULL);
|
||||
@@ -2127,7 +2117,7 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
|
||||
@@ -2119,7 +2117,7 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
|
||||
pRtlFreeUnicodeString(&string_to_findW);
|
||||
}
|
||||
|
||||
@@ -63,34 +47,20 @@ index 7512aed..6d5f2da 100644
|
||||
{
|
||||
UNICODE_STRING string_to_findW;
|
||||
ACTCTX_SECTION_KEYED_DATA data;
|
||||
@@ -2139,22 +2129,12 @@ static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_fi
|
||||
@@ -2131,12 +2129,10 @@ static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_fi
|
||||
data.cbSize = sizeof(data);
|
||||
|
||||
ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, &data);
|
||||
- if (todo)
|
||||
- todo_wine
|
||||
- ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND),
|
||||
- "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
|
||||
- else
|
||||
- ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND),
|
||||
- "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
|
||||
+ ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND),
|
||||
+ "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
|
||||
- todo_wine_if(todo)
|
||||
ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND),
|
||||
"RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
|
||||
|
||||
ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, NULL);
|
||||
- if (todo)
|
||||
- todo_wine
|
||||
- ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND),
|
||||
- "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
|
||||
- else
|
||||
- ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND),
|
||||
- "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
|
||||
+ ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND),
|
||||
+ "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
|
||||
- todo_wine_if(todo)
|
||||
ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND),
|
||||
"RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
|
||||
|
||||
pRtlFreeUnicodeString(&string_to_findW);
|
||||
}
|
||||
@@ -2170,22 +2150,22 @@ static void test_findsectionstring(void)
|
||||
@@ -2154,22 +2150,22 @@ static void test_findsectionstring(void)
|
||||
ok(ret, "ActivateActCtx failed: %u\n", GetLastError());
|
||||
|
||||
/* first we show the parameter validation from kernel32 */
|
||||
@@ -128,10 +98,10 @@ index 7512aed..6d5f2da 100644
|
||||
ret = pDeactivateActCtx(0, cookie);
|
||||
ok(ret, "DeactivateActCtx failed: %u\n", GetLastError());
|
||||
diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
|
||||
index 638daac..08f5b04 100644
|
||||
index 4aa1a72..8957fad 100644
|
||||
--- a/dlls/ntdll/actctx.c
|
||||
+++ b/dlls/ntdll/actctx.c
|
||||
@@ -4432,6 +4432,9 @@ static NTSTATUS find_string(ACTIVATION_CONTEXT* actctx, ULONG section_kind,
|
||||
@@ -4431,6 +4431,9 @@ static NTSTATUS find_string(ACTIVATION_CONTEXT* actctx, ULONG section_kind,
|
||||
|
||||
switch (section_kind)
|
||||
{
|
||||
@@ -142,5 +112,5 @@ index 638daac..08f5b04 100644
|
||||
status = find_dll_redirection(actctx, section_name, data);
|
||||
break;
|
||||
--
|
||||
2.3.2
|
||||
2.7.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user