[OLEDLG] Sync with Wine Staging 4.0. CORE-15682

[reactos.git] / dll / win32 / oledlg / pastespl.c

diff --git a/dll/win32/oledlg/pastespl.c b/dll/win32/oledlg/pastespl.c
index ae5e2f2..0b8c8c9 100644 (file)
--- a/dll/win32/oledlg/pastespl.c
+++ b/dll/win32/oledlg/pastespl.c
@@ -19,7 +19,6 @@
  */
 
 #define COBJMACROS
-#define NONAMELESSSTRUCT
 #define NONAMELESSUNION
 
 #include <stdarg.h>
@@ -85,7 +84,9 @@ static void dump_ps_flags(DWORD flags)
 
 static void dump_pastespecial(const OLEUIPASTESPECIALW *ps)
 {
-    UINT i;
+    INT i;
+    UINT j;
+
     dump_ps_flags(ps->dwFlags);
     TRACE("hwnd %p caption %s hook %p custdata %lx\n",
           ps->hWndOwner, debugstr_w(ps->lpszCaption), ps->lpfnHook, ps->lCustData);
@@ -110,8 +111,8 @@ static void dump_pastespecial(const OLEUIPASTESPECIALW *ps)
     }
     for(i = 0; i < ps->cLinkTypes; i++)
         TRACE("arrLinkTypes[%d] %08x\n", i, ps->arrLinkTypes[i]);
-    for(i = 0; i < ps->cClsidExclude; i++)
-        TRACE("lpClsidExclude[%d] %s\n", i, debugstr_guid(&ps->lpClsidExclude[i]));
+    for(j = 0; j < ps->cClsidExclude; j++)
+        TRACE("lpClsidExclude[%u] %s\n", j, debugstr_guid(&ps->lpClsidExclude[j]));
 
 }
 
@@ -181,14 +182,14 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct)
     if(ps_struct->source_name == NULL && ps_struct->link_source_name == NULL)
     {
         WCHAR buf[200];
-        LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_SRC, buf, sizeof(buf)/sizeof(WCHAR));
+        LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_SRC, buf, ARRAY_SIZE(buf));
         ps_struct->source_name = strdupW(buf);
     }
 
     if(ps_struct->type_name == NULL && ps_struct->link_type_name == NULL)
     {
         WCHAR buf[200];
-        LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_TYPE, buf, sizeof(buf)/sizeof(WCHAR));
+        LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_TYPE, buf, ARRAY_SIZE(buf));
         ps_struct->type_name = strdupW(buf);
     }
 }
@@ -227,7 +228,7 @@ static DWORD init_pastelist(HWND hdlg, OLEUIPASTESPECIALW *ps)
     }
 
     /* The native version grabs only the first 20 fmts and we do the same */
-    hr = IEnumFORMATETC_Next(penum, sizeof(fmts)/sizeof(fmts[0]), fmts, &fetched);
+    hr = IEnumFORMATETC_Next(penum, ARRAY_SIZE(fmts), fmts, &fetched);
     TRACE("got %d formats hr %08x\n", fetched, hr);
 
     if(SUCCEEDED(hr))
@@ -252,7 +253,7 @@ static DWORD init_pastelist(HWND hdlg, OLEUIPASTESPECIALW *ps)
     }
 
     IEnumFORMATETC_Release(penum);
-    EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTE), items_added ? TRUE : FALSE);
+    EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTE), items_added != 0);
     return items_added;
 }
 
@@ -287,7 +288,7 @@ static DWORD init_linklist(HWND hdlg, OLEUIPASTESPECIALW *ps)
         }
     }
 
-    EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTELINK), items_added ? TRUE : FALSE);
+    EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTELINK), items_added != 0);
     return items_added;
 }
 
@@ -313,7 +314,6 @@ static void update_display_list(HWND hdlg, UINT src_list_id)
         SendMessageW(display_list, LB_INSERTSTRING, i, (LPARAM)txt);
         SendMessageW(display_list, LB_SETITEMDATA, i, item_data);
     }
-    old_pos = max(old_pos, count);
     SendMessageW(display_list, LB_SETCURSEL, 0, 0);
     SendMessageW(display_list, WM_SETREDRAW, 1, 0);
     if(GetForegroundWindow() == hdlg)
@@ -431,7 +431,7 @@ static void update_result_text(HWND hdlg, const ps_struct_t *ps_struct)
             res_id = IDS_PS_PASTE_LINK_DATA;
     }
 
-    LoadStringW(OLEDLG_hInstance, res_id, resource_txt, sizeof(resource_txt)/sizeof(WCHAR));
+    LoadStringW(OLEDLG_hInstance, res_id, resource_txt, ARRAY_SIZE(resource_txt));
     if((ptr = strstrW(resource_txt, percent_s)))
     {
         /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}.  Else sub appropriate type name */
@@ -496,7 +496,7 @@ static void update_structure(HWND hdlg, ps_struct_t *ps_struct)
         ps_struct->ps->nSelectedIndex = pent->dwScratchSpace;
     }
     ps_struct->ps->dwFlags = ps_struct->flags;
-    ps_struct->ps->fLink = (ps_struct->flags & PSF_SELECTPASTELINK) ? TRUE : FALSE;
+    ps_struct->ps->fLink = (ps_struct->flags & PSF_SELECTPASTELINK) != 0;
 }
 
 static void free_structure(ps_struct_t *ps_struct)
@@ -710,7 +710,7 @@ UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW ps)
         HRSRC hrsrc;
 
         if(name == NULL) return OLEUI_ERR_LPSZTEMPLATEINVALID;
-        hrsrc = FindResourceW(hInst, name, MAKEINTRESOURCEW(RT_DIALOG));
+        hrsrc = FindResourceW(hInst, name, (LPWSTR)RT_DIALOG);
         if(!hrsrc) return OLEUI_ERR_FINDTEMPLATEFAILURE;
         dlg_templ = LoadResource(hInst, hrsrc);
         if(!dlg_templ) return OLEUI_ERR_LOADTEMPLATEFAILURE;