[PATCH v2 0/2] MR4486: shcore: Add stub for RegisterScaleChangeEvent.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55671 -- v2: shcore: Add stub for RegisterScaleChangeEvent. https://gitlab.winehq.org/wine/wine/-/merge_requests/4486
From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55671 --- dlls/shcore/main.c | 9 +++++++++ dlls/shcore/shcore.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 67ee3b25171..d9d654e4e57 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -2520,3 +2520,12 @@ FEATURE_ENABLED_STATE WINAPI GetFeatureEnabledState(UINT32 feature, FEATURE_CHAN FIXME("(%u, %u) stub\n", feature, change_time); return FEATURE_ENABLED_STATE_DEFAULT; } + +/************************************************************************* + * RegisterScaleChangeEvent [SHCORE.@] + */ +HRESULT WINAPI RegisterScaleChangeEvent(HANDLE handle, DWORD_PTR *cookie) +{ + FIXME("(%p, %p) stub\n", handle, cookie); + return E_NOTIMPL; +} \ No newline at end of file diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 9ed7c87b0fe..c5de17de590 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -32,7 +32,7 @@ # @ stub IsProcessInWDAGContainer # @ stub RecordFeatureError # @ stub RecordFeatureUsage -@ stub RegisterScaleChangeEvent +@ stdcall RegisterScaleChangeEvent(ptr ptr) @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications @ stdcall SHAnsiToAnsi(str ptr long) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4486
From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55671 --- dlls/shcore/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index d9d654e4e57..494da202283 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -2528,4 +2528,4 @@ HRESULT WINAPI RegisterScaleChangeEvent(HANDLE handle, DWORD_PTR *cookie) { FIXME("(%p, %p) stub\n", handle, cookie); return E_NOTIMPL; -} \ No newline at end of file +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4486
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=140281 Your paranoid android. === debian11b (64 bit WoW report) === Report validation errors: mfmediaengine:mfmediaengine crashed (80000101)
On Fri Nov 24 09:33:10 2023 +0000, Louis Lenders wrote:
changed this line in [version 2 of the diff](/wine/wine/-/merge_requests/4486/diffs?diff_id=85796&start_sha=59f2764441dbead46ee1a3262605f5d5132dcbae#155af25b26409f7cf62dc707d6dd5b709e975969_2531_2531) Please merge it in one commit.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/4486#note_53642
On Fri Nov 24 09:43:43 2023 +0000, Zhiyi Zhang wrote:
Please merge it in one commit. Could you please give exact commans/instructions how to do that? Thanks
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/4486#note_53643
On Fri Nov 24 09:51:06 2023 +0000, Louis Lenders wrote:
Could you please give exact commans/instructions how to do that? Thanks git rebase -i @~2; replace the 'pick' in the last patch to 's'; save command with your editor; git push -f
There are some good git tutorials out there that you can use as a guide. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4486#note_53644
participants (4)
-
Louis Lenders -
Louis Lenders (@xe) -
Marvin -
Zhiyi Zhang (@zhiyi)