From 5ee34a93098f3878d69969babdcb587ffed1425e Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 20 Mar 2015 19:01:08 +0100 Subject: [PATCH] Added patch to allow to edit winecfg library override by double clicking. --- README.md | 3 +- debian/changelog | 1 + patches/patchinstall.sh | 16 +++++++++ ...lick-in-dlls-list-to-edit-item-s-ove.patch | 36 +++++++++++++++++++ patches/winecfg-Libraries/definition | 1 + 5 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 patches/winecfg-Libraries/0001-winecfg-Double-click-in-dlls-list-to-edit-item-s-ove.patch create mode 100644 patches/winecfg-Libraries/definition diff --git a/README.md b/README.md index 5398b3c8..b6b5fc60 100644 --- a/README.md +++ b/README.md @@ -38,10 +38,11 @@ Wine. All those differences are also documented on the Included bug fixes and improvements =================================== -**Bugfixes and features included in the next upcoming release [12]:** +**Bugfixes and features included in the next upcoming release [13]:** * Add stub for PowerCreateRequest * Add stub for wininet.ParseX509EncodedCertificateForListBoxEntry ([Wine Bug #29842](https://bugs.winehq.org/show_bug.cgi?id=29842)) +* Allow to edit winecfg library override by double clicking * Fix caps lock state issues with multiple processes ([Wine Bug #35907](https://bugs.winehq.org/show_bug.cgi?id=35907)) * Fix multithreading issues with fullscreen clipping ([Wine Bug #38087](https://bugs.winehq.org/show_bug.cgi?id=38087)) * Fix wrong version of ID3DXEffect interface for d3dx9_24 diff --git a/debian/changelog b/debian/changelog index ec47a1ef..f7d803e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ wine-staging (1.7.39) UNRELEASED; urgency=low * Added patch to implement shared memory wineserver communication for various user32 functions. * Added patch to implement combase.WindowsSubstring function. * Added patch with stub for wininet.ParseX509EncodedCertificateForListBoxEntry. + * Added patch to allow to edit winecfg library override by double clicking. * Removed patch to avoid hardcoded values for sizeof(GUID) (accepted upstream). * Removed patches for SLGetWindowsInformationDWORD (accepted upstream). * Removed patches for _ismbckata and _mbctohira (fixed upstream). diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 6b3652bf..fe84b647 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -208,6 +208,7 @@ patch_enable_all () enable_wine_inf_Performance="$1" enable_wineboot_HKEY_DYN_DATA="$1" enable_winebuild_LinkerVersion="$1" + enable_winecfg_Libraries="$1" enable_winecfg_Staging="$1" enable_wineconsole_Buffer_Size="$1" enable_wined3d_CSMT_Helper="$1" @@ -679,6 +680,9 @@ patch_enable () winebuild-LinkerVersion) enable_winebuild_LinkerVersion="$2" ;; + winecfg-Libraries) + enable_winecfg_Libraries="$2" + ;; winecfg-Staging) enable_winecfg_Staging="$2" ;; @@ -4237,6 +4241,18 @@ if test "$enable_winebuild_LinkerVersion" -eq 1; then ) >> "$patchlist" fi +# Patchset winecfg-Libraries +# | +# | Modified files: +# | * programs/winecfg/libraries.c +# | +if test "$enable_winecfg_Libraries" -eq 1; then + patch_apply winecfg-Libraries/0001-winecfg-Double-click-in-dlls-list-to-edit-item-s-ove.patch + ( + echo '+ { "Hao Peng", "winecfg: Double click in dlls list to edit item'\''s overides.", 3 },'; + ) >> "$patchlist" +fi + # Patchset wineconsole-Buffer_Size # | # | This patchset fixes the following Wine bugs: diff --git a/patches/winecfg-Libraries/0001-winecfg-Double-click-in-dlls-list-to-edit-item-s-ove.patch b/patches/winecfg-Libraries/0001-winecfg-Double-click-in-dlls-list-to-edit-item-s-ove.patch new file mode 100644 index 00000000..c4a9fd7e --- /dev/null +++ b/patches/winecfg-Libraries/0001-winecfg-Double-click-in-dlls-list-to-edit-item-s-ove.patch @@ -0,0 +1,36 @@ +From e73805a78a8001203f866aeb24a56e1c1de36b50 Mon Sep 17 00:00:00 2001 +From: Hao Peng +Date: Thu, 5 Mar 2015 12:00:49 +0800 +Subject: winecfg: Double click in dlls list to edit item's overides. (try 3) + +Add a feature to winecfg. User can double click in dlls list to edit overides of selected item. +--- + programs/winecfg/libraries.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c +index a9889e5..a98da0e 100644 +--- a/programs/winecfg/libraries.c ++++ b/programs/winecfg/libraries.c +@@ -643,6 +643,18 @@ LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) + else + set_controls_from_selection(hDlg); + break; ++ case CBN_DBLCLK: ++ if (LOWORD(wParam) == IDC_DLLS_LIST) ++ { ++ int index; ++ POINT p; ++ if (GetCursorPos(&p) && ScreenToClient((HWND)lParam, &p)) ++ { ++ index = SendDlgItemMessageW(hDlg, IDC_DLLS_LIST, LB_ITEMFROMPOINT, 0, MAKELPARAM(p.x, p.y)); ++ if (!HIWORD(index)) on_edit_click(hDlg); ++ } ++ } ++ break; + } + break; + } +-- +2.3.2 + diff --git a/patches/winecfg-Libraries/definition b/patches/winecfg-Libraries/definition new file mode 100644 index 00000000..385058c7 --- /dev/null +++ b/patches/winecfg-Libraries/definition @@ -0,0 +1 @@ +Fixes: Allow to edit winecfg library override by double clicking