From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Daniel Colascione Newsgroups: gmane.emacs.bugs Subject: bug#12993: Wrong icon for Cygw32-Emacs Date: Mon, 10 Dec 2012 08:24:30 -0800 Message-ID: <50C60CBE.1070905@dancol.org> References: <50B2300C.3090100@alice.it> <50C58B9F.8050105@dancol.org> <83lid6auv1.fsf@gnu.org> <83k3sqatks.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig2C5694B2093E59AE5CB60845" X-Trace: ger.gmane.org 1355160897 30949 80.91.229.3 (10 Dec 2012 17:34:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 10 Dec 2012 17:34:57 +0000 (UTC) Cc: 12993@debbugs.gnu.org, angelo.graziosi@alice.it To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Dec 10 18:35:07 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ti7Fx-0005F4-UE for geb-bug-gnu-emacs@m.gmane.org; Mon, 10 Dec 2012 18:35:06 +0100 Original-Received: from localhost ([::1]:34432 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ti7Fl-0004st-Cs for geb-bug-gnu-emacs@m.gmane.org; Mon, 10 Dec 2012 12:34:53 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:50846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ti7Ff-0004sA-85 for bug-gnu-emacs@gnu.org; Mon, 10 Dec 2012 12:34:51 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ti6AY-0002ND-I1 for bug-gnu-emacs@gnu.org; Mon, 10 Dec 2012 11:25:47 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:53739) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ti6AY-0002N3-CC for bug-gnu-emacs@gnu.org; Mon, 10 Dec 2012 11:25:26 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Ti6B8-0007lA-7b for bug-gnu-emacs@gnu.org; Mon, 10 Dec 2012 11:26:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Daniel Colascione Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 10 Dec 2012 16:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12993 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 12993-submit@debbugs.gnu.org id=B12993.135515671429766 (code B ref 12993); Mon, 10 Dec 2012 16:26:02 +0000 Original-Received: (at 12993) by debbugs.gnu.org; 10 Dec 2012 16:25:14 +0000 Original-Received: from localhost ([127.0.0.1]:35757 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Ti6AL-0007k3-Lj for submit@debbugs.gnu.org; Mon, 10 Dec 2012 11:25:14 -0500 Original-Received: from dancol.org ([96.126.100.184]:41509) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Ti6AI-0007ju-M8 for 12993@debbugs.gnu.org; Mon, 10 Dec 2012 11:25:12 -0500 Original-Received: from c-76-22-66-162.hsd1.wa.comcast.net ([76.22.66.162] helo=[192.168.1.2]) by dancol.org with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1Ti69h-0000sp-NM; Mon, 10 Dec 2012 08:24:33 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:17.0) Gecko/17.0 Thunderbird/17.0 In-Reply-To: <83k3sqatks.fsf@gnu.org> X-Enigmail-Version: 1.4.6 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:68284 Archived-At: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig2C5694B2093E59AE5CB60845 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 12/10/12 6:08 AM, Eli Zaretskii wrote: >> Date: Mon, 10 Dec 2012 15:40:18 +0200 >> From: Eli Zaretskii >> 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 It looks more like a bugfix to me. Setting the window icon is something we should have always done, and that we didn't do so is problem the cygw32 build had versus the nt build, with which it should have feature parity. It's wrong and generated user complaints. That sounds like a bug to me. I'd also mentioned on the mailing list before that I intended to fix this problem before release. > 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? The resources stored in the binary don't contain paths. (I checked with a hex editor to make sure.) > And what is this hunk about: >=20 > =3D=3D=3D 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 @@ >=20 > PIMAGE_SECTION_HEADER heap_section; >=20 > -#ifdef HAVE_NTGUI > -extern HINSTANCE hinst; > -HINSTANCE hprevinst =3D NULL; > -LPSTR lpCmdLine =3D ""; > -int nCmdShow =3D 0; > -#endif /* HAVE_NTGUI */ > - > /* Startup code for running on NT. When we are running as the dum= ped > 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 =3D GetModuleHandle (NULL); > - lpCmdLine =3D GetCommandLine (); > - nCmdShow =3D SW_SHOWDEFAULT; > -#endif > mainCRTStartup (); > } >=20 > What do you know about lpCmdLine and nCmdShow, and "what crt0.c does" > with them, to be sure they can be removed? I removed dead code. Those variables are never used; the C runtime (to which we dynamically link anyway) handles this initialization internally. (We appear to have a separate bug with respect to nCmdShow: create a shortcut to runemacs.exe and set it to start minimized or start maximized. Emacs starts with a normal window.) The setting of hinst specifically now happens in cache_system_info, so we don't need to do it in _start, which doesn't run for Cygwin builds. I tested the change, and it didn't cause any functional regressions related to command-line parsing. > And this hunk breaks the MS-DOS build: *sigh* The MS-DOS build breaks when the wind blows the wrong way. Does the build work inside DOSBox? I'll have to start testing the build in that environment before pushing. > Any reasons why not revert this changeset and apply it to the trunk > instead? The missing icon annoys users. Do we really want to ship that way? --------------enig2C5694B2093E59AE5CB60845 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (Darwin) Comment: GPGTools - http://gpgtools.org iEYEARECAAYFAlDGDL4ACgkQ17c2LVA10VtWJACfVybIj9yfH9fTy++xxlGU7YlT GcoAoJSrB+FlT5xtcv4Tz3LeNubOiGOH =RqY8 -----END PGP SIGNATURE----- --------------enig2C5694B2093E59AE5CB60845--