Module: wine
Branch: master
Commit: 67d429f0f35a10413e962bd7496938df3074ae8c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d429f0f35a10413e962bd74…
Author: Christian Costa <titan.costa(a)gmail.com>
Date: Thu Mar 29 09:00:39 2012 +0200
strmbase: Display dll in which we are searching a class to instanciate.
---
dlls/strmbase/dllfunc.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c
index 34e03e6..5c9b8ab 100644
--- a/dlls/strmbase/dllfunc.c
+++ b/dlls/strmbase/dllfunc.c
@@ -362,7 +362,10 @@ HRESULT WINAPI STRMBASE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *
if (i == g_cTemplates)
{
- ERR("%s: no class found.\n", debugstr_guid(rclsid));
+ char dllname[MAX_PATH];
+ if (!GetModuleFileNameA(g_hInst, dllname, sizeof(dllname)))
+ strcpy(dllname, "???");
+ ERR("%s: no class found in %s.\n", debugstr_guid(rclsid), dllname);
return CLASS_E_CLASSNOTAVAILABLE;
}
else if (!pList->m_lpfnNew)
Module: wine
Branch: master
Commit: bf5c3019a39be89221b5386bfeecb390ef55362f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5c3019a39be89221b5386bf…
Author: Vincent Povirk <vincent(a)codeweavers.com>
Date: Thu Mar 29 10:52:29 2012 -0500
rpcrt4: Do nothing when DllMain is called because the process is exiting.
---
dlls/rpcrt4/rpcrt4_main.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c
index 53f3bbd..cb6ff30 100644
--- a/dlls/rpcrt4/rpcrt4_main.c
+++ b/dlls/rpcrt4/rpcrt4_main.c
@@ -138,6 +138,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
break;
case DLL_PROCESS_DETACH:
+ if (lpvReserved) break; /* do nothing if process is shutting down */
RPCRT4_destroy_all_protseqs();
RPCRT4_ServerFreeAllRegisteredAuthInfo();
DeleteCriticalSection(&uuid_cs);