Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[tkreuzer] 33792: preserve code for NtGdiCreateEnhMetaFile from win32k (where it's going to be removed later) in gdi32 (where it's going to be implemented later)
by tkreuzer＠svn.reactos.org 31 May '08

31 May '08

Author: tkreuzer Date: Sat May 31 18:15:34 2008 New Revision: 33792 URL: http://svn.reactos.org/svn/reactos?rev=33792&view=rev Log: preserve code for NtGdiCreateEnhMetaFile from win32k (where it's going to be removed later) in gdi32 (where it's going to be implemented later) Modified: trunk/reactos/dll/win32/gdi32/objects/enhmfile.c Modified: trunk/reactos/dll/win32/gdi32/objects/enhmfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/enhmfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/enhmfile.c [iso-8859-1] Sat May 31 18:15:34 2008 @@ -458,6 +458,211 @@ return rc; } +#if 0 +/* Previous implementation in win32k */ +HDC +STDCALL +NtGdiCreateEnhMetaFile(HDC hDCRef, + LPCWSTR File, + CONST LPRECT Rect, + LPCWSTR Description) +{ + PDC Dc; + HDC ret = NULL; + DWORD length = 0; + HDC tempHDC; + DWORD MemSize; + DWORD dwDesiredAccess; + + tempHDC = hDCRef; + if (hDCRef == NULL) + { + /* FIXME ?? + * Shall we create hdc NtGdiHdcCompatible hdc ?? + */ + UNICODE_STRING DriverName; + RtlInitUnicodeString(&DriverName, L"DISPLAY"); + //IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); + tempHDC = NtGdiOpenDCW( &DriverName, + NULL, + NULL, + 0, // DCW 0 and ICW 1. + NULL, + (PVOID) NULL, + (PVOID) NULL ); + } + + GDIOBJ_SetOwnership(GdiHandleTable, tempHDC, PsGetCurrentProcess()); + DC_SetOwnership(tempHDC, PsGetCurrentProcess()); + + Dc = DC_LockDc(tempHDC); + if (Dc == NULL) + { + if (hDCRef == NULL) + { + NtGdiDeleteObjectApp(tempHDC); + } + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + + if(Description) + { + length = wcslen(Description); + length += wcslen(Description + length + 1); + length += 3; + length *= 2; + } + + MemSize = sizeof(ENHMETAHEADER) + (length + 3) / 4 * 4; + + if (!(Dc->emh = EngAllocMem(FL_ZERO_MEMORY, MemSize, 0))) + { + DC_UnlockDc(Dc); + if (hDCRef == NULL) + { + NtGdiDeleteObjectApp(tempHDC); + } + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + + Dc->emh->iType = EMR_HEADER; + Dc->emh->nSize = MemSize; + + Dc->emh->rclBounds.left = Dc->emh->rclBounds.top = 0; + Dc->emh->rclBounds.right = Dc->emh->rclBounds.bottom = -1; + + if(Rect) + { + Dc->emh->rclFrame.left = Rect->left; + Dc->emh->rclFrame.top = Rect->top; + Dc->emh->rclFrame.right = Rect->right; + Dc->emh->rclFrame.bottom = Rect->bottom; + } + else + { + /* Set this to {0,0 - -1,-1} and update it at the end */ + Dc->emh->rclFrame.left = Dc->emh->rclFrame.top = 0; + Dc->emh->rclFrame.right = Dc->emh->rclFrame.bottom = -1; + } + + Dc->emh->dSignature = ENHMETA_SIGNATURE; + Dc->emh->nVersion = 0x10000; + Dc->emh->nBytes = Dc->emh->nSize; + Dc->emh->nRecords = 1; + Dc->emh->nHandles = 1; + + Dc->emh->sReserved = 0; /* According to docs, this is reserved and must be 0 */ + Dc->emh->nDescription = length / 2; + + Dc->emh->offDescription = length ? sizeof(ENHMETAHEADER) : 0; + + Dc->emh->nPalEntries = 0; /* I guess this should start at 0 */ + + /* Size in pixels */ + Dc->emh->szlDevice.cx = NtGdiGetDeviceCaps(tempHDC, HORZRES); + Dc->emh->szlDevice.cy = NtGdiGetDeviceCaps(tempHDC, VERTRES); + + /* Size in millimeters */ + Dc->emh->szlMillimeters.cx = NtGdiGetDeviceCaps(tempHDC, HORZSIZE); + Dc->emh->szlMillimeters.cy = NtGdiGetDeviceCaps(tempHDC, VERTSIZE); + + /* Size in micrometers */ + Dc->emh->szlMicrometers.cx = Dc->emh->szlMillimeters.cx * 1000; + Dc->emh->szlMicrometers.cy = Dc->emh->szlMillimeters.cy * 1000; + + if(Description) + { + memcpy((char *)Dc->emh + sizeof(ENHMETAHEADER), Description, length); + } + + ret = tempHDC; + if (File) + { + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + IO_STATUS_BLOCK Iosb; + UNICODE_STRING NtPathU; + NTSTATUS Status; + ULONG FileAttributes = (FILE_ATTRIBUTE_VALID_FLAGS & ~FILE_ATTRIBUTE_DIRECTORY); + + DPRINT1("Trying Create EnhMetaFile\n"); + + /* disk based metafile */ + dwDesiredAccess = GENERIC_WRITE | GENERIC_READ | SYNCHRONIZE | FILE_READ_ATTRIBUTES; + + if (!RtlDosPathNameToNtPathName_U (File, &NtPathU, NULL, NULL)) + { + DC_UnlockDc(Dc); + if (hDCRef == NULL) + { + NtGdiDeleteObjectApp(tempHDC); + } + DPRINT1("Can not Create EnhMetaFile\n"); + SetLastWin32Error(ERROR_PATH_NOT_FOUND); + return NULL; + } + + InitializeObjectAttributes(&ObjectAttributes, &NtPathU, 0, NULL, NULL); + + Status = NtCreateFile (&Dc->hFile, dwDesiredAccess, &ObjectAttributes, &IoStatusBlock, + NULL, FileAttributes, 0, FILE_OVERWRITE_IF, FILE_NON_DIRECTORY_FILE, + NULL, 0); + + RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathU.Buffer); + + if (!NT_SUCCESS(Status)) + { + Dc->hFile = NULL; + DC_UnlockDc(Dc); + if (hDCRef == NULL) + { + NtGdiDeleteObjectApp(tempHDC); + } + DPRINT1("Create EnhMetaFile fail\n"); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + + SetLastWin32Error(IoStatusBlock.Information == FILE_OVERWRITTEN ? ERROR_ALREADY_EXISTS : 0); + + Status = NtWriteFile(Dc->hFile, NULL, NULL, NULL, &Iosb, (PVOID)&Dc->emh, Dc->emh->nSize, NULL, NULL); + if (Status == STATUS_PENDING) + { + Status = NtWaitForSingleObject(Dc->hFile,FALSE,NULL); + if (NT_SUCCESS(Status)) + { + Status = Iosb.Status; + } + } + + if (NT_SUCCESS(Status)) + { + ret = tempHDC; + DC_UnlockDc(Dc); + } + else + { + Dc->hFile = NULL; + DPRINT1("Write to EnhMetaFile fail\n"); + SetLastWin32Error(ERROR_CAN_NOT_COMPLETE); + ret = NULL; + DC_UnlockDc(Dc); + if (hDCRef == NULL) + { + NtGdiDeleteObjectApp(tempHDC); + } + } + } + else + { + DC_UnlockDc(Dc); + } + + return ret; +} +#endif

1 0

[ekohl] 33791: User the user-specific date format instead of a hard-coded one.
by ekohl＠svn.reactos.org 31 May '08

31 May '08

Author: ekohl Date: Sat May 31 15:09:17 2008 New Revision: 33791 URL: http://svn.reactos.org/svn/reactos?rev=33791&view=rev Log: User the user-specific date format instead of a hard-coded one. Modified: trunk/reactos/dll/cpl/appwiz-new/appwiz.c Modified: trunk/reactos/dll/cpl/appwiz-new/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/appwiz.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz-new/appwiz.c [iso-8859-1] Sat May 31 15:09:17 2008 @@ -243,7 +243,8 @@ { if (((int)localtime.wYear > 1900) && ((int)localtime.wYear < 3000)) { - swprintf(szLastUsed, L"%02d.%02d.%02d", localtime.wMonth, localtime.wDay, localtime.wYear); + GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &localtime, + NULL, szLastUsed, 256); } else wcscpy(szLastUsed,L"---"); }

1 0

[ekohl] 33790: - Add a property sheet for user groups. Settings are visible but cannot be changed yet. - Add missing SVN properties.
by ekohl＠svn.reactos.org 31 May '08

31 May '08

Author: ekohl Date: Sat May 31 14:48:44 2008 New Revision: 33790 URL: http://svn.reactos.org/svn/reactos?rev=33790&view=rev Log: - Add a property sheet for user groups. Settings are visible but cannot be changed yet. - Add missing SVN properties. Added: trunk/reactos/dll/cpl/usrmgr/groupprops.c (with props) Modified: trunk/reactos/dll/cpl/usrmgr/extra.c (contents, props changed) trunk/reactos/dll/cpl/usrmgr/groups.c (contents, props changed) trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc trunk/reactos/dll/cpl/usrmgr/misc.c trunk/reactos/dll/cpl/usrmgr/resource.h trunk/reactos/dll/cpl/usrmgr/userprops.c trunk/reactos/dll/cpl/usrmgr/usrmgr.c (contents, props changed) trunk/reactos/dll/cpl/usrmgr/usrmgr.def (contents, props changed) trunk/reactos/dll/cpl/usrmgr/usrmgr.h trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/extra.c [iso-8859-1] Sat May 31 14:48:44 2008 @@ -1,33 +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; -} +/* $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; +} Propchange: trunk/reactos/dll/cpl/usrmgr/extra.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/usrmgr/groupprops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groupprops.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groupprops.c (added) +++ trunk/reactos/dll/cpl/usrmgr/groupprops.c [iso-8859-1] Sat May 31 14:48:44 2008 @@ -1,0 +1,155 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User Manager Control Panel + * FILE: dll/cpl/usrmgr/groupprops.c + * PURPOSE: Group property sheet + * + * PROGRAMMERS: Eric Kohl + */ + +#include "usrmgr.h" + + +static VOID +GetGroupData(HWND hwndDlg, LPTSTR lpGroupName) +{ + PLOCALGROUP_INFO_1 groupInfo = NULL; + PLOCALGROUP_MEMBERS_INFO_1 membersInfo = NULL; + DWORD dwRead; + DWORD dwTotal; + DWORD_PTR resumeHandle = 0; + DWORD i; + LV_ITEM lvi; + HWND hwndLV; + LV_COLUMN column; + RECT rect; + HIMAGELIST hImgList; + HICON hIcon; + + hwndLV = GetDlgItem(hwndDlg, IDC_GROUP_GENERAL_MEMBERS); + + /* Create the image list */ + hImgList = ImageList_Create(16, 16, ILC_COLOR8 | ILC_MASK, 5, 5); + hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_USER), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + ImageList_AddIcon(hImgList, hIcon); + hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_GROUP), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + ImageList_AddIcon(hImgList, hIcon); + DestroyIcon(hIcon); + + (void)ListView_SetImageList(hwndLV, hImgList, LVSIL_SMALL); + + /* Set the list column */ + GetClientRect(hwndLV, &rect); + + memset(&column, 0x00, sizeof(column)); + column.mask = LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM; + column.fmt = LVCFMT_LEFT; + column.cx = (INT)(rect.right - rect.left); + column.iSubItem = 0; + (void)ListView_InsertColumn(hwndLV, 0, &column); + + /* Set group name */ + SetDlgItemText(hwndDlg, IDC_GROUP_GENERAL_NAME, lpGroupName); + + /* Set group description */ + NetLocalGroupGetInfo(NULL, lpGroupName, 1, (LPBYTE*)&groupInfo); + SetDlgItemText(hwndDlg, IDC_GROUP_GENERAL_DESCRIPTION, groupInfo->lgrpi1_comment); + NetApiBufferFree(groupInfo); + + /* Set group members */ + NetLocalGroupGetMembers(NULL, lpGroupName, 1, (LPBYTE*)&membersInfo, + MAX_PREFERRED_LENGTH, &dwRead, &dwTotal, + &resumeHandle); + + for (i = 0; i < dwRead; i++) + { + ZeroMemory(&lvi, sizeof(lvi)); + lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_IMAGE; + lvi.pszText = membersInfo[i].lgrmi1_name; + lvi.state = 0; + lvi.iImage = (membersInfo[i].lgrmi1_sidusage == SidTypeGroup || + membersInfo[i].lgrmi1_sidusage == SidTypeWellKnownGroup) ? 1 : 0; + + (void)ListView_InsertItem(hwndLV, &lvi); + } + + NetApiBufferFree(membersInfo); +} + + +INT_PTR CALLBACK +GroupGeneralPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); + + switch (uMsg) + { + case WM_INITDIALOG: + GetGroupData(hwndDlg, + (LPTSTR)((PROPSHEETPAGE *)lParam)->lParam); + break; + + case WM_COMMAND: + break; + + case WM_DESTROY: + break; + } + + return FALSE; +} + + +static VOID +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPTSTR pszGroup) +{ + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT; + psp->hInstance = hApplet; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; + psp->lParam = (LPARAM)pszGroup; +} + + +VOID +GroupProperties(HWND hwndDlg) +{ + PROPSHEETPAGE psp[1]; + PROPSHEETHEADER psh; + TCHAR szGroupName[UNLEN]; + INT nItem; + HWND hwndLV; + + hwndLV = GetDlgItem(hwndDlg, IDC_GROUPS_LIST); + nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); + if (nItem == -1) + return; + + /* Get the new user name */ + ListView_GetItemText(hwndLV, + nItem, 0, + szGroupName, + UNLEN); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE; + psh.hwndParent = hwndDlg; + psh.hInstance = hApplet; + psh.hIcon = NULL; + psh.pszCaption = szGroupName; + psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + psh.nStartPage = 0; + psh.ppsp = psp; + + InitPropSheetPage(&psp[0], IDD_GROUP_GENERAL, (DLGPROC)GroupGeneralPageProc, szGroupName); + + PropertySheet(&psh); +} Propchange: trunk/reactos/dll/cpl/usrmgr/groupprops.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] Sat May 31 14:48:44 2008 @@ -1,471 +1,479 @@ -/* - * 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_IMAGE; - lvi.pszText = pBuffer[i].lgrpi1_name; - lvi.state = 0; - lvi.iImage = 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; - } - -} - - -INT_PTR CALLBACK -NewGroupDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - PLOCALGROUP_INFO_1 groupInfo; - INT nLength; - - UNREFERENCED_PARAMETER(wParam); - - groupInfo = (PLOCALGROUP_INFO_1)GetWindowLongPtr(hwndDlg, DWLP_USER); - - switch (uMsg) - { - case WM_INITDIALOG: - SetWindowLongPtr(hwndDlg, DWLP_USER, lParam); - groupInfo = (PLOCALGROUP_INFO_1)lParam; - SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_NAME, EM_SETLIMITTEXT, 20, 0); - break; - - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_GROUP_NEW_NAME: - if (HIWORD(wParam) == EN_CHANGE) - { - nLength = SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_NAME, WM_GETTEXTLENGTH, 0, 0); - EnableWindow(GetDlgItem(hwndDlg, IDOK), (nLength > 0)); - } - break; - - case IDOK: - if (!CheckAccountName(hwndDlg, IDC_GROUP_NEW_NAME, NULL)) - { - SetFocus(GetDlgItem(hwndDlg, IDC_GROUP_NEW_NAME)); - SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_NAME, EM_SETSEL, 0, -1); - break; - } - - nLength = SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_NAME, WM_GETTEXTLENGTH, 0, 0); - if (nLength > 0) - { - groupInfo->lgrpi1_name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); - GetDlgItemText(hwndDlg, IDC_GROUP_NEW_NAME, groupInfo->lgrpi1_name, nLength + 1); - } - - nLength = SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_DESCRIPTION, WM_GETTEXTLENGTH, 0, 0); - if (nLength > 0) - { - groupInfo->lgrpi1_comment = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); - GetDlgItemText(hwndDlg, IDC_GROUP_NEW_DESCRIPTION, groupInfo->lgrpi1_comment, nLength + 1); - } - - EndDialog(hwndDlg, IDOK); - break; - - case IDCANCEL: - EndDialog(hwndDlg, IDCANCEL); - break; - } - break; - - default: - return FALSE; - } - - return TRUE; -} - - -static VOID -GroupNew(HWND hwndDlg) -{ - NET_API_STATUS status; - LOCALGROUP_INFO_1 group; - LV_ITEM lvi; - INT iItem; - HWND hwndLV; - - ZeroMemory(&group, sizeof(LOCALGROUP_INFO_1)); - - if (DialogBoxParam(hApplet, - MAKEINTRESOURCE(IDD_GROUP_NEW), - hwndDlg, - NewGroupDlgProc, - (LPARAM)&group) == IDOK) - { -#if 0 - status = NetLocalGroupAdd(NULL, - 1, - (LPBYTE)&group, - NULL); -#else - status = NERR_Success; -#endif - if (status != NERR_Success) - { - TCHAR szText[256]; - wsprintf(szText, TEXT("Error: %u"), status); - MessageBox(NULL, szText, TEXT("NetUserAdd"), MB_ICONERROR | MB_OK); - return; - } - - hwndLV = GetDlgItem(hwndDlg, IDC_GROUPS_LIST); - - ZeroMemory(&lvi, sizeof(lvi)); - lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_IMAGE; - lvi.pszText = group.lgrpi1_name; - lvi.state = 0; - lvi.iImage = 0; - iItem = ListView_InsertItem(hwndLV, &lvi); - - ListView_SetItemText(hwndLV, iItem, 1, - group.lgrpi1_comment); - } - - if (group.lgrpi1_name) - HeapFree(GetProcessHeap, 0, group.lgrpi1_name); - - if (group.lgrpi1_comment) - HeapFree(GetProcessHeap, 0, group.lgrpi1_comment); -} - - -static VOID -GroupRename(HWND hwndDlg) -{ - INT nItem; - HWND hwndLV; - - hwndLV = GetDlgItem(hwndDlg, IDC_GROUPS_LIST); - nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); - if (nItem != -1) - { - (void)ListView_EditLabel(hwndLV, nItem); - } -} - - -static BOOL -GroupDelete(HWND hwndDlg) -{ - TCHAR szGroupName[UNLEN]; - TCHAR szText[256]; - INT nItem; - HWND hwndLV; - NET_API_STATUS status; - - hwndLV = GetDlgItem(hwndDlg, IDC_GROUPS_LIST); - nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); - if (nItem == -1) - return FALSE; - - /* Get the new group name */ - ListView_GetItemText(hwndLV, - nItem, 0, - szGroupName, - UNLEN); - - /* Display a warning message because the delete operation cannot be reverted */ - wsprintf(szText, TEXT("Dou you really want to delete the user group \"%s\"?"), szGroupName); - if (MessageBox(NULL, szText, TEXT("User Groups"), MB_ICONWARNING | MB_YESNO) == IDNO) - return FALSE; - - /* Delete the group */ -#if 0 - status = NetLocalGroupDel(NULL, szGroupName); -#else - status = NERR_Success; -#endif - if (status != NERR_Success) - { - TCHAR szText[256]; - wsprintf(szText, TEXT("Error: %u"), status); - MessageBox(NULL, szText, TEXT("NetLocalGroupDel"), MB_ICONERROR | MB_OK); - return FALSE; - } - - /* Delete the group from the list */ - (void)ListView_DeleteItem(hwndLV, nItem); - - return TRUE; -} - - -static VOID -OnInitDialog(HWND hwndDlg) -{ - HWND hwndListView; - HIMAGELIST hImgList; - HICON hIcon; - - /* Create the image list */ - hImgList = ImageList_Create(16,16,ILC_COLOR8 | ILC_MASK,5,5); - hIcon = LoadImage(hApplet,MAKEINTRESOURCE(IDI_GROUP),IMAGE_ICON,16,16,LR_DEFAULTCOLOR); - ImageList_AddIcon(hImgList,hIcon); - DestroyIcon(hIcon); - - hwndListView = GetDlgItem(hwndDlg, IDC_GROUPS_LIST); - - (VOID)ListView_SetImageList(hwndListView, hImgList, LVSIL_SMALL); - - (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT); - - SetGroupsListColumns(hwndListView); - - UpdateGroupsList(hwndListView); -} - - -static BOOL -OnBeginLabelEdit(LPNMLVDISPINFO pnmv) -{ - HWND hwndEdit; - - hwndEdit = ListView_GetEditControl(pnmv->hdr.hwndFrom); - if (hwndEdit == NULL) - return TRUE; - - SendMessage(hwndEdit, EM_SETLIMITTEXT, 20, 0); - - return FALSE; -} - - -static BOOL -OnEndLabelEdit(LPNMLVDISPINFO pnmv) -{ - TCHAR szOldGroupName[UNLEN]; - TCHAR szNewGroupName[UNLEN]; - LOCALGROUP_INFO_0 lgrpi0; - NET_API_STATUS status; - - /* Leave, if there is no valid listview item */ - if (pnmv->item.iItem == -1) - return FALSE; - - /* Get the new user name */ - ListView_GetItemText(pnmv->hdr.hwndFrom, - pnmv->item.iItem, 0, - szOldGroupName, - UNLEN); - - /* Leave, if the user canceled the edit action */ - if (pnmv->item.pszText == NULL) - return FALSE; - - /* Get the new user name */ - lstrcpy(szNewGroupName, pnmv->item.pszText); - - /* Leave, if the user name was not changed */ - if (lstrcmp(szOldGroupName, szNewGroupName) == 0) - return FALSE; - - /* Check the group name for illegal characters */ - if (!CheckAccountName(NULL, 0, szNewGroupName)) - return FALSE; - - /* Change the user name */ - lgrpi0.lgrpi0_name = szNewGroupName; - -#if 0 - status = NetLocalGroupSetInfo(NULL, szOldGroupName, 0, (LPBYTE)&lgrpi0, NULL); -#else - status = NERR_Success; -#endif - if (status != NERR_Success) - { - TCHAR szText[256]; - wsprintf(szText, TEXT("Error: %u"), status); - MessageBox(NULL, szText, TEXT("NetLocalGroupSetInfo"), MB_ICONERROR | MB_OK); - return FALSE; - } - - /* Update the listview item */ - ListView_SetItemText(pnmv->hdr.hwndFrom, - pnmv->item.iItem, 0, - szNewGroupName); - - return TRUE; -} - - -static BOOL -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; - - case LVN_BEGINLABELEDIT: - return OnBeginLabelEdit((LPNMLVDISPINFO)phdr); - - case LVN_ENDLABELEDIT: - return OnEndLabelEdit((LPNMLVDISPINFO)phdr); - } - break; - } - - return FALSE; -} - - -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: - switch (LOWORD(wParam)) - { - case IDM_GROUP_NEW: - GroupNew(hwndDlg); - break; - - case IDM_GROUP_RENAME: - GroupRename(hwndDlg); - break; - - case IDM_GROUP_DELETE: - GroupDelete(hwndDlg); - break; - } - break; - - case WM_NOTIFY: - return OnNotify(hwndDlg, pGroupData, (NMHDR *)lParam); - - case WM_DESTROY: - DestroyMenu(pGroupData->hPopupMenu); - HeapFree(GetProcessHeap(), 0, pGroupData); - break; - } - - return FALSE; -} +/* + * 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_IMAGE; + lvi.pszText = pBuffer[i].lgrpi1_name; + lvi.state = 0; + lvi.iImage = 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; + } + +} + + +INT_PTR CALLBACK +NewGroupDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PLOCALGROUP_INFO_1 groupInfo; + INT nLength; + + UNREFERENCED_PARAMETER(wParam); + + groupInfo = (PLOCALGROUP_INFO_1)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + SetWindowLongPtr(hwndDlg, DWLP_USER, lParam); + groupInfo = (PLOCALGROUP_INFO_1)lParam; + SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_NAME, EM_SETLIMITTEXT, 20, 0); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_GROUP_NEW_NAME: + if (HIWORD(wParam) == EN_CHANGE) + { + nLength = SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_NAME, WM_GETTEXTLENGTH, 0, 0); + EnableWindow(GetDlgItem(hwndDlg, IDOK), (nLength > 0)); + } + break; + + case IDOK: + if (!CheckAccountName(hwndDlg, IDC_GROUP_NEW_NAME, NULL)) + { + SetFocus(GetDlgItem(hwndDlg, IDC_GROUP_NEW_NAME)); + SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_NAME, EM_SETSEL, 0, -1); + break; + } + + nLength = SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_NAME, WM_GETTEXTLENGTH, 0, 0); + if (nLength > 0) + { + groupInfo->lgrpi1_name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); + GetDlgItemText(hwndDlg, IDC_GROUP_NEW_NAME, groupInfo->lgrpi1_name, nLength + 1); + } + + nLength = SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_DESCRIPTION, WM_GETTEXTLENGTH, 0, 0); + if (nLength > 0) + { + groupInfo->lgrpi1_comment = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); + GetDlgItemText(hwndDlg, IDC_GROUP_NEW_DESCRIPTION, groupInfo->lgrpi1_comment, nLength + 1); + } + + EndDialog(hwndDlg, IDOK); + break; + + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + break; + } + break; + + default: + return FALSE; + } + + return TRUE; +} + + +static VOID +GroupNew(HWND hwndDlg) +{ + NET_API_STATUS status; + LOCALGROUP_INFO_1 group; + LV_ITEM lvi; + INT iItem; + HWND hwndLV; + + ZeroMemory(&group, sizeof(LOCALGROUP_INFO_1)); + + if (DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_GROUP_NEW), + hwndDlg, + NewGroupDlgProc, + (LPARAM)&group) == IDOK) + { +#if 0 + status = NetLocalGroupAdd(NULL, + 1, + (LPBYTE)&group, + NULL); +#else + status = NERR_Success; +#endif + if (status != NERR_Success) + { + TCHAR szText[256]; + wsprintf(szText, TEXT("Error: %u"), status); + MessageBox(NULL, szText, TEXT("NetUserAdd"), MB_ICONERROR | MB_OK); + return; + } + + hwndLV = GetDlgItem(hwndDlg, IDC_GROUPS_LIST); + + ZeroMemory(&lvi, sizeof(lvi)); + lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_IMAGE; + lvi.pszText = group.lgrpi1_name; + lvi.state = 0; + lvi.iImage = 0; + iItem = ListView_InsertItem(hwndLV, &lvi); + + ListView_SetItemText(hwndLV, iItem, 1, + group.lgrpi1_comment); + } + + if (group.lgrpi1_name) + HeapFree(GetProcessHeap, 0, group.lgrpi1_name); + + if (group.lgrpi1_comment) + HeapFree(GetProcessHeap, 0, group.lgrpi1_comment); +} + + +static VOID +GroupRename(HWND hwndDlg) +{ + INT nItem; + HWND hwndLV; + + hwndLV = GetDlgItem(hwndDlg, IDC_GROUPS_LIST); + nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); + if (nItem != -1) + { + (void)ListView_EditLabel(hwndLV, nItem); + } +} + + +static BOOL +GroupDelete(HWND hwndDlg) +{ + TCHAR szGroupName[UNLEN]; + TCHAR szText[256]; + INT nItem; + HWND hwndLV; + NET_API_STATUS status; + + hwndLV = GetDlgItem(hwndDlg, IDC_GROUPS_LIST); + nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); + if (nItem == -1) + return FALSE; + + /* Get the new group name */ + ListView_GetItemText(hwndLV, + nItem, 0, + szGroupName, + UNLEN); + + /* Display a warning message because the delete operation cannot be reverted */ + wsprintf(szText, TEXT("Dou you really want to delete the user group \"%s\"?"), szGroupName); + if (MessageBox(NULL, szText, TEXT("User Groups"), MB_ICONWARNING | MB_YESNO) == IDNO) + return FALSE; + + /* Delete the group */ +#if 0 + status = NetLocalGroupDel(NULL, szGroupName); +#else + status = NERR_Success; +#endif + if (status != NERR_Success) + { + TCHAR szText[256]; + wsprintf(szText, TEXT("Error: %u"), status); + MessageBox(NULL, szText, TEXT("NetLocalGroupDel"), MB_ICONERROR | MB_OK); + return FALSE; + } + + /* Delete the group from the list */ + (void)ListView_DeleteItem(hwndLV, nItem); + + return TRUE; +} + + +static VOID +OnInitDialog(HWND hwndDlg) +{ + HWND hwndListView; + HIMAGELIST hImgList; + HICON hIcon; + + /* Create the image list */ + hImgList = ImageList_Create(16,16,ILC_COLOR8 | ILC_MASK,5,5); + hIcon = LoadImage(hApplet,MAKEINTRESOURCE(IDI_GROUP),IMAGE_ICON,16,16,LR_DEFAULTCOLOR); + ImageList_AddIcon(hImgList,hIcon); + DestroyIcon(hIcon); + + hwndListView = GetDlgItem(hwndDlg, IDC_GROUPS_LIST); + + (VOID)ListView_SetImageList(hwndListView, hImgList, LVSIL_SMALL); + + (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT); + + SetGroupsListColumns(hwndListView); + + UpdateGroupsList(hwndListView); +} + + +static BOOL +OnBeginLabelEdit(LPNMLVDISPINFO pnmv) +{ + HWND hwndEdit; + + hwndEdit = ListView_GetEditControl(pnmv->hdr.hwndFrom); + if (hwndEdit == NULL) + return TRUE; + + SendMessage(hwndEdit, EM_SETLIMITTEXT, 20, 0); + + return FALSE; +} + + +static BOOL +OnEndLabelEdit(LPNMLVDISPINFO pnmv) +{ + TCHAR szOldGroupName[UNLEN]; + TCHAR szNewGroupName[UNLEN]; + LOCALGROUP_INFO_0 lgrpi0; + NET_API_STATUS status; + + /* Leave, if there is no valid listview item */ + if (pnmv->item.iItem == -1) + return FALSE; + + /* Get the new user name */ + ListView_GetItemText(pnmv->hdr.hwndFrom, + pnmv->item.iItem, 0, + szOldGroupName, + UNLEN); + + /* Leave, if the user canceled the edit action */ + if (pnmv->item.pszText == NULL) + return FALSE; + + /* Get the new user name */ + lstrcpy(szNewGroupName, pnmv->item.pszText); + + /* Leave, if the user name was not changed */ + if (lstrcmp(szOldGroupName, szNewGroupName) == 0) + return FALSE; + + /* Check the group name for illegal characters */ + if (!CheckAccountName(NULL, 0, szNewGroupName)) + return FALSE; + + /* Change the user name */ + lgrpi0.lgrpi0_name = szNewGroupName; + +#if 0 + status = NetLocalGroupSetInfo(NULL, szOldGroupName, 0, (LPBYTE)&lgrpi0, NULL); +#else + status = NERR_Success; +#endif + if (status != NERR_Success) + { + TCHAR szText[256]; + wsprintf(szText, TEXT("Error: %u"), status); + MessageBox(NULL, szText, TEXT("NetLocalGroupSetInfo"), MB_ICONERROR | MB_OK); + return FALSE; + } + + /* Update the listview item */ + ListView_SetItemText(pnmv->hdr.hwndFrom, + pnmv->item.iItem, 0, + szNewGroupName); + + return TRUE; +} + + +static BOOL +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; + break; + + case NM_DBLCLK: + if (lpnmlv->iItem != -1) + { + UINT uItem; + + uItem = GetMenuDefaultItem(GetSubMenu(pGroupData->hPopupMenu, 1), + FALSE, 0); + if (uItem != (UINT)-1) + SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(uItem, 0), 0); + } + 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; + + case LVN_BEGINLABELEDIT: + return OnBeginLabelEdit((LPNMLVDISPINFO)phdr); + + case LVN_ENDLABELEDIT: + return OnEndLabelEdit((LPNMLVDISPINFO)phdr); + } + break; + } + + return FALSE; +} + + +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); + SetMenuDefaultItem(GetSubMenu(pGroupData->hPopupMenu, 1), + IDM_GROUP_PROPERTIES, + FALSE); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDM_GROUP_NEW: + GroupNew(hwndDlg); + break; + + case IDM_GROUP_RENAME: + GroupRename(hwndDlg); + break; + + case IDM_GROUP_DELETE: + GroupDelete(hwndDlg); + break; + + case IDM_GROUP_PROPERTIES: + GroupProperties(hwndDlg); + break; + } + break; + + case WM_NOTIFY: + return OnNotify(hwndDlg, pGroupData, (NMHDR *)lParam); + + case WM_DESTROY: + DestroyMenu(pGroupData->hPopupMenu); + HeapFree(GetProcessHeap(), 0, pGroupData); + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/cpl/usrmgr/groups.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc [iso-8859-1] Sat May 31 14:48:44 2008 @@ -41,7 +41,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_USER_GENERAL_NAME, 7, 7, 112, 8 + LTEXT "", IDC_USER_GENERAL_NAME, 7, 12, 112, 8 LTEXT "Full name:", -1, 7, 46, 63, 8 EDITTEXT IDC_USER_GENERAL_FULL_NAME,77,43,168,13,ES_AUTOHSCROLL LTEXT "Description:", -1, 7, 64, 63, 8 @@ -51,6 +51,20 @@ AUTOCHECKBOX "Password never expires",IDC_USER_GENERAL_NEVER_EXPIRES,7,108,210,10 AUTOCHECKBOX "Account is disabled",IDC_USER_GENERAL_DISABLED,7,121,210,10 AUTOCHECKBOX "Account is locked",IDC_USER_GENERAL_LOCKED,7,134,210,10,WS_DISABLED +END + + +IDD_GROUP_GENERAL DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_GROUP_GENERAL_NAME, 7, 12, 112, 8 + LTEXT "Description:", -1, 7, 45, 46, 8 + EDITTEXT IDC_GROUP_GENERAL_DESCRIPTION,65,42,180,13,ES_AUTOHSCROLL + LTEXT "Members:", -1, 7, 63, 45, 8 + CONTROL "", IDC_GROUP_GENERAL_MEMBERS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 74, 238, 117, WS_EX_CLIENTEDGE END @@ -121,7 +135,7 @@ MENUITEM "Delete", IDM_GROUP_DELETE MENUITEM "Rename", IDM_GROUP_RENAME MENUITEM SEPARATOR - MENUITEM "Properties", IDM_GROUP_PROPERTIES, GRAYED + MENUITEM "Properties", IDM_GROUP_PROPERTIES END END Modified: trunk/reactos/dll/cpl/usrmgr/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/misc.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/misc.c [iso-8859-1] Sat May 31 14:48:44 2008 @@ -9,6 +9,20 @@ #include "usrmgr.h" + +VOID +DebugPrintf(LPTSTR szFormat, ...) +{ + TCHAR szOut[512]; + va_list arg_ptr; + + + va_start (arg_ptr, szFormat); + _vstprintf (szOut, szFormat, arg_ptr); + va_end (arg_ptr); + + MessageBox(NULL, szOut, _T("Debug"), MB_OK); +} BOOL CheckAccountName(HWND hwndDlg, Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/resource.h [iso-8859-1] Sat May 31 14:48:44 2008 @@ -44,6 +44,11 @@ #define IDC_USER_GENERAL_NEVER_EXPIRES 316 #define IDC_USER_GENERAL_DISABLED 317 #define IDC_USER_GENERAL_LOCKED 318 + +#define IDD_GROUP_GENERAL 340 +#define IDC_GROUP_GENERAL_NAME 341 +#define IDC_GROUP_GENERAL_DESCRIPTION 342 +#define IDC_GROUP_GENERAL_MEMBERS 343 #define IDD_CHANGE_PASSWORD 350 Modified: trunk/reactos/dll/cpl/usrmgr/userprops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/userprops.c… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] Sat May 31 14:48:44 2008 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS User Manager Control Panel * FILE: dll/cpl/usrmgr/users.c - * PURPOSE: Users property page + * PURPOSE: User property sheet * * PROGRAMMERS: Eric Kohl */ Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.c [iso-8859-1] Sat May 31 14:48:44 2008 @@ -1,122 +1,122 @@ -/* $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 - -static LONG APIENTRY UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); - -HINSTANCE hApplet = 0; - -/* Applets */ -APPLET Applets[NUM_APPLETS] = -{ - { - IDI_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 */ -static LONG APIENTRY -UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) -{ - PROPSHEETPAGE psp[3]; - PROPSHEETHEADER psh; - TCHAR Caption[1024]; - - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(uMsg); - - LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); - - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE; - psh.hwndParent = hwnd; - psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_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; -} +/* $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 + +static LONG APIENTRY UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); + +HINSTANCE hApplet = 0; + +/* Applets */ +APPLET Applets[NUM_APPLETS] = +{ + { + IDI_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 */ +static LONG APIENTRY +UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) +{ + PROPSHEETPAGE psp[3]; + PROPSHEETHEADER psh; + TCHAR Caption[1024]; + + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(uMsg); + + LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE; + psh.hwndParent = hwnd; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_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; +} Propchange: trunk/reactos/dll/cpl/usrmgr/usrmgr.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.def [iso-8859-1] Sat May 31 14:48:44 2008 @@ -1,6 +1,6 @@ -LIBRARY usrmgr.cpl - -EXPORTS -CPlApplet@16 - -; EOF +LIBRARY usrmgr.cpl + +EXPORTS +CPlApplet@16 + +; EOF Propchange: trunk/reactos/dll/cpl/usrmgr/usrmgr.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.h [iso-8859-1] Sat May 31 14:48:44 2008 @@ -29,7 +29,14 @@ INT_PTR CALLBACK GroupsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ExtraPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +/* groupprops.c */ +VOID +GroupProperties(HWND hwndDlg); + /* misc.c */ +VOID +DebugPrintf(LPTSTR szFormat, ...); + BOOL CheckAccountName(HWND hwndDlg, INT nIdDlgItem, Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild [iso-8859-1] Sat May 31 14:48:44 2008 @@ -14,6 +14,7 @@ <library>netapi32</library> <library>msvcrt</library> <file>extra.c</file> + <file>groupprops.c</file> <file>groups.c</file> <file>misc.c</file> <file>userprops.c</file>

1 0

[dchapyshev] 33789: - Move languages structures to header - Add structures for adding fonts settings
by dchapyshev＠svn.reactos.org 31 May '08

31 May '08

Author: dchapyshev Date: Sat May 31 08:29:45 2008 New Revision: 33789 URL: http://svn.reactos.org/svn/reactos?rev=33789&view=rev Log: - Move languages structures to header - Add structures for adding fonts settings Added: trunk/reactos/base/setup/usetup/muifonts.h (with props) trunk/reactos/base/setup/usetup/muilanguages.h (with props) Modified: trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Sat May 31 08:29:45 2008 @@ -28,82 +28,11 @@ #include "interface/consup.h" #include "errorcode.h" #include "mui.h" +#include "muifonts.h" +#include "muilanguages.h" #define NDEBUG #include <debug.h> - -#include "lang/bg-BG.h" -#include "lang/cs-CZ.h" -#include "lang/en-US.h" -#include "lang/de-DE.h" -#include "lang/el-GR.h" -#include "lang/es-ES.h" -#include "lang/fr-FR.h" -#include "lang/it-IT.h" -#include "lang/pl-PL.h" -#include "lang/ru-RU.h" -#include "lang/sk-SK.h" -#include "lang/sv-SE.h" -#include "lang/uk-UA.h" -#include "lang/lt-LT.h" - -static const MUI_LANGUAGE LanguageList[] = -{ - /* Lang ID, DefKbdLayout, SecKbLayout, ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings */ - {L"00000409", L"00000409", NULL, L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041C", L"0000041C", L"00000409", L"1250", L"852", L"10029", L"Albanian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000401", L"00000401", L"00000409", L"1256", L"720", L"10004", L"Arabic", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000042B", L"0000042B", L"00000409", L"0", L"1", L"2", L"Armenian Eastern", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000082C", L"0000082C", L"00000409", L"1251", L"866", L"10007", L"Azeri Cyrillic", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000042C", L"0000042C", L"00000409", L"1254", L"857", L"10081", L"Azeri Latin", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000423", L"00000423", L"00000409", L"1251", L"866", L"10007", L"Belarusian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000813", L"00000813", L"00000409", L"1252", L"850", L"10000", L"Belgian (Dutch)", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000080C", L"0000080C", L"00000409", L"1252", L"850", L"10000", L"Belgian (French)", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000416", L"00010416", L"00000409", L"1252", L"850", L"10000", L"Brazilian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000402", L"00000402", L"00000409", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings }, - {L"00000455", L"00000455", L"00000409", L"0", L"1", L"2", L"Burmese", enUSPages, enUSErrorEntries, enUSStrings },// Unicode only - {L"00000C0C", L"00000C0C", L"00000409", L"1252", L"850", L"10000", L"Canadian (French)", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000403", L"0000040A", L"00000409", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000804", L"00000804", L"00000409", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000405", L"00000405", L"00000409", L"1250", L"852", L"10029", L"Czech", csCZPages, csCZErrorEntries, csCZStrings }, - {L"00000406", L"00000406", L"00000409", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000407", L"00000407", L"00000409", L"1252", L"850", L"10000", L"Deutsch", deDEPages, deDEErrorEntries, deDEStrings }, - {L"00000413", L"00000813", L"00000409", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000425", L"00000425", L"00000409", L"1257", L"775", L"10029", L"Estonian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040B", L"0000040B", L"00000409", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040C", L"0000040C", L"00000409", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, frFRStrings }, - {L"00000437", L"00000437", L"00000409", L"0", L"1", L"2", L"Georgian", enUSPages, enUSErrorEntries, enUSStrings },// Unicode only - {L"00000408", L"00000408", L"00000409", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, elGRStrings }, - {L"0000040D", L"0000040D", L"00000409", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040E", L"0000040E", L"00000409", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040F", L"0000040F", L"00000409", L"1252", L"850", L"10079", L"Icelandic", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000410", L"00000410", L"00000409", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, itITStrings }, - {L"00000411", L"00000411", L"00000409", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000043F", L"0000043F", L"00000409", L"1251", L"866", L"10007", L"Kazakh", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000412", L"00000412", L"00000409", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000426", L"00000426", L"00000409", L"1257", L"775", L"10029", L"Latvian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000427", L"00000427", L"00000409", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings }, - {L"0000042F", L"0000042F", L"00000409", L"1251", L"866", L"10007", L"Macedonian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000414", L"00000414", L"00000409", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000418", L"00000418", L"00000409", L"1250", L"852", L"10029", L"Romanian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000419", L"00000419", L"00000409", L"1251", L"866", L"10007", L"Russkij", ruRUPages, ruRUErrorEntries, ruRUStrings }, - {L"00000415", L"00000415", L"00000409", L"1250", L"852", L"10029", L"Polski", plPLPages, plPLErrorEntries, plPLStrings }, - {L"00000816", L"00000816", L"00000409", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000C1A", L"00000C1A", L"00000409", L"1251", L"855", L"10007", L"Serbian (Cyrillic)",enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000081A", L"0000081A", L"00000409", L"1250", L"852", L"10029", L"Serbian (Latin)", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041B", L"0000041B", L"00000409", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings }, - {L"0000040A", L"0000040A", L"00000409", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, esESStrings }, - {L"00000807", L"00000807", L"00000409", L"1252", L"850", L"10000", L"Swiss (German)", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041D", L"0000041D", L"00000409", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, svSEStrings }, - {L"00000444", L"00000444", L"00000409", L"1251", L"866", L"10007", L"Tatar", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041E", L"0000041E", L"00000409", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041F", L"0000041F", L"00000409", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000422", L"00000422", L"00000409", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, ukUAStrings }, - {L"00000809", L"00000809", L"00000409", L"1252", L"850", L"10000", L"United Kingdom", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000843", L"00000843", L"00000409", L"1251", L"866", L"10007", L"Uzbek", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000042A", L"0000042A", L"00000409", L"1258", L"1258",L"10000", L"Vietnamese", enUSPages, enUSErrorEntries, enUSStrings }, - {NULL, NULL, NULL, NULL, NULL, NULL} -}; extern VOID @@ -122,7 +51,7 @@ { /* default to english */ return 0; - } + } do { @@ -566,6 +495,57 @@ return TRUE; } +static BOOLEAN +AddFontsSettingsToRegistry(IN const MUI_SUBFONT * MuiSubFonts) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE KeyHandle; + NTSTATUS Status; + ULONG uIndex = 0; + + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\SysFontSubstitutes"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, + KEY_WRITE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); + return FALSE; + } + + do + { + RtlInitUnicodeString(&ValueName, MuiSubFonts[uIndex].FontName); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)MuiSubFonts[uIndex].SubFontName, + wcslen(MuiSubFonts[uIndex].SubFontName) * sizeof(PWCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); + NtClose(KeyHandle); + return FALSE; + } + + uIndex++; + } + while (MuiSubFonts[uIndex].FontName != NULL); + + NtClose(KeyHandle); + + return TRUE; +} + BOOLEAN AddCodePage(VOID) { @@ -574,9 +554,17 @@ { if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) { - return AddCodepageToRegistry(LanguageList[lngIndex].ACPage, - LanguageList[lngIndex].OEMCPage, - LanguageList[lngIndex].MACCPage); + if (AddCodepageToRegistry(LanguageList[lngIndex].ACPage, + LanguageList[lngIndex].OEMCPage, + LanguageList[lngIndex].MACCPage)&& + AddFontsSettingsToRegistry(LanguageList[lngIndex].MuiSubFonts)) + { + return TRUE; + } + else + { + return FALSE; + } } lngIndex++; Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Sat May 31 08:29:45 2008 @@ -19,13 +19,19 @@ { LONG Number; MUI_ENTRY * MuiEntry; -}MUI_PAGE; +} MUI_PAGE; typedef struct { LONG Number; LPSTR String; } MUI_STRING; + +typedef struct +{ + LPCWSTR FontName; + LPCWSTR SubFontName; +} MUI_SUBFONT; typedef struct { @@ -39,7 +45,8 @@ const MUI_PAGE * MuiPages; const MUI_ERROR * MuiErrors; const MUI_STRING * MuiStrings; -}MUI_LANGUAGE; + const MUI_SUBFONT * MuiSubFonts; +} MUI_LANGUAGE; VOID MUIDisplayPage (ULONG PageNumber); Added: trunk/reactos/base/setup/usetup/muifonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muifonts… ============================================================================== --- trunk/reactos/base/setup/usetup/muifonts.h (added) +++ trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] Sat May 31 08:29:45 2008 @@ -1,0 +1,201 @@ +#ifndef LANG_MUI_FONTS_H__ +#define LANG_MUI_FONTS_H__ + +MUI_SUBFONT CP1250Fonts[] = +{ + /*Font Subtitle */ + + { L"Arial", L"Tahoma" }, + { L"Courier New", L"Tahoma" }, + { L"Times New Roman", L"Tahoma" }, + { L"Tahoma", L"Tahoma" }, + { L"MS Sans Serif", L"Tahoma" }, + { L"MS Shell Dlg", L"Tahoma" }, + { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Helv", L"Tahoma" }, + { NULL, NULL } +}; + +MUI_SUBFONT CP1251Fonts[] = +{ + { L"Arial", L"Tahoma" }, + { L"Courier New", L"Tahoma" }, + { L"Times New Roman", L"Tahoma" }, + { L"Tahoma", L"Tahoma" }, + { L"MS Sans Serif", L"Tahoma" }, + { L"MS Shell Dlg", L"Tahoma" }, + { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Helv", L"Tahoma" }, + { NULL, NULL } +}; + +MUI_SUBFONT CP1252Fonts[] = +{ + { L"Arial", L"Tahoma" }, + { L"Courier New", L"Tahoma" }, + { L"Times New Roman", L"Tahoma" }, + { L"Tahoma", L"Tahoma" }, + { L"MS Sans Serif", L"Tahoma" }, + { L"MS Shell Dlg", L"Tahoma" }, + { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Helv", L"Tahoma" }, + { NULL, NULL } +}; + +MUI_SUBFONT CP1253Fonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier New", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Helv", L"Liberation Sans" }, + { NULL, NULL } +}; + +MUI_SUBFONT CP1254Fonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier New", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Helv", L"Liberation Sans" }, + { NULL, NULL } +}; + +MUI_SUBFONT CP1255Fonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier New", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Helv", L"Liberation Sans" }, + { NULL, NULL } +}; + +MUI_SUBFONT CP1256Fonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier New", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Helv", L"Liberation Sans" }, + { NULL, NULL } +}; + +MUI_SUBFONT CP1257Fonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier New", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Helv", L"Liberation Sans" }, + { NULL, NULL } +}; + +MUI_SUBFONT CP1258Fonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier New", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Helv", L"Liberation Sans" }, + { NULL, NULL } +}; + +MUI_SUBFONT CP874Fonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier New", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Helv", L"Liberation Sans" }, + { NULL, NULL } +}; + +MUI_SUBFONT CP932Fonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier New", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Helv", L"Liberation Sans" }, + { NULL, NULL } +}; + +MUI_SUBFONT CP936Fonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier New", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Helv", L"Liberation Sans" }, + { NULL, NULL } +}; + +MUI_SUBFONT CP949Fonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier New", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Helv", L"Liberation Sans" }, + { NULL, NULL } +}; + +MUI_SUBFONT CP950Fonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier New", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Helv", L"Liberation Sans" }, + { NULL, NULL } +}; + +MUI_SUBFONT UnicodeFonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier New", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Helv", L"Liberation Sans" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/muifonts.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h (added) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Sat May 31 08:29:45 2008 @@ -1,0 +1,77 @@ +#ifndef LANG_MUI_LANGUAGES_H__ +#define LANG_MUI_LANGUAGES_H__ + +#include "lang/bg-BG.h" +#include "lang/cs-CZ.h" +#include "lang/en-US.h" +#include "lang/de-DE.h" +#include "lang/el-GR.h" +#include "lang/es-ES.h" +#include "lang/fr-FR.h" +#include "lang/it-IT.h" +#include "lang/pl-PL.h" +#include "lang/ru-RU.h" +#include "lang/sk-SK.h" +#include "lang/sv-SE.h" +#include "lang/uk-UA.h" +#include "lang/lt-LT.h" + +const MUI_LANGUAGE LanguageList[] = +{ + /* Lang ID, DefKbdLayout, SecKbLayout, ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings */ + {L"00000409", L"00000409", NULL, L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, + {L"0000041C", L"0000041C", L"00000409", L"1250", L"852", L"10029", L"Albanian", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts }, + {L"00000401", L"00000401", L"00000409", L"1256", L"720", L"10004", L"Arabic", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts }, + {L"0000042B", L"0000042B", L"00000409", L"0", L"1", L"2", L"Armenian Eastern", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts}, + {L"0000082C", L"0000082C", L"00000409", L"1251", L"866", L"10007", L"Azeri Cyrillic", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts }, + {L"0000042C", L"0000042C", L"00000409", L"1254", L"857", L"10081", L"Azeri Latin", enUSPages, enUSErrorEntries, enUSStrings, CP1254Fonts }, + {L"00000423", L"00000423", L"00000409", L"1251", L"866", L"10007", L"Belarusian", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts }, + {L"00000813", L"00000813", L"00000409", L"1252", L"850", L"10000", L"Belgian (Dutch)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, + {L"0000080C", L"0000080C", L"00000409", L"1252", L"850", L"10000", L"Belgian (French)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, + {L"00000416", L"00010416", L"00000409", L"1252", L"850", L"10000", L"Brazilian", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, + {L"00000402", L"00000402", L"00000409", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings, CP1251Fonts }, + {L"00000455", L"00000455", L"00000409", L"0", L"1", L"2", L"Burmese", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts}, + {L"00000C0C", L"00000C0C", L"00000409", L"1252", L"850", L"10000", L"Canadian (French)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, + {L"00000403", L"0000040A", L"00000409", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, + {L"00000804", L"00000804", L"00000409", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings, CP936Fonts }, + {L"00000405", L"00000405", L"00000409", L"1250", L"852", L"10029", L"Czech", csCZPages, csCZErrorEntries, csCZStrings, CP1250Fonts }, + {L"00000406", L"00000406", L"00000409", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, + {L"00000407", L"00000407", L"00000409", L"1252", L"850", L"10000", L"Deutsch", deDEPages, deDEErrorEntries, deDEStrings, CP1252Fonts }, + {L"00000413", L"00000813", L"00000409", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, + {L"00000425", L"00000425", L"00000409", L"1257", L"775", L"10029", L"Estonian", enUSPages, enUSErrorEntries, enUSStrings, CP1257Fonts }, + {L"0000040B", L"0000040B", L"00000409", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, + {L"0000040C", L"0000040C", L"00000409", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, frFRStrings, CP1252Fonts }, + {L"00000437", L"00000437", L"00000409", L"0", L"1", L"2", L"Georgian", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts}, + {L"00000408", L"00000408", L"00000409", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, elGRStrings, CP1253Fonts }, + {L"0000040D", L"0000040D", L"00000409", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings, CP1255Fonts }, + {L"0000040E", L"0000040E", L"00000409", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts }, + {L"0000040F", L"0000040F", L"00000409", L"1252", L"850", L"10079", L"Icelandic", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, + {L"00000410", L"00000410", L"00000409", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, itITStrings, CP1252Fonts }, + {L"00000411", L"00000411", L"00000409", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings, CP932Fonts }, + {L"0000043F", L"0000043F", L"00000409", L"1251", L"866", L"10007", L"Kazakh", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts }, + {L"00000412", L"00000412", L"00000409", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings, CP949Fonts }, + {L"00000426", L"00000426", L"00000409", L"1257", L"775", L"10029", L"Latvian", enUSPages, enUSErrorEntries, enUSStrings, CP1257Fonts }, + {L"00000427", L"00000427", L"00000409", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings, CP1257Fonts }, + {L"0000042F", L"0000042F", L"00000409", L"1251", L"866", L"10007", L"Macedonian", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts }, + {L"00000414", L"00000414", L"00000409", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, + {L"00000418", L"00000418", L"00000409", L"1250", L"852", L"10029", L"Romanian", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts }, + {L"00000419", L"00000419", L"00000409", L"1251", L"866", L"10007", L"Russkij", ruRUPages, ruRUErrorEntries, ruRUStrings, CP1251Fonts }, + {L"00000415", L"00000415", L"00000409", L"1250", L"852", L"10029", L"Polski", plPLPages, plPLErrorEntries, plPLStrings, CP1250Fonts }, + {L"00000816", L"00000816", L"00000409", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, + {L"00000C1A", L"00000C1A", L"00000409", L"1251", L"855", L"10007", L"Serbian (Cyrillic)",enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts }, + {L"0000081A", L"0000081A", L"00000409", L"1250", L"852", L"10029", L"Serbian (Latin)", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts }, + {L"0000041B", L"0000041B", L"00000409", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings, CP1250Fonts }, + {L"0000040A", L"0000040A", L"00000409", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, esESStrings, CP1252Fonts }, + {L"00000807", L"00000807", L"00000409", L"1252", L"850", L"10000", L"Swiss (German)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, + {L"0000041D", L"0000041D", L"00000409", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, svSEStrings, CP1252Fonts }, + {L"00000444", L"00000444", L"00000409", L"1251", L"866", L"10007", L"Tatar", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts }, + {L"0000041E", L"0000041E", L"00000409", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings, CP874Fonts }, + {L"0000041F", L"0000041F", L"00000409", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings, CP1254Fonts }, + {L"00000422", L"00000422", L"00000409", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, ukUAStrings, CP1251Fonts }, + {L"00000809", L"00000809", L"00000409", L"1252", L"850", L"10000", L"United Kingdom", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts }, + {L"00000843", L"00000843", L"00000409", L"1251", L"866", L"10007", L"Uzbek", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts }, + {L"0000042A", L"0000042A", L"00000409", L"1258", L"1258",L"10000", L"Vietnamese", enUSPages, enUSErrorEntries, enUSStrings, CP1258Fonts }, + {NULL, NULL, NULL, NULL, NULL, NULL} +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/muilanguages.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 33788: Sync wininet with Wine. This fixes the Download! issue. As we implement some more functions in the network stack now, I could remove some hacks from the "wininet_ros.diff" file. Anyways, the following things still needed to be changed: - Pass a variable to WriteFile for receiving the number of bytes written. This parameter is not checked for NULL in ReactOS and Windows, when lpOverlapped is also NULL. I'll submit a patch about this to Wine as well. - Replace Unix poll() calls by
by cfinck＠svn.reactos.org 31 May '08

31 May '08

Author: cfinck Date: Sat May 31 08:02:59 2008 New Revision: 33788 URL: http://svn.reactos.org/svn/reactos?rev=33788&view=rev Log: Sync wininet with Wine. This fixes the Download! issue. As we implement some more functions in the network stack now, I could remove some hacks from the "wininet_ros.diff" file. Anyways, the following things still needed to be changed: - Pass a variable to WriteFile for receiving the number of bytes written. This parameter is not checked for NULL in ReactOS and Windows, when lpOverlapped is also NULL. I'll submit a patch about this to Wine as well. - Replace Unix poll() calls by equivalent select() calls - Bypass sock_get_error(), directly call WSAGetLastError() as we don't have to translate Unix socket errors. See issue #3197 for more details. Added: trunk/reactos/dll/win32/wininet/wininet_Da.rc (with props) Modified: trunk/reactos/dll/win32/wininet/cookie.c trunk/reactos/dll/win32/wininet/ftp.c trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/dll/win32/wininet/internet.h trunk/reactos/dll/win32/wininet/netconnection.c trunk/reactos/dll/win32/wininet/rsrc.rc trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/dll/win32/wininet/utility.c trunk/reactos/dll/win32/wininet/wininet.spec trunk/reactos/dll/win32/wininet/wininet_Ru.rc trunk/reactos/dll/win32/wininet/wininet_Si.rc trunk/reactos/dll/win32/wininet/wininet_Sv.rc trunk/reactos/dll/win32/wininet/wininet_ros.diff trunk/reactos/include/psdk/wininet.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/cookie.c… Modified: trunk/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/ftp.c?re… Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… Modified: trunk/reactos/dll/win32/wininet/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/rsrc.rc?… Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… Modified: trunk/reactos/dll/win32/wininet/utility.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/utility.… Modified: trunk/reactos/dll/win32/wininet/wininet.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… Added: trunk/reactos/dll/win32/wininet/wininet_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/include/psdk/wininet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wininet.h?rev…

1 0

[cfinck] 33787: Implement support for FIONREAD in WSPIoctl. (hope I did it properly) It works correctly with the wininet I'll commit later and a test app I wrote myself.
by cfinck＠svn.reactos.org 31 May '08

31 May '08

Author: cfinck Date: Sat May 31 07:53:55 2008 New Revision: 33787 URL: http://svn.reactos.org/svn/reactos?rev=33787&view=rev Log: Implement support for FIONREAD in WSPIoctl. (hope I did it properly) It works correctly with the wininet I'll commit later and a test app I wrote myself. Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/include/reactos/drivers/afd/shared.h Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sat May 31 07:53:55 2008 @@ -1517,6 +1517,9 @@ Handle, Socket->SharedData.NonBlocking)); return 0; + case FIONREAD: + return GetSocketInformation(Socket, AFD_INFO_RECEIVE_CONTENT_SIZE, (PULONG)lpvOutBuffer, NULL); + default: *lpErrno = WSAEINVAL; return SOCKET_ERROR; Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sat May 31 07:53:55 2008 @@ -47,6 +47,14 @@ case AFD_INFO_BLOCKING_MODE: InfoReq->Information.Ulong = 0; break; + + case AFD_INFO_RECEIVE_CONTENT_SIZE: + /* Only touch InfoReq if we actually have a valid connection. + Behaviour was verified under WinXP SP2. */ + if(FCB->Connection.Handle) + InfoReq->Information.Ulong = FCB->Recv.Content - FCB->Recv.BytesUsed; + + break; default: AFD_DbgPrint(MID_TRACE,("Unknown info id %x\n", Modified: trunk/reactos/include/reactos/drivers/afd/shared.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/af… ============================================================================== --- trunk/reactos/include/reactos/drivers/afd/shared.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/afd/shared.h [iso-8859-1] Sat May 31 07:53:55 2008 @@ -149,6 +149,7 @@ #define AFD_INFO_RECEIVE_WINDOW_SIZE 0x06L #define AFD_INFO_SEND_WINDOW_SIZE 0x07L #define AFD_INFO_GROUP_ID_TYPE 0x10L +#define AFD_INFO_RECEIVE_CONTENT_SIZE 0x11L /* AFD Share Flags */ #define AFD_SHARE_UNIQUE 0x0L

1 0

[cfinck] 33786: Implement support for MSG_PEEK. Patch by Art Yerkes with small fix by me to make it working correctly. (verified with a test app)
by cfinck＠svn.reactos.org 31 May '08

31 May '08

Author: cfinck Date: Sat May 31 07:51:22 2008 New Revision: 33786 URL: http://svn.reactos.org/svn/reactos?rev=33786&view=rev Log: Implement support for MSG_PEEK. Patch by Art Yerkes with small fix by me to make it working correctly. (verified with a test app) Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sat May 31 07:51:22 2008 @@ -85,9 +85,12 @@ MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); - FCB->Recv.BytesUsed += BytesToCopy; - *TotalBytesCopied += BytesToCopy; - BytesAvailable -= BytesToCopy; + *TotalBytesCopied += BytesToCopy; + + if (!(RecvReq->TdiFlags & TDI_RECEIVE_PEEK)) { + FCB->Recv.BytesUsed += BytesToCopy; + BytesAvailable -= BytesToCopy; + } } } @@ -405,8 +408,11 @@ MmUnmapLockedPages( Map[0].BufferAddress, Map[0].Mdl ); - FCB->Recv.BytesUsed = 0; - *TotalBytesCopied = BytesToCopy; + *TotalBytesCopied = BytesToCopy; + + if (!RecvReq->TdiFlags & TDI_RECEIVE_PEEK) { + FCB->Recv.BytesUsed = 0; + } } Status = Irp->IoStatus.Status = STATUS_SUCCESS;

1 0

[cfinck] 33785: Stub QuerySecurityPackageInfoA and QuerySecurityPackageInfoW, needed for the wininet Wine sync
by cfinck＠svn.reactos.org 31 May '08

31 May '08

Author: cfinck Date: Sat May 31 07:49:25 2008 New Revision: 33785 URL: http://svn.reactos.org/svn/reactos?rev=33785&view=rev Log: Stub QuerySecurityPackageInfoA and QuerySecurityPackageInfoW, needed for the wininet Wine sync Modified: trunk/reactos/dll/win32/secur32/secur32.def trunk/reactos/dll/win32/secur32/sspi.c Modified: trunk/reactos/dll/win32/secur32/secur32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32.… ============================================================================== --- trunk/reactos/dll/win32/secur32/secur32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/secur32.def [iso-8859-1] Sat May 31 07:49:25 2008 @@ -51,8 +51,8 @@ ;QueryCredentialsAttributesA@12 ;QueryCredentialsAttributesW@12 ;@QuerySecurityContextToken -;@QuerySecurityPackageInfoA -;@QuerySecurityPackageInfoW +QuerySecurityPackageInfoA@8 +QuerySecurityPackageInfoW@8 ;RevertSecurityContext@4 ;@SaslAcceptSecurityContext ;@SaslEnumerateProfilesA Modified: trunk/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/sspi.c?r… ============================================================================== --- trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] Sat May 31 07:49:25 2008 @@ -225,3 +225,25 @@ DPRINT1("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; } + +SECURITY_STATUS +SEC_ENTRY +QuerySecurityPackageInfoA( + SEC_CHAR* pszPackageName, + PSecPkgInfoA* ppPackageInfo +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +SEC_ENTRY +QuerySecurityPackageInfoW( + SEC_WCHAR* pszPackageName, + PSecPkgInfoW* ppPackageInfo +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

[cfinck] 33784: Use FILE_SHARE_READ | FILE_SHARE_WRITE in CopyFileExW to also copy opened files. Thanks to Christoph for the hint. Behaviour was verified under WinXP SP2.
by cfinck＠svn.reactos.org 31 May '08

31 May '08

Author: cfinck Date: Sat May 31 07:48:51 2008 New Revision: 33784 URL: http://svn.reactos.org/svn/reactos?rev=33784&view=rev Log: Use FILE_SHARE_READ | FILE_SHARE_WRITE in CopyFileExW to also copy opened files. Thanks to Christoph for the hint. Behaviour was verified under WinXP SP2. Modified: trunk/reactos/dll/win32/kernel32/file/copy.c Modified: trunk/reactos/dll/win32/kernel32/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/copy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/copy.c [iso-8859-1] Sat May 31 07:48:51 2008 @@ -215,7 +215,7 @@ FileHandleSource = CreateFileW(lpExistingFileName, GENERIC_READ, - FILE_SHARE_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL|FILE_FLAG_NO_BUFFERING,

1 0

[greatlrd] 33783: revert my last change 1. it break vmware drv, for it align each bitmap row it create 2. diffent behoirs in diffent vm this did show we have more serius bug to fix before we can apply correct fix.
by greatlrd＠svn.reactos.org 31 May '08

31 May '08

Author: greatlrd Date: Sat May 31 07:17:25 2008 New Revision: 33783 URL: http://svn.reactos.org/svn/reactos?rev=33783&view=rev Log: revert my last change 1. it break vmware drv, for it align each bitmap row it create 2. diffent behoirs in diffent vm this did show we have more serius bug to fix before we can apply correct fix. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sat May 31 07:17:25 2008 @@ -665,9 +665,7 @@ } else { - ScanLines = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); - DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx; DestSize.cy = ScanLines; @@ -688,9 +686,9 @@ if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) { - hDestBitmap = EngCreateBitmap(DestSize, - DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), + /* DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), */ + DestSize.cx * (Info->bmiHeader.biBitCount >> 3), /* HACK */ BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, Bits); @@ -1220,12 +1218,7 @@ */ INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth) { - /* http://www.osronline.com/DDKx/graphics/gdifncs_9pgn.htm say it must be exacly - * number of byte to next scanline in the bitmap - */ - UINT bytes = ((UINT)(abs(width)) * (UINT)depth) >> 3; - // FIXME : this is wrong return (width * depth + 31) & ~31) >> 3; - return (INT)bytes; + return ((width * depth + 31) & ~31) >> 3; } /***********************************************************************

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 May 2008