Commit a98d139098001e2acb1ea0525a5f94928b94107b
1 parent
8cbce81b
Exists in
master
and in
5 other branches
Debugging windows package.
Showing
1 changed file
with
32 additions
and
3 deletions
Show diff stats
src/pw3270/main.c
| @@ -276,12 +276,14 @@ int main(int argc, char *argv[]) | @@ -276,12 +276,14 @@ int main(int argc, char *argv[]) | ||
| 276 | 276 | ||
| 277 | #if defined(ENABLE_WINDOWS_REGISTRY) | 277 | #if defined(ENABLE_WINDOWS_REGISTRY) |
| 278 | HKEY hMainKey; | 278 | HKEY hMainKey; |
| 279 | - | ||
| 280 | - if(RegOpenKeyEx(HKEY_CURRENT_USER,PACKAGE_NAME,0,KEY_WRITE,&hMainKey) == ERROR_SUCCESS) | 279 | + DWORD disp; |
| 280 | + LSTATUS winRegError = RegCreateKeyEx(HKEY_CURRENT_USER,"SOFTWARE\\" PACKAGE_NAME,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hMainKey,&disp); | ||
| 281 | + if(winRegError == ERROR_SUCCESS) | ||
| 281 | { | 282 | { |
| 282 | HKEY hKey; | 283 | HKEY hKey; |
| 283 | 284 | ||
| 284 | - if(RegOpenKeyEx(HKEY_CURRENT_USER,"application",0,KEY_WRITE,&hKey) == ERROR_SUCCESS) | 285 | + winRegError = RegCreateKeyEx(HKEY_CURRENT_USER,"SOFTWARE\\" PACKAGE_NAME "\\application",0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp); |
| 286 | + if(winRegError == ERROR_SUCCESS) | ||
| 285 | { | 287 | { |
| 286 | const struct _versions | 288 | const struct _versions |
| 287 | { | 289 | { |
| @@ -305,8 +307,20 @@ int main(int argc, char *argv[]) | @@ -305,8 +307,20 @@ int main(int argc, char *argv[]) | ||
| 305 | RegCloseKey(hKey); | 307 | RegCloseKey(hKey); |
| 306 | 308 | ||
| 307 | } | 309 | } |
| 310 | +#ifdef DEBUG | ||
| 311 | + else | ||
| 312 | + { | ||
| 313 | + g_error("Can't open HKCU\\SOFTWARE\\" PACKAGE_NAME ": %s", lib3270_win32_strerror(winRegError)); | ||
| 314 | + } | ||
| 315 | +#endif | ||
| 308 | RegCloseKey(hMainKey); | 316 | RegCloseKey(hMainKey); |
| 309 | } | 317 | } |
| 318 | +#ifdef DEBUG | ||
| 319 | + else | ||
| 320 | + { | ||
| 321 | + g_error("Can't open HKCU\\SOFTWARE\\" PACKAGE_NAME "\\application: %s",lib3270_win32_strerror(winRegError)); | ||
| 322 | + } | ||
| 323 | +#endif | ||
| 310 | 324 | ||
| 311 | #endif // ENABLE_WINDOWS_REGISTRY | 325 | #endif // ENABLE_WINDOWS_REGISTRY |
| 312 | 326 | ||
| @@ -414,6 +428,21 @@ int main(int argc, char *argv[]) | @@ -414,6 +428,21 @@ int main(int argc, char *argv[]) | ||
| 414 | #endif // HAVE_SYSLOG | 428 | #endif // HAVE_SYSLOG |
| 415 | { | 429 | { |
| 416 | g_log_set_default_handler(g_logfile,NULL); | 430 | g_log_set_default_handler(g_logfile,NULL); |
| 431 | + | ||
| 432 | +#ifdef _WIN32 | ||
| 433 | + g_autofree gchar * appdir = g_win32_get_package_installation_directory_of_module(NULL); | ||
| 434 | + | ||
| 435 | + g_message("Windows Application directory is \"%s\"",appdir); | ||
| 436 | + g_message("Application name is \"%s\"", g_get_application_name()); | ||
| 437 | + g_message("Session name is \"%s\"", session_name); | ||
| 438 | + | ||
| 439 | +#if defined(ENABLE_WINDOWS_REGISTRY) | ||
| 440 | + g_message("Registry path is \"HKCU\\%s\"",PACKAGE_NAME); | ||
| 441 | +#endif // ENABLE_WINDOWS_REGISTRY | ||
| 442 | + | ||
| 443 | +#endif // _WIN32 | ||
| 444 | + | ||
| 445 | + | ||
| 417 | } | 446 | } |
| 418 | 447 | ||
| 419 | // Check GTK Version | 448 | // Check GTK Version |