shell32: Show error message box if rename conflict

[Michael Mc Donnell]

UnixFolder_IShellFolder2_SetNameOf currently fails silently during a
rename if there is already a folder with the same name. On Windows 7
the user is asked if he wants to merge the two folders. Folder merging
has not been implemented yet, so this patch displays an error message
box instead.
---
 dlls/shell32/brsfolder.c     |    4 ++--
 dlls/shell32/shell32.rc      |    2 ++
 dlls/shell32/shfldr_unixfs.c |   29 ++++++++++++++++++++++++++++-
 dlls/shell32/shresdef.h      |    2 ++
 4 files changed, 34 insertions(+), 3 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-shell32-Show-error-message-box-if-rename-conflict.patch
Type: text/x-patch
Size: 3735 bytes
Desc: not available
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20110220/b73f6021/attachment.bin>