Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 16468: SetupDiGetClassDevsExW: implement DIGCF_ALLCLASSES and DIGCF_DEVICEINTERFACE. use deviceset and enumstr parameters if provided
by hpoussin＠svn.reactos.com 06 Jul '05

06 Jul '05

SetupDiGetClassDevsExW: implement DIGCF_ALLCLASSES and DIGCF_DEVICEINTERFACE. use deviceset and enumstr parameters if provided Set right last error (if needed) in SetupDiCreateDeviceInfoListExW, SetupDiEnumDeviceInfo, SetupDiEnumDeviceInterfaces, SetupDiGetDeviceRegistryPropertyW Replace some constants by constant names Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-07-06 21:24:11 UTC (rev 16467) +++ trunk/reactos/lib/setupapi/devinst.c 2005-07-06 21:32:16 UTC (rev 16468) @@ -76,7 +76,21 @@ PWSTR InterfaceName; /* "COMx:" */ LPGUID InterfaceGuid; /* GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR */ #else - WCHAR DeviceInstance[0]; + BOOL IsDevice; /* This entry is a device or an interface */ + union + { + struct + { + GUID ClassGuid; + WCHAR RegistryKey[0]; /* "0000", "0001"... */ + } Device; + struct + { + GUID ClassGuid; + GUID InterfaceGuid; + WCHAR DeviceInstance[0]; /* "ACPI\PNP0501\4&2658d0a0&0"... */ + } Interface; + }; #endif } DeviceInfo; @@ -85,7 +99,7 @@ typedef struct _DeviceInfoList { DWORD magic; - GUID ClassGuid; + GUID ClassGuid; /* Only devices related of this class are in the device list */ HWND hWnd; HKEY HKLM; /* Local or distant HKEY_LOCAL_MACHINE registry key */ DWORD numberOfEntries; @@ -154,7 +168,7 @@ LPCWSTR MachineName, PVOID Reserved) { - WCHAR szKeyName[40]; + WCHAR szKeyName[MAX_GUID_STRING_LEN + 1]; HKEY hClassesKey; HKEY hClassKey; DWORD dwLength; @@ -179,7 +193,7 @@ for (dwIndex = 0; ; dwIndex++) { - dwLength = 40; + dwLength = MAX_GUID_STRING_LEN + 1; lError = RegEnumKeyExW(hClassesKey, dwIndex, szKeyName, @@ -359,7 +373,7 @@ LPCWSTR MachineName, PVOID Reserved) { - WCHAR szKeyName[40]; + WCHAR szKeyName[MAX_GUID_STRING_LEN + 1]; WCHAR szClassName[256]; HKEY hClassesKey; HKEY hClassKey; @@ -383,7 +397,7 @@ for (dwIndex = 0; ; dwIndex++) { - dwLength = 40; + dwLength = MAX_GUID_STRING_LEN + 1; lError = RegEnumKeyExW(hClassesKey, dwIndex, szKeyName, @@ -636,7 +650,10 @@ list = HeapAlloc(GetProcessHeap(), 0, sizeof(DeviceInfoList)); if (!list) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return (HDEVINFO)INVALID_HANDLE_VALUE; + } list->magic = SETUP_DEV_INFO_LIST_MAGIC; list->hWnd = hwndParent; @@ -676,7 +693,7 @@ if (list->magic != SETUP_DEV_INFO_LIST_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_USER_BUFFER); else if (MemberIndex >= list->numberOfEntries) SetLastError(ERROR_NO_MORE_ITEMS); else @@ -686,20 +703,27 @@ while (MemberIndex-- > 0) ItemList = ItemList->Flink; DevInfo = (DeviceInfo *)ItemList; + if (DevInfo->IsDevice) + { #ifdef __WINE__ - memcpy(&DeviceInfoData->ClassGuid, - DevInfo->InterfaceGuid, - sizeof(GUID)); - DeviceInfoData->DevInst = 0; /* FIXME */ - DeviceInfoData->Reserved = 0; + memcpy(&DeviceInfoData->ClassGuid, + DevInfo->InterfaceGuid, + sizeof(GUID)); + DeviceInfoData->DevInst = 0; /* FIXME */ + DeviceInfoData->Reserved = 0; #else - memcpy(&DeviceInfoData->ClassGuid, - &list->ClassGuid, /* FIXME */ - sizeof(GUID)); - DeviceInfoData->DevInst = 0; /* FIXME */ - DeviceInfoData->Reserved = 0; + memcpy(&DeviceInfoData->ClassGuid, + &DevInfo->Device.ClassGuid, + sizeof(GUID)); + DeviceInfoData->DevInst = 0; /* FIXME */ + DeviceInfoData->Reserved = 0; #endif - ret = TRUE; + ret = TRUE; + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + } } } else @@ -1125,28 +1149,25 @@ } #endif /* __WINE__ */ -static HDEVINFO SETUP_CreateDevListFromClass( +static LONG SETUP_CreateDevListFromClass( + DeviceInfoList *list, PCWSTR MachineName, - LPGUID class) + LPGUID class, + PCWSTR Enumerator) { - HDEVINFO hDeviceInfo; HKEY KeyClass; LONG rc; DWORD subKeys = 0, maxSubKey; DeviceInfo* deviceInfo; DWORD i; - hDeviceInfo = SetupDiCreateDeviceInfoListExW(class, NULL, MachineName, NULL); - if (hDeviceInfo == INVALID_HANDLE_VALUE) - return INVALID_HANDLE_VALUE; - KeyClass = SetupDiOpenClassRegKeyExW(class, KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, DIOCR_INSTALLER, MachineName, NULL); if (KeyClass == INVALID_HANDLE_VALUE) - { - SetupDiDestroyDeviceInfoList(hDeviceInfo); - return INVALID_HANDLE_VALUE; - } + return GetLastError(); + if (Enumerator) + FIXME("Enumerator parameter ignored\n"); + rc = RegQueryInfoKeyW( KeyClass, NULL, NULL, @@ -1157,35 +1178,185 @@ if (rc != ERROR_SUCCESS) { RegCloseKey(KeyClass); - SetLastError(rc); - return INVALID_HANDLE_VALUE; + return rc; } for (i = 0; i < subKeys; i++) { - deviceInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(DeviceInfo) + maxSubKey * sizeof(WCHAR)); + deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Device.RegistryKey) + maxSubKey * sizeof(WCHAR)); if (!deviceInfo) { - SetupDiDestroyDeviceInfoList(hDeviceInfo); - SetLastError(ERROR_NO_SYSTEM_RESOURCES); - return INVALID_HANDLE_VALUE; + RegCloseKey(KeyClass); + return ERROR_NO_SYSTEM_RESOURCES; } - rc = RegEnumKeyW(KeyClass, i, &deviceInfo->DeviceInstance[0], maxSubKey); + rc = RegEnumKeyW(KeyClass, i, &deviceInfo->Device.RegistryKey[0], maxSubKey); if (rc == ERROR_NO_MORE_ITEMS) break; if (rc != ERROR_SUCCESS) { - SetupDiDestroyDeviceInfoList(hDeviceInfo); - SetLastError(rc); - return INVALID_HANDLE_VALUE; + RegCloseKey(KeyClass); + return rc; } - InsertTailList(&((DeviceInfoList*)hDeviceInfo)->ListHead, &deviceInfo->ItemEntry); - ((DeviceInfoList*)hDeviceInfo)->numberOfEntries++; + deviceInfo->IsDevice = TRUE; + memcpy(&deviceInfo->Device.ClassGuid, class, sizeof(GUID)); + InsertTailList(&list->ListHead, &deviceInfo->ItemEntry); + list->numberOfEntries++; } RegCloseKey(KeyClass); + return ERROR_SUCCESS; +} - return hDeviceInfo; +static LONG SETUP_CreateInterfaceList( + DeviceInfoList *list, + PCWSTR MachineName, + LPGUID InterfaceGuid, + PCWSTR DeviceInstance /* OPTIONAL */) +{ + HKEY hInterfaceKey, hEnumKey, hKey; + LONG rc; + WCHAR KeyBuffer[max(MAX_PATH, MAX_GUID_STRING_LEN) + 1]; + DWORD i; + DWORD dwLength, dwRegType; + DeviceInfo *deviceInfo; + + /* Open registry key related to this interface */ + hInterfaceKey = SetupDiOpenClassRegKeyExW(InterfaceGuid, KEY_ENUMERATE_SUB_KEYS, DIOCR_INTERFACE, MachineName, NULL); + if (hInterfaceKey == INVALID_HANDLE_VALUE) + return GetLastError(); + + /* Enumerate sub keys */ + i = 0; + while (TRUE) + { + dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); + rc = RegEnumKeyExW(hInterfaceKey, i, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); + if (rc == ERROR_NO_MORE_ITEMS) + break; + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hInterfaceKey); + return rc; + } + i++; + + /* Open sub key */ + rc = RegOpenKeyEx(hInterfaceKey, KeyBuffer, 0, KEY_QUERY_VALUE, &hKey); + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hInterfaceKey); + return rc; + } + + /* Read DeviceInstance value */ + rc = RegQueryValueExW(hKey, L"DeviceInstance", NULL, &dwRegType, NULL, &dwLength); + if (rc != ERROR_SUCCESS ) + { + RegCloseKey(hKey); + RegCloseKey(hInterfaceKey); + return rc; + } + if (dwRegType != REG_SZ) + { + RegCloseKey(hKey); + RegCloseKey(hInterfaceKey); + return ERROR_GEN_FAILURE; + } + + /* Allocate memory for list entry and read DeviceInstance */ + deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Interface.DeviceInstance) + dwLength + sizeof(UNICODE_NULL)); + if (!deviceInfo) + { + RegCloseKey(hKey); + RegCloseKey(hInterfaceKey); + return ERROR_NO_SYSTEM_RESOURCES; + } + rc = RegQueryValueExW(hKey, L"DeviceInstance", NULL, NULL, (LPBYTE)&deviceInfo->Interface.DeviceInstance[0], &dwLength); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, deviceInfo); + RegCloseKey(hKey); + RegCloseKey(hInterfaceKey); + return rc; + } + deviceInfo->Interface.DeviceInstance[dwLength / sizeof(WCHAR)] = UNICODE_NULL; + TRACE("DeviceInstance %S\n", deviceInfo->Interface.DeviceInstance); + RegCloseKey(hKey); + + if (DeviceInstance) + { + /* Check if device enumerator is not the right one */ + if (wcscmp(DeviceInstance, deviceInfo->Interface.DeviceInstance) != 0) + { + HeapFree(GetProcessHeap(), 0, deviceInfo);; + continue; + } + } + + /* Find class GUID associated to the device instance */ + rc = RegOpenKeyEx( + HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Enum", + 0, /* Options */ + KEY_ENUMERATE_SUB_KEYS, + &hEnumKey); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, deviceInfo); + RegCloseKey(hInterfaceKey); + return rc; + } + rc = RegOpenKeyEx( + hEnumKey, + deviceInfo->Interface.DeviceInstance, + 0, /* Options */ + KEY_QUERY_VALUE, + &hKey); + RegCloseKey(hEnumKey); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, deviceInfo); + RegCloseKey(hInterfaceKey); + return rc; + } + dwLength = sizeof(KeyBuffer) - sizeof(UNICODE_NULL); + rc = RegQueryValueExW(hKey, L"ClassGUID", NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, deviceInfo); + RegCloseKey(hKey); + RegCloseKey(hInterfaceKey); + return rc; + } + KeyBuffer[dwLength / sizeof(WCHAR)] = UNICODE_NULL; + RegCloseKey(hKey); + KeyBuffer[37] = UNICODE_NULL; /* Replace the } by a NULL character */ + if (UuidFromStringW(&KeyBuffer[1], &deviceInfo->Interface.ClassGuid) != RPC_S_OK) + { + HeapFree(GetProcessHeap(), 0, deviceInfo); + return ERROR_GEN_FAILURE; + } + TRACE("ClassGUID %S\n", KeyBuffer); + + /* If current device matches the list GUID (if any), append the entry to the list */ + if (IsEqualIID(&list->ClassGuid, &GUID_NULL) || IsEqualIID(&list->ClassGuid, &deviceInfo->Interface.ClassGuid)) + { + TRACE("Entry found\n"); + deviceInfo->IsDevice = FALSE; + memcpy( + &deviceInfo->Interface.InterfaceGuid, + InterfaceGuid, + sizeof(deviceInfo->Interface.InterfaceGuid)); + InsertTailList(&list->ListHead, &deviceInfo->ItemEntry); + list->numberOfEntries++; + } + else + { + HeapFree(GetProcessHeap(), 0, deviceInfo); + } + } + RegCloseKey(hInterfaceKey); + return ERROR_SUCCESS; } /*********************************************************************** @@ -1200,38 +1371,141 @@ LPCWSTR machine, PVOID reserved) { - HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE; + HDEVINFO hDeviceInfo = INVALID_HANDLE_VALUE; + DeviceInfoList *list; + LPGUID pClassGuid; + LPGUID ClassGuidList; + DWORD RequiredSize; + LONG i; + LONG rc; TRACE("%s %s %p 0x%08lx %p %s %p\n", debugstr_guid(class), debugstr_w(enumstr), parent, flags, deviceset, debugstr_w(machine), reserved); + /* Create the deviceset if not set */ + if (deviceset) + { + list = (DeviceInfoList *)deviceset; + if (list->magic != SETUP_DEV_INFO_LIST_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return INVALID_HANDLE_VALUE; + } + hDeviceInfo = deviceset; + } + else + { + hDeviceInfo = SetupDiCreateDeviceInfoListExW( + flags & DIGCF_DEVICEINTERFACE ? NULL : class, + NULL, machine, NULL); + if (hDeviceInfo == INVALID_HANDLE_VALUE) + return INVALID_HANDLE_VALUE; + list = (DeviceInfoList *)hDeviceInfo; + } + + if (IsEqualIID(&list->ClassGuid, &GUID_NULL)) + pClassGuid = NULL; + else + pClassGuid = &list->ClassGuid; + if (flags & DIGCF_PRESENT) FIXME(": flag DIGCF_PRESENT ignored\n"); if (flags & DIGCF_PROFILE) FIXME(": flag DIGCF_PROFILE ignored\n"); - if (deviceset) - FIXME(": deviceset ignored\n"); - if (enumstr) - FIXME(": unimplemented for enumerator strings (%s)\n", - debugstr_w(enumstr)); - else if (flags & DIGCF_ALLCLASSES) - FIXME(": unimplemented for DIGCF_ALLCLASSES\n"); + if (flags & DIGCF_ALLCLASSES) + { + /* Get list of device classes */ + SetupDiBuildClassInfoList(0, NULL, 0, &RequiredSize); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return INVALID_HANDLE_VALUE; + } + ClassGuidList = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(GUID)); + if (!ClassGuidList) + { + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return INVALID_HANDLE_VALUE; + } + if (!SetupDiBuildClassInfoListExW(0, ClassGuidList, RequiredSize, &RequiredSize, machine, NULL)) + { + HeapFree(GetProcessHeap(), 0, ClassGuidList); + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return INVALID_HANDLE_VALUE; + } + + /* Enumerate devices in each device class */ + for (i = 0; i < RequiredSize; i++) + { + if (pClassGuid == NULL || IsEqualIID(pClassGuid, &ClassGuidList[i])) + { + rc = SETUP_CreateDevListFromClass(list, machine, &ClassGuidList[i], enumstr); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, ClassGuidList); + SetLastError(rc); + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return INVALID_HANDLE_VALUE; + } + } + } + HeapFree(GetProcessHeap(), 0, ClassGuidList); + return hDeviceInfo; + } else if (flags & DIGCF_DEVICEINTERFACE) - FIXME(": unimplemented for DIGCF_DEVICEINTERFACE\n"); - else { + if (class == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return INVALID_HANDLE_VALUE; + } + #ifdef __WINE__ - if (IsEqualIID(class, &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR)) - ret = SETUP_CreateSerialDeviceList(); - else -#else + /* Special case: find serial ports by calling QueryDosDevice */ + if (IsEqualIID(class, &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR) { - ret = SETUP_CreateDevListFromClass(machine, (LPGUID)class); + rc = SETUP_CreateSerialDeviceList(); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return INVALID_HANDLE_VALUE; + } + return hDeviceInfo; } #endif + + rc = SETUP_CreateInterfaceList(list, machine, (LPGUID)class, enumstr); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return INVALID_HANDLE_VALUE; + } + return hDeviceInfo; } - return ret; + else + { + rc = SETUP_CreateDevListFromClass(list, machine, (LPGUID)class, enumstr); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + if (!deviceset) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return INVALID_HANDLE_VALUE; + } + return hDeviceInfo; + } } /*********************************************************************** @@ -1268,25 +1542,32 @@ ItemList = ItemList->Flink; DevInfo = (DeviceInfo *)ItemList; - DeviceInterfaceData->cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); + if (!DevInfo->IsDevice) + { + DeviceInterfaceData->cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); /* FIXME: verify instead of setting */ #ifdef __WINE__ - /* FIXME: this assumes the only possible enumeration is of serial - * ports. - */ - memcpy(&DeviceInterfaceData->InterfaceClassGuid, - DevInfo->InterfaceGuid, - sizeof(DeviceInterfaceData->InterfaceClassGuid)); - DeviceInterfaceData->Flags = 0; - /* Note: this appears to be dangerous, passing a private - * pointer a heap-allocated datum to the caller. However, the - * expected lifetime of the device data is the same as the - * HDEVINFO; once that is closed, the data are no longer valid. - */ - DeviceInterfaceData->Reserved = (ULONG_PTR)DevInfo->InterfaceName; + /* FIXME: this assumes the only possible enumeration is of serial + * ports. + */ + memcpy(&DeviceInterfaceData->InterfaceClassGuid, + DevInfo->InterfaceGuid, + sizeof(DeviceInterfaceData->InterfaceClassGuid)); + DeviceInterfaceData->Flags = 0; + /* Note: this appears to be dangerous, passing a private + * pointer a heap-allocated datum to the caller. However, the + * expected lifetime of the device data is the same as the + * HDEVINFO; once that is closed, the data are no longer valid. + */ + DeviceInterfaceData->Reserved = (ULONG_PTR)DevInfo->InterfaceName; #else - FIXME("implemented\n"); + FIXME("unimplemented\n"); #endif - ret = TRUE; + ret = TRUE; + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + } } } else @@ -1513,6 +1794,7 @@ FIXME("%04lx %p %ld %p %p %ld %p\n", (DWORD)devinfo, DeviceInfoData, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); + SetLastError(ERROR_GEN_FAILURE); return FALSE; }

1 0

[gvg] 16467: zebasoftis <zebasoftis@gmail.com>:
by gvg＠svn.reactos.com 06 Jul '05

06 Jul '05

zebasoftis <zebasoftis(a)gmail.com>: Polish Resource File for control.exe Added: trunk/reactos/lib/cpl/control/Pl.rc Modified: trunk/reactos/lib/cpl/control/control.rc _____ Added: trunk/reactos/lib/cpl/control/Pl.rc --- trunk/reactos/lib/cpl/control/Pl.rc 2005-07-06 21:21:30 UTC (rev 16466) +++ trunk/reactos/lib/cpl/control/Pl.rc 2005-07-06 21:24:11 UTC (rev 16467) @@ -0,0 +1,28 @@ +// Polish language resource file (Sebastian Gasiorek, 2005-07-06) + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Plik" + BEGIN + MENUITEM "&Zamknij", IDM_CLOSE + END + POPUP "&Widok" + BEGIN + MENUITEM "Du?e ikony", IDM_LARGEICONS + MENUITEM "Ma?e ikony", IDM_SMALLICONS + MENUITEM "Lista", IDM_LIST + MENUITEM "Szczeg¾?y", IDM_DETAILS + END + POPUP "Pomoc" + BEGIN + MENUITEM "O programie", IDM_ABOUT + END +END + Property changes on: trunk/reactos/lib/cpl/control/Pl.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/control/control.rc --- trunk/reactos/lib/cpl/control/control.rc 2005-07-06 21:21:30 UTC (rev 16466) +++ trunk/reactos/lib/cpl/control/control.rc 2005-07-06 21:24:11 UTC (rev 16467) @@ -31,9 +31,10 @@ * a neutral version. This is to get localized bitmaps for example. */ +#include "En.rc" #include "Cz.rc" -#include "En.rc" #include "De.rc" #include "Dk.rc" +#include "Pl.rc" #include "Ru.rc" #include "Sv.rc"

1 0

[gvg] 16466: zebasoftis <zebasoftis@gmail.com>
by gvg＠svn.reactos.com 06 Jul '05

06 Jul '05

zebasoftis <zebasoftis(a)gmail.com> Polish Resource File for timedate.cpl Added: trunk/reactos/lib/cpl/timedate/Pl.rc Modified: trunk/reactos/lib/cpl/timedate/timedate.rc _____ Added: trunk/reactos/lib/cpl/timedate/Pl.rc --- trunk/reactos/lib/cpl/timedate/Pl.rc 2005-07-06 20:50:21 UTC (rev 16465) +++ trunk/reactos/lib/cpl/timedate/Pl.rc 2005-07-06 21:21:30 UTC (rev 16466) @@ -0,0 +1,44 @@ +// Polish translation by Sebastian Gasiorek + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Data i godzina" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "&Data", -1, 4, 2, 122, 125 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_SHORTDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 11, 17, 108, 12 + CONTROL "", IDC_MONTHCALENDAR, "SysMonthCal32", + WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 11, 37, 108, 80 + GROUPBOX "&Godzina", -1, 132, 2, 113, 125 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 144, 17, 90, 12 + LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 +END + + +IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Strefa czasowa" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "&Automatycznie uwzglÛdnij zmiany czasu", + IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "Data/Godzina" + IDS_CPLDESCRIPTION "Ustaw datÛ, godzinÛ i strefÛ czasow? komputera." + IDS_TIMEZONETEXT "Aktualna strefa czasowa: %s" + IDS_TIMEZONEINVALID "Nieprawid?owa" + IDS_TIMEZONEUNKNOWN "Nieznana" +END Property changes on: trunk/reactos/lib/cpl/timedate/Pl.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/timedate/timedate.rc --- trunk/reactos/lib/cpl/timedate/timedate.rc 2005-07-06 20:50:21 UTC (rev 16465) +++ trunk/reactos/lib/cpl/timedate/timedate.rc 2005-07-06 21:21:30 UTC (rev 16466) @@ -16,11 +16,12 @@ IDC_CPLICON ICON "resources/applet.ico" +#include "En.rc" #include "Cz.rc" -#include "En.rc" #include "De.rc" #include "Dk.rc" #include "Es.rc" #include "Fr.rc" +#include "Pl.rc" #include "Ru.rc" #include "Sv.rc"

1 0

[greatlrd] 16465: adding %errorlevel% code for date
by greatlrd＠svn.reactos.com 06 Jul '05

06 Jul '05

adding %errorlevel% code for date it is always 0 Modified: trunk/reactos/subsys/system/cmd/date.c _____ Modified: trunk/reactos/subsys/system/cmd/date.c --- trunk/reactos/subsys/system/cmd/date.c 2005-07-06 20:20:02 UTC (rev 16464) +++ trunk/reactos/subsys/system/cmd/date.c 2005-07-06 20:50:21 UTC (rev 16465) @@ -195,6 +195,8 @@ ConOutResPuts(STRING_DATE_HELP4); return 0; } + + nErrorLevel = 0; /* build parameter array */ arg = split (param, &argc, FALSE);

1 0

[ekohl] 16464: Move undocumented GUIDs to a new NDK header file.
by ekohl＠svn.reactos.com 06 Jul '05

06 Jul '05

Move undocumented GUIDs to a new NDK header file. Added: trunk/reactos/include/ndk/sysguid.h Modified: trunk/reactos/lib/wdmguid/wdmguid.c Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/w32api/include/ddk/wdmguid.h _____ Added: trunk/reactos/include/ndk/sysguid.h --- trunk/reactos/include/ndk/sysguid.h 2005-07-06 20:15:36 UTC (rev 16463) +++ trunk/reactos/include/ndk/sysguid.h 2005-07-06 20:20:02 UTC (rev 16464) @@ -0,0 +1,55 @@ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/sysguid.h + * PURPOSE: GUIDs not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ + +#ifndef _SYSGUID_H +#define _SYSGUID_H + +DEFINE_GUID(GUID_DEVICE_STANDBY_VETOED, + 0x03B21C13, 0x18D6, 0x11D3, 0x97, 0xDB, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_KERNEL_INITIATED_EJECT, + 0x14689B54, 0x0703, 0x11D3, 0x97, 0xD2, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_THERMAL_ZONE, + 0x4AFA3D51, 0x74A7, 0x11D0, 0xBE, 0x5E, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57); +DEFINE_GUID(GUID_DEVICE_SYS_BUTTON, + 0x4AFA3D53, 0x74A7, 0x11D0, 0xBE, 0x5E, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57); +DEFINE_GUID(GUID_DEVICE_REMOVAL_VETOED, + 0x60DBD5FA, 0xDDD2, 0x11D2, 0x97, 0xB8, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_HIBERNATE_VETOED, + 0x61173AD9, 0x194F, 0x11D3, 0x97, 0xDC, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_BATTERY, + 0x72631E54, 0x78A4, 0x11D0, 0xBC, 0xF7, 0x00, 0xAA, 0x00, 0xB7, 0xB3, 0x2A); +DEFINE_GUID(GUID_DEVICE_SAFE_REMOVAL, + 0x8FBEF967, 0xD6C5, 0x11D2, 0x97, 0xB5, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); + +DEFINE_GUID(GUID_DEVICE_ARRIVAL, + 0xCB3A4009, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_ENUMERATED, + 0xCB3A400A, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_ENUMERATE_REQUEST, + 0xCB3A400B, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_START_REQUEST, + 0xCB3A400C, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_REMOVE_PENDING, + 0xCB3A400D, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_QUERY_AND_REMOVE, + 0xCB3A400E, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_EJECT, + 0xCB3A400F, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_NOOP, + 0xCB3A4010, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_WARM_EJECT_VETOED, + 0xCBF4C1F9, 0x18D5, 0x11D3, 0x97, 0xDB, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_SURPRISE_REMOVAL, + 0xCE5AF000, 0x80DD, 0x11D2, 0xA8, 0x8D, 0x00, 0xA0, 0xC9, 0x69, 0x6B, 0x4B); +DEFINE_GUID(GUID_DEVICE_EJECT_VETOED, + 0xCF7B71E8, 0xD8FD, 0x11D2, 0x97, 0xB5, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_EVENT_RBC, + 0xD0744792, 0xA98E, 0x11D2, 0x91, 0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3); + +#endif _____ Modified: trunk/reactos/lib/wdmguid/wdmguid.c --- trunk/reactos/lib/wdmguid/wdmguid.c 2005-07-06 20:15:36 UTC (rev 16463) +++ trunk/reactos/lib/wdmguid/wdmguid.c 2005-07-06 20:20:02 UTC (rev 16464) @@ -5,5 +5,6 @@ #include "initguid.h" #include <ddk/wdmguid.h> +#include <ndk/sysguid.h> /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-07-06 20:15:36 UTC (rev 16463) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-07-06 20:20:02 UTC (rev 16464) @@ -18,6 +18,7 @@ #include <ddk/ntddk.h> #include <ddk/ntifs.h> #include <ddk/wdmguid.h> +#include <ndk/sysguid.h> #include <ndk/ntndk.h> #undef IO_TYPE_FILE #define IO_TYPE_FILE 0x0F5L /* Temp Hack */ _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-07-06 20:15:36 UTC (rev 16463) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-07-06 20:20:02 UTC (rev 16464) @@ -29,6 +29,7 @@ #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> +#include <ndk/sysguid.h> #include <ddk/wdmguid.h> #include <rpc.h> _____ Modified: trunk/reactos/w32api/include/ddk/wdmguid.h --- trunk/reactos/w32api/include/ddk/wdmguid.h 2005-07-06 20:15:36 UTC (rev 16463) +++ trunk/reactos/w32api/include/ddk/wdmguid.h 2005-07-06 20:20:02 UTC (rev 16464) @@ -115,26 +115,4 @@ DEFINE_GUID(GUID_POWER_DEVICE_WAKE_ENABLE, 0xa9546a82L, 0xfeb0, 0x11d0, 0xbd, 0x26, 0x00, 0xaa, 0x00, 0xb7, 0xb3, 0x2a); -DEFINE_GUID(GUID_DEVICE_STANDBY_VETOED, 0x03B21C13, 0x18D6, 0x11D3, 0x97, 0xDB, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); -DEFINE_GUID(GUID_DEVICE_KERNEL_INITIATED_EJECT, 0x14689B54, 0x0703, 0x11D3, 0x97, 0xD2, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); -DEFINE_GUID(GUID_DEVICE_THERMAL_ZONE, 0x4AFA3D51, 0x74A7, 0x11D0, 0xBE, 0x5E, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57); -DEFINE_GUID(GUID_DEVICE_SYS_BUTTON, 0x4AFA3D53, 0x74A7, 0x11D0, 0xBE, 0x5E, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57); -DEFINE_GUID(GUID_DEVICE_REMOVAL_VETOED, 0x60DBD5FA, 0xDDD2, 0x11D2, 0x97, 0xB8, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); -DEFINE_GUID(GUID_DEVICE_HIBERNATE_VETOED, 0x61173AD9, 0x194F, 0x11D3, 0x97, 0xDC, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); -DEFINE_GUID(GUID_DEVICE_BATTERY, 0x72631E54, 0x78A4, 0x11D0, 0xBC, 0xF7, 0x00, 0xAA, 0x00, 0xB7, 0xB3, 0x2A); -DEFINE_GUID(GUID_DEVICE_SAFE_REMOVAL, 0x8FBEF967, 0xD6C5, 0x11D2, 0x97, 0xB5, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); - -DEFINE_GUID(GUID_DEVICE_ARRIVAL, 0xCB3A4009, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_ENUMERATED, 0xCB3A400A, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_ENUMERATE_REQUEST, 0xCB3A400B, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_START_REQUEST, 0xCB3A400C, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_REMOVE_PENDING, 0xCB3A400D, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_QUERY_AND_REMOVE, 0xCB3A400E, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_EJECT, 0xCB3A400F, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_NOOP, 0xCB3A4010, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_WARM_EJECT_VETOED, 0xCBF4C1F9, 0x18D5, 0x11D3, 0x97, 0xDB, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); -DEFINE_GUID(GUID_DEVICE_SURPRISE_REMOVAL, 0xCE5AF000, 0x80DD, 0x11D2, 0xA8, 0x8D, 0x00, 0xA0, 0xC9, 0x69, 0x6B, 0x4B); -DEFINE_GUID(GUID_DEVICE_EJECT_VETOED, 0xCF7B71E8, 0xD8FD, 0x11D2, 0x97, 0xB5, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); -DEFINE_GUID(GUID_DEVICE_EVENT_RBC, 0xD0744792, 0xA98E, 0x11D2, 0x91, 0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3); - #endif /* __WDMGUID_H */

1 0

[greatlrd] 16463: set right errorlevel for cd / chdir, left to do we do not have /d param that are new in win2k maby in older windows also
by greatlrd＠svn.reactos.com 06 Jul '05

06 Jul '05

set right errorlevel for cd / chdir, left to do we do not have /d param that are new in win2k maby in older windows also Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-07-06 19:42:41 UTC (rev 16462) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-07-06 20:15:36 UTC (rev 16463) @@ -172,6 +172,8 @@ return 0; } + nErrorLevel = 0; + /* The whole param string is our parameter these days. The only thing we do is eliminating every quotation mark */ /* Is it safe to change the characters param is pointing to? I presume it is, as there doesn't seem to be any post-processing of it after the function call (what would that accomplish?) */ @@ -258,13 +260,14 @@ { hSearch = FindFirstFile(dir, &FileData); - if (hSearch == INVALID_HANDLE_VALUE) - { + if (hSearch == INVALID_HANDLE_VALUE) + { ConOutFormatMessage(GetLastError()); - free (lpOldPath); - lpOldPath = NULL; - return 1; - } + free (lpOldPath); + lpOldPath = NULL; + nErrorLevel = 1; + return 1; + } while (!fFinished) @@ -282,6 +285,7 @@ ConOutFormatMessage(GetLastError()); free (lpOldPath); lpOldPath = NULL; + nErrorLevel = 1; return 1; } @@ -293,6 +297,7 @@ { FindClose(hSearch); ConOutFormatMessage(GetLastError()); + nErrorLevel = 1; free (lpOldPath); lpOldPath = NULL; return 1; @@ -301,6 +306,7 @@ //ErrorMessage (GetLastError(), _T("CD")); ConOutFormatMessage(GetLastError()); + nErrorLevel = 1; /* throw away current directory */ free (lpOldPath);

1 0

[greatlrd] 16462: remove rem errorlevel it was never set stupied mistake by me.fix call setting errorlevel to 1
by greatlrd＠svn.reactos.com 06 Jul '05

06 Jul '05

remove rem errorlevel it was never set stupied mistake by me.fix call setting errorlevel to 1 Modified: trunk/reactos/subsys/system/cmd/call.c Modified: trunk/reactos/subsys/system/cmd/redir.c _____ Modified: trunk/reactos/subsys/system/cmd/call.c --- trunk/reactos/subsys/system/cmd/call.c 2005-07-06 19:13:24 UTC (rev 16461) +++ trunk/reactos/subsys/system/cmd/call.c 2005-07-06 19:42:41 UTC (rev 16462) @@ -54,6 +54,8 @@ return 0; } + nErrorLevel = 1; + n = (LPBATCH_CONTEXT)malloc (sizeof (BATCH_CONTEXT)); if (n == NULL) _____ Modified: trunk/reactos/subsys/system/cmd/redir.c --- trunk/reactos/subsys/system/cmd/redir.c 2005-07-06 19:13:24 UTC (rev 16461) +++ trunk/reactos/subsys/system/cmd/redir.c 2005-07-06 19:42:41 UTC (rev 16462) @@ -71,8 +71,7 @@ lpnFlags = 0; *ifn=('\0'); *ofn=('\0'); - *efn=_T('\0'); - nErrorLevel = 9009; + *efn=_T('\0'); return 1; } #endif

1 0

[greatlrd] 16461: set %errorlevel% for rem
by greatlrd＠svn.reactos.com 06 Jul '05

06 Jul '05

set %errorlevel% for rem Modified: trunk/reactos/subsys/system/cmd/redir.c _____ Modified: trunk/reactos/subsys/system/cmd/redir.c --- trunk/reactos/subsys/system/cmd/redir.c 2005-07-06 17:18:48 UTC (rev 16460) +++ trunk/reactos/subsys/system/cmd/redir.c 2005-07-06 19:13:24 UTC (rev 16461) @@ -61,6 +61,7 @@ TCHAR * line = s; + while (_istspace (*line)) line++; @@ -71,8 +72,9 @@ *ifn=('\0'); *ofn=('\0'); *efn=_T('\0'); + nErrorLevel = 9009; return 1; - } + } #endif /* find and remove all the redirections first */ while (*sp)

1 0

[weiden] 16460: don't use the DS_NOFAILCREATE style which I accidentally committed earlier
by weiden＠svn.reactos.com 06 Jul '05

06 Jul '05

don't use the DS_NOFAILCREATE style which I accidentally committed earlier Modified: trunk/reactos/lib/aclui/aclui_De.rc Modified: trunk/reactos/lib/aclui/aclui_En.rc Modified: trunk/reactos/lib/aclui/aclui_Sv.rc _____ Modified: trunk/reactos/lib/aclui/aclui_De.rc --- trunk/reactos/lib/aclui/aclui_De.rc 2005-07-06 16:56:28 UTC (rev 16459) +++ trunk/reactos/lib/aclui/aclui_De.rc 2005-07-06 17:18:48 UTC (rev 16460) @@ -1,7 +1,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT IDD_SECPAGE DIALOGEX 0, 0, 227, 215 -STYLE DS_NOFAILCREATE | DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Sicherheit" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN _____ Modified: trunk/reactos/lib/aclui/aclui_En.rc --- trunk/reactos/lib/aclui/aclui_En.rc 2005-07-06 16:56:28 UTC (rev 16459) +++ trunk/reactos/lib/aclui/aclui_En.rc 2005-07-06 17:18:48 UTC (rev 16460) @@ -1,7 +1,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_SECPAGE DIALOGEX 0, 0, 227, 215 -STYLE DS_NOFAILCREATE | DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Security" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN _____ Modified: trunk/reactos/lib/aclui/aclui_Sv.rc --- trunk/reactos/lib/aclui/aclui_Sv.rc 2005-07-06 16:56:28 UTC (rev 16459) +++ trunk/reactos/lib/aclui/aclui_Sv.rc 2005-07-06 17:18:48 UTC (rev 16460) @@ -19,7 +19,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT IDD_SECPAGE DIALOGEX 0, 0, 227, 215 -STYLE DS_NOFAILCREATE | DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Sõkerhet" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN

1 0

[chorns] 16459: Generate pre-compiled headers in intermediate directory tree
by chorns＠svn.reactos.com 06 Jul '05

06 Jul '05

Generate pre-compiled headers in intermediate directory tree Modified: trunk/reactos/hal/halx86/generic/generic.xml Modified: trunk/reactos/hal/halx86/xbox/halxbox.xml Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h _____ Modified: trunk/reactos/hal/halx86/generic/generic.xml --- trunk/reactos/hal/halx86/generic/generic.xml 2005-07-06 16:27:58 UTC (rev 16458) +++ trunk/reactos/hal/halx86/generic/generic.xml 2005-07-06 16:56:28 UTC (rev 16459) @@ -24,7 +24,7 @@ <file>sysinfo.c</file> <file>time.c</file> <file>timer.c</file> - <pch>../include/hal.h</pch> + <pch>../include/hal.h</pch> </module> <module name="hal_generic_up" type="objectlibrary"> <include base="hal_generic_up">../include</include> _____ Modified: trunk/reactos/hal/halx86/xbox/halxbox.xml --- trunk/reactos/hal/halx86/xbox/halxbox.xml 2005-07-06 16:27:58 UTC (rev 16458) +++ trunk/reactos/hal/halx86/xbox/halxbox.xml 2005-07-06 16:56:28 UTC (rev 16459) @@ -15,5 +15,4 @@ <file>part_xbox.c</file> <file>pci_xbox.c</file> <file>halxbox.rc</file> - <pch>../include/hal.h</pch> </module> _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-06 16:27:58 UTC (rev 16458) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-06 16:56:28 UTC (rev 16459) @@ -633,13 +633,24 @@ const IfableData& data ) { size_t i; + bool generateAssignment; - fprintf ( - fMakefile, - "%s %s", - macro.c_str(), - assignmentOperation ); - + generateAssignment = (use_pch && module.pch != NULL ) || data.includes.size () > 0 || data.defines.size () > 0 || data.compilerFlags.size () > 0; + if ( generateAssignment ) + { + fprintf ( fMakefile, + "%s %s", + macro.c_str(), + assignmentOperation ); + } + + if ( use_pch && module.pch != NULL ) + { + fprintf ( fMakefile, + " -I %s", + GetDirectory ( GetPrecompiledHeaderFilename () ).c_str () ); + } + string compilerParameters = GenerateCompilerParametersFromVector ( data.compilerFlags ); if ( compilerParameters.size () > 0 ) { @@ -669,7 +680,10 @@ "=%s", d.value.c_str() ); } - fprintf ( fMakefile, "\n" ); + if ( generateAssignment ) + { + fprintf ( fMakefile, "\n" ); + } } void @@ -680,15 +694,12 @@ { size_t i; - if ( data.includes.size () > 0 || data.defines.size () > 0 || data.compilerFlags.size () > 0 ) - { - GenerateMacro ( assignmentOperation, - cflagsMacro, - data ); - GenerateMacro ( assignmentOperation, - windresflagsMacro, - data ); - } + GenerateMacro ( assignmentOperation, + cflagsMacro, + data ); + GenerateMacro ( assignmentOperation, + windresflagsMacro, + data ); if ( linkerFlags != NULL ) { @@ -844,6 +855,14 @@ CleanupFileVector ( sourceFiles ); } +string +MingwModuleHandler::GetPrecompiledHeaderFilename () const +{ + const string& basePchFilename = module.pch->file.name + ".gch"; + return PassThruCacheDirectory ( NormalizeFilename ( basePchFilename ), + backend->intermediateDirectory ); +} + void MingwModuleHandler::GenerateGccCommand ( const string& sourceFilename, @@ -852,7 +871,7 @@ { string dependencies = sourceFilename; if ( module.pch && use_pch ) - dependencies += " " + module.pch->file.name + ".gch"; + dependencies += " " + GetPrecompiledHeaderFilename (); /* WIDL generated headers may be used */ dependencies += " " + GetLinkingDependenciesMacro (); @@ -1458,27 +1477,22 @@ const string& windresflagsMacro, const string& widlflagsMacro ) { - if ( module.pch ) + if ( module.pch && use_pch ) { - const string& pch_file = module.pch->file.name; - string gch_file = pch_file + ".gch"; - CLEAN_FILE(gch_file); - if ( use_pch ) - { - fprintf ( - fMakefile, - "%s: %s\n", - gch_file.c_str(), - pch_file.c_str() ); - fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); - fprintf ( - fMakefile, - "\t%s -o %s %s -g %s\n\n", - ( module.cplusplus ? cppc.c_str() : cc.c_str() ), - gch_file.c_str(), - cflagsMacro.c_str(), - pch_file.c_str() ); - } + const string& baseHeaderFilename = module.pch->file.name; + const string& pchFilename = GetPrecompiledHeaderFilename (); + CLEAN_FILE(pchFilename); + fprintf ( fMakefile, + "%s: %s\n", + pchFilename.c_str(), + baseHeaderFilename.c_str() ); + fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); + fprintf ( fMakefile, + "\t%s -o %s %s -g %s\n\n", + module.cplusplus ? cppc.c_str() : cc.c_str(), + pchFilename.c_str(), + cflagsMacro.c_str(), + baseHeaderFilename.c_str() ); } GenerateObjectFileTargets ( module.non_if_data, _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-07-06 16:27:58 UTC (rev 16458) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-07-06 16:56:28 UTC (rev 16459) @@ -124,6 +124,7 @@ std::string GenerateGccIncludeParameters () const; std::string GenerateGccParameters () const; std::string GenerateNasmParameters () const; + std::string MingwModuleHandler::GetPrecompiledHeaderFilename () const; void GenerateGccCommand ( const std::string& sourceFilename, const std::string& cc, const std::string& cflagsMacro );

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs