Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[ekohl] 27097: Add a user manager control panel application since the 0.3.2 release has been canceled.
by ekohl＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: ekohl Date: Sun Jun 10 03:17:33 2007 New Revision: 27097 URL: http://svn.reactos.org/svn/reactos?rev=27097&view=rev Log: Add a user manager control panel application since the 0.3.2 release has been canceled. Added: trunk/reactos/dll/cpl/usrmgr/ trunk/reactos/dll/cpl/usrmgr/extra.c trunk/reactos/dll/cpl/usrmgr/groups.c trunk/reactos/dll/cpl/usrmgr/lang/ trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc trunk/reactos/dll/cpl/usrmgr/resource.h trunk/reactos/dll/cpl/usrmgr/resources/ trunk/reactos/dll/cpl/usrmgr/resources/applet.ico (with props) trunk/reactos/dll/cpl/usrmgr/users.c trunk/reactos/dll/cpl/usrmgr/usrmgr.c trunk/reactos/dll/cpl/usrmgr/usrmgr.def trunk/reactos/dll/cpl/usrmgr/usrmgr.h trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild trunk/reactos/dll/cpl/usrmgr/usrmgr.rc Modified: trunk/reactos/dll/cpl/cpl.rbuild Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=270… ============================================================================== --- trunk/reactos/dll/cpl/cpl.rbuild (original) +++ trunk/reactos/dll/cpl/cpl.rbuild Sun Jun 10 03:17:33 2007 @@ -37,3 +37,6 @@ <directory name="timedate"> <xi:include href="timedate/timedate.rbuild" /> </directory> +<directory name="usrmgr"> + <xi:include href="usrmgr/usrmgr.rbuild" /> +</directory> Added: trunk/reactos/dll/cpl/usrmgr/extra.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/extra.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/extra.c (added) +++ trunk/reactos/dll/cpl/usrmgr/extra.c Sun Jun 10 03:17:33 2007 @@ -1,0 +1,33 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User Manager Control Panel + * FILE: dll/cpl/usrmgr/extra.c + * PURPOSE: Extra property page + * + * PROGRAMMERS: Eric Kohl + */ + +#include "usrmgr.h" + +INT_PTR CALLBACK +ExtraPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); + + switch (uMsg) + { + case WM_INITDIALOG: + break; + + case WM_COMMAND: + break; + } + + return FALSE; +} Added: trunk/reactos/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groups.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groups.c (added) +++ trunk/reactos/dll/cpl/usrmgr/groups.c Sun Jun 10 03:17:33 2007 @@ -1,0 +1,185 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User Manager Control Panel + * FILE: dll/cpl/usrmgr/groups.c + * PURPOSE: Groups property page + * + * PROGRAMMERS: Eric Kohl + */ + +#include "usrmgr.h" + +typedef struct _GROUP_DATA +{ + HMENU hPopupMenu; + + INT iCurrentItem; + +} GROUP_DATA, *PGROUP_DATA; + + +static VOID +SetGroupsListColumns(HWND hwndListView) +{ + LV_COLUMN column; + RECT rect; + TCHAR szStr[32]; + + GetClientRect(hwndListView, &rect); + + memset(&column, 0x00, sizeof(column)); + column.mask=LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM | LVCF_TEXT; + column.fmt=LVCFMT_LEFT; + column.cx = (INT)((rect.right - rect.left) * 0.40); + column.iSubItem = 0; + LoadString(hApplet, IDS_NAME, szStr, sizeof(szStr) / sizeof(szStr[0])); + column.pszText = szStr; + (void)ListView_InsertColumn(hwndListView, 0, &column); + + column.cx = (INT)((rect.right - rect.left) * 0.60); + column.iSubItem = 1; + LoadString(hApplet, IDS_DESCRIPTION, szStr, sizeof(szStr) / sizeof(szStr[0])); + column.pszText = szStr; + (void)ListView_InsertColumn(hwndListView, 1, &column); +} + + +static VOID +UpdateGroupsList(HWND hwndListView) +{ + NET_API_STATUS netStatus; + PLOCALGROUP_INFO_1 pBuffer; + DWORD entriesread; + DWORD totalentries; + DWORD resume_handle = 0; + DWORD i; + + LV_ITEM lvi; + INT iItem; + + + for (;;) + { + netStatus = NetLocalGroupEnum(NULL, 1, (LPBYTE*)&pBuffer, + 1024, &entriesread, + &totalentries, &resume_handle); + if (netStatus != NERR_Success && netStatus != ERROR_MORE_DATA) + break; + + for (i = 0; i < entriesread; i++) + { + memset(&lvi, 0x00, sizeof(lvi)); + lvi.mask = LVIF_TEXT | LVIF_STATE; // | LVIF_PARAM; +// lvi.lParam = (LPARAM)VarData; + lvi.pszText = pBuffer[i].lgrpi1_name; + lvi.state = 0; //(i == 0) ? LVIS_SELECTED : 0; + iItem = ListView_InsertItem(hwndListView, &lvi); + + ListView_SetItemText(hwndListView, iItem, 1, + pBuffer[i].lgrpi1_comment); + } + + NetApiBufferFree(&pBuffer); + + /* No more data left */ + if (netStatus != ERROR_MORE_DATA) + break; + } + +} + + +static VOID +OnInitDialog(HWND hwndDlg) +{ + HWND hwndListView; + + hwndListView = GetDlgItem(hwndDlg, IDC_GROUPS_LIST); + + (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT); + + SetGroupsListColumns(hwndListView); + + UpdateGroupsList(hwndListView); + +// (void)ListView_SetColumnWidth(hwndListView, 3, LVSCW_AUTOSIZE_USEHEADER); +// (void)ListView_Update(hwndListView, 0); +} + + +static VOID +OnNotify(HWND hwndDlg, PGROUP_DATA pGroupData, NMHDR *phdr) +{ + LPNMLISTVIEW lpnmlv = (LPNMLISTVIEW)phdr; + + switch (phdr->idFrom) + { + case IDC_GROUPS_LIST: + switch(phdr->code) + { + case NM_CLICK: + pGroupData->iCurrentItem = lpnmlv->iItem; + if (lpnmlv->iItem == -1) + { + } + else + { + } + break; + + case NM_DBLCLK: + break; + + case NM_RCLICK: + ClientToScreen(GetDlgItem(hwndDlg, IDC_GROUPS_LIST), &lpnmlv->ptAction); + TrackPopupMenu(GetSubMenu(pGroupData->hPopupMenu, (lpnmlv->iItem == -1) ? 0 : 1), + TPM_LEFTALIGN, lpnmlv->ptAction.x, lpnmlv->ptAction.y, 0, hwndDlg, NULL); + break; + } + break; + } +} + + +INT_PTR CALLBACK +GroupsPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PGROUP_DATA pGroupData; + + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); + + + pGroupData = (PGROUP_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + pGroupData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GROUP_DATA)); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGroupData); + + pGroupData->hPopupMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDM_POPUP_GROUP)); + + OnInitDialog(hwndDlg); + break; + + case WM_COMMAND: + break; + + case WM_NOTIFY: + OnNotify(hwndDlg, pGroupData, (NMHDR *)lParam); + break; + + case WM_DESTROY: + DestroyMenu(pGroupData->hPopupMenu); + HeapFree(GetProcessHeap(), 0, pGroupData); + break; + } + + return FALSE; +} Added: trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc (added) +++ trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc Sun Jun 10 03:17:33 2007 @@ -1,0 +1,90 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +/* + * Attention Translators: + * DO NOT TRANSLATE THESE RESOURCES YET! + */ + +/* Dialogs */ + +IDD_USERS DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Users" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 7, 238, 85, WS_EX_CLIENTEDGE +END + + +IDD_GROUPS DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Groups" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 7, 238, 85, WS_EX_CLIENTEDGE +END + + +IDD_EXTRA DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extra" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "This space is intentionally left blank", IDC_STATIC, 66, 90, 112, 8 +END + + +/* Menus */ + +IDM_POPUP_GROUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "New Group...", IDM_GROUP_NEW + END + POPUP "" + BEGIN + MENUITEM "Add Member", IDM_GROUP_ADD_MEMBER + MENUITEM SEPARATOR + MENUITEM "Delete", IDM_GROUP_DELETE + MENUITEM "Rename", IDM_GROUP_RENAME + MENUITEM SEPARATOR + MENUITEM "Properties", IDM_GROUP_PROPERTIES + END +END + + +IDM_POPUP_USER MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "New User...", IDM_USER_NEW + END + POPUP "" + BEGIN + MENUITEM "Change Password", IDM_USER_CHANGE_PASSWORD + MENUITEM SEPARATOR + MENUITEM "Delete", IDM_USER_DELETE + MENUITEM "Rename", IDM_USER_RENAME + MENUITEM SEPARATOR + MENUITEM "Properties", IDM_USER_PROPERTIES + END +END + + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_CPLNAME "User Accounts" + IDS_CPLDESCRIPTION "Manages Users and Groups." +END + +STRINGTABLE +BEGIN + IDS_NAME "Name" + IDS_FULLNAME "Full Name" + IDS_DESCRIPTION "Description" +END Added: trunk/reactos/dll/cpl/usrmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/resource.h (added) +++ trunk/reactos/dll/cpl/usrmgr/resource.h Sun Jun 10 03:17:33 2007 @@ -1,0 +1,55 @@ +#ifndef __CPL_USRMGR_RESOURCE_H__ +#define __CPL_USRMGR_RESOURCE_H__ + +#include <commctrl.h> + +/* metrics */ +#define PROPSHEETWIDTH 246 +#define PROPSHEETHEIGHT 228 +#define PROPSHEETPADDING 6 + +#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) +#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2)) + +#define ICONSIZE 16 + +/* ids */ + +#define IDC_USRMGR_ICON 40 +#define IDC_USRMGR_ICON2 100 // Needed for theme compatability with Windows. + +#define IDD_USERS 100 +#define IDD_GROUPS 101 +#define IDD_EXTRA 102 + +#define IDC_USERS_LIST 200 + +#define IDC_GROUPS_LIST 300 + +#define IDC_STATIC -1 + + +#define IDS_CPLNAME 2000 +#define IDS_CPLDESCRIPTION 2001 + +#define IDS_NAME 2100 +#define IDS_FULLNAME 2101 +#define IDS_DESCRIPTION 2102 + +/* Menus */ +#define IDM_POPUP_GROUP 120 +#define IDM_GROUP_ADD_MEMBER 121 +#define IDM_GROUP_NEW 122 +#define IDM_GROUP_DELETE 123 +#define IDM_GROUP_RENAME 124 +#define IDM_GROUP_PROPERTIES 125 + +#define IDM_POPUP_USER 130 +#define IDM_USER_CHANGE_PASSWORD 131 +#define IDM_USER_NEW 132 +#define IDM_USER_DELETE 133 +#define IDM_USER_RENAME 134 +#define IDM_USER_PROPERTIES 135 + +#endif /* __CPL_USRMGR_RESOURCE_H__ */ + Added: trunk/reactos/dll/cpl/usrmgr/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/resources/a… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/usrmgr/resources/applet.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c (added) +++ trunk/reactos/dll/cpl/usrmgr/users.c Sun Jun 10 03:17:33 2007 @@ -1,0 +1,200 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User Manager Control Panel + * FILE: dll/cpl/usrmgr/users.c + * PURPOSE: Users property page + * + * PROGRAMMERS: Eric Kohl + */ + +#include "usrmgr.h" + + +typedef struct _USER_DATA +{ + HMENU hPopupMenu; + + INT iCurrentItem; + +} USER_DATA, *PUSER_DATA; + + +static VOID +SetUsersListColumns(HWND hwndListView) +{ + LV_COLUMN column; + RECT rect; + TCHAR szStr[32]; + + GetClientRect(hwndListView, &rect); + + memset(&column, 0x00, sizeof(column)); + column.mask=LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM | LVCF_TEXT; + column.fmt=LVCFMT_LEFT; + column.cx = (INT)((rect.right - rect.left) * 0.25); + column.iSubItem = 0; + LoadString(hApplet, IDS_NAME, szStr, sizeof(szStr) / sizeof(szStr[0])); + column.pszText = szStr; + (void)ListView_InsertColumn(hwndListView, 0, &column); + + column.cx = (INT)((rect.right - rect.left) * 0.50); + column.iSubItem = 1; + LoadString(hApplet, IDS_FULLNAME, szStr, sizeof(szStr) / sizeof(szStr[0])); + column.pszText = szStr; + (void)ListView_InsertColumn(hwndListView, 1, &column); + + column.cx = (INT)((rect.right - rect.left) * 0.25); + column.iSubItem = 2; + LoadString(hApplet, IDS_DESCRIPTION, szStr, sizeof(szStr) / sizeof(szStr[0])); + column.pszText = szStr; + (void)ListView_InsertColumn(hwndListView, 2, &column); +} + + +static VOID +UpdateUsersList(HWND hwndListView) +{ + NET_API_STATUS netStatus; + PUSER_INFO_20 pBuffer; + DWORD entriesread; + DWORD totalentries; + DWORD resume_handle = 0; + DWORD i; + + LV_ITEM lvi; + INT iItem; + + + for (;;) + { + netStatus = NetUserEnum(NULL, 20, FILTER_NORMAL_ACCOUNT, + (LPBYTE*)&pBuffer, + 1024, &entriesread, + &totalentries, &resume_handle); + if (netStatus != NERR_Success && netStatus != ERROR_MORE_DATA) + break; + + for (i = 0; i < entriesread; i++) + { + memset(&lvi, 0x00, sizeof(lvi)); + lvi.mask = LVIF_TEXT | LVIF_STATE; // | LVIF_PARAM; +// lvi.lParam = (LPARAM)VarData; + lvi.pszText = pBuffer[i].usri20_name; + lvi.state = 0; //(i == 0) ? LVIS_SELECTED : 0; + iItem = ListView_InsertItem(hwndListView, &lvi); + + ListView_SetItemText(hwndListView, iItem, 1, + pBuffer[i].usri20_full_name); + + ListView_SetItemText(hwndListView, iItem, 2, + pBuffer[i].usri20_comment); + } + + NetApiBufferFree(&pBuffer); + + /* No more data left */ + if (netStatus != ERROR_MORE_DATA) + break; + } + +} + + +static VOID +OnInitDialog(HWND hwndDlg) +{ + HWND hwndListView; + + /* Set user environment variables */ + hwndListView = GetDlgItem(hwndDlg, IDC_USERS_LIST); + + (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT); + + SetUsersListColumns(hwndListView); + + UpdateUsersList(hwndListView); + +// (void)ListView_SetColumnWidth(hwndListView, 3, LVSCW_AUTOSIZE_USEHEADER); +// (void)ListView_Update(hwndListView, 0); +} + + +static VOID +OnNotify(HWND hwndDlg, PUSER_DATA pUserData, NMHDR *phdr) +{ + LPNMLISTVIEW lpnmlv = (LPNMLISTVIEW)phdr; + + switch (phdr->idFrom) + { + case IDC_USERS_LIST: + switch(phdr->code) + { + case NM_CLICK: + pUserData->iCurrentItem = lpnmlv->iItem; + if (lpnmlv->iItem == -1) + { + } + else + { + } + break; + + case NM_DBLCLK: + break; + + case NM_RCLICK: + ClientToScreen(GetDlgItem(hwndDlg, IDC_USERS_LIST), &lpnmlv->ptAction); + TrackPopupMenu(GetSubMenu(pUserData->hPopupMenu, (lpnmlv->iItem == -1) ? 0 : 1), + TPM_LEFTALIGN, lpnmlv->ptAction.x, lpnmlv->ptAction.y, 0, hwndDlg, NULL); + break; + } + break; + } +} + + +INT_PTR CALLBACK +UsersPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PUSER_DATA pUserData; + + UNREFERENCED_PARAMETER(wParam); + + pUserData = (PUSER_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + pUserData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(USER_DATA)); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pUserData); + + pUserData->hPopupMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDM_POPUP_USER)); + + OnInitDialog(hwndDlg); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDM_USER_PROPERTIES: + MessageBeep(-1); + break; + } + break; + + case WM_NOTIFY: + OnNotify(hwndDlg, pUserData, (NMHDR *)lParam); + break; + + case WM_DESTROY: + DestroyMenu(pUserData->hPopupMenu); + HeapFree(GetProcessHeap(), 0, pUserData); + break; + } + + return FALSE; +} Added: trunk/reactos/dll/cpl/usrmgr/usrmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.c (added) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.c Sun Jun 10 03:17:33 2007 @@ -1,0 +1,123 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User Manager Control Panel + * FILE: dll/cpl/usrmgr/extra.c + * PURPOSE: Main functions + * + * PROGRAMMERS: Eric Kohl + */ + +#include "usrmgr.h" + +#define NUM_APPLETS 1 + +LONG APIENTRY UsrmgrApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); + +HINSTANCE hApplet = 0; + +/* Applets */ +APPLET Applets[NUM_APPLETS] = +{ + { + IDC_USRMGR_ICON, + IDS_CPLNAME, + IDS_CPLDESCRIPTION, + UsrmgrApplet + } +}; + + +static VOID +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) +{ + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT; + psp->hInstance = hApplet; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; +} + + +/* Display Applet */ +LONG APIENTRY +UsrmgrApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) +{ + PROPSHEETPAGE psp[3]; + PROPSHEETHEADER psh; + TCHAR Caption[1024]; + + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(hwnd); + + LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE; + psh.hwndParent = NULL; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_USRMGR_ICON)); + psh.pszCaption = Caption; + psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + psh.nStartPage = 0; + psh.ppsp = psp; + + InitPropSheetPage(&psp[0], IDD_USERS, (DLGPROC)UsersPageProc); + InitPropSheetPage(&psp[1], IDD_GROUPS, (DLGPROC)GroupsPageProc); + InitPropSheetPage(&psp[2], IDD_EXTRA, (DLGPROC)ExtraPageProc); + + return (LONG)(PropertySheet(&psh) != -1); +} + + +/* Control Panel Callback */ +LONG CALLBACK +CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + int i = (int)lParam1; + + switch (uMsg) + { + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return NUM_APPLETS; + + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + break; + + case CPL_DBLCLK: + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + break; + } + + return FALSE; +} + + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(lpvReserved); + + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + hApplet = hinstDLL; + break; + } + + return TRUE; +} Added: trunk/reactos/dll/cpl/usrmgr/usrmgr.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.def?… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.def (added) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.def Sun Jun 10 03:17:33 2007 @@ -1,0 +1,6 @@ +LIBRARY usrmgr.cpl + +EXPORTS +CPlApplet + +; EOF Added: trunk/reactos/dll/cpl/usrmgr/usrmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.h?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.h (added) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.h Sun Jun 10 03:17:33 2007 @@ -1,0 +1,34 @@ +#ifndef __CPL_DESK_H__ +#define __CPL_DESK_H__ + +#include <windows.h> +#include <commctrl.h> +#include <commdlg.h> +#include <cpl.h> +#include <tchar.h> +#include <setupapi.h> +#include <lmaccess.h> +#include <lmapibuf.h> +#include <lmerr.h> +#include <stdio.h> + +#include "resource.h" + +typedef struct _APPLET +{ + int idIcon; + int idName; + int idDescription; + APPLET_PROC AppletProc; +} APPLET, *PAPPLET; + +extern HINSTANCE hApplet; + + +INT_PTR CALLBACK UsersPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK GroupsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ExtraPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + + +#endif /* __CPL_DESK_H__ */ + Added: trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rbui… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild (added) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild Sun Jun 10 03:17:33 2007 @@ -1,0 +1,24 @@ +<module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl"> + <importlibrary definition="usrmgr.def" /> + <include base="usrmgr">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + + + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>comctl32</library> + <library>ntdll</library> + <library>netapi32</library> + <library>msvcrt</library> + <file>extra.c</file> + <file>groups.c</file> + <file>users.c</file> + <file>usrmgr.c</file> + <file>usrmgr.rc</file> +</module> Added: trunk/reactos/dll/cpl/usrmgr/usrmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rc (added) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rc Sun Jun 10 03:17:33 2007 @@ -1,0 +1,17 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS User Manager Panel\0" +#define REACTOS_STR_INTERNAL_NAME "usrmgr\0" +#define REACTOS_STR_ORIGINAL_FILENAME "usrmgr.cpl\0" + +#include <reactos/version.rc> + +IDC_USRMGR_ICON ICON "resources/applet.ico" +IDC_USRMGR_ICON2 ICON "resources/applet.ico" + + +#include "lang/en-US.rc"

1 0

[ekohl] 27096: Add NetLocalGroupEnum stub.
by ekohl＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: ekohl Date: Sun Jun 10 03:14:07 2007 New Revision: 27096 URL: http://svn.reactos.org/svn/reactos?rev=27096&view=rev Log: Add NetLocalGroupEnum stub. Modified: trunk/reactos/dll/win32/netapi32/access.c trunk/reactos/dll/win32/netapi32/netapi32.spec Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c (original) +++ trunk/reactos/dll/win32/netapi32/access.c Sun Jun 10 03:14:07 2007 @@ -568,6 +568,21 @@ } /************************************************************ + * NetLocalGroupEnum (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetLocalGroupEnum(LPCWSTR servername, DWORD level, + LPBYTE *bufptr, DWORD prefmaxlen, PDWORD entriesread, + PDWORD totalentries, PDWORD resumehandle) +{ + FIXME("(%s %ld %p %u %p %p %p) stub!\n", debugstr_w(servername), + level, bufptr, entriesread, totalentries, resumehandle); + *entriesread = 0; + *totalentries = 0; + *resumehandle = 0; + return NERR_Success; +} + +/************************************************************ * NetLocalGroupSetMember (NETAPI32.@) */ Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec Sun Jun 10 03:14:07 2007 @@ -107,7 +107,7 @@ @ stub NetLocalGroupDel @ stub NetLocalGroupDelMember @ stub NetLocalGroupDelMembers -@ stub NetLocalGroupEnum +@ stdcall NetLocalGroupEnum(wstr long ptr long ptr ptr ptr) @ stub NetLocalGroupGetInfo @ stub NetLocalGroupGetMembers @ stub NetLocalGroupSetInfo

1 0

[greatlrd] 27095: almost finish GetDeviceIdentifier implementions, leftdo fill in guidDeviceIdentifier and dwWHQLLevel
by greatlrd＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: greatlrd Date: Sun Jun 10 02:49:38 2007 New Revision: 27095 URL: http://svn.reactos.org/svn/reactos?rev=27095&view=rev Log: almost finish GetDeviceIdentifier implementions, leftdo fill in guidDeviceIdentifier and dwWHQLLevel Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sun Jun 10 02:49:38 2007 @@ -461,6 +461,8 @@ HKEY hKey; DWORD lpType = 0; DWORD strSize = MAX_DDDEVICEID_STRING; + char *pdest; + char* pcCnvEnd; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface; @@ -507,37 +509,39 @@ if (found == TRUE) { /* we found our driver now we start setup it */ - strcpy( pDDDI->szDescription, DisplayDeviceA.DeviceString); - if (!_strnicmp(DisplayDeviceA.DeviceKey,"\\REGISTRY\\Machine\\",18)) { if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, &DisplayDeviceA.DeviceKey[18], 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS ) { - if (RegQueryValueExA(hKey, "InstalledDisplayDrivers",0, &lpType, (LPBYTE)pDDDI->szDriver, &strSize) == ERROR_SUCCESS) + + if (RegQueryValueExA(hKey, "InstalledDisplayDrivers",0, &lpType, (LPBYTE)pDDDI->szDriver, &strSize) != ERROR_SUCCESS) { - char *pdest; - /* FIXME if the file is name - ati2dvag.dll.dll then we are doom - a better code should be use to strip away .dll - */ - pdest = strstr(pDDDI->szDriver,".dll"); - memset(pdest,0,3); + ZeroMemory(pDDDI->szDriver,MAX_DDDEVICEID_STRING); } RegCloseKey(hKey); } + + strcpy( pDDDI->szDescription, DisplayDeviceA.DeviceString); + pDDDI->liDriverVersion.HighPart = 0; + pDDDI->liDriverVersion.LowPart = 0; + + pdest = strstr(DisplayDeviceA.DeviceID,"REV_"); + pDDDI->dwRevision = strtol ( &pdest[4], &pcCnvEnd, 16); + + pdest = strstr(DisplayDeviceA.DeviceID,"SUBSYS_"); + pDDDI->dwSubSysId = strtol ( &pdest[7], &pcCnvEnd, 16); + + pdest = strstr(DisplayDeviceA.DeviceID,"DEV_"); + pDDDI->dwDeviceId = strtol ( &pdest[4], &pcCnvEnd, 16); + + pdest = strstr(DisplayDeviceA.DeviceID,"VEN_"); + pDDDI->dwVendorId =strtol ( &pdest[4], &pcCnvEnd, 16); + + /* FIXME pDDDI->guidDeviceIdentifier, pDDDI->dwWHQLLevel */ + + pDDDI->dwWHQLLevel = 0; retVal = DD_OK; } - //else - //{ - // /* FIXME ?? */ - // DX_STUB_str("Error did not manger cut reg key\n" - // DX_STUB_str(DisplayDeviceA.DeviceKey); - //} - - - /* This api still under devloping now we can get desc of the - primary drv - */ break; }

1 0

[hpoussin] 27094: Support IRP_MN_FILTER_RESOURCE_REQUIREMENTS
by hpoussin＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: hpoussin Date: Sun Jun 10 00:39:34 2007 New Revision: 27094 URL: http://svn.reactos.org/svn/reactos?rev=27094&view=rev Log: Support IRP_MN_FILTER_RESOURCE_REQUIREMENTS Modified: trunk/reactos/drivers/storage/ide/pciidex/pdo.c Modified: trunk/reactos/drivers/storage/ide/pciidex/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pdo.c (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pdo.c Sun Jun 10 00:39:34 2007 @@ -473,6 +473,13 @@ Status = PciIdeXPdoQueryDeviceText(DeviceObject, Irp, &Information); break; } + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: /* 0x0d */ + { + DPRINT("IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + Information = Irp->IoStatus.Information; + Status = Irp->IoStatus.Status; + break; + } case IRP_MN_QUERY_ID: /* 0x13 */ { Status = PciIdeXPdoQueryId(DeviceObject, Irp, &Information);

1 0

[greatlrd] 27093: start implement of GetDeviceIdentifier we are filling one more member right. this time we getting the driver name
by greatlrd＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: greatlrd Date: Sun Jun 10 00:22:09 2007 New Revision: 27093 URL: http://svn.reactos.org/svn/reactos?rev=27093&view=rev Log: start implement of GetDeviceIdentifier we are filling one more member right. this time we getting the driver name Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sun Jun 10 00:22:09 2007 @@ -458,6 +458,9 @@ BOOL found = FALSE; DWORD iDevNum = 0; DISPLAY_DEVICEA DisplayDeviceA; + HKEY hKey; + DWORD lpType = 0; + DWORD strSize = MAX_DDDEVICEID_STRING; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface; @@ -506,10 +509,36 @@ /* we found our driver now we start setup it */ strcpy( pDDDI->szDescription, DisplayDeviceA.DeviceString); + if (!_strnicmp(DisplayDeviceA.DeviceKey,"\\REGISTRY\\Machine\\",18)) + { + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, &DisplayDeviceA.DeviceKey[18], 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS ) + { + if (RegQueryValueExA(hKey, "InstalledDisplayDrivers",0, &lpType, (LPBYTE)pDDDI->szDriver, &strSize) == ERROR_SUCCESS) + { + char *pdest; + /* FIXME if the file is name + ati2dvag.dll.dll then we are doom + a better code should be use to strip away .dll + */ + pdest = strstr(pDDDI->szDriver,".dll"); + memset(pdest,0,3); + } + RegCloseKey(hKey); + } + retVal = DD_OK; + } + //else + //{ + // /* FIXME ?? */ + // DX_STUB_str("Error did not manger cut reg key\n" + // DX_STUB_str(DisplayDeviceA.DeviceKey); + //} + + /* This api still under devloping now we can get desc of the primary drv */ - retVal = DD_OK; + break; }

1 0

[hpoussin] 27092: Simplify method to call to DriverEntry of a driver
by hpoussin＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: hpoussin Date: Sun Jun 10 00:16:29 2007 New Revision: 27092 URL: http://svn.reactos.org/svn/reactos?rev=27092&view=rev Log: Simplify method to call to DriverEntry of a driver Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sun Jun 10 00:16:29 2007 @@ -805,6 +805,7 @@ NTAPI IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, + IN PUNICODE_STRING RegistryPath, OUT PDRIVER_OBJECT *pDriverObject); VOID Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Sun Jun 10 00:16:29 2007 @@ -100,7 +100,7 @@ UNICODE_STRING DriverName; NTSTATUS Status; - DPRINT("IopOpenDriverObject(%p '%wZ' %x)\n", + DPRINT("IopGetDriverObject(%p '%wZ' %x)\n", DriverObject, ServiceName, FileSystem); *DriverObject = NULL; @@ -340,13 +340,6 @@ return Status; } -static NTSTATUS -NTAPI -IopDriverInitializeEmpty(IN struct _DRIVER_OBJECT *DriverObject, IN PUNICODE_STRING RegistryPath) -{ - return STATUS_SUCCESS; -} - /* * IopInitializeDriverModule * @@ -418,38 +411,24 @@ RtlInitUnicodeString(&DriverName, NameBuffer); DPRINT("Driver name: '%wZ'\n", &DriverName); - Status = IopCreateDriver(&DriverName, IopDriverInitializeEmpty, &Driver); + Status = IopCreateDriver(&DriverName, DriverEntry, &RegistryKey, &Driver); } else { - Status = IopCreateDriver(NULL, IopDriverInitializeEmpty, &Driver); - } + Status = IopCreateDriver(NULL, DriverEntry, &RegistryKey, &Driver); + } + RtlFreeUnicodeString(&RegistryKey); *DriverObject = Driver; if (!NT_SUCCESS(Status)) { - DPRINT("IopCreateDriver() failed (Status 0x%08lx)\n", Status); + DPRINT1("IopCreateDriver() failed (Status 0x%08lx)\n", Status); return Status; } Driver->HardwareDatabase = &IopHardwareDatabaseKey; Driver->DriverStart = ModuleObject->DllBase; Driver->DriverSize = ModuleObject->SizeOfImage; - - DPRINT("RegistryKey: %wZ\n", &RegistryKey); - DPRINT("Calling driver entrypoint at %08lx\n", DriverEntry); - - Status = DriverEntry(Driver, &RegistryKey); - - RtlFreeUnicodeString(&RegistryKey); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("DriverEntry() returned Status=0x%08X\n", Status); - ObMakeTemporaryObject(Driver); - ObDereferenceObject(Driver); - return Status; - } /* Set the driver as initialized */ Driver->Flags |= DRVO_INITIALIZED; @@ -1113,6 +1092,7 @@ NTAPI IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, + IN PUNICODE_STRING RegistryPath, OUT PDRIVER_OBJECT *pDriverObject) { WCHAR NameBuffer[100]; @@ -1246,7 +1226,9 @@ ZwClose(hDriver); /* Finally, call its init function */ - Status = (*InitializationFunction)(DriverObject, NULL); + DPRINT("RegistryKey: %wZ\n", RegistryKey); + DPRINT("Calling driver entrypoint at %p\n", InitializationFunction); + Status = (*InitializationFunction)(DriverObject, RegistryPath); if (!NT_SUCCESS(Status)) { /* If it didn't work, then kill the object */ @@ -1274,7 +1256,7 @@ IN PDRIVER_INITIALIZE InitializationFunction) { PDRIVER_OBJECT DriverObject; - return IopCreateDriver(DriverName, InitializationFunction, &DriverObject); + return IopCreateDriver(DriverName, InitializationFunction, NULL, &DriverObject); } /* Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Sun Jun 10 00:16:29 2007 @@ -3315,7 +3315,7 @@ * Create root device node */ - Status = IopCreateDriver(NULL, PnpDriverInitializeEmpty, &IopRootDriverObject); + Status = IopCreateDriver(NULL, PnpDriverInitializeEmpty, NULL, &IopRootDriverObject); if (!NT_SUCCESS(Status)) { CPRINT("IoCreateDriverObject() failed\n");

1 0

[dreimer] 27091: - Whitespace trim in cpucount.c - Added links to all needed Tools to info.txt - Fixed my own stupidness once more... parameters for make got skipped...
by dreimer＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: dreimer Date: Sun Jun 10 00:03:02 2007 New Revision: 27091 URL: http://svn.reactos.org/svn/reactos?rev=27091&view=rev Log: - Whitespace trim in cpucount.c - Added links to all needed Tools to info.txt - Fixed my own stupidness once more... parameters for make got skipped... Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Tools/cpucount.c trunk/tools/RosBE-Windows/Tools/info.txt Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Sun Jun 10 00:03:02 2007 @@ -11,7 +11,7 @@ :: if it is then abort the build and inform the user. :: if exist "%_ROSSOURCEDIR%\config.rbuild" ( - "%ROSBEBASEDIR%\Tools\test.exe" "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild" + %ROSBEBASEDIR%\Tools\test.exe "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild" if not errorlevel 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** @@ -26,16 +26,13 @@ :: Get the current date and time for use in :: in our build log's file name. :: -call %ROSBEBASEDIR%\TimeDate.cmd +call "%ROSBEBASEDIR%\TimeDate.cmd" :: -:: Execute the Build command +:: Now use mingw32-make to build ReactOS, passing along options, if any. :: -if "%1" == "" ( - %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% 2>&1 | %ROSBEBASEDIR%\Tools\tee.exe %_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt -) else ( - %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% %* 2>&1 | %ROSBEBASEDIR%\Tools\tee.exe %_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt -) + +call "%ROSBEBASEDIR%\Tools\buildtime.exe" %MAKE_COMMAND% 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" :: :: highlight the fact that building has ended Modified: trunk/tools/RosBE-Windows/Tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cpucount… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/cpucount.c (original) +++ trunk/tools/RosBE-Windows/Tools/cpucount.c Sun Jun 10 00:03:02 2007 @@ -29,4 +29,3 @@ return 1; } } - Modified: trunk/tools/RosBE-Windows/Tools/info.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/info.txt… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/info.txt (original) +++ trunk/tools/RosBE-Windows/Tools/info.txt Sun Jun 10 00:03:02 2007 @@ -1,1 +1,11 @@ -Built Tools need to be copied to /Root/Tools/ +Additional Tools needed: +tee: http://gnuwin32.sourceforge.net/packages/coreutils.htm +test: http://gnuwin32.sourceforge.net/packages/coreutils.htm +sed: http://gnuwin32.sourceforge.net/packages/sed.htm +svn: http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 + +Additional Libs needed: +LibIntl: http://gnuwin32.sourceforge.net/packages/libintl.htm +LibIconv: http://gnuwin32.sourceforge.net/packages/libiconv.htm + +Built Tools and Rest needs to be copied to /Root/Tools/

1 0

[hpoussin] 27090: Zero the full structure. Thanks Fireball
by hpoussin＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: hpoussin Date: Sat Jun 9 23:37:41 2007 New Revision: 27090 URL: http://svn.reactos.org/svn/reactos?rev=27090&view=rev Log: Zero the full structure. Thanks Fireball Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Sat Jun 9 23:37:41 2007 @@ -169,7 +169,7 @@ Status = STATUS_NO_MEMORY; goto cleanup; } - RtlZeroMemory(Device, sizeof(Device)); + RtlZeroMemory(Device, sizeof(PNPROOT_DEVICE)); if (!RtlCreateUnicodeString(&Device->DeviceID, DevicePath)) { Status = STATUS_NO_MEMORY;

1 0

[dreimer] 27089: Part 1 of X. Add Stuff for Version 0.3.7 - Basic SVN update/create/cleanup Feature (not final yet) - Readded makex, its not the fault of my Code, its a GCC Bug, so why not readd it?
by dreimer＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: dreimer Date: Sat Jun 9 23:31:30 2007 New Revision: 27089 URL: http://svn.reactos.org/svn/reactos?rev=27089&view=rev Log: Part 1 of X. Add Stuff for Version 0.3.7 - Basic SVN update/create/cleanup Feature (not final yet) - Readded makex, its not the fault of my Code, its a GCC Bug, so why not readd it? Added: trunk/tools/RosBE-Windows/Root/SVN.cmd Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/RosBE.mac Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Sat Jun 9 23:31:30 2007 @@ -9,6 +9,9 @@ - New cool Icon. Thanks to ROSFan for it. - Readded buildtime. - Removed makex for now, until the bug is fixed. +- Added Colin Finck's Build.cmd Unification +- Added Ged Murphy's flash tool to letthe window flash at build's end +- Updated all other tools *** Janruary 26th, 2007 - RosBE 0.3.5b2 Released Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Sat Jun 9 23:31:30 2007 @@ -4,7 +4,7 @@ :: @echo off -title ReactOS Build Environment 0.3.6 +title ReactOS Build Environment 0.3.7 if "%1" == "" ( echo. @@ -12,10 +12,15 @@ echo make [OPTIONS] - make, without options does a standard build of echo ReactOS. OPTIONS are the standard ReactOS build echo options ie. bootcd. + echo makex [OPTIONS] - Same as 'make' but automatically determines the + echo number of CPUs in the system and uses -j with + echo the appropriate number. echo clean [logs] - Fully clean the ReactOS source directory or the echo RosBE build logs. echo help [COMMAND] - Display the available commands or help on a echo specific command. + echo svn [OPTIONS] - Create, Update or clean up your ReactOS Source + echo tree. echo basedir - Switch back to the ReactOS source directory. goto :EOF ) @@ -25,15 +30,15 @@ echo are the standard ReactOS build options ie. bootcd. goto :EOF ) -:: if "%1" == "makex" ( -:: echo Usage: makex [OPTIONS] -:: echo Same as 'make' but automatically determines the number of CPUs -:: echo in the system and uses -j with the appropriate number. -:: echo NOTE: The number makex uses can be modified by editing -:: echo Build-Multi.cmd located in the RosBE directory, -:: echo instructions for doing so are contained within the file. -:: goto :EOF -:: ) +if "%1" == "makex" ( + echo Usage: makex [OPTIONS] + echo Same as 'make' but automatically determines the number of CPUs + echo in the system and uses -j with the appropriate number. + echo NOTE: The number makex uses can be modified by editing + echo Build-Multi.cmd located in the RosBE directory, + echo instructions for doing so are contained within the file. + goto :EOF +) if "%1" == "clean" ( echo Usage: clean [logs] echo Fully clean the ReactOS source directory. @@ -46,6 +51,11 @@ echo Shows help for the specified command or lists all available commands. goto :EOF ) +if "%1" == "svn" ( + echo Usage: svn [OPTIONS] + echo Creates, Updates or cleans up your ReactOS Source tree. + goto :EOF +) if "%1" == "basedir" ( echo Usage: basedir echo Switches back to the ReactOS source directory. Modified: trunk/tools/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/LICENSE.t… ============================================================================== --- trunk/tools/RosBE-Windows/Root/LICENSE.txt (original) +++ trunk/tools/RosBE-Windows/Root/LICENSE.txt Sat Jun 9 23:31:30 2007 @@ -1,4 +1,4 @@ - ReactOS Build Environment v0.3.6 + ReactOS Build Environment v0.3.7 Various parts of the ReactOS Build Environment are under different license's, the license's are as follows. (The complete text for each license is included in this document) Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Sat Jun 9 23:31:30 2007 @@ -1,7 +1,7 @@ - ReactOS Build Environment 0.3.6 + ReactOS Build Environment 0.3.7 -The ReactOS Build Environment v0.3.6 contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. +The ReactOS Build Environment v0.3.7 contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. While installing the ReactOS Build Environment you are asked to provide the directory where your ReactOS sources are located (ie.reactos\), you must enter the complete path to them (ie. C:\projects\reactos). The path is now @@ -12,7 +12,7 @@ menu. Now you have a choice of using either the built in commands (which are displayed onscreen with information about their use) or you can build as you normally would using the standard MinGW/RBuild commands. -The ReactOS Build Environment v0.3.6 contains the following packages: +The ReactOS Build Environment v0.3.7 contains the following packages: binutils-2.17.50-20070122-1.tar.gz mingw-runtime-3.12.tar.gz Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Sat Jun 9 23:31:30 2007 @@ -5,7 +5,7 @@ :: @echo off -title ReactOS Build Environment 0.3.6 +title ReactOS Build Environment 0.3.7 if "%1" == "" ( color 0A @@ -73,7 +73,7 @@ echo ******************************************************************************* echo * * - echo * ReactOS Build Environment 0.3.6-4.1.3-20070405-prerelease-patched * + echo * ReactOS Build Environment 0.3.7-4.1.3-20070405-prerelease-patched * echo * * echo ******************************************************************************* echo. Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.mac Sat Jun 9 23:31:30 2007 @@ -1,4 +1,6 @@ BASEDIR = cd /d "%_ROSSOURCEDIR%" CLEAN = "%ROSBEBASEDIR%\Clean.cmd" $* +SVN = "%ROSBEBASEDIR%\SVN.cmd" $* HELP = "%ROSBEBASEDIR%\Help.cmd" $* MAKE = "%ROSBEBASEDIR%\Build.cmd" $* +MAKEX = "%ROSBEBASEDIR%\Build-Multi.cmd" $* Added: trunk/tools/RosBE-Windows/Root/SVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/SVN.cmd?r… ============================================================================== --- trunk/tools/RosBE-Windows/Root/SVN.cmd (added) +++ trunk/tools/RosBE-Windows/Root/SVN.cmd Sat Jun 9 23:31:30 2007 @@ -1,0 +1,42 @@ +:: Copyright (c) Peter Ward and Daniel Reimer. All rights reserved. +:: +:: SVN Client +:: +@echo off + +:: +:: Execute the Build command +:: +if "%1" == "update" ( + title Updating... + %ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR% %2 + goto :ExitSVN +) +if "%1" == "cleanup" ( + title Cleaning... + %ROSBEBASEDIR%\Tools\svn.exe cleanup %_ROSSOURCEDIR% + goto :ExitSVN +) +if "%1" == "create" ( + title Creating... +if not exist "%_ROSSOURCEDIR%\." ( + mkdir %_ROSSOURCEDIR% + goto :SVN +) +if exist "%_ROSSOURCEDIR%\.svn\." ( + echo Folder already cotains a Reposority. Exiting + goto :ExitSVN +) +if exist "%_ROSSOURCEDIR%\*.*" ( + echo Folder is not empty. Continuing is dangerous and can cause errors. + goto :SVN +) +) + +:SVN +%ROSBEBASEDIR%\Tools\svn.exe checkout svn://svn.reactos.org/reactos/trunk/reactos %_ROSSOURCEDIR% +goto :ExitSVN + +:ExitSVN +title ReactOS Build Environment 0.3.7 +pause

1 0

[greatlrd] 27088: start implement of GetDeviceIdentifier we are filling one member right.
by greatlrd＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: greatlrd Date: Sat Jun 9 21:24:32 2007 New Revision: 27088 URL: http://svn.reactos.org/svn/reactos?rev=27088&view=rev Log: start implement of GetDeviceIdentifier we are filling one member right. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sat Jun 9 21:24:32 2007 @@ -11,6 +11,8 @@ #include "rosdraw.h" +#include <string.h> + /* PSEH for SEH Support */ #include <pseh/pseh.h> @@ -451,16 +453,69 @@ Main_DirectDraw_GetDeviceIdentifier7(LPDIRECTDRAW7 iface, LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) { - // HRESULT retVal = DD_OK; - HRESULT retVal = DD_FALSE; - DX_WINDBG_trace(); - - _SEH_TRY - { - if (IsBadWritePtr( pDDDI, sizeof(DDDEVICEIDENTIFIER2) ) ) + HRESULT retVal = DDERR_INVALIDPARAMS; + + BOOL found = FALSE; + DWORD iDevNum = 0; + DISPLAY_DEVICEA DisplayDeviceA; + + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface; + + DX_WINDBG_trace(); + + _SEH_TRY + { + if ( (IsBadWritePtr( pDDDI, sizeof(DDDEVICEIDENTIFIER2) ) ) || + (dwFlags & ~DDGDI_GETHOSTIDENTIFIER)) { retVal = DDERR_INVALIDPARAMS; - } + _SEH_LEAVE; + } + + /* now we can start getting the driver data */ + + while (1) + { + ZeroMemory(&DisplayDeviceA,sizeof(DISPLAY_DEVICEA)); + + DisplayDeviceA.cb = sizeof(DISPLAY_DEVICEA); + + if ( EnumDisplayDevicesA( NULL, iDevNum, &DisplayDeviceA, 0) == 0) + { + retVal = DDERR_INVALIDPARAMS; + break; + } + + if (!_stricmp(DisplayDeviceA.DeviceName, This->lpLcl->lpGbl->cDriverName)) + { + // if we got another device like hardware mpeg decoder or video card or another drv + found = TRUE; + } + else if (DisplayDeviceA.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + /* double check if it primary driver we just found */ + if (!_stricmp( This->lpLcl->lpGbl->cDriverName, "DISPLAY")) + { + /* yeah we found it */ + found = TRUE; + } + } + + if (found == TRUE) + { + /* we found our driver now we start setup it */ + strcpy( pDDDI->szDescription, DisplayDeviceA.DeviceString); + + /* This api still under devloping now we can get desc of the + primary drv + */ + retVal = DD_OK; + break; + } + + iDevNum++; + } + } _SEH_HANDLE {

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2007