[PATCH resend] winapi_test: Add/remove headers for urlmon test, in tests.dat.

[Serge Gautherie]

Signed-off-by: Serge Gautherie 
---
Addendum to b3da4abc5771a7542409412c41b3356255f248b2.
---
 tools/winapi/tests.dat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat
index 3f470d4..57a65e1 100644
--- a/tools/winapi/tests.dat
+++ b/tools/winapi/tests.dat
@@ -1261,9 +1261,9 @@ Unit tests for data structure packing

%header

-basetsd.h
 winnt.h
 windef.h
+guiddef.h
 urlmon.h

%include

[Francois Gouget]

On Mon, 8 Jun 2020, Serge Gautherie wrote:
> Signed-off-by: Serge Gautherie
>
> Addendum to b3da4abc5771a7542409412c41b3356255f248b2.

Could you provide a longer rationale for the patch?
> -basetsd.h
>  winnt.h
>  windef.h
> +guiddef.h
>  urlmon.h

Otherwise it works here in that it does not change the generated code. 
That also means that adding guiddef.h is not really necessary (by that 
measure windef.h is not either). It's presumably included by urlmon.h 
already. What should the policy be for this?

[Serge Gautherie]

My point is that each test should be actually separate.
Currently, includes from one test can silently apply to others.

First update test includes, then fix tool code too.

On 08/06/2020 18:56, Francois Gouget wrote:
> Could you provide a longer rationale for the patch?
>
> What should the policy be for this?

[Francois Gouget]

On Mon, 8 Jun 2020, Serge Gautherie wrote:
> My point is that each test should be actually separate.
> Currently, includes from one test can silently apply to others.
>
> First update test includes, then fix tool code too.

Ok.

I have retested by keeping only urlmon in tests.dat. The patch does make 
a difference. But only guiddef.h and urlmon.h seem to actually be 
needed. Do we want to keep windef.h and winnt.h anyway?

[Serge Gautherie]

On 09/06/2020 07:33, Francois Gouget wrote:
> On Mon, 8 Jun 2020, Serge Gautherie wrote:
> > First update test includes, then fix tool code too.

Actually, I am checking/fixing 'headers'.
I am ignoring 'includes' (for the time being).
> But only guiddef.h and urlmon.h seem to actually be
> needed. Do we want to keep windef.h and winnt.h anyway?

With my custom/Windows setup, they are needed:
otherwise, 'generated.c' has some diffs like
{{
@@ -77,16 +77,10 @@
  #ifdef _WIN64

static void test_pack_BINDINFO(void)
  {
      /* BINDINFO */
-    TEST_FIELD_SIZE  (BINDINFO, cbSize, 4)
-    TEST_FIELD_ALIGN (BINDINFO, cbSize, 4)
-    TEST_FIELD_OFFSET(BINDINFO, cbSize, 0)
-    TEST_FIELD_SIZE  (BINDINFO, szExtraInfo, 8)
-    TEST_FIELD_ALIGN (BINDINFO, szExtraInfo, 8)
-    TEST_FIELD_OFFSET(BINDINFO, szExtraInfo, 8)
  }

static void test_pack_IBindHost(void)
  {
      /* IBindHost */
}}