Mercurial > hg > xemacs-beta
annotate netinstall/iniparse.y @ 4874:4c3f5e1ecbeb
ChangeLog for previous patch: regenerate intl-auto-encap-win32.c
(fix build problems when building --with-msw=no on Cygwin)
-------------------- ChangeLog entries follow: --------------------
lib-src/ChangeLog addition:
2010-01-15 Ben Wing <ben@xemacs.org>
* make-mswin-unicode.pl:
Various fixes to get this to work when using the Cygwin header files
in /usr/include/w32api instead of the VC++ ones:
-- Use /usr/include/w32api as default; don't assume that a passed-in
directory always ends in .../include.
-- Add `const' to list of known type modifiers.
-- If function already seen, warn but don't generate twice.
-- Eliminate `extern' from return type modifiers.
-- Cosmetic: When eliminating APIENTRY, also eliminate following
whitespace.
src/ChangeLog addition:
2010-01-15 Ben Wing <ben@xemacs.org>
* intl-auto-encap-win32.c:
* intl-auto-encap-win32.c (qxeExtractAssociatedIcon):
* intl-auto-encap-win32.c (qxeShellExecuteEx):
* intl-auto-encap-win32.c (qxeSHFileOperation):
* intl-auto-encap-win32.c (qxeSHQueryRecycleBin):
* intl-auto-encap-win32.c (qxeSHEmptyRecycleBin):
* intl-auto-encap-win32.c (qxeWNetAddConnection):
* intl-auto-encap-win32.c (qxeWNetAddConnection2):
* intl-auto-encap-win32.c (qxeWNetAddConnection3):
* intl-auto-encap-win32.c (qxeWNetCancelConnection):
* intl-auto-encap-win32.c (qxeWNetCancelConnection2):
* intl-auto-encap-win32.c (qxeWNetGetConnection):
* intl-auto-encap-win32.c (qxeWNetUseConnection):
* intl-auto-encap-win32.c (qxeWNetConnectionDialog1):
* intl-auto-encap-win32.c (qxeWNetDisconnectDialog1):
* intl-auto-encap-win32.c (qxeWNetOpenEnum):
* intl-auto-encap-win32.c (qxeWNetEnumResource):
* intl-auto-encap-win32.c (qxeWNetGetUniversalName):
* intl-auto-encap-win32.c (qxeWNetGetUser):
* intl-auto-encap-win32.c (qxeWNetGetProviderName):
* intl-auto-encap-win32.c (qxeWNetGetNetworkInformation):
* intl-auto-encap-win32.c (qxeWNetGetLastError):
* intl-auto-encap-win32.c (qxeMultinetGetConnectionPerformance):
* intl-auto-encap-win32.c (qxeAppendMenu):
* intl-auto-encap-win32.c (qxeCopyAcceleratorTable):
* intl-auto-encap-win32.c (qxeDlgDirSelectComboBoxEx):
* intl-auto-encap-win32.c (qxeEnumDesktops):
* intl-auto-encap-win32.c (qxeEnumWindowStations):
* intl-auto-encap-win32.c (qxeGetClassInfo):
* intl-auto-encap-win32.c (qxeGetClassLong):
* intl-auto-encap-win32.c (qxeGetClassName):
* intl-auto-encap-win32.c (qxeGetKeyboardLayoutName):
* intl-auto-encap-win32.c (qxeGetWindowLong):
* intl-auto-encap-win32.c (qxeGetUserObjectInformation):
* intl-auto-encap-win32.c (qxeGetWindowTextLength):
* intl-auto-encap-win32.c (qxeGrayString):
* intl-auto-encap-win32.c (qxeInsertMenu):
* intl-auto-encap-win32.c (qxeSetProp):
* intl-auto-encap-win32.c (qxeEnumICMProfiles):
* intl-auto-encap-win32.c (qxeExtTextOut):
* intl-auto-encap-win32.c (qxeSetICMProfile):
* intl-auto-encap-win32.c (qxeTextOut):
* intl-auto-encap-win32.c (qxeSHGetPathFromIDList):
* intl-auto-encap-win32.c (qxeFindText):
* intl-auto-encap-win32.c (qxeReplaceText):
* intl-auto-encap-win32.c (qxeImmInstallIME):
* intl-auto-encap-win32.c (qxeImmGetDescription):
* intl-auto-encap-win32.c (qxeImmGetIMEFileName):
* intl-auto-encap-win32.c (qxeImmGetCompositionString):
* intl-auto-encap-win32.c (qxeImmGetCandidateListCount):
* intl-auto-encap-win32.c (qxeImmGetCandidateList):
* intl-auto-encap-win32.c (qxeImmGetGuideLine):
* intl-auto-encap-win32.c (qxeImmConfigureIME):
* intl-auto-encap-win32.c (qxeImmEscape):
* intl-auto-encap-win32.c (qxeImmGetConversionList):
* intl-auto-encap-win32.c (qxeImmRegisterWord):
* intl-auto-encap-win32.c (qxeImmUnregisterWord):
* intl-auto-encap-win32.c (qxeImmEnumRegisterWord):
* intl-auto-encap-win32.c (qxesndPlaySound):
* intl-auto-encap-win32.c (qxePlaySound):
* intl-auto-encap-win32.c (qxewaveOutGetErrorText):
* intl-auto-encap-win32.c (qxewaveInGetErrorText):
* intl-auto-encap-win32.c (qxemidiOutGetErrorText):
* intl-auto-encap-win32.c (qxemidiInGetErrorText):
* intl-auto-encap-win32.c (qxemmioStringToFOURCC):
* intl-auto-encap-win32.c (qxemmioInstallIOProc):
* intl-auto-encap-win32.c (qxemmioOpen):
* intl-auto-encap-win32.c (qxemmioRename):
* intl-auto-encap-win32.c (qxemciSendCommand):
* intl-auto-encap-win32.c (qxemciSendString):
* intl-auto-encap-win32.c (qxemciGetDeviceID):
* intl-auto-encap-win32.c (qxemciGetErrorString):
* intl-auto-encap-win32.h:
* intl-auto-encap-win32.h (qxemciGetErrorString):
Regenerate these files from Cygwin headers.
* intl-encap-win32.c:
Bracket more functions in HAVE_MS_WINDOWS, to fix build problems
when building --with-msw=no on Cygwin.
Fixes for Cygwin headers:
-- Comment out IME.H, non-existent in Cygwin.
-- Make MessageBoxIndirect a `no' (don't encapsulate but generate
error if used) because it has a structure parameter that needs
to be A/W split but is declared as FOO*, and our parser can't
split this.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 15 Jan 2010 05:12:07 -0600 |
| parents | 3078fd1074e8 |
| children |
| rev | line source |
|---|---|
| 448 | 1 %{ |
| 2 /* | |
| 3 * Copyright (c) 2000, Red Hat, Inc. | |
| 4 * | |
| 5 * This program is free software; you can redistribute it and/or modify | |
| 6 * it under the terms of the GNU General Public License as published by | |
| 7 * the Free Software Foundation; either version 2 of the License, or | |
| 8 * (at your option) any later version. | |
| 9 * | |
| 10 * A copy of the GNU General Public License can be found at | |
| 11 * http://www.gnu.org/ | |
| 12 * | |
| 13 * Written by DJ Delorie <dj@cygnus.com> | |
| 14 * | |
| 15 */ | |
| 16 | |
| 17 /* Parse the setup.ini files. inilex.l provides the tokens for this. */ | |
| 18 | |
| 19 #include <stdio.h> | |
| 20 #include <stdlib.h> | |
| 21 #include <string.h> | |
| 22 #include "win32.h" | |
| 23 | |
| 24 #include "ini.h" | |
| 25 #include "iniparse.h" | |
| 26 | |
| 27 #include "port.h" | |
| 28 | |
| 29 #define YYERROR_VERBOSE 1 | |
| 30 /*#define YYDEBUG 1*/ | |
| 31 | |
| 32 static Package *cp; | |
| 33 static int trust; | |
| 34 extern unsigned int setup_timestamp; | |
| 35 extern char *setup_version; | |
| 36 extern int yylineno; | |
| 37 extern int CDECL yyerror (char *s, ...); | |
| 38 | |
| 39 #define cpt (cp->info+trust) | |
| 40 | |
| 41 %} | |
| 42 | |
| 43 %token STRING | |
| 44 %token SETUP_TIMESTAMP SETUP_VERSION VERSION INSTALL SOURCE SDESC LDESC TYPE | |
| 45 %token T_PREV T_CURR T_TEST T_UNKNOWN | |
| 46 | |
| 47 %% | |
| 48 | |
| 49 whole_file | |
| 50 : setup_headers packages | |
| 51 ; | |
| 52 | |
| 53 setup_headers | |
| 54 : setup_header setup_headers | |
| 55 | /* empty */ | |
| 56 ; | |
| 57 | |
| 58 setup_header | |
| 59 : SETUP_TIMESTAMP STRING '\n' { setup_timestamp = strtoul ($2, 0, 0); } | |
| 60 | SETUP_VERSION STRING '\n' { setup_version = strdup ($2); } | |
| 61 | '\n' | |
| 62 | error { yyerror ("unrecognized line in setup.ini headers (do you have the latest setup?)"); } '\n' | |
| 63 ; | |
| 64 | |
| 65 packages | |
| 66 : package packages | |
| 67 | /* empty */ | |
| 68 ; | |
| 69 | |
| 70 package | |
| 71 : '@' STRING '\n' { new_package($2); } | |
| 72 lines | |
| 73 ; | |
| 74 | |
| 75 lines | |
| 76 : simple_line '\n' lines | |
| 77 | simple_line | |
| 78 ; | |
| 79 | |
| 80 simple_line | |
| 81 : VERSION STRING { cpt->version = $2; } | |
| 82 | SDESC STRING { cp->sdesc = $2; } | |
| 83 | LDESC STRING { cp->ldesc = $2; } | |
| 84 | INSTALL STRING STRING { cpt->install = $2; | |
| 85 cpt->install_size = atoi($3); } | |
| 86 | SOURCE STRING STRING { cpt->source = $2; | |
| 87 cpt->source_size = atoi($3); } | |
| 88 | TYPE STRING { if (!strcmp ($2, "cygwin")) | |
| 89 cp->type = TY_CYGWIN; | |
| 90 else if (!strcmp ($2, "native")) | |
| 91 cp->type = TY_NATIVE; | |
| 92 else | |
| 93 cp->type = TY_GENERIC; } | |
| 94 | T_PREV { trust = TRUST_PREV; } | |
| 95 | T_CURR { trust = TRUST_CURR; } | |
| 96 | T_TEST { trust = TRUST_TEST; } | |
| 97 | T_UNKNOWN { trust = TRUST_UNKNOWN; } | |
| 98 | /* empty */ | |
| 99 | error '\n' { yylineno --; | |
| 100 yyerror ("unrecognized line in package %s (do you have the latest setup?)", cp->name); | |
| 101 yylineno ++; | |
| 102 } | |
| 103 ; | |
| 104 | |
| 105 %% | |
| 106 | |
| 107 Package *package = 0; | |
| 108 Package *xemacs_package = 0; | |
| 109 int npackages = 0; | |
| 110 static int maxpackages = 0; | |
| 111 | |
| 112 Package * | |
| 113 new_package (char *name) | |
| 114 { | |
| 115 if (package == 0) | |
| 116 maxpackages = npackages = 0; | |
| 117 if (npackages >= maxpackages) | |
| 118 { | |
| 119 maxpackages += 10; | |
| 120 if (package) | |
| 121 package = (Package *) realloc (package, maxpackages * sizeof (Package)); | |
| 122 else | |
| 123 package = (Package *) malloc (maxpackages * sizeof (Package)); | |
| 124 } | |
| 125 cp = package + npackages; | |
| 126 npackages ++; | |
| 127 | |
| 128 memset (cp, 0, sizeof (Package)); | |
| 129 cp->name = name; | |
| 130 | |
| 131 trust = TRUST_CURR; | |
| 132 | |
| 133 return cp; | |
| 134 } |