Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
67970288
Commit
67970288
authored
Jun 28, 2005
by
Michael Jung
Committed by
Alexandre Julliard
Jun 28, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't expand MyComputer in the file dialogs without user interaction,
if unixfs is rooted at desktop.
parent
88812843
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
13 deletions
+40
-13
Makefile.in
dlls/commdlg/Makefile.in
+1
-1
filedlg.c
dlls/commdlg/filedlg.c
+39
-12
No files found.
dlls/commdlg/Makefile.in
View file @
67970288
...
@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
...
@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH
=
@srcdir@
VPATH
=
@srcdir@
MODULE
=
comdlg32.dll
MODULE
=
comdlg32.dll
IMPORTLIB
=
libcomdlg32.
$(IMPLIBEXT)
IMPORTLIB
=
libcomdlg32.
$(IMPLIBEXT)
IMPORTS
=
shell32 shlwapi comctl32 winspool user32 gdi32 kernel32 ntdll
IMPORTS
=
shell32 shlwapi comctl32 winspool user32 gdi32
advapi32
kernel32 ntdll
EXTRALIBS
=
-luuid
EXTRALIBS
=
-luuid
C_SRCS
=
\
C_SRCS
=
\
...
...
dlls/commdlg/filedlg.c
View file @
67970288
...
@@ -67,6 +67,7 @@
...
@@ -67,6 +67,7 @@
#include "wine/unicode.h"
#include "wine/unicode.h"
#include "wingdi.h"
#include "wingdi.h"
#include "winuser.h"
#include "winuser.h"
#include "winreg.h"
#include "commdlg.h"
#include "commdlg.h"
#include "dlgs.h"
#include "dlgs.h"
#include "cdlg.h"
#include "cdlg.h"
...
@@ -2486,6 +2487,27 @@ static void FILEDLG95_FILETYPE_Clean(HWND hwnd)
...
@@ -2486,6 +2487,27 @@ static void FILEDLG95_FILETYPE_Clean(HWND hwnd)
*
*
* Initialisation of the look in combo box
* Initialisation of the look in combo box
*/
*/
/* Small helper function, to determine if the unixfs shell extension is rooted
* at the desktop. Copied from dlls/shell32/shfldr_unixfs.c.
*/
static
inline
BOOL
FILEDLG95_unixfs_is_rooted_at_desktop
(
void
)
{
HKEY
hKey
;
const
static
WCHAR
wszRootedAtDesktop
[]
=
{
'S'
,
'o'
,
'f'
,
't'
,
'w'
,
'a'
,
'r'
,
'e'
,
'\\'
,
'M'
,
'i'
,
'c'
,
'r'
,
'o'
,
's'
,
'o'
,
'f'
,
't'
,
'\\'
,
'W'
,
'i'
,
'n'
,
'd'
,
'o'
,
'w'
,
's'
,
'\\'
,
'C'
,
'u'
,
'r'
,
'r'
,
'e'
,
'n'
,
't'
,
'V'
,
'e'
,
'r'
,
's'
,
'i'
,
'o'
,
'n'
,
'\\'
,
'E'
,
'x'
,
'p'
,
'l'
,
'o'
,
'r'
,
'e'
,
'r'
,
'\\'
,
'D'
,
'e'
,
's'
,
'k'
,
't'
,
'o'
,
'p'
,
'\\'
,
'N'
,
'a'
,
'm'
,
'e'
,
'S'
,
'p'
,
'a'
,
'c'
,
'e'
,
'\\'
,
'{'
,
'9'
,
'D'
,
'2'
,
'0'
,
'A'
,
'A'
,
'E'
,
'8'
,
'-'
,
'0'
,
'6'
,
'2'
,
'5'
,
'-'
,
'4'
,
'4'
,
'B'
,
'0'
,
'-'
,
'9'
,
'C'
,
'A'
,
'7'
,
'-'
,
'7'
,
'1'
,
'8'
,
'8'
,
'9'
,
'C'
,
'2'
,
'2'
,
'5'
,
'4'
,
'D'
,
'9'
,
'}'
,
0
};
if
(
RegOpenKeyExW
(
HKEY_LOCAL_MACHINE
,
wszRootedAtDesktop
,
0
,
KEY_READ
,
&
hKey
)
!=
ERROR_SUCCESS
)
return
FALSE
;
RegCloseKey
(
hKey
);
return
TRUE
;
}
static
void
FILEDLG95_LOOKIN_Init
(
HWND
hwndCombo
)
static
void
FILEDLG95_LOOKIN_Init
(
HWND
hwndCombo
)
{
{
IShellFolder
*
psfRoot
,
*
psfDrives
;
IShellFolder
*
psfRoot
,
*
psfDrives
;
...
@@ -2525,26 +2547,31 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo)
...
@@ -2525,26 +2547,31 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo)
{
{
FILEDLG95_LOOKIN_AddItem
(
hwndCombo
,
pidlTmp
,
LISTEND
);
FILEDLG95_LOOKIN_AddItem
(
hwndCombo
,
pidlTmp
,
LISTEND
);
/*
special handling for CSIDL_DRIVES
*/
/*
If the unixfs extension is rooted, we don't expand the drives by default
*/
if
(
COMDLG32_PIDL_ILIsEqual
(
pidlTmp
,
pidlDrives
))
if
(
!
FILEDLG95_unixfs_is_rooted_at_desktop
())
{
{
if
(
SUCCEEDED
(
IShellFolder_BindToObject
(
psfRoot
,
pidlTmp
,
NULL
,
&
IID_IShellFolder
,
(
LPVOID
*
)
&
psfDrives
)))
/* special handling for CSIDL_DRIVES */
if
(
COMDLG32_PIDL_ILIsEqual
(
pidlTmp
,
pidlDrives
))
{
{
/* enumerate the drives */
if
(
SUCCEEDED
(
IShellFolder_BindToObject
(
psfRoot
,
pidlTmp
,
NULL
,
&
IID_IShellFolder
,
(
LPVOID
*
)
&
psfDrives
)))
if
(
SUCCEEDED
(
IShellFolder_EnumObjects
(
psfDrives
,
hwndCombo
,
SHCONTF_FOLDERS
,
&
lpeDrives
)))
{
{
while
(
S_OK
==
IEnumIDList_Next
(
lpeDrives
,
1
,
&
pidlTmp1
,
NULL
))
/* enumerate the drives */
if
(
SUCCEEDED
(
IShellFolder_EnumObjects
(
psfDrives
,
hwndCombo
,
SHCONTF_FOLDERS
,
&
lpeDrives
)))
{
{
pidlAbsTmp
=
COMDLG32_PIDL_ILCombine
(
pidlTmp
,
pidlTmp1
);
while
(
S_OK
==
IEnumIDList_Next
(
lpeDrives
,
1
,
&
pidlTmp1
,
NULL
))
FILEDLG95_LOOKIN_AddItem
(
hwndCombo
,
pidlAbsTmp
,
LISTEND
);
{
COMDLG32_SHFree
(
pidlAbsTmp
);
pidlAbsTmp
=
COMDLG32_PIDL_ILCombine
(
pidlTmp
,
pidlTmp1
);
COMDLG32_SHFree
(
pidlTmp1
);
FILEDLG95_LOOKIN_AddItem
(
hwndCombo
,
pidlAbsTmp
,
LISTEND
);
COMDLG32_SHFree
(
pidlAbsTmp
);
COMDLG32_SHFree
(
pidlTmp1
);
}
IEnumIDList_Release
(
lpeDrives
);
}
}
I
EnumIDList_Release
(
lpe
Drives
);
I
ShellFolder_Release
(
psf
Drives
);
}
}
IShellFolder_Release
(
psfDrives
);
}
}
}
}
COMDLG32_SHFree
(
pidlTmp
);
COMDLG32_SHFree
(
pidlTmp
);
}
}
IEnumIDList_Release
(
lpeRoot
);
IEnumIDList_Release
(
lpeRoot
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment