[USER32] Hackfix for CORE-17902 - The cursoricon (copyimage) that returns NULL to render - LR_COPYFROMRESOURCE #6886
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
julenuri
changed the title
github-actions
bot
added
the
Win32SS
oleg-dubinskiy
added
the
hackfix
HBelusca
reviewed
May 15, 2024
| switch(uType) | ||
| { | ||
| case IMAGE_BITMAP: | ||
| return BITMAP_CopyImage(hImage, cxDesired, cyDesired, fuFlags); | ||
| case IMAGE_CURSOR: | ||
| case IMAGE_ICON: | ||
| return CURSORICON_CopyImage(hImage, uType == IMAGE_ICON, cxDesired, cyDesired, fuFlags); | ||
| handle = CURSORICON_CopyImage(hImage, uType == IMAGE_ICON, cxDesired, cyDesired, fuFlags); | ||
| if(handle == NULL && (fuFlags & (LR_COPYFROMRESOURCE|LR_COPYRETURNORG))) |
There was a problem hiding this comment.
When you run the VB-based app in ReactOS, which flag(s) amongst these two are being specified? Both? or only one of these?
There was a problem hiding this comment.
In addition I would suggest you add here in the code a // HACK or // HACKFIX comment explaining what's happening, with the CORE-xxxx number mentioned too.
I also wonder whether this hack could be added instead into the CURSORICON_CopyImage function instead? In any case I guess running the test bots on that would be necessary.
cbialorucki
approved these changes
May 21, 2024
| @@ -2031,7 +2031,15 @@ HANDLE WINAPI CopyImage( | |||
| return BITMAP_CopyImage(hImage, cxDesired, cyDesired, fuFlags); | |||
| case IMAGE_CURSOR: | |||
| case IMAGE_ICON: | |||
| return CURSORICON_CopyImage(hImage, uType == IMAGE_ICON, cxDesired, cyDesired, fuFlags); | |||
| /* HACK: Returning the old bitmap in LR_COPYFROMRESOURCE caused | |||
There was a problem hiding this comment.
Suggested change
| /* HACK: Returning the old bitmap in LR_COPYFROMRESOURCE caused | |
| // HACK: Copying bitmaps with LR_COPYFROMRESOURCE flag fails. CORE-17902. |
…urns NULL to render - LR_COPYFROMRESOURCE [USER32] Fix the previous commit based on the suggested comments [USER32] Minor fixes and fixing identation
julenuri
force-pushed
the
CORE-17902-pseudofix
branch
from
c526c7a
to
e30a5e5
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hackfix for CORE-17902 - The cursoricon (copyimage) that returns NULL to render - LR_COPYFROMRESOURCE
Purpose
In this case, the aim is to render some VB5/6 software icons to show up. Those elements are icons rendered in a way that is common under Visual Basic icons loaded from a .ocx .
ThunderRT6FormDC->ThunderRT6UserControlDC->RebarWindows32->Toolbar20WndClass->msvb_lib_toolbar
Quoting Simone:
More info here: https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-copyimage
Proposed changes
Minor (fix? or hackfix?) that should make it to work.
BEFORE:
AFTER:
TODO