Francois Gouget : msvcp90: {init, free}_misc() are only used with msvcp >= 100.
Alexandre Julliard
julliard at winehq.org
Mon Apr 3 14:01:48 CDT 2017
Module: wine
Branch: master
Commit: 459134b855f4cad5cb83336d7dca9b5f84b08e23
URL: http://source.winehq.org/git/wine.git/?a=commit;h=459134b855f4cad5cb83336d7dca9b5f84b08e23
Author: Francois Gouget <fgouget at free.fr>
Date: Sat Apr 1 14:36:29 2017 +0200
msvcp90: {init,free}_misc() are only used with msvcp >= 100.
Signed-off-by: Francois Gouget <fgouget at free.fr>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcp90/misc.c | 2 ++
dlls/msvcp90/msvcp_main.c | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c
index 9f3724a..828c4c2 100644
--- a/dlls/msvcp90/misc.c
+++ b/dlls/msvcp90/misc.c
@@ -1364,6 +1364,7 @@ BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param)
return InitOnceExecuteOnce(flag, func, param, NULL);
}
+#if _MSVCP_VER >= 100
void init_misc(void *base)
{
#ifdef __x86_64__
@@ -1393,6 +1394,7 @@ void free_misc(void)
HeapFree(GetProcessHeap(), 0, broadcast_at_thread_exit.to_broadcast);
#endif
}
+#endif
#if _MSVCP_VER >= 140
LONGLONG __cdecl _Query_perf_counter(void)
diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c
index 3898c9d..8eb1e21 100644
--- a/dlls/msvcp90/msvcp_main.c
+++ b/dlls/msvcp90/msvcp_main.c
@@ -209,14 +209,18 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
init_exception(hinstDLL);
init_locale(hinstDLL);
init_io(hinstDLL);
+#if _MSVCP_VER >= 100
init_misc(hinstDLL);
+#endif
break;
case DLL_PROCESS_DETACH:
if (lpvReserved) break;
free_io();
free_locale();
free_lockit();
+#if _MSVCP_VER >= 100
free_misc();
+#endif
break;
}
More information about the wine-cvs
mailing list