mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Add library override instead of closing winecfg when pressing ENTER over the combobox.
This commit is contained in:
Sebastian Lackner
parent
1b9fa30106
commit
cfdc80f823
@ -38,9 +38,10 @@ Wine. All those differences are also documented on the
|
||||
Included bug fixes and improvements
|
||||
===================================
|
||||
|
||||
**Bugfixes and features included in the next upcoming release [10]:**
|
||||
**Bugfixes and features included in the next upcoming release [11]:**
|
||||
|
||||
* Add implementation for CreateThreadpool ([Wine Bug #35192](https://bugs.winehq.org/show_bug.cgi?id=35192))
|
||||
* Add library override instead of closing winecfg when pressing ENTER over the combobox ([Wine Bug #12804](https://bugs.winehq.org/show_bug.cgi?id=12804))
|
||||
* Call DriverUnload function when unloading a device driver.
|
||||
* Fix arguments for OSMesaMakeCurrent when using 16 bit formats
|
||||
* Fix check for end_frame in RtlUnwindEx on x86_64. ([Wine Bug #34254](https://bugs.winehq.org/show_bug.cgi?id=34254))
|
||||
|
||||
4
debian/changelog
vendored
4
debian/changelog
vendored
@ -1,11 +1,15 @@
|
||||
wine-staging (1.7.36) UNRELEASED; urgency=low
|
||||
* Fix an incompatibility of patchinstall.sh with non-bash shells under specific situations.
|
||||
* Improve dinput-Events patch to be compatible with applications which do not explicitly poll for input.
|
||||
* Added patch to properly call DriverUnload when unloading device drivers.
|
||||
* Added patch to fix check for end_frame in RtlUnwindEx on x86_64.
|
||||
* Added patch to fix mouse jittering in Planetside 2.
|
||||
* Added patch to implement additional stubs for vcomp dlls.
|
||||
* Added patchset to implement Vista+ threadpool functions for work / timers.
|
||||
* Added patchset for Vista+ threadpool wait objects.
|
||||
* Added patch to fix crash in Jedi Knight: Dark Forces II when winmm is set to native.
|
||||
* Added patch to fix arguments for OSMesaMakeCurrent when using 16 bit formats.
|
||||
* Added patch to add library override instead of closing winecfg when pressing ENTER over the combobox.
|
||||
* Removed patch to add additional tests for SLGetWindowsInformationDWORD (accepted upstream).
|
||||
* Removed patch to avoid filling KdHelp structure for usermode applications (accepted upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 25 Jan 2015 05:58:36 +0100
|
||||
|
||||
@ -179,6 +179,7 @@ patch_enable_all ()
|
||||
enable_windowscodecs_TGA_Decoder="$1"
|
||||
enable_wineboot_HKEY_DYN_DATA="$1"
|
||||
enable_winebuild_LinkerVersion="$1"
|
||||
enable_winecfg_Libraries="$1"
|
||||
enable_winecfg_Staging="$1"
|
||||
enable_wined3d_CSMT_Helper="$1"
|
||||
enable_wined3d_CSMT_Main="$1"
|
||||
@ -560,6 +561,9 @@ patch_enable ()
|
||||
winebuild-LinkerVersion)
|
||||
enable_winebuild_LinkerVersion="$2"
|
||||
;;
|
||||
winecfg-Libraries)
|
||||
enable_winecfg_Libraries="$2"
|
||||
;;
|
||||
winecfg-Staging)
|
||||
enable_winecfg_Staging="$2"
|
||||
;;
|
||||
@ -3033,6 +3037,21 @@ if test "$enable_winebuild_LinkerVersion" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset winecfg-Libraries
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#12804] Add library override instead of closing winecfg when pressing ENTER over the combobox
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * programs/winecfg/libraries.c
|
||||
# |
|
||||
if test "$enable_winecfg_Libraries" -eq 1; then
|
||||
patch_apply winecfg-Libraries/0001-winecfg-Add-library-override-instead-of-closing-wine.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "winecfg: Add library override instead of closing winecfg when pressing ENTER.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-CSMT_Helper
|
||||
# |
|
||||
# | Modified files:
|
||||
|
||||
@ -0,0 +1,74 @@
|
||||
From fa8d8f6dba0b772b2e820360dae34f994b5e78ea Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 7 Feb 2015 08:00:34 +0100
|
||||
Subject: winecfg: Add library override instead of closing winecfg when
|
||||
pressing ENTER.
|
||||
|
||||
Based on a patch by Hugh McMaster.
|
||||
---
|
||||
programs/winecfg/libraries.c | 31 +++++++++++++++++++------------
|
||||
1 file changed, 19 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c
|
||||
index 660737b..a9889e5 100644
|
||||
--- a/programs/winecfg/libraries.c
|
||||
+++ b/programs/winecfg/libraries.c
|
||||
@@ -421,9 +421,15 @@ static void on_add_combo_change(HWND dialog)
|
||||
len=SendDlgItemMessageW(dialog, IDC_DLLCOMBO, CB_GETLBTEXTLEN, sel, 0);
|
||||
|
||||
if (buffer[0] || len>0)
|
||||
+ {
|
||||
enable(IDC_DLLS_ADDDLL)
|
||||
+ SendMessageW(GetParent(dialog), DM_SETDEFID, IDC_DLLS_ADDDLL, 0);
|
||||
+ }
|
||||
else
|
||||
+ {
|
||||
disable(IDC_DLLS_ADDDLL);
|
||||
+ SendMessageW(GetParent(dialog), DM_SETDEFID, IDOK, 0);
|
||||
+ }
|
||||
}
|
||||
|
||||
static void set_dllmode(HWND dialog, DWORD id)
|
||||
@@ -492,7 +498,8 @@ static void on_add_click(HWND dialog)
|
||||
|
||||
SendDlgItemMessageW(dialog, IDC_DLLCOMBO, WM_SETTEXT, 0, (LPARAM)emptyW);
|
||||
disable(IDC_DLLS_ADDDLL);
|
||||
-
|
||||
+ SendMessageW(GetParent(dialog), DM_SETDEFID, IDOK, 0);
|
||||
+
|
||||
WINE_TRACE("Adding %s as native, builtin\n", buffer);
|
||||
|
||||
SendMessageW(GetParent(dialog), PSM_CHANGED, 0, 0);
|
||||
@@ -605,18 +612,18 @@ LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
break;
|
||||
case WM_COMMAND:
|
||||
switch(HIWORD(wParam)) {
|
||||
-
|
||||
- /* FIXME: when the user hits enter in the DLL combo box we should invoke the add
|
||||
- * add button, rather than the propsheet OK button. But I don't know how to do that!
|
||||
- */
|
||||
-
|
||||
case CBN_EDITCHANGE:
|
||||
- if(LOWORD(wParam) == IDC_DLLCOMBO)
|
||||
- {
|
||||
- on_add_combo_change(hDlg);
|
||||
- break;
|
||||
- }
|
||||
-
|
||||
+ if (LOWORD(wParam) == IDC_DLLCOMBO)
|
||||
+ on_add_combo_change(hDlg);
|
||||
+ break;
|
||||
+ case CBN_SETFOCUS:
|
||||
+ if (LOWORD(wParam) == IDC_DLLCOMBO)
|
||||
+ on_add_combo_change(hDlg);
|
||||
+ break;
|
||||
+ case CBN_KILLFOCUS:
|
||||
+ if (LOWORD(wParam) == IDC_DLLCOMBO)
|
||||
+ SendMessageW(GetParent(hDlg), DM_SETDEFID, IDOK, 0);
|
||||
+ break;
|
||||
case BN_CLICKED:
|
||||
switch(LOWORD(wParam)) {
|
||||
case IDC_DLLS_ADDDLL:
|
||||
--
|
||||
2.2.2
|
||||
|
||||
1
patches/winecfg-Libraries/definition
Normal file
1
patches/winecfg-Libraries/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: [12804] Add library override instead of closing winecfg when pressing ENTER over the combobox
|
||||
Loading…
Reference in New Issue
Block a user