From 26eb2942d0a7238f968c1872e4eaa291270206a3 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 6 Jun 2015 03:56:52 +0200 Subject: [PATCH] Added patch to implement default homepage button in inetcpl.cpl. --- README.md | 3 +- debian/changelog | 1 + ...netcpl-Implement-default-page-button.patch | 48 ++++++++++++++++++ patches/patchinstall.sh | 50 ++++++++++++------- 4 files changed, 84 insertions(+), 18 deletions(-) create mode 100644 patches/inetcpl-Default_Home/0001-inetcpl-Implement-default-page-button.patch diff --git a/README.md b/README.md index c7d0946e..76cc8798 100644 --- a/README.md +++ b/README.md @@ -39,11 +39,12 @@ Wine. All those differences are also documented on the Included bug fixes and improvements ----------------------------------- -**Bug fixes and features included in the next upcoming release [12]:** +**Bug fixes and features included in the next upcoming release [13]:** * Add implementation for kernel32.GetNumaProcessorNode ([Wine Bug #38660](https://bugs.winehq.org/show_bug.cgi?id=38660)) * Allow to enable/disable InsertMode in wineconsole settings ([Wine Bug #38697](https://bugs.winehq.org/show_bug.cgi?id=38697)) * Allow to set pixel format for desktop window +* Implement default homepage button in inetcpl.cpl * Implement mscoree._CorValidateImage for mono runtime ([Wine Bug #38662](https://bugs.winehq.org/show_bug.cgi?id=38662)) * Implement proper handling of CLI .NET images in Wine library loader ([Wine Bug #38661](https://bugs.winehq.org/show_bug.cgi?id=38661)) * Initialize System\CurrentControlSet\Control\TimeZoneInformation registry keys diff --git a/debian/changelog b/debian/changelog index 245b8437..f8db84f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ wine-staging (1.7.45) UNRELEASED; urgency=low Wine Staging Bug #348). * Added patch to initialize System\CurrentControlSet\Control\TimeZoneInformation registry keys. + * Added patch to implement default homepage button in inetcpl.cpl. * Removed patch to handle '\r' as whitespace in wbemprox queries (accepted upstream). * Removed patch to make sure OpenClipboard with current owner doesn't fail diff --git a/patches/inetcpl-Default_Home/0001-inetcpl-Implement-default-page-button.patch b/patches/inetcpl-Default_Home/0001-inetcpl-Implement-default-page-button.patch new file mode 100644 index 00000000..2af887df --- /dev/null +++ b/patches/inetcpl-Default_Home/0001-inetcpl-Implement-default-page-button.patch @@ -0,0 +1,48 @@ +From 3247690bbc075d37863f6f2c9f8f33c5ee6276ee Mon Sep 17 00:00:00 2001 +From: Jared Smudde +Date: Thu, 4 Jun 2015 14:01:14 -0500 +Subject: inetcpl: Implement default page button. + +This patch implements the button default page to set back the +default homepage is the user changes the homepage. + + dlls/inetcpl.cpl/general.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +--- + dlls/inetcpl.cpl/general.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c +index 0691579..24631c6 100644 +--- a/dlls/inetcpl.cpl/general.c ++++ b/dlls/inetcpl.cpl/general.c +@@ -35,6 +35,7 @@ + WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); + + 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','\\', +@@ -43,7 +44,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, +@@ -187,6 +187,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); +-- +2.4.2 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 9cdf0016..848fe65f 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -130,6 +130,7 @@ patch_enable_all () enable_gdiplus_GdipCreateRegionRgnData="$1" enable_imagehlp_BindImageEx="$1" enable_imagehlp_ImageLoad="$1" + enable_inetcpl_Default_Home="$1" enable_iphlpapi_TCP_Table="$1" enable_kernel32_CompareStringEx="$1" enable_kernel32_CopyFileEx="$1" @@ -460,6 +461,9 @@ patch_enable () imagehlp-ImageLoad) enable_imagehlp_ImageLoad="$2" ;; + inetcpl-Default_Home) + enable_inetcpl_Default_Home="$2" + ;; iphlpapi-TCP_Table) enable_iphlpapi_TCP_Table="$2" ;; @@ -2923,6 +2927,18 @@ if test "$enable_imagehlp_ImageLoad" -eq 1; then ) >> "$patchlist" fi +# Patchset inetcpl-Default_Home +# | +# | Modified files: +# | * dlls/inetcpl.cpl/general.c +# | +if test "$enable_inetcpl_Default_Home" -eq 1; then + patch_apply inetcpl-Default_Home/0001-inetcpl-Implement-default-page-button.patch + ( + echo '+ { "Jared Smudde", "inetcpl: Implement default page button.", 1 },'; + ) >> "$patchlist" +fi + # Patchset iphlpapi-TCP_Table # | # | This patchset fixes the following Wine bugs: @@ -5067,15 +5083,15 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then ) >> "$patchlist" fi -# Patchset wined3d-resource_check_usage +# Patchset wined3d-UnhandledBlendFactor # | # | Modified files: -# | * dlls/wined3d/resource.c +# | * dlls/wined3d/state.c # | -if test "$enable_wined3d_resource_check_usage" -eq 1; then - patch_apply wined3d-resource_check_usage/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch +if test "$enable_wined3d_UnhandledBlendFactor" -eq 1; then + patch_apply wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch ( - echo '+ { "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME.", 2 },'; + echo '+ { "Sebastian Lackner", "wined3d: Silence repeated '\''Unhandled blend factor 0'\'' messages.", 1 },'; ) >> "$patchlist" fi @@ -5091,6 +5107,18 @@ if test "$enable_wined3d_wined3d_swapchain_present" -eq 1; then ) >> "$patchlist" fi +# Patchset wined3d-resource_check_usage +# | +# | Modified files: +# | * dlls/wined3d/resource.c +# | +if test "$enable_wined3d_resource_check_usage" -eq 1; then + patch_apply wined3d-resource_check_usage/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch + ( + echo '+ { "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME.", 2 },'; + ) >> "$patchlist" +fi + # Patchset wined3d-Multisampling # | # | This patchset fixes the following Wine bugs: @@ -5140,18 +5168,6 @@ if test "$enable_wined3d_Revert_PixelFormat" -eq 1; then ) >> "$patchlist" fi -# Patchset wined3d-UnhandledBlendFactor -# | -# | Modified files: -# | * dlls/wined3d/state.c -# | -if test "$enable_wined3d_UnhandledBlendFactor" -eq 1; then - patch_apply wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch - ( - echo '+ { "Sebastian Lackner", "wined3d: Silence repeated '\''Unhandled blend factor 0'\'' messages.", 1 },'; - ) >> "$patchlist" -fi - # Patchset wined3d-CSMT_Main # | # | This patchset fixes the following Wine bugs: