Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 21:45:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge in Winehq commits.

Browse source 
svn path=/trunk/; revision=9952
This commit is contained in:
Steven Edwards 2004-06-30 20:42:18 +00:00
parent 8eb23c9e6c
commit 6cfb2b5848
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
reactos/lib/shell32/brsfolder.c
View file

@ -391,7 +391,8 @@ static INT_PTR CALLBACK BrsFolderDlgProc(HWND hWnd, UINT msg, WPARAM wParam,
switch (wParam) switch (wParam)
{ case IDOK: { case IDOK:
pdump ( pidlRet ); pdump ( pidlRet );
SHGetPathFromIDListW(pidlRet, lpBrowseInfo->pszDisplayName); if (lpBrowseInfo->pszDisplayName)
SHGetPathFromIDListW(pidlRet, lpBrowseInfo->pszDisplayName);
EndDialog(hWnd, (DWORD) ILClone(pidlRet)); EndDialog(hWnd, (DWORD) ILClone(pidlRet));
return TRUE; return TRUE;
@ -438,7 +439,7 @@ static INT_PTR CALLBACK BrsFolderDlgProc(HWND hWnd, UINT msg, WPARAM wParam,
return FALSE; return FALSE;
} }
static WCHAR swBrowseTempName[] = {'S','H','B','R','S','F','O','R','F','O','L','D','E','R','_','M','S','G','B','O','X',0}; static const WCHAR swBrowseTempName[] = {'S','H','B','R','S','F','O','R','F','O','L','D','E','R','_','M','S','G','B','O','X',0};
/************************************************************************* /*************************************************************************
* SHBrowseForFolderA [SHELL32.@] * SHBrowseForFolderA [SHELL32.@]
@ -460,9 +461,9 @@ LPITEMIDLIST WINAPI SHBrowseForFolderA (LPBROWSEINFOA lpbi)
bi.pidlRoot = lpbi->pidlRoot; bi.pidlRoot = lpbi->pidlRoot;
if (lpbi->pszDisplayName) if (lpbi->pszDisplayName)
{ {
len = MultiByteToWideChar(CP_ACP, 0, lpbi->pszDisplayName, -1, NULL, 0); /*lpbi->pszDisplayName is assumed to be MAX_PATH (MSDN) */
bi.pszDisplayName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); bi.pszDisplayName = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, lpbi->pszDisplayName, -1, bi.pszDisplayName, len); MultiByteToWideChar(CP_ACP, 0, lpbi->pszDisplayName, -1, bi.pszDisplayName, MAX_PATH);
} }
else else
bi.pszDisplayName = NULL; bi.pszDisplayName = NULL;

17
reactos/lib/shell32/shlfileop.c
View file

@ -53,9 +53,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
#define FO_MASK 0xF #define FO_MASK 0xF
CHAR aWildcardFile[] = {'*','.','*',0}; CHAR aWildcardFile[] = {'*','.','*',0};
WCHAR wWildcardFile[] = {'*','.','*',0}; static const WCHAR wWildcardFile[] = {'*','.','*',0};
WCHAR wWildcardChars[] = {'*','?',0}; static const WCHAR wWildcardChars[] = {'*','?',0};
WCHAR wBackslash[] = {'\\',0}; static const WCHAR wBackslash[] = {'\\',0};
static DWORD SHNotifyCreateDirectoryA(LPCSTR path, LPSECURITY_ATTRIBUTES sec); static DWORD SHNotifyCreateDirectoryA(LPCSTR path, LPSECURITY_ATTRIBUTES sec);
static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec); static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec);
@ -1310,3 +1310,14 @@ BOOL WINAPI IsNetDrive(DWORD drive)
root[0] += (char)drive; root[0] += (char)drive;
return (GetDriveTypeA(root) == DRIVE_REMOTE); return (GetDriveTypeA(root) == DRIVE_REMOTE);
} }
/*************************************************************************
* RealDriveType [SHELL32.524]
*/
INT WINAPI RealDriveType(INT drive, BOOL bQueryNet)
{
char root[] = "A:\\";
root[0] += (char)drive;
return GetDriveTypeA(root);
}