This is one of the stubs required for MS Office 365.
-- v3: wintypes: Stub RoIsApiContractMajorVersionPresent().
From: Daniel Tang danielzgtg.opensource@gmail.com
--- dlls/wintypes/main.c | 7 +++++++ dlls/wintypes/wintypes.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/dlls/wintypes/main.c b/dlls/wintypes/main.c index 74eda4af5ce..7eb2c0c2cce 100644 --- a/dlls/wintypes/main.c +++ b/dlls/wintypes/main.c @@ -355,6 +355,13 @@ HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **fac return S_OK; }
+HRESULT WINAPI RoIsApiContractMajorVersionPresent(const WCHAR *name, UINT16 major, BOOL *result) +{ + FIXME("name %s, major %u, result %p\n", debugstr_w(name), major, result); + *result = FALSE; + return S_OK; +} + HRESULT WINAPI RoResolveNamespace(HSTRING name, HSTRING windowsMetaDataDir, DWORD packageGraphDirsCount, const HSTRING *packageGraphDirs, DWORD *metaDataFilePathsCount, HSTRING **metaDataFilePaths, diff --git a/dlls/wintypes/wintypes.spec b/dlls/wintypes/wintypes.spec index 305344fef42..086332e0d69 100644 --- a/dlls/wintypes/wintypes.spec +++ b/dlls/wintypes/wintypes.spec @@ -5,7 +5,7 @@ @ stub RoCreatePropertySetSerializer @ stub RoGetBufferMarshaler @ stub RoGetMetaDataFile -@ stub RoIsApiContractMajorVersionPresent +@ stdcall RoIsApiContractMajorVersionPresent(wstr long ptr) @ stub RoIsApiContractPresent @ stub RoParseTypeName @ stdcall RoResolveNamespace(ptr ptr long ptr ptr ptr ptr ptr)
On Tue Mar 14 03:42:32 2023 +0000, Daniel Tang wrote:
changed this line in [version 3 of the diff](/wine/wine/-/merge_requests/2376/diffs?diff_id=36875&start_sha=7058187513dd7410ada2c66234e32a152694ac4e#e598b22f068252a1c7085ce51f9a26025c996c1b_360_360)
I succeeded in adding regular logging without `DECLSPEC_HOTPATCH`. It was probably UB coming from an interaction with earlier versions of my other MRs. It works fine now.
Please comment if you still need `DECLSPEC_HOTPATCH` added.
On Tue Mar 14 03:46:30 2023 +0000, Daniel Tang wrote:
I succeeded in adding regular logging without `DECLSPEC_HOTPATCH`. It was probably UB coming from an interaction with earlier versions of my other MRs. It works fine now. Please comment if you still need `DECLSPEC_HOTPATCH` added.
I'm glad you got it working! To the best of my knowledge, the current policy is to only add DECLSPEC_HOTPATCH if some application needs it, so what you have now is fine.
@danielzgtg The [MinecraftInstaller.msi](https://launcher.mojang.com/download/MinecraftInstaller.msi) is the windows 7 one. (No bedrock allowed, but work) The [MinecraftInstaller.exe](https://launcher.mojang.com/download/MinecraftInstaller.exe) is the windows 10 one. (Bedrock allowed, but not work)
For some reason both version don't have the same behavior on wine even tho they look the same.
I'm talking about the windows 10 launcher (The .exe) that allow bedrock and not the windows 7+ one (the .msi) that can't launch bedrock.
Also the need for a working `wintypes.dll` is when you use Microsoft dotnet from microsoft.
Because wine-mono is a long way before supporting winrt apps, it just crash before the need for a working wintypes.dll
I had a lot of discussions on wine-tkg discord server about that, if you go there you will probably find someone that did more research than me.
On Tue Mar 14 15:20:41 2023 +0000, Loïc Rebmeister wrote:
Also the need for a working `wintypes.dll` is when you use Microsoft dotnet from microsoft. Because wine-mono is a long way before supporting winrt apps, it just crash before the need for a working wintypes.dll I had a lot of discussions on wine-tkg discord server about that, if you go there you will probably find someone that did more research than me.
I will join the Discord server so we can take this separate conversation there.
Even wine-tkg says "PLEASE DO NOT REPORT BUGS ENCOUNTERED WITH THIS AT WINEHQ OR VALVESOFTWARE, REPORT HERE INSTEAD !" at https://github.com/Frogging-Family/wine-tkg-git/blob/cb9ac3cac38560098c4ad9c...
-
Alex Henrie (＠alexhenrie) -
Daniel Tang
-
Daniel Tang (＠danielzgtg)
-
Loïc Rebmeister (＠Fox2Code)