Huw Davies : oledlg: Set nSelectedIndex on exit.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8711d5e6b1900a62238498d1f51996406dd4d3c5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8711d5e6b1900a62238498d1f51996406dd4d3c5

Author: Huw Davies <huw at codeweavers.com>
Date:   Thu Oct 19 11:42:03 2006 +0100

oledlg: Set nSelectedIndex on exit.

---

 dlls/oledlg/pastespl.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c
index ff3a8b5..b4d5f97 100644
--- a/dlls/oledlg/pastespl.c
+++ b/dlls/oledlg/pastespl.c
@@ -236,7 +236,7 @@ static DWORD init_pastelist(HWND hdlg, O
         DWORD src_fmt, req_fmt;
         for(req_fmt = 0; req_fmt < ps->cPasteEntries; req_fmt++)
         {
-            /* This is used by update_struct() to set nSelectedIndex on exit */
+            /* This is used by update_structure() to set nSelectedIndex on exit */
             ps->arrPasteEntries[req_fmt].dwScratchSpace = req_fmt;
             TRACE("req_fmt %x\n", ps->arrPasteEntries[req_fmt].fmtetc.cfFormat);
             for(src_fmt = 0; src_fmt < fetched; src_fmt++)
@@ -465,6 +465,13 @@ static void send_end_dialog_msg(HWND hdl
 
 static void update_structure(HWND hdlg, ps_struct_t *ps_struct)
 {
+    LONG cur_sel = SendMessageW(GetDlgItem(hdlg, IDC_PS_DISPLAYLIST), LB_GETCURSEL, 0, 0);
+    if(cur_sel != -1)
+    {
+        OLEUIPASTEENTRYW *pent;
+        pent = (OLEUIPASTEENTRYW *)SendMessageW(GetDlgItem(hdlg, IDC_PS_DISPLAYLIST), LB_GETITEMDATA, cur_sel, 0);
+        ps_struct->ps->nSelectedIndex = pent->dwScratchSpace;
+    }
     ps_struct->ps->dwFlags = ps_struct->flags;
     ps_struct->ps->fLink = (ps_struct->flags & PSF_SELECTPASTELINK) ? TRUE : FALSE;
 }