shell32: Fix the logic in Control_LoadApplet determining when to use CPL_INQUIRE and when to use CPL_NEWINQUIRE.

Robert Shearman rob at
Wed Feb 13 15:30:53 CST 2008

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 |   75 
  1 files changed, 42 insertions(+), 33 deletions(-)

Tested with mlcfg32.cpl from Office 2007 (which this patch fixes) and 
Office 2003, odbccp32.cpl from Office 2003 and inetcpl.cpl from IE6.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: d0604706dd0e72aad0a6b78d443808d5a70f8b81.diff
Type: text/x-patch
Size: 4812 bytes
Desc: not available
Url : 

More information about the wine-patches mailing list