msvcp90: {init,free}_misc() are only used with msvcp >= 100.

Francois Gouget fgouget at free.fr
Sat Apr 1 07:36:29 CDT 2017


For older versions they are either not used or don't do anything.

Signed-off-by: Francois Gouget <fgouget at free.fr>
---
 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 fa5ac1d7f5..eb1c9b18a6 100644
--- a/dlls/msvcp90/misc.c
+++ b/dlls/msvcp90/misc.c
@@ -1312,6 +1312,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__
@@ -1341,6 +1342,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 3898c9d318..8eb1e2196a 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;
     }
 
-- 
2.11.0



More information about the wine-patches mailing list