Any problems with these wineconsole patches?

[Martin Storsjö]

Hi,

In addition to the select vs poll patch to wineconsole, I sent two other 
unrelated minor patches for wineconsole last Friday (attached here); are 
there any obvious problems with these, prohibiting them from getting 
merged?

The first one simply makes fallbacks from the curses to the user backend 
work if the curses library isn't found; not only in the case when the 
curses backend isn't compiled in at all.

The second one makes --use-event not resetting the backend to user, since 
that's already the default. By setting the environment variable 
WINECONSOLE="wineconsole --backend=curses", the user could make all 
implicitly opened consoles be curses based consoles -- if --use-event 
wouldn't reset the backend back to user as it does at the moment.

Regards,
// MartinFrom 1e63403183c6ff2a92f62f9c2e42d7cc9d8c0dfe Mon Sep 17 00:00:00 2001
From: Martin Storsjo <[EMAIL PROTECTED]>
Date: Fri, 28 Nov 2008 15:11:31 +0200
Subject: wineconsole: Fallback to window based console if the curses library isn't found
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1.6.0.2"

This is a multi-part message in MIME format.
--------------1.6.0.2
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit

---
 programs/wineconsole/curses.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


--------------1.6.0.2
Content-Type: text/x-patch; name="1e63403183c6ff2a92f62f9c2e42d7cc9d8c0dfe.diff"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="1e63403183c6ff2a92f62f9c2e42d7cc9d8c0dfe.diff"

diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c
index 4270b1b..082d7ad 100644
--- a/programs/wineconsole/curses.c
+++ b/programs/wineconsole/curses.c
@@ -958,7 +958,7 @@ static int WCCURSES_MainLoop(struct inner_data* data)
 enum init_return WCCURSES_InitBackend(struct inner_data* data)
 {
     if( !WCCURSES_bind_libcurses() )
-        return init_failed;
+        return init_not_supported;
 
     data->private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct inner_data_curse));
     if (!data->private) return init_failed;

--------------1.6.0.2--


From 3581a015bf65f72142a61c3b9b9c05cbe6bbce22 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <[EMAIL PROTECTED]>
Date: Fri, 28 Nov 2008 15:12:33 +0200
Subject: wineconsole: Don't force a window backend when --use-event is specified
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1.6.0.2"

This is a multi-part message in MIME format.
--------------1.6.0.2
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit


The user could choose a different preference by setting WINECONSOLE="wineconsole --backend=curses"
---
 programs/wineconsole/wineconsole.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


--------------1.6.0.2
Content-Type: text/x-patch; name="3581a015bf65f72142a61c3b9b9c05cbe6bbce22.diff"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="3581a015bf65f72142a61c3b9b9c05cbe6bbce22.diff"

diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c
index bdb695d..96a93df 100644
--- a/programs/wineconsole/wineconsole.c
+++ b/programs/wineconsole/wineconsole.c
@@ -780,7 +780,6 @@ static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci)
             if (end == wci->ptr + 12) return IDS_CMD_INVALID_EVENT_ID;
             wci->mode = from_event;
             wci->ptr = end;
-            wci->backend = WCUSER_InitBackend;
         }
         else if (strncmp(wci->ptr, "--backend=", 10) == 0)
         {

--------------1.6.0.2--