[akhaldi] 60358: [OLEDLG] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Thu Sep 26 14:02:31 2013
New Revision: 60358

URL: http://svn.reactos.org/svn/reactos?rev=60358&view=rev
Log:
[OLEDLG]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/reactos/dll/win32/oledlg/CMakeLists.txt
    trunk/reactos/dll/win32/oledlg/insobjdlg.c
    trunk/reactos/dll/win32/oledlg/oledlg_main.c
    trunk/reactos/dll/win32/oledlg/oledlg_private.h
    trunk/reactos/dll/win32/oledlg/pastespl.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/oledlg/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/CMakeLists...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/CMakeLists.txt	[iso-8859-1] Thu Sep 26 14:02:31 2013
@@ -1,20 +1,16 @@

+add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-add_definitions(-D__WINESRC__)
-
 spec2def(oledlg.dll oledlg.spec ADD_IMPORTLIB)

list(APPEND SOURCE
     insobjdlg.c
     oledlg_main.c
     pastespl.c
-    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/oledlg.def)

-add_library(oledlg SHARED ${SOURCE})
-
+add_library(oledlg SHARED ${SOURCE} rsrc.rc)
 set_module_type(oledlg win32dll)
 target_link_libraries(oledlg wine)
 add_importlibs(oledlg ole32 comdlg32 user32 advapi32 msvcrt kernel32 ntdll)
-
 add_cd_file(TARGET oledlg DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/insobjdlg....
==============================================================================
--- trunk/reactos/dll/win32/oledlg/insobjdlg.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/insobjdlg.c	[iso-8859-1] Thu Sep 26 14:02:31 2013
@@ -199,13 +199,12 @@

case IDC_ADDCONTROL:
       UIINSERTOBJECTDLG_AddControl(pdlgInfo);
+      break;

case IDC_OBJTYPELIST:
-    {
       if (wNotifyCode == LBN_SELCHANGE)
         UIINSERTOBJECTDLG_SelChange(pdlgInfo);
       break;
-    }
   }
   return 0;
 }
@@ -239,8 +238,8 @@
     IOF_SHOWINSERTCONTROL) ? SW_SHOW : SW_HIDE);
   ShowWindow(pdlgInfo->hwndDisplayIconCB, (pdlgInfo->lpOleUIInsertObject->dwFlags &
     IOF_CHECKDISPLAYASICON) ? SW_SHOW : SW_HIDE);
-  EnableWindow(pdlgInfo->hwndDisplayIconCB, (pdlgInfo->lpOleUIInsertObject->dwFlags &
-    IOF_DISABLEDISPLAYASICON) ? FALSE : TRUE);
+  EnableWindow(pdlgInfo->hwndDisplayIconCB, !(pdlgInfo->lpOleUIInsertObject->dwFlags &
+    IOF_DISABLEDISPLAYASICON));

if (pdlgInfo->lpOleUIInsertObject->dwFlags & IOF_SELECTCREATECONTROL)
     UIINSERTOBJECTDLG_SelectCreateCtrl(pdlgInfo);

Modified: trunk/reactos/dll/win32/oledlg/oledlg_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_mai...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_main.c	[iso-8859-1] Thu Sep 26 14:02:31 2013
@@ -94,10 +94,6 @@
         register_clipboard_formats();
         register_messages();
         break;
-
-    case DLL_PROCESS_DETACH:
-        OLEDLG_hInstance = 0;
-        break;
     }
     return TRUE;
 }

Modified: trunk/reactos/dll/win32/oledlg/oledlg_private.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_pri...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_private.h	[iso-8859-1] Thu Sep 26 14:02:31 2013
@@ -21,18 +21,18 @@
 #ifndef __OLEDLG_PRIVATE_H__
 #define __OLEDLG_PRIVATE_H__

-extern HINSTANCE OLEDLG_hInstance;
+extern HINSTANCE OLEDLG_hInstance DECLSPEC_HIDDEN;

-extern UINT cf_embed_source;
-extern UINT cf_embedded_object;
-extern UINT cf_link_source;
-extern UINT cf_object_descriptor;
-extern UINT cf_link_src_descriptor;
-extern UINT cf_ownerlink;
-extern UINT cf_filename;
-extern UINT cf_filenamew;
+extern UINT cf_embed_source DECLSPEC_HIDDEN;
+extern UINT cf_embedded_object DECLSPEC_HIDDEN;
+extern UINT cf_link_source DECLSPEC_HIDDEN;
+extern UINT cf_object_descriptor DECLSPEC_HIDDEN;
+extern UINT cf_link_src_descriptor DECLSPEC_HIDDEN;
+extern UINT cf_ownerlink DECLSPEC_HIDDEN;
+extern UINT cf_filename DECLSPEC_HIDDEN;
+extern UINT cf_filenamew DECLSPEC_HIDDEN;

-extern UINT oleui_msg_help;
-extern UINT oleui_msg_enddialog;
+extern UINT oleui_msg_help DECLSPEC_HIDDEN;
+extern UINT oleui_msg_enddialog DECLSPEC_HIDDEN;

#endif /* __OLEDLG_PRIVATE_H__ */

Modified: trunk/reactos/dll/win32/oledlg/pastespl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/pastespl.c...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/pastespl.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/pastespl.c	[iso-8859-1] Thu Sep 26 14:02:31 2013
@@ -89,7 +89,9 @@

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);
@@ -114,8 +116,8 @@
     }
     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]));

}

@@ -256,7 +258,7 @@
     }

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;
 }

@@ -291,7 +293,7 @@
         }
     }

-    EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTELINK), items_added ? TRUE : FALSE);
+    EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTELINK), items_added != 0);
     return items_added;
 }

@@ -317,7 +319,6 @@
         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)
@@ -500,7 +501,7 @@
         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)

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Thu Sep 26 14:02:31 2013
@@ -146,7 +146,7 @@
 reactos/dll/win32/oleacc          # Autosync
 reactos/dll/win32/oleaut32        # Synced to Wine-1.7.1
 reactos/dll/win32/olecli32        # Synced to Wine-1.5.19
-reactos/dll/win32/oledlg          # Autosync
+reactos/dll/win32/oledlg          # Synced to Wine-1.7.1
 reactos/dll/win32/olepro32        # Autosync
 reactos/dll/win32/olesvr32        # Synced to Wine-1.5.19
 reactos/dll/win32/olethk32        # Synced to Wine-1.5.19