Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[INETCPL] Sync with Wine Staging 1.7.47. CORE-9924

Browse source 
svn path=/trunk/; revision=68513
This commit is contained in:
Amine Khaldi 2015-07-21 23:07:30 +00:00
parent d39036a255
commit 746516f162
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/cpl/inetcpl/general.c
View file

@ -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 @@ static const WCHAR reg_ie_main[] = {'S','o','f','t','w','a','r','e','\\',
/* 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 @@ static INT_PTR general_on_command(HWND hwnd, WPARAM wparam)
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);

6
reactos/dll/cpl/inetcpl/inetcpl.c
View file

@ -34,8 +34,10 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved)
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);

2
reactos/media/doc/README.WINE
View file

@ -225,7 +225,7 @@ reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.7.37
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.