giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

md: use register to enable debug log

This commit is contained in:
Viktor Tarasov 2016-04-13 14:28:06 +02:00
parent 66515989d8
commit 09cbcd80f4
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/minidriver/minidriver.c
View File

@ -247,8 +247,6 @@ static void logprintf(PCARD_DATA pCardData, int level, _Printf_format_string_ co
{ {
va_list arg; va_list arg;
VENDOR_SPECIFIC *vs; VENDOR_SPECIFIC *vs;
#define CARDMOD_LOW_LEVEL_DEBUG 1
#ifdef CARDMOD_LOW_LEVEL_DEBUG
/* Use a simplied log to get all messages including messages /* Use a simplied log to get all messages including messages
* before opensc is loaded. The file must be modifiable by all * before opensc is loaded. The file must be modifiable by all
* users as we maybe called under lsa or user. Note data from * users as we maybe called under lsa or user. Note data from
@ -256,20 +254,23 @@ static void logprintf(PCARD_DATA pCardData, int level, _Printf_format_string_ co
* flush to get last message before ann crash * flush to get last message before ann crash
* close so as the file is not left open during any wait. * close so as the file is not left open during any wait.
*/ */
{ DWORD md_debug = 0;
FILE* lldebugfp = NULL; DWORD sz = sizeof(md_debug);
int rv;
lldebugfp = fopen("C:\\tmp\\md.log","a+"); rv = sc_ctx_win32_get_config_value("CARDMOD_LOW_LEVEL_DEBUG",
"MiniDriverDebug", "Software\\OpenSC Project\\OpenSC",
(char *)(&md_debug), &sz);
if (rv == SC_SUCCESS && md_debug != 0) {
FILE *lldebugfp = fopen("C:\\tmp\\md.log","a+");
if (lldebugfp) { if (lldebugfp) {
va_start(arg, format); va_start(arg, format);
vfprintf(lldebugfp, format, arg); vfprintf(lldebugfp, format, arg);
va_end(arg); va_end(arg);
fflush(lldebugfp); fflush(lldebugfp);
fclose(lldebugfp); fclose(lldebugfp);
lldebugfp = NULL;
} }
} }
#endif
va_start(arg, format); va_start(arg, format);
if(pCardData != NULL) { if(pCardData != NULL) {
@ -5689,7 +5690,6 @@ BOOL APIENTRY DllMain( HINSTANCE hinstDLL,
LPVOID lpReserved LPVOID lpReserved
) )
{ {
#ifdef CARDMOD_LOW_LEVEL_DEBUG
CHAR name[MAX_PATH + 1] = "\0"; CHAR name[MAX_PATH + 1] = "\0";
char *reason = ""; char *reason = "";
@ -5712,7 +5712,6 @@ BOOL APIENTRY DllMain( HINSTANCE hinstDLL,
logprintf(NULL,8,"\n********** DllMain Module(handle:0x%p) '%s'; reason='%s'; Reserved=%p; P:%d; T:%d\n", logprintf(NULL,8,"\n********** DllMain Module(handle:0x%p) '%s'; reason='%s'; Reserved=%p; P:%d; T:%d\n",
hinstDLL, name, reason, lpReserved, GetCurrentProcessId(), GetCurrentThreadId()); hinstDLL, name, reason, lpReserved, GetCurrentProcessId(), GetCurrentThreadId());
#endif
switch (ul_reason_for_call) switch (ul_reason_for_call)
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

1
win32/OpenSC.wxs.in
View File

@ -111,6 +111,7 @@
<RegistryValue Type="string" Name="ConfigFile" Value="[INSTALLDIR]opensc.conf"/> <RegistryValue Type="string" Name="ConfigFile" Value="[INSTALLDIR]opensc.conf"/>
<RegistryValue Type="string" Name="ProfileDir" Value="[INSTALLDIR]profiles"/> <RegistryValue Type="string" Name="ProfileDir" Value="[INSTALLDIR]profiles"/>
<RegistryValue Type="string" Name="SmDir" Value="[INSTALLDIR]tools"/> <RegistryValue Type="string" Name="SmDir" Value="[INSTALLDIR]tools"/>
<RegistryValue Type="integer" Name="MiniDriverDebug" Value="0"/>
</RegistryKey> </RegistryKey>
</Component> </Component>