mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Added patch to allow to enable/disable InsertMode in wineconsole settings.
This commit is contained in:
Sebastian Lackner
parent
79c69db369
commit
c10eb9a4a1
@ -39,10 +39,11 @@ Wine. All those differences are also documented on the
|
||||
Included bug fixes and improvements
|
||||
-----------------------------------
|
||||
|
||||
**Bug fixes and features included in the next upcoming release [5]:**
|
||||
**Bug fixes and features included in the next upcoming release [6]:**
|
||||
|
||||
* Add shell32 placeholder icons to match offsets with Windows ([Wine Bug #30185](https://bugs.winehq.org/show_bug.cgi?id=30185))
|
||||
* Add stubbed ISWbemSecurity interfaces in wbemdisp
|
||||
* Allow to enable/disable InsertMode in wineconsole settings ([Wine Bug #36704](https://bugs.winehq.org/show_bug.cgi?id=36704))
|
||||
* Also handle '\r' as whitespace in wbemprox queries
|
||||
* Assign a drive serial number during prefix creation/update ([Wine Bug #17823](https://bugs.winehq.org/show_bug.cgi?id=17823))
|
||||
* Support for ws2_32.dll.WSAPoll ([Wine Bug #38601](https://bugs.winehq.org/show_bug.cgi?id=38601))
|
||||
|
||||
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -4,6 +4,7 @@ wine-staging (1.7.44) UNRELEASED; urgency=low
|
||||
* Added patch with shell32 placeholder icons to match offsets with Windows.
|
||||
* Added patch to assign a drive serial number during prefix creation/update.
|
||||
* Added patch for support of ws2_32.dll.WSAPoll.
|
||||
* Added patch to allow to enable/disable InsertMode in wineconsole settings.
|
||||
* Removed patch to reset device state in SysKeyboard*Impl_Acquire (accepted
|
||||
upstream).
|
||||
* Removed patch to avoid creating thread queues for foreign threads in
|
||||
|
||||
@ -247,6 +247,7 @@ patch_enable_all ()
|
||||
enable_winecfg_Libraries="$1"
|
||||
enable_winecfg_Staging="$1"
|
||||
enable_winecfg_Unmounted_Devices="$1"
|
||||
enable_wineconsole_Insert_Mode="$1"
|
||||
enable_wined3d_CSMT_Helper="$1"
|
||||
enable_wined3d_CSMT_Main="$1"
|
||||
enable_wined3d_DXTn="$1"
|
||||
@ -799,6 +800,9 @@ patch_enable ()
|
||||
winecfg-Unmounted_Devices)
|
||||
enable_winecfg_Unmounted_Devices="$2"
|
||||
;;
|
||||
wineconsole-Insert_Mode)
|
||||
enable_wineconsole_Insert_Mode="$2"
|
||||
;;
|
||||
wined3d-CSMT_Helper)
|
||||
enable_wined3d_CSMT_Helper="$2"
|
||||
;;
|
||||
@ -5273,6 +5277,28 @@ if test "$enable_winecfg_Unmounted_Devices" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wineconsole-Insert_Mode
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#36704] Allow to enable/disable InsertMode in wineconsole settings
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * programs/wineconsole/dialog.c, programs/wineconsole/registry.c, programs/wineconsole/winecon_private.h,
|
||||
# | programs/wineconsole/wineconsole.c, programs/wineconsole/wineconsole.rc, programs/wineconsole/wineconsole_res.h
|
||||
# |
|
||||
if test "$enable_wineconsole_Insert_Mode" -eq 1; then
|
||||
patch_apply wineconsole-Insert_Mode/0001-wineconsole-Rearrange-user-dialog-to-make-space-for-.patch
|
||||
patch_apply wineconsole-Insert_Mode/0002-wineconsole-Improve-semantics-of-some-poorly-worded-.patch
|
||||
patch_apply wineconsole-Insert_Mode/0003-wineconsole-Add-InsertMode-to-HKCU.patch
|
||||
patch_apply wineconsole-Insert_Mode/0004-wineconsole-Add-InsertMode-to-the-user-dialog.patch
|
||||
(
|
||||
echo '+ { "Hugh McMaster", "wineconsole: Rearrange user dialog to make space for InsertMode checkbox.", 1 },';
|
||||
echo '+ { "Hugh McMaster", "wineconsole: Improve semantics of some poorly-worded resource strings.", 1 },';
|
||||
echo '+ { "Hugh McMaster", "wineconsole: Add InsertMode to HKCU.", 1 },';
|
||||
echo '+ { "Hugh McMaster", "wineconsole: Add InsertMode to the user dialog.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset winedevice-Fix_Relocation
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -0,0 +1,71 @@
|
||||
From f5b87201251c3fd2d10cc9208ade78d0a100d26a Mon Sep 17 00:00:00 2001
|
||||
From: Hugh McMaster <hugh.mcmaster@outlook.com>
|
||||
Date: Thu, 28 May 2015 21:29:24 +1000
|
||||
Subject: wineconsole: Rearrange user dialog to make space for InsertMode
|
||||
checkbox
|
||||
|
||||
---
|
||||
programs/wineconsole/wineconsole.rc | 28 ++++++++++++++--------------
|
||||
1 file changed, 14 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/programs/wineconsole/wineconsole.rc b/programs/wineconsole/wineconsole.rc
|
||||
index e4e0624..4dd06b7 100644
|
||||
--- a/programs/wineconsole/wineconsole.rc
|
||||
+++ b/programs/wineconsole/wineconsole.rc
|
||||
@@ -54,31 +54,31 @@ IDS_USAGE_FOOTER "\nExample:\n wineconsole cmd\nStarts the Wine comma
|
||||
|
||||
END
|
||||
|
||||
-IDD_OPTION DIALOG 36, 24, 140, 105
|
||||
+IDD_OPTION DIALOG 36, 24, 140, 153
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Options"
|
||||
FONT 8, "MS Shell Dlg"
|
||||
{
|
||||
- GROUPBOX "Cursor size", -1, 5, 5, 65, 56, BS_GROUPBOX
|
||||
+ GROUPBOX "Cursor size", -1, 5, 5, 70, 54, BS_GROUPBOX
|
||||
AUTORADIOBUTTON "&Small", IDC_OPT_CURSOR_SMALL, 9, 18, 50, 10, WS_TABSTOP
|
||||
AUTORADIOBUTTON "&Medium", IDC_OPT_CURSOR_MEDIUM, 9, 30, 50, 10, WS_TABSTOP
|
||||
AUTORADIOBUTTON "&Large", IDC_OPT_CURSOR_LARGE, 9, 42, 50, 10, WS_TABSTOP
|
||||
|
||||
- GROUPBOX "Control", -1, 75, 5, 125, 56, BS_GROUPBOX
|
||||
- LTEXT "Popup menu", -1, 79, 18, 50, 18
|
||||
- AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 138, 18, 60, 10, WS_TABSTOP
|
||||
- AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 138, 30, 60, 10, WS_TABSTOP
|
||||
- LTEXT "Quick edit", -1, 79, 42, 50, 18
|
||||
- AUTOCHECKBOX "&enable", IDC_OPT_QUICK_EDIT, 138, 42, 60, 10, WS_TABSTOP
|
||||
+ GROUPBOX "Console", -1, 80, 5, 120, 54, BS_GROUPBOX
|
||||
+ AUTOCHECKBOX "&Quick edit", IDC_OPT_QUICK_EDIT, 84, 18, 70, 10, WS_TABSTOP
|
||||
|
||||
- GROUPBOX "Command history", -1, 5, 63, 195, 40, BS_GROUPBOX
|
||||
- LTEXT "&Number of recalled commands:", -1, 9, 75, 78, 18
|
||||
- EDITTEXT IDC_OPT_HIST_SIZE, 87, 77, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER
|
||||
+ GROUPBOX "Popup menu", -1, 5, 61, 70, 42, BS_GROUPBOX
|
||||
+ AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 9, 74, 60, 10, WS_TABSTOP
|
||||
+ AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 9, 86, 60, 10, WS_TABSTOP
|
||||
+
|
||||
+ GROUPBOX "Command history", -1, 5, 105, 195, 42, BS_GROUPBOX
|
||||
+ LTEXT "&Number of recalled commands:", -1, 9, 118, 110, 10
|
||||
+ EDITTEXT IDC_OPT_HIST_SIZE, 123, 117, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER
|
||||
CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0
|
||||
- AUTOCHECKBOX "&Remove doubles", IDC_OPT_HIST_NODOUBLE, 125, 75, 60, 18, WS_TABSTOP|BS_MULTILINE
|
||||
+ AUTOCHECKBOX "&Remove doubles", IDC_OPT_HIST_NODOUBLE, 9, 130, 80, 10, WS_TABSTOP|BS_MULTILINE
|
||||
}
|
||||
|
||||
-IDD_FONT DIALOG 36, 24, 140, 105
|
||||
+IDD_FONT DIALOG 36, 24, 140, 153
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Font"
|
||||
FONT 8, "MS Shell Dlg"
|
||||
@@ -94,7 +94,7 @@ FONT 8, "MS Shell Dlg"
|
||||
LTEXT "", IDC_FNT_FONT_INFO, 128, 73, 80, 27
|
||||
}
|
||||
|
||||
-IDD_CONFIG DIALOG 36, 24, 140, 105
|
||||
+IDD_CONFIG DIALOG 36, 24, 140, 153
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Configuration"
|
||||
FONT 8, "MS Shell Dlg"
|
||||
--
|
||||
2.4.1
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
From c89f895ce2d7e5a29491bf658bdae0b53fbf0c08 Mon Sep 17 00:00:00 2001
|
||||
From: Hugh McMaster <hugh.mcmaster@outlook.com>
|
||||
Date: Thu, 28 May 2015 21:29:47 +1000
|
||||
Subject: wineconsole: Improve semantics of some poorly-worded resource strings
|
||||
|
||||
---
|
||||
programs/wineconsole/wineconsole.rc | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/programs/wineconsole/wineconsole.rc b/programs/wineconsole/wineconsole.rc
|
||||
index 4dd06b7..4226ba3 100644
|
||||
--- a/programs/wineconsole/wineconsole.rc
|
||||
+++ b/programs/wineconsole/wineconsole.rc
|
||||
@@ -65,17 +65,17 @@ FONT 8, "MS Shell Dlg"
|
||||
AUTORADIOBUTTON "&Large", IDC_OPT_CURSOR_LARGE, 9, 42, 50, 10, WS_TABSTOP
|
||||
|
||||
GROUPBOX "Console", -1, 80, 5, 120, 54, BS_GROUPBOX
|
||||
- AUTOCHECKBOX "&Quick edit", IDC_OPT_QUICK_EDIT, 84, 18, 70, 10, WS_TABSTOP
|
||||
+ AUTOCHECKBOX "&QuickEdit mode", IDC_OPT_QUICK_EDIT, 84, 18, 70, 10, WS_TABSTOP
|
||||
|
||||
GROUPBOX "Popup menu", -1, 5, 61, 70, 42, BS_GROUPBOX
|
||||
AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 9, 74, 60, 10, WS_TABSTOP
|
||||
AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 9, 86, 60, 10, WS_TABSTOP
|
||||
|
||||
GROUPBOX "Command history", -1, 5, 105, 195, 42, BS_GROUPBOX
|
||||
- LTEXT "&Number of recalled commands:", -1, 9, 118, 110, 10
|
||||
+ LTEXT "&Number of stored commands:", -1, 9, 118, 110, 10
|
||||
EDITTEXT IDC_OPT_HIST_SIZE, 123, 117, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER
|
||||
CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0
|
||||
- AUTOCHECKBOX "&Remove doubles", IDC_OPT_HIST_NODOUBLE, 9, 130, 80, 10, WS_TABSTOP|BS_MULTILINE
|
||||
+ AUTOCHECKBOX "&Remove duplicates", IDC_OPT_HIST_NODOUBLE, 9, 130, 80, 10, WS_TABSTOP|BS_MULTILINE
|
||||
}
|
||||
|
||||
IDD_FONT DIALOG 36, 24, 140, 153
|
||||
--
|
||||
2.4.1
|
||||
|
||||
@ -0,0 +1,79 @@
|
||||
From 8ff887be7e2b57523f19534c1c83ae3e5111aa23 Mon Sep 17 00:00:00 2001
|
||||
From: Hugh McMaster <hugh.mcmaster@outlook.com>
|
||||
Date: Thu, 28 May 2015 21:30:08 +1000
|
||||
Subject: wineconsole: Add InsertMode to HKCU
|
||||
|
||||
---
|
||||
programs/wineconsole/registry.c | 13 +++++++++++--
|
||||
programs/wineconsole/winecon_private.h | 1 +
|
||||
2 files changed, 12 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c
|
||||
index 2805f2a..c1d04c1 100644
|
||||
--- a/programs/wineconsole/registry.c
|
||||
+++ b/programs/wineconsole/registry.c
|
||||
@@ -40,6 +40,7 @@ static const WCHAR wszFontSize[] = {'F','o','n','t','S','i','z','e',0};
|
||||
static const WCHAR wszFontWeight[] = {'F','o','n','t','W','e','i','g','h','t',0};
|
||||
static const WCHAR wszHistoryBufferSize[] = {'H','i','s','t','o','r','y','B','u','f','f','e','r','S','i','z','e',0};
|
||||
static const WCHAR wszHistoryNoDup[] = {'H','i','s','t','o','r','y','N','o','D','u','p',0};
|
||||
+static const WCHAR wszInsertMode[] = {'I','n','s','e','r','t','M','o','d','e',0};
|
||||
static const WCHAR wszMenuMask[] = {'M','e','n','u','M','a','s','k',0};
|
||||
static const WCHAR wszQuickEdit[] = {'Q','u','i','c','k','E','d','i','t',0};
|
||||
static const WCHAR wszScreenBufferSize[] = {'S','c','r','e','e','n','B','u','f','f','e','r','S','i','z','e',0};
|
||||
@@ -48,10 +49,10 @@ static const WCHAR wszWindowSize[] = {'W','i','n','d','o','w','S','i','z'
|
||||
|
||||
void WINECON_DumpConfig(const char* pfx, const struct config_data* cfg)
|
||||
{
|
||||
- WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x font=%s/%u hist=%u/%d flags=%c%c msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n",
|
||||
+ WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x font=%s/%u hist=%u/%d flags=%c%c%c msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n",
|
||||
pfx, cfg->cell_width, cfg->cell_height, cfg->cursor_size, cfg->cursor_visible, cfg->def_attr,
|
||||
wine_dbgstr_w(cfg->face_name), cfg->font_weight, cfg->history_size, cfg->history_nodup ? 1 : 2,
|
||||
- cfg->quick_edit ? 'Q' : 'q', cfg->exit_on_die ? 'X' : 'x',
|
||||
+ cfg->insert_mode ? 'I' : 'i', cfg->quick_edit ? 'Q' : 'q', cfg->exit_on_die ? 'X' : 'x',
|
||||
cfg->menu_mask, cfg->sb_width, cfg->sb_height, cfg->win_pos.X, cfg->win_pos.Y, cfg->win_width, cfg->win_height,
|
||||
cfg->edition_mode,
|
||||
wine_dbgstr_w(cfg->registry));
|
||||
@@ -126,6 +127,10 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg)
|
||||
cfg->history_nodup = val;
|
||||
|
||||
count = sizeof(val);
|
||||
+ if (!RegQueryValueExW(hConKey, wszInsertMode, 0, &type, (LPBYTE)&val, &count))
|
||||
+ cfg->insert_mode = val;
|
||||
+
|
||||
+ count = sizeof(val);
|
||||
if (!RegQueryValueExW(hConKey, wszMenuMask, 0, &type, (LPBYTE)&val, &count))
|
||||
cfg->menu_mask = val;
|
||||
|
||||
@@ -175,6 +180,7 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg)
|
||||
cfg->font_weight = 0;
|
||||
cfg->history_size = 50;
|
||||
cfg->history_nodup = 0;
|
||||
+ cfg->insert_mode = 1;
|
||||
cfg->menu_mask = 0;
|
||||
cfg->quick_edit = 0;
|
||||
cfg->sb_height = 25;
|
||||
@@ -245,6 +251,9 @@ static void WINECON_RegSaveHelper(HKEY hConKey, const struct config_data* cfg)
|
||||
val = cfg->history_nodup;
|
||||
RegSetValueExW(hConKey, wszHistoryNoDup, 0, REG_DWORD, (LPBYTE)&val, sizeof(val));
|
||||
|
||||
+ val = cfg->insert_mode;
|
||||
+ RegSetValueExW(hConKey, wszInsertMode, 0, REG_DWORD, (LPBYTE)&val, sizeof(val));
|
||||
+
|
||||
val = cfg->menu_mask;
|
||||
RegSetValueExW(hConKey, wszMenuMask, 0, REG_DWORD, (LPBYTE)&val, sizeof(val));
|
||||
|
||||
diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h
|
||||
index eec4171..2178dd0 100644
|
||||
--- a/programs/wineconsole/winecon_private.h
|
||||
+++ b/programs/wineconsole/winecon_private.h
|
||||
@@ -36,6 +36,7 @@ struct config_data {
|
||||
DWORD font_weight;
|
||||
DWORD history_size; /* number of commands in history buffer */
|
||||
DWORD history_nodup; /* TRUE if commands are not stored twice in buffer */
|
||||
+ DWORD insert_mode; /* TRUE to insert text at the cursor location; FALSE to overwrite it */
|
||||
DWORD menu_mask; /* MK_CONTROL MK_SHIFT mask to drive submenu opening */
|
||||
DWORD quick_edit; /* whether mouse ops are sent to app (false) or used for content selection (true) */
|
||||
unsigned sb_width; /* active screen buffer width */
|
||||
--
|
||||
2.4.1
|
||||
|
||||
@ -0,0 +1,126 @@
|
||||
From 51f0cd8d176e8889b969ba9f02de67041c30b313 Mon Sep 17 00:00:00 2001
|
||||
From: Hugh McMaster <hugh.mcmaster@outlook.com>
|
||||
Date: Thu, 28 May 2015 21:53:55 +1000
|
||||
Subject: wineconsole: Add InsertMode to the user dialog
|
||||
|
||||
---
|
||||
programs/wineconsole/dialog.c | 5 +++++
|
||||
programs/wineconsole/wineconsole.c | 32 +++++++++++++++++++++++++++++++-
|
||||
programs/wineconsole/wineconsole.rc | 1 +
|
||||
programs/wineconsole/wineconsole_res.h | 1 +
|
||||
4 files changed, 38 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c
|
||||
index 8573d07..493990d 100644
|
||||
--- a/programs/wineconsole/dialog.c
|
||||
+++ b/programs/wineconsole/dialog.c
|
||||
@@ -76,6 +76,8 @@ static INT_PTR WINAPI WCUSER_OptionDlgProc(HWND hDlg, UINT msg, WPARAM wParam, L
|
||||
SetDlgItemInt(hDlg, IDC_OPT_HIST_SIZE, di->config.history_size, FALSE);
|
||||
SendDlgItemMessageW(hDlg, IDC_OPT_HIST_NODOUBLE, BM_SETCHECK,
|
||||
(di->config.history_nodup) ? BST_CHECKED : BST_UNCHECKED, 0);
|
||||
+ SendDlgItemMessageW(hDlg, IDC_OPT_INSERT_MODE, BM_SETCHECK,
|
||||
+ (di->config.insert_mode) ? BST_CHECKED : BST_UNCHECKED, 0);
|
||||
SendDlgItemMessageW(hDlg, IDC_OPT_CONF_CTRL, BM_SETCHECK,
|
||||
(di->config.menu_mask & MK_CONTROL) ? BST_CHECKED : BST_UNCHECKED, 0);
|
||||
SendDlgItemMessageW(hDlg, IDC_OPT_CONF_SHIFT, BM_SETCHECK,
|
||||
@@ -121,6 +123,9 @@ static INT_PTR WINAPI WCUSER_OptionDlgProc(HWND hDlg, UINT msg, WPARAM wParam, L
|
||||
val = (IsDlgButtonChecked(hDlg, IDC_OPT_HIST_NODOUBLE) & BST_CHECKED) != 0;
|
||||
di->config.history_nodup = val;
|
||||
|
||||
+ val = (IsDlgButtonChecked(hDlg, IDC_OPT_INSERT_MODE) & BST_CHECKED) != 0;
|
||||
+ di->config.insert_mode = val;
|
||||
+
|
||||
val = 0;
|
||||
if (IsDlgButtonChecked(hDlg, IDC_OPT_CONF_CTRL) & BST_CHECKED) val |= MK_CONTROL;
|
||||
if (IsDlgButtonChecked(hDlg, IDC_OPT_CONF_SHIFT) & BST_CHECKED) val |= MK_SHIFT;
|
||||
diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c
|
||||
index ed5f816..b7a968c 100644
|
||||
--- a/programs/wineconsole/wineconsole.c
|
||||
+++ b/programs/wineconsole/wineconsole.c
|
||||
@@ -150,6 +150,25 @@ static BOOL WINECON_SetHistoryMode(HANDLE hConIn, int mode)
|
||||
}
|
||||
|
||||
/******************************************************************
|
||||
+ * WINECON_SetInsertMode
|
||||
+ *
|
||||
+ *
|
||||
+ */
|
||||
+static void WINECON_SetInsertMode(HANDLE hConIn, int enable)
|
||||
+{
|
||||
+ DWORD mode;
|
||||
+
|
||||
+ if (GetConsoleMode( hConIn, &mode ))
|
||||
+ {
|
||||
+ if (enable)
|
||||
+ mode |= ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS;
|
||||
+ else
|
||||
+ mode &= ~ENABLE_INSERT_MODE;
|
||||
+ SetConsoleMode( hConIn, mode );
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+/******************************************************************
|
||||
* WINECON_GetConsoleTitle
|
||||
*
|
||||
*
|
||||
@@ -397,6 +416,11 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf
|
||||
data->curcfg.history_nodup = cfg->history_nodup;
|
||||
WINECON_SetHistoryMode(data->hConIn, cfg->history_nodup);
|
||||
}
|
||||
+ if (data->curcfg.insert_mode != cfg->insert_mode)
|
||||
+ {
|
||||
+ data->curcfg.insert_mode = cfg->insert_mode;
|
||||
+ WINECON_SetInsertMode(data->hConIn, cfg->insert_mode);
|
||||
+ }
|
||||
data->curcfg.menu_mask = cfg->menu_mask;
|
||||
data->curcfg.quick_edit = cfg->quick_edit;
|
||||
if (1 /* FIXME: font info has changed */)
|
||||
@@ -533,7 +557,12 @@ static void WINECON_Delete(struct inner_data* data)
|
||||
*/
|
||||
static BOOL WINECON_GetServerConfig(struct inner_data* data)
|
||||
{
|
||||
- BOOL ret;
|
||||
+ BOOL ret;
|
||||
+ DWORD mode;
|
||||
+
|
||||
+ if (!GetConsoleMode( data->hConIn, &mode )) mode = 0;
|
||||
+ data->curcfg.insert_mode = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) ==
|
||||
+ (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS);
|
||||
|
||||
SERVER_START_REQ(get_console_input_info)
|
||||
{
|
||||
@@ -545,6 +574,7 @@ static BOOL WINECON_GetServerConfig(struct inner_data* data)
|
||||
}
|
||||
SERVER_END_REQ;
|
||||
if (!ret) return FALSE;
|
||||
+
|
||||
SERVER_START_REQ(get_console_output_info)
|
||||
{
|
||||
req->handle = wine_server_obj_handle( data->hConOut );
|
||||
diff --git a/programs/wineconsole/wineconsole.rc b/programs/wineconsole/wineconsole.rc
|
||||
index 4226ba3..a3afa1b 100644
|
||||
--- a/programs/wineconsole/wineconsole.rc
|
||||
+++ b/programs/wineconsole/wineconsole.rc
|
||||
@@ -66,6 +66,7 @@ FONT 8, "MS Shell Dlg"
|
||||
|
||||
GROUPBOX "Console", -1, 80, 5, 120, 54, BS_GROUPBOX
|
||||
AUTOCHECKBOX "&QuickEdit mode", IDC_OPT_QUICK_EDIT, 84, 18, 70, 10, WS_TABSTOP
|
||||
+ AUTOCHECKBOX "&Insert mode", IDC_OPT_INSERT_MODE, 84, 30, 70, 10, WS_TABSTOP
|
||||
|
||||
GROUPBOX "Popup menu", -1, 5, 61, 70, 42, BS_GROUPBOX
|
||||
AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 9, 74, 60, 10, WS_TABSTOP
|
||||
diff --git a/programs/wineconsole/wineconsole_res.h b/programs/wineconsole/wineconsole_res.h
|
||||
index ac62b58..8261fd5 100644
|
||||
--- a/programs/wineconsole/wineconsole_res.h
|
||||
+++ b/programs/wineconsole/wineconsole_res.h
|
||||
@@ -70,6 +70,7 @@
|
||||
#define IDC_OPT_CONF_CTRL 0x0107
|
||||
#define IDC_OPT_CONF_SHIFT 0x0108
|
||||
#define IDC_OPT_QUICK_EDIT 0x0109
|
||||
+#define IDC_OPT_INSERT_MODE 0x0110
|
||||
|
||||
#define IDC_FNT_LIST_FONT 0x0201
|
||||
#define IDC_FNT_LIST_SIZE 0x0202
|
||||
--
|
||||
2.4.1
|
||||
|
||||
1
patches/wineconsole-Insert_Mode/definition
Normal file
1
patches/wineconsole-Insert_Mode/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: [36704] Allow to enable/disable InsertMode in wineconsole settings
|
||||
Loading…
Reference in New Issue
Block a user