From: Eli Zaretskii <eliz@gnu.org>
To: dancol@dancol.org
Cc: 12993@debbugs.gnu.org, angelo.graziosi@alice.it
Subject: bug#12993: Wrong icon for Cygw32-Emacs
Date: Mon, 10 Dec 2012 16:08:03 +0200 [thread overview]
Message-ID: <83k3sqatks.fsf@gnu.org> (raw)
In-Reply-To: <83lid6auv1.fsf@gnu.org>
> Date: Mon, 10 Dec 2012 15:40:18 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: 12993@debbugs.gnu.org, angelo.graziosi@alice.it
>
> > I've pushed a change to the emacs-24 branch that should resolve the
> > problem. We weren't compiling Windows resources into the cygw32 Emacs
> > binary.
>
> Why are such changes committed to the release branch? This is a minor
> feature, certainly not a bugfix, while the changes are definitely
> non-trivial. Please don't do that without discussion.
The more I look at the changes, the less I like them. E.g., how do we
know that the various Windows utilities that access the resources will
DTRT with forward slashes? Any references on the subject?
And what is this hunk about:
=== modified file 'src/unexw32.c'
--- a/src/unexw32.c 2012-10-17 19:02:44 +0000
+++ b/src/unexw32.c 2012-12-10 07:11:21 +0000
@@ -85,13 +85,6 @@
PIMAGE_SECTION_HEADER heap_section;
-#ifdef HAVE_NTGUI
-extern HINSTANCE hinst;
-HINSTANCE hprevinst = NULL;
-LPSTR lpCmdLine = "";
-int nCmdShow = 0;
-#endif /* HAVE_NTGUI */
-
/* Startup code for running on NT. When we are running as the dumped
version, we need to bootstrap our heap and .bss section into our
address space before we can actually hand off control to the startup
@@ -121,15 +114,6 @@
/* Prevent Emacs from being locked up (eg. in batch mode) when
accessing devices that aren't mounted (eg. removable media drives). */
SetErrorMode (SEM_FAILCRITICALERRORS);
-
- /* Invoke the NT CRT startup routine now that our housecleaning
- is finished. */
-#ifdef HAVE_NTGUI
- /* determine WinMain args like crt0.c does */
- hinst = GetModuleHandle (NULL);
- lpCmdLine = GetCommandLine ();
- nCmdShow = SW_SHOWDEFAULT;
-#endif
mainCRTStartup ();
}
What do you know about lpCmdLine and nCmdShow, and "what crt0.c does"
with them, to be sure they can be removed?
And this hunk breaks the MS-DOS build:
-temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) $(lib)/libgnu.a
+temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) \
+ $(lib)/libgnu.a $(W32_RES)
$(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \
- -o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES)
+ -o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES) \
+ $(W32_RES_LINK)
test "$(CANNOT_DUMP)" = "yes" || \
test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT)
(because W32_RES will be expanded to @W32_RES@ and W32_RES_LINK to
@W32_RES_LINK@, and GCC will barf).
Any reasons why not revert this changeset and apply it to the trunk
instead?
next prev parent reply other threads:[~2012-12-10 14:08 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-25 14:49 bug#12993: Wrong icon for Cygw32-Emacs Angelo Graziosi
2012-12-10 7:13 ` Daniel Colascione
2012-12-10 13:40 ` Eli Zaretskii
2012-12-10 14:08 ` Eli Zaretskii [this message]
2012-12-10 16:24 ` Daniel Colascione
2012-12-10 19:57 ` Eli Zaretskii
2012-12-10 21:05 ` Daniel Colascione
2012-12-10 16:03 ` Daniel Colascione
2012-12-10 16:34 ` Eli Zaretskii
2012-12-10 17:30 ` Stefan Monnier
2012-12-10 17:58 ` Daniel Colascione
2012-12-10 20:06 ` Eli Zaretskii
2013-04-07 18:11 ` Ken Brown
2013-04-07 18:48 ` Eli Zaretskii
2013-04-07 22:44 ` Ken Brown
2013-04-08 2:39 ` Eli Zaretskii
2013-04-08 13:02 ` Ken Brown
2013-04-08 14:53 ` Eli Zaretskii
2013-04-08 15:25 ` Ken Brown
2013-04-08 16:24 ` Eli Zaretskii
2013-04-08 16:58 ` Ken Brown
2013-04-08 17:20 ` Eli Zaretskii
2013-04-08 20:26 ` Ken Brown
2013-04-09 2:41 ` Eli Zaretskii
2013-04-09 2:43 ` Ken Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83k3sqatks.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=12993@debbugs.gnu.org \
--cc=angelo.graziosi@alice.it \
--cc=dancol@dancol.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).