[PATCH v2 0/1] MR2375: wofutil: Stub WofIsExternalFile().
This fixes a crash in `OneDriveSetup.exe`. It still doesn't install with "A supported version of Windows 10 or Windows 11 is required to proceed," but at least it doesn't crash. After this patch, we can now see the OneDrive logo, the progress bar, and the "Installing OneDrive" label. -- v2: wofutil: Stub WofIsExternalFile(). https://gitlab.winehq.org/wine/wine/-/merge_requests/2375
From: Daniel Tang <danielzgtg.opensource(a)gmail.com> --- dlls/wofutil/main.c | 9 +++++++++ dlls/wofutil/wofutil.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wofutil/main.c b/dlls/wofutil/main.c index 1866aed7c69..d8c891aa30c 100644 --- a/dlls/wofutil/main.c +++ b/dlls/wofutil/main.c @@ -23,6 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(wofutil); +HRESULT WINAPI WofIsExternalFile( const WCHAR *path, BOOL *result, ULONG *provider, void *ptr, ULONG *length ) +{ + FIXME( "%s, %p, %p, %p, %p", debugstr_w(path), result, provider, ptr, length ); + if (result) *result = FALSE; + if (provider) *provider = 0; + if (length) *length = 0; + return S_OK; +} + BOOL WINAPI WofShouldCompressBinaries( const WCHAR *volume, ULONG *alg ) { FIXME( "%s, %p\n", debugstr_w(volume), alg ); diff --git a/dlls/wofutil/wofutil.spec b/dlls/wofutil/wofutil.spec index 73f11c4f885..27a6ebd80eb 100644 --- a/dlls/wofutil/wofutil.spec +++ b/dlls/wofutil/wofutil.spec @@ -1,7 +1,7 @@ @ stub WofEnumEntries @ stub WofFileEnumFiles @ stub WofGetDriverVersion -@ stub WofIsExternalFile +@ stdcall WofIsExternalFile(wstr ptr ptr ptr ptr) @ stub WofSetFileDataLocation @ stdcall WofShouldCompressBinaries(wstr ptr) @ stub WofWimAddEntry -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2375
On Tue Mar 14 03:42:35 2023 +0000, Daniel Tang wrote:
changed this line in [version 2 of the diff](/wine/wine/-/merge_requests/2375/diffs?diff_id=36877&start_sha=82de637639c660e379fa3e33429db634ed99912c#7f048472e11a2a22c0be1b2d1f59154a4d291d16_26_26) Fixed
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2375#note_26814
On Tue Mar 14 03:42:37 2023 +0000, Daniel Tang wrote:
changed this line in [version 2 of the diff](/wine/wine/-/merge_requests/2375/diffs?diff_id=36877&start_sha=82de637639c660e379fa3e33429db634ed99912c#d88d43ac1f5a6f4ecafa380a00cfd54cb56080b4_19_19) Removed. Please also consider discussing with @jactry to standardize an official Wine policy on this, after https://gitlab.winehq.org/wine/wine/-/merge_requests/2374#note_26708
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2375#note_26815
On Tue Mar 14 03:44:48 2023 +0000, Daniel Tang wrote:
Removed. Please also consider discussing with @jactry to standardize an official Wine policy on this, after https://gitlab.winehq.org/wine/wine/-/merge_requests/2374#note_26708 Jactry's opinion beats mine. I thought that in the past people didn't like having prototypes for stubs, but it sounds like that's changed.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2375#note_26821
On 3/14/23 05:14, Alex Henrie (@alexhenrie) wrote:
On Tue Mar 14 03:44:48 2023 +0000, Daniel Tang wrote:
Removed. Please also consider discussing with @jactry to standardize an official Wine policy on this, afterhttps://gitlab.winehq.org/wine/wine/-/merge_requests/2374#note_26708 Jactry's opinion beats mine. I thought that in the past people didn't like having prototypes for stubs, but it sounds like that's changed.
Ah, right, I didn't distinguish stubs and real implementations when I left the comment in MR 2374. So I am not sure what will be perfected right now. But from some recent commits, likely both are acceptable? btw, I think only comments from Alexandre or maintainers of the module, or anything have been documented in WineHQ's website can be considered as official standard or policy. My comment is just my comment :) , sorry for the confusion.
On Tue Mar 14 05:55:10 2023 +0000, **** wrote:
Jactry Zeng replied on the mailing list: ``` On 3/14/23 05:14, Alex Henrie (@alexhenrie) wrote:
On Tue Mar 14 03:44:48 2023 +0000, Daniel Tang wrote:
Removed. Please also consider discussing with @jactry to standardize an official Wine policy on this, afterhttps://gitlab.winehq.org/wine/wine/-/merge_requests/2374#note_26708 Jactry's opinion beats mine. I thought that in the past people didn't like having prototypes for stubs, but it sounds like that's changed. Ah, right, I didn't distinguish stubs and real implementations when I left the comment in MR 2374. So I am not sure what will be perfected right now. But from some recent commits, likely both are acceptable? btw, I think only comments from Alexandre or maintainers of the module, or anything have been documented in WineHQ's website can be considered as official standard or policy. My comment is just my comment :) , sorry for the confusion.
I was just about to add it back in when I saw your comment. I'll now leave it out to keep the diff small. If it is desired, someone else can add it after the merge.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2375#note_26831
participants (4)
-
Alex Henrie (@alexhenrie) -
Daniel Tang -
Daniel Tang (@danielzgtg) -
Jactry Zeng