[PATCH 0/2] MR10570: widl: Do not override name prefix settings from pragmas in imported modules.

[Jacek Caban (＠jacek)]

Fixes regression from 858ec42a31c5.

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

[PATCH 1/2] widl: Do not override name prefix settings from pragmas in imported modules.

[Jacek Caban]

From: Jacek Caban <[e-mail]>

Fixes regression from 858ec42a31c5.
---
 tools/widl/parser.l | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/widl/parser.l b/tools/widl/parser.l
index c57ad990c5b..c18c7dd09ab 100644
--- a/tools/widl/parser.l
+++ b/tools/widl/parser.l
@@ -185,11 +185,9 @@ static int token_winrt( int token, const char *str, YYSTYPE *yylval )
     return token_ident( str, yylval );
 }
 
-static void winrt_enable( int ns_prefix )
+static void winrt_enable(void)
 {
     if (!list_empty( &import_stack ) && !winrt_mode) error_loc( "WinRT IDL file imported in non-winrt mode.\n" );
-
-    use_abi_namespace = ns_prefix;
     winrt_mode = TRUE;
 }
 
@@ -210,12 +208,14 @@ static void winrt_enable( int ns_prefix )
     winrt{ws}+ns_prefix[^\n]*                   {
                                                     yy_pop_state();
                                                     yylloc->first_line -= 1;
-                                                    winrt_enable( TRUE );
+                                                    winrt_enable();
+                                                    if (list_empty( &import_stack )) use_abi_namespace = TRUE;
+
                                                 }
     winrt[^\n]*                                 {
                                                     yy_pop_state();
                                                     yylloc->first_line -= 1;
-                                                    winrt_enable( FALSE );
+                                                    winrt_enable();
                                                 }
     [^\n]*                                      {
                                                     yy_pop_state();
-- 
GitLab


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

[PATCH 2/2] include: Don't use ns_prefix in windows.graphics.directx.direct3d11.interop.idl.

[Jacek Caban]

From: Jacek Caban <[e-mail]>

Fixes https://github.com/mingw-w64/mingw-w64/issues/129.
---
 include/windows.graphics.directx.direct3d11.interop.idl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/windows.graphics.directx.direct3d11.interop.idl b/include/windows.graphics.directx.direct3d11.interop.idl
index b5ca72e40d6..345080449de 100644
--- a/include/windows.graphics.directx.direct3d11.interop.idl
+++ b/include/windows.graphics.directx.direct3d11.interop.idl
@@ -15,7 +15,7 @@
  */
 
 #ifdef __WIDL__
-#pragma winrt ns_prefix
+#pragma winrt
 #endif
 
 import "dxgi.idl";
-- 
GitLab

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