[ros-diffs] [akhaldi] 68513: [INETCPL] Sync with Wine Staging 1.7.47. CORE-9924

Author: akhaldi
Date: Tue Jul 21 23:07:30 2015
New Revision: 68513

URL: http://svn.reactos.org/svn/reactos?rev=68513&view=rev
Log:
[INETCPL] Sync with Wine Staging 1.7.47. CORE-9924

Modified:
    trunk/reactos/dll/cpl/inetcpl/general.c
    trunk/reactos/dll/cpl/inetcpl/inetcpl.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/cpl/inetcpl/general.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/general.c?…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/general.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/general.c	[iso-8859-1] Tue Jul 21 23:07:30 2015
@@ -25,6 +25,7 @@
 #include <shlobj.h>
 
 static const WCHAR about_blank[] =
{'a','b','o','u','t',':','b','l','a','n','k',0};
+static const WCHAR default_home[] =
{'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0};
 static const WCHAR start_page[] =
{'S','t','a','r','t','
','P','a','g','e',0};
 static const WCHAR reg_ie_main[] =
{'S','o','f','t','w','a','r','e','\\',
                                    
'M','i','c','r','o','s','o','f','t','\\',
@@ -33,7 +34,6 @@
 
 /* list of unimplemented buttons */
 static DWORD disabled_general_buttons[] = {IDC_HOME_CURRENT,
-                                           IDC_HOME_DEFAULT,
                                            IDC_HISTORY_SETTINGS,
                                            0};
 static DWORD disabled_delhist_buttons[] = {IDC_DELETE_FORM_DATA,
@@ -177,6 +177,10 @@
             SetDlgItemTextW(hwnd, IDC_HOME_EDIT, about_blank);
             break;
 
+        case MAKEWPARAM(IDC_HOME_DEFAULT, BN_CLICKED):
+            SetDlgItemTextW(hwnd, IDC_HOME_EDIT, default_home);
+            break;
+
         case MAKEWPARAM(IDC_HISTORY_DELETE, BN_CLICKED):
             DialogBoxW(hcpl, MAKEINTRESOURCEW(IDD_DELETE_HISTORY), hwnd,
                        delhist_dlgproc);

Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.c?…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/inetcpl.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/inetcpl.c	[iso-8859-1] Tue Jul 21 23:07:30 2015
@@ -34,8 +34,10 @@
 
     switch (reason)
     {
-        /* case DLL_WINE_PREATTACH:
-            return FALSE;  prefer native version */
+#ifndef __REACTOS__
+        case DLL_WINE_PREATTACH:
+            return FALSE;  /* prefer native version */
+#endif
 
         case DLL_PROCESS_ATTACH:
             DisableThreadLibraryCalls(hdll);

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Tue Jul 21 23:07:30 2015
@@ -225,7 +225,7 @@
 reactos/dll/win32/xinput9_1_0         # Synced to WineStaging-1.7.37
 reactos/dll/win32/xmllite             # Synced to WineStaging-1.7.37
 
-reactos/dll/cpl/inetcpl               # Synced to WineStaging-1.7.37
+reactos/dll/cpl/inetcpl               # Synced to WineStaging-1.7.47
 
 ReactOS shares the following programs with Winehq.