Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 38792: - Partly implement hardware types page
by dchapyshev＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: dchapyshev Date: Fri Jan 16 09:21:32 2009 New Revision: 38792 URL: http://svn.reactos.org/svn/reactos?rev=38792&view=rev Log: - Partly implement hardware types page Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -34,6 +34,7 @@ SP_CLASSIMAGELIST_DATA ImageListData; PWSTR pDeviceStatusText; HANDLE hProcessHeap; +HDEVINFO hDevInfoTypes; typedef BOOL (WINAPI *PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD); @@ -498,7 +499,13 @@ case PSN_SETACTIVE: { PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); - SendDlgItemMessage(hwndDlg, IDC_AUTOINSTALL, BM_SETCHECK, 1, 1); + if (SendDlgItemMessage(hwndDlg, IDC_AUTOINSTALL, BM_GETCHECK, 0, 0) == BST_CHECKED) + SendDlgItemMessage(hwndDlg, IDC_MANUALLYINST, BM_SETCHECK, 0, 0); + else + { + SendDlgItemMessage(hwndDlg, IDC_AUTOINSTALL, BM_SETCHECK, 1, 1); + SendDlgItemMessage(hwndDlg, IDC_MANUALLYINST, BM_SETCHECK, 0, 0); + } } break; @@ -558,11 +565,174 @@ return FALSE; } +static INT +EnumDeviceClasses(INT ClassIndex, + LPWSTR DevClassName, + LPWSTR DevClassDesc, + BOOL *DevPresent, + INT *ClassImage) +{ + GUID ClassGuid; + HKEY KeyClass; + WCHAR ClassName[MAX_STR_SIZE]; + DWORD RequiredSize = MAX_STR_SIZE; + UINT Ret; + + *DevPresent = FALSE; + *DevClassName = L'\0'; + + Ret = CM_Enumerate_Classes(ClassIndex, + &ClassGuid, + 0); + if (Ret != CR_SUCCESS) + { + /* all classes enumerated */ + if(Ret == CR_NO_SUCH_VALUE) + { + hDevInfoTypes = NULL; + return -1; + } + + if (Ret == CR_INVALID_DATA) + { + ; /*FIXME: what should we do here? */ + } + + /* handle other errors... */ + } + + if (SetupDiClassNameFromGuid(&ClassGuid, + ClassName, + RequiredSize, + &RequiredSize)) + { + lstrcpy(DevClassName, ClassName); + } + + if (!SetupDiGetClassImageIndex(&ImageListData, + &ClassGuid, + ClassImage)) + { + /* FIXME: can we do this? + * Set the blank icon: IDI_SETUPAPI_BLANK = 41 + * it'll be image 24 in the imagelist */ + *ClassImage = 24; + } + + /* Get device info for all devices of a particular class */ + hDevInfoTypes = SetupDiGetClassDevs(&ClassGuid, + NULL, + NULL, + DIGCF_PRESENT); + if (hDevInfoTypes == INVALID_HANDLE_VALUE) + { + hDevInfoTypes = NULL; + return 0; + } + + KeyClass = SetupDiOpenClassRegKeyEx(&ClassGuid, + MAXIMUM_ALLOWED, + DIOCR_INSTALLER, + NULL, + 0); + if (KeyClass != INVALID_HANDLE_VALUE) + { + + LONG dwSize = MAX_STR_SIZE; + + if (RegQueryValue(KeyClass, + NULL, + DevClassDesc, + &dwSize) != ERROR_SUCCESS) + { + *DevClassDesc = L'\0'; + } + } + else + { + return -3; + } + + *DevPresent = TRUE; + + RegCloseKey(KeyClass); + + return 0; +} + +static VOID +InitHardWareTypesPage(HWND hwndDlg) +{ + HWND hList = GetDlgItem(hwndDlg, IDC_HWTYPESLIST); + WCHAR DevName[MAX_STR_SIZE]; + WCHAR DevDesc[MAX_STR_SIZE]; + BOOL DevExist = FALSE; + INT ClassRet, DevImage, Index = 0; + LV_COLUMN Column; + LV_ITEM Item; + RECT Rect; + + if (!hList) return; + + ZeroMemory(&Column, sizeof(LV_COLUMN)); + + GetClientRect(hList, &Rect); + + Column.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; + Column.fmt = LVCFMT_LEFT; + Column.iSubItem = 0; + Column.pszText = NULL; + Column.cx = Rect.right - GetSystemMetrics(SM_CXVSCROLL); + (VOID) ListView_InsertColumn(hList, 0, &Column); + + ZeroMemory(&Item, sizeof(LV_ITEM)); + + do + { + ClassRet = EnumDeviceClasses(Index, + DevName, + DevDesc, + &DevExist, + &DevImage); + + if ((ClassRet != -1) && (DevExist)) + { + Item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; + Item.iItem = Index; + Item.iImage = DevImage; + + if (DevDesc[0] != L'\0') + Item.pszText = (LPWSTR) DevDesc; + else + Item.pszText = (LPWSTR) DevName; + + (VOID) ListView_InsertItem(hList, &Item); + + /* kill InfoList initialized in EnumDeviceClasses */ + if (hDevInfoTypes) + { + SetupDiDestroyDeviceInfoList(hDevInfoTypes); + hDevInfoTypes = NULL; + } + } + Index++; + } + while (ClassRet != -1); + + (VOID) ListView_SetImageList(hList, ImageListData.ImageList, LVSIL_SMALL); +} + static INT_PTR CALLBACK HdTypesPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { + case WM_INITDIALOG: + { + InitHardWareTypesPage(hwndDlg); + } + break; + case WM_NOTIFY: { LPNMHDR lpnm = (LPNMHDR)lParam; Modified: trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -62,7 +62,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -67,7 +67,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Detekovaný hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -77,7 +77,7 @@ BEGIN LTEXT "Pokud nevidíte vámi hledaný typ hardwaru, klepnìte na Zobrazit vechna zaøízení.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Bìné typy &hardwaru:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -62,7 +62,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Erkannte Hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "Wenn Sie die Hardwarekategorie, die Sie benötigen nicht finden, wählen Sie ""Alle Geräte"".", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Bekannte &Hardware Typen:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -62,7 +62,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -62,7 +62,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -62,7 +62,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Hardware detectado:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "Si no encuentra el tipo de hardware que desea, haga clic en Mostrar todos los dispositivos.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "&Tipos de hardware comunes:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -62,7 +62,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -63,7 +63,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -73,7 +73,7 @@ BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -62,7 +62,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -62,7 +62,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -62,7 +62,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -62,7 +62,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -62,7 +62,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Oppdaget maskinvare:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "Hvis du ikke ser maskinvare kategori som du ønsker, trykk på vis alle enheter.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Vanlige &maskinvare typer:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -67,7 +67,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Wykryte urz¹dzenia:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -77,7 +77,7 @@ BEGIN LTEXT "Jeli nie widzisz odpowiedniej kategorii urz¹dzeñ kliknij przycisk Poka¿ wszystkie urz¹dzenia.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "&Popularne typy urz¹dzeñ:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -62,7 +62,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -62,7 +62,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Îáíàðóæåííûå óñòðîéñòâà:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "Åñëè íóæíûé âàì òèï îáîðóäîâàíèÿ îòñóòñòâóåò, ùåëêíèòå ýëåìåíò ñïèñêà ""Ïîêàçàòü âñå óñòðîéñòâà"".", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "&Ñòàíäàðòíûå òèïû îáîðóäîâàíèÿ:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -67,7 +67,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -77,7 +77,7 @@ BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -62,7 +62,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -70,7 +70,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -80,7 +80,7 @@ BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc [iso-8859-1] Fri Jan 16 09:21:32 2009 @@ -68,7 +68,7 @@ BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 - CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -78,7 +78,7 @@ BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 - CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143

1 0

[cwittich] 38791: reapply 36982 WIDL: Enable the use of scalar types (non-pointer types) as custom binding handles.
by cwittich＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: cwittich Date: Fri Jan 16 09:16:09 2009 New Revision: 38791 URL: http://svn.reactos.org/svn/reactos?rev=38791&view=rev Log: reapply 36982 WIDL: Enable the use of scalar types (non-pointer types) as custom binding handles. Modified: trunk/reactos/tools/widl/header.c Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=38… ============================================================================== --- trunk/reactos/tools/widl/header.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/header.c [iso-8859-1] Fri Jan 16 09:16:09 2009 @@ -537,10 +537,18 @@ const type_t* get_explicit_generic_handle_type(const var_t* var) { - const type_t *t; - for (t = var->type; is_ptr(t); t = t->ref) - if (t->type != RPC_FC_BIND_PRIMITIVE && is_attr(t->attrs, ATTR_HANDLE)) - return t; + const type_t *t = var->type; + + if (t->type == RPC_FC_BIND_PRIMITIVE) + return NULL; + + if (!is_ptr(t) && is_attr(t->attrs, ATTR_HANDLE)) + return t; + else + for (; is_ptr(t); t = t->ref) + if (t->type != RPC_FC_BIND_PRIMITIVE && is_attr(t->attrs, ATTR_HANDLE)) + return t; + return NULL; }

1 0

[mjmartin] 38790: - create.c: All instances of a pipe must be the same pipe mode as when first instance was created. Clients start of in byte stream mode, regardless of the pipe's mode. - finfo.c: NPFS does not allow changing read mode to message for byte stream mode pipes. - rw.c: The format in which data is in the pipe's buffer is based on the pipe mode vice read mode. Implement reads in byte stream mode for pipes using message mode. Fixed a bug that could caused buffer data to be corrupted du
by mjmartin＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: mjmartin Date: Fri Jan 16 08:33:45 2009 New Revision: 38790 URL: http://svn.reactos.org/svn/reactos?rev=38790&view=rev Log: - create.c: All instances of a pipe must be the same pipe mode as when first instance was created. Clients start of in byte stream mode, regardless of the pipe's mode. - finfo.c: NPFS does not allow changing read mode to message for byte stream mode pipes. - rw.c: The format in which data is in the pipe's buffer is based on the pipe mode vice read mode. Implement reads in byte stream mode for pipes using message mode. Fixed a bug that could caused buffer data to be corrupted due to incorrect calc of WritePtr position. - fsctrl.c: Return buffer from NpfsPeekPipe if caller requested. Use a mutex before reading the pipe's buffer. Return the correct length in Irp info. Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/finfo.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Fri Jan 16 08:33:45 2009 @@ -373,9 +373,9 @@ return STATUS_INSTANCE_NOT_AVAILABLE; } - /* FIXME: Check pipe modes also! */ if (Fcb->MaximumInstances != Buffer->MaximumInstances || - Fcb->TimeOut.QuadPart != Buffer->DefaultTimeout.QuadPart) + Fcb->TimeOut.QuadPart != Buffer->DefaultTimeout.QuadPart || + Fcb->PipeType != Buffer->NamedPipeType) { DPRINT("Asked for invalid pipe mode.\n"); ExFreePool(Ccb); @@ -388,6 +388,7 @@ { NewPipe = TRUE; Fcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_FCB)); + if (Fcb == NULL) { KeUnlockMutex(&DeviceExt->PipeListLock); @@ -420,8 +421,11 @@ KeInitializeMutex(&Fcb->CcbListLock, 0); Fcb->PipeType = Buffer->NamedPipeType; - Fcb->WriteMode = Buffer->ReadMode; - Fcb->ReadMode = Buffer->ReadMode; + /* FIXME: Verify which is correct */ + Fcb->WriteMode = Buffer->ReadMode;//Buffer->NamedPipeType; + /* MSDN documentation read that clients always start off in byte mode */ + Fcb->ReadMode = FILE_PIPE_BYTE_STREAM_MODE; + Fcb->CompletionMode = Buffer->CompletionMode; switch (IoStack->Parameters.CreatePipe.ShareAccess & (FILE_SHARE_READ|FILE_SHARE_WRITE)) { @@ -737,6 +741,10 @@ DPRINT("Client\n"); } + /* Disconnect the pipes */ + if (Ccb->OtherSide) Ccb->OtherSide->OtherSide = NULL; + if (Ccb) Ccb->OtherSide = NULL; + ASSERT(Ccb->PipeState == FILE_PIPE_CLOSING_STATE); FileObject->FsContext2 = NULL; Modified: trunk/reactos/drivers/filesystems/npfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/finfo.c [iso-8859-1] Fri Jan 16 08:33:45 2009 @@ -29,6 +29,12 @@ /* Get the Pipe and data */ Fcb = Ccb->Fcb; Request = (PFILE_PIPE_INFORMATION)Info; + + if ((Fcb->PipeType == FILE_PIPE_BYTE_STREAM_MODE) && (Request->ReadMode == FILE_PIPE_MESSAGE_MODE)) + { + DPRINT("Cannot change readmode to message type on a byte type pipe!\n"); + return STATUS_ACCESS_DENIED; + } /* Set Pipe Data */ Fcb->ReadMode = Request->ReadMode; Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Fri Jan 16 08:33:45 2009 @@ -202,7 +202,7 @@ { Server = (Ccb->PipeEnd == FILE_PIPE_SERVER_END); OtherSide = Ccb->OtherSide; - Ccb->OtherSide = NULL; + //Ccb->OtherSide = NULL; Ccb->PipeState = FILE_PIPE_DISCONNECTED_STATE; /* Lock the server first */ if (Server) @@ -216,7 +216,7 @@ ExAcquireFastMutex(&Ccb->DataListLock); } OtherSide->PipeState = FILE_PIPE_DISCONNECTED_STATE; - OtherSide->OtherSide = NULL; + //OtherSide->OtherSide = NULL; /* * Signaling the write event. If is possible that an other * thread waits for an empty buffer. @@ -365,6 +365,7 @@ PIO_STACK_LOCATION IoStack) { ULONG OutputBufferLength; + ULONG ReturnLength = 0; PFILE_PIPE_PEEK_BUFFER Reply; PNPFS_FCB Fcb; PNPFS_CCB Ccb; @@ -396,11 +397,21 @@ Reply->ReadDataAvailable = Ccb->ReadDataAvailable; DPRINT("ReadDataAvailable: %lu\n", Ccb->ReadDataAvailable); - if (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) + ExAcquireFastMutex(&Ccb->DataListLock); + BufferPtr = Ccb->Data; + DPRINT("BufferPtr = %x\n", BufferPtr); + if (Ccb->Fcb->PipeType == FILE_PIPE_BYTE_STREAM_MODE) { DPRINT("Byte Stream Mode\n"); Reply->MessageLength = Ccb->ReadDataAvailable; - DPRINT("Reply->MessageLength %d\n",Reply->MessageLength ); + DPRINT("Reply->MessageLength %lu\n",Reply->MessageLength ); + MessageCount = 1; + ReturnLength = Ccb->ReadDataAvailable; + + if (Reply->Data[0] && (OutputBufferLength >= ReturnLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0]))) + { + memcpy(&Reply->Data[0], (PVOID)BufferPtr, Ccb->ReadDataAvailable); + } } else { @@ -410,7 +421,7 @@ if (ReadDataAvailable > 0) { memcpy(&Reply->MessageLength,Ccb->Data,sizeof(ULONG)); - BufferPtr = Ccb->Data; + /* NOTE: Modifying the structure in header file to keep track of NumberOfMessage would be better */ while ((ReadDataAvailable > 0) && (BufferPtr < Ccb->WritePtr)) { @@ -418,34 +429,37 @@ ASSERT(MessageLength > 0); - DPRINT("MessageLength = %d\n",MessageLength); + DPRINT("MessageLength = %lu\n",MessageLength); MessageCount++; ReadDataAvailable -= MessageLength; /* If its the first message, copy the Message if the size of buffer is large enough */ - if ((MessageCount==1) && (Reply->Data[0]) - && (OutputBufferLength >= (sizeof(FILE_PIPE_PEEK_BUFFER) + MessageLength))) + if (MessageCount==1) { - memcpy(&Reply->Data[0], (PVOID)((ULONG)BufferPtr + sizeof(MessageLength)), MessageLength); + ReturnLength = MessageLength; + if ((Reply->Data[0]) + && (OutputBufferLength >= (MessageLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0])))) + { + memcpy(&Reply->Data[0], (PVOID)((ULONG)BufferPtr + sizeof(MessageLength)), MessageLength); + } } BufferPtr =(PVOID)((ULONG)BufferPtr + MessageLength + sizeof(MessageLength)); - DPRINT("Message %d\n",MessageCount); + DPRINT("BufferPtr = %x\n", BufferPtr); DPRINT("ReadDataAvailable: %lu\n", ReadDataAvailable); } if (ReadDataAvailable != 0) { - DPRINT1("This should never happen! Possible memory corruption.\n"); - return STATUS_UNSUCCESSFUL; + DPRINT1("Possible memory corruption.\n"); + ASSERT(FALSE); } } } + ExReleaseFastMutex(&Ccb->DataListLock); Reply->NumberOfMessages = MessageCount; - if (MessageCount > 0) - Reply->Data[0] = 0; - - Irp->IoStatus.Information = OutputBufferLength; + + Irp->IoStatus.Information = ReturnLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0]); Irp->IoStatus.Status = STATUS_SUCCESS; Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Fri Jan 16 08:33:45 2009 @@ -16,7 +16,6 @@ /* FUNCTIONS *****************************************************************/ -#ifndef NDEBUG VOID HexDump(PUCHAR Buffer, ULONG Length) { CHAR Line[65]; @@ -42,7 +41,6 @@ } DbgPrint("---------------\n"); } -#endif static DRIVER_CANCEL NpfsReadWriteCancelRoutine; static VOID NTAPI @@ -360,7 +358,6 @@ Irp->RequestorMode, FALSE, NULL); - if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) { Status = STATUS_CANCELLED; @@ -449,7 +446,7 @@ Irp->RequestorMode, FALSE, NULL); - DPRINT("Finished waiting (%wZ)! Status: %x\n", &Ccb->Fcb->PipeName, Status); + DPRINT("Finished waiting (%wZ)! Status: %x\n", &Ccb->Fcb->PipeName, Status); if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) { @@ -480,9 +477,11 @@ } } ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); - if (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) - { - DPRINT("Byte stream mode\n"); + + /* If the pipe type and read mode are both byte stream */ + if ((Ccb->Fcb->PipeType == FILE_PIPE_BYTE_STREAM_MODE) && (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE)) + { + DPRINT("Byte stream mode: Ccb->Data %x\n", Ccb->Data); /* Byte stream mode */ while (Length > 0 && Ccb->ReadDataAvailable > 0) { @@ -522,115 +521,135 @@ break; } } - else - { - DPRINT("Message mode\n"); - - /* For Message mode, the Message length will be stored in the buffer preceeding the Message. */ - if (Ccb->ReadDataAvailable) - { - ULONG NextMessageLength=0; - //HexDump(Ccb->Data, (ULONG)Ccb->WritePtr - (ULONG)Ccb->Data); - /*First get the size of the message */ - memcpy(&NextMessageLength, Ccb->Data, sizeof(NextMessageLength)); - if ((NextMessageLength == 0) || (NextMessageLength > Ccb->ReadDataAvailable)) + else if (Ccb->Fcb->PipeType == FILE_PIPE_MESSAGE_MODE) + { + ULONG ThisCopyLength = 0; + ULONG TotalLengthNeeded = min(Length, Ccb->ReadDataAvailable); + + DPRINT("Message mode: Ccb>Data %x\n", Ccb->Data); + + do + { + Buffer = (PVOID)((ULONG_PTR)Buffer + ThisCopyLength); + + /* For Message mode, the Message length will be stored in the buffer preceeding the Message. */ + if (Ccb->ReadDataAvailable) { - DPRINT1("This should never happen! Possible memory corruption.\n"); -#ifndef NDEBUG - HexDump(Ccb->Data, (ULONG)Ccb->WritePtr - (ULONG)Ccb->Data); -#endif - ASSERT(FALSE); - } - - /* Use the smaller value */ - - CopyLength = min(NextMessageLength, Length); - - /* retrieve the message from the buffer */ - memcpy(Buffer, (PVOID)((ULONG)Ccb->Data + sizeof(NextMessageLength)), CopyLength); - - - if (Ccb->ReadDataAvailable > CopyLength) - { - if (CopyLength < NextMessageLength) + ULONG NextMessageLength = 0; + + /*First get the size of the message */ + memcpy(&NextMessageLength, Ccb->Data, sizeof(NextMessageLength)); + + if ((NextMessageLength == 0) || (NextMessageLength > Ccb->ReadDataAvailable)) { - /* Client only requested part of the message */ - - /* Calculate the remaining message new size */ - ULONG NewMessageSize = NextMessageLength-CopyLength; - - /* Write a new Message size to buffer for the part of the message still there */ - memcpy(Ccb->Data, &NewMessageSize, sizeof(NewMessageSize)); - - /* Move the memory starting from end of partial Message just retrieved */ - memmove((PVOID)((ULONG_PTR)Ccb->Data + sizeof(NewMessageSize)), - (PVOID)((ULONG_PTR) Ccb->Data + CopyLength + sizeof(NewMessageSize)), - (ULONG)Ccb->WritePtr - ((ULONG)Ccb->Data + sizeof(NewMessageSize)) - CopyLength); - - /* Update the write pointer */ - Ccb->WritePtr = (PVOID)((ULONG)Ccb->WritePtr - CopyLength); - - /* Add CopyLength only to WriteQuotaAvailable as the - Message Size was replaced in the buffer */ - Ccb->WriteQuotaAvailable += CopyLength; + DPRINT("Possible memory corruption.\n"); + HexDump(Ccb->Data, (ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->Data); + ASSERT(FALSE); + } + + /* Use the smaller value */ + ThisCopyLength = min(NextMessageLength, Length); + + /* retrieve the message from the buffer */ + memcpy(Buffer, (PVOID)((ULONG_PTR)Ccb->Data + sizeof(NextMessageLength)), ThisCopyLength); + + if (Ccb->ReadDataAvailable > ThisCopyLength) + { + if (ThisCopyLength < NextMessageLength) + { + /* Client only requested part of the message */ + + /* Calculate the remaining message new size */ + ULONG NewMessageSize = NextMessageLength-ThisCopyLength; + + /* Write a new Message size to buffer for the part of the message still there */ + memcpy(Ccb->Data, &NewMessageSize, sizeof(NewMessageSize)); + + /* Move the memory starting from end of partial Message just retrieved */ + memmove((PVOID)((ULONG_PTR)Ccb->Data + sizeof(NewMessageSize)), + (PVOID)((ULONG_PTR)Ccb->Data + ThisCopyLength + sizeof(NewMessageSize)), + (ULONG_PTR)Ccb->WritePtr - ((ULONG_PTR)Ccb->Data + sizeof(NewMessageSize)) - + ThisCopyLength); + + /* Update the write pointer */ + Ccb->WritePtr = (PVOID)((ULONG_PTR)Ccb->WritePtr - ThisCopyLength); + + /* Add ThisCopyLength only to WriteQuotaAvailable as the + Message Size was replaced in the buffer */ + Ccb->WriteQuotaAvailable += ThisCopyLength; + } + else + { + /* Client wanted the entire message */ + + /* Move the memory starting from the next Message just retrieved */ + memmove(Ccb->Data, + (PVOID)((ULONG_PTR) Ccb->Data + NextMessageLength + sizeof(NextMessageLength)), + (ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->Data - NextMessageLength - + sizeof(NextMessageLength)); + + /* Update the write pointer */ + Ccb->WritePtr = (PVOID)((ULONG_PTR)Ccb->WritePtr - ThisCopyLength - + sizeof(NextMessageLength)); + + /* Add both the message length and the header to the WriteQuotaAvailable + as they both were removed */ + Ccb->WriteQuotaAvailable += (ThisCopyLength + sizeof(NextMessageLength)); + } } else { - /* Client wanted the entire message */ - - /* Move the memory starting from the next Message just retrieved */ - memmove(Ccb->Data, - (PVOID)((ULONG_PTR) Ccb->Data + NextMessageLength + sizeof(NextMessageLength)), - (ULONG)Ccb->WritePtr - (ULONG)Ccb->Data - NextMessageLength - sizeof(NextMessageLength)); - - /* Update the write pointer */ - Ccb->WritePtr = (PVOID)((ULONG)Ccb->WritePtr - NextMessageLength); + /* This was the last Message, so just zero this messages for safety sake */ + memset(Ccb->Data, 0, NextMessageLength + sizeof(NextMessageLength)); + + /* reset the write pointer to beginning of buffer */ + Ccb->WritePtr = Ccb->Data; /* Add both the message length and the header to the WriteQuotaAvailable as they both were removed */ - Ccb->WriteQuotaAvailable += (CopyLength + sizeof(NextMessageLength)); + Ccb->WriteQuotaAvailable += (ThisCopyLength + sizeof(ULONG)); + + KeResetEvent(&Ccb->ReadEvent); + if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) + { + KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); + } } +#ifndef NDEBUG + DPRINT("Length %d Buffer %x\n",ThisCopyLength,Buffer); + HexDump((PUCHAR)Buffer, ThisCopyLength); +#endif + + Information += ThisCopyLength; + + Ccb->ReadDataAvailable -= ThisCopyLength; + + if ((ULONG)Ccb->WriteQuotaAvailable > (ULONG)Ccb->MaxDataLength) ASSERT(FALSE); } - else - { - /* This was the last Message, so just zero this messages for safety sake */ - memset(Ccb->Data,0,NextMessageLength + sizeof(NextMessageLength)); - - /* reset the write pointer to beginning of buffer */ - Ccb->WritePtr = Ccb->Data; - - /* Add both the message length and the header to the WriteQuotaAvailable - as they both were removed */ - Ccb->WriteQuotaAvailable += (CopyLength + sizeof(ULONG)); - - KeResetEvent(&Ccb->ReadEvent); - if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) - { - KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); - } - } -#ifndef NDEBUG - DPRINT("Length %d Buffer %x\n",CopyLength,Buffer); - HexDump((PUCHAR)Buffer, CopyLength); -#endif - - Information += CopyLength; - - Ccb->ReadDataAvailable -= CopyLength; - - if ((ULONG)Ccb->WriteQuotaAvailable > (ULONG)Ccb->MaxDataLength) ASSERT(FALSE); - } + + }while ((ThisCopyLength < TotalLengthNeeded) + && (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) + && (Ccb->ReadDataAvailable)); + if (Information > 0) { break; } + } + else + { + DPRINT1("Unhandled Pipe Mode with Read Mode!\n"); + ASSERT(FALSE); } } Irp->IoStatus.Information = Information; Irp->IoStatus.Status = Status; ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); + + if (Status == STATUS_CANCELLED) + goto done; if (IoIsOperationSynchronous(Irp)) { @@ -718,15 +737,15 @@ if (Irp->MdlAddress == NULL) { - DPRINT1("Irp->MdlAddress == NULL\n"); + DPRINT("Irp->MdlAddress == NULL\n"); Status = STATUS_UNSUCCESSFUL; Length = 0; goto done; } - if (ReaderCcb == NULL) - { - DPRINT1("Pipe is NOT connected!\n"); + if ((ReaderCcb == NULL) || (Ccb->PipeState != FILE_PIPE_CONNECTED_STATE)) + { + DPRINT("Pipe is NOT connected!\n"); if (Ccb->PipeState == FILE_PIPE_LISTENING_STATE) Status = STATUS_PIPE_LISTENING; else if (Ccb->PipeState == FILE_PIPE_DISCONNECTED_STATE) @@ -739,7 +758,7 @@ if (ReaderCcb->Data == NULL) { - DPRINT1("Pipe is NOT writable!\n"); + DPRINT("Pipe is NOT writable!\n"); Status = STATUS_UNSUCCESSFUL; Length = 0; goto done; @@ -749,6 +768,7 @@ Buffer = MmGetSystemAddressForMdl (Irp->MdlAddress); ExAcquireFastMutex(&ReaderCcb->DataListLock); + #ifndef NDEBUG DPRINT("Length %d Buffer %x Offset %x\n",Length,Buffer,Offset); HexDump(Buffer, Length); @@ -774,7 +794,7 @@ FALSE, NULL); DPRINT("Write Finished waiting (%S)! Status: %x\n", Fcb->PipeName.Buffer, Status); - ExAcquireFastMutex(&ReaderCcb->DataListLock); + if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) { Status = STATUS_CANCELLED; @@ -792,14 +812,14 @@ { DPRINT("PipeState: %x\n", Ccb->PipeState); Status = STATUS_PIPE_BROKEN; - // ExReleaseFastMutex(&ReaderCcb->DataListLock); goto done; } - } - - if (Fcb->WriteMode == FILE_PIPE_BYTE_STREAM_MODE) - { - DPRINT("Byte stream mode\n"); + ExAcquireFastMutex(&ReaderCcb->DataListLock); + } + + if ((Ccb->Fcb->PipeType == FILE_PIPE_BYTE_STREAM_MODE) && (Ccb->Fcb->WriteMode == FILE_PIPE_BYTE_STREAM_MODE)) + { + DPRINT("Byte stream mode: Ccb->Data %x, Ccb->WritePtr %x\n", ReaderCcb->Data, ReaderCcb->WritePtr); while (Length > 0 && ReaderCcb->WriteQuotaAvailable > 0) { @@ -816,7 +836,10 @@ } else { - TempLength = (ULONG)((ULONG_PTR)ReaderCcb->Data + ReaderCcb->MaxDataLength - (ULONG_PTR)ReaderCcb->WritePtr); + + TempLength = (ULONG)((ULONG_PTR)ReaderCcb->Data + ReaderCcb->MaxDataLength - + (ULONG_PTR)ReaderCcb->WritePtr); + memcpy(ReaderCcb->WritePtr, Buffer, TempLength); memcpy(ReaderCcb->Data, Buffer + TempLength, CopyLength - TempLength); ReaderCcb->WritePtr = (PVOID)((ULONG_PTR)ReaderCcb->Data + CopyLength - TempLength); @@ -837,33 +860,38 @@ break; } } - else + else if ((Ccb->Fcb->PipeType == FILE_PIPE_MESSAGE_MODE) && (Ccb->Fcb->WriteMode == FILE_PIPE_MESSAGE_MODE)) { /* For Message Type Pipe, the Pipes memory will be used to store the size of each message */ - /* FIXME: Check and verify ReadMode ByteStream */ - + DPRINT("Message mode: Ccb->Data %x, Ccb->WritePtr %x\n",ReaderCcb->Data, ReaderCcb->WritePtr); if (Length > 0) { /* Verify the WritePtr is still inside the buffer */ - if (((ULONG)ReaderCcb->WritePtr > ((ULONG)ReaderCcb->Data + (ULONG)ReaderCcb->MaxDataLength)) || - ((ULONG)ReaderCcb->WritePtr < (ULONG)ReaderCcb->Data)) + if (((ULONG_PTR)ReaderCcb->WritePtr > ((ULONG_PTR)ReaderCcb->Data + (ULONG_PTR)ReaderCcb->MaxDataLength)) || + ((ULONG_PTR)ReaderCcb->WritePtr < (ULONG_PTR)ReaderCcb->Data)) { DPRINT1("NPFS is writing out of its buffer. Report to developer!\n"); - DPRINT1("ReaderCcb->WritePtr %x, ReaderCcb->Data %x, ReaderCcb->MaxDataLength%d\n", - ReaderCcb->WritePtr,ReaderCcb->Data,ReaderCcb->MaxDataLength); + DPRINT1("ReaderCcb->WritePtr %x, ReaderCcb->Data %x, ReaderCcb->MaxDataLength %lu\n", + ReaderCcb->WritePtr, ReaderCcb->Data, ReaderCcb->MaxDataLength); ASSERT(FALSE); } CopyLength = min(Length, ReaderCcb->WriteQuotaAvailable - sizeof(ULONG)); + if (CopyLength > ReaderCcb->WriteQuotaAvailable) + { + DPRINT1("Writing %lu byte to pipe would overflow as only %lu bytes are available\n", + CopyLength, ReaderCcb->ReadDataAvailable); + ASSERT(FALSE); + } /* First Copy the Length of the message into the pipes buffer */ memcpy(ReaderCcb->WritePtr, &CopyLength, sizeof(CopyLength)); /* Now the user buffer itself */ - memcpy((PVOID)((ULONG)ReaderCcb->WritePtr+ sizeof(CopyLength)), Buffer, CopyLength); + memcpy((PVOID)((ULONG_PTR)ReaderCcb->WritePtr + sizeof(CopyLength)), Buffer, CopyLength); /* Update the write pointer */ - ReaderCcb->WritePtr = (PVOID)((ULONG)ReaderCcb->WritePtr + sizeof(CopyLength) + CopyLength); + ReaderCcb->WritePtr = (PVOID)((ULONG_PTR)ReaderCcb->WritePtr + sizeof(CopyLength) + CopyLength); Information += CopyLength; @@ -871,7 +899,7 @@ ReaderCcb->WriteQuotaAvailable -= (CopyLength + sizeof(ULONG)); - if ((ULONG)ReaderCcb->WriteQuotaAvailable > (ULONG)ReaderCcb->MaxDataLength) + if ((ULONG_PTR)ReaderCcb->WriteQuotaAvailable > (ULONG)ReaderCcb->MaxDataLength) { DPRINT1("QuotaAvailable is greater than buffer size!\n"); ASSERT(FALSE); @@ -885,6 +913,11 @@ break; } } + else + { + DPRINT1("Unhandled Pipe Type Mode and Read Write Mode!\n"); + ASSERT(FALSE); + } } ExReleaseFastMutex(&ReaderCcb->DataListLock);

1 0

[dchapyshev] 38789: - More dialogs implementation
by dchapyshev＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: dchapyshev Date: Fri Jan 16 08:28:07 2009 New Revision: 38789 URL: http://svn.reactos.org/svn/reactos?rev=38789&view=rev Log: - More dialogs implementation Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc trunk/reactos/dll/cpl/hdwwiz/resource.h Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -487,6 +487,35 @@ static INT_PTR CALLBACK SelectWayPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + switch (uMsg) + { + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + SendDlgItemMessage(hwndDlg, IDC_AUTOINSTALL, BM_SETCHECK, 1, 1); + } + break; + + case PSN_WIZNEXT: + { + if (SendDlgItemMessage(hwndDlg, IDC_AUTOINSTALL, BM_GETCHECK, 0, 0) == BST_CHECKED) + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_PROGRESSPAGE); + else + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_HWTYPESPAGE); + + return TRUE; + } + } + } + break; + } + return FALSE; } @@ -529,10 +558,70 @@ return FALSE; } +static INT_PTR CALLBACK +HdTypesPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + } + break; + + case PSN_WIZBACK: + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE); + return TRUE; + } + } + } + break; + } + + return FALSE; +} + +static INT_PTR CALLBACK +ProgressPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + } + break; + + case PSN_WIZBACK: + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE); + return TRUE; + } + } + } + break; + } + + return FALSE; +} + static VOID HardwareWizardInit(HWND hwnd) { - HPROPSHEETPAGE ahpsp[8]; + HPROPSHEETPAGE ahpsp[10]; PROPSHEETPAGE psp = {0}; PROPSHEETHEADER psh; UINT nPages = 0; @@ -597,6 +686,28 @@ psp.lParam = 0; psp.pfnDlgProc = DevStatusPageDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_HWSTATUSPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + + /* Create hardware types page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_HDTYPESTITLE); + psp.pszHeaderSubTitle = NULL; + psp.hInstance = hApplet; + psp.lParam = 0; + psp.pfnDlgProc = HdTypesPageDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_HWTYPESPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + + /* Create progress page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_SEARCHTITLE); + psp.pszHeaderSubTitle = NULL; + psp.hInstance = hApplet; + psp.lParam = 0; + psp.pfnDlgProc = ProgressPageDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_PROGRESSPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); /* Create finish page */ Modified: trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -143,4 +143,5 @@ IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -148,4 +148,5 @@ IDS_PROBELISTTITLE "Následující hardware ji je nainstalován na tomto poèítaèi" IDS_ADDNEWDEVICE "Pøidat nové hardwarové zaøízení" IDS_SELECTWAYTITLE "Prùvodce vám mùe pomoci nainstalovat jiný hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -143,4 +143,5 @@ IDS_PROBELISTTITLE "Folgende Hardware ist bereits auf Ihrem Computer installiert" IDS_ADDNEWDEVICE "Ein neues Gerät hinzufügen" IDS_SELECTWAYTITLE "Der Assistent kann Sie bei der Installation anderer Hardware unterstützen" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -143,4 +143,5 @@ IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -143,4 +143,5 @@ IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -143,4 +143,5 @@ IDS_PROBELISTTITLE "El siguiente hardware ya está instalado en su equipo" IDS_ADDNEWDEVICE "Añadir un nuevo dispositivo hardware" IDS_SELECTWAYTITLE "El asistente puede ayudarle a instalar otro hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -143,4 +143,5 @@ IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -144,4 +144,5 @@ IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -143,4 +143,5 @@ IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -143,4 +143,5 @@ IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -143,4 +143,5 @@ IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -143,4 +143,5 @@ IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -143,4 +143,5 @@ IDS_PROBELISTTITLE "Følgende maskinvare har blitt installert på din datamaskin" IDS_ADDNEWDEVICE "Legg til en ny maskinvare enhet" IDS_SELECTWAYTITLE "Veiviseren kan hjelpe deg å installere andre maskinvare" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -148,4 +148,5 @@ IDS_PROBELISTTITLE "Poni¿sze urz¹dzenia s¹ ju¿ zainstalowane na tym komputerze" IDS_ADDNEWDEVICE "Dodaj nowe urz¹dzenie sprzêtowe" IDS_SELECTWAYTITLE "Kreator mo¿e pomóc Tobie zainstalowaæ inne urz¹dzenie" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -143,4 +143,5 @@ IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -143,4 +143,5 @@ IDS_PROBELISTTITLE "Íà ýòîì êîìïüþòåðå óæå óñòàíîâëåíî ñëåäóþùåå îáîðóäîâàíèå" IDS_ADDNEWDEVICE "Äîáàâëåíèå íîâîãî óñòðîéñòâà" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -148,4 +148,5 @@ IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -143,4 +143,5 @@ IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -151,4 +151,5 @@ IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -149,4 +149,5 @@ IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/resource.h [iso-8859-1] Fri Jan 16 08:28:07 2009 @@ -17,6 +17,7 @@ #define IDS_SEARCHTEXT 1020 #define IDS_SEARCHTITLE 1025 #define IDS_SELECTWAYTITLE 1027 +#define IDS_HDTYPESTITLE 1061 #define IDS_ADDNEWDEVICE 1081 #define IDS_ISCONNECTED 1113

1 0

[hyperion] 38788: Echo [HOST-CC] and [HOST-LD] instead of [HOSTCC] and [HOSTLD] Also echo [HOST-AR] for invocations of the host "ar" Use [HOST-CC], [HOST-LD] and [HOST-AR] in bootstrap makefiles as well
by hyperion＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: hyperion Date: Fri Jan 16 07:19:14 2009 New Revision: 38788 URL: http://svn.reactos.org/svn/reactos?rev=38788&view=rev Log: Echo [HOST-CC] and [HOST-LD] instead of [HOSTCC] and [HOSTLD] Also echo [HOST-AR] for invocations of the host "ar" Use [HOST-CC], [HOST-LD] and [HOST-AR] in bootstrap makefiles as well Modified: trunk/reactos/Makefile trunk/reactos/lib/inflib/inflib.mak trunk/reactos/tools/bin2c.mak trunk/reactos/tools/buildno/buildno.mak trunk/reactos/tools/gendib/gendib.mak trunk/reactos/tools/nci/nci.mak trunk/reactos/tools/ofw_interface/ofw_interface.mak trunk/reactos/tools/pefixup.mak trunk/reactos/tools/raddr2line.mak trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/rbuild.mak trunk/reactos/tools/rsym.mak trunk/reactos/tools/tools.mak Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=38788&r1=3878… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Fri Jan 16 07:19:14 2009 @@ -216,18 +216,19 @@ ECHO_PCH =@echo $(QUOTE)[PCH] $@$(QUOTE) ECHO_CPP =@echo $(QUOTE)[CPP] $@$(QUOTE) ECHO_CC =@echo $(QUOTE)[CC] $<$(QUOTE) - ECHO_HOSTCC =@echo $(QUOTE)[HOSTCC] $<$(QUOTE) + ECHO_HOSTCC =@echo $(QUOTE)[HOST-CC] $<$(QUOTE) ECHO_CL =@echo $(QUOTE)[CL] $<$(QUOTE) ECHO_GAS =@echo $(QUOTE)[GAS] $<$(QUOTE) ECHO_NASM =@echo $(QUOTE)[NASM] $<$(QUOTE) ECHO_AR =@echo $(QUOTE)[AR] $@$(QUOTE) + ECHO_HOSTAR =@echo $(QUOTE)[HOST-AR] $@$(QUOTE) ECHO_WINEBLD =@echo $(QUOTE)[WINEBLD] $@$(QUOTE) ECHO_WRC =@echo $(QUOTE)[WRC] $@$(QUOTE) ECHO_WIDL =@echo $(QUOTE)[WIDL] $@$(QUOTE) ECHO_BIN2RES =@echo $(QUOTE)[BIN2RES] $<$(QUOTE) ECHO_DLLTOOL =@echo $(QUOTE)[DLLTOOL] $@$(QUOTE) ECHO_LD =@echo $(QUOTE)[LD] $@$(QUOTE) - ECHO_HOSTLD =@echo $(QUOTE)[HOSTLD] $@$(QUOTE) + ECHO_HOSTLD =@echo $(QUOTE)[HOST-LD] $@$(QUOTE) ECHO_LINK =@echo $(QUOTE)[LINK] $@$(QUOTE) ECHO_NM =@echo $(QUOTE)[NM] $@$(QUOTE) ECHO_OBJDUMP =@echo $(QUOTE)[OBJDUMP] $@$(QUOTE) @@ -251,15 +252,18 @@ ECHO_PCH = ECHO_CPP = ECHO_CC = + ECHO_HOSTCC = ECHO_GAS = ECHO_NASM = ECHO_AR = + ECHO_HOSTAR = ECHO_WINEBLD = ECHO_WRC = ECHO_WIDL = ECHO_BIN2RES = ECHO_DLLTOOL = ECHO_LD = + ECHO_HOSTLD = ECHO_NM = ECHO_OBJDUMP = ECHO_RBUILD = Modified: trunk/reactos/lib/inflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.mak?rev=… ============================================================================== --- trunk/reactos/lib/inflib/inflib.mak [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/inflib.mak [iso-8859-1] Fri Jan 16 07:19:14 2009 @@ -35,31 +35,31 @@ -Iinclude/reactos -Iinclude $(HOST_CFLAGS) $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) - $(ECHO_AR) + $(ECHO_HOSTAR) $(host_ar) -r $@ $(INFLIB_HOST_OBJECTS) $(INFLIB_INT_)infcore.o: $(INFLIB_BASE_)infcore.c | $(INFLIB_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ $(INFLIB_INT_)infget.o: $(INFLIB_BASE_)infget.c | $(INFLIB_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ $(INFLIB_INT_)infput.o: $(INFLIB_BASE_)infput.c | $(INFLIB_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ $(INFLIB_INT_)infhostgen.o: $(INFLIB_BASE_)infhostgen.c | $(INFLIB_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ $(INFLIB_INT_)infhostget.o: $(INFLIB_BASE_)infhostget.c | $(INFLIB_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ $(INFLIB_INT_)infhostput.o: $(INFLIB_BASE_)infhostput.c | $(INFLIB_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ .PHONY: inflib_host Modified: trunk/reactos/tools/bin2c.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.mak?rev=38788&… ============================================================================== --- trunk/reactos/tools/bin2c.mak [iso-8859-1] (original) +++ trunk/reactos/tools/bin2c.mak [iso-8859-1] Fri Jan 16 07:19:14 2009 @@ -23,11 +23,11 @@ bin2c: $(BIN2C_TARGET) $(BIN2C_TARGET): $(BIN2C_OBJECTS) | $(BIN2C_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gcc} $(BIN2C_OBJECTS) $(BIN2C_HOST_LFLAGS) -o $@ $(BIN2C_INT_)bin2c.o: $(BIN2C_BASE_)bin2c.c | $(BIN2C_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(BIN2C_HOST_CFLAGS) -c $< -o $@ .PHONY: bin2c_clean Modified: trunk/reactos/tools/buildno/buildno.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.mak?… ============================================================================== --- trunk/reactos/tools/buildno/buildno.mak [iso-8859-1] (original) +++ trunk/reactos/tools/buildno/buildno.mak [iso-8859-1] Fri Jan 16 07:19:14 2009 @@ -35,11 +35,11 @@ buildno: $(BUILDNO_TARGET) $(BUILDNO_TARGET): $(BUILDNO_OBJECTS) $(XML_SSPRINTF_OBJECTS) | $(BUILDNO_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gpp} $^ $(BUILDNO_HOST_LFLAGS) -o $@ $(BUILDNO_INT_)buildno.o: $(BUILDNO_BASE_)buildno.cpp $(BUILDNO_VERSION) | $(BUILDNO_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@ .PHONY: buildno_clean Modified: trunk/reactos/tools/gendib/gendib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.mak?re… ============================================================================== --- trunk/reactos/tools/gendib/gendib.mak [iso-8859-1] (original) +++ trunk/reactos/tools/gendib/gendib.mak [iso-8859-1] Fri Jan 16 07:19:14 2009 @@ -29,11 +29,11 @@ GENDIB_HOST_LFLAGS = $(TOOLS_LFLAGS) $(GENDIB_TARGET): $(GENDIB_OBJECTS) | $(GENDIB_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gcc} $(GENDIB_OBJECTS) $(GENDIB_HOST_LFLAGS) -o $@ $(GENDIB_INT_)gendib.o: $(GENDIB_BASE_)gendib.c | $(GENDIB_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(GENDIB_HOST_CFLAGS) -c $< -o $@ .PHONY: gendib Modified: trunk/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=3878… ============================================================================== --- trunk/reactos/tools/nci/nci.mak [iso-8859-1] (original) +++ trunk/reactos/tools/nci/nci.mak [iso-8859-1] Fri Jan 16 07:19:14 2009 @@ -29,11 +29,11 @@ NCI_HOST_LFLAGS = $(TOOLS_LFLAGS) $(NCI_TARGET): $(NCI_OBJECTS) | $(NCI_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gcc} $(NCI_OBJECTS) $(NCI_HOST_LFLAGS) -o $@ $(NCI_INT_)ncitool.o: $(NCI_BASE_)ncitool.c | $(NCI_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@ .PHONY: nci Modified: trunk/reactos/tools/ofw_interface/ofw_interface.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ofw_interface/ofw_in… ============================================================================== --- trunk/reactos/tools/ofw_interface/ofw_interface.mak [iso-8859-1] (original) +++ trunk/reactos/tools/ofw_interface/ofw_interface.mak [iso-8859-1] Fri Jan 16 07:19:14 2009 @@ -39,11 +39,11 @@ OFW_INTERFACE_HOST_LFLAGS = $(TOOLS_LFLAGS) $(OFW_INTERFACE_TARGET): $(OFW_INTERFACE_OBJECTS) | $(OFW_INTERFACE_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gpp} $(OFW_INTERFACE_OBJECTS) $(OFW_INTERFACE_HOST_LFLAGS) -o $@ $(OFW_INTERFACE_INT_)ofw_interface.o: $(OFW_INTERFACE_BASE_)ofw_interface.cpp | $(OFW_INTERFACE_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(OFW_INTERFACE_HOST_CFLAGS) -c $< -o $@ $(OFW_INTERFACE_SERVICE_FILES): $(OFW_INTERFACE_TARGET) $(OFW_INTERFACE_INPUT) @@ -53,7 +53,7 @@ $(OFW_INTERFACE_OUTPUT) \ $(OFW_INTERFACE_SOURCE) \ $(OFW_INTERFACE_HEADER) - + .PHONY: ofw_interface ofw_interface: $(OFW_INTERFACE_TARGET) Modified: trunk/reactos/tools/pefixup.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pefixup.mak?rev=3878… ============================================================================== --- trunk/reactos/tools/pefixup.mak [iso-8859-1] (original) +++ trunk/reactos/tools/pefixup.mak [iso-8859-1] Fri Jan 16 07:19:14 2009 @@ -23,11 +23,11 @@ pefixup: $(PEFIXUP_TARGET) $(PEFIXUP_TARGET): $(PEFIXUP_OBJECTS) | $(PEFIXUP_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gcc} $(PEFIXUP_OBJECTS) $(PEFIXUP_HOST_LFLAGS) -o $@ $(PEFIXUP_INT_)pefixup.o: $(PEFIXUP_BASE_)pefixup.c | $(PEFIXUP_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(PEFIXUP_HOST_CFLAGS) -c $< -o $@ .PHONY: pefixup_clean Modified: trunk/reactos/tools/raddr2line.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/raddr2line.mak?rev=3… ============================================================================== --- trunk/reactos/tools/raddr2line.mak [iso-8859-1] (original) +++ trunk/reactos/tools/raddr2line.mak [iso-8859-1] Fri Jan 16 07:19:14 2009 @@ -24,15 +24,15 @@ raddr2line: $(RADDR2LINE_TARGET) $(RADDR2LINE_TARGET): $(RADDR2LINE_OBJECTS) | $(RADDR2LINE_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gcc} $(RADDR2LINE_OBJECTS) $(RADDR2LINE_HOST_LFLAGS) -o $@ $(RADDR2LINE_INT_)raddr2line.o: $(RADDR2LINE_BASE_)raddr2line.c | $(RADDR2LINE_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(RADDR2LINE_HOST_CFLAGS) -c $< -o $@ #$(RADDR2LINE_INT_)rsym_common.o: $(RADDR2LINE_BASE_)rsym_common.c | $(RADDR2LINE_INT) -# $(ECHO_CC) +# $(ECHO_HOSTCC) # ${host_gcc} $(RADDR2LINE_HOST_CFLAGS) -c $< -o $@ .PHONY: raddr2line_clean Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Fri Jan 16 07:19:14 2009 @@ -1055,7 +1055,7 @@ Rule arRule2 ( "\t$(ECHO_AR)\n" "\t${ar} -rc $@ $($(module_name)_OBJS)\n", NULL ); -Rule arHostRule2 ( "\t$(ECHO_AR)\n" +Rule arHostRule2 ( "\t$(ECHO_HOSTAR)\n" "\t${host_ar} -rc $@ $($(module_name)_OBJS)\n", NULL ); Rule gasRule ( "$(source): ${$(module_name)_precondition}\n" Modified: trunk/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.mak [iso-8859-1] Fri Jan 16 07:19:14 2009 @@ -353,223 +353,223 @@ host_gpp += -g $(RBUILD_TARGET): $(RBUILD_OBJECTS) $(XML_SSPRINTF_OBJECTS) $(INFLIB_HOST_OBJECTS) | $(RBUILD_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gpp} $^ $(RBUILD_HOST_LFLAGS) -o $@ $(RBUILD_INT_)global.o: $(RBUILD_BASE_)global.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)automaticdependency.o: $(RBUILD_BASE_)automaticdependency.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)autoregister.o: $(RBUILD_BASE_)autoregister.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)bootstrap.o: $(RBUILD_BASE_)bootstrap.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)cdfile.o: $(RBUILD_BASE_)cdfile.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)compilationunit.o: $(RBUILD_BASE_)compilationunit.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)compilationunitsupportcode.o: $(RBUILD_BASE_)compilationunitsupportcode.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)compilerflag.o: $(RBUILD_BASE_)compilerflag.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)configuration.o: $(RBUILD_BASE_)configuration.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)define.o: $(RBUILD_BASE_)define.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)directory.o: $(RBUILD_BASE_)directory.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)exception.o: $(RBUILD_BASE_)exception.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)filesupportcode.o: $(RBUILD_BASE_)filesupportcode.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)include.o: $(RBUILD_BASE_)include.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)installfile.o: $(RBUILD_BASE_)installfile.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)linkerflag.o: $(RBUILD_BASE_)linkerflag.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)linkerscript.o: $(RBUILD_BASE_)linkerscript.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)module.o: $(RBUILD_BASE_)module.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)project.o: $(RBUILD_BASE_)project.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)rbuild.o: $(RBUILD_BASE_)rbuild.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)rule.o: $(RBUILD_BASE_)rule.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)stubbedcomponent.o: $(RBUILD_BASE_)stubbedcomponent.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)syssetupgenerator.o: $(RBUILD_BASE_)syssetupgenerator.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)wineresource.o: $(RBUILD_BASE_)wineresource.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)xmlnode.o: $(RBUILD_BASE_)xmlnode.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)testsupportcode.o: $(RBUILD_BASE_)testsupportcode.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_BACKEND_INT_)backend.o: $(RBUILD_BACKEND_BASE_)backend.cpp $(RBUILD_HEADERS) | $(RBUILD_BACKEND_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MINGW_INT_)mingw.o: $(RBUILD_MINGW_BASE_)mingw.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MINGW_INT_)modulehandler.o: $(RBUILD_MINGW_BASE_)modulehandler.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MINGW_INT_)proxymakefile.o: $(RBUILD_MINGW_BASE_)proxymakefile.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MINGW_INT_)rule.o: $(RBUILD_MINGW_BASE_)rule.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_DEVCPP_INT_)devcpp.o: $(RBUILD_DEVCPP_BASE_)devcpp.cpp $(RBUILD_HEADERS) | $(RBUILD_DEVCPP_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_CODEBLOCKS_INT_)codeblocks.o: $(RBUILD_CODEBLOCKS_BASE_)codeblocks.cpp $(RBUILD_HEADERS) | $(RBUILD_CODEBLOCKS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_DEPMAP_INT_)dependencymap.o: $(RBUILD_DEPMAP_BASE_)dependencymap.cpp $(RBUILD_HEADERS) | $(RBUILD_DEPMAP_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_VREPORT_INT_)versionreport.o: $(RBUILD_VREPORT_BASE_)versionreport.cpp $(RBUILD_HEADERS) | $(RBUILD_VREPORT_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MSBUILD_INT_)msbuild.o: $(RBUILD_MSBUILD_BASE_)msbuild.cpp $(RBUILD_HEADERS) | $(RBUILD_MSBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MSVC_INT_)genguid.o: $(RBUILD_MSVC_BASE_)genguid.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MSVC_INT_)msvc.o: $(RBUILD_MSVC_BASE_)msvc.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MSVC_INT_)msvcmaker.o: $(RBUILD_MSVC_BASE_)msvcmaker.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MSVC_INT_)vcprojmaker.o: $(RBUILD_MSVC_BASE_)vcprojmaker.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(INFLIB_HOST_OBJECTS) $(RBUILD_HEADERS) | $(RBUILD_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gpp} $(RBUILD_TEST_OBJECTS) $(INFLIB_HOST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ $(RBUILD_TESTS_INT_)cdfiletest.o: $(RBUILD_TESTS_BASE_)cdfiletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)compilationunittest.o: $(RBUILD_TESTS_BASE_)compilationunittest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)definetest.o: $(RBUILD_TESTS_BASE_)definetest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)functiontest.o: $(RBUILD_TESTS_BASE_)functiontest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)iftest.o: $(RBUILD_TESTS_BASE_)iftest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)includetest.o: $(RBUILD_TESTS_BASE_)includetest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)invoketest.o: $(RBUILD_TESTS_BASE_)invoketest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)linkerflagtest.o: $(RBUILD_TESTS_BASE_)linkerflagtest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)moduletest.o: $(RBUILD_TESTS_BASE_)moduletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)projecttest.o: $(RBUILD_TESTS_BASE_)projecttest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)sourcefiletest.o: $(RBUILD_TESTS_BASE_)sourcefiletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)symboltest.o: $(RBUILD_TESTS_BASE_)symboltest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)alltests.o: $(RBUILD_TESTS_BASE_)alltests.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ Modified: trunk/reactos/tools/rsym.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.mak?rev=38788&r… ============================================================================== --- trunk/reactos/tools/rsym.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rsym.mak [iso-8859-1] Fri Jan 16 07:19:14 2009 @@ -19,7 +19,7 @@ ifeq ($(ARCH),amd64) RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) -D_TARGET_PE64 else -RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) +RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) endif RSYM_HOST_LFLAGS = $(TOOLS_LFLAGS) @@ -28,15 +28,15 @@ rsym: $(RSYM_TARGET) $(RSYM_TARGET): $(RSYM_OBJECTS) | $(RSYM_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gcc} $(RSYM_OBJECTS) $(RSYM_HOST_LFLAGS) -o $@ $(RSYM_INT_)rsym.o: $(RSYM_BASE_)rsym.c | $(RSYM_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(RSYM_HOST_CFLAGS) -c $< -o $@ $(RSYM_INT_)rsym_common.o: $(RSYM_BASE_)rsym_common.c | $(RSYM_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(RSYM_HOST_CFLAGS) -c $< -o $@ .PHONY: rsym_clean Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=38788&… ============================================================================== --- trunk/reactos/tools/tools.mak [iso-8859-1] (original) +++ trunk/reactos/tools/tools.mak [iso-8859-1] Fri Jan 16 07:19:14 2009 @@ -33,11 +33,11 @@ $(addprefix $(INTERMEDIATE_), $(XML_SSPRINTF_SOURCES:.cpp=.o)) $(TOOLS_INT_)ssprintf.o: $(TOOLS_BASE_)ssprintf.cpp $(XML_SSPRINTF_HEADERS) | $(TOOLS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(TOOLS_CPPFLAGS) -c $< -o $@ $(TOOLS_INT_)xml.o: $(TOOLS_BASE_)xml.cpp $(XML_SSPRINTF_HEADERS) | $(TOOLS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(TOOLS_CPPFLAGS) -c $< -o $@ include tools/bin2c.mak

1 0

[pschweitzer] 38787: Fixed code
by pschweitzer＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: pschweitzer Date: Fri Jan 16 07:10:53 2009 New Revision: 38787 URL: http://svn.reactos.org/svn/reactos?rev=38787&view=rev Log: Fixed code Modified: branches/pierre-fsd/ntoskrnl/fsrtl/notify.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/notif… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] Fri Jan 16 07:10:53 2009 @@ -43,11 +43,13 @@ FORCEINLINE FsRtlNotifyAcquireFastMutex(IN PREAL_NOTIFY_SYNC RealNotifySync) { + ULONG_PTR CurrentThread = (ULONG_PTR)KeGetCurrentThread(); + /* Only acquire fast mutex if it's not already acquired by the current thread */ - if (RealNotifySync->OwningThread != (ULONG_PTR)KeGetCurrentThread()) + if (RealNotifySync->OwningThread != CurrentThread) { ExAcquireFastMutexUnsafe(&(RealNotifySync->FastMutex)); - RealNotifySync->OwningThread = (ULONG_PTR)KeGetCurrentThread(); + RealNotifySync->OwningThread = CurrentThread; } /* Whatever the case, keep trace of the attempt to acquire fast mutex */ RealNotifySync->OwnerCount++; @@ -215,7 +217,7 @@ /* Remove from the list */ RemoveEntryList(NotifyChange->NotifyList); - /* Downcrease reference number and if 0 is reached, it's time to do total cleanup */ + /* Downcrease reference number and if 0 is reached, it's time to do complete cleanup */ if (!InterlockedDecrement((PLONG)&(NotifyChange->ReferenceCount))) { /* In case there was an allocated buffer, free it */

1 0

[hyperion] 38786: ... and echo "[HOSTLD]" for the link phase of host modules
by hyperion＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: hyperion Date: Fri Jan 16 06:50:20 2009 New Revision: 38786 URL: http://svn.reactos.org/svn/reactos?rev=38786&view=rev Log: ... and echo "[HOSTLD]" for the link phase of host modules Modified: trunk/reactos/Makefile trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=38786&r1=3878… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Fri Jan 16 06:50:20 2009 @@ -227,6 +227,7 @@ ECHO_BIN2RES =@echo $(QUOTE)[BIN2RES] $<$(QUOTE) ECHO_DLLTOOL =@echo $(QUOTE)[DLLTOOL] $@$(QUOTE) ECHO_LD =@echo $(QUOTE)[LD] $@$(QUOTE) + ECHO_HOSTLD =@echo $(QUOTE)[HOSTLD] $@$(QUOTE) ECHO_LINK =@echo $(QUOTE)[LINK] $@$(QUOTE) ECHO_NM =@echo $(QUOTE)[NM] $@$(QUOTE) ECHO_OBJDUMP =@echo $(QUOTE)[OBJDUMP] $@$(QUOTE) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Fri Jan 16 06:50:20 2009 @@ -2519,7 +2519,7 @@ objectsMacro.c_str (), linkDepsMacro.c_str (), backend->GetFullPath ( *target_file ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); + fprintf ( fMakefile, "\t$(ECHO_HOSTLD)\n" ); fprintf ( fMakefile, "\t%s %s -o $@ %s %s\n\n", linker.c_str (),

1 0

[hyperion] 38785: Echo "[HOSTCC]" instead of "[CC]" in short-hand build output when invoking the host compiler
by hyperion＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: hyperion Date: Fri Jan 16 06:44:55 2009 New Revision: 38785 URL: http://svn.reactos.org/svn/reactos?rev=38785&view=rev Log: Echo "[HOSTCC]" instead of "[CC]" in short-hand build output when invoking the host compiler Modified: trunk/reactos/Makefile trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=38785&r1=3878… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Fri Jan 16 06:44:55 2009 @@ -216,6 +216,7 @@ ECHO_PCH =@echo $(QUOTE)[PCH] $@$(QUOTE) ECHO_CPP =@echo $(QUOTE)[CPP] $@$(QUOTE) ECHO_CC =@echo $(QUOTE)[CC] $<$(QUOTE) + ECHO_HOSTCC =@echo $(QUOTE)[HOSTCC] $<$(QUOTE) ECHO_CL =@echo $(QUOTE)[CL] $<$(QUOTE) ECHO_GAS =@echo $(QUOTE)[GAS] $<$(QUOTE) ECHO_NASM =@echo $(QUOTE)[NASM] $<$(QUOTE) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Fri Jan 16 06:44:55 2009 @@ -1183,7 +1183,7 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule gccHostRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" - "\t$(ECHO_CC)\n" + "\t$(ECHO_HOSTCC)\n" "\t${host_gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule gppRule ( "$(source): ${$(module_name)_precondition}\n" @@ -1193,7 +1193,7 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" - "\t$(ECHO_CC)\n" + "\t$(ECHO_HOSTCC)\n" "\t${host_gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule emptyRule ( "", NULL );

1 0

[hyperion] 38784: modified tools/rbuild/backend/mingw/modulehandler.cpp Don't precompile headers with g++: g++ is stupid and, ironically, will precompile .h headers but not .hpp headers (it will mistake them for linker input files). Always use gcc instead Don't let gcc guess the language of the header, either: we detect "C++ modules" automatically in rbuild, use that for consistency
by hyperion＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: hyperion Date: Fri Jan 16 04:44:36 2009 New Revision: 38784 URL: http://svn.reactos.org/svn/reactos?rev=38784&view=rev Log: modified tools/rbuild/backend/mingw/modulehandler.cpp Don't precompile headers with g++: g++ is stupid and, ironically, will precompile .h headers but not .hpp headers (it will mistake them for linker input files). Always use gcc instead Don't let gcc guess the language of the header, either: we detect "C++ modules" automatically in rbuild, use that for consistency Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Fri Jan 16 04:44:36 2009 @@ -1713,11 +1713,12 @@ backend->GetFullPath ( *pchFilename ).c_str() ); fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); fprintf ( fMakefile, - "\t%s -o %s %s %s -gstabs+ %s\n\n", - module.cplusplus ? cppc.c_str() : cc.c_str(), + "\t%s -o %s %s %s -gstabs+ -x %s %s\n\n", + cc.c_str(), backend->GetFullName ( *pchFilename ).c_str(), module.cplusplus ? cxxflagsMacro.c_str() : cflagsMacro.c_str(), GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags, module.cplusplus ? CompilerTypeCPP : CompilerTypeCC ).c_str(), + module.cplusplus ? "c++-header" : "c-header", backend->GetFullName ( baseHeaderFile ).c_str() ); delete pchFilename; }

1 0

[fireball] 38783: - Set version override in pnp_* IDL modules too, since we use Vista's APIs there. Fixes implicitly declared PNP_* functions.
by fireball＠svn.reactos.org 16 Jan '09

16 Jan '09

Author: fireball Date: Fri Jan 16 02:59:56 2009 New Revision: 38783 URL: http://svn.reactos.org/svn/reactos?rev=38783&view=rev Log: - Set version override in pnp_* IDL modules too, since we use Vista's APIs there. Fixes implicitly declared PNP_* functions. Modified: trunk/reactos/include/reactos/idl/idl.rbuild Modified: trunk/reactos/include/reactos/idl/idl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/idl.rb… ============================================================================== --- trunk/reactos/include/reactos/idl/idl.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/idl.rbuild [iso-8859-1] Fri Jan 16 02:59:56 2009 @@ -2,9 +2,11 @@ <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="pnp_server" type="rpcserver" allowwarnings="true"> + <define name="_WIN32_WINNT">0x600</define> <file>pnp.idl</file> </module> <module name="pnp_client" type="rpcclient"> + <define name="_WIN32_WINNT">0x600</define> <file>pnp.idl</file> </module> <module name="scm_server" type="rpcserver" allowwarnings="true">

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