Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[royce] 19722: append "_auto" to dsp and vcproj filenames to not conflict with any manually created project files
by royce＠svn.reactos.com 28 Nov '05

28 Nov '05

append "_auto" to dsp and vcproj filenames to not conflict with any manually created project files Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-11-28 14:16:39 UTC (rev 19721) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-11-28 18:23:25 UTC (rev 19722) @@ -209,7 +209,7 @@ MSVCBackend::DspFileName ( const Module& module ) const { return DosSeparator( - ReplaceExtension ( module.GetPath(), ".dsp" ) + ReplaceExtension ( module.GetPath(), "_auto.dsp" ) ); } @@ -217,6 +217,6 @@ MSVCBackend::VcprojFileName ( const Module& module ) const { return DosSeparator( - ReplaceExtension ( module.GetPath(), ".vcproj" ) + ReplaceExtension ( module.GetPath(), "_auto.vcproj" ) ); }

1 0

[turner] 19721: devmgr.exe changed to devmgrapp.exe
by turner＠svn.reactos.com 28 Nov '05

28 Nov '05

devmgr.exe changed to devmgrapp.exe Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-28 11:00:01 UTC (rev 19720) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-28 14:16:39 UTC (rev 19721) @@ -180,7 +180,7 @@ subsys\system\autochk\autochk.exe 1 subsys\system\calc\calc.exe 1 subsys\system\cmd\cmd.exe 1 -subsys\system\devmgr\devmgr.exe 1 +subsys\system\devmgr\devmgrapp.exe 1 subsys\system\explorer\explorer.exe 4 subsys\system\explorer\explorer-cfg-template.xml 4 subsys\system\explorer\notifyhook\notifyhook.dll 1

1 0

[weiden] 19720: also scroll the selection
by weiden＠svn.reactos.com 28 Nov '05

28 Nov '05

also scroll the selection Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c _____ Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c --- trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-11-28 10:38:04 UTC (rev 19719) +++ trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-11-28 11:00:01 UTC (rev 19720) @@ -502,6 +502,25 @@ ScrollRect.right = Console->Size.X * GuiData->CharWidth; ScrollRect.bottom = Region->top * GuiData->CharHeight; + if (GuiData->Selection.left != -1) + { + /* scroll the selection */ + if (GuiData->Selection.top > ScrolledLines) + { + GuiData->Selection.top -= ScrolledLines; + GuiData->Selection.bottom -= ScrolledLines; + } + else if (GuiData->Selection.bottom < ScrolledLines) + { + GuiData->Selection.left = -1; + } + else + { + GuiData->Selection.top = 0; + GuiData->Selection.bottom -= ScrolledLines; + } + } + ScrollWindowEx(Console->hWindow, 0, -(ScrolledLines * GuiData->CharHeight),

1 0

[weiden] 19719: scroll the console properly instead of repainting it
by weiden＠svn.reactos.com 28 Nov '05

28 Nov '05

scroll the console properly instead of repainting it Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c _____ Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c --- trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-11-28 10:20:44 UTC (rev 19718) +++ trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-11-28 10:38:04 UTC (rev 19719) @@ -488,7 +488,7 @@ PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA) Console->PrivateData; PCSRSS_SCREEN_BUFFER Buff = Console->ActiveBuffer; LONG CursorEndX, CursorEndY; - RECT Source, ScrollRect; + RECT ScrollRect; if (NULL == Console->hWindow || NULL == GuiData) { @@ -497,16 +497,19 @@ if (0 != ScrolledLines) { - Source.left = 0; - Source.top = ScrolledLines; - Source.right = Console->Size.X - 1; - Source.bottom = ScrolledLines + Region->top - 1; ScrollRect.left = 0; ScrollRect.top = 0; ScrollRect.right = Console->Size.X * GuiData->CharWidth; ScrollRect.bottom = Region->top * GuiData->CharHeight; - InvalidateRect(Console->hWindow, &ScrollRect, FALSE); + ScrollWindowEx(Console->hWindow, + 0, + -(ScrolledLines * GuiData->CharHeight), + &ScrollRect, + NULL, + NULL, + NULL, + SW_INVALIDATE); } GuiIntDrawRegion(GuiData, Console->hWindow, Region);

1 0

[weiden] 19718: fix no newline at end of file warning
by weiden＠svn.reactos.com 28 Nov '05

28 Nov '05

fix no newline at end of file warning Modified: trunk/reactos/lib/cpl/mmsys/En.rc _____ Modified: trunk/reactos/lib/cpl/mmsys/En.rc --- trunk/reactos/lib/cpl/mmsys/En.rc 2005-11-28 03:46:16 UTC (rev 19717) +++ trunk/reactos/lib/cpl/mmsys/En.rc 2005-11-28 10:20:44 UTC (rev 19718) @@ -11,4 +11,5 @@ BEGIN IDS_CPLNAME "Sound and Audio Devices" IDS_CPLDESCRIPTION "Changes the sound scheme for your computer, or configure the settings for your speakers and recording devices." -END \ No newline at end of file +END +

1 0

[royce] 19717: fix linux builds - sorry
by royce＠svn.reactos.com 28 Nov '05

28 Nov '05

fix linux builds - sorry Modified: trunk/reactos/tools/ssprintf.cpp _____ Modified: trunk/reactos/tools/ssprintf.cpp --- trunk/reactos/tools/ssprintf.cpp 2005-11-28 01:22:52 UTC (rev 19716) +++ trunk/reactos/tools/ssprintf.cpp 2005-11-28 03:46:16 UTC (rev 19717) @@ -24,6 +24,15 @@ #include <assert.h> #include "ssprintf.h" +#ifndef WIN32 +#define _finite __finite +#define _isnan __isnan +inline int iswdigit ( wchar_t c ) +{ + return ( c >= L'0' && c <= L'9' ); +} +#endif//WIN32 + #ifdef __FreeBSD__ # define __isnan isnan # define __finite finite

1 0

[weiden] 19716: fixed some warnings
by weiden＠svn.reactos.com 28 Nov '05

28 Nov '05

fixed some warnings Modified: trunk/reactos/lib/string/bsearch.c Modified: trunk/reactos/lib/string/lfind.c Modified: trunk/reactos/lib/string/mbstowcs.c Modified: trunk/reactos/lib/string/splitp.c Modified: trunk/reactos/lib/string/strpbrk.c Modified: trunk/reactos/lib/string/strstr.c Modified: trunk/reactos/lib/string/strtol.c Modified: trunk/reactos/lib/string/strtoul.c Modified: trunk/reactos/lib/string/strxspn.h Modified: trunk/reactos/lib/string/wcstol.c Modified: trunk/reactos/lib/string/wcstombs.c Modified: trunk/reactos/lib/string/wcstoul.c Modified: trunk/reactos/lib/string/wstring.c _____ Modified: trunk/reactos/lib/string/bsearch.c --- trunk/reactos/lib/string/bsearch.c 2005-11-28 01:10:49 UTC (rev 19715) +++ trunk/reactos/lib/string/bsearch.c 2005-11-28 01:22:52 UTC (rev 19716) @@ -7,19 +7,19 @@ bsearch(const void *key, const void *base0, size_t nelem, size_t size, int (*cmp)(const void *ck, const void *ce)) { - char *base = (char *)base0; + const char *base = base0; int lim, cmpval; - void *p; + const void *p; for (lim = nelem; lim != 0; lim >>= 1) { p = base + (lim >> 1) * size; cmpval = (*cmp)(key, p); if (cmpval == 0) - return p; + return (void*)((size_t)p); if (cmpval > 0) { /* key > p: move right */ - base = (char *)p + size; + base = (const char *)p + size; lim--; } /* else move left */ } _____ Modified: trunk/reactos/lib/string/lfind.c --- trunk/reactos/lib/string/lfind.c 2005-11-28 01:10:49 UTC (rev 19715) +++ trunk/reactos/lib/string/lfind.c 2005-11-28 01:22:52 UTC (rev 19716) @@ -5,13 +5,13 @@ void *_lfind(const void *key, const void *base, size_t *nelp, size_t width, int (*compar)(const void *, const void *)) { - char* char_base = (char*)base; + const char* char_base = (const char *)base; size_t i; for (i = 0; i < *nelp; i++) { if (compar(key, char_base) == 0) - return char_base; + return (void *)((size_t)char_base); char_base += width; } _____ Modified: trunk/reactos/lib/string/mbstowcs.c --- trunk/reactos/lib/string/mbstowcs.c 2005-11-28 01:10:49 UTC (rev 19715) +++ trunk/reactos/lib/string/mbstowcs.c 2005-11-28 01:22:52 UTC (rev 19716) @@ -20,7 +20,7 @@ Status = RtlMultiByteToUnicodeN (wchar, sizeof(WCHAR), &Size, - (char *)mbchar, + mbchar, count); if (!NT_SUCCESS(Status)) return -1; @@ -42,7 +42,7 @@ if (wcstr == NULL) { RtlMultiByteToUnicodeSize (&Size, - (char *)mbstr, + mbstr, Length); return (size_t)Size; @@ -51,7 +51,7 @@ Status = RtlMultiByteToUnicodeN (wcstr, count, &Size, - (char *)mbstr, + mbstr, Length); if (!NT_SUCCESS(Status)) return -1; _____ Modified: trunk/reactos/lib/string/splitp.c --- trunk/reactos/lib/string/splitp.c 2005-11-28 01:10:49 UTC (rev 19715) +++ trunk/reactos/lib/string/splitp.c 2005-11-28 01:22:52 UTC (rev 19716) @@ -4,11 +4,11 @@ */ void _splitpath(const char* path, char* drive, char* dir, char* fname, char* ext) { - char* tmp_drive; - char* tmp_dir; - char* tmp_ext; + const char* tmp_drive; + const char* tmp_dir; + const char* tmp_ext; - tmp_drive = (char*)strchr(path,':'); + tmp_drive = strchr(path,':'); if (drive) { if (tmp_drive) { strncpy(drive,tmp_drive-1,2); @@ -18,7 +18,7 @@ } } if (!tmp_drive) { - tmp_drive = (char*)path - 1; + tmp_drive = path - 1; } tmp_dir = (char*)strrchr(path,'\\'); @@ -31,9 +31,9 @@ } } - tmp_ext = (char*)strrchr(path,'.'); + tmp_ext = strrchr(path,'.'); if (!tmp_ext) { - tmp_ext = (char*)path+strlen(path); + tmp_ext = path+strlen(path); } if (ext) { strcpy(ext,tmp_ext); _____ Modified: trunk/reactos/lib/string/strpbrk.c --- trunk/reactos/lib/string/strpbrk.c 2005-11-28 01:10:49 UTC (rev 19715) +++ trunk/reactos/lib/string/strpbrk.c 2005-11-28 01:22:52 UTC (rev 19716) @@ -34,17 +34,17 @@ else { unsigned long char_map[(1 << CHAR_BIT) / BIT_SIZE] = {0, }; - register unsigned char* str = (unsigned char*)s1; + const unsigned char* str = (const unsigned char*)s1; while (*s2) { - char_map[*(unsigned char*)s2 / BIT_SIZE] |= (1 << (*(unsigned char*)s2 % BIT_SIZE)); + char_map[*(const unsigned char*)s2 / BIT_SIZE] |= (1 << (*(const unsigned char*)s2 % BIT_SIZE)); s2++; } while (*str) { if (char_map[*str / BIT_SIZE] & (1 << (*str % BIT_SIZE))) { - return (char*)str; + return (char*)((size_t)str); } str++; } _____ Modified: trunk/reactos/lib/string/strstr.c --- trunk/reactos/lib/string/strstr.c 2005-11-28 01:10:49 UTC (rev 19715) +++ trunk/reactos/lib/string/strstr.c 2005-11-28 01:22:52 UTC (rev 19716) @@ -20,5 +20,5 @@ } while (strncmp(s, find, len) != 0); s--; } - return (char *)s; + return (char *)((size_t)s); } _____ Modified: trunk/reactos/lib/string/strtol.c --- trunk/reactos/lib/string/strtol.c 2005-11-28 01:10:49 UTC (rev 19715) +++ trunk/reactos/lib/string/strtol.c 2005-11-28 01:22:52 UTC (rev 19716) @@ -85,6 +85,6 @@ else if (neg) acc = -acc; if (endptr != 0) - *endptr = any ? (char *)s - 1 : (char *)nptr; + *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr); return acc; } _____ Modified: trunk/reactos/lib/string/strtoul.c --- trunk/reactos/lib/string/strtoul.c 2005-11-28 01:10:49 UTC (rev 19715) +++ trunk/reactos/lib/string/strtoul.c 2005-11-28 01:22:52 UTC (rev 19716) @@ -68,6 +68,6 @@ else if (neg) acc = -acc; if (endptr != 0) - *endptr = any ? (char *)s - 1 : (char *)nptr; + *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr); return acc; } _____ Modified: trunk/reactos/lib/string/strxspn.h --- trunk/reactos/lib/string/strxspn.h 2005-11-28 01:10:49 UTC (rev 19715) +++ trunk/reactos/lib/string/strxspn.h 2005-11-28 01:22:52 UTC (rev 19716) @@ -7,8 +7,8 @@ size_t _strxspn(const char *s1, const char *s2) { unsigned char char_map[1 << CHAR_BIT * sizeof(char)]; - register unsigned char * us2 = (unsigned char *)s2; - register unsigned char * str = (unsigned char *)s1; + const unsigned char * us2 = (const unsigned char *)s2; + const unsigned char * str = (const unsigned char *)s1; memset(char_map, 0, sizeof(char_map)); @@ -18,7 +18,7 @@ for(; *str; ++ str) if(_x(char_map[*str / CHAR_BIT] & (1 << (*str % CHAR_BIT)))) break; - return str - (unsigned char*)s1; + return (size_t)str - (size_t)s1; } /* EOF */ _____ Modified: trunk/reactos/lib/string/wcstol.c --- trunk/reactos/lib/string/wcstol.c 2005-11-28 01:10:49 UTC (rev 19715) +++ trunk/reactos/lib/string/wcstol.c 2005-11-28 01:22:52 UTC (rev 19716) @@ -85,6 +85,6 @@ else if (neg) acc = -acc; if (endptr != 0) - *endptr = any ? (wchar_t *)s - 1 : (wchar_t *)nptr; + *endptr = any ? (wchar_t *)((size_t)(s - 1)) : (wchar_t *)((size_t)nptr); return acc; } _____ Modified: trunk/reactos/lib/string/wcstombs.c --- trunk/reactos/lib/string/wcstombs.c 2005-11-28 01:10:49 UTC (rev 19715) +++ trunk/reactos/lib/string/wcstombs.c 2005-11-28 01:22:52 UTC (rev 19716) @@ -41,7 +41,7 @@ if (mbstr == NULL) { RtlUnicodeToMultiByteSize (&Size, - (wchar_t *)wcstr, + (wchar_t*)((size_t)wcstr), Length * sizeof(WCHAR)); return (size_t)Size; @@ -50,7 +50,7 @@ Status = RtlUnicodeToMultiByteN (mbstr, count, &Size, - (wchar_t *)wcstr, + (wchar_t*)((size_t)wcstr), Length * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) return -1; _____ Modified: trunk/reactos/lib/string/wcstoul.c --- trunk/reactos/lib/string/wcstoul.c 2005-11-28 01:10:49 UTC (rev 19715) +++ trunk/reactos/lib/string/wcstoul.c 2005-11-28 01:22:52 UTC (rev 19716) @@ -69,6 +69,6 @@ else if (neg) acc = -acc; if (endptr != 0) - *endptr = any ? (wchar_t *)s - 1 : (wchar_t *)nptr; + *endptr = any ? (wchar_t *)((size_t)s - 1) : (wchar_t *)((size_t)nptr); return acc; } _____ Modified: trunk/reactos/lib/string/wstring.c --- trunk/reactos/lib/string/wstring.c 2005-11-28 01:10:49 UTC (rev 19715) +++ trunk/reactos/lib/string/wstring.c 2005-11-28 01:22:52 UTC (rev 19716) @@ -67,11 +67,10 @@ */ size_t wcscspn(const wchar_t *str,const wchar_t *reject) { - wchar_t *s; - wchar_t *t; - s=(wchar_t *)str; + const wchar_t *t; + const wchar_t *s = str; do { - t=(wchar_t *)reject; + t=reject; while (*t) { if (*t==*s) break; @@ -97,7 +96,7 @@ for (scanp = s2; (sc = *scanp++) != 0;) if (sc == c) { - return (wchar_t *)(--s1); + return (wchar_t *)((size_t)(--s1)); } } return 0; @@ -108,11 +107,10 @@ */ size_t wcsspn(const wchar_t *str,const wchar_t *accept) { - wchar_t *s; - wchar_t *t; - s=(wchar_t *)str; + const wchar_t *t; + const wchar_t *s = str; do { - t=(wchar_t *)accept; + t=accept; while (*t) { if (*t==*s) break; @@ -131,20 +129,19 @@ */ wchar_t *wcsstr(const wchar_t *s,const wchar_t *b) { - wchar_t *x; - wchar_t *y; - wchar_t *c; - x=(wchar_t *)s; + const wchar_t *y; + const wchar_t *c; + const wchar_t *x = s; while (*x) { if (*x==*b) { y=x; - c=(wchar_t *)b; + c=b; while (*y && *c && *y==*c) { c++; y++; } if (!*c) - return x; + return (wchar_t *)((size_t)x); } x++; }

1 0

[weiden] 19715: minor fixes
by weiden＠svn.reactos.com 28 Nov '05

28 Nov '05

minor fixes Modified: trunk/reactos/lib/aclui/aclui.c Modified: trunk/reactos/lib/aclui/checklist.c Modified: trunk/reactos/lib/aclui/misc.c _____ Modified: trunk/reactos/lib/aclui/aclui.c --- trunk/reactos/lib/aclui/aclui.c 2005-11-28 01:09:27 UTC (rev 19714) +++ trunk/reactos/lib/aclui/aclui.c 2005-11-28 01:10:49 UTC (rev 19715) @@ -1077,16 +1077,18 @@ IN LPARAM lParam) { PSECURITY_PAGE sp; + INT_PTR Ret = FALSE; - switch (uMsg) + sp = (PSECURITY_PAGE)GetWindowLongPtr(hwndDlg, + DWL_USER); + if (sp != NULL || uMsg == WM_INITDIALOG) { - case WM_NOTIFY: + switch (uMsg) { - NMHDR *pnmh = (NMHDR*)lParam; - sp = (PSECURITY_PAGE)GetWindowLongPtr(hwndDlg, - DWL_USER); - if (sp != NULL) + case WM_NOTIFY: { + NMHDR *pnmh = (NMHDR*)lParam; + if (pnmh->hwndFrom == sp->hWndPrincipalsList) { switch (pnmh->code) @@ -1123,170 +1125,179 @@ } } } + break; } - break; - } - - case WM_COMMAND: - { - switch (LOWORD(wParam)) + + case WM_COMMAND: { - case IDC_ADD_PRINCIPAL: + switch (LOWORD(wParam)) { - HRESULT hRet; - - sp = (PSECURITY_PAGE)GetWindowLongPtr(hwndDlg, - DWL_USER); - - hRet = InitializeObjectPicker(sp->ServerName, - &sp->ObjectInfo, - &sp->pDsObjectPicker); - if (SUCCEEDED(hRet)) + case IDC_ADD_PRINCIPAL: { - hRet = InvokeObjectPickerDialog(sp->pDsObjectPicker, - hwndDlg, - AddSelectedPrincipal, - sp); - if (FAILED(hRet)) + HRESULT hRet; + + hRet = InitializeObjectPicker(sp->ServerName, + &sp->ObjectInfo, + &sp->pDsObjectPicker); + if (SUCCEEDED(hRet)) { - MessageBox(hwndDlg, L"InvokeObjectPickerDialog failed!\n", NULL, 0); + hRet = InvokeObjectPickerDialog(sp->pDsObjectPicker, + hwndDlg, + AddSelectedPrincipal, + sp); + if (FAILED(hRet)) + { + MessageBox(hwndDlg, L"InvokeObjectPickerDialog failed!\n", NULL, 0); + } + + /* delete the instance */ + FreeObjectPicker(sp->pDsObjectPicker); + + /* reload the principal list */ + FillPrincipalsList(sp); } - - /* delete the instance */ - FreeObjectPicker(sp->pDsObjectPicker); - - /* reload the principal list */ - FillPrincipalsList(sp); + else + { + MessageBox(hwndDlg, L"InitializeObjectPicker failed!\n", NULL, 0); + } + break; } - else + + case IDC_REMOVE_PRINCIPAL: { - MessageBox(hwndDlg, L"InitializeObjectPicker failed!\n", NULL, 0); + PPRINCIPAL_LISTITEM SelectedPrincipal; + + SelectedPrincipal = (PPRINCIPAL_LISTITEM)ListViewGetSelectedItemData(sp->hWndPrincipalsList) ; + if (SelectedPrincipal != NULL) + { + /* FIXME */ + } + break; } - break; } + break; } - break; - } - - case WM_SIZE: - { - sp = (PSECURITY_PAGE)GetWindowLongPtr(hwndDlg, - DWL_USER); - - ResizeControls(sp, - (INT)LOWORD(lParam), - (INT)HIWORD(lParam)); - break; - } - - case WM_INITDIALOG: - { - sp = (PSECURITY_PAGE)((LPPROPSHEETPAGE)lParam)->lParam; - if(sp != NULL) + + case WM_SIZE: { - LV_COLUMN lvc; - RECT rcLvClient; - - sp->hWnd = hwndDlg; - sp->hWndPrincipalsList = GetDlgItem(hwndDlg, IDC_PRINCIPALS); - sp->hBtnAdd = GetDlgItem(hwndDlg, IDC_ADD_PRINCIPAL); - sp->hBtnRemove = GetDlgItem(hwndDlg, IDC_REMOVE_PRINCIPAL); - sp->hBtnAdvanced = GetDlgItem(hwndDlg, IDC_ADVANCED); - sp->hAceCheckList = GetDlgItem(hwndDlg, IDC_ACE_CHECKLIST); - sp->hPermissionsForLabel = GetDlgItem(hwndDlg, IDC_LABEL_PERMISSIONS_FOR); - - sp->SpecialPermCheckIndex = -1; - - if ((sp->ObjectInfo.dwFlags & SI_SERVER_IS_DC) && - sp->ObjectInfo.pszServerName != NULL && - sp->ObjectInfo.pszServerName[0] != L'\0') + ResizeControls(sp, + (INT)LOWORD(lParam), + (INT)HIWORD(lParam)); + break; + } + + case WM_INITDIALOG: + { + sp = (PSECURITY_PAGE)((LPPROPSHEETPAGE)lParam)->lParam; + if(sp != NULL) { - sp->ServerName = sp->ObjectInfo.pszServerName; - } + LV_COLUMN lvc; + RECT rcLvClient; + + sp->hWnd = hwndDlg; + sp->hWndPrincipalsList = GetDlgItem(hwndDlg, IDC_PRINCIPALS); + sp->hBtnAdd = GetDlgItem(hwndDlg, IDC_ADD_PRINCIPAL); + sp->hBtnRemove = GetDlgItem(hwndDlg, IDC_REMOVE_PRINCIPAL); + sp->hBtnAdvanced = GetDlgItem(hwndDlg, IDC_ADVANCED); + sp->hAceCheckList = GetDlgItem(hwndDlg, IDC_ACE_CHECKLIST); + sp->hPermissionsForLabel = GetDlgItem(hwndDlg, IDC_LABEL_PERMISSIONS_FOR); + + sp->SpecialPermCheckIndex = -1; + + if ((sp->ObjectInfo.dwFlags & SI_SERVER_IS_DC) && + sp->ObjectInfo.pszServerName != NULL && + sp->ObjectInfo.pszServerName[0] != L'\0') + { + sp->ServerName = sp->ObjectInfo.pszServerName; + } - /* save the pointer to the structure */ - SetWindowLongPtr(hwndDlg, - DWL_USER, - (DWORD_PTR)sp); + /* save the pointer to the structure */ + SetWindowLongPtr(hwndDlg, + DWL_USER, + (DWORD_PTR)sp); - sp->hiPrincipals = ImageList_LoadBitmap(hDllInstance, - MAKEINTRESOURCE(IDB_USRGRPIMAGES), - 16, - 3, - RGB(255, - 0, - 255)); - - /* setup the listview control */ - if (sp->hiPrincipals != NULL) - { ListView_SetExtendedListViewStyleEx(sp->hWndPrincipalsList, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT); - ListView_SetImageList(sp->hWndPrincipalsList, - sp->hiPrincipals, - LVSIL_SMALL); - } - GetClientRect(sp->hWndPrincipalsList, - &rcLvClient); - - /* add a column to the list view */ - lvc.mask = LVCF_FMT | LVCF_WIDTH; - lvc.fmt = LVCFMT_LEFT; - lvc.cx = rcLvClient.right; - ListView_InsertColumn(sp->hWndPrincipalsList, - 0, - &lvc); - - ReloadPrincipalsList(sp); + sp->hiPrincipals = ImageList_LoadBitmap(hDllInstance, + MAKEINTRESOURCE(IDB_USRGRPIMAGES), + 16, + 3, + RGB(255, + 0, + 255)); - FillPrincipalsList(sp); - - ListViewSelectItem(sp->hWndPrincipalsList, - 0); + /* setup the listview control */ + if (sp->hiPrincipals != NULL) + { + ListView_SetImageList(sp->hWndPrincipalsList, + sp->hiPrincipals, + LVSIL_SMALL); + } - /* calculate the columns of the allow/deny checkboxes */ - SetAceCheckListColumns(sp->hAceCheckList, - CLB_ALLOW, - GetDlgItem(hwndDlg, IDC_LABEL_ALLOW)); - SetAceCheckListColumns(sp->hAceCheckList, - CLB_DENY, - GetDlgItem(hwndDlg, IDC_LABEL_DENY)); + GetClientRect(sp->hWndPrincipalsList, + &rcLvClient); + + /* add a column to the list view */ + lvc.mask = LVCF_FMT | LVCF_WIDTH; + lvc.fmt = LVCFMT_LEFT; + lvc.cx = rcLvClient.right; + ListView_InsertColumn(sp->hWndPrincipalsList, + 0, + &lvc); + + ReloadPrincipalsList(sp); - LoadPermissionsList(sp, - NULL, - SI_ACCESS_GENERAL | - ((sp->ObjectInfo.dwFlags & SI_CONTAINER) ? SI_ACCESS_CONTAINER : 0), - &sp->DefaultAccess); + FillPrincipalsList(sp); + + ListViewSelectItem(sp->hWndPrincipalsList, + 0); - /* hide controls in case the flags aren't present */ - if (sp->ObjectInfo.dwFlags & SI_ADVANCED) - { - /* editing the permissions is least the user can do when - the advanced button is showed */ - sp->ObjectInfo.dwFlags |= SI_EDIT_PERMS; + /* calculate the columns of the allow/deny checkboxes */ + SetAceCheckListColumns(sp->hAceCheckList, + CLB_ALLOW, + GetDlgItem(hwndDlg, IDC_LABEL_ALLOW)); + SetAceCheckListColumns(sp->hAceCheckList, + CLB_DENY, + GetDlgItem(hwndDlg, IDC_LABEL_DENY)); + + LoadPermissionsList(sp, + NULL, + SI_ACCESS_GENERAL | + ((sp->ObjectInfo.dwFlags & SI_CONTAINER) ? SI_ACCESS_CONTAINER : 0), + &sp->DefaultAccess); + + /* hide controls in case the flags aren't present */ + if (sp->ObjectInfo.dwFlags & SI_ADVANCED) + { + /* editing the permissions is least the user can do when + the advanced button is showed */ + sp->ObjectInfo.dwFlags |= SI_EDIT_PERMS; + } + else + { + ShowWindow(sp->hBtnAdvanced, + SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_LABEL_ADVANCED), + SW_HIDE); + } + + /* enable quicksearch for the permissions checklist control */ + SendMessage(sp->hAceCheckList, + CLM_ENABLEQUICKSEARCH, + TRUE, + 0); + + UpdateControlStates(sp); } - else - { - ShowWindow(sp->hBtnAdvanced, - SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_LABEL_ADVANCED), - SW_HIDE); - } - - /* enable quicksearch for the permissions checklist control */ - SendMessage(sp->hAceCheckList, - CLM_ENABLEQUICKSEARCH, - TRUE, - 0); - UpdateControlStates(sp); + Ret = TRUE; + break; } - break; } } - return 0; + return Ret; } _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-11-28 01:09:27 UTC (rev 19714) +++ trunk/reactos/lib/aclui/checklist.c 2005-11-28 01:10:49 UTC (rev 19715) @@ -1498,14 +1498,17 @@ { hdc = (wParam != 0 ? (HDC)wParam : BeginPaint(hwnd, &ps)); - PaintControl(infoPtr, - hdc, - &rcUpdate); + if (hdc != NULL) + { + PaintControl(infoPtr, + hdc, + &rcUpdate); - if (wParam == 0) - { - EndPaint(hwnd, - &ps); + if (wParam == 0) + { + EndPaint(hwnd, + &ps); + } } } break; _____ Modified: trunk/reactos/lib/aclui/misc.c --- trunk/reactos/lib/aclui/misc.c 2005-11-28 01:09:27 UTC (rev 19714) +++ trunk/reactos/lib/aclui/misc.c 2005-11-28 01:10:49 UTC (rev 19715) @@ -338,7 +338,20 @@ } GlobalUnlock(stm.hGlobal); + + if (SUCCEEDED(hRet)) + { + /* return S_OK instead of possible other success codes if + everything went well */ + hRet = S_OK; + } } + else + { + /* unable to translate the selection pointer handle, indicate + failure */ + hRet = E_FAIL; + } ReleaseStgMedium(&stm); }

1 0

[turner] 19714: fix wallpaper style center and implement tile.
by turner＠svn.reactos.com 28 Nov '05

28 Nov '05

fix wallpaper style center and implement tile. Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-11-27 23:36:55 UTC (rev 19713) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-11-28 01:09:27 UTC (rev 19714) @@ -1227,35 +1227,118 @@ sz.cx = DeskWin->WindowRect.right - DeskWin->WindowRect.left; sz.cy = DeskWin->WindowRect.bottom - DeskWin->WindowRect.top; - - - x = (sz.cx / 2) - (WinSta->cxWallpaper / 2); - y = (sz.cy / 2) - (WinSta->cyWallpaper / 2); - + + if(WinSta->WallpaperMode == wmStretch || + WinSta->WallpaperMode == wmTile) + { + x = 0; + y = 0; + } + else + { + x = (sz.cx / 2) - (WinSta->cxWallpaper / 2); + y = (sz.cy / 2) - (WinSta->cyWallpaper / 2); + } + hWallpaperDC = NtGdiCreateCompatibleDC(hDC); if(hWallpaperDC != NULL) { HBITMAP hOldBitmap; - + if(x > 0 || y > 0) { - /* FIXME - clip out the bitmap */ - PreviousBrush = NtGdiSelectObject(hDC, DesktopBrush); - NtGdiPatBlt(hDC, Rect.left, Rect.top, Rect.right, Rect.bottom, PATCOPY); - NtGdiSelectObject(hDC, PreviousBrush); + /* FIXME - clip out the bitmap + can be replaced with "NtGdiPatBlt(hDC, x, y, WinSta->cxWallpaper, WinSta->cyWallpaper, PATCOPY | DSTINVERT);" + once we support DSTINVERT */ + PreviousBrush = NtGdiSelectObject(hDC, DesktopBrush); + NtGdiPatBlt(hDC, Rect.left, Rect.top, Rect.right, Rect.bottom, PATCOPY); + NtGdiSelectObject(hDC, PreviousBrush); } + + //Do not fill the background after it is painted no matter the size of the picture + doPatBlt = FALSE; + + hOldBitmap = NtGdiSelectObject(hWallpaperDC, WinSta->hbmWallpaper); + + if(WinSta->WallpaperMode == wmStretch) + { +#if 0 //Broken Stretch Code + /* Fix me, stretch the bitmap to fit the screen. I'm not smart enough to do this :( */ + BITMAPINFO bmINFO; + LPVOID pBits; + bmINFO.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + /* Get bits */ + NtGdiGetDIBits(hDC, + WinSta->hbmWallpaper, + 0, + WinSta->cyWallpaper, + NULL, // what goes here? + &bmINFO, + DIB_RGB_COLORS); + + bmINFO.bmiHeader.biCompression = BI_RGB; + + pBits = ExAllocatePool(PagedPool,bmINFO.bmiHeader.biSizeImage); + + if(pBits == NULL) + { + doPatBlt = TRUE; + } + else + { + + NtGdiGetDIBits(hDC, + WinSta->hbmWallpaper, + 0, + WinSta->cyWallpaper, + (LPVOID)pBits, // what goes here? + &bmINFO, + DIB_RGB_COLORS); + DPRINT1("Before Draw\n"); + + /* Stretch it to fit the screen */ + NtGdiStretchDIBits(hDC, + 0, + 0, + Rect.right, + Rect.bottom, + 0, + 0, + WinSta->cxWallpaper, + WinSta->cyWallpaper, + (LPVOID)pBits, // get this from NtGdiGetDiBits? + &bmINFO, // get this from NtGdiGetDiBits? + DIB_RGB_COLORS, + SRCCOPY); + ExFreePool(pBits); + } +#else + /* Draw nothing */ + doPatBlt = TRUE; +#endif //Broken Stretch Code + } + else if(WinSta->WallpaperMode == wmTile) + { + + for(y = 0; y < Rect.bottom; y += WinSta->cyWallpaper) + { + for(x = 0; x < Rect.right; x += WinSta->cxWallpaper) + { + NtGdiBitBlt(hDC, x, y, WinSta->cxWallpaper, WinSta->cyWallpaper, hWallpaperDC, 0, 0, SRCCOPY); + } + } + } else - doPatBlt = FALSE; - - hOldBitmap = NtGdiSelectObject(hWallpaperDC, WinSta->hbmWallpaper); - NtGdiBitBlt(hDC, x, y, WinSta->cxWallpaper, WinSta->cyWallpaper, hWallpaperDC, 0, 0, SRCCOPY); - NtGdiSelectObject(hWallpaperDC, hOldBitmap); - + { + NtGdiBitBlt(hDC, x, y, WinSta->cxWallpaper, WinSta->cyWallpaper, hWallpaperDC, 0, 0, SRCCOPY); + } + NtGdiSelectObject(hWallpaperDC, hOldBitmap); NtGdiDeleteDC(hWallpaperDC); } } } + /* Back ground is set to none, clear the screen */ if (doPatBlt) { PreviousBrush = NtGdiSelectObject(hDC, DesktopBrush);

1 0

[arty] 19713: Case changes for file names to unbreak unix build.
by arty＠svn.reactos.com 27 Nov '05

27 Nov '05

Case changes for file names to unbreak unix build. Deleted: trunk/reactos/lib/cpl/intl/Es.rc Added: trunk/reactos/lib/cpl/intl/es.rc Deleted: trunk/reactos/lib/cpl/ncpa/Es.rc Added: trunk/reactos/lib/cpl/ncpa/es.rc _____ Deleted: trunk/reactos/lib/cpl/intl/Es.rc --- trunk/reactos/lib/cpl/intl/Es.rc 2005-11-27 23:23:38 UTC (rev 19712) +++ trunk/reactos/lib/cpl/intl/Es.rc 2005-11-27 23:36:55 UTC (rev 19713) @@ -1,88 +0,0 @@ -/* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ -/* - *Spanish Language resource file - *ReactOs (c) 2005 Samuel Serapi¾n Vega - */ - -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH - -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 -END - - -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Numeros" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 -END - - -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Moneda" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 -END - - -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Tiempo" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Ejemplo de Apariencia", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE - LTEXT "Ejemplo de tiempo:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "&Formato de Tiempo:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "&Separador de Tiempo:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "SÝmbolo A&M:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "SÝmbolo &PM:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE - LTEXT "Formato de Notaci¾n del Tiempo\n\n" - "h = hora m = minuto s = segundo t = am ¾ pm\n\n" - "h = 12 houras\n" - "H = 24 houras\n\n" - "hh, mm, ss = cero inicial\n" - "h, m, s = sin cero inicial", - -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP -END - - -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Dia" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 5",-1,73,74,90,8 -END - - -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Localidad" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Lenguaje Primario", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Seleccione el lenguaje primario y la regi¾n que desea usar:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL -END - - -STRINGTABLE -BEGIN - IDS_CPLNAME "Opciones Regionales" - IDS_CPLDESCRIPTION "Seleccione lenguaje y formato numerio, moneda, hora y fecha." -END _____ Added: trunk/reactos/lib/cpl/intl/es.rc --- trunk/reactos/lib/cpl/intl/es.rc 2005-11-27 23:23:38 UTC (rev 19712) +++ trunk/reactos/lib/cpl/intl/es.rc 2005-11-27 23:36:55 UTC (rev 19713) @@ -0,0 +1,88 @@ +/* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 1",-1,73,74,90,8 +END + + +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Numeros" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 2",-1,73,74,90,8 +END + + +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Moneda" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 3",-1,73,74,90,8 +END + + +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tiempo" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ejemplo de Apariencia", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Ejemplo de tiempo:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Formato de Tiempo:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "&Separador de Tiempo:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "SÝmbolo A&M:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "SÝmbolo &PM:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + LTEXT "Formato de Notaci¾n del Tiempo\n\n" + "h = hora m = minuto s = segundo t = am ¾ pm\n\n" + "h = 12 houras\n" + "H = 24 houras\n\n" + "hh, mm, ss = cero inicial\n" + "h, m, s = sin cero inicial", + -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP +END + + +IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Dia" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 5",-1,73,74,90,8 +END + + +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Localidad" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Lenguaje Primario", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Seleccione el lenguaje primario y la regi¾n que desea usar:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "Opciones Regionales" + IDS_CPLDESCRIPTION "Seleccione lenguaje y formato numerio, moneda, hora y fecha." +END _____ Deleted: trunk/reactos/lib/cpl/ncpa/Es.rc --- trunk/reactos/lib/cpl/ncpa/Es.rc 2005-11-27 23:23:38 UTC (rev 19712) +++ trunk/reactos/lib/cpl/ncpa/Es.rc 2005-11-27 23:36:55 UTC (rev 19713) @@ -1,93 +0,0 @@ -/* - *Spanish Language resource file - *ReactOs (c) 2005 Samuel Serapi¾n Vega - */ - - -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH - -IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 -STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Propiedades de la Red" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Adaptadores de la red",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&A±adir",IDC_ADD,9,100,60,14 - PUSHBUTTON "&Remover",IDC_REMOVE,72,100,60,14 - PUSHBUTTON "&Propiedades",IDC_PROPERTIES,179,100,60,14 -END - -IDD_NETPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 -STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Connectarse Usando:", -1, 9,9,217,8 - EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP - PUSHBUTTON "&Configurar", IDC_CONFIGURE, 189, 38, 50, 14 - LTEXT "Los componentes marcados son utilizados por esta conecci¾n:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD - PUSHBUTTON "&Instalar", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 130, 65, 14 - GROUPBOX "Descripci¾n", -1, 9, 153, 230, 46, BS_GROUPBOX - LTEXT "La Descripci¾n del componente va aqui...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Ense±ar icono de estatus cuando conectado", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP -END - - -IDD_CARDPROPERTIES DIALOG DISCARDABLE 0, 0, 200,180 -STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Coneci¾n", -1, 9, 8, 182, 58, BS_GROUPBOX - LTEXT "Estatus:", -1, 19, 20, 60, 8 - LTEXT "Duraci¾n:", -1, 19, 34, 60, 8 - LTEXT "Velocidad:", -1, 19, 48, 60, 8 - GROUPBOX "Actividad", -1, 9, 74, 182, 70, BS_GROUPBOX - RTEXT "Enviado", -1, 26, 90, 60, 8 - ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 - ICON IDI_NETSTAT, -1, 110, 85, 18, 20 - ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 - LTEXT "Recibido", -1, 149, 90, 37, 8 - LTEXT "Paquetes:", -1, 17, 115, 32, 8 - RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 - ICON IDI_VERTICAL, -1, 110, 108, 18, 20 - RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 10, 150, 50, 14 - PUSHBUTTON "&Desabilitar", IDC_ENDISABLE, 66, 150, 50, 14 -END - -IDD_TCPIPPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 -STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Se pueden asignar las propiedades de IP automaticamente si su red apoya esta capacidad. Si no, debe contactar su administrador de red para los ajustes necesarios.", -1, 9, 9, 228, 27 - CONTROL "Obtener direcci¾n IP automaticamente", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 - GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX - CONTROL "&Usar la siguiente Direcci¾n IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 - LTEXT "Direcci¾n IP:", -1, 14, 75, 135, 8 - CONTROL "",IDC_IPADDR,"SysIPAddress32",0,150,75-2,80,12 - LTEXT "Subnet mask:", -1, 14, 90, 135, 8 - CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",0,150,90-2,80,12 - LTEXT "Default gateway:", -1, 14, 105, 135, 8 - CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",0,150,105-2,80,12 - CONTROL "Obtener direcci¾n del servidor DNS automaticamente", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12 - GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX - CONTROL "&Usar las siguiente direcciones de DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 - LTEXT "Servidor DNS Preferido:", -1, 14, 171, 135, 8 - CONTROL "",IDC_DNS1,"SysIPAddress32",0,150,171-2,80,12 - LTEXT "Servidor DNS Alterno:", -1, 14, 186, 135, 8 - CONTROL "",IDC_DNS2,"SysIPAddress32",0,150,186-2,80,12 - PUSHBUTTON "&Avanzado", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP -} - - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "Propiedades de la Red" - IDS_CPLSYSTEMDESCRIPTION "Cambia las opciones de la red." -END _____ Added: trunk/reactos/lib/cpl/ncpa/es.rc --- trunk/reactos/lib/cpl/ncpa/es.rc 2005-11-27 23:23:38 UTC (rev 19712) +++ trunk/reactos/lib/cpl/ncpa/es.rc 2005-11-27 23:36:55 UTC (rev 19713) @@ -0,0 +1,93 @@ +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Propiedades de la Red" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Adaptadores de la red",-1,9,9,217,8 + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&A±adir",IDC_ADD,9,100,60,14 + PUSHBUTTON "&Remover",IDC_REMOVE,72,100,60,14 + PUSHBUTTON "&Propiedades",IDC_PROPERTIES,179,100,60,14 +END + +IDD_NETPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Connectarse Usando:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Configurar", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Los componentes marcados son utilizados por esta conecci¾n:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + PUSHBUTTON "&Instalar", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Descripci¾n", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "La Descripci¾n del componente va aqui...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Ense±ar icono de estatus cuando conectado", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + + +IDD_CARDPROPERTIES DIALOG DISCARDABLE 0, 0, 200,180 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Coneci¾n", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Estatus:", -1, 19, 20, 60, 8 + LTEXT "Duraci¾n:", -1, 19, 34, 60, 8 + LTEXT "Velocidad:", -1, 19, 48, 60, 8 + GROUPBOX "Actividad", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Enviado", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Recibido", -1, 149, 90, 37, 8 + LTEXT "Paquetes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Desabilitar", IDC_ENDISABLE, 66, 150, 50, 14 +END + +IDD_TCPIPPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Se pueden asignar las propiedades de IP automaticamente si su red apoya esta capacidad. Si no, debe contactar su administrador de red para los ajustes necesarios.", -1, 9, 9, 228, 27 + CONTROL "Obtener direcci¾n IP automaticamente", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX + CONTROL "&Usar la siguiente Direcci¾n IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 + LTEXT "Direcci¾n IP:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",0,150,75-2,80,12 + LTEXT "Subnet mask:", -1, 14, 90, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",0,150,90-2,80,12 + LTEXT "Default gateway:", -1, 14, 105, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",0,150,105-2,80,12 + CONTROL "Obtener direcci¾n del servidor DNS automaticamente", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12 + GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX + CONTROL "&Usar las siguiente direcciones de DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 + LTEXT "Servidor DNS Preferido:", -1, 14, 171, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",0,150,171-2,80,12 + LTEXT "Servidor DNS Alterno:", -1, 14, 186, 135, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",0,150,186-2,80,12 + PUSHBUTTON "&Avanzado", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP +} + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Propiedades de la Red" + IDS_CPLSYSTEMDESCRIPTION "Cambia las opciones de la red." +END

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005