| commit | c627a81a76f0853190702f95b73b8b42d07a8f92 | |
| author | Rob Shearman <rob@codeweavers.com> | |
| Wed, 13 Feb 2008 21:30:53 +0000 (13 21:30 +0000) | ||
| committer | Alexandre Julliard <julliard@winehq.org> | |
| Mon, 18 Feb 2008 13:10:20 +0000 (18 14:10 +0100) | ||
| tree | baff6c15ca5d2c11bbd38529e8d939c775fa5f2c | treesnapshot (tar.gz zip) |
| parent | c8b626fa1de2fcab5f929161a6bc5e8b86961665 | commitdiff |
shell32: Fix the logic in Control_LoadApplet determining when to use CPL_INQUIRE and when to use CPL_NEWINQUIRE.
Previously, the code would fail to get the name of an applet that didn't
return an icon for CPL_NEWINQUIRE and didn't return set either idName or
idIcon to a non-zero value for CPL_INQUIRE.
Fix this by sending CPL_INQUIRE first and loading any strings or icon
specified and then only fall back to CPL_NEWINQUIRE if any of the
required members were zero (i.e. CPL_DYNAMIC_RES) and then only fill in
these fields.
Previously, the code would fail to get the name of an applet that didn't
return an icon for CPL_NEWINQUIRE and didn't return set either idName or
idIcon to a non-zero value for CPL_INQUIRE.
Fix this by sending CPL_INQUIRE first and loading any strings or icon
specified and then only fall back to CPL_NEWINQUIRE if any of the
required members were zero (i.e. CPL_DYNAMIC_RES) and then only fill in
these fields.
| dlls/shell32/control.c | diffblobblamehistory |