Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[weiden] 19552: fix a DeviceCreateHardwarePageEx call

by weiden＠svn.reactos.com

fix a DeviceCreateHardwarePageEx call Modified: trunk/reactos/lib/cpl/mmsys/mmsys.c _____ Modified: trunk/reactos/lib/cpl/mmsys/mmsys.c --- trunk/reactos/lib/cpl/mmsys/mmsys.c 2005-11-25 14:17:30 UTC (rev 19551) +++ trunk/reactos/lib/cpl/mmsys/mmsys.c 2005-11-25 14:19:42 UTC (rev 19552) @@ -36,11 +36,18 @@ #include "mmsys.h" #include "resource.h" +typedef enum +{ + HWPD_STANDARDLIST = 0, + HWPD_LARGELIST, + HWPD_MAX = HWPD_LARGELIST +} HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE; + HWND WINAPI DeviceCreateHardwarePageEx(HWND hWndParent, LPGUID lpGuids, UINT uNumberOfGuids, - UINT Unknown); + HWPAGE_DISPLAYMODE DisplayMode); #define NUM_APPLETS (1) @@ -73,7 +80,7 @@ DeviceCreateHardwarePageEx(hwndDlg, Guids, sizeof(Guids) / sizeof(Guids[0]), - 1); + HWPD_LARGELIST); break; } }

18 years, 9 months

[weiden] 19551: Initial implementation of the hardware page, based on a patch by G_siorek <zebasoftis@reactos.org> (bug #986)

by weiden＠svn.reactos.com

Initial implementation of the hardware page, based on a patch by G_siorek <zebasoftis(a)reactos.org> (bug #986) Added: trunk/reactos/lib/devmgr/En.rc Added: trunk/reactos/lib/devmgr/Pl.rc Modified: trunk/reactos/lib/devmgr/devmgr.c Deleted: trunk/reactos/lib/devmgr/devmgr.h Modified: trunk/reactos/lib/devmgr/devmgr.rc Modified: trunk/reactos/lib/devmgr/devmgr.xml Added: trunk/reactos/lib/devmgr/misc.c Added: trunk/reactos/lib/devmgr/precomp.h Modified: trunk/reactos/lib/devmgr/resource.h Modified: trunk/reactos/lib/devmgr/stubs.c _____ Added: trunk/reactos/lib/devmgr/En.rc --- trunk/reactos/lib/devmgr/En.rc 2005-11-25 14:15:46 UTC (rev 19550) +++ trunk/reactos/lib/devmgr/En.rc 2005-11-25 14:17:30 UTC (rev 19551) @@ -0,0 +1,28 @@ +// English language resource file (Sebastian Gasiorek, 2005-11-13) + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_NAME "Name" + IDS_TYPE "Type" + IDS_MANUFACTURER "Manufacturer: %1" + IDS_LOCATION "Location: %1" + IDS_STATUS "Device Status: %1" +END + +IDD_HARDWARE DIALOG DISCARDABLE 0, 0, 300, 400 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Devices:",IDC_DEVICES,7,6,196,10 + CONTROL "",IDC_LV_DEVICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,16,196,50 + GROUPBOX "Device Properties",IDC_PROPERTIESGROUP,7,76,196,105 + LTEXT "",IDC_MANUFACTURER,14,88,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_LOCATION,14,100,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_STATUS,14,112,183,30 + PUSHBUTTON "&Troubleshoot...",IDC_TROUBLESHOOT,85,140,54,14 + PUSHBUTTON "P&roperties",IDC_PROPERTIES,146,140,50,14 +END Property changes on: trunk/reactos/lib/devmgr/En.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/devmgr/Pl.rc --- trunk/reactos/lib/devmgr/Pl.rc 2005-11-25 14:15:46 UTC (rev 19550) +++ trunk/reactos/lib/devmgr/Pl.rc 2005-11-25 14:17:30 UTC (rev 19551) @@ -0,0 +1,28 @@ +// Polish language resource file (Sebastian Gasiorek, 2005-11-13) + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN +IDS_NAME "Nazwa" +IDS_TYPE "Typ" +IDS_MANUFACTURER "Producent: %1" +IDS_LOCATION "Lokalizacja: %1" +IDS_STATUS "Stan urz?dzenia: %1" +END + +IDD_HARDWARE DIALOG DISCARDABLE 0, 0, 300, 400 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Urz?dzenia:",IDC_DEVICES,7,6,196,10 + CONTROL "",IDC_LV_DEVICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,16,196,50 + GROUPBOX "W?a£ciwo£ci urz?dzenia",IDC_PROPERTIESGROUP,7,76,196,105 + LTEXT "",IDC_MANUFACTURER,14,88,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_LOCATION,14,100,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_STATUS,14,112,183,30 + PUSHBUTTON "&Rozwi?zywanie problem¾w...",IDC_TROUBLESHOOT,85,140,54,14 + PUSHBUTTON "&W?a£ciwo£ci",IDC_PROPERTIES,146,140,50,14 +END Property changes on: trunk/reactos/lib/devmgr/Pl.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/devmgr/devmgr.c --- trunk/reactos/lib/devmgr/devmgr.c 2005-11-25 14:15:46 UTC (rev 19550) +++ trunk/reactos/lib/devmgr/devmgr.c 2005-11-25 14:17:30 UTC (rev 19551) @@ -1,6 +1,6 @@ /* * ReactOS Device Manager Applet - * Copyright (C) 2004 ReactOS Team + * Copyright (C) 2004 - 2005 ReactOS Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,35 +21,807 @@ * PROJECT: ReactOS devmgr.dll * FILE: lib/devmgr/devmgr.c * PURPOSE: ReactOS Device Manager - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> * UPDATE HISTORY: * 04-04-2004 Created */ -#include <windows.h> -#include "devmgr.h" -#include "resource.h" +#include <precomp.h> -HINSTANCE hDllInstance; +#define NDEBUG +#include <debug.h> +HINSTANCE hDllInstance = NULL; -BOOL STDCALL -DllMain( - HINSTANCE hinstDLL, - DWORD dwReason, - LPVOID lpvReserved) +typedef VOID (WINAPI *PINITCOMMONCONTROLS)(VOID); + +typedef enum { - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - hDllInstance = hinstDLL; - break; - case DLL_THREAD_ATTACH: - break; - case DLL_THREAD_DETACH: - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; + HWPD_STANDARDLIST = 0, + HWPD_LARGELIST, + HWPD_MAX = HWPD_LARGELIST +} HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE; + +typedef struct _HWDEVINFO +{ + struct _HWCLASSDEVINFO *ClassDevInfo; + SP_DEVINFO_DATA DevInfoData; +} HWDEVINFO, *PHWDEVINFO; + +typedef struct _HWCLASSDEVINFO +{ + GUID Guid; + HDEVINFO hDevInfo; + INT ItemCount; + PHWDEVINFO HwDevInfo; +} HWCLASSDEVINFO, *PHWCLASSDEVINFO; + +typedef struct _HARDWARE_PAGE_DATA +{ + HWND hWnd; + HWND hWndDevList; + HINSTANCE hComCtl32; /* only save this to keep track of the references */ + SP_CLASSIMAGELIST_DATA ClassImageListData; + HWPAGE_DISPLAYMODE DisplayMode; + + /* parent window subclass info */ + WNDPROC ParentOldWndProc; + HWND hWndParent; + + UINT NumberOfGuids; + HWCLASSDEVINFO ClassDevInfo[1]; + /* struct may be dynamically expanded here! */ +} HARDWARE_PAGE_DATA, *PHARDWARE_PAGE_DATA; + +#define CX_TYPECOLUMN_WIDTH 80 + +static VOID +InitializeDevicesList(IN PHARDWARE_PAGE_DATA hpd) +{ + LVCOLUMN lvc; + RECT rcClient; + WCHAR szColName[255]; + int iCol = 0; + + /* set the list view style */ + ListView_SetExtendedListViewStyle(hpd->hWndDevList, + LVS_EX_FULLROWSELECT); + + /* set the list view image list */ + if (hpd->ClassImageListData.ImageList != NULL) + { + ListView_SetImageList(hpd->hWndDevList, + hpd->ClassImageListData.ImageList, + LVSIL_SMALL); + } + + GetClientRect(hpd->hWndDevList, + &rcClient); + + /* add the list view columns */ + lvc.mask = LVCF_TEXT | LVCF_WIDTH; + lvc.fmt = LVCFMT_LEFT; + lvc.pszText = szColName; + + if (LoadString(hDllInstance, + IDS_NAME, + szColName, + sizeof(szColName) / sizeof(szColName[0]))) + { + lvc.cx = rcClient.right - CX_TYPECOLUMN_WIDTH - + GetSystemMetrics(SM_CXVSCROLL); + ListView_InsertColumn(hpd->hWndDevList, + iCol++, + &lvc); + } + if (LoadString(hDllInstance, + IDS_TYPE, + szColName, + sizeof(szColName) / sizeof(szColName[0]))) + { + lvc.cx = CX_TYPECOLUMN_WIDTH; + ListView_InsertColumn(hpd->hWndDevList, + iCol++, + &lvc); + } } + +static VOID +UpdateControlStates(IN PHARDWARE_PAGE_DATA hpd) +{ + PHWDEVINFO HwDevInfo; + + HwDevInfo = (PHWDEVINFO)ListViewGetSelectedItemData(hpd->hWndDevList); + if (HwDevInfo != NULL) + { + /* FIXME - update static controls and enable buttons */ + } + else + { + /* FIXME - clear static controls and disable buttons */ + } +} + + +static VOID +FillDevicesList(IN PHARDWARE_PAGE_DATA hpd) +{ + PHWCLASSDEVINFO DevInfo, LastDevInfo; + SP_DEVINFO_DATA DevInfoData; + WCHAR szBuffer[255]; + INT ItemCount = 0; + + DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + + DevInfo = hpd->ClassDevInfo; + LastDevInfo = DevInfo + hpd->NumberOfGuids; + + while (DevInfo != LastDevInfo) + { + INT ImageIndex = -1; + + DevInfo->hDevInfo = SetupDiGetClassDevs(&DevInfo->Guid, + NULL, + hpd->hWnd, + DIGCF_PRESENT); + if (DevInfo->hDevInfo != INVALID_HANDLE_VALUE) + { + LVITEM li; + DWORD MemberIndex = 0; + + SetupDiGetClassImageIndex(&hpd->ClassImageListData, + &DevInfo->Guid, + &ImageIndex); + + while (SetupDiEnumDeviceInfo(DevInfo->hDevInfo, + MemberIndex++, + &DevInfoData)) + { + DWORD RegDataType; + INT iItem; + + if (DevInfo->HwDevInfo != NULL) + { + PHWDEVINFO HwNewDevInfo = HeapReAlloc(GetProcessHeap(), + 0, + DevInfo->HwDevInfo, + (DevInfo->ItemCount + 1) * + sizeof(HWDEVINFO)); + if (HwNewDevInfo != NULL) + { + DevInfo->HwDevInfo = HwNewDevInfo; + DevInfo->HwDevInfo[DevInfo->ItemCount].ClassDevInfo = DevInfo; + DevInfo->HwDevInfo[DevInfo->ItemCount++].DevInfoData = DevInfoData; + } + else + { + DPRINT1("Unable to allocate memory for %d SP_DEVINFO_DATA structures!\n", + DevInfo->ItemCount + 1); + break; + } + } + else + { + DevInfo->HwDevInfo = HeapAlloc(GetProcessHeap(), + 0, + sizeof(HWDEVINFO)); + if (DevInfo->HwDevInfo != NULL) + { + DevInfo->HwDevInfo[DevInfo->ItemCount].ClassDevInfo = DevInfo; + DevInfo->HwDevInfo[DevInfo->ItemCount++].DevInfoData = DevInfoData; + } + else + { + DPRINT1("Unable to allocate memory for a SP_DEVINFO_DATA structures!\n"); + break; + } + } + + if ((SetupDiGetDeviceRegistryProperty(DevInfo->hDevInfo, + &DevInfoData, + SPDRP_FRIENDLYNAME, + &RegDataType, + (PBYTE)szBuffer, + sizeof(szBuffer), + NULL) || + SetupDiGetDeviceRegistryProperty(DevInfo->hDevInfo, + &DevInfoData, + SPDRP_DEVICEDESC, + &RegDataType, + (PBYTE)szBuffer, + sizeof(szBuffer), + NULL)) && + RegDataType == REG_SZ) + { + /* FIXME - check string for NULL termination! */ + + li.mask = LVIF_PARAM | LVIF_STATE | LVIF_TEXT | LVIF_IMAGE; + li.iItem = ItemCount; + li.iSubItem = 0; + li.state = (ItemCount == 0 ? LVIS_SELECTED : 0); + li.stateMask = LVIS_SELECTED; + li.pszText = szBuffer; + li.iImage = ImageIndex; + li.lParam = (LPARAM)&DevInfo->HwDevInfo[DevInfo->ItemCount - 1]; + + iItem = ListView_InsertItem(hpd->hWndDevList, + &li); + if (iItem != -1) + { + ItemCount++; + + if (SetupDiGetClassDescription(&DevInfo->Guid, + szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0]), + NULL)) + { + li.mask = LVIF_TEXT; + li.iItem = iItem; + li.iSubItem = 1; + + ListView_SetItem(hpd->hWndDevList, + &li); + } + } + } + } + } + + DevInfo++; + } + + /* update the controls */ + UpdateControlStates(hpd); +} + + +static LRESULT +CALLBACK +ParentSubWndProc(IN HWND hwnd, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PHARDWARE_PAGE_DATA hpd; + + hpd = (PHARDWARE_PAGE_DATA)GetProp(hwnd, + L"DevMgrSubClassInfo"); + if (hpd != NULL) + { + if (uMsg == WM_SIZE) + { + /* resize the hardware page */ + SetWindowPos(hpd->hWnd, + NULL, + 0, + 0, + LOWORD(lParam), + HIWORD(lParam), + SWP_NOZORDER); + } + + /* pass the message the the old window proc */ + return CallWindowProc(hpd->ParentOldWndProc, + hwnd, + uMsg, + wParam, + lParam); + } + else + { + /* this is not a good idea if the subclassed window was an ansi + window, but we failed finding out the previous window proc + so we can't use CallWindowProc. This should rarely - if ever - + happen. */ + + return DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + } +} + + +static VOID +HardwareDlgResize(IN PHARDWARE_PAGE_DATA hpd, + IN INT cx, + IN INT cy) +{ + HDWP dwp; + HWND hControl, hButton; + INT Width, x, y, TopBias = 0; + RECT rc, rcButton; + POINT pt = {0}; + POINT ptMargin = {0}; + POINT ptMarginGroup = {0}; + + /* use left margin of the IDC_DEVICES label as the right + margin of all controls outside the group box */ + hControl = GetDlgItem(hpd->hWnd, + IDC_DEVICES); + GetWindowRect(hControl, + &rc); + MapWindowPoints(hControl, + hpd->hWnd, + &ptMargin, + 1); + + Width = cx - (2 * ptMargin.x); + + if ((dwp = BeginDeferWindowPos(8))) + { + /* rc already has the window rect of IDC_DEVICES! */ + if (!(dwp = DeferWindowPos(dwp, + hControl, + NULL, + 0, + 0, + Width, + rc.bottom - rc.top, + SWP_NOMOVE | SWP_NOZORDER))) + { + return; + } + + /* resize the devices list view control */ + GetWindowRect(hpd->hWndDevList, + &rc); + MapWindowPoints(hpd->hWndDevList, + hpd->hWnd, + &pt, + 1); + if (hpd->DisplayMode == HWPD_LARGELIST) + { + /* increase the size of the list view control by 2/3 */ + TopBias = ((rc.bottom - rc.top) * 2) / 3; + } + y = pt.y + TopBias + rc.bottom - rc.top + ptMargin.y; + if (!(dwp = DeferWindowPos(dwp, + hpd->hWndDevList, + NULL, + 0, + 0, + Width, + rc.bottom - rc.top + TopBias, + SWP_NOMOVE | SWP_NOZORDER))) + { + return; + } + + /* resize the group box control */ + hControl = GetDlgItem(hpd->hWnd, + IDC_PROPERTIESGROUP); + GetWindowRect(hControl, + &rc); + if (!(dwp = DeferWindowPos(dwp, + hControl, + NULL, + ptMargin.x, + y, + Width, + cy - y - ptMargin.y, + SWP_NOZORDER))) + { + return; + } + + /* use left margin of the IDC_MANUFACTURER label as the right + margin of all controls inside the group box */ + hControl = GetDlgItem(hpd->hWnd, + IDC_MANUFACTURER); + GetWindowRect(hControl, + &rc); + MapWindowPoints(hControl, + hpd->hWnd, + &ptMarginGroup, + 1); + + ptMarginGroup.y = ptMargin.y * 2; + Width = cx - (2 * ptMarginGroup.x); + y += ptMarginGroup.y; + if (!(dwp = DeferWindowPos(dwp, + hControl, + NULL, + ptMarginGroup.x, + y, + Width, + rc.bottom - rc.top, + SWP_NOZORDER))) + { + return; + } + y += rc.bottom - rc.top + ptMargin.y; + + /* resize the IDC_LOCATION label */ + hControl = GetDlgItem(hpd->hWnd, + IDC_LOCATION); + GetWindowRect(hControl, + &rc); + if (!(dwp = DeferWindowPos(dwp, + hControl, + NULL, + ptMarginGroup.x, + y, + Width, + rc.bottom - rc.top, + SWP_NOZORDER))) + { + return; + } + y += rc.bottom - rc.top + ptMargin.y; + + /* measure the size of the buttons */ + hButton = GetDlgItem(hpd->hWnd, + IDC_PROPERTIES); + GetWindowRect(hButton, + &rcButton); + + /* resize the IDC_STATUS label */ + hControl = GetDlgItem(hpd->hWnd, + IDC_STATUS); + GetWindowRect(hControl, + &rc); + if (!(dwp = DeferWindowPos(dwp, + hControl, + NULL, + ptMarginGroup.x, + y, + Width, + cy - y - (3 * ptMargin.y) - + (rcButton.bottom - rcButton.top), + SWP_NOZORDER))) + { + return; + } + + /* move the IDC_PROPERTIES button */ + y = cy - (2 * ptMargin.y) - (rcButton.bottom - rcButton.top); + x = cx - ptMarginGroup.x - (rcButton.right - rcButton.left); + if (!(dwp = DeferWindowPos(dwp, + hButton, + NULL, + x, + y, + 0, + 0, + SWP_NOSIZE | SWP_NOZORDER))) + { + return; + } + + /* move the IDC_TROUBLESHOOT button */ + hButton = GetDlgItem(hpd->hWnd, + IDC_TROUBLESHOOT); + GetWindowRect(hButton, + &rcButton); + x -= ptMargin.x + (rcButton.right - rcButton.left); + if (!(dwp = DeferWindowPos(dwp, + hButton, + NULL, + x, + y, + 0, + 0, + SWP_NOSIZE | SWP_NOZORDER))) + { + return; + } + + EndDeferWindowPos(dwp); + } +} + + +static INT_PTR +CALLBACK +HardwareDlgProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PHARDWARE_PAGE_DATA hpd; + + hpd = (PHARDWARE_PAGE_DATA)GetWindowLongPtr(hwndDlg, + DWL_USER); + + if (hpd != NULL || uMsg == WM_INITDIALOG) + { + switch (uMsg) + { + case WM_NOTIFY: + { + NMHDR *pnmh = (NMHDR*)lParam; + if (pnmh->hwndFrom == hpd->hWndDevList) + { + switch (pnmh->code) + { + case LVN_ITEMCHANGED: + { + LPNMLISTVIEW pnmv = (LPNMLISTVIEW)lParam; + + if ((pnmv->uChanged & LVIF_STATE) && + ((pnmv->uOldState & (LVIS_FOCUSED | LVIS_SELECTED)) || + (pnmv->uNewState & (LVIS_FOCUSED | LVIS_SELECTED)))) + { + UpdateControlStates(hpd); + } + break; + } + } + } + break; + } + + case WM_SIZE: + HardwareDlgResize(hpd, + (INT)LOWORD(lParam), + (INT)HIWORD(lParam)); + break; + + case WM_INITDIALOG: + { + hpd = (PHARDWARE_PAGE_DATA)lParam; + if (hpd != NULL) + { + HWND hWndParent; + + hpd->hWnd = hwndDlg; + SetWindowLongPtr(hwndDlg, + DWL_USER, + (DWORD_PTR)hpd); + + hpd->ClassImageListData.cbSize = sizeof(SP_CLASSIMAGELIST_DATA); + + SetupDiGetClassImageList(&hpd->ClassImageListData); + + hpd->hWndDevList = GetDlgItem(hwndDlg, + IDC_LV_DEVICES); + + /* subclass the parent window */ + hWndParent = GetAncestor(hwndDlg, + GA_PARENT); + if (hWndParent != NULL) + { + RECT rcClient; + + if (GetClientRect(hWndParent, + &rcClient) && + SetWindowPos(hwndDlg, + NULL, + 0, + 0, + rcClient.right, + rcClient.bottom, + SWP_NOZORDER)) + { + /* subclass the parent window. This is not safe + if the parent window belongs to another thread! */ + hpd->ParentOldWndProc = (WNDPROC)SetWindowLongPtr(hWndParent, + GWLP_WNDPROC, + (LONG_PTR)ParentSubWndProc); + + if (hpd->ParentOldWndProc != NULL && + SetProp(hWndParent, + L"DevMgrSubClassInfo", + (HANDLE)hpd)) + { + hpd->hWndParent = hWndParent; + } + } + } + + /* initialize the devices list view control */ + InitializeDevicesList(hpd); + + /* fill the devices list view control */ + FillDevicesList(hpd); + } + break; + } + + case WM_DESTROY: + { + UINT i; + + /* free the device info set handles */ + for (i = 0; + i < hpd->NumberOfGuids; + i++) + { + SetupDiDestroyDeviceInfoList(hpd->ClassDevInfo[i].hDevInfo); + if (hpd->ClassDevInfo[i].HwDevInfo != NULL) + { + HeapFree(GetProcessHeap(), + 0, + hpd->ClassDevInfo[i].HwDevInfo); + } + } + + /* restore the old window proc of the subclassed parent window */ + if (hpd->hWndParent != NULL && hpd->ParentOldWndProc != NULL) + { + SetWindowLongPtr(hpd->hWndParent, + GWLP_WNDPROC, + (LONG_PTR)hpd->ParentOldWndProc); + } + + if (hpd->ClassImageListData.ImageList != NULL) + { + SetupDiDestroyClassImageList(&hpd->ClassImageListData); + } + + /* free the reference to comctl32 */ + FreeLibrary(hpd->hComCtl32); + hpd->hComCtl32 = NULL; + + /* free the allocated resources */ + HeapFree(GetProcessHeap(), + 0, + hpd); + break; + } + } + } + + return FALSE; +} + + +/********************************************************************** ***** + * NAME EXPORTED + * DeviceCreateHardwarePageEx + * + * DESCRIPTION + * Creates a hardware page + * + * ARGUMENTS + * hWndParent: Handle to the parent window + * lpGuids: An array of guids of devices that are to be listed + * uNumberOfGuids: Numbers of guids in the Guids array + * Unknown: Unknown parameter, see NOTEs + * + * RETURN VALUE + * Returns the handle of the hardware page window that has been created or + * NULL if it failed. + * + * REVISIONS + * 13-05-2005 first working version (Sebastian Gasiorek <zebasoftis(a)gmail.com>) + * + * NOTE + * uUnknown seems to be some kind of flag how the entries should be displayed, + * in Win it seems to be always 0x00000001 + * + * TODO + * missing: device icon in list view, Troubleshoot button, device properties, + * status description, + * devices should be visible afer PSN_SETACTIVE message + * + */ +HWND +WINAPI +DeviceCreateHardwarePageEx(IN HWND hWndParent, + IN LPGUID lpGuids, + IN UINT uNumberOfGuids, + IN HWPAGE_DISPLAYMODE DisplayMode) +{ + PHARDWARE_PAGE_DATA hpd; + PINITCOMMONCONTROLS pInitCommonControls; + + /* allocate the HARDWARE_PAGE_DATA structure. Make sure it is + zeroed because the initialization code assumes that in + failure cases! */ + hpd = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + FIELD_OFFSET(HARDWARE_PAGE_DATA, + ClassDevInfo) + + (uNumberOfGuids * sizeof(HWCLASSDEVINFO))); + if (hpd != NULL) + { + HWND hWnd; + UINT i; + + hpd->DisplayMode = ((DisplayMode > HWPD_MAX) ? HWPD_STANDARDLIST : DisplayMode); + + /* initialize the HARDWARE_PAGE_DATA structure */ + hpd->NumberOfGuids = uNumberOfGuids; + for (i = 0; + i < uNumberOfGuids; + i++) + { + hpd->ClassDevInfo[i].Guid = lpGuids[i]; + } + + /* load comctl32.dll dynamically */ + hpd->hComCtl32 = LoadLibrary(TEXT("comctl32.dll")); + if (hpd->hComCtl32 == NULL) + { + goto Cleanup; + } + + /* initialize the common controls */ + pInitCommonControls = (PINITCOMMONCONTROLS)GetProcAddress(hpd->hComCtl32, + "InitCommonControls"); + if (pInitCommonControls == NULL) + { + goto Cleanup; + } + pInitCommonControls(); + + /* create the dialog */ + hWnd = CreateDialogParam(hDllInstance, + MAKEINTRESOURCE(IDD_HARDWARE), + hWndParent, + HardwareDlgProc, + (LPARAM)hpd); + if (hWnd != NULL) + { + return hWnd; + } + else + { +Cleanup: + /* oops, something went wrong... */ + if (hpd->hComCtl32 != NULL) + { + FreeLibrary(hpd->hComCtl32); + } + + HeapFree(GetProcessHeap(), + 0, + hpd); + } + } + + return NULL; +} + + +/********************************************************************** ***** + * NAME EXPORTED + * DeviceCreateHardwarePage + * + * DESCRIPTION + * Creates a hardware page + * + * ARGUMENTS + * hWndParent: Handle to the parent window + * lpGuid: Guid of the device + * + * RETURN VALUE + * Returns the handle of the hardware page window that has been created or + * NULL if it failed. + * + * REVISIONS + * + * NOTE + * + */ + +HWND +WINAPI +DeviceCreateHardwarePage(IN HWND hWndParent, + IN LPGUID lpGuid) +{ + return DeviceCreateHardwarePageEx(hWndParent, + lpGuid, + 1, + HWPD_LARGELIST); +} + + +BOOL +STDCALL +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + hDllInstance = hinstDLL; + break; + } + + return TRUE; +} _____ Deleted: trunk/reactos/lib/devmgr/devmgr.h --- trunk/reactos/lib/devmgr/devmgr.h 2005-11-25 14:15:46 UTC (rev 19550) +++ trunk/reactos/lib/devmgr/devmgr.h 2005-11-25 14:17:30 UTC (rev 19551) @@ -1,155 +0,0 @@ -#ifndef __DEVMGR_H -#define __DEVMGR_H - -extern HINSTANCE hDllInstance; - -WINBOOL -WINAPI -DeviceManager_ExecuteA(HWND hWndParent, - HINSTANCE hInst, - LPCSTR lpMachineName, - int nCmdShow); - -WINBOOL -WINAPI -DeviceManager_ExecuteW(HWND hWndParent, - HINSTANCE hInst, - LPCWSTR lpMachineName, - int nCmdShow); - -VOID -WINAPI -DeviceProperties_RunDLLA(HWND hWndParent, - HINSTANCE hInst, - LPCWSTR lpDeviceCmd, - int nCmdShow); - -VOID -WINAPI -DeviceProperties_RunDLLW(HWND hWndParent, - HINSTANCE hInst, - LPCSTR lpDeviceCmd, - int nCmdShow); - -int -WINAPI -DevicePropertiesA(HWND hWndParent, - HINSTANCE hInst, - LPCSTR lpMachineName, - LPCSTR lpDeviceID, - DWORD Unknown); - -int -WINAPI -DevicePropertiesW(HWND hWndParent, - HINSTANCE hInst, - LPCWSTR lpMachineName, - LPCWSTR lpDeviceID, - DWORD Unknown); - -UINT -WINAPI -DeviceProblemTextA(PVOID Unknown1, - PVOID Unknown2, - UINT uProblemId, - LPSTR lpString, - UINT uMaxString); - -UINT -WINAPI -DeviceProblemTextW(PVOID Unknown1, - PVOID Unknown2, - UINT uProblemId, - LPWSTR lpString, - UINT uMaxString); - -WINBOOL -WINAPI -DeviceProblemWizardA(HWND hWndParent, - LPCSTR lpMachineName, - LPCSTR lpDeviceID); - - -WINBOOL -WINAPI [truncated at 1000 lines; 605 more skipped]

18 years, 9 months

[weiden] 19550: Some header fixes by Sebastian G_siorek <zebasoftis@reactos.org>

by weiden＠svn.reactos.com

Some header fixes by Sebastian G_siorek <zebasoftis(a)reactos.org> Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-11-25 14:08:45 UTC (rev 19549) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-11-25 14:15:46 UTC (rev 19550) @@ -106,7 +106,11 @@ #define CR_INVALID_INDEX 0x0000003A #define CR_INVALID_STRUCTURE_SIZE 0x0000003B +#define RegDisposition_OpenAlways 0x00000000 +#define RegDisposition_OpenExisting 0x00000001 +#define RegDisposition_Bits 0x00000001 + typedef DWORD RETURN_TYPE; typedef RETURN_TYPE CONFIGRET; @@ -224,7 +228,13 @@ #define CM_DRP_MIN 0x00000001 #define CM_DRP_MAX 0x00000017 +#define CM_REGISTRY_HARDWARE 0x00000000 +#define CM_REGISTRY_SOFTWARE 0x00000001 +#define CM_REGISTRY_USER 0x00000100 +#define CM_REGISTRY_CONFIG 0x00000200 +#define CM_REGISTRY_BITS 0x00000301 + typedef struct BusNumber_Des_s { DWORD BUSD_Count; DWORD BUSD_Type;

18 years, 9 months

[jimtabor] 19549: Fix caps.

by jimtabor＠svn.reactos.com

Fix caps. Modified: trunk/reactos/lib/cpl/desk/desk.rc _____ Modified: trunk/reactos/lib/cpl/desk/desk.rc --- trunk/reactos/lib/cpl/desk/desk.rc 2005-11-25 13:48:16 UTC (rev 19548) +++ trunk/reactos/lib/cpl/desk/desk.rc 2005-11-25 14:08:45 UTC (rev 19549) @@ -17,7 +17,7 @@ #include "cz.rc" #include "de.rc" #include "es.rc" -#include "Gr.rc" +#include "gr.rc" #include "Ja.rc" #include "nl.rc" #include "pl.rc"

18 years, 9 months

[jimtabor] 19548: Fix typo.

by jimtabor＠svn.reactos.com

Fix typo. Modified: trunk/reactos/drivers/multimedia/portcls/portcls.c _____ Modified: trunk/reactos/drivers/multimedia/portcls/portcls.c --- trunk/reactos/drivers/multimedia/portcls/portcls.c 2005-11-25 13:01:44 UTC (rev 19547) +++ trunk/reactos/drivers/multimedia/portcls/portcls.c 2005-11-25 13:48:16 UTC (rev 19548) @@ -19,7 +19,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Sound System * PURPOSE: Audio Port Class Functions - * FILE: drivers/dd/sound/portcls/portcls.c + * FILE: drivers/multimedia/portcls/portcls.c * PROGRAMMERS: * * REVISION HISTORY:

18 years, 9 months

[turner] 19547: Fix a typo in the header comments.

by turner＠svn.reactos.com

Fix a typo in the header comments. Modified: trunk/reactos/subsys/win32k/ntuser/misc.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-11-25 11:53:30 UTC (rev 19546) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-11-25 13:01:44 UTC (rev 19547) @@ -6,7 +6,7 @@ * FILE: subsys/win32k/ntuser/misc.c * PROGRAMER: Ge van Geldorp (ge(a)gse.nl) * REVISION HISTORY: - * 2003/05/22 CreatedStyleNum + * 2003/05/22 Created */ #include <w32k.h>

18 years, 9 months

[chorns] 19546: Speedup compilation of kernel32

by chorns＠svn.reactos.com

Speedup compilation of kernel32 Modified: trunk/reactos/ReactOS.xml Modified: trunk/reactos/lib/kernel32/k32.h Modified: trunk/reactos/lib/kernel32/kernel32.xml _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-11-25 10:35:27 UTC (rev 19545) +++ trunk/reactos/ReactOS.xml 2005-11-25 11:53:30 UTC (rev 19546) @@ -32,6 +32,7 @@ </if> <compilerflag>-Wpointer-arith</compilerflag> + <include>.</include> <include>include</include> <include>include/reactos</include> <include>include/libs</include> _____ Modified: trunk/reactos/lib/kernel32/k32.h --- trunk/reactos/lib/kernel32/k32.h 2005-11-25 10:35:27 UTC (rev 19545) +++ trunk/reactos/lib/kernel32/k32.h 2005-11-25 11:53:30 UTC (rev 19546) @@ -6,6 +6,9 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ +#ifndef __K32_H +#define __K32_H + /* INCLUDES ******************************************************************/ /* PSDK/NDK Headers */ @@ -37,4 +40,4 @@ /* Helper Header */ #include <reactos/helper.h> -/* EOF */ +#endif _____ Modified: trunk/reactos/lib/kernel32/kernel32.xml --- trunk/reactos/lib/kernel32/kernel32.xml 2005-11-25 10:35:27 UTC (rev 19545) +++ trunk/reactos/lib/kernel32/kernel32.xml 2005-11-25 11:53:30 UTC (rev 19546) @@ -8,6 +8,7 @@ <define name="__NO_CTYPE_INLINES" /> <define name="WINVER">0x0600</define> <pch>k32.h</pch> + <compilationunit name="unit.c"> <directory name="debug"> <file>break.c</file> <file>debugger.c</file> @@ -64,13 +65,11 @@ <file>errormsg.c</file> <file>handle.c</file> <file>lang.c</file> - <file>lcformat.c</file> <file>ldr.c</file> <file>lzexpand_main.c</file> <file>muldiv.c</file> <file>nls.c</file> <file>perfcnt.c</file> - <file>profile.c</file> <file>recovery.c</file> <file>res.c</file> <file>stubs.c</file> @@ -78,7 +77,6 @@ <file>time.c</file> <file>timerqueue.c</file> <file>toolhelp.c</file> - <file>utils.c</file> <file>version.c</file> </directory> <directory name="process"> @@ -100,15 +98,23 @@ <file>wait.c</file> </directory> <directory name="thread"> - <directory name="i386"> - <file>fiber.S</file> - <file>thread.S</file> - </directory> <file>fiber.c</file> <file>fls.c</file> <file>thread.c</file> <file>tls.c</file> </directory> + </compilationunit> + <directory name="misc"> + <file>lcformat.c</file> + <file>profile.c</file> + <file>utils.c</file> + </directory> + <directory name="thread"> + <directory name="i386"> + <file>fiber.S</file> + <file>thread.S</file> + </directory> + </directory> </module> <module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll"> <importlibrary definition="kernel32.def" />

18 years, 9 months

[greatlrd] 19545: Greek Translation by Apal see bug 994

by greatlrd＠svn.reactos.com

Greek Translation by Apal see bug 994 Added: trunk/reactos/lib/userenv/Gr.rc Modified: trunk/reactos/lib/userenv/userenv.rc _____ Added: trunk/reactos/lib/userenv/Gr.rc --- trunk/reactos/lib/userenv/Gr.rc 2005-11-25 10:22:12 UTC (rev 19544) +++ trunk/reactos/lib/userenv/Gr.rc 2005-11-25 10:35:27 UTC (rev 19545) @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2004 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_PROFILEPATH "%SystemDrive%\\?±¸Õ?ß ÛßÚ ±§Þý?¾ÕÚ?" + IDS_APPDATA "?Õõ´ý¦Ýß Õ÷ß±ý´Ò?Ý" + IDS_DESKTOP "?Ú÷?ÝÕÚß Õ±Òß¾?ß?" + IDS_FAVORITES "?Òßþý¦Ýß" + IDS_STARTMENU "?ÕÝ´² ¦Ýß±¯þ?" + IDS_PROGRAMS "?ÕÝ´² ¦Ýß±¯þ?\\ð±´Ò±?ýýß¶ß" + IDS_ADMINTOOLS "?ÕÝ´² ¦Ýß±¯þ?\\ð±´Ò±?ýýß¶ß\\?±ÒßÙÕ?ß õÚß¸ÕÚ±Ú¾¶Ì" + IDS_STARTUP "?ÕÝ´² ¦Ýß±¯þ?\\ð±´Ò±?ýýß¶ß\\?ÛÛ?Ýþ¾þ" + IDS_MYDOCUMENTS "Èß ß±¸Õ?ß ý´§" + IDS_MYPICTURES "Èß ß±¸Õ?ß ý´§\\¤Ú ÕÚÛ³ÝÕ? ý´§" + IDS_MYMUSIC "Èß ß±¸Õ?ß ý´§\\Ã ý´§¾ÚÛÌ ý´§" + IDS_MYVIDEOS "Èß ß±¸Õ?ß ý´§\\Èß Videos ý´§" + IDS_TEMPLATES "Templates" + IDS_RECENT "ð±³¾÷ß¶ß" + IDS_SENDTO "?´¾¶´ÙÌ ±´?" + IDS_PRINTHOOD "?Û¶²¨¾þ" + IDS_NETHOOD "NetHood" + IDS_LOCALSETTINGS "È´ÚÛ¦? ±§Þý?¾ÕÚ?" + IDS_LOCALAPPDATA "È´ÚÛ¦? ±§Þý?¾ÕÚ?\\?Õõ´ý¦Ýß Õ÷ß±ý´Ò?Ý" + IDS_TEMP "È´ÚÛ¦? ±§Þý?¾ÕÚ?\\ð±´¾¨±ÚÝ?" + IDS_CACHE "È´ÚÛ¦? ±§Þý?¾ÕÚ?\\ð±´¾¨±ÚÝ? ß±¸Õ?ß õÚßõÚÛ¶²´§" + IDS_HISTORY "È´ÚÛ¦? ±§Þý?¾ÕÚ?\\?¾¶´±ÚÛ³" + IDS_COOKIES "Cookies" + IDS_PROGRAMFILES "%SystemDrive%\\?±¸Õ?ß ±´Ò±ßýý?¶¨Ý" +END _____ Modified: trunk/reactos/lib/userenv/userenv.rc --- trunk/reactos/lib/userenv/userenv.rc 2005-11-25 10:22:12 UTC (rev 19544) +++ trunk/reactos/lib/userenv/userenv.rc 2005-11-25 10:35:27 UTC (rev 19545) @@ -39,6 +39,7 @@ #include "De.rc" #include "En.rc" #include "Fr.rc" +#include "Gr.rc" #include "Ja.rc" #include "Nl.rc" #include "Pl.rc"

18 years, 9 months

[greatlrd] 19544: Greek Translation by Apal see bug 994

by greatlrd＠svn.reactos.com

Greek Translation by Apal see bug 994 Added: trunk/reactos/lib/cpl/appwiz/Gr.rc Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc Added: trunk/reactos/lib/cpl/control/Gr.rc Modified: trunk/reactos/lib/cpl/control/control.rc Modified: trunk/reactos/lib/cpl/desk/desk.rc Added: trunk/reactos/lib/cpl/desk/gr.rc Added: trunk/reactos/lib/cpl/timedate/Gr.rc Modified: trunk/reactos/lib/cpl/timedate/timedate.rc _____ Added: trunk/reactos/lib/cpl/appwiz/Gr.rc --- trunk/reactos/lib/cpl/appwiz/Gr.rc 2005-11-25 09:30:09 UTC (rev 19543) +++ trunk/reactos/lib/cpl/appwiz/Gr.rc 2005-11-25 10:22:12 UTC (rev 19544) @@ -0,0 +1,50 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "?ÒÛß¶?¾¶ß¾þ/?ÕÒÛß¶?¾¶ß¾þ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 + LTEXT "?Úß Ýß ÕÒÛß¶ß¾¶Ì¾Õ¶Õ ¦Ýß Ý¦´ ±³Ò±ßýýß, Û?Ý¶Õ ÛÙÚÛ ¾¶´ '?ÒÛß¶? ¾¶ß¾þ'",-1,36,18,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&?ÒÛß¶?¾¶ß¾þ...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14 + LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + LTEXT "È´ ßÛ³Ù´§Þ´ Ù´ÒÚ¾ýÚÛ³ ý´±Õ? Ýß ßÕÒÛß¶ß¾¶ßÞÕ? ß§¶´ý?¶¨?. ?Úß Ýß ßÕÒÛß¶ß¾¶Ì¾Õ¶Õ ¦Ýß ±³Ò±ßýýß Ì Ýß ßÙÙ?¯Õ¶Õ ¶ß ÕÒÛß¶Õ¾¶þý¦Ýß ¶´§ ß±¸ Õ?ß, ÕÚÙ¦¯¶Õ ¶´ ß³ ¶þ Ù?¾¶ß ÛßÚ Û?Ý¶Õ ÛÙÚÛ ¾¶´ ð±´¾ÞÌÛþ/?÷ß?±Õ¾ þ.",-1,36,72,PROPSHEETWIDTH-48,32 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "ð±´¾ÞÌÛþ/&?÷ß?±Õ¾þ", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "?ÒÛß¶?¾¶ß¾þ Reactos" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "?þýÚ´§±Ò?ß ¾§Ý¶³ýÕ§¾þ?" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "?þýÚ´§±Ò?ß ¾§Ý¶³ýÕ§¾þ?" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "ð±´¾Þß÷ß?±Õ¾þ ±´Ò±ßýý?¶¨Ý" + IDS_CPLSYSTEMDESCRIPTION "?ÒÛßÞÚ¾¶? ±´Ò±?ýýß¶ß ÛßÚ õþýÚ´§±Ò?ß ¾§Ý¶´ý¦§¾ÕÚ?." +END _____ Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc --- trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-11-25 09:30:09 UTC (rev 19543) +++ trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-11-25 10:22:12 UTC (rev 19544) @@ -26,5 +26,6 @@ #include "Cz.rc" #include "De.rc" #include "Dk.rc" +#include "Gr.rc" #include "Nl.rc" #include "Ru.rc" _____ Added: trunk/reactos/lib/cpl/control/Gr.rc --- trunk/reactos/lib/cpl/control/Gr.rc 2005-11-25 09:30:09 UTC (rev 19543) +++ trunk/reactos/lib/cpl/control/Gr.rc 2005-11-25 10:22:12 UTC (rev 19544) @@ -0,0 +1,28 @@ +// Greek language resource file (Dj_Apal«, 2005-11-14) + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&?±¸Õ?´" + BEGIN + MENUITEM "&?ÙÕ?¾Úý´", IDM_CLOSE + END + POPUP "&?ý÷?ÝÚ¾þ" + BEGIN + MENUITEM "?ÕÒ?Ùß ÕÚÛ´Ý?õÚß", IDM_LARGEICONS + MENUITEM "?ÚÛ±? ÕÚÛ´Ý?õÚß", IDM_SMALLICONS + MENUITEM "??¾¶ß", IDM_LIST + MENUITEM "?Õ¶´ý¦±ÕÚÕ?", IDM_DETAILS + END + POPUP "?´ÌÞÕÚß" + BEGIN + MENUITEM "Ë¸Õ¶ÚÛ?", IDM_ABOUT + END +END + _____ Modified: trunk/reactos/lib/cpl/control/control.rc --- trunk/reactos/lib/cpl/control/control.rc 2005-11-25 09:30:09 UTC (rev 19543) +++ trunk/reactos/lib/cpl/control/control.rc 2005-11-25 10:22:12 UTC (rev 19544) @@ -35,6 +35,7 @@ #include "De.rc" #include "Dk.rc" #include "En.rc" +#include "Gr.rc" #include "Ja.rc" #include "Nl.rc" #include "Pl.rc" _____ Modified: trunk/reactos/lib/cpl/desk/desk.rc --- trunk/reactos/lib/cpl/desk/desk.rc 2005-11-25 09:30:09 UTC (rev 19543) +++ trunk/reactos/lib/cpl/desk/desk.rc 2005-11-25 10:22:12 UTC (rev 19544) @@ -17,6 +17,7 @@ #include "cz.rc" #include "de.rc" #include "es.rc" +#include "Gr.rc" #include "Ja.rc" #include "nl.rc" #include "pl.rc" _____ Added: trunk/reactos/lib/cpl/desk/gr.rc --- trunk/reactos/lib/cpl/desk/gr.rc 2005-11-25 09:30:09 UTC (rev 19543) +++ trunk/reactos/lib/cpl/desk/gr.rc 2005-11-25 10:22:12 UTC (rev 19544) @@ -0,0 +1,110 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÈßÕ¶¾ß±?ß" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, + 90,65,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,7,99,173,71 + LTEXT "?ÚÙ¦¯¶Õ ýÚß ÕÚÛ³Ýß ¨? ¶ßÕ¶¾ß±?ß:", + IDC_STATIC,8,87,180,8 + PUSHBUTTON "&?ÝßµÌ¶þ¾þ...",IDC_BROWSE_BUTTON,187,135,50,14 + PUSHBUTTON "&Î±?ýß...",IDC_COLOR_BUTTON,187,155,50,14 + LTEXT "È´´ÞÕ¾?ß:",IDC_STATIC,187,98,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ð±´÷²Ùß¯þ ´Þ³Ýþ?" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&ð±´÷²Ùß¯þ ´Þ³Ýþ?",IDC_SCREENS_DUMMY, 5, 7, 238, 136 + + LTEXT "??¾¶ß ±´÷§Ù?¯Õ¨Ý ´Þ³Ýþ?:",IDC_STATIC,13, 24, 71, 9 + CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,13, 34, 171, 69 + PUSHBUTTON "&?ÚßÒ±ß÷Ì",IDC_SCREENS_DELETE, 190,47,39,10 + PUSHBUTTON "&ð±´¾ÞÌÛþ",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + + PUSHBUTTON "?ÚÙ´&Ò¦?...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP + PUSHBUTTON "ð±´&Ô´ÙÌ",IDC_SCREENS_TESTSC,192, 124, 43, 12 + + CONTROL "Ë¶þÝ ÕßÝß÷´±?, &µÌ¶þ¾þ ¾§ÝÞþýß¶ÚÛ´².",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 + + LTEXT "&ðÕ±Úý¦ÝÕ¶Õ:",IDC_STATIC,13, 110, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP,52, 109, 12, 12 + LTEXT "?Õ¶? ±ÚÝ ¶þÝ ¦Ýß±¯þ ¶þ? ±´÷²Ùß¯þ? ´ Þ³Ýþ?.",IDC_STATIC,70, 111, 147, 9 + + GROUPBOX "&Ë¶´Ú¸Õ?ß Õ¯´ÚÛ´Ý³ýþ¾þ? ÕÝ¦±ÒÕÚß? ¶þ? ´ Þ³Ýþ?",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + LTEXT "?Úß Ýß ±§Þý?¾Õ¶Õ ¶ß ¾¶´Ú¸Õ?ß ÕÝ¦±ÒÕÚß? ¶þ? ´Þ³Ýþ?, Û?Ý¶Õ ÛÙÚÛ ¾¶´ 'Ð§ý?¾ÕÚ? ÕÝ¦±ÒÕÚß?'.", + IDC_STATIC,16, 159, 155, 19 + PUSHBUTTON "&Ð§Þý?¾ÕÚ? ÕÝ¦± ÒÕÚß?",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 +END + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "?ý÷?ÝÚ¾þ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "This space is intentionally left blank",IDC_STATIC,66, + 90,112,8 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ð§Þý?¾ÕÚ?" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&?ý÷?ÝÚ¾þ:",1820,3,100,30,8 + LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&ðÕ±Ú´¸Ì ´Þ³Ýþ?",1818,3,120,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, + 30,130,58,17 + LTEXT "?ÚÒ³¶Õ±´",1815,9,130,15,8,NOT WS_GROUP + LTEXT "ðÕ±Ú¾¾³¶Õ±´",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Î±?ýß¶ß",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,148,103,9 + PUSHBUTTON "?Úß &±´¸¨±þý¦Ý´§ ?...",IDC_SETTINGS_ADVANCED,306,165,56,14 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Display" + IDS_CPLDESCRIPTION "ðß±ßýÕ¶±´´ÚÕ? ¶þÝ ÕÚ÷?ÝÕÚß Õ±Òß¾?ß? ÛßÚ ¶þÝ ±´÷²Ùß¯þ ´Þ³Ýþ?." + + IDS_NONE "(?ÕÝ³)" + IDS_CENTER "?¦Ý¶±´" + IDS_STRETCH "ÈÕÝ¶¨ý¦Ý´" + IDS_TILE "ð´ÙÙßÙ¦? ÕÚÛ³ÝÕ?" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "16 ¸±?ýß¶ß" + IDS_COLOR_8BIT "256 ¸±?ýß¶ß" + IDS_COLOR_16BIT "High Color (16 Bit)" + IDS_COLOR_24BIT "True Color (24 Bit)" + IDS_COLOR_32BIT "True Color (32 Bit)" + IDS_PIXEL "%lux%lu Pixel" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "?ÚÛ³ÝÕ? (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" + IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" +END _____ Added: trunk/reactos/lib/cpl/timedate/Gr.rc --- trunk/reactos/lib/cpl/timedate/Gr.rc 2005-11-25 09:30:09 UTC (rev 19543) +++ trunk/reactos/lib/cpl/timedate/Gr.rc 2005-11-25 10:22:12 UTC (rev 19544) @@ -0,0 +1,42 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÃýÕ±´ýþÝ?ß && ?±ß" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "&ÃýÕ±´ýþÝ?ß", -1, 4, 2, 122, 125 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_SHORTDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 11, 17, 108, 12 + CONTROL "", IDC_MONTHCALENDAR, "SysMonthCal32", + WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 11, 37, 108, 80 + GROUPBOX "&?±ß", -1, 132, 2, 113, 125 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 144, 17, 90, 12 + LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 +END + + +IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Î±´ÝÚÛÌ µ?Ýþ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "?§¶³ýß¶þ ±²ÞýÚ¾þ ±´Ù´ÒÚ´² ÒÚß &ßÙÙßÒ¦?", + IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "ÃýÕ±´ýþÝ?ß/?±ß" + IDS_CPLDESCRIPTION "?ÙÙ?µÕÚ ¶þÝ þýÕ±´ýþÝ?ß, ¶þÝ ?±ß ÛßÚ ¶þ ¸±´ÝÚÛÌ µ?Ýþ." + IDS_TIMEZONETEXT "È¨±ÚÝÌ ¸±´ÝÚÛÌ µ?Ýþ: %s" + IDS_TIMEZONEINVALID "?þ ¦ÒÒ§±´" + IDS_TIMEZONEUNKNOWN "óÒÝ¨¾¶´" +END _____ Modified: trunk/reactos/lib/cpl/timedate/timedate.rc --- trunk/reactos/lib/cpl/timedate/timedate.rc 2005-11-25 09:30:09 UTC (rev 19543) +++ trunk/reactos/lib/cpl/timedate/timedate.rc 2005-11-25 10:22:12 UTC (rev 19544) @@ -20,6 +20,7 @@ #include "Dk.rc" #include "En.rc" #include "Fr.rc" +#include "Gr.rc" #include "Ja.rc" #include "Nl.rc" #include "Pl.rc"

18 years, 9 months

[hpoussin] 19543: Return NULL when an error occurs in CreateServiceW

by hpoussin＠svn.reactos.com

Return NULL when an error occurs in CreateServiceW Modified: trunk/reactos/lib/advapi32/service/scm.c _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-11-25 04:39:08 UTC (rev 19542) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-11-25 09:30:09 UTC (rev 19543) @@ -458,7 +458,7 @@ { DPRINT1("ScmrCreateServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); - return INVALID_HANDLE_VALUE; + return NULL; } return hService;

18 years, 9 months

← Newer
1
...
22
23
24
25
26
27
28
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005