[rmessiant] 50080: [DEVMGR] - DisplayDevicePropertyText: Use full DWORD value, not just one byte of it (CID 1803). [WINMM] - MCI_Close: Use UINT instead of UINT16 for the device id (CID 1804).
Author: rmessiant Date: Tue Dec 21 14:58:13 2010 New Revision: 50080
URL: http://svn.reactos.org/svn/reactos?rev=50080&view=rev Log: [DEVMGR] - DisplayDevicePropertyText: Use full DWORD value, not just one byte of it (CID 1803). [WINMM] - MCI_Close: Use UINT instead of UINT16 for the device id (CID 1804).
Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/winmm/mci.c
Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c?... ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Tue Dec 21 14:58:13 2010 @@ -720,6 +720,7 @@ PSP_DEVINFO_DATA DeviceInfoData; DWORD dwType; DWORD dwSize; + DWORD dwValue; LPBYTE lpBuffer; LPWSTR lpStr; INT len; @@ -791,58 +792,60 @@ } else if (dwType == REG_DWORD) { + dwValue = *(DWORD *) lpBuffer; + switch (dwProperty) { case SPDRP_CAPABILITIES: index = 0; - if (*lpBuffer & CM_DEVCAP_LOCKSUPPORTED) + if (dwValue & CM_DEVCAP_LOCKSUPPORTED) SetListViewText(hwndListView, index++, L"CM_DEVCAP_LOCKSUPPORTED"); - if (*lpBuffer & CM_DEVCAP_EJECTSUPPORTED) + if (dwValue & CM_DEVCAP_EJECTSUPPORTED) SetListViewText(hwndListView, index++, L"CM_DEVCAP_EJECTSUPPORTED"); - if (*lpBuffer & CM_DEVCAP_REMOVABLE) + if (dwValue & CM_DEVCAP_REMOVABLE) SetListViewText(hwndListView, index++, L"CM_DEVCAP_REMOVABLE"); - if (*lpBuffer & CM_DEVCAP_DOCKDEVICE) + if (dwValue & CM_DEVCAP_DOCKDEVICE) SetListViewText(hwndListView, index++, L"CM_DEVCAP_DOCKDEVICE"); - if (*lpBuffer & CM_DEVCAP_UNIQUEID) + if (dwValue & CM_DEVCAP_UNIQUEID) SetListViewText(hwndListView, index++, L"CM_DEVCAP_UNIQUEID"); - if (*lpBuffer & CM_DEVCAP_SILENTINSTALL) + if (dwValue & CM_DEVCAP_SILENTINSTALL) SetListViewText(hwndListView, index++, L"CM_DEVCAP_SILENTINSTALL"); - if (*lpBuffer & CM_DEVCAP_RAWDEVICEOK) + if (dwValue & CM_DEVCAP_RAWDEVICEOK) SetListViewText(hwndListView, index++, L"CM_DEVCAP_RAWDEVICEOK"); - if (*lpBuffer & CM_DEVCAP_SURPRISEREMOVALOK) + if (dwValue & CM_DEVCAP_SURPRISEREMOVALOK) SetListViewText(hwndListView, index++, L"CM_DEVCAP_SURPRISEREMOVALOK"); - if (*lpBuffer & CM_DEVCAP_HARDWAREDISABLED) + if (dwValue & CM_DEVCAP_HARDWAREDISABLED) SetListViewText(hwndListView, index++, L"CM_DEVCAP_HARDWAREDISABLED"); - if (*lpBuffer & CM_DEVCAP_NONDYNAMIC) + if (dwValue & CM_DEVCAP_NONDYNAMIC) SetListViewText(hwndListView, index++, L"CM_DEVCAP_NONDYNAMIC"); break;
case SPDRP_CONFIGFLAGS: index = 0; - if (*lpBuffer & CONFIGFLAG_DISABLED) + if (dwValue & CONFIGFLAG_DISABLED) SetListViewText(hwndListView, index++, L"CONFIGFLAG_DISABLED"); - if (*lpBuffer & CONFIGFLAG_REMOVED) + if (dwValue & CONFIGFLAG_REMOVED) SetListViewText(hwndListView, index++, L"CONFIGFLAG_REMOVED"); - if (*lpBuffer & CONFIGFLAG_MANUAL_INSTALL) + if (dwValue & CONFIGFLAG_MANUAL_INSTALL) SetListViewText(hwndListView, index++, L"CONFIGFLAG_MANUAL_INSTALL"); - if (*lpBuffer & CONFIGFLAG_IGNORE_BOOT_LC) + if (dwValue & CONFIGFLAG_IGNORE_BOOT_LC) SetListViewText(hwndListView, index++, L"CONFIGFLAG_IGNORE_BOOT_LC"); - if (*lpBuffer & CONFIGFLAG_NET_BOOT) + if (dwValue & CONFIGFLAG_NET_BOOT) SetListViewText(hwndListView, index++, L"CONFIGFLAG_NET_BOOT"); - if (*lpBuffer & CONFIGFLAG_REINSTALL) + if (dwValue & CONFIGFLAG_REINSTALL) SetListViewText(hwndListView, index++, L"CONFIGFLAG_REINSTALL"); - if (*lpBuffer & CONFIGFLAG_FAILEDINSTALL) + if (dwValue & CONFIGFLAG_FAILEDINSTALL) SetListViewText(hwndListView, index++, L"CONFIGFLAG_FAILEDINSTALL"); - if (*lpBuffer & CONFIGFLAG_CANTSTOPACHILD) + if (dwValue & CONFIGFLAG_CANTSTOPACHILD) SetListViewText(hwndListView, index++, L"CONFIGFLAG_CANTSTOPACHILD"); - if (*lpBuffer & CONFIGFLAG_OKREMOVEROM) + if (dwValue & CONFIGFLAG_OKREMOVEROM) SetListViewText(hwndListView, index++, L"CONFIGFLAG_OKREMOVEROM"); - if (*lpBuffer & CONFIGFLAG_NOREMOVEEXIT) + if (dwValue & CONFIGFLAG_NOREMOVEEXIT) SetListViewText(hwndListView, index++, L"CONFIGFLAG_NOREMOVEEXIT"); break;
default: - swprintf(dap->szTemp, L"0x%08x", *lpBuffer); + swprintf(dap->szTemp, L"0x%08lx", dwValue); SetListViewText(hwndListView, 0, dap->szTemp); break; }
Modified: trunk/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mci.c?rev=5... ============================================================================== --- trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] Tue Dec 21 14:58:13 2010 @@ -1669,7 +1669,7 @@ /************************************************************************** * MCI_Close [internal] */ -static DWORD MCI_Close(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) +static DWORD MCI_Close(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) { DWORD dwRet; LPWINE_MCIDRIVER wmd;
-
rmessiant＠svn.reactos.org