[PATCH 0/2] MR6158: Replaced with simpler functions with the char, wchar_t parameter if possible

[Herman Semenov (＠GermanAizek)]

Example my assembly with gcc -02 flag

Before:
![screen_before](/uploads/f2bf5f4c793c159c31ac42b635c46d5a/screen_before.jpg)

After:
![screen_after](/uploads/051315ad1e3c064046446782d36e1a29/screen_after.jpg)

[PATCH 1/2] dbghelp: fixed misprint access to struct with invalid case

[Herman Semenov]

From: Herman Semenov

---
 dlls/dbghelp/msc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c
index 6250061296e..e4a63544f34 100644
--- a/dlls/dbghelp/msc.c
+++ b/dlls/dbghelp/msc.c
@@ -2712,7 +2712,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg,
                     /* skip all records until paired S_INLINESITE_END */
                     sym = (const union codeview_symbol*)(root + sym->inline_site2_v3.pEnd);
                     if (sym->generic.id != S_INLINESITE_END) FIXME("complete wreckage\n");
-                    length = sym->inline_site_v3.pEnd - i + sym->generic.len;
+                    length = sym->inline_site2_v3.pEnd - i + sym->generic.len;
                 }
             }
             break;

[PATCH 2/2] d3dcompiler, wcmdmain: replaced to strchr for simplify codegeneration by compiler

[Herman Semenov]

From: Herman Semenov

---
 dlls/d3dcompiler_43/compiler.c | 2 +-
 programs/cmd/wcmdmain.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c
index 6fffcfb82ab..5059deee9f1 100644
--- a/dlls/d3dcompiler_43/compiler.c
+++ b/dlls/d3dcompiler_43/compiler.c
@@ -176,7 +176,7 @@ static const char *get_line(const char **ptr)
     const char *p, *q;

p = *ptr;
-    if (!(q = strstr(p, "\n")))
+    if (!(q = strchr(p, '\n')))
     {
         if (!*p)
             return NULL;
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 2c64785d44a..50c71857bab 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -704,7 +704,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR startchar)
       return WCMD_strsubstW(start, endOfVar + 1, startCopy, substrlength);
     /* search and replace manipulation */
     } else {
-      WCHAR *equalspos = wcsstr(colonpos, L"=");
+      WCHAR *equalspos = wcschr(colonpos, '=');
       WCHAR *replacewith = equalspos+1;
       WCHAR *found       = NULL;
       WCHAR *searchIn;

[PATCH 2/2] d3dcompiler, wcmdmain: replaced to strchr for simplify codegeneration by compiler

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=147346

Your paranoid android.

=== debian11b (64 bit WoW report) ===

Report validation errors:
mshtml:script crashed (c0000005)