VirtualBox

Changeset 83826 in vbox


Ignore:
Timestamp:
Apr 19, 2020 1:31:42 AM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
137353
Message:

Add/NT/Installer: VC++ 14.1 warnings. bugref:8489

Location:
trunk/src/VBox/Additions/WINNT/Installer
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.cpp

    r82968 r83826  
    104104    if (::FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwLastError, 0, pszMsg, dwBufSize / sizeof(TCHAR), NULL) == 0)
    105105    {
    106         _sntprintf(pszMsg, dwBufSize / sizeof(TCHAR), _T("Unknown error!\n"), dwLastError);
     106        _sntprintf(pszMsg, dwBufSize / sizeof(TCHAR), _T("Unknown error!\n"));
    107107        return false;
    108108    }
    … …  
    126126        _tprintf(_T("(%u) %ws\n"), Event, pEventDescription);
    127127    else
    128         _tprintf(_T("(%u) ERROR: %u - %ws\n"), Event, dwError, pEventDescription);
     128        _tprintf(_T("(%u) ERROR: %lu - %ws\n"), Event, dwError, pEventDescription);
    129129
    130130     if (pCallbackContext)
    131          fwprintf((FILE*)pCallbackContext, _T("(%u) %u - %s\n"), Event, dwError, pEventDescription);
     131         fwprintf((FILE*)pCallbackContext, _T("(%u) %lu - %s\n"), Event, dwError, pEventDescription);
    132132}
    133133
    … …  
    372372                        TCHAR szErrMsg[1024];
    373373                        GetErrorMsg(dwRet, szErrMsg, sizeof(szErrMsg));
    374                         _tprintf(_T("ERROR (%08x): %ws\n"), dwRet, szErrMsg);
     374                        _tprintf(_T("ERROR (%08lx): %ws\n"), dwRet, szErrMsg);
    375375                        break;
    376376                    }
    … …  
    518518    LONG lRet = RegCreateKeyEx(HKEY_LOCAL_MACHINE, pszSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, NULL, &hKey, &disp);
    519519    if (lRet != ERROR_SUCCESS)
    520         _tprintf(_T("AddStringToMultiSZ: RegCreateKeyEx %ts failed with error %ld!\n"), pszSubKey, lRet);
     520        _tprintf(_T("AddStringToMultiSZ: RegCreateKeyEx %s failed with error %ld!\n"), pszSubKey, lRet);
    521521
    522522    if (lRet == ERROR_SUCCESS)
    … …  
    530530            || dwType != REG_MULTI_SZ)
    531531        {
    532            _tprintf(_T("AddStringToMultiSZ: RegQueryValueEx failed with error %ld, key type = 0x%x!\n"), lRet, dwType);
     532           _tprintf(_T("AddStringToMultiSZ: RegQueryValueEx failed with error %ld, key type = %#lx!\n"), lRet, dwType);
    533533        }
    534534        else
    … …  
    614614    LONG lRet = RegCreateKeyEx(HKEY_LOCAL_MACHINE, pszKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, NULL, &hkey, &disp);
    615615    if (lRet != ERROR_SUCCESS)
    616         _tprintf(_T("RemoveStringFromMultiSZ: RegCreateKeyEx %ts failed with error %ld!\n"), pszKey, lRet);
     616        _tprintf(_T("RemoveStringFromMultiSZ: RegCreateKeyEx %s failed with error %ld!\n"), pszKey, lRet);
    617617
    618618    if (lRet == ERROR_SUCCESS)
    … …  
    625625            || dwType != REG_MULTI_SZ)
    626626        {
    627             _tprintf(_T("RemoveStringFromMultiSZ: RegQueryValueEx failed with %d, key type = 0x%x!\n"), lRet, dwType);
     627            _tprintf(_T("RemoveStringFromMultiSZ: RegQueryValueEx failed with %ld, key type = %#lx!\n"), lRet, dwType);
    628628        }
    629629        else
    630630        {
    631         #ifdef DEBUG
     631#ifdef DEBUG
    632632            _tprintf(_T("RemoveStringFromMultiSZ: Current key len: %ld\n"), cbKeyValue);
    633         #endif
     633#endif
    634634
    635635            TCHAR szCurString[1024] = { 0 };
    … …  
    661661            }
    662662            szFinalString[++iNewIndex] = _T('\0');
    663         #ifdef DEBUG
     663#ifdef DEBUG
    664664            _tprintf(_T("RemoveStringFromMultiSZ: New key value: %ws (%u bytes)\n"),
    665                      szFinalString, iNewIndex * sizeof(TCHAR));
    666         #endif
     665                     szFinalString, (unsigned)(iNewIndex * sizeof(TCHAR)));
     666#endif
    667667
    668668            lRet = RegSetValueExW(hkey, pszKeyValue, 0, REG_MULTI_SZ, (LPBYTE)szFinalString, iNewIndex * sizeof(TCHAR));
    669669            if (lRet != ERROR_SUCCESS)
    670                 _tprintf(_T("RemoveStringFromMultiSZ: RegSetValueEx failed with %d!\n"), lRet);
     670                _tprintf(_T("RemoveStringFromMultiSZ: RegSetValueEx failed with %ld!\n"), lRet);
    671671        }
    672672
    673673        RegCloseKey(hkey);
    674     #ifdef DEBUG
     674#ifdef DEBUG
    675675        if (lRet == ERROR_SUCCESS)
    676676            _tprintf(_T("RemoveStringFromMultiSZ: Value %ws successfully removed!\n"), pszValueToRemove);
    677     #endif
     677#endif
    678678    }
    679679
    … …  
    701701    LONG lRet = RegCreateKeyEx(HKEY_LOCAL_MACHINE, pszSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, NULL, &hKey, &disp);
    702702    if (lRet != ERROR_SUCCESS)
    703         _tprintf(_T("RegistryAddStringToList: RegCreateKeyEx %ts failed with error %ld!\n"), pszSubKey, lRet);
     703        _tprintf(_T("RegistryAddStringToList: RegCreateKeyEx %s failed with error %ld!\n"), pszSubKey, lRet);
    704704
    705705    TCHAR szKeyValue[512] = { 0 };
    … …  
    711711        || dwType != REG_SZ)
    712712    {
    713         _tprintf(_T("RegistryAddStringToList: RegQueryValueEx failed with %d, key type = 0x%x!\n"), lRet, dwType);
     713        _tprintf(_T("RegistryAddStringToList: RegQueryValueEx failed with %ld, key type = %#lx!\n"), lRet, dwType);
    714714    }
    715715
    716716    if (lRet == ERROR_SUCCESS)
    717717    {
    718     #ifdef DEBUG
     718#ifdef DEBUG
    719719        _tprintf(_T("RegistryAddStringToList: Key value: %ws\n"), szKeyValue);
    720     #endif
     720#endif
    721721
    722722        /* Create entire new list. */
    … …  
    750750            }
    751751
    752     #ifdef DEBUG
     752#ifdef DEBUG
    753753            _tprintf (_T("RegistryAddStringToList: Temp new key value: %ws\n"), szNewKeyValue);
    754     #endif
     754#endif
    755755            pszToken = pszNewToken;
    756756        }
    … …  
    766766        size_t iNewLen = (wcslen(szNewKeyValue) * sizeof(WCHAR)) + sizeof(WCHAR);
    767767
    768     #ifdef DEBUG
    769         _tprintf(_T("RegistryAddStringToList: New provider list: %ws (%u bytes)\n"), szNewKeyValue, iNewLen);
    770     #endif
     768#ifdef DEBUG
     769        _tprintf(_T("RegistryAddStringToList: New provider list: %ws (%u bytes)\n"), szNewKeyValue, (unsigned)iNewLen);
     770#endif
    771771
    772772        lRet = RegSetValueExW(hKey, pszKeyValue, 0, REG_SZ, (LPBYTE)szNewKeyValue, (DWORD)iNewLen);
    … …  
    796796    LONG lRet = RegCreateKeyEx(HKEY_LOCAL_MACHINE, pszSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, NULL, &hKey, &disp);
    797797    if (lRet != ERROR_SUCCESS)
    798         _tprintf(_T("RegistryRemoveStringFromList: RegCreateKeyEx %ts failed with error %ld!\n"), pszSubKey, lRet);
     798        _tprintf(_T("RegistryRemoveStringFromList: RegCreateKeyEx %s failed with error %ld!\n"), pszSubKey, lRet);
    799799
    800800    TCHAR szKeyValue[512] = { 0 };
    … …  
    806806        || dwType != REG_SZ)
    807807    {
    808         _tprintf(_T("RegistryRemoveStringFromList: RegQueryValueEx failed with %d, key type = 0x%x!\n"), lRet, dwType);
     808        _tprintf(_T("RegistryRemoveStringFromList: RegQueryValueEx failed with %ld, key type = %#lx!\n"), lRet, dwType);
    809809    }
    810810
    … …  
    846846
    847847    #ifdef DEBUG
    848         _tprintf(_T("RegistryRemoveStringFromList: New provider list: %ws (%u bytes)\n"), szNewKeyValue, iNewLen);
     848        _tprintf(_T("RegistryRemoveStringFromList: New provider list: %ws (%u bytes)\n"), szNewKeyValue, (unsigned)iNewLen);
    849849    #endif
    850850

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestDrvInst.cpp

    r82968 r83826  
    451451  if (!GetModuleFileName(hExe, &szInstallDir[0], sizeof(szInstallDir)))
    452452    {
    453       printf("GetModuleFileName failed! rc = %d\n", GetLastError());
     453      printf("GetModuleFileName failed! rc=%lu\n", GetLastError());
    454454      return -1;
    455455    }
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette