Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[weiden] 19782: fixed call to SetupDiGetClassDevPropertySheets

by weiden＠svn.reactos.com

fixed call to SetupDiGetClassDevPropertySheets Modified: trunk/reactos/lib/devmgr/advprop.c _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-11-30 17:28:42 UTC (rev 19781) +++ trunk/reactos/lib/devmgr/advprop.c 2005-11-30 18:26:43 UTC (rev 19782) @@ -169,23 +169,12 @@ PROPSHEETHEADER psh = {0}; PROPSHEETPAGE pspGeneral = {0}; DWORD nPropSheets = 0; - DWORD nDevSheetsStart = 0; PPROPERTYSHEETW pPropertySheetW; PCREATEPROPERTYSHEETPAGEW pCreatePropertySheetPageW; PDESTROYPROPERTYSHEETPAGE pDestroyPropertySheetPage; PDEVADVPROP_INFO DevAdvPropInfo; DWORD PropertySheetType; HANDLE hMachine = NULL; - UINT nPages = 0; - union - { - ULONG Mask; - struct - { - ULONG General : 1; - ULONG Device : 1; - } Page; - } DelPropSheets = {0}; INT_PTR Ret = -1; /* we don't want to statically link against comctl32, so find the @@ -283,60 +272,44 @@ psh.phpage[0] = pCreatePropertySheetPageW(&pspGeneral); if (psh.phpage[0] != NULL) { - DelPropSheets.Page.General = TRUE; - nDevSheetsStart++; - nPages++; + psh.nPages++; } if (nPropSheets != 0) { - /* create the device property sheets but don't overwrite - the "General" property sheet handle */ - psh.phpage += nDevSheetsStart; + /* create the device property sheets */ if (!SetupDiGetClassDevPropertySheets(DeviceInfoSet, DeviceInfoData, &psh, - nPropSheets, + nPropSheets + psh.nPages, NULL, PropertySheetType)) { goto Cleanup; } - psh.phpage -= nDevSheetsStart; - - DelPropSheets.Page.Device = TRUE; - nPages += nPropSheets; } - psh.nPages = nPages; - /* FIXME - add the "Driver" property sheet if necessary */ - Ret = pPropertySheetW(&psh); + if (psh.nPages != 0) + { + Ret = pPropertySheetW(&psh); - /* no need to destroy the property sheets anymore */ - DelPropSheets.Mask = 0; + /* NOTE: no need to destroy the property sheets anymore! */ + } + else + { + UINT i; Cleanup: - /* in case of failure the property sheets must be destroyed */ - if (DelPropSheets.Mask != 0) - { - if (DelPropSheets.Page.General && psh.phpage[0] != NULL) + /* in case of failure the property sheets must be destroyed */ + for (i = 0; + i < psh.nPages; + i++) { - pDestroyPropertySheetPage(psh.phpage[0]); - } - - if (DelPropSheets.Page.Device) - { - UINT i; - for (i = 0; - i < nPropSheets; - i++) + if (psh.phpage[i] != NULL) { - if (psh.phpage[i + 1] != NULL) - { - pDestroyPropertySheetPage(psh.phpage[i + 1]); - } + pDestroyPropertySheetPage(psh.phpage[i]); } } }

18 years, 9 months

[gvg] 19781: Alex Buell <alex.buell@munted.org.uk>:

by gvg＠svn.reactos.com

Alex Buell <alex.buell(a)munted.org.uk>: - math_asm.S: undefined references to 'not' when linking ntdll.dll Modified: trunk/reactos/lib/rtl/i386/math_asm.S _____ Modified: trunk/reactos/lib/rtl/i386/math_asm.S --- trunk/reactos/lib/rtl/i386/math_asm.S 2005-11-30 17:11:43 UTC (rev 19780) +++ trunk/reactos/lib/rtl/i386/math_asm.S 2005-11-30 17:28:42 UTC (rev 19781) @@ -1436,7 +1436,7 @@ mov al,ah // Move condition flags to AL lahf // Load Flags into AH and al, 0b01000101 // Isolate C0, C2 and C3 - and ah,not 0b01000101 // Turn off CF, PF and ZF + and ah, 0b10111010 // Turn off CF, PF and ZF or ah,al // Set new CF, PF and ZF sahf // Store AH into Flags jb __fpow1 // Re-direct if x < 0 @@ -1448,7 +1448,7 @@ mov al,ah // Move condition flags to AL lahf // Load Flags into AH and al, 0b01000101 // Isolate C0, C2 and C3 - and ah,not 0b01000101 // Turn off CF, PF and ZF + and ah, 0b10111010 // Turn off CF, PF and ZF or ah,al // Set new CF, PF and ZF sahf // Store AH into Flags ja __fpow3 // Re-direct if y > 0 @@ -1464,7 +1464,7 @@ mov al,ah // Move condition flags to AL lahf // Load Flags into AH and al, 0b01000101 // Isolate C0, C2 and C3 - and ah,not 0b01000101 // Turn off CF, PF and ZF + and ah, 0b10111010 // Turn off CF, PF and ZF or ah,al // Set new CF, PF and ZF sahf // Store AH into Flags je __fpow2 // Proceed if y = int(y)

18 years, 9 months

[hpoussin] 19780: Finish implementation of SetupDiGetClassDevPropertySheetsW (not tested)

by hpoussin＠svn.reactos.com

Finish implementation of SetupDiGetClassDevPropertySheetsW (not tested) Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-30 16:54:54 UTC (rev 19779) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-30 17:11:43 UTC (rev 19780) @@ -3591,11 +3591,28 @@ return FALSE; } +struct ClassDevPropertySheetsData +{ + HPROPSHEETPAGE *PropertySheetPages; + DWORD MaximumNumberOfPages; + DWORD NumberOfPages; +}; + static BOOL WINAPI GetClassDevPropertySheetsCallback( IN HPROPSHEETPAGE hPropSheetPage, - LPARAM lParam) + IN OUT LPARAM lParam) { - FIXME("Need to add a property page!\n"); + struct ClassDevPropertySheetsData *PropPageData; + + PropPageData = (struct ClassDevPropertySheetsData *)lParam; + + if (PropPageData->NumberOfPages < PropPageData->MaximumNumberOfPages) + { + *PropPageData->PropertySheetPages = hPropSheetPage; + PropPageData->PropertySheetPages++; + } + + PropPageData->NumberOfPages++; return TRUE; } @@ -3605,7 +3622,7 @@ BOOL WINAPI SetupDiGetClassDevPropertySheetsW( IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, - IN LPPROPSHEETHEADERW PropertySheetHeader, + IN OUT LPPROPSHEETHEADERW PropertySheetHeader, IN DWORD PropertySheetHeaderPageListSize, OUT PDWORD RequiredSize OPTIONAL, IN DWORD PropertySheetType) @@ -3633,8 +3650,8 @@ SetLastError(ERROR_INVALID_PARAMETER); else if (PropertySheetType != DIGCDP_FLAG_ADVANCED && PropertySheetType != DIGCDP_FLAG_BASIC - /* FIXME: && PropertySheetType != DIGCDP_FLAG_REMOTE_ADVANCED - && PropertySheetType != DIGCDP_FLAG_REMOTE_BASIC*/) + && PropertySheetType != DIGCDP_FLAG_REMOTE_ADVANCED + && PropertySheetType != DIGCDP_FLAG_REMOTE_BASIC) SetLastError(ERROR_INVALID_PARAMETER); else { @@ -3643,6 +3660,7 @@ LPWSTR PropPageProvider = NULL; HMODULE hModule = NULL; PROPERTY_PAGE_PROVIDER pPropPageProvider = NULL; + struct ClassDevPropertySheetsData PropPageData; DWORD dwLength, dwRegType; DWORD rc; @@ -3696,10 +3714,25 @@ Request.PageRequested = SPPSR_ENUM_ADV_DEVICE_PROPERTIES; Request.DeviceInfoSet = DeviceInfoSet; Request.DeviceInfoData = DeviceInfoData; + PropPageData.PropertySheetPages = &PropertySheetHeader->phpage[PropertySheetHeader->nPages]; + PropPageData.MaximumNumberOfPages = PropertySheetHeaderPageListSize; + PropPageData.NumberOfPages = 0; + ret = pPropPageProvider(&Request, GetClassDevPropertySheetsCallback, (LPARAM)&PropPageData); + if (!ret) + goto cleanup; + if (RequiredSize) - *RequiredSize = 0; /* FIXME */ - pPropPageProvider(&Request, GetClassDevPropertySheetsCallback, (LPARAM)0); - ret = TRUE; + *RequiredSize = PropPageData.NumberOfPages; + if (PropPageData.NumberOfPages <= PropPageData.MaximumNumberOfPages) + { + PropertySheetHeader->nPages += PropPageData.NumberOfPages; + ret = TRUE; + } + else + { + PropertySheetHeader->nPages += PropPageData.MaximumNumberOfPages; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + } cleanup: if (hKey != INVALID_HANDLE_VALUE)

18 years, 9 months

[weiden] 19779: display "Unknown" as status when querying the device status failed

by weiden＠svn.reactos.com

display "Unknown" as status when querying the device status failed Modified: trunk/reactos/lib/devmgr/misc.c _____ Modified: trunk/reactos/lib/devmgr/misc.c --- trunk/reactos/lib/devmgr/misc.c 2005-11-30 16:52:41 UTC (rev 19778) +++ trunk/reactos/lib/devmgr/misc.c 2005-11-30 16:54:54 UTC (rev 19779) @@ -426,6 +426,7 @@ { CONFIGRET cr; ULONG Status, ProblemNumber; + UINT MessageId = IDS_UNKNOWN; BOOL Ret = FALSE; if (hMachine != NULL) @@ -446,23 +447,13 @@ if (cr == CR_SUCCESS) { - UINT MessageId; - if (ProblemNumber < sizeof(ProblemStringId) / sizeof(ProblemStringId[0])) MessageId = ProblemStringId[ProblemNumber]; - else - MessageId = IDS_UNKNOWN; szBuffer[0] = L'\0'; if (ProblemNumber == 0) { - if (LoadString(hDllInstance, - MessageId, - szBuffer, - BufferSize)) - { - Ret = TRUE; - } + goto UnknownProblem; } else { @@ -485,6 +476,17 @@ } } } + else + { +UnknownProblem: + if (LoadString(hDllInstance, + MessageId, + szBuffer, + BufferSize)) + { + Ret = TRUE; + } + } return Ret; }

18 years, 9 months

[weiden] 19778: forgot to commit this change

by weiden＠svn.reactos.com

forgot to commit this change Modified: trunk/reactos/w32api/include/setupapi.h _____ Modified: trunk/reactos/w32api/include/setupapi.h --- trunk/reactos/w32api/include/setupapi.h 2005-11-30 16:33:05 UTC (rev 19777) +++ trunk/reactos/w32api/include/setupapi.h 2005-11-30 16:52:41 UTC (rev 19778) @@ -152,10 +152,14 @@ #define DIF_ADDREMOTEPROPERTYPAGE_ADVANCED 40 #define DIF_UPDATEDRIVER_UI 41 #define DIF_RESERVED2 42 +#define DIGCDP_FLAG_BASIC 0x00000001 +#define DIGCDP_FLAG_ADVANCED 0x00000002 +#if (_SETUPAPI_VER >= 0x0501) +#define DIGCDP_FLAG_REMOTE_BASIC 0x00000003 +#define DIGCDP_FLAG_REMOTE_ADVANCED 0x00000004 +#endif #define DIGCF_DEFAULT 0x00000001 -#define DIGCDP_FLAG_BASIC 0x00000001 #define DIGCF_PRESENT 0x00000002 -#define DIGCDP_FLAG_ADVANCED 0x00000002 #define DIGCF_ALLCLASSES 0x00000004 #define DIGCF_PROFILE 0x00000008 #define DIGCF_DEVICEINTERFACE 0x00000010

18 years, 9 months

[weiden] 19777: - support remote device property sheets

by weiden＠svn.reactos.com

- support remote device property sheets - display the device status Modified: trunk/reactos/lib/devmgr/En.rc Modified: trunk/reactos/lib/devmgr/advprop.c Modified: trunk/reactos/lib/devmgr/devmgr.xml Modified: trunk/reactos/lib/devmgr/hwpage.c Modified: trunk/reactos/lib/devmgr/misc.c Modified: trunk/reactos/lib/devmgr/precomp.h Modified: trunk/reactos/lib/devmgr/resource.h _____ Modified: trunk/reactos/lib/devmgr/En.rc --- trunk/reactos/lib/devmgr/En.rc 2005-11-30 14:02:55 UTC (rev 19776) +++ trunk/reactos/lib/devmgr/En.rc 2005-11-30 16:33:05 UTC (rev 19777) @@ -11,8 +11,62 @@ IDS_STATUS "Device Status: %1" IDS_UNKNOWN "Unknown" IDS_LOCATIONSTR "Location %1!u! (%2)" + IDS_DEVCODE " (Code %1!u!)" END +STRINGTABLE +BEGIN + IDS_DEV_NO_PROBLEM "This device is working properly." + IDS_DEV_NOT_CONFIGURED "CM_PROB_NOT_CONFIGURED" + IDS_DEV_OUT_OF_MEMORY "CM_PROB_DEVLOADER_FAILED" + IDS_DEV_ENTRY_IS_WRONG_TYPE "CM_PROB_ENTRY_IS_WRONG_TYPE" + IDS_DEV_LACKED_ARBITRATOR "CM_PROB_LACKED_ARBITRATOR" + IDS_DEV_BOOT_CONFIG_CONFLICT "CM_PROB_BOOT_CONFIG_CONFLICT" + IDS_DEV_FAILED_FILTER "CM_PROB_FAILED_FILTER" + IDS_DEV_DEVLOADER_NOT_FOUND "CM_PROB_DEVLOADER_NOT_FOUND" + IDS_DEV_INVALID_DATA "CM_PROB_INVALID_DATA" + IDS_DEV_FAILED_START "CM_PROB_FAILED_START" + IDS_DEV_LIAR "CM_PROB_LIAR" + IDS_DEV_NORMAL_CONFLICT "CM_PROB_NORMAL_CONFLICT" + IDS_DEV_NOT_VERIFIED "CM_PROB_NOT_VERIFIED" + IDS_DEV_NEED_RESTART "CM_PROB_NEED_RESTART" + IDS_DEV_REENUMERATION "CM_PROB_REENUMERATION" + IDS_DEV_PARTIAL_LOG_CONF "CM_PROB_PARTIAL_LOG_CONF" + IDS_DEV_UNKNOWN_RESOURCE "CM_PROB_UNKNOWN_RESOURCE" + IDS_DEV_REINSTALL "CM_PROB_REINSTALL" + IDS_DEV_REGISTRY "CM_PROB_REGISTRY" + IDS_DEV_WILL_BE_REMOVED "CM_PROB_WILL_BE_REMOVED" + IDS_DEV_DISABLED "CM_PROB_DISABLED" + IDS_DEV_DEVLOADER_NOT_READY "CM_PROB_DEVLOADER_NOT_READY" + IDS_DEV_DEVICE_NOT_THERE "CM_PROB_DEVICE_NOT_THERE" + IDS_DEV_MOVED "CM_PROB_MOVED" + IDS_DEV_TOO_EARLY "CM_PROB_TOO_EARLY" + IDS_DEV_NO_VALID_LOG_CONF "CM_PROB_NO_VALID_LOG_CONF" + IDS_DEV_FAILED_INSTALL "CM_PROB_FAILED_INSTALL" + IDS_DEV_HARDWARE_DISABLED "CM_PROB_HARDWARE_DISABLED" + IDS_DEV_CANT_SHARE_IRQ "CM_PROB_CANT_SHARE_IRQ" + IDS_DEV_FAILED_ADD "CM_PROB_FAILED_ADD" + IDS_DEV_DISABLED_SERVICE "CM_PROB_DISABLED_SERVICE" + IDS_DEV_TRANSLATION_FAILED "CM_PROB_TRANSLATION_FAILED" + IDS_DEV_NO_SOFTCONFIG "CM_PROB_NO_SOFTCONFIG" + IDS_DEV_BIOS_TABLE "CM_PROB_BIOS_TABLE" + IDS_DEV_IRQ_TRANSLATION_FAILED "CM_PROB_IRQ_TRANSLATION_FAILED" + IDS_DEV_FAILED_DRIVER_ENTRY "CM_PROB_FAILED_DRIVER_ENTRY" + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "CM_PROB_DRIVER_FAILED_PRIOR_UNLOAD" + IDS_DEV_DRIVER_FAILED_LOAD "CM_PROB_DRIVER_FAILED_LOAD" + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "CM_PROB_DRIVER_SERVICE_KEY_INVALID" + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "CM_PROB_LEGACY_SERVICE_NO_DEVICES" + IDS_DEV_DUPLICATE_DEVICE "CM_PROB_DUPLICATE_DEVICE" + IDS_DEV_FAILED_POST_START "CM_PROB_FAILED_POST_START" + IDS_DEV_HALTED "CM_PROB_HALTED" + IDS_DEV_PHANTOM "CM_PROB_PHANTOM" + IDS_DEV_SYSTEM_SHUTDOWN "CM_PROB_SYSTEM_SHUTDOWN" + IDS_DEV_HELD_FOR_EJECT "CM_PROB_HELD_FOR_EJECT" + IDS_DEV_DRIVER_BLOCKED "CM_PROB_DRIVER_BLOCKED" + IDS_DEV_REGISTRY_TOO_LARGE "CM_PROB_REGISTRY_TOO_LARGE" + IDS_DEV_SETPROPERTIES_FAILED "CM_PROB_SETPROPERTIES_FAILED" +END + IDD_HARDWARE DIALOG DISCARDABLE 0, 0, 300, 400 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-11-30 14:02:55 UTC (rev 19776) +++ trunk/reactos/lib/devmgr/advprop.c 2005-11-30 16:33:05 UTC (rev 19777) @@ -39,6 +39,7 @@ HDEVINFO DeviceInfoSet; PSP_DEVINFO_DATA DeviceInfoData; HINSTANCE hComCtl32; + HANDLE hMachine; WCHAR szDevName[255]; WCHAR szTemp[255]; } DEVADVPROP_INFO, *PDEVADVPROP_INFO; @@ -52,6 +53,7 @@ IN LPARAM lParam) { PDEVADVPROP_INFO dap; + INT_PTR Ret = FALSE; dap = (PDEVADVPROP_INFO)GetWindowLongPtr(hwndDlg, DWL_USER); @@ -120,8 +122,8 @@ } /* set the device status edit control text */ - if (GetDeviceStatusString(dap->DeviceInfoSet, - dap->DeviceInfoData, + if (GetDeviceStatusString(dap->DeviceInfoData->DevInst, + dap->hMachine, dap->szTemp, sizeof(dap->szTemp) / sizeof(dap->szTemp[0]))) { @@ -130,6 +132,7 @@ dap->szTemp); } } + Ret = TRUE; break; } @@ -152,7 +155,7 @@ } } - return FALSE; + return Ret; } @@ -160,9 +163,9 @@ DisplayDeviceAdvancedProperties(IN HWND hWndParent, IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData, - IN HINSTANCE hComCtl32) + IN HINSTANCE hComCtl32, + IN LPCWSTR lpMachineName) { - DWORD RegDataType; PROPSHEETHEADER psh = {0}; PROPSHEETPAGE pspGeneral = {0}; DWORD nPropSheets = 0; @@ -171,6 +174,8 @@ PCREATEPROPERTYSHEETPAGEW pCreatePropertySheetPageW; PDESTROYPROPERTYSHEETPAGE pDestroyPropertySheetPage; PDEVADVPROP_INFO DevAdvPropInfo; + DWORD PropertySheetType; + HANDLE hMachine = NULL; UINT nPages = 0; union { @@ -201,6 +206,16 @@ return -1; } + if (lpMachineName != NULL) + { + CONFIGRET cr = CM_Connect_Machine(lpMachineName, + &hMachine); + if (cr != CR_SUCCESS) + { + return -1; + } + } + /* create the internal structure associated with the "General", "Driver", ... pages */ DevAdvPropInfo = HeapAlloc(GetProcessHeap(), @@ -208,45 +223,37 @@ sizeof(DEVADVPROP_INFO)); if (DevAdvPropInfo == NULL) { - return -1; + goto Cleanup; } DevAdvPropInfo->DeviceInfoSet = DeviceInfoSet; DevAdvPropInfo->DeviceInfoData = DeviceInfoData; DevAdvPropInfo->hComCtl32 = hComCtl32; + DevAdvPropInfo->hMachine = hMachine; DevAdvPropInfo->szDevName[0] = L'\0'; /* get the device name */ - if ((SetupDiGetDeviceRegistryProperty(DeviceInfoSet, - DeviceInfoData, - SPDRP_FRIENDLYNAME, - &RegDataType, - (PBYTE)DevAdvPropInfo->szDevName, - sizeof(DevAdvPropInfo->szDevName), - NULL) || - SetupDiGetDeviceRegistryProperty(DeviceInfoSet, - DeviceInfoData, - SPDRP_DEVICEDESC, - &RegDataType, - (PBYTE)DevAdvPropInfo->szDevName, - sizeof(DevAdvPropInfo->szDevName), - NULL)) && - RegDataType == REG_SZ) + if (GetDeviceDescriptionString(DeviceInfoSet, + DeviceInfoData, + DevAdvPropInfo->szDevName, + sizeof(DevAdvPropInfo->szDevName) / sizeof(DevAdvPropInfo->szDevName[0]))) { - /* FIXME - check string for NULL termination! */ - psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPTITLE; psh.hwndParent = hWndParent; psh.pszCaption = DevAdvPropInfo->szDevName; + PropertySheetType = lpMachineName != NULL ? + DIGCDP_FLAG_REMOTE_ADVANCED : + DIGCDP_FLAG_ADVANCED; + /* find out how many property sheets we need */ if (SetupDiGetClassDevPropertySheets(DeviceInfoSet, DeviceInfoData, &psh, 0, &nPropSheets, - DIGCDP_FLAG_ADVANCED) && + PropertySheetType) && nPropSheets != 0) { DPRINT1("SetupDiGetClassDevPropertySheets unexpectedly returned TRUE!\n"); @@ -291,7 +298,7 @@ &psh, nPropSheets, NULL, - DIGCDP_FLAG_ADVANCED)) + PropertySheetType)) { goto Cleanup; } @@ -343,6 +350,11 @@ 0, DevAdvPropInfo); + if (hMachine != NULL) + { + CM_Disconnect_Machine(hMachine); + } + return Ret; } @@ -380,16 +392,23 @@ HINSTANCE hComCtl32; INT_PTR Ret = -1; - /* FIXME - handle remote device properties */ - - UNREFERENCED_PARAMETER(lpMachineName); - /* dynamically load comctl32 */ hComCtl32 = LoadAndInitComctl32(); if (hComCtl32 != NULL) { - hDevInfo = SetupDiCreateDeviceInfoList(NULL, - hWndParent); + if (lpMachineName != NULL) + { + hDevInfo = SetupDiCreateDeviceInfoListEx(NULL, + hWndParent, + lpMachineName, + NULL); + } + else + { + hDevInfo = SetupDiCreateDeviceInfoList(NULL, + hWndParent); + } + if (hDevInfo != INVALID_HANDLE_VALUE) { DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); @@ -402,7 +421,8 @@ Ret = DisplayDeviceAdvancedProperties(hWndParent, hDevInfo, &DevInfoData, - hComCtl32); + hComCtl32, + lpMachineName); } SetupDiDestroyDeviceInfoList(hDevInfo); @@ -469,12 +489,18 @@ lpDeviceIDW); Cleanup: - HeapFree(GetProcessHeap(), - 0, - lpMachineNameW); - HeapFree(GetProcessHeap(), - 0, - lpDeviceIDW); + if (lpMachineNameW != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpMachineNameW); + } + if (lpDeviceIDW != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpDeviceIDW); + } return Ret; } _____ Modified: trunk/reactos/lib/devmgr/devmgr.xml --- trunk/reactos/lib/devmgr/devmgr.xml 2005-11-30 14:02:55 UTC (rev 19776) +++ trunk/reactos/lib/devmgr/devmgr.xml 2005-11-30 16:33:05 UTC (rev 19777) @@ -8,6 +8,7 @@ <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> + <define name="_SETUPAPI_VER">0x501</define> <library>kernel32</library> <library>ntdll</library> <library>setupapi</library> _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-11-30 14:02:55 UTC (rev 19776) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-11-30 16:33:05 UTC (rev 19777) @@ -136,7 +136,8 @@ Ret = DisplayDeviceAdvancedProperties(hpd->hWnd, HwDevInfo->ClassDevInfo->hDevInfo, &HwDevInfo->DevInfoData, - hpd->hComCtl32) != -1; + hpd->hComCtl32, + NULL) != -1; } return Ret; @@ -192,8 +193,8 @@ LocalFree((HLOCAL)szFormatted); } - if (GetDeviceStatusString(HwDevInfo->ClassDevInfo->hDevInfo, - &HwDevInfo->DevInfoData, + if (GetDeviceStatusString(HwDevInfo->DevInfoData.DevInst, + NULL, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])) && LoadAndFormatString(hDllInstance, @@ -357,29 +358,15 @@ while (HwDevInfo != LastHwDevInfo) { - DWORD RegDataType; INT iItem; LVITEM li; /* get the device name */ - if ((SetupDiGetDeviceRegistryProperty(ClassDevInfo->hDevInfo, - &HwDevInfo->DevInfoData, - SPDRP_FRIENDLYNAME, - &RegDataType, - (PBYTE)szBuffer, - sizeof(szBuffer), - NULL) || - SetupDiGetDeviceRegistryProperty(ClassDevInfo->hDevInfo, - &HwDevInfo->DevInfoData, - SPDRP_DEVICEDESC, - &RegDataType, - (PBYTE)szBuffer, - sizeof(szBuffer), - NULL)) && - RegDataType == REG_SZ) + if (GetDeviceDescriptionString(ClassDevInfo->hDevInfo, + &HwDevInfo->DevInfoData, + szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0]))) { - /* FIXME - check string for NULL termination! */ - li.mask = LVIF_PARAM | LVIF_STATE | LVIF_TEXT | LVIF_IMAGE; li.iItem = ItemCount; li.iSubItem = 0; @@ -405,7 +392,7 @@ li.iSubItem = 1; ListView_SetItem(hpd->hWndDevList, - &li); + &li); } } } @@ -674,6 +661,7 @@ IN LPARAM lParam) { PHARDWARE_PAGE_DATA hpd; + INT_PTR Ret = FALSE; hpd = (PHARDWARE_PAGE_DATA)GetWindowLongPtr(hwndDlg, DWL_USER); @@ -820,6 +808,7 @@ EnableTroubleShoot(hpd, GetWindowTextLength(hwndDlg) != 0); } + Ret = TRUE; break; } @@ -854,7 +843,7 @@ } } - return FALSE; + return Ret; } _____ Modified: trunk/reactos/lib/devmgr/misc.c --- trunk/reactos/lib/devmgr/misc.c 2005-11-30 14:02:55 UTC (rev 19776) +++ trunk/reactos/lib/devmgr/misc.c 2005-11-30 16:33:05 UTC (rev 19777) @@ -94,6 +94,41 @@ } +static INT +AllocAndLoadStringsCat(OUT LPWSTR *lpTarget, + IN HINSTANCE hInst, + IN UINT uID1, + IN UINT uID2) +{ + INT ln; + + ln = LengthOfStrResource(hInst, + uID1); + ln += LengthOfStrResource(hInst, + uID2); + if (ln++ > 0) + { + (*lpTarget) = (LPWSTR)LocalAlloc(LMEM_FIXED, + ln * sizeof(WCHAR)); + if ((*lpTarget) != NULL) + { + INT Ret, Ret2 = 0; + if (!(Ret = LoadStringW(hInst, uID1, *lpTarget, ln))) + { + LocalFree((HLOCAL)(*lpTarget)); + } + else if (!(Ret2 = LoadStringW(hInst, uID2, *lpTarget + Ret, ln - Ret))) + { + LocalFree((HLOCAL)(*lpTarget)); + Ret = 0; + } + return Ret + Ret2; + } + } + return 0; +} + + DWORD LoadAndFormatString(IN HINSTANCE hInstance, IN UINT uID, @@ -127,6 +162,41 @@ } +DWORD +LoadAndFormatStringsCat(IN HINSTANCE hInstance, + IN UINT uID1, + IN UINT uID2, + OUT LPWSTR *lpTarget, + ...) +{ + DWORD Ret = 0; + LPWSTR lpFormat; + va_list lArgs; + + if (AllocAndLoadStringsCat(&lpFormat, + hInstance, + uID1, + uID2) > 0) + { + va_start(lArgs, lpTarget); + /* let's use FormatMessage to format it because it has the ability to allocate + memory automatically */ + Ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, + lpFormat, + 0, + 0, + (LPWSTR)lpTarget, + 0, + &lArgs); + va_end(lArgs); + + LocalFree((HLOCAL)lpFormat); + } + + return Ret; +} + + LPARAM ListViewGetSelectedItemData(IN HWND hwnd) { @@ -293,16 +363,130 @@ } +static const UINT ProblemStringId[] = +{ + IDS_DEV_NO_PROBLEM, + IDS_DEV_NOT_CONFIGURED, + IDS_DEV_OUT_OF_MEMORY, + IDS_DEV_ENTRY_IS_WRONG_TYPE, + IDS_DEV_LACKED_ARBITRATOR, + IDS_DEV_BOOT_CONFIG_CONFLICT, + IDS_DEV_FAILED_FILTER, + IDS_DEV_DEVLOADER_NOT_FOUND, + IDS_DEV_INVALID_DATA, + IDS_DEV_FAILED_START, + IDS_DEV_LIAR, + IDS_DEV_NORMAL_CONFLICT, + IDS_DEV_NOT_VERIFIED, + IDS_DEV_NEED_RESTART, + IDS_DEV_REENUMERATION, + IDS_DEV_PARTIAL_LOG_CONF, + IDS_DEV_UNKNOWN_RESOURCE, + IDS_DEV_REINSTALL, + IDS_DEV_REGISTRY, + IDS_UNKNOWN, /* CM_PROB_VXDLDR, not used on NT */ + IDS_DEV_WILL_BE_REMOVED, + IDS_DEV_DISABLED, + IDS_DEV_DEVLOADER_NOT_READY, + IDS_DEV_DEVICE_NOT_THERE, + IDS_DEV_MOVED, + IDS_DEV_TOO_EARLY, + IDS_DEV_NO_VALID_LOG_CONF, + IDS_DEV_FAILED_INSTALL, + IDS_DEV_HARDWARE_DISABLED, + IDS_DEV_CANT_SHARE_IRQ, + IDS_DEV_FAILED_ADD, + IDS_DEV_DISABLED_SERVICE, + IDS_DEV_TRANSLATION_FAILED, + IDS_DEV_NO_SOFTCONFIG, + IDS_DEV_BIOS_TABLE, + IDS_DEV_IRQ_TRANSLATION_FAILED, + IDS_DEV_FAILED_DRIVER_ENTRY, + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD, + IDS_DEV_DRIVER_FAILED_LOAD, + IDS_DEV_DRIVER_SERVICE_KEY_INVALID, + IDS_DEV_LEGACY_SERVICE_NO_DEVICES, + IDS_DEV_DUPLICATE_DEVICE, + IDS_DEV_FAILED_POST_START, + IDS_DEV_HALTED, + IDS_DEV_PHANTOM, + IDS_DEV_SYSTEM_SHUTDOWN, + IDS_DEV_HELD_FOR_EJECT, + IDS_DEV_DRIVER_BLOCKED, + IDS_DEV_REGISTRY_TOO_LARGE, + IDS_DEV_SETPROPERTIES_FAILED, +}; + + BOOL -GetDeviceStatusString(IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData, +GetDeviceStatusString(IN DEVINST DevInst, + IN HANDLE hMachine, OUT LPWSTR szBuffer, IN DWORD BufferSize) { - return LoadString(hDllInstance, - IDS_UNKNOWN, - szBuffer, - BufferSize) != 0; + CONFIGRET cr; + ULONG Status, ProblemNumber; + BOOL Ret = FALSE; + + if (hMachine != NULL) + { + cr = CM_Get_DevNode_Status_Ex(&Status, + &ProblemNumber, + DevInst, + 0, + hMachine); + } + else + { + cr = CM_Get_DevNode_Status(&Status, + &ProblemNumber, + DevInst, + 0); + } + + if (cr == CR_SUCCESS) + { + UINT MessageId; + + if (ProblemNumber < sizeof(ProblemStringId) / sizeof(ProblemStringId[0])) + MessageId = ProblemStringId[ProblemNumber]; + else + MessageId = IDS_UNKNOWN; + + szBuffer[0] = L'\0'; + if (ProblemNumber == 0) + { + if (LoadString(hDllInstance, + MessageId, + szBuffer, + BufferSize)) + { + Ret = TRUE; + } + } + else + { + LPWSTR szProblem; + + if (LoadAndFormatStringsCat(hDllInstance, + MessageId, + IDS_DEVCODE, + &szProblem, + ProblemNumber)) + { + wcsncpy(szBuffer, + szProblem, + BufferSize - 1); + szBuffer[BufferSize - 1] = L'\0'; + + LocalFree((HLOCAL)szProblem); + + Ret = TRUE; + } + } + } + + return Ret; } @@ -337,6 +521,50 @@ } +BOOL +GetDeviceDescriptionString(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT LPWSTR szBuffer, + IN DWORD BufferSize) +{ + DWORD RegDataType; + BOOL Ret = FALSE; + + if ((SetupDiGetDeviceRegistryProperty(DeviceInfoSet, + DeviceInfoData, + SPDRP_FRIENDLYNAME, + &RegDataType, + (PBYTE)szBuffer, + BufferSize * sizeof(WCHAR), + NULL) || + SetupDiGetDeviceRegistryProperty(DeviceInfoSet, + DeviceInfoData, + SPDRP_DEVICEDESC, + &RegDataType, + (PBYTE)szBuffer, + BufferSize * sizeof(WCHAR), + NULL)) && + RegDataType == REG_SZ) + { + /* FIXME - check string for NULL termination! */ + Ret = TRUE; + } + else + { + szBuffer[0] = L'\0'; + if (LoadString(hDllInstance, + IDS_UNKNOWN, + szBuffer, + BufferSize)) + { + Ret = TRUE; + } + } + + return Ret; +} + + HINSTANCE LoadAndInitComctl32(VOID) { _____ Modified: trunk/reactos/lib/devmgr/precomp.h --- trunk/reactos/lib/devmgr/precomp.h 2005-11-30 14:02:55 UTC (rev 19776) +++ trunk/reactos/lib/devmgr/precomp.h 2005-11-30 16:33:05 UTC (rev 19777) @@ -186,7 +186,8 @@ DisplayDeviceAdvancedProperties(IN HWND hWndParent, IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData, - IN HINSTANCE hComCtl32); + IN HINSTANCE hComCtl32, + IN LPCWSTR lpMachineName); /* MISC.C */ @@ -196,6 +197,13 @@ OUT LPWSTR *lpTarget, ...); +DWORD +LoadAndFormatStringsCat(IN HINSTANCE hInstance, + IN UINT uID1, + IN UINT uID2, + OUT LPWSTR *lpTarget, + ...); + LPARAM ListViewGetSelectedItemData(IN HWND hwnd); @@ -218,8 +226,8 @@ IN DWORD BufferSize); BOOL -GetDeviceStatusString(IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData, +GetDeviceStatusString(IN DEVINST DevInst, + IN HANDLE hMachine, OUT LPWSTR szBuffer, IN DWORD BufferSize); @@ -228,6 +236,12 @@ OUT LPWSTR szBuffer, IN DWORD BufferSize); +BOOL +GetDeviceDescriptionString(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT LPWSTR szBuffer, + IN DWORD BufferSize); + #endif /* __DEVMGR_H */ /* EOF */ _____ Modified: trunk/reactos/lib/devmgr/resource.h --- trunk/reactos/lib/devmgr/resource.h 2005-11-30 14:02:55 UTC (rev 19776) +++ trunk/reactos/lib/devmgr/resource.h 2005-11-30 16:33:05 UTC (rev 19777) @@ -31,7 +31,59 @@ #define IDS_STATUS 0x104 #define IDS_UNKNOWN 0x105 #define IDS_LOCATIONSTR 0x106 +#define IDS_DEVCODE 0x107 +#define IDS_DEV_NO_PROBLEM 0x200 +#define IDS_DEV_NOT_CONFIGURED 0x201 +#define IDS_DEV_DEVLOADER_FAILED 0x202 +#define IDS_DEV_OUT_OF_MEMORY 0x203 +#define IDS_DEV_ENTRY_IS_WRONG_TYPE 0x204 +#define IDS_DEV_LACKED_ARBITRATOR 0x205 +#define IDS_DEV_BOOT_CONFIG_CONFLICT 0x206 +#define IDS_DEV_FAILED_FILTER 0x207 +#define IDS_DEV_DEVLOADER_NOT_FOUND 0x208 +#define IDS_DEV_INVALID_DATA 0x209 +#define IDS_DEV_FAILED_START 0x20A +#define IDS_DEV_LIAR 0x20B +#define IDS_DEV_NORMAL_CONFLICT 0x20C +#define IDS_DEV_NOT_VERIFIED 0x20D +#define IDS_DEV_NEED_RESTART 0x20E +#define IDS_DEV_REENUMERATION 0x20F +#define IDS_DEV_PARTIAL_LOG_CONF 0x210 +#define IDS_DEV_UNKNOWN_RESOURCE 0x211 +#define IDS_DEV_REINSTALL 0x212 +#define IDS_DEV_REGISTRY 0x213 +#define IDS_DEV_WILL_BE_REMOVED 0x214 +#define IDS_DEV_DISABLED 0x215 +#define IDS_DEV_DEVLOADER_NOT_READY 0x216 +#define IDS_DEV_DEVICE_NOT_THERE 0x217 +#define IDS_DEV_MOVED 0x218 +#define IDS_DEV_TOO_EARLY 0x219 +#define IDS_DEV_NO_VALID_LOG_CONF 0x21A +#define IDS_DEV_FAILED_INSTALL 0x21B +#define IDS_DEV_HARDWARE_DISABLED 0x21C +#define IDS_DEV_CANT_SHARE_IRQ 0x21D +#define IDS_DEV_FAILED_ADD 0x21E +#define IDS_DEV_DISABLED_SERVICE 0x21F +#define IDS_DEV_TRANSLATION_FAILED 0x220 +#define IDS_DEV_NO_SOFTCONFIG 0x221 +#define IDS_DEV_BIOS_TABLE 0x222 +#define IDS_DEV_IRQ_TRANSLATION_FAILED 0x223 +#define IDS_DEV_FAILED_DRIVER_ENTRY 0x224 +#define IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD 0x225 +#define IDS_DEV_DRIVER_FAILED_LOAD 0x226 +#define IDS_DEV_DRIVER_SERVICE_KEY_INVALID 0x227 +#define IDS_DEV_LEGACY_SERVICE_NO_DEVICES 0x228 +#define IDS_DEV_DUPLICATE_DEVICE 0x229 +#define IDS_DEV_FAILED_POST_START 0x22A +#define IDS_DEV_HALTED 0x22B +#define IDS_DEV_PHANTOM 0x22C +#define IDS_DEV_SYSTEM_SHUTDOWN 0x22D +#define IDS_DEV_HELD_FOR_EJECT 0x22E +#define IDS_DEV_DRIVER_BLOCKED 0x22F +#define IDS_DEV_REGISTRY_TOO_LARGE 0x230 +#define IDS_DEV_SETPROPERTIES_FAILED 0x231 + #endif /* __DEVMGR_RESOURCE_H */ /* EOF */

18 years, 9 months

[mf] 19776: sprintf_s1

by mf＠svn.reactos.com

sprintf_s1 Modified: trunk/reactos/subsys/system/explorer/utility/utility.h Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h _____ Modified: trunk/reactos/subsys/system/explorer/utility/utility.h --- trunk/reactos/subsys/system/explorer/utility/utility.h 2005-11-30 11:57:20 UTC (rev 19775) +++ trunk/reactos/subsys/system/explorer/utility/utility.h 2005-11-30 14:02:55 UTC (rev 19776) @@ -166,6 +166,7 @@ #endif + // secure CRT functions #ifdef __STDC_WANT_SECURE_LIB__ // for VS 2005: _MSC_VER>=1400 #undef _vsntprintf _____ Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp --- trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2005-11-30 11:57:20 UTC (rev 19775) +++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2005-11-30 14:02:55 UTC (rev 19776) @@ -464,7 +464,7 @@ std::string EncodeXMLString(const XS_String& str) { LPCXSSTR s = str.c_str(); - LPXSSTR buffer = (LPXSSTR)alloca(5*sizeof(XS_CHAR)*XS_len(s)); // worst case. "&" + LPXSSTR buffer = (LPXSSTR)alloca(6*sizeof(XS_CHAR)*XS_len(s)); // worst case """ / "'" LPXSSTR o = buffer; for(LPCXSSTR p=s; *p; ++p) @@ -492,7 +492,7 @@ default: if ((unsigned)*p<20 && *p!='\t' && *p!='\r' && *p!='\n') { char b[16]; - sprintf(b, "&%d;", (unsigned)*p); + sprintf_s1(b, COUNTOF(b), "&%d;", (unsigned)*p); for(const char*q=b; *q; ) *o++ = *q++; } else _____ Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h --- trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-11-30 11:57:20 UTC (rev 19775) +++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-11-30 14:02:55 UTC (rev 19776) @@ -71,6 +71,14 @@ namespace XMLStorage { + // secure CRT functions +#ifdef __STDC_WANT_SECURE_LIB__ // VS 2005 +#define sprintf_s1 sprintf_s +#else +#define sprintf_s1(b, l, f, p1) sprintf(b, f, p1) +#endif + + #ifndef XS_String #ifdef XS_STRING_UTF8

18 years, 9 months

[mf] 19775: XML-encode characters below 0x20

by mf＠svn.reactos.com

XML-encode characters below 0x20 Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp _____ Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp --- trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2005-11-30 09:16:21 UTC (rev 19774) +++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2005-11-30 11:57:20 UTC (rev 19775) @@ -490,7 +490,13 @@ break; default: - *o++ = *p; + if ((unsigned)*p<20 && *p!='\t' && *p!='\r' && *p!='\n') { + char b[16]; + sprintf(b, "&%d;", (unsigned)*p); + for(const char*q=b; *q; ) + *o++ = *q++; + } else + *o++ = *p; } #ifdef XS_STRING_UTF8

18 years, 9 months

[cwittich] 19774: fix linker options

by cwittich＠svn.reactos.com

fix linker options Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-30 08:15:13 UTC (rev 19773) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-30 09:16:21 UTC (rev 19774) @@ -325,20 +325,27 @@ if ( sys ) { - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /DRIVER /ALIGN:0x20 /subsystem:NATIVE /SECTION:INIT,D /FORCE:MULTIPLE /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /DRIVER /ALIGN:0x20 /SUBSYSTEM:NATIVE /SECTION:INIT,D /NODEFAULTLIB /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DriverEntry" : module.entrypoint.c_str ()); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress == "" ? "0x10000" : module.baseaddress.c_str ()); } else if ( exe ) { - if ( module.type == Kernel || module.type == NativeCUI) + if ( module.type == Kernel ) { - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /SECTION:INIT,D /ALIGN:4096 /FORCE:MULTIPLE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /NODEFAULTLIB /SECTION:INIT,D /ALIGN:0x80\"\r\n" ); fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint.c_str ()); + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"KiSystemStartup\"\r\n" ); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress.c_str ()); } + else if ( module.type == NativeCUI ) + { + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /NODEFAULTLIB /ALIGN:0x20\"\r\n" ); + fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"NtProcessStartup\"\r\n" ); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress.c_str ()); + } else if ( module.type == Win32CUI || module.type == Win32GUI ) { fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 );

18 years, 9 months

[ion] 19773: - Implement remaining functions in rtl/i386/math_asm.S

by ion＠svn.reactos.com

- Implement remaining functions in rtl/i386/math_asm.S - Fix some more build issues. Modified: trunk/reactos/lib/rtl/i386/math_asm.S Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/rtl.xml Modified: trunk/reactos/lib/string/mbstowcs.c Modified: trunk/reactos/lib/string/sscanf.c Modified: trunk/reactos/lib/string/string.xml Modified: trunk/reactos/lib/string/wcstombs.c _____ Modified: trunk/reactos/lib/rtl/i386/math_asm.S --- trunk/reactos/lib/rtl/i386/math_asm.S 2005-11-30 08:01:56 UTC (rev 19772) +++ trunk/reactos/lib/rtl/i386/math_asm.S 2005-11-30 08:15:13 UTC (rev 19773) @@ -69,190 +69,891 @@ __fltused: .long 0x9875 +.intel_syntax noprefix + /* FUNCTIONS ***************************************************************/ -/* - * long long - * __alldiv(long long Dividend, long long Divisor)// - * - * Parameters: - * [ESP+04h] - long long Dividend - * [ESP+0Ch] - long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - long long quotient (Dividend/Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ +// +// lldiv - signed long divide +// +// Purpose: +// Does a signed long divide of the arguments. Arguments are +// not changed. +// +// Entry: +// Arguments are passed on the stack: +// 1st pushed: divisor (QWORD) +// 2nd pushed: dividend (QWORD) +// +// Exit: +// EDX:EAX contains the quotient (dividend/divisor) +// NOTE: this routine removes the parameters from the stack. +// +// Uses: +// ECX +// + __alldiv: - call ___divdi3 - ret $0x10 -/* - * long long - * __allmul(long long Multiplier, long long Multiplicand)// - * - * Parameters: - * [ESP+04h] - long long Multiplier - * [ESP+0Ch] - long long Multiplicand - * Registers: - * Unknown - * Returns: - * EDX:EAX - long long product (Multiplier*Multiplicand) - * Notes: - * Routine removes the arguments from the stack. - */ + push edi + push esi + push ebx + +// Set up the local stack and save the index registers. When this is done +// the stack frame will look as follows (assuming that the expression a/b will +// generate a call to lldiv(a, b)): +// +// ----------------- +// | | +// |---------------| +// | | +// |--divisor (b)--| +// | | +// |---------------| +// | | +// |--dividend (a)-| +// | | +// |---------------| +// | return addr** | +// |---------------| +// | EDI | +// |---------------| +// | ESI | +// |---------------| +// ESP---->| EBX | +// ----------------- +// + +#define DVNDLO [esp + 16] // stack address of dividend (a) +#define DVNDHI [esp + 20] // stack address of dividend (a) +#define DVSRLO [esp + 24] // stack address of divisor (b) +#define DVSRHI [esp + 28] // stack address of divisor (b) + +// Determine sign of the result (edi = 0 if result is positive, non-zero +// otherwise) and make operands positive. + + xor edi,edi // result sign assumed positive + + mov eax,DVNDHI // hi word of a + or eax,eax // test to see if signed + jge short L1 // skip rest if a is already positive + inc edi // complement result sign flag + mov edx,DVNDLO // lo word of a + neg eax // make a positive + neg edx + sbb eax,0 + mov DVNDHI,eax // save positive value + mov DVNDLO,edx +L1: + mov eax,DVSRHI // hi word of b + or eax,eax // test to see if signed + jge short L2 // skip rest if b is already positive + inc edi // complement the result sign flag + mov edx,DVSRLO // lo word of a + neg eax // make b positive + neg edx + sbb eax,0 + mov DVSRHI,eax // save positive value + mov DVSRLO,edx +L2: + +// +// Now do the divide. First look to see if the divisor is less than 4194304K. +// If so, then we can use a simple algorithm with word divides, otherwise +// things get a little more complex. +// +// NOTE - eax currently contains the high order word of DVSR +// + + or eax,eax // check to see if divisor < 4194304K + jnz short L3 // nope, gotta do this the hard way + mov ecx,DVSRLO // load divisor + mov eax,DVNDHI // load high word of dividend + xor edx,edx + div ecx // eax <- high order bits of quotient + mov ebx,eax // save high bits of quotient + mov eax,DVNDLO // edx:eax <- remainder:lo word of dividend + div ecx // eax <- low order bits of quotient + mov edx,ebx // edx:eax <- quotient + jmp short L4 // set sign, restore stack and return + +// +// Here we do it the hard way. Remember, eax contains the high word of DVSR +// + +L3: + mov ebx,eax // ebx:ecx <- divisor + mov ecx,DVSRLO + mov edx,DVNDHI // edx:eax <- dividend + mov eax,DVNDLO +L5: + shr ebx,1 // shift divisor right one bit + rcr ecx,1 + shr edx,1 // shift dividend right one bit + rcr eax,1 + or ebx,ebx + jnz short L5 // loop until divisor < 4194304K + div ecx // now divide, ignore remainder + mov esi,eax // save quotient + +// +// We may be off by one, so to check, we will multiply the quotient +// by the divisor and check the result against the orignal dividend +// Note that we must also check for overflow, which can occur if the +// dividend is close to 2**64 and the quotient is off by 1. +// + + mul dword ptr DVSRHI // QUOT * DVSRHI + mov ecx,eax + mov eax,DVSRLO + mul esi // QUOT * DVSRLO + add edx,ecx // EDX:EAX = QUOT * DVSR + jc short L6 // carry means Quotient is off by 1 + +// +// do long compare here between original dividend and the result of the +// multiply in edx:eax. If original is larger or equal, we are ok, otherwise +// subtract one (1) from the quotient. +// + + cmp edx,DVNDHI // compare hi words of result and original + ja short L6 // if result > original, do subtract + jb short L7 // if result < original, we are ok + cmp eax,DVNDLO // hi words are equal, compare lo words + jbe short L7 // if less or equal we are ok, else subtract +L6: + dec esi // subtract 1 from quotient +L7: + xor edx,edx // edx:eax <- quotient + mov eax,esi + +// +// Just the cleanup left to do. edx:eax contains the quotient. Set the sign +// according to the save value, cleanup the stack, and return. +// + +L4: + dec edi // check to see if result is negative + jnz short L8 // if EDI == 0, result should be negative + neg edx // otherwise, negate the result + neg eax + sbb edx,0 + +// +// Restore the saved registers and return. +// + +L8: + pop ebx + pop esi + pop edi + + ret 16 + +// +// llmul - long multiply routine +// +// Purpose: +// Does a long multiply (same for signed/unsigned) +// Parameters are not changed. +// +// Entry: +// Parameters are passed on the stack: +// 1st pushed: multiplier (QWORD) +// 2nd pushed: multiplicand (QWORD) +// +// Exit: +// EDX:EAX - product of multiplier and multiplicand +// NOTE: parameters are removed from the stack +// +// Uses: +// ECX +// + __allmul: - pushl %ebp - movl %esp, %ebp - pushl %edi - pushl %esi - pushl %ebx - subl $12, %esp - movl 16(%ebp), %ebx - movl 8(%ebp), %eax - mull %ebx - movl 20(%ebp), %ecx - movl %eax, -24(%ebp) - movl 8(%ebp), %eax - movl %edx, %esi - imull %ecx, %eax - addl %eax, %esi - movl 12(%ebp), %eax - imull %eax, %ebx - leal (%ebx,%esi), %eax - movl %eax, -20(%ebp) - movl -24(%ebp), %eax - movl -20(%ebp), %edx - addl $12, %esp - popl %ebx - popl %esi - popl %edi - popl %ebp - ret $0x10 -/* - * unsigned long long - * __aullrem(unsigned long long Dividend, unsigned long long Divisor)// - * - * Parameters: - * [ESP+04h] - unsigned long long Dividend - * [ESP+0Ch] - unsigned long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - unsigned long long remainder (Dividend%Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ -__aullrem: - call ___umoddi3 - ret $16 +#define ALO [esp + 4] // stack address of a +#define AHI [esp + 8] // stack address of a +#define BLO [esp + 12] // stack address of b +#define BHI [esp + 16] // stack address of b -/* - * long long - * __allshl(long long Value, unsigned char Shift)// - * - * Parameters: - * EDX:EAX - signed long long value to be shifted left - * CL - number of bits to shift by - * Registers: - * Destroys CL - * Returns: - * EDX:EAX - shifted value - */ +// +// AHI, BHI : upper 32 bits of A and B +// ALO, BLO : lower 32 bits of A and B +// +// ALO * BLO +// ALO * BHI +// + BLO * AHI +// --------------------- +// + + mov eax,AHI + mov ecx,BHI + or ecx,eax //test for both hiwords zero. + mov ecx,BLO + jnz short hard //both are zero, just mult ALO and BLO + + mov eax,AHI + mul ecx + + ret 16 // callee restores the stack + +hard: + push ebx + +// must redefine A and B since esp has been altered + +#define A2LO [esp + 4] // stack address of a +#define A2HI [esp + 8] // stack address of a +#define B2LO [esp + 12] // stack address of b +#define B2HI [esp + 16] // stack address of b + + mul ecx //eax has AHI, ecx has BLO, so AHI * BLO + mov ebx,eax //save result + + mov eax,A2LO + mul dword ptr B2HI //ALO * BHI + add ebx,eax //ebx = ((ALO * BHI) + (AHI * BLO)) + + mov eax,A2LO //ecx = BLO + mul ecx //so edx:eax = ALO*BLO + add edx,ebx //now edx has all the LO*HI stuff + + pop ebx + + ret 16 // callee restores the stack + +// +// llrem - signed long remainder +// +// Purpose: +// Does a signed long remainder of the arguments. Arguments are +// not changed. +// +// Entry: +// Arguments are passed on the stack: +// 1st pushed: divisor (QWORD) +// 2nd pushed: dividend (QWORD) +// +// Exit: +// EDX:EAX contains the remainder (dividend%divisor) +// NOTE: this routine removes the parameters from the stack. +// +// Uses: +// ECX +// + +__allrem : + + push ebx + push edi + +// Set up the local stack and save the index registers. When this is done +// the stack frame will look as follows (assuming that the expression a%b will +// generate a call to lrem(a, b)): +// +// ----------------- +// | | +// |---------------| +// | | +// |--divisor (b)--| +// | | +// |---------------| +// | | +// |--dividend (a)-| +// | | +// |---------------| +// | return addr** | +// |---------------| +// | EBX | +// |---------------| +// ESP---->| EDI | +// ----------------- +// + +#undef DVNDLO +#undef DVNDHI +#undef DVSRLO +#undef DVSRHI +#define DVNDLO [esp + 12] // stack address of dividend (a) +#define DVNDHI [esp + 16] // stack address of dividend (a) +#define DVSRLO [esp + 20] // stack address of divisor (b) +#define DVSRHI [esp + 24] // stack address of divisor (b) + +// Determine sign of the result (edi = 0 if result is positive, non-zero +// otherwise) and make operands positive. + + xor edi,edi // result sign assumed positive + + mov eax,DVNDHI // hi word of a + or eax,eax // test to see if signed + jge short .L1 // skip rest if a is already positive + inc edi // complement result sign flag bit + mov edx,DVNDLO // lo word of a + neg eax // make a positive + neg edx + sbb eax,0 + mov DVNDHI,eax // save positive value + mov DVNDLO,edx +.L1: + mov eax,DVSRHI // hi word of b + or eax,eax // test to see if signed + jge short .L2 // skip rest if b is already positive + mov edx,DVSRLO // lo word of b + neg eax // make b positive + neg edx + sbb eax,0 + mov DVSRHI,eax // save positive value + mov DVSRLO,edx +.L2: + +// +// Now do the divide. First look to see if the divisor is less than 4194304K. +// If so, then we can use a simple algorithm with word divides, otherwise +// things get a little more complex. +// +// NOTE - eax currently contains the high order word of DVSR +// + + or eax,eax // check to see if divisor < 4194304K + jnz short .L3 // nope, gotta do this the hard way + mov ecx,DVSRLO // load divisor + mov eax,DVNDHI // load high word of dividend + xor edx,edx + div ecx // edx <- remainder + mov eax,DVNDLO // edx:eax <- remainder:lo word of dividend + div ecx // edx <- final remainder + mov eax,edx // edx:eax <- remainder + xor edx,edx + dec edi // check result sign flag + jns short .L4 // negate result, restore stack and return + jmp short .L8 // result sign ok, restore stack and return + +// +// Here we do it the hard way. Remember, eax contains the high word of DVSR +// + +.L3: + mov ebx,eax // ebx:ecx <- divisor + mov ecx,DVSRLO + mov edx,DVNDHI // edx:eax <- dividend + mov eax,DVNDLO +.L5: + shr ebx,1 // shift divisor right one bit + rcr ecx,1 + shr edx,1 // shift dividend right one bit + rcr eax,1 + or ebx,ebx + jnz short .L5 // loop until divisor < 4194304K + div ecx // now divide, ignore remainder + +// +// We may be off by one, so to check, we will multiply the quotient +// by the divisor and check the result against the orignal dividend +// Note that we must also check for overflow, which can occur if the +// dividend is close to 2**64 and the quotient is off by 1. +// + + mov ecx,eax // save a copy of quotient in ECX + mul dword ptr DVSRHI + xchg ecx,eax // save product, get quotient in EAX + mul dword ptr DVSRLO + add edx,ecx // EDX:EAX = QUOT * DVSR + jc short .L6 // carry means Quotient is off by 1 + +// +// do long compare here between original dividend and the result of the +// multiply in edx:eax. If original is larger or equal, we are ok, otherwise +// subtract the original divisor from the result. +// + + cmp edx,DVNDHI // compare hi words of result and original + ja short .L6 // if result > original, do subtract + jb short .L7 // if result < original, we are ok + cmp eax,DVNDLO // hi words are equal, compare lo words + jbe short .L7 // if less or equal we are ok, else subtract +.L6: + sub eax,DVSRLO // subtract divisor from result + sbb edx,DVSRHI +.L7: + +// +// Calculate remainder by subtracting the result from the original dividend. +// Since the result is already in a register, we will do the subtract in the +// opposite direction and negate the result if necessary. +// + + sub eax,DVNDLO // subtract dividend from result + sbb edx,DVNDHI + +// +// Now check the result sign flag to see if the result is supposed to be positive +// or negative. It is currently negated (because we subtracted in the 'wrong' +// direction), so if the sign flag is set we are done, otherwise we must negate +// the result to make it positive again. +// + + dec edi // check result sign flag + jns short .L8 // result is ok, restore stack and return +.L4: + neg edx // otherwise, negate the result + neg eax + sbb edx,0 + +// +// Just the cleanup left to do. edx:eax contains the quotient. +// Restore the saved registers and return. +// + +.L8: + pop edi + pop ebx + + ret 16 + +// +// llshl - long shift left +// +// Purpose: +// Does a Long Shift Left (signed and unsigned are identical) +// Shifts a long left any number of bits. +// +// Entry: +// EDX:EAX - long value to be shifted +// CL - number of bits to shift by +// +// Exit: +// EDX:EAX - shifted value +// +// Uses: +// CL is destroyed. +// + __allshl: - shldl %cl, %eax, %edx - sall %cl, %eax - andl $32, %ecx - je 1f - movl %eax, %edx - xorl %eax, %eax -1: - ret -/* - * long long - * __allshr(long long Value, unsigned char Shift)// - * - * Parameters: - * EDX:EAX - signed long long value to be shifted right - * CL - number of bits to shift by - * Registers: - * Destroys CL - * Returns: - * EDX:EAX - shifted value - */ +// +// Handle shifts of 64 or more bits (all get 0) +// + cmp cl, 64 + jae short RETZERO + +// +// Handle shifts of between 0 and 31 bits +// + cmp cl, 32 + jae short MORE32 + shld edx,eax,cl + shl eax,cl + ret + +// +// Handle shifts of between 32 and 63 bits +// +MORE32: + mov edx,eax + xor eax,eax + and cl,31 + shl edx,cl + ret + +// +// return 0 in edx:eax +// +RETZERO: + xor eax,eax + xor edx,edx + ret + +// +// llshr - long shift right +// +// Purpose: +// Does a signed Long Shift Right +// Shifts a long right any number of bits. +// +// Entry: +// EDX:EAX - long value to be shifted +// CL - number of bits to shift by +// +// Exit: +// EDX:EAX - shifted value +// +// Uses: +// CL is destroyed. +// + __allshr: - shrdl %cl, %edx, %eax - sarl %cl, %edx - andl $32, %ecx - je 1f - movl %edx, %eax - sarl $31, %edx -1: - ret -/* - * unsigned long long - * __aulldiv(unsigned long long Dividend, unsigned long long Divisor)// - * - * Parameters: - * [ESP+04h] - unsigned long long Dividend - * [ESP+0Ch] - unsigned long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - unsigned long long quotient (Dividend/Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ +// +// Handle shifts of 64 bits or more (if shifting 64 bits or more, the result +// depends only on the high order bit of edx). +// + cmp cl,64 + jae short .RETSIGN + +// +// Handle shifts of between 0 and 31 bits +// + cmp cl, 32 + jae short .MORE32 + shrd eax,edx,cl + sar edx,cl + ret + +// +// Handle shifts of between 32 and 63 bits +// +.MORE32: + mov eax,edx + sar edx,31 + and cl,31 + sar eax,cl + ret + +// +// Return double precision 0 or -1, depending on the sign of edx +// +.RETSIGN: + sar edx,31 + mov eax,edx + ret + +// +// ulldiv - unsigned long divide +// +// Purpose: +// Does a unsigned long divide of the arguments. Arguments are +// not changed. +// +// Entry: +// Arguments are passed on the stack: +// 1st pushed: divisor (QWORD) +// 2nd pushed: dividend (QWORD) +// +// Exit: +// EDX:EAX contains the quotient (dividend/divisor) +// NOTE: this routine removes the parameters from the stack. +// +// Uses: +// ECX +// + __aulldiv: - call ___udivdi3 - ret $16 -/* - * unsigned long long - * __aullshr(unsigned long long Value, unsigned char Shift)// - * - * Parameters: - * EDX:EAX - unsigned long long value to be shifted right - * CL - number of bits to shift by - * Registers: - * Destroys CL - * Returns: - * EDX:EAX - shifted value - */ + push ebx + push esi + +// Set up the local stack and save the index registers. When this is done +// the stack frame will look as follows (assuming that the expression a/b will +// generate a call to uldiv(a, b)): +// +// ----------------- +// | | +// |---------------| +// | | +// |--divisor (b)--| +// | | +// |---------------| +// | | +// |--dividend (a)-| +// | | +// |---------------| +// | return addr** | +// |---------------| +// | EBX | +// |---------------| +// ESP---->| ESI | +// ----------------- +// + +#undef DVNDLO +#undef DVNDHI +#undef DVSRLO +#undef DVSRHI +#define DVNDLO [esp + 12] // stack address of dividend (a) +#define DVNDHI [esp + 16] // stack address of dividend (a) +#define DVSRLO [esp + 20] // stack address of divisor (b) +#define DVSRHI [esp + 24] // stack address of divisor (b) + +// +// Now do the divide. First look to see if the divisor is less than 4194304K. +// If so, then we can use a simple algorithm with word divides, otherwise +// things get a little more complex. +// + + mov eax,DVSRHI // check to see if divisor < 4194304K + or eax,eax + jnz short ..L1 // nope, gotta do this the hard way + mov ecx,DVSRLO // load divisor + mov eax,DVNDHI // load high word of dividend + xor edx,edx + div ecx // get high order bits of quotient + mov ebx,eax // save high bits of quotient + mov eax,DVNDLO // edx:eax <- remainder:lo word of dividend + div ecx // get low order bits of quotient + mov edx,ebx // edx:eax <- quotient hi:quotient lo + jmp short ..L2 // restore stack and return + +// +// Here we do it the hard way. Remember, eax contains DVSRHI +// + +..L1: + mov ecx,eax // ecx:ebx <- divisor + mov ebx,DVSRLO + mov edx,DVNDHI // edx:eax <- dividend + mov eax,DVNDLO +..L3: + shr ecx,1 // shift divisor right one bit// hi bit <- 0 + rcr ebx,1 + shr edx,1 // shift dividend right one bit// hi bit <- 0 + rcr eax,1 + or ecx,ecx + jnz short ..L3 // loop until divisor < 4194304K + div ebx // now divide, ignore remainder + mov esi,eax // save quotient + +// +// We may be off by one, so to check, we will multiply the quotient +// by the divisor and check the result against the orignal dividend +// Note that we must also check for overflow, which can occur if the +// dividend is close to 2**64 and the quotient is off by 1. +// + + mul dword ptr DVSRHI // QUOT * DVSRHI + mov ecx,eax + mov eax,DVSRLO + mul esi // QUOT * DVSRLO + add edx,ecx // EDX:EAX = QUOT * DVSR + jc short ..L4 // carry means Quotient is off by 1 + +// +// do long compare here between original dividend and the result of the +// multiply in edx:eax. If original is larger or equal, we are ok, otherwise +// subtract one (1) from the quotient. +// + + cmp edx,DVNDHI // compare hi words of result and original + ja short ..L4 // if result > original, do subtract + jb short ..L5 // if result < original, we are ok + cmp eax,DVNDLO // hi words are equal, compare lo words + jbe short ..L5 // if less or equal we are ok, else subtract +..L4: + dec esi // subtract 1 from quotient +..L5: + xor edx,edx // edx:eax <- quotient + mov eax,esi + +// +// Just the cleanup left to do. edx:eax contains the quotient. +// Restore the saved registers and return. +// + +..L2: + + pop esi + pop ebx + + ret 16 + +// +// ullshr - long shift right +// +// Purpose: +// Does a unsigned Long Shift Right +// Shifts a long right any number of bits. +// +// Entry: +// EDX:EAX - long value to be shifted +// CL - number of bits to shift by +// +// Exit: +// EDX:EAX - shifted value +// +// Uses: +// CL is destroyed. +// + __aullshr: - shrdl %cl, %edx, %eax - shrl %cl, %edx - andl $32, %ecx - je 1f - movl %edx, %eax -1: - ret - -/* - * long long - * __allrem(long long Dividend, long long Divisor)// - * - * Parameters: - * [ESP+04h] - long long Dividend - * [ESP+0Ch] - long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - long long remainder (Dividend/Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ -__allrem: - call ___moddi3 - ret $16 - -.intel_syntax noprefix +// +// Handle shifts of 64 bits or more (if shifting 64 bits or more, the result +// depends only on the high order bit of edx). +// + cmp cl,64 + jae short ..RETZERO + +// +// Handle shifts of between 0 and 31 bits +// + cmp cl, 32 + jae short ..MORE32 + shrd eax,edx,cl + shr edx,cl + ret + +// +// Handle shifts of between 32 and 63 bits +// +..MORE32: + mov eax,edx + xor edx,edx + and cl,31 + shr eax,cl + ret + +// +// return 0 in edx:eax +// +..RETZERO: + xor eax,eax + xor edx,edx + ret + +// +// ullrem - unsigned long remainder +// +// Purpose: +// Does a unsigned long remainder of the arguments. Arguments are +// not changed. +// +// Entry: +// Arguments are passed on the stack: +// 1st pushed: divisor (QWORD) +// 2nd pushed: dividend (QWORD) +// +// Exit: +// EDX:EAX contains the remainder (dividend%divisor) +// NOTE: this routine removes the parameters from the stack. +// +// Uses: +// ECX +// + +__aullrem: + + push ebx + +// Set up the local stack and save the index registers. When this is done +// the stack frame will look as follows (assuming that the expression a%b will +// generate a call to ullrem(a, b)): +// +// ----------------- +// | | +// |---------------| +// | | +// |--divisor (b)--| +// | | +// |---------------| +// | | +// |--dividend (a)-| +// | | +// |---------------| +// | return addr** | +// |---------------| +// ESP---->| EBX | +// ----------------- +// + +#undef DVNDLO +#undef DVNDHI +#undef DVSRLO +#undef DVSRHI +#define DVNDLO [esp + 8] // stack address of dividend (a) +#define DVNDHI [esp + 8] // stack address of dividend (a) +#define DVSRLO [esp + 16] // stack address of divisor (b) +#define DVSRHI [esp + 20] // stack address of divisor (b) + +// Now do the divide. First look to see if the divisor is less than 4194304K. +// If so, then we can use a simple algorithm with word divides, otherwise +// things get a little more complex. +// + + mov eax,DVSRHI // check to see if divisor < 4194304K + or eax,eax + jnz short ...L1 // nope, gotta do this the hard way + mov ecx,DVSRLO // load divisor + mov eax,DVNDHI // load high word of dividend + xor edx,edx + div ecx // edx <- remainder, eax <- quotient + mov eax,DVNDLO // edx:eax <- remainder:lo word of dividend + div ecx // edx <- final remainder + mov eax,edx // edx:eax <- remainder + xor edx,edx + jmp short ...L2 // restore stack and return + +// +// Here we do it the hard way. Remember, eax contains DVSRHI +// + +...L1: + mov ecx,eax // ecx:ebx <- divisor + mov ebx,DVSRLO + mov edx,DVNDHI // edx:eax <- dividend + mov eax,DVNDLO +...L3: [truncated at 1000 lines; 365 more skipped]

18 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005