Hi,
2 small patches here, the second relies on the first.
License: X11
Cheers,
Jon
ChangeLog:
Jon Griffiths <jon_p_griffiths@yahoo.com>
+dlls/shlwapi/shlwapi_main.c
Free comctl32 on unload, add detection of Unicode O/S
+dll/shlwapi/thread.c
Create security attributes when running as NT or later
=====
"Don't wait for the seas to part, or messiahs to come;
Don't you sit around and waste this chance..." - Live
jon_p_griffiths@yahoo.com
__________________________________________________
Do You Yahoo!?
HotJobs - Search Thousands of New Jobs
http://www.hotjobs.com
--- wine/dlls/shlwapi/shlwapi_main.c Mon Aug 19 05:43:44 2002
+++ wine-develop/dlls/shlwapi/shlwapi_main.c Mon Aug 19 14:33:28 2002
@@ -39,6 +39,8 @@
DWORD SHLWAPI_ThreadRef_index = -1;
+BOOL SHWAPI_OsIsUnicode = TRUE;
+
/*************************************************************************
* SHLWAPI LibMain
*
@@ -53,11 +55,13 @@
case DLL_PROCESS_ATTACH:
shlwapi_hInstance = hinstDLL;
SHLWAPI_ThreadRef_index = TlsAlloc();
+ SHWAPI_OsIsUnicode = !(GetVersion() & 0x80000000);
break;
case DLL_PROCESS_DETACH:
if (SHLWAPI_hshell32) FreeLibrary(SHLWAPI_hshell32);
if (SHLWAPI_hwinmm) FreeLibrary(SHLWAPI_hwinmm);
if (SHLWAPI_hcomdlg32) FreeLibrary(SHLWAPI_hcomdlg32);
+ if (SHLWAPI_hcomctl32) FreeLibrary(SHLWAPI_hcomctl32);
if (SHLWAPI_hmpr) FreeLibrary(SHLWAPI_hmpr);
if (SHLWAPI_hmlang) FreeLibrary(SHLWAPI_hmlang);
if (SHLWAPI_hversion) FreeLibrary(SHLWAPI_hversion);
--- wine/dlls/shlwapi/thread.c Mon Aug 12 05:22:24 2002
+++ wine-develop/dlls/shlwapi/thread.c Mon Aug 19 14:43:18 2002
@@ -35,6 +35,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(shell);
extern DWORD SHLWAPI_ThreadRef_index; /* Initialised in shlwapi_main.c */
+extern BOOL SHWAPI_OsIsUnicode; /* Ditto */
static HRESULT (WINAPI *pSHGetInstanceExplorer)(IUnknown**);
@@ -66,7 +67,7 @@
TRACE("(%p,%p)\n", lpAttr, lpSec);
- if (0) /* FIXME: SHWAPI_OsIsUnicode, as per shell32 */
+ if (SHWAPI_OsIsUnicode)
{
if (!lpSec || !lpAttr)
return NULL;
