drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* cygpath.cc (dowin): Revert accidental checkin from November.

This commit is contained in:
Corinna Vinschen 2004-01-22 09:21:56 +00:00
parent 7d4be1efd5
commit 30352c261c
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/utils/ChangeLog
View File

@ -1,3 +1,7 @@
2004-01-22 Corinna Vinschen <corinna@vinschen.de>
* cygpath.cc (dowin): Revert accidental checkin from November.
2003-11-26 Corinna Vinschen <corinna@vinschen.de> 2003-11-26 Corinna Vinschen <corinna@vinschen.de>
* mkgroup.c (main): Print "root" group with local admins group sid * mkgroup.c (main): Print "root" group with local admins group sid

27
winsup/utils/cygpath.cc
View File

@ -9,8 +9,6 @@ details. */
#define NOCOMATTRIBUTE #define NOCOMATTRIBUTE
#define _WIN32_IE 0x0400
#include <shlobj.h> #include <shlobj.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -332,6 +330,7 @@ dowin (char option)
char *buf, buf1[MAX_PATH], buf2[MAX_PATH]; char *buf, buf1[MAX_PATH], buf2[MAX_PATH];
DWORD len = MAX_PATH; DWORD len = MAX_PATH;
WIN32_FIND_DATA w32_fd; WIN32_FIND_DATA w32_fd;
LPITEMIDLIST id;
HINSTANCE k32; HINSTANCE k32;
BOOL (*GetProfilesDirectoryAPtr) (LPSTR, LPDWORD) = 0; BOOL (*GetProfilesDirectoryAPtr) (LPSTR, LPDWORD) = 0;
@ -339,15 +338,27 @@ dowin (char option)
switch (option) switch (option)
{ {
case 'D': case 'D':
if (!SHGetSpecialFolderPath (NULL, buf, allusers_flag ? SHGetSpecialFolderLocation (NULL, allusers_flag ?
CSIDL_COMMON_DESKTOPDIRECTORY : CSIDL_DESKTOPDIRECTORY, FALSE)) CSIDL_COMMON_DESKTOPDIRECTORY : CSIDL_DESKTOPDIRECTORY, &id);
SHGetSpecialFolderPath (NULL, buf, CSIDL_DESKTOPDIRECTORY, FALSE); SHGetPathFromIDList (id, buf);
/* This if clause is a Fix for Win95 without any "All Users" */
if (strlen (buf) == 0)
{
SHGetSpecialFolderLocation (NULL, CSIDL_DESKTOPDIRECTORY, &id);
SHGetPathFromIDList (id, buf);
}
break; break;
case 'P': case 'P':
if (!SHGetSpecialFolderPath (NULL, buf, allusers_flag ? SHGetSpecialFolderLocation (NULL, allusers_flag ?
CSIDL_COMMON_PROGRAMS : CSIDL_PROGRAMS, FALSE)) CSIDL_COMMON_PROGRAMS : CSIDL_PROGRAMS, &id);
SHGetSpecialFolderPath (NULL, buf, CSIDL_PROGRAMS, FALSE); SHGetPathFromIDList (id, buf);
/* This if clause is a Fix for Win95 without any "All Users" */
if (strlen (buf) == 0)
{
SHGetSpecialFolderLocation (NULL, CSIDL_PROGRAMS, &id);
SHGetPathFromIDList (id, buf);
}
break; break;
case 'H': case 'H':