2:17 p.m.
Hi, Henry!
Thanks for your efforts on this. I have copied xemacs-beta on my reply.
On Sun, Mar 29, 2015 at 9:52 PM, Henry S. Thompson <ht(a)inf.ed.ac.uk> wrote:
OK, small progress. Using VS6:
Adding the following to syswindows.h at around line 605, in the
_non_-CYGWIN_HEADERS branch
typedef int WINBOOL;
typedef intptr_t LONG_PTR;
typedef uintptr_t ULONG_PTR;
typedef uintptr_t DWORD_PTR;
/* #define PCIDLIST_ABSOLUTE_ARRAY LPCITEMIDLIST *
typedef const PCIDLIST_ABSOLUTE *PCIDLIST_ABSOLUTE_ARRAY;* */
typedef LPCITEMIDLIST PCIDLIST_ABSOLUTE;
allows several of the -msw.c files to compile.
More similar work is required, I think.
Oops: the last typedef above is wrong - I read the commented-lines above
that backwards!
Thanks for making sure the native Windows build continues to work.
I appreciate your taking the lead on this, because I haven't made any
substantive progress on this over the weekend.
Here are a few comments:
1. I have checked in the configure changes, so please make your next
patchsets based off of current version control. Please split your
patchset into two patches: one containing the w32api refactoring /
unicode regeneration and a second one containing the 64-bit
(DEVICE_TYPE_) changes.
2. Back when I was looking at updating the unicode definitions, I had
a slightly different regexp in lib-sr/make-mswin-unicode.pl:
my $rettype_re = "(SHSTDAPI_\\(${tok_ch}+${ws_re}\\*?\\)|${tok_ch}" .
"[A-Za-z_0-9 \t\n\r\f]*?${tok_ch})";
I think this regexp is a little more restrictive than the one you
used, but I'm not sure that it makes a difference.
3. Here are my current definitions for the syswindows.h block:
#else /* !CYGWIN_HEADERS */
#define W32API_VER(major,minor) 0
#define W32API_INSTALLED_VER 0
/* Some types that show up in Cygwin headers but not in Visual Studio headers,
and cause problems if we used Cygwin headers to generate
intl-auto-encap-win32.[ch]. */
typedef LPCVOID PCVOID;
typedef int WINBOOL;
typedef intptr_t LONG_PTR;
typedef uintptr_t ULONG_PTR;
typedef uintptr_t DWORD_PTR;
typedef ITEMIDLIST ITEMIDLIST_ABSOLUTE;
typedef ITEMIDLIST_ABSOLUTE *PIDLIST_ABSOLUTE;
typedef const ITEMIDLIST_ABSOLUTE *PCIDLIST_ABSOLUTE;
/* Defined in w32api/winuser.h */
#define GCLP_MENUNAME (-8)
#define GCLP_HBRBACKGROUND (-10)
#define GCLP_HCURSOR (-12)
#define GCLP_HICON (-14)
#define GCLP_HMODULE (-16)
#define GCLP_WNDPROC (-24)
#define GCLP_HICONSM (-34)
#define GWLP_USERDATA (-21)
#define GWLP_WNDPROC (-4)
#define GWLP_HINSTANCE (-6)
#define GWLP_HWNDPARENT (-8)
#define GWLP_USERDATA (-21)
#define GWLP_ID (-12)
#define DWL_MSGRESULT 0
#define DWL_DLGPROC 4
#define DWL_USER 8
#ifdef _WIN64
#undef DWL_MSGRESULT
#undef DWL_DLGPROC
#undef DWL_USER
#endif
#define DWLP_MSGRESULT 0
#define DWLP_DLGPROC DWLP_MSGRESULT + sizeof(LRESULT)
#define DWLP_USER DWLP_DLGPROC + sizeof(DLGPROC)
#endif /* CYGWIN_HEADERS */
Not all of these definitions are necessary, but I think it's probably
best to include the entire GCLP/GWLP definition block.
Thanks for digging in on this.
-Vin
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
4:26 p.m.
New subject: Generated Headers - Quite the Can of Worms
I can confirm your version gets me exactly as far as the version I
just posted, and that your $rettype_re produces the same result as
mine...
ht
--
Henry S. Thompson, School of Informatics, University of Edinburgh
10 Crichton Street, Edinburgh EH8 9AB, SCOTLAND -- (44) 131 650-4440
Fax: (44) 131 650-4587, e-mail: ht(a)inf.ed.ac.uk
URL: http://www.ltg.ed.ac.uk/~ht/
[mail from me _always_ has a .sig like this -- mail without it is forged spam]
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
4:33 p.m.
New subject: Generated Headers - Quite the Can of Worms
On Tue, Mar 31, 2015 at 11:26 AM, Henry S. Thompson <ht(a)inf.ed.ac.uk> wrote:
I can confirm your version gets me exactly as far as the version I
just posted, and that your $rettype_re produces the same result as
mine...
OK. There are several differences in const-ness (LPCSTR vs. LPSTR) in
the newly-generated intl-auto-encap.c, but fixing those by hand only
gets to the next step.
- Vin
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
5:22 a.m.
New subject: Generated Headers - Quite the Can of Worms
Vin Shelton writes:
On Tue, Mar 31, 2015 at 11:26 AM, Henry S. Thompson
<ht(a)inf.ed.ac.uk> wrote:
> I can confirm your version gets me exactly as far as the version I
> just posted, and that your $rettype_re produces the same result as
> mine...
OK. There are several differences in const-ness (LPCSTR vs. LPSTR) in
the newly-generated intl-auto-encap.c, but fixing those by hand only
gets to the next step.
Not sure what "the next step" is. . .
Note that the source of the LPCWSTR vs LPWSTR (which is the first
problem I hit:
C:\C64\usr\local\src\xemacs-21.5-64bit\src\intl-auto-encap-win32.c(634)
: error C2664: 'OpenDesktopW' : cannot convert parameter 1 from
'const unsigned short *' to 'unsigned short *' Conversion loses
qualifiers
is caused by this discontinuity:
VC98/include/winuser.h:
OpenDesktopW(
LPWSTR lpszDesktop,
DWORD dwFlags,
BOOL fInherit,
ACCESS_MASK dwDesiredAccess);
/usr/include/w32api/winuser.h:
WINUSERAPI HDESK WINAPI OpenDesktopW(LPCWSTR lpszDesktop,
DWORD dwFlags,
WINBOOL fInherit,
ACCESS_MASK dwDesiredAccess);
I'm guessing this is simply because w32api has been updated to a later
version of Visual Studio include files. . .
Hmm, maybe not -- online MS documentation has LPWSTR, as above. . .
Some apparently mingw versions of winuser.h I can find on the web
have the non-const version. . ., but I can't immediately find any
discussion of the issue.
Since the only function with the LP[C]WSTR issue which is actually
_called_ by XEmacs is GetNamedSecurityInfo, for the time being I tried
editting intl-encap-win32.c to skip all the others, editting
w32api/aclapi.h to change LPCWSTR to LPWSTR and then rebuilding
intl-auto...
Ah -- I guess I see what you were worrying about. GetWindowLongPtr
and friends are not supported by VS6. Full stop. What level is the
VS6 requirement/where is it coming from? VS2008 an option?
ht
--
Henry S. Thompson, School of Informatics, University of Edinburgh
10 Crichton Street, Edinburgh EH8 9AB, SCOTLAND -- (44) 131 650-4440
Fax: (44) 131 650-4587, e-mail: ht(a)inf.ed.ac.uk
URL: http://www.ltg.ed.ac.uk/~ht/
[mail from me _always_ has a .sig like this -- mail without it is forged spam]
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
1:25 p.m.
New subject: Generated Headers - Quite the Can of Worms
Hi, Henry et al,
On Wed, Apr 1, 2015 at 12:22 AM, Henry S. Thompson <ht(a)inf.ed.ac.uk> wrote:
Some apparently mingw versions of winuser.h I can find on the web
have the non-const version. . ., but I can't immediately find any
discussion of the issue.
Since the only function with the LP[C]WSTR issue which is actually
_called_ by XEmacs is GetNamedSecurityInfo, for the time being I tried
editting intl-encap-win32.c to skip all the others, editting
w32api/aclapi.h to change LPCWSTR to LPWSTR and then rebuilding
intl-auto...
Ah -- I guess I see what you were worrying about. GetWindowLongPtr
and friends are not supported by VS6. Full stop. What level is the
VS6 requirement/where is it coming from? VS2008 an option?
I have been thinking about this, too. The only thing tying us to VS6
is that it works and converting to VS2010 would require some effort.
With 21.4 reaching the EOL (I hope not to make any more setup kits for
21.4), this is a good time to start thinking about building the 21.5
branch with a newer toolset.
VS6 was, actually, a good compiler for its day, but that day is long
past. I would encourage us to move to the newest free (as in beer)
version of Visual Studio available.
https://www.visualstudio.com/en-us/products/visual-studio-express-vs.aspx
seems to indicate that Express 2013 is the latest free version
available.
I think Mats has patches to support VS2010 - Mats, can you post your
patches?
- Vin
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
6:35 p.m.
New subject: Generated Headers - Quite the Can of Worms
Vin Shelton writes:
I think Mats has patches to support VS2010 - Mats, can you post your
patches?
I've installed it, found some patches here [1], making some progress
(but had to turn off gif and jpeg -- those libraries need to be
recompiled with VS2010 themselves I think), and got to the point where
temacs is launched. That failed, but I think I have some
configuration issues still to be sorted.
About to go out of email contact for 24 hours, sorry for lack of
detail.
Diffs attached, against my old state, sorry no time to do better but
these are all simple. . .
ht
[1] http://permalink.gmane.org/gmane.emacs.xemacs.beta/27920
--
Henry S. Thompson, School of Informatics, University of Edinburgh
10 Crichton Street, Edinburgh EH8 9AB, SCOTLAND -- (44) 131 650-4440
Fax: (44) 131 650-4587, e-mail: ht(a)inf.ed.ac.uk
URL: http://www.ltg.ed.ac.uk/~ht/
[mail from me _always_ has a .sig like this -- mail without it is forged spam]
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
9:45 p.m.
New subject: Generated Headers - Quite the Can of Worms
>>>> Henry S Thompson <ht(a)inf.ed.ac.uk> writes:
Vin Shelton writes:
> I think Mats has patches to support VS2010 - Mats, can you post your
> patches?
I've installed it, found some patches here [1], making some
progress
I once had patches but I need to look for them. Need to find what workarea or post they
might be hiding in. So if Henrys patching turns out good that is probably a better way.
Just now I also lack an development environment so even if I find it I can't test that
it still works. But I can try to set one up if just to be able to verify future patches.
Yours
--
%% Mats
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
10:13 p.m.
New subject: Generated Headers - Quite the Can of Worms
Here's what I found from November of 2010.
- Vin
On Wed, Apr 1, 2015 at 4:45 PM, Mats Lidell <matsl(a)xemacs.org> wrote:
>>>>> Henry S Thompson <ht(a)inf.ed.ac.uk> writes:
> Vin Shelton writes:
>> I think Mats has patches to support VS2010 - Mats, can you post your
>> patches?
> I've installed it, found some patches here [1], making some progress
I once had patches but I need to look for them. Need to find what workarea or post they
might be hiding in. So if Henrys patching turns out good that is probably a better way.
Just now I also lack an development environment so even if I find it I can't test
that it still works. But I can try to set one up if just to be able to verify future
patches.
Yours
--
%% Mats
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
6:33 a.m.
New subject: Generated Headers - Quite the Can of Worms
>>>> Vin Shelton <acs(a)xemacs.org> writes:
Here's what I found from November of 2010.
That should be it! Thanks for doing the digging Vin!
Yours
--
%% Mats
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
2:49 p.m.
New subject: Generated Headers - Quite the Can of Worms
Right, looks essentially the same as what I had found, plus the
Solution and Project files.
I'm now hitting a segfault at the batch-update-elc-2 stage, the first
time it tries to use xemacs.exe instead of temacs.exe.
More later,
ht
--
Henry S. Thompson, School of Informatics, University of Edinburgh
10 Crichton Street, Edinburgh EH8 9AB, SCOTLAND -- (44) 131 650-4440
Fax: (44) 131 650-4587, e-mail: ht(a)inf.ed.ac.uk
URL: http://www.ltg.ed.ac.uk/~ht/
[mail from me _always_ has a .sig like this -- mail without it is forged spam]
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
3522
days inactive
3524
days old
9 comments
3 participants
participants (3)
-
Henry S. Thompson -
The XEmacs Package Smoketest -
Vin Shelton