Fix DPA_Merge problems

[Guy L. Albertelli]

This fixes the regression with IE4 and its menu line not working.
Regressions of the Favorites menu and Favorites/Search/History buttons still
exist.

Changelog:
Guy Albertelli  <<galberte at neo.lrun.com>>

  dlls/comctl32/comctl32undoc.c
    - Fix problems in DPA_Merge exposed by previous
      code cleanup.

  include/commctrl.h
    - Add definitions for DPA_Merge flags.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: comctl32undoc1.diff
Type: application/octet-stream
Size: 2126 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20020220/5fd20121/comctl32undoc1.obj
-------------- next part --------------
A non-text attachment was scrubbed...
Name: commmctrlh7.diff
Type: application/octet-stream
Size: 710 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20020220/5fd20121/commmctrlh7.obj