Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 16378: - query the domain server if specified by the server
by weiden＠svn.reactos.com 02 Jul '05

02 Jul '05

- query the domain server if specified by the server - fixed some minor bugs Modified: trunk/reactos/lib/aclui/aclui.c Modified: trunk/reactos/lib/aclui/aclui_De.rc Modified: trunk/reactos/lib/aclui/aclui_En.rc Modified: trunk/reactos/lib/aclui/aclui_Sv.rc Modified: trunk/reactos/lib/aclui/acluilib.h Modified: trunk/reactos/lib/aclui/checklist.c Modified: trunk/reactos/lib/aclui/misc.c Modified: trunk/reactos/lib/aclui/resource.h _____ Modified: trunk/reactos/lib/aclui/aclui.c --- trunk/reactos/lib/aclui/aclui.c 2005-07-02 13:45:23 UTC (rev 16377) +++ trunk/reactos/lib/aclui/aclui.c 2005-07-02 13:49:23 UTC (rev 16378) @@ -140,7 +140,7 @@ DomainNameSize = 0; /* calculate the size of the buffer we need to calculate */ - LookupAccountSid(NULL, /* FIXME */ + LookupAccountSid(sp->ServerName, Sid, NULL, &AccountNameSize, @@ -164,7 +164,7 @@ Sid); LookupResult = ERROR_SUCCESS; - if (!LookupAccountSid(NULL, /* FIXME */ + if (!LookupAccountSid(sp->ServerName, Sid, AceListItem->AccountName, &AccountNameSize, @@ -208,7 +208,7 @@ AceListItem->DisplayString = NULL; /* read the domain of the SID */ - if (OpenLSAPolicyHandle(NULL, /* FIXME */ + if (OpenLSAPolicyHandle(sp->ServerName, POLICY_LOOKUP_NAMES | POLICY_VIEW_LOCAL_INFORMATION, &LsaHandle)) { @@ -310,6 +310,7 @@ default: { + DPRINT("Unhandled SID type: 0x%x\n", Names->Use); break; } } @@ -406,11 +407,37 @@ static VOID UpdateControlStates(IN PSECURITY_PAGE sp) { - BOOL UserOrGroupSelected; + PACE_LISTITEM Selected = (PACE_LISTITEM)ListViewGetSelectedItemData(sp->hWndAceList); + + EnableWindow(sp->hBtnRemove, Selected != NULL); + EnableWindow(sp->hAceCheckList, Selected != NULL); - UserOrGroupSelected = (ListViewGetSelectedItemData(sp->hWndAceList) != 0); + if (Selected != NULL) + { + LPWSTR szLabel; - EnableWindow(sp->hBtnRemove, UserOrGroupSelected); + LoadAndFormatString(hDllInstance, + IDS_PERMISSIONS_FOR, + &szLabel, + Selected->AccountName); + + SetWindowText(sp->hPermissionsForLabel, + szLabel); + + LocalFree((HLOCAL)szLabel); + + /* FIXME - update the checkboxes */ + } + else + { + SetWindowText(sp->hPermissionsForLabel, + NULL); + + SendMessage(sp->hAceCheckList, + CLM_CLEARCHECKBOXES, + 0, + 0); + } } static UINT CALLBACK @@ -555,7 +582,14 @@ { case LVN_ITEMCHANGED: { - UpdateControlStates(sp); + LPNMLISTVIEW pnmv = (LPNMLISTVIEW)lParam; + + if ((pnmv->uChanged & LVIF_STATE) && + ((pnmv->uOldState & (LVIS_FOCUSED | LVIS_SELECTED)) || + (pnmv->uNewState & (LVIS_FOCUSED | LVIS_SELECTED)))) + { + UpdateControlStates(sp); + } break; } } @@ -575,7 +609,18 @@ sp->hWnd = hwndDlg; sp->hWndAceList = GetDlgItem(hwndDlg, IDC_ACELIST); sp->hBtnRemove = GetDlgItem(hwndDlg, IDC_ACELIST_REMOVE); + 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, @@ -617,13 +662,40 @@ CLB_DENY, GetDlgItem(hwndDlg, IDC_LABEL_DENY)); - /* FIXME - hide controls in case the flags aren't present */ - 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) + { + WCHAR szSpecialPermissions[255]; + + /* editing the permissions is least the user can do when + the advanced button is showed */ + sp->ObjectInfo.dwFlags |= SI_EDIT_PERMS; + + if (LoadString(hDllInstance, + IDS_SPECIAL_PERMISSIONS, + szSpecialPermissions, + sizeof(szSpecialPermissions) / sizeof(szSpecialPermissions[0]))) + { + /* add the special permissions check item */ + sp->SpecialPermCheckIndex = (INT)SendMessage(sp->hAceCheckList, + CLM_ADDITEM, + CIS_DISABLED | CIS_NONE, + (LPARAM)szSpecialPermissions); + } + } + else + { + ShowWindow(sp->hBtnAdvanced, + SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_LABEL_ADVANCED), + SW_HIDE); + } } break; } @@ -654,7 +726,10 @@ return NULL; } - /* get the object information from the server interface */ + /* get the object information from the server. Zero the structure before + because some applications seem to return SUCCESS but only seem to set the + fields they care about. */ + ZeroMemory(&ObjectInfo, sizeof(ObjectInfo)); hRet = psi->lpVtbl->GetObjectInformation(psi, &ObjectInfo); if(FAILED(hRet)) @@ -694,13 +769,19 @@ psp.lParam = (LPARAM)sPage; psp.pfnCallback = SecurityPageCallback; - if((ObjectInfo.dwFlags & SI_PAGE_TITLE) && - ObjectInfo.pszPageTitle != NULL && ObjectInfo.pszPageTitle[0] != L'\0') + if(ObjectInfo.dwFlags & SI_PAGE_TITLE) { - /* Set the page title if the flag is present and the string isn't empty */ psp.pszTitle = ObjectInfo.pszPageTitle; - psp.dwFlags |= PSP_USETITLE; + + if (psp.pszTitle != NULL) + { + psp.dwFlags |= PSP_USETITLE; + } } + else + { + psp.pszTitle = NULL; + } /* NOTE: the SECURITY_PAGE structure will be freed by the property page callback! */ @@ -734,7 +815,10 @@ return FALSE; } - /* get the object information from the server interface */ + /* get the object information from the server. Zero the structure before + because some applications seem to return SUCCESS but only seem to set the + fields they care about. */ + ZeroMemory(&ObjectInfo, sizeof(ObjectInfo)); hRet = psi->lpVtbl->GetObjectInformation(psi, &ObjectInfo); if(FAILED(hRet)) @@ -757,26 +841,16 @@ psh.dwFlags = PSH_DEFAULT; psh.hwndParent = hwndOwner; psh.hInstance = hDllInstance; - if((ObjectInfo.dwFlags & SI_PAGE_TITLE) && - ObjectInfo.pszPageTitle != NULL && ObjectInfo.pszPageTitle[0] != L'\0') - { - /* Set the page title if the flag is present and the string isn't empty */ - psh.pszCaption = ObjectInfo.pszPageTitle; - psh.dwFlags |= PSH_PROPTITLE; - lpCaption = NULL; - } - else - { - /* Set the page title to the object name, make sure the format string - has "%1" NOT "%s" because it uses FormatMessage() to automatically - allocate the right amount of memory. */ - LoadAndFormatString(hDllInstance, - IDS_PSP_TITLE, - &lpCaption, - ObjectInfo.pszObjectName); - psh.pszCaption = lpCaption; - } + /* Set the page title to the object name, make sure the format string + has "%1" NOT "%s" because it uses FormatMessage() to automatically + allocate the right amount of memory. */ + LoadAndFormatString(hDllInstance, + IDS_PSP_TITLE, + &lpCaption, + ObjectInfo.pszObjectName); + psh.pszCaption = lpCaption; + psh.nPages = sizeof(hPages) / sizeof(HPROPSHEETPAGE); psh.nStartPage = 0; psh.phpage = hPages; _____ Modified: trunk/reactos/lib/aclui/aclui_De.rc --- trunk/reactos/lib/aclui/aclui_De.rc 2005-07-02 13:45:23 UTC (rev 16377) +++ trunk/reactos/lib/aclui/aclui_De.rc 2005-07-02 13:49:23 UTC (rev 16378) @@ -9,13 +9,18 @@ CONTROL "", IDC_ACELIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE PUSHBUTTON "&Hinzuf³gen...", IDC_ACELIST_ADD, 116, 87, 50, 14 PUSHBUTTON "&Entfernen", IDC_ACELIST_REMOVE, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX LTEXT "Erlauben", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER LTEXT "Verbieten", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "Klicken Sie auf \"Erweitert\", um spezielle Berechtigungen oder erweiterte Einstellungen anzuzeigen.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "Er&weitert", IDC_ADVANCED, 165, 194, 55, 14 END STRINGTABLE DISCARDABLE { IDS_PSP_TITLE "Berechtigungen f³r %1" IDS_UNKNOWN "Unbekannt" + IDS_SPECIAL_PERMISSIONS "Spezielle Berechtigungen" + IDS_PERMISSIONS_FOR "Berechtigungen f³r %1" } _____ Modified: trunk/reactos/lib/aclui/aclui_En.rc --- trunk/reactos/lib/aclui/aclui_En.rc 2005-07-02 13:45:23 UTC (rev 16377) +++ trunk/reactos/lib/aclui/aclui_En.rc 2005-07-02 13:49:23 UTC (rev 16378) @@ -9,14 +9,19 @@ CONTROL "", IDC_ACELIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE PUSHBUTTON "A&dd...", IDC_ACELIST_ADD, 116, 87, 50, 14 PUSHBUTTON "&Remove", IDC_ACELIST_REMOVE, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX LTEXT "Allow", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER LTEXT "Deny", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "For special permissions or for advanced settings, click Advanced.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "Ad&vanced", IDC_ADVANCED, 165, 194, 55, 14 END STRINGTABLE DISCARDABLE { IDS_PSP_TITLE "Permissions for %1" IDS_UNKNOWN "Unknown" + IDS_SPECIAL_PERMISSIONS "Special Permissions" + IDS_PERMISSIONS_FOR "Permissions for %1" } _____ Modified: trunk/reactos/lib/aclui/aclui_Sv.rc --- trunk/reactos/lib/aclui/aclui_Sv.rc 2005-07-02 13:45:23 UTC (rev 16377) +++ trunk/reactos/lib/aclui/aclui_Sv.rc 2005-07-02 13:49:23 UTC (rev 16378) @@ -27,14 +27,19 @@ CONTROL "", IDC_ACELIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE PUSHBUTTON "&Lõgg till...", IDC_ACELIST_ADD, 116, 87, 50, 14 PUSHBUTTON "&Ta bort", IDC_ACELIST_REMOVE, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX LTEXT "TillÕt", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER LTEXT "Neka", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "For special permissions or for advanced settings, click Advanced.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "Ad&vanced", IDC_ADVANCED, 165, 194, 55, 14 END STRINGTABLE DISCARDABLE { IDS_PSP_TITLE "Beh÷righeter f÷r %1" IDS_UNKNOWN "Unknown" + IDS_SPECIAL_PERMISSIONS "Special Permissions" + IDS_PERMISSIONS_FOR "Permissions for %1" } _____ Modified: trunk/reactos/lib/aclui/acluilib.h --- trunk/reactos/lib/aclui/acluilib.h 2005-07-02 13:45:23 UTC (rev 16377) +++ trunk/reactos/lib/aclui/acluilib.h 2005-07-02 13:49:23 UTC (rev 16378) @@ -34,11 +34,15 @@ { HWND hWnd; HWND hBtnRemove; + HWND hBtnAdvanced; HWND hAceCheckList; + HWND hPermissionsForLabel; /* Main ACE List */ HWND hWndAceList; PACE_LISTITEM AceListHead; + + INT SpecialPermCheckIndex; HIMAGELIST hiUsrs; @@ -46,12 +50,14 @@ SI_OBJECT_INFO ObjectInfo; SI_ACCESS DefaultAccess; + + LPWSTR ServerName; } SECURITY_PAGE, *PSECURITY_PAGE; /* MISC ***********************************************************************/ BOOL -OpenLSAPolicyHandle(IN WCHAR *SystemName, +OpenLSAPolicyHandle(IN LPWSTR SystemName, IN ACCESS_MASK DesiredAccess, OUT PLSA_HANDLE PolicyHandle); @@ -87,6 +93,8 @@ #define CLM_CLEAR (WM_USER + 4) #define CLM_SETCHECKBOXCOLUMN (WM_USER + 5) #define CLM_GETCHECKBOXCOLUMN (WM_USER + 6) +#define CLM_CLEARCHECKBOXES (WM_USER + 7) +#define CLM_SETITEMSTATE (WM_USER + 8) BOOL RegisterCheckListControl(HINSTANCE hInstance); _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-07-02 13:45:23 UTC (rev 16377) +++ trunk/reactos/lib/aclui/checklist.c 2005-07-02 13:49:23 UTC (rev 16378) @@ -123,20 +123,23 @@ static PCHECKITEM AddCheckItem(IN PCHECKLISTWND infoPtr, IN LPWSTR Name, - IN DWORD State) + IN DWORD State, + OUT INT *Index) { PCHECKITEM CurItem; + INT i; PCHECKITEM *PrevPtr = &infoPtr->CheckItemListHead; PCHECKITEM Item = HeapAlloc(GetProcessHeap(), 0, sizeof(CHECKITEM) + (wcslen(Name) * sizeof(WCHAR))); if (Item != NULL) { - for (CurItem = infoPtr->CheckItemListHead; + for (CurItem = infoPtr->CheckItemListHead, i = 0; CurItem != NULL; CurItem = CurItem->Next) { PrevPtr = &CurItem->Next; + i++; } Item->Next = NULL; @@ -146,11 +149,36 @@ *PrevPtr = Item; infoPtr->CheckItemCount++; + + if (Index != NULL) + { + *Index = i; + } } return Item; } +static UINT +ClearCheckBoxes(IN PCHECKLISTWND infoPtr) +{ + PCHECKITEM CurItem; + UINT nUpdated = 0; + + for (CurItem = infoPtr->CheckItemListHead; + CurItem != NULL; + CurItem = CurItem->Next) + { + if (CurItem->State & (CIS_ALLOW | CIS_DENY)) + { + CurItem->State &= ~(CIS_ALLOW | CIS_DENY); + nUpdated++; + } + } + + return nUpdated; +} + static VOID UpdateControl(IN PCHECKLISTWND infoPtr, IN BOOL AllowChangeStyle) @@ -511,14 +539,21 @@ case CLM_ADDITEM: { - Ret = (AddCheckItem(infoPtr, - (LPWSTR)lParam, - (DWORD)wParam) != NULL); - if (Ret) + INT Index = -1; + PCHECKITEM Item = AddCheckItem(infoPtr, + (LPWSTR)lParam, + (DWORD)wParam, + &Index); + if (Item != NULL) { UpdateControl(infoPtr, TRUE); + Ret = (LRESULT)Index; } + else + { + Ret = (LRESULT)-1; + } break; } @@ -543,6 +578,29 @@ break; } + case CLM_SETITEMSTATE: + { + PCHECKITEM Item = FindCheckItemByIndex(infoPtr, + wParam); + if (Item != NULL) + { + DWORD OldState = Item->State; + Item->State = (DWORD)lParam & CIS_MASK; + + if (Item->State != OldState) + { + UpdateControl(infoPtr, + TRUE); + } + Ret = TRUE; + } + else + { + Ret = FALSE; + } + break; + } + case CLM_GETITEMCOUNT: { Ret = infoPtr->CheckItemCount; @@ -570,6 +628,17 @@ break; } + case CLM_CLEARCHECKBOXES: + { + Ret = (LRESULT)ClearCheckBoxes(infoPtr); + if (Ret) + { + UpdateControl(infoPtr, + TRUE); + } + break; + } + case WM_SETFONT: { Ret = (LRESULT)RetChangeControlFont(infoPtr, @@ -674,7 +743,6 @@ case WM_LBUTTONDOWN: case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: - case WM_XBUTTONDOWN: { if (!infoPtr->HasFocus && IsWindowEnabled(hwnd)) { _____ Modified: trunk/reactos/lib/aclui/misc.c --- trunk/reactos/lib/aclui/misc.c 2005-07-02 13:45:23 UTC (rev 16377) +++ trunk/reactos/lib/aclui/misc.c 2005-07-02 13:49:23 UTC (rev 16378) @@ -127,7 +127,7 @@ } BOOL -OpenLSAPolicyHandle(IN WCHAR *SystemName, +OpenLSAPolicyHandle(IN LPWSTR SystemName, IN ACCESS_MASK DesiredAccess, OUT PLSA_HANDLE PolicyHandle) { _____ Modified: trunk/reactos/lib/aclui/resource.h --- trunk/reactos/lib/aclui/resource.h 2005-07-02 13:45:23 UTC (rev 16377) +++ trunk/reactos/lib/aclui/resource.h 2005-07-02 13:49:23 UTC (rev 16378) @@ -9,11 +9,16 @@ #define IDC_ACE_CHECKLIST 1004 #define IDC_LABEL_ALLOW 1005 #define IDC_LABEL_DENY 1006 +#define IDC_ADVANCED 1007 +#define IDC_LABEL_ADVANCED 1008 +#define IDC_LABEL_PERMISSIONS_FOR 1009 #define IDI_DEVMGR 100 #define IDS_PSP_TITLE 1001 #define IDS_UNKNOWN 1002 +#define IDS_SPECIAL_PERMISSIONS 1003 +#define IDS_PERMISSIONS_FOR 1004 #define IDB_USRGRPIMAGES 1001

1 0

[navaraf] 16377: Use RtlExitUserThread instead of NtTerminateThread, so the stack is properly freed.
by navaraf＠svn.reactos.com 02 Jul '05

02 Jul '05

Use RtlExitUserThread instead of NtTerminateThread, so the stack is properly freed. Modified: trunk/reactos/subsys/csrss/api/wapi.c _____ Modified: trunk/reactos/subsys/csrss/api/wapi.c --- trunk/reactos/subsys/csrss/api/wapi.c 2005-07-02 13:42:43 UTC (rev 16376) +++ trunk/reactos/subsys/csrss/api/wapi.c 2005-07-02 13:45:23 UTC (rev 16377) @@ -165,7 +165,7 @@ /* Close the port and exit the thread */ NtClose(ServerPort); - NtTerminateThread(NtCurrentThread(), STATUS_SUCCESS); + RtlExitUserThread(STATUS_SUCCESS); } /**********************************************************************

1 0

[navaraf] 16376: Add prototypes for RtlExitUserThread and RtlInitializeContext.
by navaraf＠svn.reactos.com 02 Jul '05

02 Jul '05

Add prototypes for RtlExitUserThread and RtlInitializeContext. Modified: trunk/reactos/include/ndk/rtlfuncs.h _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-07-02 01:34:18 UTC (rev 16375) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-07-02 13:42:43 UTC (rev 16376) @@ -1075,6 +1075,20 @@ STDCALL RtlDestroyProcessParameters(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters); +NTSTATUS +STDCALL +RtlExitUserThread(NTSTATUS Status); + +NTSTATUS +STDCALL +RtlInitializeContext( + IN HANDLE ProcessHandle, + OUT PCONTEXT ThreadContext, + IN PVOID ThreadStartParam OPTIONAL, + IN PTHREAD_START_ROUTINE ThreadStartAddress, + IN PINITIAL_TEB InitialTeb +); + PRTL_USER_PROCESS_PARAMETERS STDCALL RtlNormalizeProcessParams(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters);

1 0

[weiden] 16375: enumerate the permission names and display them
by weiden＠svn.reactos.com 02 Jul '05

02 Jul '05

enumerate the permission names and display them Modified: trunk/reactos/lib/aclui/aclui.c Modified: trunk/reactos/lib/aclui/aclui_De.rc Modified: trunk/reactos/lib/aclui/aclui_En.rc Modified: trunk/reactos/lib/aclui/aclui_Sv.rc Modified: trunk/reactos/lib/aclui/acluilib.h Modified: trunk/reactos/lib/aclui/checklist.c Modified: trunk/reactos/lib/aclui/resource.h _____ Modified: trunk/reactos/lib/aclui/aclui.c --- trunk/reactos/lib/aclui/aclui.c 2005-07-01 23:33:34 UTC (rev 16374) +++ trunk/reactos/lib/aclui/aclui.c 2005-07-02 01:34:18 UTC (rev 16375) @@ -460,7 +460,78 @@ pt.x); } +static VOID +LoadPermissionsList(IN PSECURITY_PAGE sp, + IN GUID *GuidObjectType, + IN DWORD dwFlags, + OUT SI_ACCESS *DefaultAccess) +{ + HRESULT hRet; + PSI_ACCESS AccessList; + ULONG nAccessList, DefaultAccessIndex; + + /* clear the permissions list */ + + SendMessage(sp->hAceCheckList, + CLM_CLEAR, + 0, + 0); + + /* query the access rights from the server */ + hRet = sp->psi->lpVtbl->GetAccessRights(sp->psi, + GuidObjectType, + dwFlags, + &AccessList, + &nAccessList, + &DefaultAccessIndex); + if (SUCCEEDED(hRet) && nAccessList != 0) + { + LPCWSTR NameStr; + PSI_ACCESS CurAccess, LastAccess; + WCHAR NameBuffer[MAX_PATH]; + + /* save the default access rights to be used when adding ACEs later */ + if (DefaultAccess != NULL) + { + *DefaultAccess = AccessList[DefaultAccessIndex]; + } + + LastAccess = AccessList + nAccessList; + for (CurAccess = &AccessList[0]; + CurAccess != LastAccess; + CurAccess++) + { + if (CurAccess->dwFlags & dwFlags) + { + /* get the permission name, load it from a string table if necessary */ + if (IS_INTRESOURCE(CurAccess->pszName)) + { + if (!LoadString(sp->ObjectInfo.hInstance, + (UINT)((ULONG_PTR)CurAccess->pszName), + NameBuffer, + sizeof(NameBuffer) / sizeof(NameBuffer[0]))) + { + LoadString(hDllInstance, + IDS_UNKNOWN, + NameBuffer, + sizeof(NameBuffer) / sizeof(NameBuffer[0])); + } + NameStr = NameBuffer; + } + else + { + NameStr = CurAccess->pszName; + } + SendMessage(sp->hAceCheckList, + CLM_ADDITEM, + CIS_DISABLED | CIS_NONE, + (LPARAM)NameStr); + } + } + } +} + static INT_PTR CALLBACK SecurityPageProc(IN HWND hwndDlg, IN UINT uMsg, @@ -547,6 +618,12 @@ GetDlgItem(hwndDlg, IDC_LABEL_DENY)); /* FIXME - hide controls in case the flags aren't present */ + + LoadPermissionsList(sp, + NULL, + SI_ACCESS_GENERAL | + ((sp->ObjectInfo.dwFlags & SI_CONTAINER) ? SI_ACCESS_CONTAINER : 0), + &sp->DefaultAccess); } break; } @@ -607,6 +684,8 @@ sPage->psi = psi; sPage->ObjectInfo = ObjectInfo; + ZeroMemory(&psp, sizeof(psp)); + psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwFlags = PSP_USECALLBACK; psp.hInstance = hDllInstance; @@ -683,6 +762,7 @@ { /* Set the page title if the flag is present and the string isn't empty */ psh.pszCaption = ObjectInfo.pszPageTitle; + psh.dwFlags |= PSH_PROPTITLE; lpCaption = NULL; } else _____ Modified: trunk/reactos/lib/aclui/aclui_De.rc --- trunk/reactos/lib/aclui/aclui_De.rc 2005-07-01 23:33:34 UTC (rev 16374) +++ trunk/reactos/lib/aclui/aclui_De.rc 2005-07-02 01:34:18 UTC (rev 16375) @@ -17,4 +17,5 @@ STRINGTABLE DISCARDABLE { IDS_PSP_TITLE "Berechtigungen f³r %1" + IDS_UNKNOWN "Unbekannt" } _____ Modified: trunk/reactos/lib/aclui/aclui_En.rc --- trunk/reactos/lib/aclui/aclui_En.rc 2005-07-01 23:33:34 UTC (rev 16374) +++ trunk/reactos/lib/aclui/aclui_En.rc 2005-07-02 01:34:18 UTC (rev 16375) @@ -17,5 +17,6 @@ STRINGTABLE DISCARDABLE { IDS_PSP_TITLE "Permissions for %1" + IDS_UNKNOWN "Unknown" } _____ Modified: trunk/reactos/lib/aclui/aclui_Sv.rc --- trunk/reactos/lib/aclui/aclui_Sv.rc 2005-07-01 23:33:34 UTC (rev 16374) +++ trunk/reactos/lib/aclui/aclui_Sv.rc 2005-07-02 01:34:18 UTC (rev 16375) @@ -35,5 +35,6 @@ STRINGTABLE DISCARDABLE { IDS_PSP_TITLE "Beh÷righeter f÷r %1" + IDS_UNKNOWN "Unknown" } _____ Modified: trunk/reactos/lib/aclui/acluilib.h --- trunk/reactos/lib/aclui/acluilib.h 2005-07-01 23:33:34 UTC (rev 16374) +++ trunk/reactos/lib/aclui/acluilib.h 2005-07-02 01:34:18 UTC (rev 16375) @@ -44,6 +44,8 @@ LPSECURITYINFO psi; SI_OBJECT_INFO ObjectInfo; + + SI_ACCESS DefaultAccess; } SECURITY_PAGE, *PSECURITY_PAGE; /* MISC ***********************************************************************/ @@ -68,10 +70,11 @@ /* CHECKLIST CONTROL **********************************************************/ -#define CIS_DISABLED (0x2) +#define CIS_DISABLED (0x4) #define CIS_ENABLED (0x0) -#define CIS_ALLOW (0x1) -#define CIS_DENY (0x0) +#define CIS_ALLOW (0x2) +#define CIS_DENY (0x1) +#define CIS_NONE (0x0) #define CLB_ALLOW (0x1) #define CLB_DENY (0x0) _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-07-01 23:33:34 UTC (rev 16374) +++ trunk/reactos/lib/aclui/checklist.c 2005-07-02 01:34:18 UTC (rev 16375) @@ -281,12 +281,11 @@ ScrollPos + VisibleFirstIndex); if (FirstItem != NULL) { - RECT TextRect, ItemRect; + RECT TextRect, ItemRect, CheckBox; HFONT hOldFont; DWORD CurrentIndex; COLORREF OldTextColor; BOOL Enabled, PrevEnabled; - POINT ptOld; Enabled = IsWindowEnabled(infoPtr->hSelf); PrevEnabled = Enabled; @@ -299,11 +298,6 @@ TextRect.right = ItemRect.right - 6; TextRect.top = ItemRect.top + 2; - MoveToEx(hDC, - infoPtr->CheckBoxLeft[CLB_ALLOW], - ItemRect.top, - &ptOld); - OldTextColor = SetTextColor(hDC, infoPtr->TextColor[Enabled]); @@ -324,27 +318,35 @@ infoPtr->TextColor[PrevEnabled]); } + /* draw the text */ DrawText(hDC, Item->Name, -1, &TextRect, DT_LEFT | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER); - MoveToEx(hDC, - infoPtr->CheckBoxLeft[CLB_ALLOW], - TextRect.top - 6, - NULL); - LineTo(hDC, - infoPtr->CheckBoxLeft[CLB_ALLOW], - TextRect.bottom - 6); - MoveToEx(hDC, - infoPtr->CheckBoxLeft[CLB_DENY], - TextRect.top - 6, - NULL); - LineTo(hDC, - infoPtr->CheckBoxLeft[CLB_DENY], - TextRect.bottom - 6); + /* draw the Allow checkbox */ + CheckBox.left = infoPtr->CheckBoxLeft[CLB_ALLOW] - ((TextRect.bottom - TextRect.top) / 2); + CheckBox.right = CheckBox.left + (TextRect.bottom - TextRect.top) - 4; + CheckBox.top = TextRect.top; + CheckBox.bottom = CheckBox.top + (TextRect.bottom - TextRect.top) - 4; + DrawFrameControl(hDC, + &CheckBox, + DFC_BUTTON, + DFCS_BUTTONCHECK | DFCS_FLAT | + ((Item->State & CIS_DISABLED) && Enabled ? DFCS_INACTIVE : 0) | + ((Item->State & CIS_ALLOW) ? DFCS_CHECKED : 0)); + /* draw the Deny checkbox */ + CheckBox.left = infoPtr->CheckBoxLeft[CLB_DENY] - ((TextRect.bottom - TextRect.top) / 2); + CheckBox.right = CheckBox.left + (TextRect.bottom - TextRect.top) - 4; + DrawFrameControl(hDC, + &CheckBox, + DFC_BUTTON, + DFCS_BUTTONCHECK | DFCS_FLAT | + ((Item->State & CIS_DISABLED) && Enabled ? DFCS_INACTIVE : 0) | + ((Item->State & CIS_DENY) ? DFCS_CHECKED : 0)); + TextRect.top += infoPtr->ItemHeight; } @@ -353,11 +355,6 @@ SetTextColor(hDC, OldTextColor); - - MoveToEx(hDC, - ptOld.x, - ptOld.y, - NULL); } } _____ Modified: trunk/reactos/lib/aclui/resource.h --- trunk/reactos/lib/aclui/resource.h 2005-07-01 23:33:34 UTC (rev 16374) +++ trunk/reactos/lib/aclui/resource.h 2005-07-02 01:34:18 UTC (rev 16375) @@ -13,6 +13,7 @@ #define IDI_DEVMGR 100 #define IDS_PSP_TITLE 1001 +#define IDS_UNKNOWN 1002 #define IDB_USRGRPIMAGES 1001

1 0

[weiden] 16374: initial (not yet complete) implementation of the checklist control for the permissions editor
by weiden＠svn.reactos.com 01 Jul '05

01 Jul '05

initial (not yet complete) implementation of the checklist control for the permissions editor Modified: trunk/reactos/lib/aclui/aclui.c Modified: trunk/reactos/lib/aclui/aclui.xml Modified: trunk/reactos/lib/aclui/aclui_De.rc Modified: trunk/reactos/lib/aclui/aclui_En.rc Modified: trunk/reactos/lib/aclui/aclui_Sv.rc Modified: trunk/reactos/lib/aclui/acluilib.h Added: trunk/reactos/lib/aclui/checklist.c Modified: trunk/reactos/lib/aclui/misc.c Modified: trunk/reactos/lib/aclui/resource.h _____ Modified: trunk/reactos/lib/aclui/aclui.c --- trunk/reactos/lib/aclui/aclui.c 2005-07-01 23:26:01 UTC (rev 16373) +++ trunk/reactos/lib/aclui/aclui.c 2005-07-01 23:33:34 UTC (rev 16374) @@ -30,32 +30,6 @@ HINSTANCE hDllInstance; -static LPARAM -ListViewGetSelectedItemData(IN HWND hwnd) -{ - int Index; - - Index = ListView_GetNextItem(hwnd, - -1, - LVNI_SELECTED); - if (Index != -1) - { - LVITEM li; - - li.mask = LVIF_PARAM; - li.iItem = Index; - li.iSubItem = 0; - - if (ListView_GetItem(hwnd, - &li)) - { - return li.lParam; - } - } - - return 0; -} - static VOID DestroySecurityPage(IN PSECURITY_PAGE sp) { @@ -363,6 +337,38 @@ } } +static INT +AddAceListEntry(IN PSECURITY_PAGE sp, + IN PACE_LISTITEM AceListItem, + IN INT Index, + IN BOOL Selected) +{ + LVITEM li; + + li.mask = LVIF_IMAGE | LVIF_PARAM | LVIF_STATE | LVIF_TEXT; + li.iItem = Index; + li.iSubItem = 0; + li.state = (Selected ? LVIS_SELECTED : 0); + li.stateMask = LVIS_SELECTED; + li.pszText = (AceListItem->DisplayString != NULL ? AceListItem->DisplayString : AceListItem->AccountName); + switch (AceListItem->SidNameUse) + { + case SidTypeUser: + li.iImage = 0; + break; + case SidTypeGroup: + li.iImage = 1; + break; + default: + li.iImage = -1; + break; + } + li.lParam = (LPARAM)AceListItem; + + return ListView_InsertItem(sp->hWndAceList, + &li); +} + static VOID FillUsersGroupsList(IN PSECURITY_PAGE sp) { @@ -382,30 +388,10 @@ CurItem != NULL; CurItem = CurItem->Next) { - LVITEM li; - - li.mask = LVIF_IMAGE | LVIF_PARAM | LVIF_STATE | LVIF_TEXT; - li.iItem = -1; - li.iSubItem = 0; - li.state = (CurItem == (PACE_LISTITEM)SelLParam ? LVIS_SELECTED : 0); - li.stateMask = LVIS_SELECTED; - li.pszText = (CurItem->DisplayString != NULL ? CurItem->DisplayString : CurItem->AccountName); - switch (CurItem->SidNameUse) - { - case SidTypeUser: - li.iImage = 0; - break; - case SidTypeGroup: - li.iImage = 1; - break; - default: - li.iImage = -1; - break; - } - li.lParam = (LPARAM)CurItem; - - ListView_InsertItem(sp->hWndAceList, - &li); + AddAceListEntry(sp, + CurItem, + -1, + (SelLParam == (LPARAM)CurItem)); } EnableRedrawWindow(sp->hWndAceList); @@ -417,7 +403,16 @@ rcLvClient.right); } +static VOID +UpdateControlStates(IN PSECURITY_PAGE sp) +{ + BOOL UserOrGroupSelected; + + UserOrGroupSelected = (ListViewGetSelectedItemData(sp->hWndAceList) != 0); + EnableWindow(sp->hBtnRemove, UserOrGroupSelected); +} + static UINT CALLBACK SecurityPageCallback(IN HWND hwnd, IN UINT uMsg, @@ -434,6 +429,7 @@ case PSPCB_RELEASE: { DestroySecurityPage(sp); + UnregisterCheckListControl(); return FALSE; } } @@ -441,7 +437,30 @@ return FALSE; } +static VOID +SetAceCheckListColumns(IN HWND hAceCheckList, + IN UINT Button, + IN HWND hLabel) +{ + POINT pt; + RECT rcLabel; + GetWindowRect(hLabel, + &rcLabel); + pt.y = 0; + pt.x = (rcLabel.right - rcLabel.left) / 2; + MapWindowPoints(hLabel, + hAceCheckList, + &pt, + 1); + + SendMessage(hAceCheckList, + CLM_SETCHECKBOXCOLUMN, + Button, + pt.x); +} + + static INT_PTR CALLBACK SecurityPageProc(IN HWND hwndDlg, IN UINT uMsg, @@ -452,6 +471,28 @@ switch(uMsg) { + case WM_NOTIFY: + { + NMHDR *pnmh = (NMHDR*)lParam; + if (pnmh->idFrom == IDC_ACELIST) + { + sp = (PSECURITY_PAGE)GetWindowLongPtr(hwndDlg, + DWL_USER); + if (sp != NULL) + { + switch(pnmh->code) + { + case LVN_ITEMCHANGED: + { + UpdateControlStates(sp); + break; + } + } + } + } + break; + } + case WM_INITDIALOG: { sp = (PSECURITY_PAGE)((LPPROPSHEETPAGE)lParam)->lParam; @@ -462,6 +503,8 @@ sp->hWnd = hwndDlg; sp->hWndAceList = GetDlgItem(hwndDlg, IDC_ACELIST); + sp->hBtnRemove = GetDlgItem(hwndDlg, IDC_ACELIST_REMOVE); + sp->hAceCheckList = GetDlgItem(hwndDlg, IDC_ACE_CHECKLIST); /* save the pointer to the structure */ SetWindowLongPtr(hwndDlg, @@ -491,7 +534,18 @@ ListView_InsertColumn(sp->hWndAceList, 0, &lvc); FillUsersGroupsList(sp); + + ListViewSelectItem(sp->hWndAceList, + 0); + /* 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)); + /* FIXME - hide controls in case the flags aren't present */ } break; @@ -530,10 +584,16 @@ { SetLastError(hRet); - DPRINT("CreateSecurityPage() failed!\n"); + DPRINT("CreateSecurityPage() failed! Failed to query the object information!\n"); return NULL; } + if (!RegisterCheckListControl(hDllInstance)) + { + DPRINT("Registering the CHECKLIST_ACLUI class failed!\n"); + return NULL; + } + sPage = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SECURITY_PAGE)); @@ -555,7 +615,7 @@ psp.lParam = (LPARAM)sPage; psp.pfnCallback = SecurityPageCallback; - if((ObjectInfo.dwFlags & SI_PAGE_TITLE) != 0 && + if((ObjectInfo.dwFlags & SI_PAGE_TITLE) && ObjectInfo.pszPageTitle != NULL && ObjectInfo.pszPageTitle[0] != L'\0') { /* Set the page title if the flag is present and the string isn't empty */ @@ -618,7 +678,7 @@ psh.dwFlags = PSH_DEFAULT; psh.hwndParent = hwndOwner; psh.hInstance = hDllInstance; - if((ObjectInfo.dwFlags & SI_PAGE_TITLE) != 0 && + if((ObjectInfo.dwFlags & SI_PAGE_TITLE) && ObjectInfo.pszPageTitle != NULL && ObjectInfo.pszPageTitle[0] != L'\0') { /* Set the page title if the flag is present and the string isn't empty */ _____ Modified: trunk/reactos/lib/aclui/aclui.xml --- trunk/reactos/lib/aclui/aclui.xml 2005-07-01 23:26:01 UTC (rev 16373) +++ trunk/reactos/lib/aclui/aclui.xml 2005-07-01 23:33:34 UTC (rev 16374) @@ -10,8 +10,10 @@ <library>ntdll</library> <library>kernel32</library> <library>user32</library> + <library>gdi32</library> <library>comctl32</library> <file>aclui.c</file> + <file>checklist.c</file> <file>misc.c</file> <file>aclui.rc</file> <pch>acluilib.h</pch> _____ Modified: trunk/reactos/lib/aclui/aclui_De.rc --- trunk/reactos/lib/aclui/aclui_De.rc 2005-07-01 23:26:01 UTC (rev 16373) +++ trunk/reactos/lib/aclui/aclui_De.rc 2005-07-01 23:33:34 UTC (rev 16374) @@ -1,7 +1,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT IDD_SECPAGE DIALOGEX 0, 0, 227, 215 -STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +STYLE DS_NOFAILCREATE | DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Sicherheit" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -9,8 +9,9 @@ CONTROL "", IDC_ACELIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE PUSHBUTTON "&Hinzuf³gen...", IDC_ACELIST_ADD, 116, 87, 50, 14 PUSHBUTTON "&Entfernen", IDC_ACELIST_REMOVE, 170, 87, 50, 14 - LTEXT "Erlauben", -1, 135, 107, 32, 8, SS_CENTER - LTEXT "Verbieten", -1, 176, 107, 32, 8, SS_CENTER + LTEXT "Erlauben", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER + LTEXT "Verbieten", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE END STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/lib/aclui/aclui_En.rc --- trunk/reactos/lib/aclui/aclui_En.rc 2005-07-01 23:26:01 UTC (rev 16373) +++ trunk/reactos/lib/aclui/aclui_En.rc 2005-07-01 23:33:34 UTC (rev 16374) @@ -1,7 +1,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_SECPAGE DIALOGEX 0, 0, 227, 215 -STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +STYLE DS_NOFAILCREATE | DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Security" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -9,8 +9,9 @@ CONTROL "", IDC_ACELIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE PUSHBUTTON "A&dd...", IDC_ACELIST_ADD, 116, 87, 50, 14 PUSHBUTTON "&Remove", IDC_ACELIST_REMOVE, 170, 87, 50, 14 - LTEXT "Allow", -1, 135, 107, 32, 8, SS_CENTER - LTEXT "Deny", -1, 176, 107, 32, 8, SS_CENTER + LTEXT "Allow", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER + LTEXT "Deny", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE END STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/lib/aclui/aclui_Sv.rc --- trunk/reactos/lib/aclui/aclui_Sv.rc 2005-07-01 23:26:01 UTC (rev 16373) +++ trunk/reactos/lib/aclui/aclui_Sv.rc 2005-07-01 23:33:34 UTC (rev 16374) @@ -19,7 +19,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT IDD_SECPAGE DIALOGEX 0, 0, 227, 215 -STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +STYLE DS_NOFAILCREATE | DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Sõkerhet" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -27,8 +27,9 @@ CONTROL "", IDC_ACELIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE PUSHBUTTON "&Lõgg till...", IDC_ACELIST_ADD, 116, 87, 50, 14 PUSHBUTTON "&Ta bort", IDC_ACELIST_REMOVE, 170, 87, 50, 14 - LTEXT "TillÕt", -1, 135, 107, 32, 8, SS_CENTER - LTEXT "Neka", -1, 176, 107, 32, 8, SS_CENTER + LTEXT "TillÕt", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER + LTEXT "Neka", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE END STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/lib/aclui/acluilib.h --- trunk/reactos/lib/aclui/acluilib.h 2005-07-01 23:26:01 UTC (rev 16373) +++ trunk/reactos/lib/aclui/acluilib.h 2005-07-01 23:33:34 UTC (rev 16374) @@ -33,6 +33,8 @@ typedef struct _SECURITY_PAGE { HWND hWnd; + HWND hBtnRemove; + HWND hAceCheckList; /* Main ACE List */ HWND hWndAceList; @@ -44,6 +46,8 @@ SI_OBJECT_INFO ObjectInfo; } SECURITY_PAGE, *PSECURITY_PAGE; +/* MISC ***********************************************************************/ + BOOL OpenLSAPolicyHandle(IN WCHAR *SystemName, IN ACCESS_MASK DesiredAccess, @@ -55,4 +59,36 @@ OUT LPWSTR *lpTarget, ...); +LPARAM +ListViewGetSelectedItemData(IN HWND hwnd); + +BOOL +ListViewSelectItem(IN HWND hwnd, + IN INT Index); + +/* CHECKLIST CONTROL **********************************************************/ + +#define CIS_DISABLED (0x2) +#define CIS_ENABLED (0x0) +#define CIS_ALLOW (0x1) +#define CIS_DENY (0x0) + +#define CLB_ALLOW (0x1) +#define CLB_DENY (0x0) + +#define CIS_MASK (CIS_DISABLED | CIS_ALLOW | CIS_DENY) + +#define CLM_ADDITEM (WM_USER + 1) +#define CLM_DELITEM (WM_USER + 2) +#define CLM_GETITEMCOUNT (WM_USER + 3) +#define CLM_CLEAR (WM_USER + 4) +#define CLM_SETCHECKBOXCOLUMN (WM_USER + 5) +#define CLM_GETCHECKBOXCOLUMN (WM_USER + 6) + +BOOL +RegisterCheckListControl(HINSTANCE hInstance); + +VOID +UnregisterCheckListControl(VOID); + /* EOF */ _____ Added: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-07-01 23:26:01 UTC (rev 16373) +++ trunk/reactos/lib/aclui/checklist.c 2005-07-01 23:33:34 UTC (rev 16374) @@ -0,0 +1,785 @@ +/* + * ReactOS Access Control List Editor + * Copyright (C) 2004 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* $Id$ + * + * PROJECT: ReactOS Access Control List Editor + * FILE: lib/aclui/checklist.c + * PURPOSE: Access Control List Editor + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * + * UPDATE HISTORY: + * 08/10/2004 Created + */ +#include "acluilib.h" + +typedef struct _CHECKITEM +{ + struct _CHECKITEM *Next; + DWORD State; + WCHAR Name[1]; +} CHECKITEM, *PCHECKITEM; + +typedef struct _CHECKLISTWND +{ + HWND hSelf; + HWND hNotify; + DWORD Style; + HFONT hFont; + + PCHECKITEM CheckItemListHead; + UINT CheckItemCount; + + INT ItemHeight; + BOOL HasFocus; + + COLORREF TextColor[2]; + UINT CheckBoxLeft[2]; +} CHECKLISTWND, *PCHECKLISTWND; + +static PCHECKITEM +FindCheckItemByIndex(IN PCHECKLISTWND infoPtr, + IN UINT Index) +{ + PCHECKITEM Item, Found = NULL; + + for (Item = infoPtr->CheckItemListHead; + Item != NULL; + Item = Item->Next) + { + if (Index == 0) + { + Found = Item; + break; + } + + Index--; + } + + return Found; +} + +static VOID +ClearCheckItems(IN PCHECKLISTWND infoPtr) +{ + PCHECKITEM CurItem, NextItem; + + CurItem = infoPtr->CheckItemListHead; + while (CurItem != NULL) + { + NextItem = CurItem->Next; + HeapFree(GetProcessHeap(), + 0, + CurItem); + CurItem = NextItem; + } + + infoPtr->CheckItemListHead = NULL; + infoPtr->CheckItemCount = 0; +} + +static BOOL +DeleteCheckItem(IN PCHECKLISTWND infoPtr, + IN PCHECKITEM Item) +{ + PCHECKITEM CurItem; + PCHECKITEM *PrevPtr = &infoPtr->CheckItemListHead; + + for (CurItem = infoPtr->CheckItemListHead; + CurItem != NULL; + CurItem = CurItem->Next) + { + if (CurItem == Item) + { + *PrevPtr = CurItem->Next; + HeapFree(GetProcessHeap(), + 0, + CurItem); + infoPtr->CheckItemCount--; + return TRUE; + } + + PrevPtr = &CurItem->Next; + } + + return FALSE; +} + +static PCHECKITEM +AddCheckItem(IN PCHECKLISTWND infoPtr, + IN LPWSTR Name, + IN DWORD State) +{ + PCHECKITEM CurItem; + PCHECKITEM *PrevPtr = &infoPtr->CheckItemListHead; + PCHECKITEM Item = HeapAlloc(GetProcessHeap(), + 0, + sizeof(CHECKITEM) + (wcslen(Name) * sizeof(WCHAR))); + if (Item != NULL) + { + for (CurItem = infoPtr->CheckItemListHead; + CurItem != NULL; + CurItem = CurItem->Next) + { + PrevPtr = &CurItem->Next; + } + + Item->Next = NULL; + Item->State = State & CIS_MASK; + wcscpy(Item->Name, + Name); + + *PrevPtr = Item; + infoPtr->CheckItemCount++; + } + + return Item; +} + +static VOID +UpdateControl(IN PCHECKLISTWND infoPtr, + IN BOOL AllowChangeStyle) +{ + RECT rcClient; + SCROLLINFO ScrollInfo; + + GetClientRect(infoPtr->hSelf, + &rcClient); + + ScrollInfo.cbSize = sizeof(ScrollInfo); + ScrollInfo.fMask = SIF_PAGE | SIF_RANGE; + ScrollInfo.nMin = 0; + ScrollInfo.nMax = infoPtr->CheckItemCount; + ScrollInfo.nPage = ((rcClient.bottom - rcClient.top) + infoPtr->ItemHeight - 1) / infoPtr->ItemHeight; + ScrollInfo.nPos = 0; + ScrollInfo.nTrackPos = 0; + + if (AllowChangeStyle) + { + /* determine whether the vertical scrollbar has to be visible or not */ + if (ScrollInfo.nMax > ScrollInfo.nPage && + !(infoPtr->Style & WS_VSCROLL)) + { + SetWindowLong(infoPtr->hSelf, + GWL_STYLE, + infoPtr->Style | WS_VSCROLL); + } + else if (ScrollInfo.nMax < ScrollInfo.nPage && + infoPtr->Style & WS_VSCROLL) + { + SetWindowLong(infoPtr->hSelf, + GWL_STYLE, + infoPtr->Style & ~WS_VSCROLL); + } + } + + SetScrollInfo(infoPtr->hSelf, + SB_VERT, + &ScrollInfo, + TRUE); + + RedrawWindow(infoPtr->hSelf, + NULL, + NULL, + RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN); +} + +static UINT +GetIdealItemHeight(IN PCHECKLISTWND infoPtr) +{ + HDC hdc = GetDC(infoPtr->hSelf); + if(hdc != NULL) + { + UINT height; + TEXTMETRIC tm; + HGDIOBJ hOldFont = SelectObject(hdc, + infoPtr->hFont); + + if(GetTextMetrics(hdc, + &tm)) + { + height = tm.tmHeight; + } + else + { + height = 0; + } + + SelectObject(hdc, + hOldFont); + + ReleaseDC(infoPtr->hSelf, + hdc); + + return height; + } + return 0; +} + +static HFONT +RetChangeControlFont(IN PCHECKLISTWND infoPtr, + IN HFONT hFont, + IN BOOL Redraw) +{ + HFONT hOldFont = infoPtr->hFont; + infoPtr->hFont = hFont; + + if (hOldFont != hFont) + { + infoPtr->ItemHeight = 4 + GetIdealItemHeight(infoPtr); + } + + UpdateControl(infoPtr, + TRUE); + + return hOldFont; +} + +static VOID +PaintControl(IN PCHECKLISTWND infoPtr, + IN HDC hDC, + IN PRECT rcUpdate) +{ + INT ScrollPos; + PCHECKITEM FirstItem, Item; + RECT rcClient; + UINT VisibleFirstIndex = rcUpdate->top / infoPtr->ItemHeight; + UINT LastTouchedIndex = rcUpdate->bottom / infoPtr->ItemHeight; + + FillRect(hDC, + rcUpdate, + (HBRUSH)(COLOR_WINDOW + 1)); + + GetClientRect(infoPtr->hSelf, &rcClient); + + if (infoPtr->Style & WS_VSCROLL) + { + ScrollPos = GetScrollPos(infoPtr->hSelf, + SB_VERT); + } + else + { + ScrollPos = 0; + } + + FirstItem = FindCheckItemByIndex(infoPtr, + ScrollPos + VisibleFirstIndex); + if (FirstItem != NULL) + { + RECT TextRect, ItemRect; + HFONT hOldFont; + DWORD CurrentIndex; + COLORREF OldTextColor; + BOOL Enabled, PrevEnabled; + POINT ptOld; + + Enabled = IsWindowEnabled(infoPtr->hSelf); + PrevEnabled = Enabled; + + ItemRect.left = 0; + ItemRect.right = rcClient.right; + ItemRect.top = VisibleFirstIndex * infoPtr->ItemHeight; + + TextRect.left = ItemRect.left + 6; + TextRect.right = ItemRect.right - 6; + TextRect.top = ItemRect.top + 2; + + MoveToEx(hDC, + infoPtr->CheckBoxLeft[CLB_ALLOW], + ItemRect.top, + &ptOld); + + OldTextColor = SetTextColor(hDC, + infoPtr->TextColor[Enabled]); + + hOldFont = SelectObject(hDC, + infoPtr->hFont); + + for (Item = FirstItem, CurrentIndex = VisibleFirstIndex; + Item != NULL && CurrentIndex <= LastTouchedIndex; + Item = Item->Next, CurrentIndex++) + { + TextRect.bottom = TextRect.top + infoPtr->ItemHeight; + + if (Enabled && PrevEnabled != ((Item->State & CIS_DISABLED) == 0)) + { + PrevEnabled = ((Item->State & CIS_DISABLED) == 0); + + SetTextColor(hDC, + infoPtr->TextColor[PrevEnabled]); + } + + DrawText(hDC, + Item->Name, + -1, + &TextRect, + DT_LEFT | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER); + + MoveToEx(hDC, + infoPtr->CheckBoxLeft[CLB_ALLOW], + TextRect.top - 6, + NULL); + LineTo(hDC, + infoPtr->CheckBoxLeft[CLB_ALLOW], + TextRect.bottom - 6); + MoveToEx(hDC, + infoPtr->CheckBoxLeft[CLB_DENY], + TextRect.top - 6, + NULL); + LineTo(hDC, + infoPtr->CheckBoxLeft[CLB_DENY], + TextRect.bottom - 6); + + TextRect.top += infoPtr->ItemHeight; + } + + SelectObject(hDC, + hOldFont); + + SetTextColor(hDC, + OldTextColor); + + MoveToEx(hDC, + ptOld.x, + ptOld.y, + NULL); + } +} + +LRESULT CALLBACK +CheckListWndProc(IN HWND hwnd, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PCHECKLISTWND infoPtr; + LRESULT Ret; + + infoPtr = (PCHECKLISTWND)GetWindowLongPtr(hwnd, + 0); + + if (infoPtr == NULL && uMsg != WM_CREATE) + { + return DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + } + + Ret = 0; + + switch (uMsg) + { + case WM_PAINT: + { + HDC hdc; + RECT rcUpdate; + PAINTSTRUCT ps; + + if (GetUpdateRect(hwnd, + &rcUpdate, + FALSE)) + { + hdc = (wParam != 0 ? (HDC)wParam : BeginPaint(hwnd, &ps)); + + PaintControl(infoPtr, + hdc, + &rcUpdate); + + if (wParam == 0) + { + EndPaint(hwnd, + &ps); + } + } + break; + } + + case WM_VSCROLL: + { + SCROLLINFO ScrollInfo; + + ScrollInfo.cbSize = sizeof(ScrollInfo); + ScrollInfo.fMask = SIF_PAGE | SIF_RANGE | SIF_POS | SIF_TRACKPOS; + + if (GetScrollInfo(hwnd, + SB_VERT, + &ScrollInfo)) + { + INT OldPos = ScrollInfo.nPos; + + switch (LOWORD(wParam)) + { + case SB_BOTTOM: + ScrollInfo.nPos = ScrollInfo.nMax; + break; + + case SB_LINEDOWN: + if (ScrollInfo.nPos < ScrollInfo.nMax) + { + ScrollInfo.nPos++; + } + break; + + case SB_LINEUP: + if (ScrollInfo.nPos > 0) + { + ScrollInfo.nPos--; + } + break; + + case SB_PAGEDOWN: + if (ScrollInfo.nPos + ScrollInfo.nPage <= ScrollInfo.nMax) + { + ScrollInfo.nPos += ScrollInfo.nPage; + } + else + { + ScrollInfo.nPos = ScrollInfo.nMax; + } + break; + + case SB_PAGEUP: + if (ScrollInfo.nPos >= ScrollInfo.nPage) + { + ScrollInfo.nPos -= ScrollInfo.nPage; + } + else + { + ScrollInfo.nPos = 0; + } + break; + + case SB_THUMBPOSITION: + { + ScrollInfo.nPos = HIWORD(wParam); + break; + } + + case SB_THUMBTRACK: + { + ScrollInfo.nPos = ScrollInfo.nTrackPos; + break; + } + + case SB_TOP: + ScrollInfo.nPos = 0; + break; + } + + if (OldPos != ScrollInfo.nPos) + { + ScrollInfo.fMask = SIF_POS; + + ScrollInfo.nPos = SetScrollInfo(hwnd, + SB_VERT, + &ScrollInfo, + TRUE); + + if (OldPos != ScrollInfo.nPos) + { + ScrollWindowEx(hwnd, + 0, + (OldPos - ScrollInfo.nPos) * infoPtr->ItemHeight, + NULL, + NULL, + NULL, + NULL, + SW_INVALIDATE); + + RedrawWindow(hwnd, + NULL, + NULL, + RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN); + } + } + } + break; + } + + case CLM_ADDITEM: + { + Ret = (AddCheckItem(infoPtr, + (LPWSTR)lParam, + (DWORD)wParam) != NULL); + if (Ret) + { + UpdateControl(infoPtr, + TRUE); + } + break; + } + + case CLM_DELITEM: + { + PCHECKITEM Item = FindCheckItemByIndex(infoPtr, + wParam); + if (Item != NULL) + { + Ret = DeleteCheckItem(infoPtr, + Item); + if (Ret) + { + UpdateControl(infoPtr, + TRUE); + } + } + else + { + Ret = FALSE; + } + break; + } + + case CLM_GETITEMCOUNT: + { + Ret = infoPtr->CheckItemCount; + break; + } + + case CLM_CLEAR: + { + ClearCheckItems(infoPtr); + UpdateControl(infoPtr, + TRUE); + break; + } + + case CLM_SETCHECKBOXCOLUMN: + { + infoPtr->CheckBoxLeft[wParam != CLB_DENY] = (UINT)lParam; + Ret = 1; + break; + } + + case CLM_GETCHECKBOXCOLUMN: + { + Ret = (LRESULT)infoPtr->CheckBoxLeft[wParam != CLB_DENY]; + break; + } + + case WM_SETFONT: + { + Ret = (LRESULT)RetChangeControlFont(infoPtr, + (HFONT)wParam, + (BOOL)lParam); + break; + } + + case WM_GETFONT: + { + Ret = (LRESULT)infoPtr->hFont; [truncated at 1000 lines; 270 more skipped]

1 0

[hpoussin] 16373: Set svn:eol-style property to native
by hpoussin＠svn.reactos.com 01 Jul '05

01 Jul '05

Set svn:eol-style property to native Modified: trunk/reactos/lib/setupapi/Cs.rc Modified: trunk/reactos/lib/setupapi/De.rc Modified: trunk/reactos/lib/setupapi/En.rc Modified: trunk/reactos/lib/setupapi/Es.rc Modified: trunk/reactos/lib/setupapi/Fr.rc Modified: trunk/reactos/lib/setupapi/It.rc Modified: trunk/reactos/lib/setupapi/Ja.rc Modified: trunk/reactos/lib/setupapi/Makefile.in Modified: trunk/reactos/lib/setupapi/Nl.rc Modified: trunk/reactos/lib/setupapi/Pt.rc Modified: trunk/reactos/lib/setupapi/Ru.rc Modified: trunk/reactos/lib/setupapi/Sv.rc Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/devinst16.c Modified: trunk/reactos/lib/setupapi/dirid.c Modified: trunk/reactos/lib/setupapi/diskspace.c Modified: trunk/reactos/lib/setupapi/infparse.c Modified: trunk/reactos/lib/setupapi/install.c Modified: trunk/reactos/lib/setupapi/misc.c Modified: trunk/reactos/lib/setupapi/parser.c Modified: trunk/reactos/lib/setupapi/queue.c Modified: trunk/reactos/lib/setupapi/rpc.c Modified: trunk/reactos/lib/setupapi/setupapi.rc Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/lib/setupapi/setupapi.xml Modified: trunk/reactos/lib/setupapi/setupapi_private.h Modified: trunk/reactos/lib/setupapi/setupcab.c Modified: trunk/reactos/lib/setupapi/setupx.spec Modified: trunk/reactos/lib/setupapi/setupx16.h Modified: trunk/reactos/lib/setupapi/setupx_main.c Modified: trunk/reactos/lib/setupapi/stringtable.c Modified: trunk/reactos/lib/setupapi/stubs.c Modified: trunk/reactos/lib/setupapi/virtcopy.c _____ Modified: trunk/reactos/lib/setupapi/Cs.rc --- trunk/reactos/lib/setupapi/Cs.rc 2005-07-01 19:53:02 UTC (rev 16372) +++ trunk/reactos/lib/setupapi/Cs.rc 2005-07-01 23:26:01 UTC (rev 16373) @@ -1,35 +1,35 @@ -/* - * Czech resources for SETUPAPI - * - * Copyright 2001 Andreas Mohr - * Copyright 2004 David Kredba - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "KopÝruji soubory..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Storno", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Zdroj:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "CÝl:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * Czech resources for SETUPAPI + * + * Copyright 2001 Andreas Mohr + * Copyright 2004 David Kredba + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "KopÝruji soubory..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Storno", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Zdroj:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "CÝl:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/Cs.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/De.rc --- trunk/reactos/lib/setupapi/De.rc 2005-07-01 19:53:02 UTC (rev 16372) +++ trunk/reactos/lib/setupapi/De.rc 2005-07-01 23:26:01 UTC (rev 16373) @@ -1,34 +1,34 @@ -/* - * German resources for SETUPAPI - * - * Copyright 2004 Henning Gerhardt - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Dateien kopieren..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Abbrechen", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Quelle:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Ziel:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * German resources for SETUPAPI + * + * Copyright 2004 Henning Gerhardt + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Dateien kopieren..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Abbrechen", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Quelle:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Ziel:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/De.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/En.rc --- trunk/reactos/lib/setupapi/En.rc 2005-07-01 19:53:02 UTC (rev 16372) +++ trunk/reactos/lib/setupapi/En.rc 2005-07-01 23:26:01 UTC (rev 16373) @@ -1,34 +1,34 @@ -/* - * English resources for SETUPAPI - * - * Copyright 2001 Andreas Mohr - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Copying Files..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Cancel", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Source:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * English resources for SETUPAPI + * + * Copyright 2001 Andreas Mohr + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Copying Files..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Cancel", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Source:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/En.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/Es.rc --- trunk/reactos/lib/setupapi/Es.rc 2005-07-01 19:53:02 UTC (rev 16372) +++ trunk/reactos/lib/setupapi/Es.rc 2005-07-01 23:26:01 UTC (rev 16373) @@ -1,34 +1,34 @@ -/* - * Spanish resources for SETUPAPI - * - * Copyright 2003 JosÚ Manuel Ferrer Ortiz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Copiando archivos..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Origen:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destino:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * Spanish resources for SETUPAPI + * + * Copyright 2003 JosÚ Manuel Ferrer Ortiz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Copiando archivos..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Origen:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destino:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/Es.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/Fr.rc --- trunk/reactos/lib/setupapi/Fr.rc 2005-07-01 19:53:02 UTC (rev 16372) +++ trunk/reactos/lib/setupapi/Fr.rc 2005-07-01 23:26:01 UTC (rev 16373) @@ -1,35 +1,35 @@ -/* - * French resources for SETUPAPI - * - * Copyright 2001 Andreas Mohr - * Copyright 2003 Vincent BÚron - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Copie de fichiers..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Annuler", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Source:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * French resources for SETUPAPI + * + * Copyright 2001 Andreas Mohr + * Copyright 2003 Vincent BÚron + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Copie de fichiers..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Annuler", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Source:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/Fr.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/It.rc --- trunk/reactos/lib/setupapi/It.rc 2005-07-01 19:53:02 UTC (rev 16372) +++ trunk/reactos/lib/setupapi/It.rc 2005-07-01 23:26:01 UTC (rev 16373) @@ -1,35 +1,35 @@ -/* - * Italian resources for SETUPAPI - * - * Copyright 2001 Andreas Mohr - * Copyright 2003 Ivan Leo Puoti - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Copia dei file in corso..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Anulla", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Origine:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destinazione:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * Italian resources for SETUPAPI + * + * Copyright 2001 Andreas Mohr + * Copyright 2003 Ivan Leo Puoti + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Copia dei file in corso..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Anulla", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Origine:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destinazione:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/It.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/Ja.rc --- trunk/reactos/lib/setupapi/Ja.rc 2005-07-01 19:53:02 UTC (rev 16372) +++ trunk/reactos/lib/setupapi/Ja.rc 2005-07-01 23:26:01 UTC (rev 16373) @@ -1,34 +1,34 @@ -/* - * Japanese resources for SETUPAPI - * - * Copyright 2004 Hajime Segawa - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "âtâ@âCâïéâRâsü[éÁé?éóé?éÀ..." -FONT 9, "MS UI Gothic" -BEGIN - PUSHBUTTON "âLâââôâZâï", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "âRâsü[î?:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "âRâsü[Éµ:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * Japanese resources for SETUPAPI + * + * Copyright 2004 Hajime Segawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "âtâ@âCâïéâRâsü[éÁé?éóé?éÀ..." +FONT 9, "MS UI Gothic" +BEGIN + PUSHBUTTON "âLâââôâZâï", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "âRâsü[î?:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "âRâsü[Éµ:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/Ja.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/Makefile.in --- trunk/reactos/lib/setupapi/Makefile.in 2005-07-01 19:53:02 UTC (rev 16372) +++ trunk/reactos/lib/setupapi/Makefile.in 2005-07-01 23:26:01 UTC (rev 16373) @@ -1,39 +1,39 @@ -EXTRADEFS = -D_SETUPAPI_ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = setupapi.dll -IMPORTLIB = libsetupapi.$(IMPLIBEXT) -IMPORTS = user32 version advapi32 rpcrt4 kernel32 ntdll -DELAYIMPORTS = shell32 -EXTRALIBS = $(LIBUNICODE) - -C_SRCS = \ - pnp_c.c \ - cfgmgr.c \ - devinst.c \ - dirid.c \ - diskspace.c \ - install.c \ - misc.c \ - parser.c \ - queue.c \ - setupcab.c \ - stringtable.c \ - stubs.c \ - rpc.c - -C_SRCS16 = \ - devinst16.c \ - infparse.c \ - setupx_main.c \ - virtcopy.c - -SPEC_SRCS16 = setupx.spec - -RC_SRCS= setupapi.rc - -@MAKE_DLL_RULES@ - -### Dependencies: +EXTRADEFS = -D_SETUPAPI_ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = setupapi.dll +IMPORTLIB = libsetupapi.$(IMPLIBEXT) +IMPORTS = user32 version advapi32 rpcrt4 kernel32 ntdll +DELAYIMPORTS = shell32 +EXTRALIBS = $(LIBUNICODE) + +C_SRCS = \ + pnp_c.c \ + cfgmgr.c \ + devinst.c \ + dirid.c \ + diskspace.c \ + install.c \ + misc.c \ + parser.c \ + queue.c \ + setupcab.c \ + stringtable.c \ + stubs.c \ + rpc.c + +C_SRCS16 = \ + devinst16.c \ + infparse.c \ + setupx_main.c \ + virtcopy.c + +SPEC_SRCS16 = setupx.spec + +RC_SRCS= setupapi.rc + +@MAKE_DLL_RULES@ + +### Dependencies: Property changes on: trunk/reactos/lib/setupapi/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/Nl.rc --- trunk/reactos/lib/setupapi/Nl.rc 2005-07-01 19:53:02 UTC (rev 16372) +++ trunk/reactos/lib/setupapi/Nl.rc 2005-07-01 23:26:01 UTC (rev 16373) @@ -1,34 +1,34 @@ -/* - * setupapi (Dutch resources) - * - * Copyright 2003 Hans Leidekker - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Bestanden worden gekopiÙerd..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Annuleren", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Bron:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Bestemming:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * setupapi (Dutch resources) + * + * Copyright 2003 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Bestanden worden gekopiÙerd..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Annuleren", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Bron:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Bestemming:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/Nl.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/Pt.rc --- trunk/reactos/lib/setupapi/Pt.rc 2005-07-01 19:53:02 UTC (rev 16372) +++ trunk/reactos/lib/setupapi/Pt.rc 2005-07-01 23:26:01 UTC (rev 16373) @@ -1,50 +1,50 @@ -/* - * Portuguese resources for SETUPAPI - * - * Copyright 2003 Marcelo Duarte - * Copyright 2004 AmÚrico JosÚ Melo - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Copiando arquivos..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Origem:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destino:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "A copiar ficheiros..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Origem:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destino:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * Portuguese resources for SETUPAPI + * + * Copyright 2003 Marcelo Duarte + * Copyright 2004 AmÚrico JosÚ Melo + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Copiando arquivos..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Origem:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destino:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "A copiar ficheiros..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Origem:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destino:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/Pt.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/Ru.rc --- trunk/reactos/lib/setupapi/Ru.rc 2005-07-01 19:53:02 UTC (rev 16372) +++ trunk/reactos/lib/setupapi/Ru.rc 2005-07-01 23:26:01 UTC (rev 16373) @@ -1,34 +1,34 @@ -/* - * SETUPAPI (Russian resources) - * - * Copyright 2003 Igor Stepin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "?¯´Þ¯ÔÓÝÞÕ ¶ÓÚÙ¯Ô..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "??ýÕÝÓ", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "??Û¾õÓ:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "?¾õÓ:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * SETUPAPI (Russian resources) + * + * Copyright 2003 Igor Stepin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "?¯´Þ¯ÔÓÝÞÕ ¶ÓÚÙ¯Ô..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "??ýÕÝÓ", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "??Û¾õÓ:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "?¾õÓ:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/Ru.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/Sv.rc --- trunk/reactos/lib/setupapi/Sv.rc 2005-07-01 19:53:02 UTC (rev 16372) +++ trunk/reactos/lib/setupapi/Sv.rc 2005-07-01 23:26:01 UTC (rev 16373) @@ -1,34 +1,34 @@ -/* - * Swedish resources for SETUPAPI - * - * Copyright 2005 Anders Bergh - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Kopierar filer..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Avbryt", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Kõlla:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * Swedish resources for SETUPAPI + * + * Copyright 2005 Anders Bergh + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Kopierar filer..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Avbryt", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Kõlla:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/Sv.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-07-01 19:53:02 UTC (rev 16372) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-07-01 23:26:01 UTC (rev 16373) @@ -1,362 +1,362 @@ -/* - * Configuration manager functions - * - * Copyright 2000 James Hatheway - * Copyright 2005 Eric Kohl - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <stdarg.h> - [truncated at 1000 lines; 24532 more skipped]

1 0

[ion] 16372: fix tlist
by ion＠svn.reactos.com 01 Jul '05

01 Jul '05

fix tlist Modified: trunk/rosapps/sysutils/tlist/tlist.c _____ Modified: trunk/rosapps/sysutils/tlist/tlist.c --- trunk/rosapps/sysutils/tlist/tlist.c 2005-07-01 18:20:10 UTC (rev 16371) +++ trunk/rosapps/sysutils/tlist/tlist.c 2005-07-01 19:53:02 UTC (rev 16372) @@ -6,15 +6,16 @@ * Copyright (c) 2000,2001 Emanuele Aliberti */ #include <reactos/buildno.h> +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> -#include <epsapi.h> +#include <epsapi/epsapi.h> #include <getopt.h> #ifndef PAGE_SIZE

1 0

[greatlrd] 16371: Brandon Turner turnerb7@msu.edu
by greatlrd＠svn.reactos.com 01 Jul '05

01 Jul '05

Brandon Turner turnerb7(a)msu.edu Added ConPrintfPaging and ConOutPrintfPaging Added /p back in using ConOutPrintfPaging Me correct small mistake in en.rc adding newline for dir_help text, so it looking bit better when it printout Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/dir.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-07-01 16:04:07 UTC (rev 16370) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-07-01 18:20:10 UTC (rev 16371) @@ -199,8 +199,8 @@ Switches may be preset in the DIRCMD environment variable. Override\n\ preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n" -STRING_DIR_HELP2, " Volume in drive %c is %s" -STRING_DIR_HELP3, " Volume in drive %c has no label" +STRING_DIR_HELP2, " Volume in drive %c is %s\n" +STRING_DIR_HELP3, " Volume in drive %c has no label.\n" STRING_DIR_HELP4, " Volume Serial Number is %04X-%04X\n" STRING_DIR_HELP5, "\n Total Files Listed:\n%16i File(s)% 14s bytes\n" STRING_DIR_HELP6, "%16i Dir(s)% 15s bytes\n" _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-07-01 16:04:07 UTC (rev 16370) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-07-01 18:20:10 UTC (rev 16371) @@ -147,6 +147,7 @@ VOID ConOutChar (TCHAR); VOID ConOutPuts (LPTSTR); VOID ConOutPrintf (LPTSTR, ...); +VOID ConOutPrintfPaging (BOOL NewPage, LPTSTR, ...); VOID ConErrChar (TCHAR); VOID ConErrPuts (LPTSTR); VOID ConErrPrintf (LPTSTR, ...); _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-07-01 16:04:07 UTC (rev 16370) +++ trunk/reactos/subsys/system/cmd/console.c 2005-07-01 18:20:10 UTC (rev 16371) @@ -9,6 +9,9 @@ * * 03-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) * Remove all hardcode string to En.rc + * + * 01-Jul-2005 (Brandon Turner) <turnerb7(a)msu.edu>) + * Added ConPrintfPaging and ConOutPrintfPaging */ @@ -222,6 +225,92 @@ #endif } +VOID ConPrintfPaging(BOOL NewPage, LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle) +{ + INT len; + PCHAR pBuf; + CONSOLE_SCREEN_BUFFER_INFO csbi; + TCHAR szOut[OUTPUT_BUFFER_SIZE]; + DWORD dwWritten; + static int LineCount = 0; //used to count number of lines since last pause + int ScreenLines = 0; //used to see how big the screen is + int ScreenCol = 0; //the number of chars in a roow + int CharEL = 0; //chars since end of line + int i = 0; + + if(NewPage == TRUE) + LineCount = 0; + + //get the size of the visual screen that can be printed too + GetConsoleScreenBufferInfo(hConsole, &csbi); + //subtract 2 to account for "press any key..." and for the blank line at the end of PagePrompt() + ScreenLines = csbi.srWindow.Bottom - csbi.srWindow.Top - 2; + ScreenCol = csbi.srWindow.Right + 1; + + //make sure they didnt make the screen to small + if(ScreenLines<2) + ConPrintf(szFormat, arg_ptr, nStdHandle); + //if more lines have been printed then screen size it is time to stop + if(LineCount >= ScreenLines) + { + if(PagePrompt() != PROMPT_YES) + { + return; + } + //reset the number of lines being printed + LineCount = 0; + } + + len = _vstprintf (szOut, szFormat, arg_ptr); +#ifdef _UNICODE + pBuf = malloc(len + 1); + len = WideCharToMultiByte( OutputCodePage, 0, szOut, len + 1, pBuf, len + 1, NULL, NULL) - 1; +#else + pBuf = szOut; +#endif + WriteFile (GetStdHandle (nStdHandle), + pBuf, + len, + &dwWritten, + NULL); + + + + if(len < ScreenCol) + { + //if it is smaller then a row then just check for \n + for(i = 0; i < len; i++) + if(szOut[i] == '\n') + LineCount++; + + } + else + { + //if it is bigger then a row check for \n and a string longer then a row can handle + for(i = 0; i < len; i++) + { + if(szOut[i] == '\n') + { + CharEL = 0; + LineCount++; + } + else + { + CharEL++; + if(CharEL > ScreenCol) + { + CharEL = 0; + LineCount++; + } + } + } + } + +#ifdef UNICODE + free(pBuf); +#endif +} + VOID ConOutFormatMessage (DWORD MessageId, ...) { TCHAR szMsg[RC_STRING_MAX_SIZE]; @@ -260,6 +349,15 @@ va_end (arg_ptr); } +VOID ConOutPrintfPaging (BOOL NewPage, LPTSTR szFormat, ...) +{ + va_list arg_ptr; + + va_start (arg_ptr, szFormat); + ConPrintfPaging(NewPage, szFormat, arg_ptr, STD_OUTPUT_HANDLE); + va_end (arg_ptr); +} + VOID ConErrChar (TCHAR c) { ConChar(c, STD_ERROR_HANDLE); _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-07-01 16:04:07 UTC (rev 16370) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-07-01 18:20:10 UTC (rev 16371) @@ -125,6 +125,8 @@ * the code is rewritten. /p is removed, to be rewriten in * the main cmd code. * + * 1-Jul-2004 (Brandon Turner <turnerb7(a)msu.edu>) + * Added /p back in using ConOutPrintfPaging */ #include "precomp.h" @@ -847,20 +849,35 @@ if (szVolName[0] != _T('\0')) { LoadString(CMD_ModuleHandle, STRING_DIR_HELP2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, szRootName[0], szVolName); + //needs to have first paramter as TRUE because + //this is the first output and need to clear the static + if(lpFlags->bPause) + ConOutPrintfPaging(TRUE,szMsg, szRootName[0], szVolName); + else + ConOutPrintf(szMsg, szRootName[0], szVolName); + } else { LoadString(CMD_ModuleHandle, STRING_DIR_HELP3, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, szRootName[0]); + if(lpFlags->bPause) + ConOutPrintfPaging(TRUE,szMsg, szRootName[0]); + else + ConOutPrintf(szMsg, szRootName[0]); } /* print the volume serial number if the return was successful */ LoadString(CMD_ModuleHandle, STRING_DIR_HELP4, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); + else + ConOutPrintf(szMsg, + HIWORD(dwSerialNr), + LOWORD(dwSerialNr)); + return TRUE; } @@ -1094,7 +1111,10 @@ ConvertULargeInteger(u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); LoadString(CMD_ModuleHandle, STRING_DIR_HELP5, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg,ulFiles, szBuffer); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer); + else + ConOutPrintf(szMsg,ulFiles, szBuffer); } /* Print total directories and freespace */ @@ -1102,7 +1122,10 @@ GetUserDiskFreeSpace(szRoot, &uliFree); ConvertULargeInteger(uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); LoadString(CMD_ModuleHandle, STRING_DIR_HELP6, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg,ulDirs, szBuffer); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,szMsg,ulDirs, szBuffer); + else + ConOutPrintf(szMsg,ulDirs, szBuffer); return 0; } @@ -1197,13 +1220,22 @@ DirPrintFileDateTime(szDate, szTime, ptrFiles[i], lpFlags); /* Print the line */ - ConOutPrintf(_T("%10s %-8s %*s%s %s\n"), - szDate, - szTime, - iSizeFormat, - szSize, - szShortName, - ptrFiles[i]->cFileName); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,_T("%10s %-8s %*s%s %s\n"), + szDate, + szTime, + iSizeFormat, + szSize, + szShortName, + ptrFiles[i]->cFileName); + else + ConOutPrintf(_T("%10s %-8s %*s%s %s\n"), + szDate, + szTime, + iSizeFormat, + szSize, + szShortName, + ptrFiles[i]->cFileName); } } @@ -1277,10 +1309,16 @@ else _stprintf(szTempFname, _T("%s"), ptrFiles[temp]->cFileName); - ConOutPrintf(_T("%-*s"), iLongestName + 1 , szTempFname); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,_T("%-*s"), iLongestName + 1 , szTempFname); + else + ConOutPrintf(_T("%-*s"), iLongestName + 1 , szTempFname); } - ConOutPrintf(_T("\n")); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,_T("\n")); + else + ConOutPrintf(_T("\n")); } } else @@ -1293,18 +1331,29 @@ else _stprintf(szTempFname, _T("%s"), ptrFiles[i]->cFileName); - ConOutPrintf(_T("%-*s"), iLongestName + 1, szTempFname ); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,_T("%-*s"), iLongestName + 1, szTempFname ); + else + ConOutPrintf(_T("%-*s"), iLongestName + 1, szTempFname ); /* * We print a new line at the end of each column * except for the case that it is the last item. */ - if (!((i + 1) % iColumns) && (i < (dwCount - 1))) - ConOutPrintf(_T("\n")); + if (!((i + 1) % iColumns) && (i < (dwCount - 1))) + { + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,_T("\n")); + else + ConOutPrintf(_T("\n")); + } } /* Add a new line after the last item */ - ConOutPrintf(_T("\n")); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,_T("\n")); + else + ConOutPrintf(_T("\n")); } } @@ -1364,13 +1413,22 @@ DirPrintFileDateTime(szDate,szTime,ptrFiles[i],lpFlags); /* Print the line */ - ConOutPrintf(_T("%-8s %-3s %*s %s %s\n"), - szName, /* The file's 8.3 name */ - szExt, /* The file's 8.3 extension */ - iSizeFormat, /* print format for size column */ - szSize, /* The size of file or "<DIR>" for dirs */ - szDate, /* The date of file/dir */ - szTime); /* The time of file/dir */ + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,_T("%-8s %-3s %*s %s %s\n"), + szName, /* The file's 8.3 name */ + szExt, /* The file's 8.3 extension */ + iSizeFormat, /* print format for size column */ + szSize, /* The size of file or "<DIR>" for dirs */ + szDate, /* The date of file/dir */ + szTime); /* The time of file/dir */ + else + ConOutPrintf(_T("%-8s %-3s %*s %s %s\n"), + szName, /* The file's 8.3 name */ + szExt, /* The file's 8.3 extension */ + iSizeFormat, /* print format for size column */ + szSize, /* The size of file or "<DIR>" for dirs */ + szDate, /* The date of file/dir */ + szTime); /* The time of file/dir */ } } @@ -1401,12 +1459,18 @@ /* at recursive mode we print full path of file */ _tcscpy(szFullName, lpCurPath); _tcscat(szFullName, ptrFiles[i]->cFileName); - ConOutPrintf(_T("%s\n"), szFullName); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,_T("%s\n"), szFullName); + else + ConOutPrintf(_T("%s\n"), szFullName); } else { /* if we are not in recursive mode we print the file names */ - ConOutPrintf(_T("%s\n"),ptrFiles[i]->cFileName); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,_T("%s\n"),ptrFiles[i]->cFileName); + else + ConOutPrintf(_T("%s\n"),ptrFiles[i]->cFileName); } } } @@ -1438,7 +1502,10 @@ if (!(lpFlags->bBareFormat ) && !((lpFlags->bRecursive) && (dwCount <= 0))) { LoadString(CMD_ModuleHandle, STRING_DIR_HELP7, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, szTemp); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,szMsg, szTemp); + else + ConOutPrintf(szMsg, szTemp); } if (lpFlags->bBareFormat) @@ -1790,7 +1857,11 @@ { ConvertULargeInteger(u64CountBytes, szBytes, 20, lpFlags->bTSeperator); LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg,dwCountFiles, szBytes); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,szMsg,dwCountFiles, szBytes); + else + ConOutPrintf(szMsg,dwCountFiles, szBytes); + } /* Add statistics to recursive statistics*/ @@ -1899,7 +1970,7 @@ /* <Debug :> Uncomment this to show the final state of switch flags*/ -/* +#ifdef _DEBUG ConOutPrintf("Attributes mask/value %x/%x\n",stFlags.stAttribs.dwAttribMask,stFlags.stAttribs.dwAttribVal ); ConOutPrintf("(B) Bare format : %i\n", stFlags.bBareFormat ); ConOutPrintf("(C) Thousand : %i\n", stFlags.bTSeperator ); @@ -1917,7 +1988,7 @@ ConOutPrintf("(T) Time field : %i\n", stFlags.stTimeField.eTimeField ); ConOutPrintf("(X) Short names : %i\n", stFlags.bShortName ); ConOutPrintf("Parameter : %s\n", param ); -*/ +#endif /* print the header */ if (!stFlags.bBareFormat)

1 0

[ion] 16370: remove acledit.h, the interfaces are nt4-only and deprecated, programmers must use ISecurityInformation (which is what Thomas has started to implement as well)
by ion＠svn.reactos.com 01 Jul '05

01 Jul '05

remove acledit.h, the interfaces are nt4-only and deprecated, programmers must use ISecurityInformation (which is what Thomas has started to implement as well) Deleted: trunk/reactos/include/acledit.h Modified: trunk/reactos/lib/acledit/acledit.c Modified: trunk/reactos/lib/acledit/acleditint.h Modified: trunk/reactos/lib/acledit/stubs.c _____ Deleted: trunk/reactos/include/acledit.h --- trunk/reactos/include/acledit.h 2005-07-01 15:40:52 UTC (rev 16369) +++ trunk/reactos/include/acledit.h 2005-07-01 16:04:07 UTC (rev 16370) @@ -1,136 +0,0 @@ -/* - * acledit.h - * - * Access Control List Editor definitions - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __ACLEDIT_H -#define __ACLEDIT_H - -#include <windows.h> - -typedef struct _ACL_HELP_CONTROL -{ - LPWSTR lpHelpFile; - DWORD dwMainDialogTopic; - DWORD dwACLEditorDialogTopic; - DWORD Reserved1; - DWORD dwAddEntryDialogTopic; - DWORD Reserved2; - DWORD Reserved3; - DWORD dwAccountDialogTopic; -} ACL_HELP_CONTROL, *PACL_HELP_CONTROL; - -typedef struct _ACL_DLG_CONTROL -{ - UCHAR ucVersion; - BOOL bIsContainer; - BOOL bAllowNewObject; - BOOL bMapSpecificToGeneric; - LPDWORD lpdwGenericAccessMap; - LPDWORD lpdwGenericMappingNewObjects; - LPWSTR lpDialogTitle; - PACL_HELP_CONTROL pHelpInfo; - LPWSTR lpSubReplaceTitle; - LPWSTR lpSubReplaceObjectsTitle; - LPWSTR lpSubReplaceConfirmation; - LPWSTR lpSpecialAccess; - LPWSTR lpSpecialNewAccess; -} ACL_DLG_CONTROL, *PACL_DLG_CONTROL; - -typedef struct _ACL_EDIT_ENTRY{ - DWORD dwType; - DWORD dwAccessMask; - DWORD dwAccessMask1; - LPWSTR lpName; -} ACL_EDIT_ENTRY, *PACL_EDIT_ENTRY; - -typedef struct _ACL_EDIT_CONTROL -{ - DWORD dwNumberOfEntries; - PACL_EDIT_ENTRY pEntries; - LPWSTR lpDefaultPermissionName; -} ACL_EDIT_CONTROL, *PACL_EDIT_CONTROL; - -typedef DWORD (CALLBACK *PACL_CHANGE)(HWND hWnd, - HINSTANCE hInstance, - PVOID pCallbackContext, - PSECURITY_DESCRIPTOR pNewSD, - PSECURITY_DESCRIPTOR pNewObjectSD, - BOOL bApplyToSubContainers, - BOOL bApplyToSubObjects, - LPDWORD lpdwChangeContextStatus); - -DWORD WINAPI -EditAuditInfo(DWORD Unknown); - -DWORD WINAPI -EditOwnerInfo(DWORD Unknown); - -DWORD WINAPI -EditPermissionInfo(DWORD Unknown); - -LONG WINAPI -FMExtensionProcW(HWND hWnd, - WORD wEvent, - LONG lParam); - -DWORD WINAPI -SedDiscretionaryAclEditor(HWND hWndOwner, - HINSTANCE hInstance, - LPCWSTR lpMachineName, - PACL_DLG_CONTROL pAclDlgControl, - PACL_EDIT_CONTROL pAclEditControl, - LPCWSTR lpObjectName, - PACL_CHANGE pChangeCallback, - PVOID pChangeCallbackContext, - PSECURITY_DESCRIPTOR pObjectSecurity, - BOOL bNoReadPermission, - BOOL bReadOnly, - LPDWORD lpdwChangeContextStatus, - DWORD Reserved); - -DWORD WINAPI -SedTakeOwnership(HWND hWndOwner, - HINSTANCE hInstance, - LPCWSTR lpMachineName, - LPCWSTR lpObjectType, - LPCWSTR lpObjectName, - DWORD dwObjectCount, - PACL_CHANGE pChangeCallback, - PVOID pChangeCallbackContext, - PSECURITY_DESCRIPTOR pObjectSecurity, - BOOL NoReadPermission, - BOOL NoOwnerChange, - LPDWORD lpdwChangeContextStatus, - PACL_HELP_CONTROL pHelpInfo, - DWORD Reserved); - -DWORD WINAPI -SedSystemAclEditor(HWND hWndOwner, - HINSTANCE hInstance, - LPCWSTR lpMachineName, - PACL_DLG_CONTROL pAclDlgControl, - PACL_EDIT_CONTROL pAclEditControl, - LPCWSTR lpObjectName, - PACL_CHANGE pChangeCallback, - PVOID pChangeCallbackContext, - PSECURITY_DESCRIPTOR pObjectSecurity, - BOOL bNoReadPermission, - LPDWORD lpdwChangeContextStatus, - DWORD Reserved); - -#endif /* __ACLEDIT_H */ - -/* EOF */ _____ Modified: trunk/reactos/lib/acledit/acledit.c --- trunk/reactos/lib/acledit/acledit.c 2005-07-01 15:40:52 UTC (rev 16369) +++ trunk/reactos/lib/acledit/acledit.c 2005-07-01 16:04:07 UTC (rev 16370) @@ -30,7 +30,6 @@ * 07/09/2004 Created */ #include <windows.h> -#include <acledit.h> #include "acleditint.h" #include "resource.h" _____ Modified: trunk/reactos/lib/acledit/acleditint.h --- trunk/reactos/lib/acledit/acleditint.h 2005-07-01 15:40:52 UTC (rev 16369) +++ trunk/reactos/lib/acledit/acleditint.h 2005-07-01 16:04:07 UTC (rev 16370) @@ -3,6 +3,58 @@ extern HINSTANCE hDllInstance; +typedef struct _ACL_HELP_CONTROL +{ + LPWSTR lpHelpFile; + DWORD dwMainDialogTopic; + DWORD dwACLEditorDialogTopic; + DWORD Reserved1; + DWORD dwAddEntryDialogTopic; + DWORD Reserved2; + DWORD Reserved3; + DWORD dwAccountDialogTopic; +} ACL_HELP_CONTROL, *PACL_HELP_CONTROL; + +typedef struct _ACL_DLG_CONTROL +{ + UCHAR ucVersion; + BOOL bIsContainer; + BOOL bAllowNewObject; + BOOL bMapSpecificToGeneric; + LPDWORD lpdwGenericAccessMap; + LPDWORD lpdwGenericMappingNewObjects; + LPWSTR lpDialogTitle; + PACL_HELP_CONTROL pHelpInfo; + LPWSTR lpSubReplaceTitle; + LPWSTR lpSubReplaceObjectsTitle; + LPWSTR lpSubReplaceConfirmation; + LPWSTR lpSpecialAccess; + LPWSTR lpSpecialNewAccess; +} ACL_DLG_CONTROL, *PACL_DLG_CONTROL; + +typedef struct _ACL_EDIT_ENTRY{ + DWORD dwType; + DWORD dwAccessMask; + DWORD dwAccessMask1; + LPWSTR lpName; +} ACL_EDIT_ENTRY, *PACL_EDIT_ENTRY; + +typedef struct _ACL_EDIT_CONTROL +{ + DWORD dwNumberOfEntries; + PACL_EDIT_ENTRY pEntries; + LPWSTR lpDefaultPermissionName; +} ACL_EDIT_CONTROL, *PACL_EDIT_CONTROL; + +typedef DWORD (CALLBACK *PACL_CHANGE)(HWND hWnd, + HINSTANCE hInstance, + PVOID pCallbackContext, + PSECURITY_DESCRIPTOR pNewSD, + PSECURITY_DESCRIPTOR pNewObjectSD, + BOOL bApplyToSubContainers, + BOOL bApplyToSubObjects, + LPDWORD lpdwChangeContextStatus); + #endif /* __ACLEDITINT_H */ /* EOF */ _____ Modified: trunk/reactos/lib/acledit/stubs.c --- trunk/reactos/lib/acledit/stubs.c 2005-07-01 15:40:52 UTC (rev 16369) +++ trunk/reactos/lib/acledit/stubs.c 2005-07-01 16:04:07 UTC (rev 16370) @@ -14,7 +14,6 @@ * 07/09/2004 Created */ #include <windows.h> -#include <acledit.h> #include "acleditint.h" ULONG DbgPrint(PCH Format,...);

1 0

[ion] 16369: Fix DHCP bug (a ReadFile was being done on a BOOLEAN return value instead of the handle, and a thread was never returning), fix 99% of warnings and use PCH
by ion＠svn.reactos.com 01 Jul '05

01 Jul '05

Fix DHCP bug (a ReadFile was being done on a BOOLEAN return value instead of the handle, and a thread was never returning), fix 99% of warnings and use PCH Modified: trunk/reactos/subsys/system/dhcp/adapter.c Modified: trunk/reactos/subsys/system/dhcp/dhclient.c Modified: trunk/reactos/subsys/system/dhcp/dhcp.xml Modified: trunk/reactos/subsys/system/dhcp/dispatch.c Modified: trunk/reactos/subsys/system/dhcp/hash.c Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h Modified: trunk/reactos/subsys/system/dhcp/pipe.c Modified: trunk/reactos/subsys/system/dhcp/tables.c _____ Modified: trunk/reactos/subsys/system/dhcp/adapter.c --- trunk/reactos/subsys/system/dhcp/adapter.c 2005-07-01 15:29:06 UTC (rev 16368) +++ trunk/reactos/subsys/system/dhcp/adapter.c 2005-07-01 15:40:52 UTC (rev 16369) @@ -10,7 +10,7 @@ DWORD Error; HKEY MainKey; PCHAR *Out, OutKeyName; - DWORD CharTotal = 0, ThisKey, AppendLen = 1 + strlen(Append); + DWORD CharTotal = 0, AppendLen = 1 + strlen(Append); DWORD MaxSubKeyLen = 0, MaxSubKeys = 0; Error = RegOpenKey( HKEY_LOCAL_MACHINE, MainKeyName, &MainKey ); @@ -194,7 +194,7 @@ DefGatewayRow.dwForwardNextHop = inet_addr(DefaultGateway); Error = CreateIpForwardEntry( &DefGatewayRow ); if( Error ) - warning("Failed to set default gateway %s: %d\n", + warning("Failed to set default gateway %s: %ld\n", DefaultGateway, Error); } _____ Modified: trunk/reactos/subsys/system/dhcp/dhclient.c --- trunk/reactos/subsys/system/dhcp/dhclient.c 2005-07-01 15:29:06 UTC (rev 16368) +++ trunk/reactos/subsys/system/dhcp/dhclient.c 2005-07-01 15:40:52 UTC (rev 16369) @@ -124,11 +124,7 @@ int main(int argc, char *argv[]) { - extern char *__progname; - int ch, fd, quiet = 0, i = 0; - int pipe_fd[2]; - struct passwd *pw; - + int i = 0; ApiInit(); AdapterInit(); PipeInit(); @@ -503,7 +499,7 @@ &Adapter->NteInstance ); if( !NT_SUCCESS(Status) ) - warning("AddIPAddress: %x\n", Status); + warning("AddIPAddress: %lx\n", Status); } if( new_lease->options[DHO_ROUTERS].len ) { @@ -526,7 +522,7 @@ Status = CreateIpForwardEntry( &RouterMib ); if( !NT_SUCCESS(Status) ) - warning("CreateIpForwardEntry: %x\n", Status); + warning("CreateIpForwardEntry: %lx\n", Status); else old_default_route = RouterMib.dwForwardNextHop; } @@ -551,7 +547,7 @@ if( ip->client->active->renewal - cur_time ) add_timeout(ip->client->active->renewal, state_bound, ip); - note("bound to %s -- renewal in %d seconds.", + note("bound to %s -- renewal in %ld seconds.", piaddr(ip->client->active->address), ip->client->active->renewal - cur_time); @@ -917,7 +913,7 @@ if (!ip->client->offered_leases && ip->client->config->media) { int fail = 0; -again: + if (ip->client->medium) { ip->client->medium = ip->client->medium->next; increase = 0; @@ -976,7 +972,7 @@ ip->client->packet.secs = htons(65535); ip->client->secs = ip->client->packet.secs; - note("DHCPDISCOVER on %s to %s port %d interval %d", + note("DHCPDISCOVER on %s to %s port %d interval %ld", ip->name, inet_ntoa(sockaddr_broadcast.sin_addr), ntohs(sockaddr_broadcast.sin_port), ip->client->interval); @@ -1030,7 +1026,7 @@ if (cur_time < ip->client->active->renewal) { ip->client->state = S_BOUND; - note("bound: renewal in %d seconds.", + note("bound: renewal in %ld seconds.", ip->client->active->renewal - cur_time); add_timeout( @@ -1106,7 +1102,6 @@ if ((ip->client->state == S_REBOOTING || ip->client->state == S_REQUESTING) && interval > ip->client->config->reboot_timeout) { -cancel: ip->client->state = S_INIT; cancel_timeout(send_request, ip); state_init(ip); @@ -1632,7 +1627,6 @@ struct interface_info *ip = ifi; u_int8_t dbuf[1500]; int i, len = 0; - char tbuf[128]; #if 0 script_set_env(ip->client, prefix, "ip_address", _____ Modified: trunk/reactos/subsys/system/dhcp/dhcp.xml --- trunk/reactos/subsys/system/dhcp/dhcp.xml 2005-07-01 15:29:06 UTC (rev 16368) +++ trunk/reactos/subsys/system/dhcp/dhcp.xml 2005-07-01 15:40:52 UTC (rev 16369) @@ -8,6 +8,7 @@ <library>kernel32</library> <library>ws2_32</library> <library>iphlpapi</library> + <pch>include/rosdhcp.h</pch> <file>adapter.c</file> <file>alloc.c</file> <file>api.c</file> _____ Modified: trunk/reactos/subsys/system/dhcp/dispatch.c --- trunk/reactos/subsys/system/dhcp/dispatch.c 2005-07-01 15:29:06 UTC (rev 16368) +++ trunk/reactos/subsys/system/dhcp/dispatch.c 2005-07-01 15:40:52 UTC (rev 16369) @@ -66,7 +66,6 @@ void discover_interfaces(struct interface_info *iface) { - NTSTATUS Status; PDHCP_ADAPTER Adapter = AdapterFindInfo( iface ); if_register_receive(iface); _____ Modified: trunk/reactos/subsys/system/dhcp/hash.c --- trunk/reactos/subsys/system/dhcp/hash.c 2005-07-01 15:29:06 UTC (rev 16368) +++ trunk/reactos/subsys/system/dhcp/hash.c 2005-07-01 15:40:52 UTC (rev 16369) @@ -40,6 +40,7 @@ * Enterprises, see ``http://www.vix.com''. */ +#define lint #ifndef lint static char copyright[] = "$Id: hash.c,v 1.9.2.3 1999/04/09 17:39:41 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. All rights reserved.\n"; _____ Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h --- trunk/reactos/subsys/system/dhcp/include/rosdhcp.h 2005-07-01 15:29:06 UTC (rev 16368) +++ trunk/reactos/subsys/system/dhcp/include/rosdhcp.h 2005-07-01 15:40:52 UTC (rev 16369) @@ -1,11 +1,9 @@ #ifndef ROSDHCP_H #define ROSDHCP_H -#include <roscfg.h> #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include <winnt.h> #include <iprtrmib.h> #include <iphlpapi.h> #include <winsock2.h> @@ -59,6 +57,8 @@ #define random rand #define srandom srand +void AdapterInit(VOID); +HANDLE PipeInit(VOID); extern PDHCP_ADAPTER AdapterFindIndex( unsigned int AdapterIndex ); extern PDHCP_ADAPTER AdapterFindInfo( struct interface_info *info ); extern VOID ApiInit(); @@ -68,5 +68,5 @@ extern DWORD DSLeaseIpAddress( PipeSendFunc Send, COMM_DHCP_REQ *Req ); extern DWORD DSRenewIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ); extern DWORD DSReleaseIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ); - +int warn( char *format, ... ); #endif/*ROSDHCP_H*/ _____ Modified: trunk/reactos/subsys/system/dhcp/pipe.c --- trunk/reactos/subsys/system/dhcp/pipe.c 2005-07-01 15:29:06 UTC (rev 16368) +++ trunk/reactos/subsys/system/dhcp/pipe.c 2005-07-01 15:40:52 UTC (rev 16369) @@ -31,10 +31,10 @@ DWORD BytesRead, BytesWritten; COMM_DHCP_REQ Req; BOOL Result; - HANDLE Connection; + BOOLEAN Connection; while( (Connection = ConnectNamedPipe( CommPipe, NULL )) ) { - Result = ReadFile( Connection, &Req, sizeof(Req), &BytesRead, NULL ); + Result = ReadFile( CommPipe, &Req, sizeof(Req), &BytesRead, NULL ); if( Result ) { switch( Req.Type ) { case DhcpReqQueryHWInfo: @@ -54,8 +54,10 @@ break; } } - CloseHandle( Connection ); + CloseHandle( CommPipe ); } + + return TRUE; } HANDLE PipeInit() { _____ Modified: trunk/reactos/subsys/system/dhcp/tables.c --- trunk/reactos/subsys/system/dhcp/tables.c 2005-07-01 15:29:06 UTC (rev 16368) +++ trunk/reactos/subsys/system/dhcp/tables.c 2005-07-01 15:40:52 UTC (rev 16369) @@ -39,7 +39,7 @@ * see ``http://www.vix.com/isc''. To learn more about Vixie * Enterprises, see ``http://www.vix.com''. */ - +#define lint #ifndef lint static char copyright[] = "$Id: tables.c,v 1.13.2.4 1999/04/24 16:46:44 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n";

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