This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
RE: [RFA] mingw port: Allow use of cvs GDB on Windows 95
- From: "Pierre Muller" <pierre dot muller at ics-cnrs dot unistra dot fr>
- To: "'Joel Brobecker'" <brobecker at adacore dot com>
- Cc: <gdb-patches at sourceware dot org>
- Date: Mon, 21 Feb 2011 12:50:28 +0100
- Subject: RE: [RFA] mingw port: Allow use of cvs GDB on Windows 95
- References: <001201cbc46c$5b95b100$12c11300$@muller@ics-cnrs.unistra.fr> <000001cbc473$6ef9d120$4ced7360$@muller@ics-cnrs.unistra.fr> <002401cbc574$a8d990e0$fa8cb2a0$@muller@ics-cnrs.unistra.fr> <20110221102151.GG2600@adacore.com>
> > 2011-02-05 Pierre Muller <muller@ics.u-strasbg.fr>
> >
> > Allow use of mingw native on Windows 95 OS.
> > * src/gdb/ser-mingw.c (CancelIo): New macro for dynamically
> loaded
> > DLL entry.
> > (ser_windows_close): Only call CancelIo if function exists.
> > (_initialize_ser_windows): Use LoadLirary/GetProcAddress
> > to check for existence of CancelIo function in kernel32 DLL.
>
> I was hoping that someone with more Windows knowledge would be able
> to review this patch, but oh well...
Thanks for doing this!
> This patch looks OK to me (ie, no risk that I can see for the other
> platforms). Just a couple of remarks:
>
> > +/* CancelIo is not available for Windows 95 OS,
> > + so we need to use LoadLibrary/GetProcAddress to avoid
> > + a startup failure. */
>
> I find that the length of your lines are consistently really short
> and inconsistent. I think it makes it harder to read. The above
> can be reformatted to:
>
> /* CancelIo is not available for Windows 95 OS, so we need to use
> LoadLibrary/GetProcAddress to avoid a startup failure. */
>
> (but I think you could also look at your editor to see if there is
> anything that's contributing to this, especially the inconsistency
> - are you using fixed fonts?)
No, it's just that I do like to have sentences in their own lines...
I should try to adhere closer to GNU standards...
> > +#define CancelIo dyn_CancelIo
> > +
> > +static BOOL WINAPI (*CancelIo) (HANDLE);
>
> I would *personally* keep these two together, to make it clearer
> that the comment above applies to both. Just a thought, so don't
> feel obligated to follow the suggestion if you don't agree.
I removed the empty line in between.
> > /* Stop any pending selects. */
> > - CancelIo ((HANDLE) _get_osfhandle (scb->fd));
> > + if (CancelIo)
> > + CancelIo ((HANDLE) _get_osfhandle (scb->fd));
>
> Can you add a comment explaining why it's OK to not call CancelIo
> if it is not defined? I think you were trying to get more info
> about this on this list - whatever information that you might have
> gleaned...
I added some explanation, see below.
> The patch is pre-approved once the comments are addressed.
Thanks for the approval,
for the record, here is what I just committed.
Pierre Muller
GDB pascal language maintainer
Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.12615
diff -u -p -r1.12615 ChangeLog
--- ChangeLog 21 Feb 2011 08:38:10 -0000 1.12615
+++ ChangeLog 21 Feb 2011 11:46:15 -0000
@@ -1,3 +1,12 @@
+2011-02-21 Pierre Muller <muller@ics.u-strasbg.fr>
+
+ Allow use of mingw native on Windows 95 OS.
+ * src/gdb/ser-mingw.c (CancelIo): New macro for dynamically loaded
+ DLL entry.
+ (ser_windows_close): Only call CancelIo if function exists.
+ (_initialize_ser_windows): Use LoadLirary/GetProcAddress
+ to check for existence of CancelIo function in kernel32 DLL.
+
2011-02-21 Hui Zhu <teawater@gmail.com>
* Makefile.in (HFILES_NO_SRCDIR): Add printcmd.h.
Index: ser-mingw.c
===================================================================
RCS file: /cvs/src/src/gdb/ser-mingw.c,v
retrieving revision 1.26
diff -u -p -r1.26 ser-mingw.c
--- ser-mingw.c 11 Jan 2011 21:53:23 -0000 1.26
+++ ser-mingw.c 21 Feb 2011 11:46:15 -0000
@@ -45,6 +45,11 @@ struct ser_windows_state
HANDLE except_event;
};
+/* CancelIo is not available for Windows 95 OS, so we need to use
+ LoadLibrary/GetProcAddress to avoid a startup failure. */
+#define CancelIo dyn_CancelIo
+static BOOL WINAPI (*CancelIo) (HANDLE);
+
/* Open up a real live device for serial I/O. */
static int
@@ -216,8 +221,12 @@ ser_windows_close (struct serial *scb)
{
struct ser_windows_state *state;
- /* Stop any pending selects. */
- CancelIo ((HANDLE) _get_osfhandle (scb->fd));
+ /* Stop any pending selects. On Windows 95 OS, CancelIo function does not
+ exist. In that case, it can be replaced by a call to CloseHandle, but
+ this is not necessary here as we do close the Windows handle by
calling
+ close (scb->fd) below. */
+ if (CancelIo)
+ CancelIo ((HANDLE) _get_osfhandle (scb->fd));
state = scb->state;
CloseHandle (state->ov.hEvent);
CloseHandle (state->except_event);
@@ -1208,8 +1217,19 @@ _initialize_ser_windows (void)
WSADATA wsa_data;
struct serial_ops *ops;
- /* First register the serial port driver. */
+ HMODULE hm = NULL;
+
+ /* First find out if kernel32 exports CancelIo function. */
+ hm = LoadLibrary ("kernel32.dll");
+ if (hm)
+ {
+ CancelIo = (void *) GetProcAddress (hm, "CancelIo");
+ FreeLibrary (hm);
+ }
+ else
+ CancelIo = NULL;
+ /* Now register the serial port driver. */
ops = XMALLOC (struct serial_ops);
memset (ops, 0, sizeof (struct serial_ops));
ops->name = "hardwire";