Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.13 doesn't build with the tests enabled #98

Open
ivyl opened this issue Oct 20, 2020 · 0 comments
Open

5.13 doesn't build with the tests enabled #98

ivyl opened this issue Oct 20, 2020 · 0 comments

Comments

@ivyl
Copy link
Collaborator

ivyl commented Oct 20, 2020

Caused by 289f450 ("mmdevapi: Implement ActivateAudioInterfaceAsync.")

Looks like we are missing two other patches from the upstream:

  • 6e09636 ("include: Split objidl.idl to objidlbase.idl.")
  • cdf013b ("include: Add IAgileObject to objidlbase.idl.")

Then 29ccc21 ("windows.globalization: Add stub dll.") needs a small fixup:

diff --git a/dlls/windows.globalization.dll/windows.globalization_main.c b/dlls/windows.globalization.dll/windows.globalization_main.c
index f29079d6a5e..e6bba5e096f 100644
--- a/dlls/windows.globalization.dll/windows.globalization_main.c
+++ b/dlls/windows.globalization.dll/windows.globalization_main.c
@@ -25,7 +25,6 @@ static const char *debugstr_hstring(HSTRING hstr)

 DEFINE_GUID(IID_IGlobalizationPreferencesStatics,0x01bf4326,0xed37,0x4e96,0xb0,0xe9,0xc1,0x34,0x0d,0x1e,0xa1,0x58);
 DEFINE_GUID(IID_IVectorView,0xbbe1fa4c,0xb0e3,0x4583,0xba,0xef,0x1f,0x1b,0x2e,0x48,0x3e,0x56);
-DEFINE_GUID(IID_IAgileObject,0x94ea2b94,0xe9cc,0x49e0,0xc0,0xff,0xee,0x64,0xca,0x8f,0x5b,0x90);
 DEFINE_GUID(IID_IInspectable,0xaf86e2e0,0xb12d,0x4c6a,0x9c,0x5a,0xd7,0xaa,0x65,0x10,0x1e,0x90);

 typedef struct IVectorView IVectorView;
ivyl pushed a commit to ivyl/wine that referenced this issue Jan 6, 2021
Bug: ValveSoftware/wine#98

THIS INCLUDES THE FOLLOWING TWO CHERRY-PICKS:

include: Split objidl.idl to objidlbase.idl.

Windows SDKs use #include here to import one into the other, so we do
the same.

Signed-off-by: Rémi Bernon <[email protected]>
Signed-off-by: Alexandre Julliard <[email protected]>
(cherry picked from commit 6e09636)

include: Add IAgileObject to objidlbase.idl.

Signed-off-by: Rémi Bernon <[email protected]>
Signed-off-by: Alexandre Julliard <[email protected]>
(cherry picked from commit cdf013b)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant