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
d3a034e3
Commit
d3a034e3
authored
Jun 14, 2014
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jun 16, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Release cached desktop folder on process detach.
parent
1f92df77
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
+12
-2
shell32_main.c
dlls/shell32/shell32_main.c
+1
-0
shell32_main.h
dlls/shell32/shell32_main.h
+1
-0
shfldr_desktop.c
dlls/shell32/shfldr_desktop.c
+10
-2
No files found.
dlls/shell32/shell32_main.c
View file @
d3a034e3
...
...
@@ -1281,6 +1281,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
if
(
fImpLoad
)
break
;
SIC_Destroy
();
FreeChangeNotifications
();
release_desktop_folder
();
release_typelib
();
break
;
}
...
...
dlls/shell32/shell32_main.h
View file @
d3a034e3
...
...
@@ -230,5 +230,6 @@ BOOL AddToEnumList(IEnumIDListImpl *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN;
BOOL
CreateFolderEnumList
(
IEnumIDListImpl
*
list
,
LPCWSTR
lpszPath
,
DWORD
dwFlags
)
DECLSPEC_HIDDEN
;
void
release_typelib
(
void
)
DECLSPEC_HIDDEN
;
void
release_desktop_folder
(
void
)
DECLSPEC_HIDDEN
;
#endif
dlls/shell32/shfldr_desktop.c
View file @
d3a034e3
...
...
@@ -57,7 +57,6 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
/* Undocumented functions from shdocvw */
extern
HRESULT
WINAPI
IEParseDisplayNameWithBCW
(
DWORD
codepage
,
LPCWSTR
lpszDisplayName
,
LPBC
pbc
,
LPITEMIDLIST
*
ppidl
);
/***********************************************************************
* Desktopfolder implementation
*/
...
...
@@ -75,6 +74,8 @@ typedef struct {
BOOL
fAcceptFmt
;
/* flag for pending Drop */
}
IDesktopFolderImpl
;
static
IDesktopFolderImpl
*
cached_sf
;
static
inline
IDesktopFolderImpl
*
impl_from_IShellFolder2
(
IShellFolder2
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
IDesktopFolderImpl
,
IShellFolder2_iface
);
...
...
@@ -934,13 +935,20 @@ static const IPersistFolder2Vtbl vt_IPersistFolder2 =
ISF_Desktop_IPersistFolder2_fnGetCurFolder
};
void
release_desktop_folder
(
void
)
{
if
(
!
cached_sf
)
return
;
SHFree
(
cached_sf
->
pidlRoot
);
SHFree
(
cached_sf
->
sPathTarget
);
LocalFree
(
cached_sf
);
}
/**************************************************************************
* ISF_Desktop_Constructor
*/
HRESULT
WINAPI
ISF_Desktop_Constructor
(
IUnknown
*
pUnkOuter
,
REFIID
riid
,
LPVOID
*
ppv
)
{
static
IDesktopFolderImpl
*
cached_sf
;
WCHAR
szMyPath
[
MAX_PATH
];
TRACE
(
"unkOut=%p %s
\n
"
,
pUnkOuter
,
shdebugstr_guid
(
riid
));
...
...
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