You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
Rebase against c89dc58deb9ba74d8dcd7faf7012203cff0724a0.
This commit is contained in:
@ -25,7 +25,7 @@ index 4549d5b..2aff054 100644
|
||||
static CRITICAL_SECTION SHELL32_SicCS;
|
||||
static CRITICAL_SECTION_DEBUG critsect_debug =
|
||||
@@ -109,7 +111,7 @@ static int SIC_LoadOverlayIcon(int icon_idx);
|
||||
* Creates a new icon as a copy of the passed-in icon, overlayed with a
|
||||
* Creates a new icon as a copy of the passed-in icon, overlaid with a
|
||||
* shortcut image.
|
||||
*/
|
||||
-static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large)
|
||||
@ -143,7 +143,7 @@ index 4549d5b..2aff054 100644
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- WARN("Failed to create shortcut overlayed icons\n");
|
||||
- WARN("Failed to create shortcut overlaid icons\n");
|
||||
- if (NULL != hiconLargeShortcut) DestroyIcon(hiconLargeShortcut);
|
||||
- if (NULL != hiconSmallShortcut) DestroyIcon(hiconSmallShortcut);
|
||||
- dwFlags &= ~ GIL_FORSHORTCUT;
|
||||
@ -163,7 +163,7 @@ index 4549d5b..2aff054 100644
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ WARN("Failed to create shortcut overlayed icons\n");
|
||||
+ WARN("Failed to create shortcut overlaid icons\n");
|
||||
+ if (NULL != hiconSmallShortcut) DestroyIcon(hiconSmallShortcut);
|
||||
+ if (NULL != hiconLargeShortcut) DestroyIcon(hiconLargeShortcut);
|
||||
+ if (NULL != hiconExtraLargeShortcut) DestroyIcon(hiconExtraLargeShortcut);
|
||||
|
Reference in New Issue
Block a user