comparison src/w32proc.c @ 40656:cdfd4d09b79a

Update usage of CHECK_ macros (remove unused second argument).
author Pavel Janík <Pavel@Janik.cz>
date Fri, 02 Nov 2001 20:46:55 +0000
parents 66e0816837a8
children 8b5deb3bca03
comparison
equal deleted inserted replaced
40655:45453187feeb 40656:cdfd4d09b79a
1710 (filename) 1710 (filename)
1711 Lisp_Object filename; 1711 Lisp_Object filename;
1712 { 1712 {
1713 char shortname[MAX_PATH]; 1713 char shortname[MAX_PATH];
1714 1714
1715 CHECK_STRING (filename, 0); 1715 CHECK_STRING (filename);
1716 1716
1717 /* first expand it. */ 1717 /* first expand it. */
1718 filename = Fexpand_file_name (filename, Qnil); 1718 filename = Fexpand_file_name (filename, Qnil);
1719 1719
1720 /* luckily, this returns the short version of each element in the path. */ 1720 /* luckily, this returns the short version of each element in the path. */
1735 (filename) 1735 (filename)
1736 Lisp_Object filename; 1736 Lisp_Object filename;
1737 { 1737 {
1738 char longname[ MAX_PATH ]; 1738 char longname[ MAX_PATH ];
1739 1739
1740 CHECK_STRING (filename, 0); 1740 CHECK_STRING (filename);
1741 1741
1742 /* first expand it. */ 1742 /* first expand it. */
1743 filename = Fexpand_file_name (filename, Qnil); 1743 filename = Fexpand_file_name (filename, Qnil);
1744 1744
1745 if (!w32_get_long_filename (XSTRING (filename)->data, longname, MAX_PATH)) 1745 if (!w32_get_long_filename (XSTRING (filename)->data, longname, MAX_PATH))
1764 { 1764 {
1765 HANDLE proc_handle = GetCurrentProcess (); 1765 HANDLE proc_handle = GetCurrentProcess ();
1766 DWORD priority_class = NORMAL_PRIORITY_CLASS; 1766 DWORD priority_class = NORMAL_PRIORITY_CLASS;
1767 Lisp_Object result = Qnil; 1767 Lisp_Object result = Qnil;
1768 1768
1769 CHECK_SYMBOL (priority, 0); 1769 CHECK_SYMBOL (priority);
1770 1770
1771 if (!NILP (process)) 1771 if (!NILP (process))
1772 { 1772 {
1773 DWORD pid; 1773 DWORD pid;
1774 child_process *cp; 1774 child_process *cp;
1775 1775
1776 CHECK_NUMBER (process, 0); 1776 CHECK_NUMBER (process);
1777 1777
1778 /* Allow pid to be an internally generated one, or one obtained 1778 /* Allow pid to be an internally generated one, or one obtained
1779 externally. This is necessary because real pids on Win95 are 1779 externally. This is necessary because real pids on Win95 are
1780 negative. */ 1780 negative. */
1781 1781
1823 int got_abbrev; 1823 int got_abbrev;
1824 int got_full; 1824 int got_full;
1825 char abbrev_name[32] = { 0 }; 1825 char abbrev_name[32] = { 0 };
1826 char full_name[256] = { 0 }; 1826 char full_name[256] = { 0 };
1827 1827
1828 CHECK_NUMBER (lcid, 0); 1828 CHECK_NUMBER (lcid);
1829 1829
1830 if (!IsValidLocale (XINT (lcid), LCID_SUPPORTED)) 1830 if (!IsValidLocale (XINT (lcid), LCID_SUPPORTED))
1831 return Qnil; 1831 return Qnil;
1832 1832
1833 if (NILP (longform)) 1833 if (NILP (longform))
1930 "Make Windows locale LCID be the current locale setting for Emacs.\n\ 1930 "Make Windows locale LCID be the current locale setting for Emacs.\n\
1931 If successful, the new locale id is returned, otherwise nil.") 1931 If successful, the new locale id is returned, otherwise nil.")
1932 (lcid) 1932 (lcid)
1933 Lisp_Object lcid; 1933 Lisp_Object lcid;
1934 { 1934 {
1935 CHECK_NUMBER (lcid, 0); 1935 CHECK_NUMBER (lcid);
1936 1936
1937 if (!IsValidLocale (XINT (lcid), LCID_SUPPORTED)) 1937 if (!IsValidLocale (XINT (lcid), LCID_SUPPORTED))
1938 return Qnil; 1938 return Qnil;
1939 1939
1940 if (!SetThreadLocale (XINT (lcid))) 1940 if (!SetThreadLocale (XINT (lcid)))
1986 The codepage setting affects keyboard input and display in tty mode.\n\ 1986 The codepage setting affects keyboard input and display in tty mode.\n\
1987 If successful, the new CP is returned, otherwise nil.") 1987 If successful, the new CP is returned, otherwise nil.")
1988 (cp) 1988 (cp)
1989 Lisp_Object cp; 1989 Lisp_Object cp;
1990 { 1990 {
1991 CHECK_NUMBER (cp, 0); 1991 CHECK_NUMBER (cp);
1992 1992
1993 if (!IsValidCodePage (XINT (cp))) 1993 if (!IsValidCodePage (XINT (cp)))
1994 return Qnil; 1994 return Qnil;
1995 1995
1996 if (!SetConsoleCP (XINT (cp))) 1996 if (!SetConsoleCP (XINT (cp)))
2013 The codepage setting affects keyboard input and display in tty mode.\n\ 2013 The codepage setting affects keyboard input and display in tty mode.\n\
2014 If successful, the new CP is returned, otherwise nil.") 2014 If successful, the new CP is returned, otherwise nil.")
2015 (cp) 2015 (cp)
2016 Lisp_Object cp; 2016 Lisp_Object cp;
2017 { 2017 {
2018 CHECK_NUMBER (cp, 0); 2018 CHECK_NUMBER (cp);
2019 2019
2020 if (!IsValidCodePage (XINT (cp))) 2020 if (!IsValidCodePage (XINT (cp)))
2021 return Qnil; 2021 return Qnil;
2022 2022
2023 if (!SetConsoleOutputCP (XINT (cp))) 2023 if (!SetConsoleOutputCP (XINT (cp)))
2033 (cp) 2033 (cp)
2034 Lisp_Object cp; 2034 Lisp_Object cp;
2035 { 2035 {
2036 CHARSETINFO info; 2036 CHARSETINFO info;
2037 2037
2038 CHECK_NUMBER (cp, 0); 2038 CHECK_NUMBER (cp);
2039 2039
2040 if (!IsValidCodePage (XINT (cp))) 2040 if (!IsValidCodePage (XINT (cp)))
2041 return Qnil; 2041 return Qnil;
2042 2042
2043 if (TranslateCharsetInfo ((DWORD *) XINT (cp), &info, TCI_SRCCODEPAGE)) 2043 if (TranslateCharsetInfo ((DWORD *) XINT (cp), &info, TCI_SRCCODEPAGE))
2091 (layout) 2091 (layout)
2092 Lisp_Object layout; 2092 Lisp_Object layout;
2093 { 2093 {
2094 DWORD kl; 2094 DWORD kl;
2095 2095
2096 CHECK_CONS (layout, 0); 2096 CHECK_CONS (layout);
2097 CHECK_NUMBER (XCAR (layout), 0); 2097 CHECK_NUMBER (XCAR (layout));
2098 CHECK_NUMBER (XCDR (layout), 0); 2098 CHECK_NUMBER (XCDR (layout));
2099 2099
2100 kl = (XINT (XCAR (layout)) & 0xffff) 2100 kl = (XINT (XCAR (layout)) & 0xffff)
2101 | (XINT (XCDR (layout)) << 16); 2101 | (XINT (XCDR (layout)) << 16);
2102 2102
2103 /* Synchronize layout with input thread. */ 2103 /* Synchronize layout with input thread. */