widl: Correct the condition when to use new code path which avoids writing negative offsets in the pointer description.

Dmitry Timoshkov dmitry at baikal.ru
Wed Apr 2 23:57:13 CDT 2014


It looks like the change introduced by bde38bebe9d396ba83a5b3e477fa616b6500c4d5
was not properly tested and that's causing rpcrt4/server test failures under
all Windows platforms. This patch should fix the breakage, here is the testbot
result of the test submitted manually (because it depends on a widl rebuild):
https://testbot.winehq.org/JobDetails.pl?Key=6124 (w8 VM test failures are not
related to widl changes and existed before).
---
 tools/widl/typegen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c
index d85b5e0..4bb4cc4 100644
--- a/tools/widl/typegen.c
+++ b/tools/widl/typegen.c
@@ -3596,7 +3596,7 @@ static unsigned int write_type_tfs(FILE *file, int indent,
         else
             ref_context = context;
 
-        if (is_string_type(attrs, type) && is_conformant_array(ref))
+        if (is_string_type(attrs, ref))
         {
             if (context != TYPE_CONTEXT_CONTAINER_NO_POINTERS)
                 write_pointer_tfs(file, attrs, type, *typeformat_offset + 4, context, typeformat_offset);
-- 
1.9.1




More information about the wine-patches mailing list