comparison src/intl-encap-win32.c @ 778:2923009caf47

[xemacs-hg @ 2002-03-16 10:38:59 by ben] cm.c, file-coding.c: fix warnings. .cvsignore: Those pesky *.tmp files. mule\arabic.el, mule\canna-leim.el, mule\china-util.el, mule\chinese.el, mule\cyril-util.el, mule\cyrillic.el, mule\devan-util.el, mule\devanagari.el, mule\english.el, mule\ethio-util.el, mule\ethiopic.el, mule\european.el, mule\greek.el, mule\hebrew.el, mule\indian.el, mule\japan-util.el, mule\japanese.el, mule\korea-util.el, mule\korean.el, mule\lao-util.el, mule\lao.el, mule\misc-lang.el, mule\mule-charset.el, mule\mule-cmds.el, mule\thai-util.el, mule\thai.el, mule\tibet-util.el, mule\tibetan.el, mule\viet-util.el, mule\vietnamese.el, unicode.el: Fix lots of warnings. Sync up some files to FSF 21.1. Copy over all charset definitions from FSF 21.1, convert them to our format, and stick them in the relevant files. Eventually we will actually be able to dump these files (though they may not quite work). autoload.el: Support defun*, defmacro*. mule/mule-composite.el, mule/mule-composite-stub.el: New file, stubs for nonexistent composition funs/vars. mule/viet-chars.el, dumped-lisp.el: Account for these changes. font.el, mouse.el, msw-font-menu.el, printer.el, startup.el: fix warnings.
author ben
date Sat, 16 Mar 2002 10:39:19 +0000
parents 943eaba38521
children 1f5108485fe7
comparison
equal deleted inserted replaced
777:e65d9cf16707 778:2923009caf47
157 157
158 /* we use a simple script to control the auto-generation. 158 /* we use a simple script to control the auto-generation.
159 159
160 \(The following is copied from lib-src/make-mswin-unicode.pl.) 160 \(The following is copied from lib-src/make-mswin-unicode.pl.)
161 161
162 dir sets the directory for include files.
163 file specifies a file to start reading from. 162 file specifies a file to start reading from.
164 yes indicates a function to be automatically Unicode-encapsulated. 163 yes indicates a function to be automatically Unicode-encapsulated.
165 (All parameters either need no special processing or are LPTSTR or 164 (All parameters either need no special processing or are LPTSTR or
166 LPCTSTR.) 165 LPCTSTR.)
167 soon indicates a function that should be automatically Unicode-encapsulated, 166 soon indicates a function that should be automatically Unicode-encapsulated,
189 This does the following: 188 This does the following:
190 189
191 cd $(SRC) 190 cd $(SRC)
192 perl ../lib-src/make-mswin-unicode.pl --c-output intl-auto-encap-win32.c --h-output intl-auto-encap-win32.h intl-encap-win32.c 191 perl ../lib-src/make-mswin-unicode.pl --c-output intl-auto-encap-win32.c --h-output intl-auto-encap-win32.h intl-encap-win32.c
193 192
194 NOTE: If your copy of VC++ is not in the directory indicated below, you'll
195 have to change that directive (or create a symlink, provided you're using
196 Cygwin perl). #### There should be an option to the perl script to specify
197 this.
198 */ 193 */
199 194
200 /* 195 /*
201 196
202 terminology used below: 197 terminology used below:
212 pointer to another split-sized structure. 207 pointer to another split-sized structure.
213 208
214 "split-complex" 209 "split-complex"
215 210
216 begin-unicode-encapsulation-script 211 begin-unicode-encapsulation-script
217
218 dir c:\Program Files\Microsoft Visual Studio\VC98\Include\
219 212
220 file WINBASE.H 213 file WINBASE.H
221 214
222 yes GetBinaryType 215 yes GetBinaryType
223 yes GetShortPathName 216 yes GetShortPathName
225 yes GetEnvironmentStrings 218 yes GetEnvironmentStrings
226 yes FreeEnvironmentStrings 219 yes FreeEnvironmentStrings
227 yes FormatMessage 220 yes FormatMessage
228 yes CreateMailslot 221 yes CreateMailslot
229 begin-bracket !defined (CYGWIN_HEADERS) 222 begin-bracket !defined (CYGWIN_HEADERS)
230 yes EncryptFile 223 no EncryptFile Win2K+ only
231 yes DecryptFile 224 no DecryptFile Win2K+ only
232 end-bracket 225 end-bracket
233 no OpenRaw error "The procedure entry point OpenRawW could not be located in the dynamic link library ADVAPI32.dll." 226 no OpenRaw error "The procedure entry point OpenRawW could not be located in the dynamic link library ADVAPI32.dll."
234 no QueryRecoveryAgents split-sized LPRECOVERY_AGENT_INFORMATION 227 no QueryRecoveryAgents split-sized LPRECOVERY_AGENT_INFORMATION
235 yes lstrcmp 228 yes lstrcmp
236 yes lstrcmpi 229 yes lstrcmpi
955 yes mmioRename 948 yes mmioRename
956 yes mciSendCommand 949 yes mciSendCommand
957 yes mciSendString 950 yes mciSendString
958 yes mciGetDeviceID 951 yes mciGetDeviceID
959 begin-bracket !defined (MINGW) 952 begin-bracket !defined (MINGW)
960 yes mciGetDeviceIDFromElementID 953 no mciGetDeviceIDFromElementID missing from Win98se version of ADVAPI32.dll
961 end-bracket 954 end-bracket
962 yes mciGetErrorString 955 yes mciGetErrorString
963 956
964 file WINNETWK.H 957 file WINNETWK.H
965 958
1407 /* shell */ 1400 /* shell */
1408 /************************************************************************/ 1401 /************************************************************************/
1409 1402
1410 static void 1403 static void
1411 copy_shfileinfoa_to_shfileinfow (const SHFILEINFOA *pa, 1404 copy_shfileinfoa_to_shfileinfow (const SHFILEINFOA *pa,
1412 SHFILEINFOW *pw) 1405 SHFILEINFOW *pw, UINT sz)
1413 { 1406 {
1414 /* the layout of SHFILEINFO is 1407 /* the layout of SHFILEINFO is
1415 1408
1416 non-split fields; 1409 non-split fields;
1417 TCHAR szDisplayName[...]; 1410 TCHAR szDisplayName[...];
1418 TCHAR szTypeName[...]; 1411 TCHAR szTypeName[...];
1419 */ 1412 */
1420 1413
1414 assert (sz >= sizeof (SHFILEINFOW));
1421 xzero (*pw); 1415 xzero (*pw);
1422 memcpy (pw, pa, offsetof (SHFILEINFOA, szDisplayName)); 1416 memcpy (pw, pa, offsetof (SHFILEINFOA, szDisplayName));
1423 memcpy (pw->szDisplayName, pa->szDisplayName, sizeof (pa->szDisplayName)); 1417 memcpy (pw->szDisplayName, pa->szDisplayName, sizeof (pa->szDisplayName));
1424 memcpy (pw->szTypeName, pa->szTypeName, sizeof (pa->szTypeName)); 1418 memcpy (pw->szTypeName, pa->szTypeName, sizeof (pa->szTypeName));
1425 } 1419 }
1435 { 1429 {
1436 SHFILEINFOA ansidat; 1430 SHFILEINFOA ansidat;
1437 BOOL retval; 1431 BOOL retval;
1438 1432
1439 retval = SHGetFileInfoA ((LPCSTR) pszPath, dwFileAttributes, 1433 retval = SHGetFileInfoA ((LPCSTR) pszPath, dwFileAttributes,
1440 (SHFILEINFOA FAR *) &ansidat, sizeof (ansidat), 1434 (SHFILEINFOA FAR *) &ansidat,
1441 uFlags); 1435 cbFileInfo ? sizeof (ansidat) : 0, uFlags);
1442 if (retval) 1436 if (retval && cbFileInfo)
1443 copy_shfileinfoa_to_shfileinfow (&ansidat, psfi); 1437 copy_shfileinfoa_to_shfileinfow (&ansidat, psfi, cbFileInfo);
1444 return retval; 1438 return retval;
1445 } 1439 }
1446 } 1440 }
1447 1441
1448 struct intercepted_SHBrowseForFolder 1442 struct intercepted_SHBrowseForFolder