[PATCH v2 0/1] MR6735: msxml3: Undo removal of xmlThrDefTreeIndentString

[Fabian Maurer (＠DarkShadow44)]

Fixes regression by 9d34c44d8464722c333fdde5313b341504d3ea44.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57325

Not sure why this was removed, but it breaks the office installer. If this is not the right course of action, please tell me and I'll try to find a different solution.

--
  v2: msxml3: Undo removal of xmlThrDefTreeIndentString
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6735

[PATCH v2 1/1] msxml3: Undo removal of xmlThrDefTreeIndentString

[Fabian Maurer]

From: Fabian Maurer <dark.shadow4(a)web.de>

Fixes regression by 9d34c44d8464722c333fdde5313b341504d3ea44.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57325
---
 dlls/msxml3/main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
index c92cd49aaf3..16e0b38b185 100644
--- a/dlls/msxml3/main.c
+++ b/dlls/msxml3/main.c
@@ -24,6 +24,7 @@
 #include <stdarg.h>
 #include <libxml/parser.h>
 #include <libxml/xmlerror.h>
+#include <libxml/xmlsave.h>
 #include <libxslt/pattern.h>
 #include <libxslt/transform.h>
 #include <libxslt/imports.h>
@@ -365,8 +366,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved)
     case DLL_PROCESS_ATTACH:
         xmlInitParser();
 
-        /* Set the default indent character to a single tab */
+        /* Set the default indent character to a single tab,
+           for this thread and as default for new threads */
         xmlTreeIndentString = "\t";
+        xmlThrDefTreeIndentString("\t");
 
          /* Register callbacks for loading XML files */
         if(xmlRegisterInputCallbacks(wineXmlMatchCallback, wineXmlOpenCallback,
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6735

[PATCH v2 1/1] msxml3: Undo removal of xmlThrDefTreeIndentString

[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=149843

Your paranoid android.


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

user32:
win.c:4070: Test failed: Expected active window 00000000033E0156, got 0000000000000000.
win.c:4071: Test failed: Expected focus window 00000000033E0156, got 0000000000000000.

[Fabian Maurer (＠DarkShadow44)]

On Thu Nov 21 09:33:49 2024 +0000, Nikolay Sivov wrote:
> Sure. We'll need a change for this one to include <libxml/xmlsave.h>
> anyway, otherwise you'll get a compilation warning. That's why there is
> no CI results.
> Good catch, I pushed an update.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6735#note_88360

[PATCH v2 0/1] MR6735: msxml3: Undo removal of xmlThrDefTreeIndentString - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6735