Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 27103: Add a base address for usrmgr.dll
by weiden＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: weiden Date: Sun Jun 10 11:39:21 2007 New Revision: 27103 URL: http://svn.reactos.org/svn/reactos?rev=27103&view=rev Log: Add a base address for usrmgr.dll Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=271… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Sun Jun 10 11:39:21 2007 @@ -10,6 +10,7 @@ <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> <property name="BASEADDRESS_OBJSEL" value="0x5b400000" /> <property name="BASEADDRESS_SLAYER" value="0x5c7e0000" /> + <property name="BASEADDRESS_USRMGR" value="0x5c900000" /> <property name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> <property name="BASEADDRESS_DPLAYX" value="0x5e080000" /> <property name="BASEADDRESS_DINPUT" value="0x5f580000" />

1 0

[greatlrd] 27102: simplefly the math for calc out the guiddeviceidentify
by greatlrd＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: greatlrd Date: Sun Jun 10 08:36:19 2007 New Revision: 27102 URL: http://svn.reactos.org/svn/reactos?rev=27102&view=rev Log: simplefly the math for calc out the guiddeviceidentify 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 08:36:19 2007 @@ -545,18 +545,16 @@ /* Count out the guidDeviceIdentifier */ memcpy(&pDDDI->guidDeviceIdentifier, &CLSID_DirectDraw,sizeof(GUID)); - pDDDI->guidDeviceIdentifier.Data1 = pDDDI->guidDeviceIdentifier.Data1 ^ pDDDI->dwVendorId; + pDDDI->guidDeviceIdentifier.Data1 ^= pDDDI->dwVendorId; lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data2; - *lpdata = *lpdata ^ pDDDI->dwDeviceId; + *lpdata ^= pDDDI->dwDeviceId; lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4; - *lpdata = *lpdata ^ pDDDI->dwSubSysId; - *lpdata = *lpdata ^ pDDDI->liDriverVersion.LowPart; + *lpdata = (*lpdata ^ pDDDI->dwSubSysId) ^ pDDDI->liDriverVersion.LowPart; lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4[4]; - *lpdata = *lpdata ^ pDDDI->dwRevision; - *lpdata = *lpdata ^ pDDDI->liDriverVersion.HighPart; + *lpdata = (*lpdata ^ pDDDI->dwRevision) ^ pDDDI->liDriverVersion.HighPart; /* FIXME pDDDI->dwWHQLLevel * we leave this with no informations, I do not known

1 0

[greatlrd] 27101: update some comment DD COM object now we got 7 of 30 done and 7 of 30 are under developing / testing total we got 14 of 30 that is working
by greatlrd＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: greatlrd Date: Sun Jun 10 07:54:37 2007 New Revision: 27101 URL: http://svn.reactos.org/svn/reactos?rev=27101&view=rev Log: update some comment DD COM object now we got 7 of 30 done and 7 of 30 are under developing / testing total we got 14 of 30 that is working 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 07:54:37 2007 @@ -494,7 +494,7 @@ if (!_stricmp(DisplayDeviceA.DeviceName, This->lpLcl->lpGbl->cDriverName)) { - // if we got another device like hardware mpeg decoder or video card or another drv + /* 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) @@ -558,7 +558,11 @@ *lpdata = *lpdata ^ pDDDI->dwRevision; *lpdata = *lpdata ^ pDDDI->liDriverVersion.HighPart; - /* FIXME pDDDI->dwWHQLLevel */ + /* FIXME pDDDI->dwWHQLLevel + * we leave this with no informations, I do not known + * if program care for it, I mark this api done, and + * tested, no bugs was found in it + */ pDDDI->dwWHQLLevel = 0; retVal = DD_OK; } @@ -602,7 +606,7 @@ Main_DirectDraw_GetMonitorFrequency, /* (GetMonitorFrequency done) */ Main_DirectDraw_GetScanLine, Main_DirectDraw_GetVerticalBlankStatus, - Main_DirectDraw_Initialize, + Main_DirectDraw_Initialize, /* (Initialize done) */ Main_DirectDraw_RestoreDisplayMode, /* (RestoreDisplayMode testing / devloping) */ Main_DirectDraw_SetCooperativeLevel, /* (SetCooperativeLevel testing / devloping) */ Main_DirectDraw_SetDisplayMode, /* (SetDisplayMode testing / devloping) */ @@ -611,7 +615,7 @@ Main_DirectDraw_GetSurfaceFromDC, Main_DirectDraw_RestoreAllSurfaces, Main_DirectDraw_TestCooperativeLevel, - Main_DirectDraw_GetDeviceIdentifier7, + Main_DirectDraw_GetDeviceIdentifier7, /* (GetDeviceIdentifier done) */ Main_DirectDraw_StartModeTest, Main_DirectDraw_EvaluateMode };

1 0

[greatlrd] 27100: adding real testcase to GetDeviceIdentifier, we can not test everything, I leave small code comment out for easy debuging
by greatlrd＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: greatlrd Date: Sun Jun 10 07:41:49 2007 New Revision: 27100 URL: http://svn.reactos.org/svn/reactos?rev=27100&view=rev Log: adding real testcase to GetDeviceIdentifier, we can not test everything, I leave small code comment out for easy debuging Modified: trunk/rostests/dxtest/ddraw/ddraw.rbuild trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Modified: trunk/rostests/dxtest/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddraw.rbuild… ============================================================================== --- trunk/rostests/dxtest/ddraw/ddraw.rbuild (original) +++ trunk/rostests/dxtest/ddraw/ddraw.rbuild Sun Jun 10 07:41:49 2007 @@ -5,6 +5,7 @@ <library>kernel32</library> <library>user32</library> <library>gdi32</library> + <library>ole32</library> <library>ddraw</library> <library>dxguid</library> <file>ddraw_test.cpp</file> Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Sun Jun 10 07:41:49 2007 @@ -378,6 +378,10 @@ BOOL Test_GetDeviceIdentifier (INT* passed, INT* failed) { LPDIRECTDRAW7 DirectDraw; + DDDEVICEIDENTIFIER2 pDDDI; + //OLECHAR GuidStr[100]; + + /* Preparations */ if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) @@ -385,6 +389,33 @@ printf("ERROR: Failed to set up ddraw\n"); return FALSE; } + + TEST ( DirectDraw->GetDeviceIdentifier(NULL, 0) == DDERR_INVALIDPARAMS ); + TEST ( DirectDraw->GetDeviceIdentifier(NULL, ~DDGDI_GETHOSTIDENTIFIER) == DDERR_INVALIDPARAMS ); + TEST ( DirectDraw->GetDeviceIdentifier(NULL, DDGDI_GETHOSTIDENTIFIER) == DDERR_INVALIDPARAMS ); + + + memset(&pDDDI,0,sizeof(DDDEVICEIDENTIFIER2)); + TEST ( DirectDraw->GetDeviceIdentifier(&pDDDI, 0) == DD_OK ); + +/* + StringFromGUID2(pDDDI.guidDeviceIdentifier, GuidStr, 100); + printf("1. \n"); + printf("szDriver : %s\n",pDDDI.szDriver); + printf("szDescription : %s\n",pDDDI.szDescription); + printf("liDriverVersion : 0x%08x . 0x%08x\n", pDDDI.liDriverVersion.HighPart, pDDDI.liDriverVersion.LowPart); + printf("dwVendorId : 0x%08x\n",pDDDI.dwVendorId); + printf("dwDeviceId : 0x%08x\n",pDDDI.dwDeviceId); + printf("dwSubSysId : 0x%08x\n",pDDDI.dwSubSysId); + printf("dwRevision : 0x%08x\n",pDDDI.dwRevision); + printf("guidDeviceIdentifier : %ls\n",GuidStr); + printf("dwWHQLLevel : 0x%08x\n",pDDDI.dwWHQLLevel); +*/ + + memset(&pDDDI,0,sizeof(DDDEVICEIDENTIFIER2)); + TEST ( DirectDraw->GetDeviceIdentifier(&pDDDI, DDGDI_GETHOSTIDENTIFIER) == DD_OK ); + memset(&pDDDI,0,sizeof(DDDEVICEIDENTIFIER2)); + TEST ( DirectDraw->GetDeviceIdentifier(&pDDDI, ~DDGDI_GETHOSTIDENTIFIER) == DDERR_INVALIDPARAMS ); DirectDraw->Release();

1 0

[greatlrd] 27099: Only dwWHQLLevel are left todo in GetDeviceIdentifier
by greatlrd＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: greatlrd Date: Sun Jun 10 07:33:17 2007 New Revision: 27099 URL: http://svn.reactos.org/svn/reactos?rev=27099&view=rev Log: Only dwWHQLLevel are left todo in GetDeviceIdentifier 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 07:33:17 2007 @@ -463,7 +463,7 @@ DWORD strSize = MAX_DDDEVICEID_STRING; char *pdest; char* pcCnvEnd; - long data; + long *lpdata; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface; @@ -542,18 +542,23 @@ pdest = strstr(DisplayDeviceA.DeviceID,"VEN_"); pDDDI->dwVendorId =strtol ( &pdest[4], &pcCnvEnd, 16); - /* FIXME pDDDI->guidDeviceIdentifier, pDDDI->dwWHQLLevel */ - + /* Count out the guidDeviceIdentifier */ memcpy(&pDDDI->guidDeviceIdentifier, &CLSID_DirectDraw,sizeof(GUID)); pDDDI->guidDeviceIdentifier.Data1 = pDDDI->guidDeviceIdentifier.Data1 ^ pDDDI->dwVendorId; - data = (pDDDI->guidDeviceIdentifier.Data3 <<16) | pDDDI->guidDeviceIdentifier.Data2; - data = data ^ pDDDI->dwDeviceId; - pDDDI->guidDeviceIdentifier.Data2 = data & 0xFFFF; - pDDDI->guidDeviceIdentifier.Data3 = (data>>16) & 0xFFFF; - - + lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data2; + *lpdata = *lpdata ^ pDDDI->dwDeviceId; + + lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4; + *lpdata = *lpdata ^ pDDDI->dwSubSysId; + *lpdata = *lpdata ^ pDDDI->liDriverVersion.LowPart; + + lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4[4]; + *lpdata = *lpdata ^ pDDDI->dwRevision; + *lpdata = *lpdata ^ pDDDI->liDriverVersion.HighPart; + + /* FIXME pDDDI->dwWHQLLevel */ pDDDI->dwWHQLLevel = 0; retVal = DD_OK; }

1 0

[greatlrd] 27098: Building part of guidDeviceIdentifier in GetDeviceIdentifier left to coding in is REV_ SUBSYS_ liDriverVersion
by greatlrd＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: greatlrd Date: Sun Jun 10 07:10:20 2007 New Revision: 27098 URL: http://svn.reactos.org/svn/reactos?rev=27098&view=rev Log: Building part of guidDeviceIdentifier in GetDeviceIdentifier left to coding in is REV_ SUBSYS_ liDriverVersion 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 07:10:20 2007 @@ -463,6 +463,7 @@ DWORD strSize = MAX_DDDEVICEID_STRING; char *pdest; char* pcCnvEnd; + long data; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface; @@ -518,6 +519,10 @@ { ZeroMemory(pDDDI->szDriver,MAX_DDDEVICEID_STRING); } + else + { + strcat(pDDDI->szDriver,".dll"); + } RegCloseKey(hKey); } @@ -538,6 +543,16 @@ pDDDI->dwVendorId =strtol ( &pdest[4], &pcCnvEnd, 16); /* FIXME pDDDI->guidDeviceIdentifier, pDDDI->dwWHQLLevel */ + + memcpy(&pDDDI->guidDeviceIdentifier, &CLSID_DirectDraw,sizeof(GUID)); + + pDDDI->guidDeviceIdentifier.Data1 = pDDDI->guidDeviceIdentifier.Data1 ^ pDDDI->dwVendorId; + + data = (pDDDI->guidDeviceIdentifier.Data3 <<16) | pDDDI->guidDeviceIdentifier.Data2; + data = data ^ pDDDI->dwDeviceId; + pDDDI->guidDeviceIdentifier.Data2 = data & 0xFFFF; + pDDDI->guidDeviceIdentifier.Data3 = (data>>16) & 0xFFFF; + pDDDI->dwWHQLLevel = 0; retVal = DD_OK;

1 0

[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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs