xemacs-beta: src/nt.c comparison

comparison src/nt.c @ 4990:8f0cf4fd3d2c

Automatic merge

author	Ben Wing <ben@xemacs.org>
date	Sat, 06 Feb 2010 04:01:46 -0600
parents	3c3c1d139863
children	44d7bde26046

comparison

equal deleted inserted replaced

-:d2ec55325515
+:8f0cf4fd3d2c
 && GetTokenInformation (token, TokenUser, &sidinfo, sizeof (sidinfo),
 			      &trash)
 && qxeLookupAccountSid (NULL, sidinfo.User.Sid, name, &length,
 			      domain, &dlength, &user_type))
 {
-TSTR_TO_C_STRING_MALLOC (name, the_passwd.pw_name);
+the_passwd.pw_name = TSTR_TO_ITEXT_MALLOC (name);
 /* Determine a reasonable uid value. */
 if (qxestrcasecmp ("administrator", the_passwd.pw_name) == 0)
 	{
 	  the_passwd.pw_uid = 0;
 	  the_passwd.pw_gid = 0;
 }
 /* If security calls are not supported (presumably because we
 are running under Windows 95), fallback to this. */
 else if (qxeGetUserName (name, &length))
 {
-TSTR_TO_C_STRING_MALLOC (name, the_passwd.pw_name);
+the_passwd.pw_name = TSTR_TO_ITEXT_MALLOC (name);
 if (qxestrcasecmp ("administrator", the_passwd.pw_name) == 0)
 	the_passwd.pw_uid = 0;
 else
 	the_passwd.pw_uid = 123;
 the_passwd.pw_gid = the_passwd.pw_uid;
 #else
 /* Obtain only logon id here, uid part is moved to getuid */
 DWORD length = UNLEN + 1;
 Extbyte name[MAX_XETCHAR_SIZE * (UNLEN + 1)];
 if (qxeGetUserName (name, &length))
-TSTR_TO_C_STRING_MALLOC (name, the_passwd.pw_name);
+the_passwd.pw_name = TSTR_TO_ITEXT_MALLOC (name);
 else
 the_passwd.pw_name = "unknown";
 #endif
 #if 0
 dir_handle = qxeFindFirstFile (nameext, &find_data);
 if (dir_handle != INVALID_HANDLE_VALUE)
 {
 Ibyte *fileint;
-TSTR_TO_C_STRING_MALLOC (find_data.cFileName, fileint);
+fileint = TSTR_TO_ITEXT_MALLOC (find_data.cFileName);
 FindClose (dir_handle);
 return fileint;
 }
 return 0;
 }
 	  if (p != NULL)
 	    {
 	      *p++ = '\\';
 	      eicat_ch (o, '\\');
 	    }
-	  xfree (component, Ibyte *);
+	  xfree (component);
 	}
 else
 	{
-	  xfree (full, Ibyte *);
+	  xfree (full);
 	  return 0;
 	}
 }
-xfree (full, Ibyte *);
+xfree (full);
 return eicpyout_malloc (o, 0);
 }
 static int
 is_unc_volume (const Ibyte *filename)
 LPBYTE lpvalue;
 HKEY hrootkey = NULL;
 DWORD cbData;
 Extbyte *keyext;
-C_STRING_TO_TSTR (key, keyext);
+keyext = ITEXT_TO_TSTR (key);
 /* Check both the current user and the local machine to see if
 we have any resources.  */
 if (qxeRegOpenKeyEx (HKEY_CURRENT_USER, XETEXT (REG_ROOT), 0, KEY_READ,
 	  && qxeRegQueryValueEx (hrootkey, keyext, NULL, lpdwtype, lpvalue,
 			      &cbData) == ERROR_SUCCESS)
 	return (lpvalue);
 if (lpvalue)
-	xfree (lpvalue, LPBYTE);
+	xfree (lpvalue);
 RegCloseKey (hrootkey);
 }
 if (qxeRegOpenKeyEx (HKEY_LOCAL_MACHINE, XETEXT (REG_ROOT), 0, KEY_READ,
 	  qxeRegQueryValueEx (hrootkey, keyext, NULL, lpdwtype, lpvalue,
 			      &cbData) == ERROR_SUCCESS)
 	return (lpvalue);
 if (lpvalue)
-	xfree (lpvalue, LPBYTE);
+	xfree (lpvalue);
 RegCloseKey (hrootkey);
 }
 return (NULL);
 		Charcount cch;
 		cch = qxeExpandEnvironmentStrings ((Extbyte *) lpval, buf, 0);
 		buf = alloca_extbytes (cch * XETCHAR_SIZE);
 		qxeExpandEnvironmentStrings ((Extbyte *) lpval, buf, cch);
-		TSTR_TO_C_STRING (buf, envval);
+		envval = TSTR_TO_ITEXT (buf);
 		eputenv (env_vars[i], (CIbyte *) envval);
 	      }
 	    else if (dwType == REG_SZ)
 	      {
 		Ibyte *envval;
-		TSTR_TO_C_STRING (lpval, envval);
+		envval = TSTR_TO_ITEXT (lpval);
 		eputenv (env_vars[i], (CIbyte *) envval);
 	      }
-	    xfree (lpval, LPBYTE);
+	    xfree (lpval);
 	  }
 }
 }
 /* Another special case: on NT, the PATH variable is actually named
 if (!nchars)
 	return NULL;
 rootext = alloca_extbytes (nchars * XETCHAR_SIZE);
 if (!qxeGetCurrentDirectory (nchars, rootext))
 	return NULL;
-TSTR_TO_C_STRING (rootext, default_root);
+default_root = TSTR_TO_ITEXT (rootext);
 parse_root (default_root, &root_dir);
 *root_dir = 0;
 root_dir = default_root;
 }
 	  info = xnew (volume_info_data);
 	  add_volume_info (root_dir, info);
 	}
 else
 	{
-	  xfree (info->name, Ibyte *);
+	  xfree (info->name);
-	  xfree (info->type, Ibyte *);
+	  xfree (info->type);
 	}
-TSTR_TO_C_STRING_MALLOC (name, info->name);
+info->name = TSTR_TO_ITEXT_MALLOC (name);
 info->serialnum = serialnum;
 info->maxcomp = maxcomp;
 info->flags = flags;
-TSTR_TO_C_STRING_MALLOC (type, info->type);
+info->type = TSTR_TO_ITEXT_MALLOC (type);
 info->timestamp = GetTickCount ();
 }
 return info;
 }
 if (!(dirp = xnew_and_zero (DIR)))
 return NULL;
 if (dir_pathname)
-xfree (dir_pathname, Ibyte *);
+xfree (dir_pathname);
 dir_pathname = qxestrdup (filename);
 return dirp;
 }
 else if (wnet_enum_handle != INVALID_HANDLE_VALUE)
 {
 retval = close_unc_volume (wnet_enum_handle);
 wnet_enum_handle = INVALID_HANDLE_VALUE;
 }
-xfree (dirp, DIR *);
+xfree (dirp);
 return retval;
 }
 struct direct *
 dir_find_handle = qxeFindFirstFile (fileext, &dir_find_data);
 if (dir_find_handle == INVALID_HANDLE_VALUE)
 	return NULL;
-TSTR_TO_C_STRING (dir_find_data.cFileName, val);
+val = TSTR_TO_ITEXT (dir_find_data.cFileName);
 }
 else
 {
 if (!qxeFindNextFile (dir_find_handle, &dir_find_data))
 	return NULL;
-TSTR_TO_C_STRING (dir_find_data.cFileName, val);
+val = TSTR_TO_ITEXT (dir_find_data.cFileName);
 }
 /* XEmacs never uses this value, so don't bother making it match
 value returned by qxe_stat().  */
 dir_static.d_ino = 1;
 	      eicat_ch (linkname, '\\');
 	    eicat_rawz (linkname, val);
 	    resolved = mswindows_read_link (eidata (linkname));
 	    if (resolved)
 	      {
-		xfree (resolved, Ibyte *);
+		xfree (resolved);
 		len -= 4;
 		val[len] = '\0';
 	      }
 	  }
 }
 eicpy_rawz (found, val);
 if (need_to_free)
-xfree (val, Ibyte *);
+xfree (val);
 if (!NILP (Vmswindows_downcase_file_names))
 eilwr (found);
 namlen = min (eilen (found), sizeof (dir_static.d_name) - 1);
 result = qxeWNetEnumResource (wnet_enum_handle, &count, buf, &bufsize);
 if (result != NO_ERROR)
 return NULL;
 /* WNetEnumResource returns \\resource\share...skip forward to "share". */
-TSTR_TO_C_STRING (((LPNETRESOURCEW) buf)->lpRemoteName, ptr);
+ptr = TSTR_TO_ITEXT (((LPNETRESOURCEW) buf)->lpRemoteName);
 INC_IBYTEPTR (ptr);
 INC_IBYTEPTR (ptr);
 while (*ptr && !IS_DIRECTORY_SEP (itext_ichar (ptr)))
 INC_IBYTEPTR (ptr);
 INC_IBYTEPTR (ptr);
 {
 if (!IS_DIRECTORY_SEP (name[len-1]))
 	qxestrcat (name, (Ibyte *) "\\");
 /* File has already been resolved and we don't want to do it again
 	 in case of lstat() */
-C_STRING_TO_TSTR (name, nameext);
+nameext = ITEXT_TO_TSTR (name);
 if (qxeGetDriveType (nameext) < 2)
 	{
 	  SetErrorMode (errm);
 	  errno = ENOENT;
 	  return -1;
 	  /* This was the last entry returned by readdir.  */
 	  wfd = dir_find_data;
 	}
 else
 	{
-	  C_STRING_TO_TSTR (name, nameext);
+	  nameext = ITEXT_TO_TSTR (name);
 	  fh = qxeFindFirstFile (nameext, &wfd);
 	  if (fh == INVALID_HANDLE_VALUE)
 	    {
 	      SetErrorMode (errm);
 	      errno = ENOENT;
 else
 {
 if (!NILP (Vmswindows_get_true_file_attributes))
 	/* File has already been resolved and we don't want to do it again
 	   in case of lstat() */
-	C_STRING_TO_TSTR (name, nameext);
+	nameext = ITEXT_TO_TSTR (name);
 if (!NILP (Vmswindows_get_true_file_attributes)
 	  /* No access rights required to get info.  */
 	  && (fh = qxeCreateFile (nameext, 0, 0, NULL, OPEN_EXISTING, 0, NULL))
 	  != INVALID_HANDLE_VALUE)
 	{
 	    {
 	      /* check if link is valid */
 	      Ibyte *resolved = mswindows_read_link (name);
 	      if (resolved)
 		{
-		  xfree (resolved, Ibyte *);
+		  xfree (resolved);
 		  buf->st_mode = S_IFLNK;
 		}
 	    }
 	}
 }
 if (XEUNICODE_P)
 cwdext = (Extbyte *) _wgetdcwd (drivelet, NULL, 0);
 else
 cwdext = _getdcwd (drivelet, NULL, 0);
 if (cwdext == NULL) return NULL;
-TSTR_TO_C_STRING_MALLOC (cwdext, cwd);
+cwd = TSTR_TO_ITEXT_MALLOC (cwdext);
-xfree (cwdext, Extbyte *);
+xfree (cwdext);
 return cwd;
 }
 /*--------------------------------------------------------------------*/
 	    {
 	      Extbyte *dllname_ext =
 		(Extbyte *) RVA_TO_PTR (imports->Name, section, executable);
 	      Ibyte *dllname;
-	      EXTERNAL_TO_C_STRING (dllname_ext, dllname, Qbinary);
+	      dllname = EXTERNAL_TO_ITEXT (dllname_ext, Qbinary);
 	      /* The exact name of the cygwin dll has changed with
 		 various releases, but hopefully this will be reasonably
 		 future proof.  */
 	      if (qxestrncasecmp (dllname, (Ibyte *) "cygwin", 6) == 0)
 /* luckily, this returns the short version of each element in the path.  */
 if (qxeGetShortPathName (fileext, shortname,
 			   sizeof (shortname) / XETCHAR_SIZE) == 0)
 return Qnil;
-TSTR_TO_C_STRING (shortname, shortint);
+shortint = TSTR_TO_ITEXT (shortname);
 MSWINDOWS_NORMALIZE_FILENAME (shortint);
-return build_intstring (shortint);
+return build_istring (shortint);
 }
 DEFUN ("mswindows-long-file-name", Fmswindows_long_file_name, 1, 1, 0, /*
 Return the long file name version of the full path of FILENAME.
 if (!(longname = mswindows_get_long_filename (XSTRING_DATA (filename))))
 return Qnil;
 canon = mswindows_canonicalize_filename (longname);
-ret = build_intstring (canon);
+ret = build_istring (canon);
-xfree (canon, Ibyte *);
+xfree (canon);
-xfree (longname, Ibyte *);
+xfree (longname);
 return ret;
 }
 void

Mercurial > hg > xemacs-beta

comparison src/nt.c @ 4990:8f0cf4fd3d2c