Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 16368: Add '\' between "System\CurrentControlSet\Class" and the GUID when creating the registry key name
by hpoussin＠svn.reactos.com 01 Jul '05

01 Jul '05

Add '\' between "System\CurrentControlSet\Class" and the GUID when creating the registry key name Don't return FALSE but INVALID_HANDLE_VALUE in SetupDiOpenClassRegKeyExW Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-07-01 12:09:04 UTC (rev 16367) +++ trunk/reactos/lib/setupapi/devinst.c 2005-07-01 15:29:06 UTC (rev 16368) @@ -1182,12 +1182,13 @@ DWORD RequiredSize; HKEY hClassKey; + Buffer[0] = '\\'; if (!SetupGetLineTextW(NULL, hInf, Version, ClassGUID, - Buffer, - MAX_PATH, + &Buffer[1], + MAX_PATH - 1, &RequiredSize)) { return INVALID_HANDLE_VALUE; @@ -1433,7 +1434,7 @@ if (UuidToStringW((UUID*)ClassGuid, &lpGuidString) != RPC_S_OK) { RegCloseKey(hClassesKey); - return FALSE; + return INVALID_HANDLE_VALUE; } if (RegOpenKeyExW(hClassesKey, @@ -1444,7 +1445,7 @@ { RpcStringFreeW(&lpGuidString); RegCloseKey(hClassesKey); - return FALSE; + return INVALID_HANDLE_VALUE; } RpcStringFreeW(&lpGuidString);

1 0

[weiden] 16367: query the dacl from the ISecurityInformation server, query the domains name from lsass and list them in the dialog box
by weiden＠svn.reactos.com 01 Jul '05

01 Jul '05

query the dacl from the ISecurityInformation server, query the domains name from lsass and list them in the dialog box Modified: trunk/reactos/lib/aclui/aclui.c Modified: trunk/reactos/lib/aclui/aclui.xml Added: trunk/reactos/lib/aclui/acluilib.h Deleted: trunk/reactos/lib/aclui/internal.h Added: trunk/reactos/lib/aclui/misc.c _____ Modified: trunk/reactos/lib/aclui/aclui.c --- trunk/reactos/lib/aclui/aclui.c 2005-07-01 03:58:55 UTC (rev 16366) +++ trunk/reactos/lib/aclui/aclui.c 2005-07-01 12:09:04 UTC (rev 16367) @@ -21,103 +21,486 @@ * PROJECT: ReactOS Access Control List Editor * FILE: lib/aclui/aclui.c * PURPOSE: Access Control List Editor - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> * * UPDATE HISTORY: * 08/10/2004 Created */ -#define INITGUID -#include <windows.h> -#include <commctrl.h> -#include <prsht.h> -#include <aclui.h> -#include "internal.h" -#include "resource.h" +#include "acluilib.h" HINSTANCE hDllInstance; -UINT CALLBACK -SecurityPageCallback(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp) +static LPARAM +ListViewGetSelectedItemData(IN HWND hwnd) { - switch(uMsg) - { - case PSPCB_CREATE: + int Index; + + Index = ListView_GetNextItem(hwnd, + -1, + LVNI_SELECTED); + if (Index != -1) { - PSECURITY_PAGE sp; + LVITEM li; + + li.mask = LVIF_PARAM; + li.iItem = Index; + li.iSubItem = 0; + + if (ListView_GetItem(hwnd, + &li)) + { + return li.lParam; + } + } + + return 0; +} - sp = LocalAlloc(LHND, sizeof(SECURITY_PAGE)); - if(sp != NULL) - { - /* save the pointer to the ISecurityInformation interface */ - sp->psi = (LPSECURITYINFO)ppsp->lParam; - /* set the lParam to the allocated structure */ - ppsp->lParam = (LPARAM)sp; - return TRUE; - } - return FALSE; +static VOID +DestroySecurityPage(IN PSECURITY_PAGE sp) +{ + if(sp->hiUsrs != NULL) + { + ImageList_Destroy(sp->hiUsrs); } - case PSPCB_RELEASE: + + HeapFree(GetProcessHeap(), + 0, + sp); +} + +static VOID +FreeAceList(IN PACE_LISTITEM *AceListHead) +{ + PACE_LISTITEM CurItem, NextItem; + + CurItem = *AceListHead; + while (CurItem != NULL) { - if(ppsp->lParam != 0) - { - PSECURITY_PAGE sp = (PSECURITY_PAGE)ppsp->lParam; - if(sp->hiUsrs != NULL) + /* free the SID string if present */ + if (CurItem->DisplayString != NULL) { - ImageList_Destroy(sp->hiUsrs); + LocalFree((HLOCAL)CurItem->DisplayString); } - LocalFree((HLOCAL)sp); - } - return FALSE; + + /* free the ACE list item */ + NextItem = CurItem->Next; + HeapFree(GetProcessHeap(), + 0, + CurItem); + CurItem = NextItem; } - } + + *AceListHead = NULL; +} - return FALSE; +static PACE_LISTITEM +FindSidInAceList(IN PACE_LISTITEM AceListHead, + IN PSID Sid) +{ + PACE_LISTITEM CurItem; + + for (CurItem = AceListHead; + CurItem != NULL; + CurItem = CurItem->Next) + { + if (EqualSid((PSID)(CurItem + 1), + Sid)) + { + return CurItem; + } + } + + return NULL; } +static VOID +ReloadUsersGroupsList(IN PSECURITY_PAGE sp) +{ + PSECURITY_DESCRIPTOR SecurityDescriptor; + BOOL DaclPresent, DaclDefaulted; + PACL Dacl = NULL; + HRESULT hRet; -INT_PTR CALLBACK -SecurityPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) + /* delete the cached ACL */ + FreeAceList(&sp->AceListHead); + + /* query the ACL */ + hRet = sp->psi->lpVtbl->GetSecurity(sp->psi, + DACL_SECURITY_INFORMATION, + &SecurityDescriptor, + FALSE); + if (SUCCEEDED(hRet) && SecurityDescriptor != NULL) + { + if (GetSecurityDescriptorDacl(SecurityDescriptor, + &DaclPresent, + &Dacl, + &DaclDefaulted)) + { + PACE_LISTITEM AceListItem, *NextAcePtr; + PSID Sid; + PVOID Ace; + ULONG AceIndex; + DWORD AccountNameSize, DomainNameSize, SidLength; + SID_NAME_USE SidNameUse; + DWORD LookupResult; + + NextAcePtr = &sp->AceListHead; + + for (AceIndex = 0; + AceIndex < Dacl->AceCount; + AceIndex++) + { + GetAce(Dacl, + AceIndex, + &Ace); + + Sid = (PSID)&((PACCESS_ALLOWED_ACE)Ace)->SidStart; + + if (!FindSidInAceList(sp->AceListHead, + Sid)) + { + SidLength = GetLengthSid(Sid); + + AccountNameSize = 0; + DomainNameSize = 0; + + /* calculate the size of the buffer we need to calculate */ + LookupAccountSid(NULL, /* FIXME */ + Sid, + NULL, + &AccountNameSize, + NULL, + &DomainNameSize, + &SidNameUse); + + /* allocate the ace */ + AceListItem = HeapAlloc(GetProcessHeap(), + 0, + sizeof(ACE_LISTITEM) + + SidLength + + ((AccountNameSize + DomainNameSize) * sizeof(WCHAR))); + if (AceListItem != NULL) + { + AceListItem->AccountName = (LPWSTR)((ULONG_PTR)(AceListItem + 1) + SidLength); + AceListItem->DomainName = AceListItem->AccountName + AccountNameSize; + + CopySid(SidLength, + (PSID)(AceListItem + 1), + Sid); + + LookupResult = ERROR_SUCCESS; + if (!LookupAccountSid(NULL, /* FIXME */ + Sid, + AceListItem->AccountName, + &AccountNameSize, + AceListItem->DomainName, + &DomainNameSize, + &SidNameUse)) + { + LookupResult = GetLastError(); + if (LookupResult != ERROR_NONE_MAPPED) + { + HeapFree(GetProcessHeap(), + 0, + AceListItem); + continue; + } + } + + if (AccountNameSize == 0) + { + AceListItem->AccountName = NULL; + } + if (DomainNameSize == 0) + { + AceListItem->DomainName = NULL; + } + + AceListItem->Next = NULL; + if (LookupResult == ERROR_NONE_MAPPED) + { + if (!ConvertSidToStringSid(Sid, + &AceListItem->DisplayString)) + { + AceListItem->DisplayString = NULL; + } + } + else + { + LSA_HANDLE LsaHandle; + NTSTATUS Status; + + AceListItem->DisplayString = NULL; + + /* read the domain of the SID */ + if (OpenLSAPolicyHandle(NULL, /* FIXME */ + POLICY_LOOKUP_NAMES | POLICY_VIEW_LOCAL_INFORMATION, + &LsaHandle)) + { + PLSA_REFERENCED_DOMAIN_LIST ReferencedDomain; + PLSA_TRANSLATED_NAME Names; + PLSA_TRUST_INFORMATION Domain; + PLSA_UNICODE_STRING DomainName; + PPOLICY_ACCOUNT_DOMAIN_INFO PolicyAccountDomainInfo = NULL; + + Status = LsaLookupSids(LsaHandle, + 1, + &Sid, + &ReferencedDomain, + &Names); + if (NT_SUCCESS(Status)) + { + if (ReferencedDomain != NULL && + Names->DomainIndex >= 0) + { + Domain = &ReferencedDomain->Domains[Names->DomainIndex]; + DomainName = &Domain->Name; + } + else + { + Domain = NULL; + DomainName = NULL; + } + + AceListItem->SidNameUse = Names->Use; + + switch (Names->Use) + { + case SidTypeAlias: + if (Domain != NULL) + { + /* query the domain name for BUILTIN accounts */ + Status = LsaQueryInformationPolicy(LsaHandle, + PolicyAccountDomainInformation, + (PVOID*)&PolicyAccountDomainInfo); + if (NT_SUCCESS(Status)) + { + DomainName = &PolicyAccountDomainInfo->DomainName; + + /* make the user believe this is a group */ + AceListItem->SidNameUse = SidTypeGroup; + } + } + /* fall through */ + + case SidTypeUser: + { + if (Domain != NULL) + { + AceListItem->DisplayString = (LPWSTR)LocalAlloc(LMEM_FIXED, + (AccountNameSize * sizeof(WCHAR)) + + (DomainName->Length + sizeof(WCHAR)) + + (Names->Name.Length + sizeof(WCHAR)) + + (4 * sizeof(WCHAR))); + if (AceListItem->DisplayString != NULL) + { + WCHAR *s; + + /* NOTE: LSA_UNICODE_STRINGs are not always NULL-terminated! */ + + wcscpy(AceListItem->DisplayString, + AceListItem->AccountName); + wcscat(AceListItem->DisplayString, + L" ("); + s = AceListItem->DisplayString + wcslen(AceListItem->DisplayString); + CopyMemory(s, + DomainName->Buffer, + DomainName->Length); + s += DomainName->Length / sizeof(WCHAR); + *(s++) = L'\\'; + CopyMemory(s, + Names->Name.Buffer, + Names->Name.Length); + s += Names->Name.Length / sizeof(WCHAR); + *(s++) = L')'; + *s = L'\0'; + } + + /* mark the ace as a user unless it's a + BUILTIN account */ + if (PolicyAccountDomainInfo == NULL) + { + AceListItem->SidNameUse = SidTypeUser; + } + } + break; + } + + case SidTypeWellKnownGroup: + { + /* make the user believe this is a group */ + AceListItem->SidNameUse = SidTypeGroup; + break; + } + + default: + { + break; + } + } + + if (PolicyAccountDomainInfo != NULL) + { + LsaFreeMemory(PolicyAccountDomainInfo); + } + + LsaFreeMemory(ReferencedDomain); + LsaFreeMemory(Names); + } + LsaClose(LsaHandle); + } + } + + /* append item to the cached ACL */ + *NextAcePtr = AceListItem; + NextAcePtr = &AceListItem->Next; + } + } + } + } + LocalFree((HLOCAL)SecurityDescriptor); + } +} + +static VOID +FillUsersGroupsList(IN PSECURITY_PAGE sp) { - PSECURITY_PAGE sp; - - switch(uMsg) - { - case WM_INITDIALOG: + LPARAM SelLParam; + PACE_LISTITEM CurItem; + RECT rcLvClient; + + SelLParam = ListViewGetSelectedItemData(sp->hWndAceList); + + DisableRedrawWindow(sp->hWndAceList); + + ListView_DeleteAllItems(sp->hWndAceList); + + ReloadUsersGroupsList(sp); + + for (CurItem = sp->AceListHead; + CurItem != NULL; + CurItem = CurItem->Next) { - sp = (PSECURITY_PAGE)lParam; - if(sp != NULL) - { - LV_COLUMN lvc; - RECT rcLvClient; - - sp->hWnd = hwndDlg; - sp->hWndUsrList = GetDlgItem(hwndDlg, IDC_ACELIST); - sp->hiUsrs = ImageList_LoadBitmap(hDllInstance, MAKEINTRESOURCE(IDB_USRGRPIMAGES), 16, 3, 0); - - /* save the pointer to the structure */ - SetWindowLongPtr(hwndDlg, DWL_USER, (DWORD_PTR)sp); - - GetClientRect(sp->hWndUsrList, &rcLvClient); - - /* setup the listview control */ - ListView_SetExtendedListViewStyleEx(sp->hWndUsrList, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT); - ListView_SetImageList(sp->hWndUsrList, sp->hiUsrs, LVSIL_SMALL); + LVITEM li; - /* add a column to the list view */ - lvc.mask = LVCF_FMT | LVCF_WIDTH; - lvc.fmt = LVCFMT_LEFT; - lvc.cx = rcLvClient.right; - ListView_InsertColumn(sp->hWndUsrList, 0, &lvc); - - /* FIXME - hide controls in case the flags aren't present */ - } - break; + 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); } - } - return 0; + + EnableRedrawWindow(sp->hWndAceList); + + GetClientRect(sp->hWndAceList, &rcLvClient); + + ListView_SetColumnWidth(sp->hWndAceList, + 0, + rcLvClient.right); } +static UINT CALLBACK +SecurityPageCallback(IN HWND hwnd, + IN UINT uMsg, + IN LPPROPSHEETPAGE ppsp) +{ + PSECURITY_PAGE sp = (PSECURITY_PAGE)ppsp->lParam; + + switch(uMsg) + { + case PSPCB_CREATE: + { + return TRUE; + } + case PSPCB_RELEASE: + { + DestroySecurityPage(sp); + return FALSE; + } + } + + return FALSE; +} + + +static INT_PTR CALLBACK +SecurityPageProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PSECURITY_PAGE sp; + + switch(uMsg) + { + case WM_INITDIALOG: + { + sp = (PSECURITY_PAGE)((LPPROPSHEETPAGE)lParam)->lParam; + if(sp != NULL) + { + LV_COLUMN lvc; + RECT rcLvClient; + + sp->hWnd = hwndDlg; + sp->hWndAceList = GetDlgItem(hwndDlg, IDC_ACELIST); + + /* save the pointer to the structure */ + SetWindowLongPtr(hwndDlg, + DWL_USER, + (DWORD_PTR)sp); + + sp->hiUsrs = ImageList_LoadBitmap(hDllInstance, + MAKEINTRESOURCE(IDB_USRGRPIMAGES), + 16, + 3, + 0); + + /* setup the listview control */ + ListView_SetExtendedListViewStyleEx(sp->hWndAceList, + LVS_EX_FULLROWSELECT, + LVS_EX_FULLROWSELECT); + ListView_SetImageList(sp->hWndAceList, + sp->hiUsrs, + LVSIL_SMALL); + + GetClientRect(sp->hWndAceList, &rcLvClient); + + /* add a column to the list view */ + lvc.mask = LVCF_FMT | LVCF_WIDTH; + lvc.fmt = LVCFMT_LEFT; + lvc.cx = rcLvClient.right; + ListView_InsertColumn(sp->hWndAceList, 0, &lvc); + + FillUsersGroupsList(sp); + + /* FIXME - hide controls in case the flags aren't present */ + } + break; + } + } + return 0; +} + + /* * CreateSecurityPage EXPORTED * @@ -125,48 +508,65 @@ */ HPROPSHEETPAGE WINAPI -CreateSecurityPage(LPSECURITYINFO psi) +CreateSecurityPage(IN LPSECURITYINFO psi) { - PROPSHEETPAGE psp; - SI_OBJECT_INFO ObjectInfo; - HRESULT hRet; + PROPSHEETPAGE psp; + PSECURITY_PAGE sPage; + SI_OBJECT_INFO ObjectInfo; + HRESULT hRet; - if(psi == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); + if(psi == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); - DPRINT("No ISecurityInformation class passed!\n"); - return NULL; - } + DPRINT("No ISecurityInformation class passed!\n"); + return NULL; + } - /* get the object information from the server interface */ - hRet = psi->lpVtbl->GetObjectInformation(psi, &ObjectInfo); + /* get the object information from the server interface */ + hRet = psi->lpVtbl->GetObjectInformation(psi, &ObjectInfo); - if(FAILED(hRet)) - { - SetLastError(hRet); + if(FAILED(hRet)) + { + SetLastError(hRet); - DPRINT("CreateSecurityPage() failed!\n"); - return NULL; - } + DPRINT("CreateSecurityPage() failed!\n"); + return NULL; + } + + sPage = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SECURITY_PAGE)); + if (sPage == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + + DPRINT("Not enough memory to allocate a SECURITY_PAGE!\n"); + return NULL; + } + sPage->psi = psi; + sPage->ObjectInfo = ObjectInfo; - psp.dwSize = sizeof(PROPSHEETPAGE); - psp.dwFlags = PSP_DEFAULT | PSP_USECALLBACK; - psp.hInstance = hDllInstance; - psp.pszTemplate = MAKEINTRESOURCE(IDD_SECPAGE); - psp.pfnDlgProc = SecurityPageProc; - psp.lParam = (LPARAM)psi; - psp.pfnCallback = SecurityPageCallback; + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_USECALLBACK; + psp.hInstance = hDllInstance; + psp.pszTemplate = MAKEINTRESOURCE(IDD_SECPAGE); + psp.pfnDlgProc = SecurityPageProc; + psp.lParam = (LPARAM)sPage; + psp.pfnCallback = SecurityPageCallback; - if((ObjectInfo.dwFlags & SI_PAGE_TITLE) != 0 && - ObjectInfo.pszPageTitle != NULL && ObjectInfo.pszPageTitle[0] != L'\0') - { - /* Set the page title if the flag is present and the string isn't empty */ - psp.pszTitle = ObjectInfo.pszPageTitle; - psp.dwFlags |= PSP_USETITLE; - } + if((ObjectInfo.dwFlags & SI_PAGE_TITLE) != 0 && + ObjectInfo.pszPageTitle != NULL && ObjectInfo.pszPageTitle[0] != L'\0') + { + /* Set the page title if the flag is present and the string isn't empty */ + psp.pszTitle = ObjectInfo.pszPageTitle; + psp.dwFlags |= PSP_USETITLE; + } + + /* NOTE: the SECURITY_PAGE structure will be freed by the property page + callback! */ - return CreatePropertySheetPage(&psp); + return CreatePropertySheetPage(&psp); } @@ -177,99 +577,95 @@ */ BOOL WINAPI -EditSecurity(HWND hwndOwner, LPSECURITYINFO psi) +EditSecurity(IN HWND hwndOwner, + IN LPSECURITYINFO psi) { - HRESULT hRet; - SI_OBJECT_INFO ObjectInfo; - PROPSHEETHEADER psh; - HPROPSHEETPAGE hPages[1]; - LPVOID lpCaption; - BOOL Ret; - - if(psi == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - - DPRINT("No ISecurityInformation class passed!\n"); - return FALSE; - } - - /* get the object information from the server interface */ - hRet = psi->lpVtbl->GetObjectInformation(psi, &ObjectInfo); - - if(FAILED(hRet)) - { - SetLastError(hRet); - - DPRINT("GetObjectInformation() failed!\n"); - return FALSE; - } + HRESULT hRet; + SI_OBJECT_INFO ObjectInfo; + PROPSHEETHEADER psh; + HPROPSHEETPAGE hPages[1]; + LPWSTR lpCaption; + BOOL Ret; - /* create the page */ - hPages[0] = CreateSecurityPage(psi); - if(hPages[0] == NULL) - { - DPRINT("CreateSecurityPage(), couldn't create property sheet!\n"); - return FALSE; - } - - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_DEFAULT; - psh.hwndParent = hwndOwner; - psh.hInstance = hDllInstance; - if((ObjectInfo.dwFlags & SI_PAGE_TITLE) != 0 && - 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; - 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. */ - FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ARGUMENT_ARRAY, - hDllInstance, - IDS_PSP_TITLE, - 0, - (LPSTR)lpCaption, - 0, - (va_list*)&ObjectInfo.pszObjectName); /* Acc. to MSDN, should work */ - psh.pszCaption = lpCaption; - } - psh.nPages = sizeof(hPages) / sizeof(HPROPSHEETPAGE); - psh.nStartPage = 0; - psh.phpage = hPages; - - Ret = (PropertySheet(&psh) != -1); - - if(lpCaption != NULL) - { - LocalFree((HLOCAL)lpCaption); - } - - return Ret; + if(psi == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + + DPRINT("No ISecurityInformation class passed!\n"); + return FALSE; + } + + /* get the object information from the server interface */ + hRet = psi->lpVtbl->GetObjectInformation(psi, &ObjectInfo); + + if(FAILED(hRet)) + { + SetLastError(hRet); + + DPRINT("GetObjectInformation() failed!\n"); + return FALSE; + } + + /* create the page */ + hPages[0] = CreateSecurityPage(psi); + if(hPages[0] == NULL) + { + DPRINT("CreateSecurityPage(), couldn't create property sheet!\n"); + return FALSE; + } + + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_DEFAULT; + psh.hwndParent = hwndOwner; + psh.hInstance = hDllInstance; + if((ObjectInfo.dwFlags & SI_PAGE_TITLE) != 0 && + 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; + 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; + } + + psh.nPages = sizeof(hPages) / sizeof(HPROPSHEETPAGE); + psh.nStartPage = 0; + psh.phpage = hPages; + + Ret = (PropertySheet(&psh) != -1); + + if(lpCaption != NULL) + { + LocalFree((HLOCAL)lpCaption); + } + + return Ret; } BOOL STDCALL -DllMain(HINSTANCE hinstDLL, - DWORD dwReason, - LPVOID lpvReserved) +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) { - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - hDllInstance = hinstDLL; - break; - case DLL_THREAD_ATTACH: - break; - case DLL_THREAD_DETACH: - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + hDllInstance = hinstDLL; + break; + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + break; + } + return TRUE; } _____ Modified: trunk/reactos/lib/aclui/aclui.xml --- trunk/reactos/lib/aclui/aclui.xml 2005-07-01 03:58:55 UTC (rev 16366) +++ trunk/reactos/lib/aclui/aclui.xml 2005-07-01 12:09:04 UTC (rev 16367) @@ -3,16 +3,16 @@ <include base="aclui">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x0600</define> - <library>rosrtl</library> <library>ntdll</library> <library>kernel32</library> <library>user32</library> <library>comctl32</library> <file>aclui.c</file> + <file>misc.c</file> <file>aclui.rc</file> + <pch>acluilib.h</pch> </module> _____ Copied: trunk/reactos/lib/aclui/acluilib.h (from rev 16307, trunk/reactos/lib/aclui/internal.h) --- trunk/reactos/lib/aclui/internal.h 2005-06-27 18:56:50 UTC (rev 16307) +++ trunk/reactos/lib/aclui/acluilib.h 2005-07-01 12:09:04 UTC (rev 16367) @@ -0,0 +1,58 @@ +#include <windows.h> +#include <commctrl.h> +#include <prsht.h> +#include <aclui.h> +#include <sddl.h> +#include <ntsecapi.h> +#include "resource.h" + +ULONG DbgPrint(PCH Format,...); +#define DPRINT DbgPrint + +#ifndef NT_SUCCESS +#define NT_SUCCESS(status) ((LONG)(status) >= 0) +#endif + +#define EnableRedrawWindow(hwnd) \ + SendMessage((hwnd), WM_SETREDRAW, TRUE, 0) + +#define DisableRedrawWindow(hwnd) \ + SendMessage((hwnd), WM_SETREDRAW, FALSE, 0) + +extern HINSTANCE hDllInstance; + +typedef struct _ACE_LISTITEM +{ + struct _ACE_LISTITEM *Next; + SID_NAME_USE SidNameUse; + WCHAR *DisplayString; + WCHAR *AccountName; + WCHAR *DomainName; +} ACE_LISTITEM, *PACE_LISTITEM; + +typedef struct _SECURITY_PAGE +{ + HWND hWnd; + + /* Main ACE List */ + HWND hWndAceList; + PACE_LISTITEM AceListHead; + + HIMAGELIST hiUsrs; + + LPSECURITYINFO psi; + SI_OBJECT_INFO ObjectInfo; +} SECURITY_PAGE, *PSECURITY_PAGE; + +BOOL +OpenLSAPolicyHandle(IN WCHAR *SystemName, + IN ACCESS_MASK DesiredAccess, + OUT PLSA_HANDLE PolicyHandle); + +DWORD +LoadAndFormatString(IN HINSTANCE hInstance, + IN UINT uID, + OUT LPWSTR *lpTarget, + ...); + +/* EOF */ _____ Deleted: trunk/reactos/lib/aclui/internal.h --- trunk/reactos/lib/aclui/internal.h 2005-07-01 03:58:55 UTC (rev 16366) +++ trunk/reactos/lib/aclui/internal.h 2005-07-01 12:09:04 UTC (rev 16367) @@ -1,19 +0,0 @@ -#ifndef __ACLUI_INTERNAL_H -#define __ACLUI_INTERNAL_H - -ULONG DbgPrint(PCH Format,...); -#define DPRINT DbgPrint - -extern HINSTANCE hDllInstance; - -typedef struct _SECURITY_PAGE -{ - HWND hWnd; - HWND hWndUsrList; - HIMAGELIST hiUsrs; - LPSECURITYINFO psi; -} SECURITY_PAGE, *PSECURITY_PAGE; - -#endif /* __ACLUI_INTERNAL_H */ - -/* EOF */ _____ Added: trunk/reactos/lib/aclui/misc.c --- trunk/reactos/lib/aclui/misc.c 2005-07-01 03:58:55 UTC (rev 16366) +++ trunk/reactos/lib/aclui/misc.c 2005-07-01 12:09:04 UTC (rev 16367) @@ -0,0 +1,163 @@ +/* + * 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/misc.c + * PURPOSE: Access Control List Editor + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * + * UPDATE HISTORY: + * 07/01/2005 Created + */ +#define INITGUID +#include <windows.h> +#include <aclui.h> + +#include "acluilib.h" + +static INT +LengthOfStrResource(IN HINSTANCE hInst, + IN UINT uID) +{ + HRSRC hrSrc; + HGLOBAL hRes; [truncated at 1000 lines; 129 more skipped]

1 0

[ion] 16366: These two escaped... fix them too
by ion＠svn.reactos.com 01 Jul '05

01 Jul '05

These two escaped... fix them too Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h _____ Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h --- trunk/reactos/lib/fslib/vfatlib/vfatlib.h 2005-07-01 03:41:44 UTC (rev 16365) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.h 2005-07-01 03:58:55 UTC (rev 16366) @@ -5,7 +5,7 @@ */ #include <windows.h> -#include <fmifs.h> +#include <fmifs/fmifs.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h --- trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h 2005-07-01 03:41:44 UTC (rev 16365) +++ trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h 2005-07-01 03:58:55 UTC (rev 16366) @@ -4,7 +4,7 @@ * FILE: vfatxlib.h */ #include <windows.h> -#include <fmifs.h> +#include <fmifs/fmifs.h> #define NTOS_MODE_USER #include <ndk/ntndk.h>

1 0

[ion] 16365:
by ion＠svn.reactos.com 01 Jul '05

01 Jul '05

Property changes on: trunk/reactos/subsys/csrss ___________________________________________________________________ Name: svn:ignore - csrss.coff csrss.exe csrss.nostrip.exe *.d *.o *.a *.sym *.map win32k.c makefile + csrss.coff csrss.exe csrss.nostrip.exe *.d *.o *.a *.sym *.map win32k.c *.gch makefile Property changes on: trunk/reactos/subsys/csrss/win32csr ___________________________________________________________________ Name: svn:ignore - win32csr.coff win32csr.dll win32csr.nostrip.dll *.d *.o *.a *.sym *.map makefile + win32csr.coff win32csr.dll win32csr.nostrip.dll *.d *.o *.a *.sym *.map *.gch makefile Property changes on: trunk/reactos/subsys/smss ___________________________________________________________________ Name: svn:ignore - *.coff *.exe *.d *.o *.a *.sym *.map makefile + *.coff *.exe *.d *.o *.a *.sym *.map *.gch makefile

1 0

[ion] 16364: Fix breakage caused by accidental commit in the last revision
by ion＠svn.reactos.com 01 Jul '05

01 Jul '05

Fix breakage caused by accidental commit in the last revision Modified: trunk/reactos/include/fslib/vfatlib.h Modified: trunk/reactos/include/fslib/vfatxlib.h Modified: trunk/reactos/lib/epsapi/enum/drivers.c Modified: trunk/reactos/lib/epsapi/enum/modules.c Modified: trunk/reactos/lib/epsapi/enum/processes.c Modified: trunk/reactos/lib/fmifs/chkdsk.c Modified: trunk/reactos/lib/fmifs/compress.c Modified: trunk/reactos/lib/fmifs/diskcopy.c Modified: trunk/reactos/lib/fmifs/extend.c Modified: trunk/reactos/lib/fmifs/format.c Modified: trunk/reactos/lib/fmifs/init.c Modified: trunk/reactos/lib/fmifs/label.c Modified: trunk/reactos/lib/fmifs/media.c Modified: trunk/reactos/lib/psapi/precomp.h Modified: trunk/reactos/lib/samlib/samlib.c Modified: trunk/reactos/lib/syssetup/install.c Modified: trunk/reactos/subsys/system/format/format.c Modified: trunk/reactos/subsys/system/usetup/usetup.h _____ Modified: trunk/reactos/include/fslib/vfatlib.h --- trunk/reactos/include/fslib/vfatlib.h 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/include/fslib/vfatlib.h 2005-07-01 03:40:52 UTC (rev 16364) @@ -7,7 +7,7 @@ #ifndef __VFATLIB_H #define __VFATLIB_H -#include <fmifs.h> +#include <fmifs/fmifs.h> NTSTATUS VfatInitialize (VOID); _____ Modified: trunk/reactos/include/fslib/vfatxlib.h --- trunk/reactos/include/fslib/vfatxlib.h 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/include/fslib/vfatxlib.h 2005-07-01 03:40:52 UTC (rev 16364) @@ -7,7 +7,7 @@ #ifndef __VFATXLIB_H #define __VFATXLIB_H -#include <fmifs.h> +#include <fmifs/fmifs.h> NTSTATUS VfatxInitialize (VOID); _____ Modified: trunk/reactos/lib/epsapi/enum/drivers.c --- trunk/reactos/lib/epsapi/enum/drivers.c 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/lib/epsapi/enum/drivers.c 2005-07-01 03:40:52 UTC (rev 16364) @@ -21,7 +21,7 @@ #define NDEBUG #include <debug.h> -#include <epsapi.h> +#include <epsapi/epsapi.h> NTSTATUS NTAPI PsaEnumerateSystemModules(IN PSYSMOD_ENUM_ROUTINE Callback, _____ Modified: trunk/reactos/lib/epsapi/enum/modules.c --- trunk/reactos/lib/epsapi/enum/modules.c 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/lib/epsapi/enum/modules.c 2005-07-01 03:40:52 UTC (rev 16364) @@ -25,7 +25,7 @@ #define NDEBUG #include <debug.h> -#include <epsapi.h> +#include <epsapi/epsapi.h> NTSTATUS NTAPI PsaEnumerateProcessModules(IN HANDLE ProcessHandle, _____ Modified: trunk/reactos/lib/epsapi/enum/processes.c --- trunk/reactos/lib/epsapi/enum/processes.c 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/lib/epsapi/enum/processes.c 2005-07-01 03:40:52 UTC (rev 16364) @@ -35,7 +35,7 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include <epsapi.h> +#include <epsapi/epsapi.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/fmifs/chkdsk.c --- trunk/reactos/lib/fmifs/chkdsk.c 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/lib/fmifs/chkdsk.c 2005-07-01 03:40:52 UTC (rev 16364) @@ -12,9 +12,8 @@ #define UNICODE #define _UNICODE #include <windows.h> -#include <fmifs.h> +#include <fmifs/fmifs.h> - /* FMIFS.1 */ VOID STDCALL Chkdsk (PWCHAR DriveRoot, _____ Modified: trunk/reactos/lib/fmifs/compress.c --- trunk/reactos/lib/fmifs/compress.c 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/lib/fmifs/compress.c 2005-07-01 03:40:52 UTC (rev 16364) @@ -13,9 +13,7 @@ #define _UNICODE #include <windows.h> #include <winioctl.h> -#include <fmifs.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/fmifs/diskcopy.c --- trunk/reactos/lib/fmifs/diskcopy.c 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/lib/fmifs/diskcopy.c 2005-07-01 03:40:52 UTC (rev 16364) @@ -12,7 +12,6 @@ #define UNICODE #define _UNICODE #include <windows.h> -#include <fmifs.h> /* FMIFS.3 */ VOID STDCALL _____ Modified: trunk/reactos/lib/fmifs/extend.c --- trunk/reactos/lib/fmifs/extend.c 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/lib/fmifs/extend.c 2005-07-01 03:40:52 UTC (rev 16364) @@ -12,7 +12,6 @@ #define UNICODE #define _UNICODE #include <windows.h> -#include <fmifs.h> /* FMIFS.5 */ VOID STDCALL _____ Modified: trunk/reactos/lib/fmifs/format.c --- trunk/reactos/lib/fmifs/format.c 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/lib/fmifs/format.c 2005-07-01 03:40:52 UTC (rev 16364) @@ -14,7 +14,7 @@ #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include <fmifs.h> +#include <fmifs/fmifs.h> #include <fslib/vfatlib.h> #include <string.h> _____ Modified: trunk/reactos/lib/fmifs/init.c --- trunk/reactos/lib/fmifs/init.c 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/lib/fmifs/init.c 2005-07-01 03:40:52 UTC (rev 16364) @@ -12,7 +12,6 @@ #define UNICODE #define _UNICODE #include <windows.h> -#include <fmifs.h> static BOOL FmIfsInitialized = FALSE; _____ Modified: trunk/reactos/lib/fmifs/label.c --- trunk/reactos/lib/fmifs/label.c 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/lib/fmifs/label.c 2005-07-01 03:40:52 UTC (rev 16364) @@ -12,9 +12,7 @@ #define UNICODE #define _UNICODE #include <windows.h> -#include <fmifs.h> - /* FMIFS.10 */ VOID STDCALL SetLabel (VOID) _____ Modified: trunk/reactos/lib/fmifs/media.c --- trunk/reactos/lib/fmifs/media.c 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/lib/fmifs/media.c 2005-07-01 03:40:52 UTC (rev 16364) @@ -12,9 +12,7 @@ #define UNICODE #define _UNICODE #include <windows.h> -#include <fmifs.h> - /* FMIFS.9 */ VOID STDCALL QuerySupportedMedia (VOID) _____ Modified: trunk/reactos/lib/psapi/precomp.h --- trunk/reactos/lib/psapi/precomp.h 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/lib/psapi/precomp.h 2005-07-01 03:40:52 UTC (rev 16364) @@ -4,7 +4,7 @@ #include <ndk/ntndk.h> #include <psapi.h> -#include <epsapi.h> +#include <epsapi/epsapi.h> #include "internal.h" _____ Modified: trunk/reactos/lib/samlib/samlib.c --- trunk/reactos/lib/samlib/samlib.c 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/lib/samlib/samlib.c 2005-07-01 03:40:52 UTC (rev 16364) @@ -32,9 +32,6 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include <samlib.h> - - #define NDEBUG #include "debug.h" _____ Modified: trunk/reactos/lib/syssetup/install.c --- trunk/reactos/lib/syssetup/install.c 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/lib/syssetup/install.c 2005-07-01 03:40:52 UTC (rev 16364) @@ -36,7 +36,7 @@ #include <tchar.h> #include <stdlib.h> -#include <samlib.h> +#include <samlib/samlib.h> #include <syssetup.h> #include <userenv.h> #include <setupapi.h> _____ Modified: trunk/reactos/subsys/system/format/format.c --- trunk/reactos/subsys/system/format/format.c 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/subsys/system/format/format.c 2005-07-01 03:40:52 UTC (rev 16364) @@ -5,7 +5,7 @@ #include <stdlib.h> #include <string.h> #include <windows.h> -#include <fmifs.h> +#include <fmifs/fmifs.h> #include <tchar.h> #include "resource.h" _____ Modified: trunk/reactos/subsys/system/usetup/usetup.h --- trunk/reactos/subsys/system/usetup/usetup.h 2005-07-01 03:25:35 UTC (rev 16363) +++ trunk/reactos/subsys/system/usetup/usetup.h 2005-07-01 03:40:52 UTC (rev 16364) @@ -29,7 +29,7 @@ /* PSDK/NDK */ #include <windows.h> -#include <fmifs.h> +#include <fmifs/fmifs.h> #define NTOS_MODE_USER #include <ndk/ntndk.h>

1 0

[ion] 16363: Fix explorer/ibrowser build
by ion＠svn.reactos.com 01 Jul '05

01 Jul '05

Fix explorer/ibrowser build Added: trunk/reactos/include/epsapi/ Added: trunk/reactos/include/epsapi/epsapi.h Deleted: trunk/reactos/include/epsapi.h Added: trunk/reactos/include/expat/ Added: trunk/reactos/include/expat/expat.h Added: trunk/reactos/include/expat/expat_external.h Added: trunk/reactos/include/fmifs/ Added: trunk/reactos/include/fmifs/fmifs.h Deleted: trunk/reactos/include/fmifs.h Added: trunk/reactos/include/samlib/ Added: trunk/reactos/include/samlib/samlib.h Deleted: trunk/reactos/include/samlib.h Deleted: trunk/reactos/lib/expat/lib/expat.h Deleted: trunk/reactos/lib/expat/lib/expat_external.h Modified: trunk/reactos/lib/expat/lib/xmlparse.c Modified: trunk/reactos/lib/expat/lib/xmlrole.c Modified: trunk/reactos/lib/expat/lib/xmltok.c Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h Modified: trunk/reactos/subsys/system/ibrowser/utility/xmlstorage.h _____ Copied: trunk/reactos/include/epsapi/epsapi.h (from rev 16356, trunk/reactos/include/epsapi.h) _____ Deleted: trunk/reactos/include/epsapi.h --- trunk/reactos/include/epsapi.h 2005-07-01 03:14:40 UTC (rev 16362) +++ trunk/reactos/include/epsapi.h 2005-07-01 03:25:35 UTC (rev 16363) @@ -1,135 +0,0 @@ -/* $Id$ -*/ -/* - * epsapi.h - * - * Process Status Helper API, native interface - * - * This file is part of the ReactOS Operating System. - * - * Contributors: - * Created by KJK::Hyperion <noog(a)libero.it> - * - * 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 - * DISCLAMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __EPSAPI_H_INCLUDED__ -#define __EPSAPI_H_INCLUDED__ - -/* TYPES */ -typedef NTSTATUS (NTAPI *PPROC_ENUM_ROUTINE)(IN PSYSTEM_PROCESS_INFORMATION CurrentProcess, - IN OUT PVOID CallbackContext); - -typedef NTSTATUS (NTAPI *PTHREAD_ENUM_ROUTINE)(IN PSYSTEM_THREAD_INFORMATION CurrentThread, - IN OUT PVOID CallbackContext); - -typedef NTSTATUS (NTAPI *PSYSMOD_ENUM_ROUTINE)(IN PSYSTEM_MODULE_INFORMATION_ENTRY CurrentModule, - IN OUT PVOID CallbackContext); - -typedef NTSTATUS (NTAPI *PPROCMOD_ENUM_ROUTINE)(IN HANDLE ProcessHandle, - IN PLDR_DATA_TABLE_ENTRY CurrentModule, - IN OUT PVOID CallbackContext); - -/* CONSTANTS */ -#define FAILED_WITH_STATUS DEFINE_DBG_MSG("%s() failed, status 0x%08X") - -/* PROTOTYPES */ -/* Processes and threads */ -/* enumeration */ -NTSTATUS NTAPI -PsaEnumerateProcessesAndThreads(IN PPROC_ENUM_ROUTINE ProcessCallback, - IN OUT PVOID ProcessCallbackContext, - IN PTHREAD_ENUM_ROUTINE ThreadCallback, - IN OUT PVOID ThreadCallbackContext); - -NTSTATUS NTAPI -PsaEnumerateProcesses(IN PPROC_ENUM_ROUTINE Callback, - IN OUT PVOID CallbackContext); - -NTSTATUS NTAPI -PsaEnumerateThreads(IN PTHREAD_ENUM_ROUTINE Callback, - IN OUT PVOID CallbackContext); - -/* capturing & walking */ -NTSTATUS NTAPI -PsaCaptureProcessesAndThreads(OUT PSYSTEM_PROCESS_INFORMATION * ProcessesAndThreads); - -NTSTATUS NTAPI -PsaWalkProcessesAndThreads(IN PSYSTEM_PROCESS_INFORMATION ProcessesAndThreads, - IN PPROC_ENUM_ROUTINE ProcessCallback, - IN OUT PVOID ProcessCallbackContext, - IN PTHREAD_ENUM_ROUTINE ThreadCallback, - IN OUT PVOID ThreadCallbackContext); - -NTSTATUS NTAPI -PsaWalkProcesses(IN PSYSTEM_PROCESS_INFORMATION ProcessesAndThreads, - IN PPROC_ENUM_ROUTINE Callback, - IN OUT PVOID CallbackContext); - -NTSTATUS NTAPI -PsaWalkThreads(IN PSYSTEM_PROCESS_INFORMATION ProcessesAndThreads, - IN PTHREAD_ENUM_ROUTINE Callback, - IN OUT PVOID CallbackContext); - -PSYSTEM_PROCESS_INFORMATION FASTCALL -PsaWalkFirstProcess(IN PSYSTEM_PROCESS_INFORMATION ProcessesAndThreads); - -PSYSTEM_PROCESS_INFORMATION FASTCALL -PsaWalkNextProcess(IN PSYSTEM_PROCESS_INFORMATION CurrentProcess); - -PSYSTEM_THREAD_INFORMATION FASTCALL -PsaWalkFirstThread(IN PSYSTEM_PROCESS_INFORMATION CurrentProcess); - -PSYSTEM_THREAD_INFORMATION FASTCALL -PsaWalkNextThread(IN PSYSTEM_THREAD_INFORMATION CurrentThread); - -/* System modules */ -/* enumeration */ -NTSTATUS NTAPI -PsaEnumerateSystemModules(IN PSYSMOD_ENUM_ROUTINE Callback, - IN OUT PVOID CallbackContext); - -/* capturing & walking */ -NTSTATUS NTAPI -PsaCaptureSystemModules(OUT PSYSTEM_MODULE_INFORMATION * SystemModules); - -NTSTATUS NTAPI -PsaWalkSystemModules(IN PSYSTEM_MODULE_INFORMATION SystemModules, - IN PSYSMOD_ENUM_ROUTINE Callback, - IN OUT PVOID CallbackContext); - -PSYSTEM_MODULE_INFORMATION_ENTRY FASTCALL -PsaWalkFirstSystemModule(IN PSYSTEM_MODULE_INFORMATION SystemModules); - -PSYSTEM_MODULE_INFORMATION_ENTRY FASTCALL -PsaWalkNextSystemModule(IN PSYSTEM_MODULE_INFORMATION CurrentSystemModule); - -/* Process modules */ -NTSTATUS NTAPI -PsaEnumerateProcessModules(IN HANDLE ProcessHandle, - IN PPROCMOD_ENUM_ROUTINE Callback, - IN OUT PVOID CallbackContext); - -/* Miscellaneous */ -VOID NTAPI -PsaFreeCapture(IN PVOID Capture); - -/* The user must define these functions. They are called by PSAPI to allocate - memory. This allows PSAPI to be called from any environment */ -void *PsaiMalloc(SIZE_T size); -void *PsaiRealloc(void *ptr, SIZE_T size); -void PsaiFree(void *ptr); - -/* MACROS */ -#define DEFINE_DBG_MSG(__str__) "PSAPI: " __str__ "\n" - -#endif /* __EPSAPI_H_INCLUDED__ */ _____ Copied: trunk/reactos/include/expat/expat.h (from rev 16335, trunk/reactos/lib/expat/lib/expat.h) _____ Copied: trunk/reactos/include/expat/expat_external.h (from rev 16335, trunk/reactos/lib/expat/lib/expat_external.h) _____ Copied: trunk/reactos/include/fmifs/fmifs.h (from rev 16356, trunk/reactos/include/fmifs.h) _____ Deleted: trunk/reactos/include/fmifs.h --- trunk/reactos/include/fmifs.h 2005-07-01 03:14:40 UTC (rev 16362) +++ trunk/reactos/include/fmifs.h 2005-07-01 03:25:35 UTC (rev 16363) @@ -1,126 +0,0 @@ -#ifndef _FMIFS_H -#define _FMIFS_H -/* $Id$ - * - * fmifs.h - * - * Copyright (c) 1998 Mark Russinovich - * Systems Internals - * http://www.sysinternals.com - * - * Typedefs and definitions for using chkdsk and formatex - * functions exported by the fmifs.dll library. - * - * --- - * - * 1999-02-18 (Emanuele Aliberti) - * Normalized function names. - * - */ - -/* Output command */ -typedef -struct -{ - ULONG Lines; - PCHAR Output; - -} TEXTOUTPUT, *PTEXTOUTPUT; - - -/* Callback command types */ -typedef -enum -{ - PROGRESS, - DONEWITHSTRUCTURE, - UNKNOWN2, - UNKNOWN3, - UNKNOWN4, - UNKNOWN5, - INSUFFICIENTRIGHTS, - UNKNOWN7, - UNKNOWN8, - UNKNOWN9, - UNKNOWNA, - DONE, - UNKNOWNC, - UNKNOWND, - OUTPUT, - STRUCTUREPROGRESS - -} CALLBACKCOMMAND; - - -/* FMIFS callback definition */ -typedef -BOOLEAN -(STDCALL * PFMIFSCALLBACK) ( - CALLBACKCOMMAND Command, - ULONG SubAction, - PVOID ActionInfo - ); - -/* Chkdsk command in FMIFS */ -VOID -STDCALL -Chkdsk( - PWCHAR DriveRoot, - PWCHAR Format, - BOOLEAN CorrectErrors, - BOOLEAN Verbose, - BOOLEAN CheckOnlyIfDirty, - BOOLEAN ScanDrive, - PVOID Unused2, - PVOID Unused3, - PFMIFSCALLBACK Callback - ); - -/* ChkdskEx command in FMIFS (not in the original) */ -VOID -STDCALL -ChkDskEx( - PWCHAR DriveRoot, - PWCHAR Format, - BOOLEAN CorrectErrors, - BOOLEAN Verbose, - BOOLEAN CheckOnlyIfDirty, - BOOLEAN ScanDrive, - PVOID Unused2, - PVOID Unused3, - PFMIFSCALLBACK Callback - ); - -/* DiskCopy command in FMIFS */ - -VOID -STDCALL -DiskCopy(VOID); - -/* Enable/Disable volume compression */ -BOOL -STDCALL -EnableVolumeCompression( - PWCHAR DriveRoot, - USHORT Compression - ); - -/* Format command in FMIFS */ - -/* media flags */ -#define FMIFS_HARDDISK 0xC -#define FMIFS_FLOPPY 0x8 - -VOID -STDCALL -FormatEx( - PWCHAR DriveRoot, - ULONG MediaFlag, - PWCHAR Format, - PWCHAR Label, - BOOLEAN QuickFormat, - ULONG ClusterSize, - PFMIFSCALLBACK Callback - ); - -#endif /* ndef _FMIFS_H */ _____ Copied: trunk/reactos/include/samlib/samlib.h (from rev 16356, trunk/reactos/include/samlib.h) _____ Deleted: trunk/reactos/include/samlib.h --- trunk/reactos/include/samlib.h 2005-07-01 03:14:40 UTC (rev 16362) +++ trunk/reactos/include/samlib.h 2005-07-01 03:25:35 UTC (rev 16363) @@ -1,53 +0,0 @@ -/* $Id$ -*/ -/* - * samlib.h - * - * Security Account Manager API, native interface - * - * This file is part of the ReactOS Operating System. - * - * Contributors: - * Created by Eric Kohl <ekohl(a)rz-online.de> - * - * 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 - * DISCLAMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __SAMLIB_H_INCLUDED__ -#define __SAMLIB_H_INCLUDED__ - - -BOOL STDCALL -SamInitializeSAM (VOID); - -BOOL STDCALL -SamGetDomainSid (PSID *Sid); - -BOOL STDCALL -SamSetDomainSid (PSID Sid); - -BOOL STDCALL -SamCreateUser (PWSTR UserName, - PWSTR UserPassword, - PSID UserSid); - -BOOL STDCALL -SamCheckUserPassword (PWSTR UserName, - PWSTR UserPassword); - -BOOL STDCALL -SamGetUserSid (PWSTR UserName, - PSID *Sid); - -#endif /* __SAMLIB_H_INCLUDED__ */ - -/* EOF */ _____ Deleted: trunk/reactos/lib/expat/lib/expat.h --- trunk/reactos/lib/expat/lib/expat.h 2005-07-01 03:14:40 UTC (rev 16362) +++ trunk/reactos/lib/expat/lib/expat.h 2005-07-01 03:25:35 UTC (rev 16363) @@ -1,1013 +0,0 @@ -/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd - See the file COPYING for copying permission. -*/ - -#ifndef Expat_INCLUDED -#define Expat_INCLUDED 1 - -#ifdef __VMS -/* 0 1 2 3 0 1 2 3 - 1234567890123456789012345678901 1234567890123456789012345678901 */ -#define XML_SetProcessingInstructionHandler XML_SetProcessingInstrHandler -#define XML_SetUnparsedEntityDeclHandler XML_SetUnparsedEntDeclHandler -#define XML_SetStartNamespaceDeclHandler XML_SetStartNamespcDeclHandler -#define XML_SetExternalEntityRefHandlerArg XML_SetExternalEntRefHandlerArg -#endif - -#include <stdlib.h> -#include "expat_external.h" - -#ifdef __cplusplus -extern "C" { -#endif - -struct XML_ParserStruct; -typedef struct XML_ParserStruct *XML_Parser; - -/* Should this be defined using stdbool.h when C99 is available? */ -typedef unsigned char XML_Bool; -#define XML_TRUE ((XML_Bool) 1) -#define XML_FALSE ((XML_Bool) 0) - -/* The XML_Status enum gives the possible return values for several - API functions. The preprocessor #defines are included so this - stanza can be added to code that still needs to support older - versions of Expat 1.95.x: - - #ifndef XML_STATUS_OK - #define XML_STATUS_OK 1 - #define XML_STATUS_ERROR 0 - #endif - - Otherwise, the #define hackery is quite ugly and would have been - dropped. -*/ -enum XML_Status { - XML_STATUS_ERROR = 0, -#define XML_STATUS_ERROR XML_STATUS_ERROR - XML_STATUS_OK = 1, -#define XML_STATUS_OK XML_STATUS_OK - XML_STATUS_SUSPENDED = 2 -#define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED -}; - -enum XML_Error { - XML_ERROR_NONE, - XML_ERROR_NO_MEMORY, - XML_ERROR_SYNTAX, - XML_ERROR_NO_ELEMENTS, - XML_ERROR_INVALID_TOKEN, - XML_ERROR_UNCLOSED_TOKEN, - XML_ERROR_PARTIAL_CHAR, - XML_ERROR_TAG_MISMATCH, - XML_ERROR_DUPLICATE_ATTRIBUTE, - XML_ERROR_JUNK_AFTER_DOC_ELEMENT, - XML_ERROR_PARAM_ENTITY_REF, - XML_ERROR_UNDEFINED_ENTITY, - XML_ERROR_RECURSIVE_ENTITY_REF, - XML_ERROR_ASYNC_ENTITY, - XML_ERROR_BAD_CHAR_REF, - XML_ERROR_BINARY_ENTITY_REF, - XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF, - XML_ERROR_MISPLACED_XML_PI, - XML_ERROR_UNKNOWN_ENCODING, - XML_ERROR_INCORRECT_ENCODING, - XML_ERROR_UNCLOSED_CDATA_SECTION, - XML_ERROR_EXTERNAL_ENTITY_HANDLING, - XML_ERROR_NOT_STANDALONE, - XML_ERROR_UNEXPECTED_STATE, - XML_ERROR_ENTITY_DECLARED_IN_PE, - XML_ERROR_FEATURE_REQUIRES_XML_DTD, - XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING, - /* Added in 1.95.7. */ - XML_ERROR_UNBOUND_PREFIX, - /* Added in 1.95.8. */ - XML_ERROR_UNDECLARING_PREFIX, - XML_ERROR_INCOMPLETE_PE, - XML_ERROR_XML_DECL, - XML_ERROR_TEXT_DECL, - XML_ERROR_PUBLICID, - XML_ERROR_SUSPENDED, - XML_ERROR_NOT_SUSPENDED, - XML_ERROR_ABORTED, - XML_ERROR_FINISHED, - XML_ERROR_SUSPEND_PE, - /* Added in 2.0. */ - XML_ERROR_RESERVED_PREFIX_XML, - XML_ERROR_RESERVED_PREFIX_XMLNS, - XML_ERROR_RESERVED_NAMESPACE_URI -}; - -enum XML_Content_Type { - XML_CTYPE_EMPTY = 1, - XML_CTYPE_ANY, - XML_CTYPE_MIXED, - XML_CTYPE_NAME, - XML_CTYPE_CHOICE, - XML_CTYPE_SEQ -}; - -enum XML_Content_Quant { - XML_CQUANT_NONE, - XML_CQUANT_OPT, - XML_CQUANT_REP, - XML_CQUANT_PLUS -}; - -/* If type == XML_CTYPE_EMPTY or XML_CTYPE_ANY, then quant will be - XML_CQUANT_NONE, and the other fields will be zero or NULL. - If type == XML_CTYPE_MIXED, then quant will be NONE or REP and - numchildren will contain number of elements that may be mixed in - and children point to an array of XML_Content cells that will be - all of XML_CTYPE_NAME type with no quantification. - - If type == XML_CTYPE_NAME, then the name points to the name, and - the numchildren field will be zero and children will be NULL. The - quant fields indicates any quantifiers placed on the name. - - CHOICE and SEQ will have name NULL, the number of children in - numchildren and children will point, recursively, to an array - of XML_Content cells. - - The EMPTY, ANY, and MIXED types will only occur at top level. -*/ - -typedef struct XML_cp XML_Content; - -struct XML_cp { - enum XML_Content_Type type; - enum XML_Content_Quant quant; - XML_Char * name; - unsigned int numchildren; - XML_Content * children; -}; - - -/* This is called for an element declaration. See above for - description of the model argument. It's the caller's responsibility - to free model when finished with it. -*/ -typedef void (XMLCALL *XML_ElementDeclHandler) (void *userData, - const XML_Char *name, - XML_Content *model); - -XMLPARSEAPI(void) -XML_SetElementDeclHandler(XML_Parser parser, - XML_ElementDeclHandler eldecl); - -/* The Attlist declaration handler is called for *each* attribute. So - a single Attlist declaration with multiple attributes declared will - generate multiple calls to this handler. The "default" parameter - may be NULL in the case of the "#IMPLIED" or "#REQUIRED" - keyword. The "isrequired" parameter will be true and the default - value will be NULL in the case of "#REQUIRED". If "isrequired" is - true and default is non-NULL, then this is a "#FIXED" default. -*/ -typedef void (XMLCALL *XML_AttlistDeclHandler) ( - void *userData, - const XML_Char *elname, - const XML_Char *attname, - const XML_Char *att_type, - const XML_Char *dflt, - int isrequired); - -XMLPARSEAPI(void) -XML_SetAttlistDeclHandler(XML_Parser parser, - XML_AttlistDeclHandler attdecl); - -/* The XML declaration handler is called for *both* XML declarations - and text declarations. The way to distinguish is that the version - parameter will be NULL for text declarations. The encoding - parameter may be NULL for XML declarations. The standalone - parameter will be -1, 0, or 1 indicating respectively that there - was no standalone parameter in the declaration, that it was given - as no, or that it was given as yes. -*/ -typedef void (XMLCALL *XML_XmlDeclHandler) (void *userData, - const XML_Char *version, - const XML_Char *encoding, - int standalone); - -XMLPARSEAPI(void) -XML_SetXmlDeclHandler(XML_Parser parser, - XML_XmlDeclHandler xmldecl); - - -typedef struct { - void *(*malloc_fcn)(size_t size); - void *(*realloc_fcn)(void *ptr, size_t size); - void (*free_fcn)(void *ptr); -} XML_Memory_Handling_Suite; - -/* Constructs a new parser; encoding is the encoding specified by the - external protocol or NULL if there is none specified. -*/ -XMLPARSEAPI(XML_Parser) -XML_ParserCreate(const XML_Char *encoding); - -/* Constructs a new parser and namespace processor. Element type - names and attribute names that belong to a namespace will be - expanded; unprefixed attribute names are never expanded; unprefixed - element type names are expanded only if there is a default - namespace. The expanded name is the concatenation of the namespace - URI, the namespace separator character, and the local part of the - name. If the namespace separator is '\0' then the namespace URI - and the local part will be concatenated without any separator. - It is a programming error to use the separator '\0' with namespace - triplets (see XML_SetReturnNSTriplet). -*/ -XMLPARSEAPI(XML_Parser) -XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator); - - -/* Constructs a new parser using the memory management suite referred to - by memsuite. If memsuite is NULL, then use the standard library memory - suite. If namespaceSeparator is non-NULL it creates a parser with - namespace processing as described above. The character pointed at - will serve as the namespace separator. - - All further memory operations used for the created parser will come from - the given suite. -*/ -XMLPARSEAPI(XML_Parser) -XML_ParserCreate_MM(const XML_Char *encoding, - const XML_Memory_Handling_Suite *memsuite, - const XML_Char *namespaceSeparator); - -/* Prepare a parser object to be re-used. This is particularly - valuable when memory allocation overhead is disproportionatly high, - such as when a large number of small documnents need to be parsed. - All handlers are cleared from the parser, except for the - unknownEncodingHandler. The parser's external state is re-initialized - except for the values of ns and ns_triplets. - - Added in Expat 1.95.3. -*/ -XMLPARSEAPI(XML_Bool) -XML_ParserReset(XML_Parser parser, const XML_Char *encoding); - -/* atts is array of name/value pairs, terminated by 0; - names and values are 0 terminated. -*/ -typedef void (XMLCALL *XML_StartElementHandler) (void *userData, - const XML_Char *name, - const XML_Char **atts); - -typedef void (XMLCALL *XML_EndElementHandler) (void *userData, - const XML_Char *name); - - -/* s is not 0 terminated. */ -typedef void (XMLCALL *XML_CharacterDataHandler) (void *userData, - const XML_Char *s, - int len); - -/* target and data are 0 terminated */ -typedef void (XMLCALL *XML_ProcessingInstructionHandler) ( - void *userData, - const XML_Char *target, - const XML_Char *data); - -/* data is 0 terminated */ -typedef void (XMLCALL *XML_CommentHandler) (void *userData, - const XML_Char *data); - -typedef void (XMLCALL *XML_StartCdataSectionHandler) (void *userData); -typedef void (XMLCALL *XML_EndCdataSectionHandler) (void *userData); - -/* This is called for any characters in the XML document for which - there is no applicable handler. This includes both characters that - are part of markup which is of a kind that is not reported - (comments, markup declarations), or characters that are part of a - construct which could be reported but for which no handler has been - supplied. The characters are passed exactly as they were in the XML - document except that they will be encoded in UTF-8 or UTF-16. - Line boundaries are not normalized. Note that a byte order mark - character is not passed to the default handler. There are no - guarantees about how characters are divided between calls to the - default handler: for example, a comment might be split between - multiple calls. -*/ -typedef void (XMLCALL *XML_DefaultHandler) (void *userData, - const XML_Char *s, - int len); - -/* This is called for the start of the DOCTYPE declaration, before - any DTD or internal subset is parsed. -*/ -typedef void (XMLCALL *XML_StartDoctypeDeclHandler) ( - void *userData, - const XML_Char *doctypeName, - const XML_Char *sysid, - const XML_Char *pubid, - int has_internal_subset); - -/* This is called for the start of the DOCTYPE declaration when the - closing > is encountered, but after processing any external - subset. -*/ -typedef void (XMLCALL *XML_EndDoctypeDeclHandler)(void *userData); - -/* This is called for entity declarations. The is_parameter_entity - argument will be non-zero if the entity is a parameter entity, zero - otherwise. - - For internal entities (<!ENTITY foo "bar">), value will - be non-NULL and systemId, publicID, and notationName will be NULL. - The value string is NOT nul-terminated; the length is provided in - the value_length argument. Since it is legal to have zero-length - values, do not use this argument to test for internal entities. - - For external entities, value will be NULL and systemId will be - non-NULL. The publicId argument will be NULL unless a public - identifier was provided. The notationName argument will have a - non-NULL value only for unparsed entity declarations. - - Note that is_parameter_entity can't be changed to XML_Bool, since - that would break binary compatibility. -*/ -typedef void (XMLCALL *XML_EntityDeclHandler) ( - void *userData, - const XML_Char *entityName, - int is_parameter_entity, - const XML_Char *value, - int value_length, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId, - const XML_Char *notationName); - -XMLPARSEAPI(void) -XML_SetEntityDeclHandler(XML_Parser parser, - XML_EntityDeclHandler handler); - -/* OBSOLETE -- OBSOLETE -- OBSOLETE - This handler has been superceded by the EntityDeclHandler above. - It is provided here for backward compatibility. - - This is called for a declaration of an unparsed (NDATA) entity. - The base argument is whatever was set by XML_SetBase. The - entityName, systemId and notationName arguments will never be - NULL. The other arguments may be. -*/ -typedef void (XMLCALL *XML_UnparsedEntityDeclHandler) ( - void *userData, - const XML_Char *entityName, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId, - const XML_Char *notationName); - -/* This is called for a declaration of notation. The base argument is - whatever was set by XML_SetBase. The notationName will never be - NULL. The other arguments can be. -*/ -typedef void (XMLCALL *XML_NotationDeclHandler) ( - void *userData, - const XML_Char *notationName, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId); - -/* When namespace processing is enabled, these are called once for - each namespace declaration. The call to the start and end element - handlers occur between the calls to the start and end namespace - declaration handlers. For an xmlns attribute, prefix will be - NULL. For an xmlns="" attribute, uri will be NULL. -*/ -typedef void (XMLCALL *XML_StartNamespaceDeclHandler) ( - void *userData, - const XML_Char *prefix, - const XML_Char *uri); - -typedef void (XMLCALL *XML_EndNamespaceDeclHandler) ( - void *userData, - const XML_Char *prefix); - -/* This is called if the document is not standalone, that is, it has an - external subset or a reference to a parameter entity, but does not - have standalone="yes". If this handler returns XML_STATUS_ERROR, - then processing will not continue, and the parser will return a - XML_ERROR_NOT_STANDALONE error. - If parameter entity parsing is enabled, then in addition to the - conditions above this handler will only be called if the referenced - entity was actually read. -*/ -typedef int (XMLCALL *XML_NotStandaloneHandler) (void *userData); - -/* This is called for a reference to an external parsed general - entity. The referenced entity is not automatically parsed. The - application can parse it immediately or later using - XML_ExternalEntityParserCreate. - - The parser argument is the parser parsing the entity containing the - reference; it can be passed as the parser argument to - XML_ExternalEntityParserCreate. The systemId argument is the - system identifier as specified in the entity declaration; it will - not be NULL. - - The base argument is the system identifier that should be used as - the base for resolving systemId if systemId was relative; this is - set by XML_SetBase; it may be NULL. - - The publicId argument is the public identifier as specified in the - entity declaration, or NULL if none was specified; the whitespace - in the public identifier will have been normalized as required by - the XML spec. - - The context argument specifies the parsing context in the format - expected by the context argument to XML_ExternalEntityParserCreate; - context is valid only until the handler returns, so if the - referenced entity is to be parsed later, it must be copied. - context is NULL only when the entity is a parameter entity. - - The handler should return XML_STATUS_ERROR if processing should not - continue because of a fatal error in the handling of the external - entity. In this case the calling parser will return an - XML_ERROR_EXTERNAL_ENTITY_HANDLING error. - - Note that unlike other handlers the first argument is the parser, - not userData. -*/ -typedef int (XMLCALL *XML_ExternalEntityRefHandler) ( - XML_Parser parser, - const XML_Char *context, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId); - -/* This is called in two situations: - 1) An entity reference is encountered for which no declaration - has been read *and* this is not an error. - 2) An internal entity reference is read, but not expanded, because - XML_SetDefaultHandler has been called. - Note: skipped parameter entities in declarations and skipped general - entities in attribute values cannot be reported, because - the event would be out of sync with the reporting of the - declarations or attribute values -*/ -typedef void (XMLCALL *XML_SkippedEntityHandler) ( - void *userData, - const XML_Char *entityName, - int is_parameter_entity); - -/* This structure is filled in by the XML_UnknownEncodingHandler to - provide information to the parser about encodings that are unknown - to the parser. - - The map[b] member gives information about byte sequences whose - first byte is b. - - If map[b] is c where c is >= 0, then b by itself encodes the - Unicode scalar value c. - - If map[b] is -1, then the byte sequence is malformed. - - If map[b] is -n, where n >= 2, then b is the first byte of an - n-byte sequence that encodes a single Unicode scalar value. - - The data member will be passed as the first argument to the convert - function. - - The convert function is used to convert multibyte sequences; s will - point to a n-byte sequence where map[(unsigned char)*s] == -n. The - convert function must return the Unicode scalar value represented - by this byte sequence or -1 if the byte sequence is malformed. - - The convert function may be NULL if the encoding is a single-byte - encoding, that is if map[b] >= -1 for all bytes b. - - When the parser is finished with the encoding, then if release is - not NULL, it will call release passing it the data member; once - release has been called, the convert function will not be called - again. - - Expat places certain restrictions on the encodings that are supported - using this mechanism. - - 1. Every ASCII character that can appear in a well-formed XML document, - other than the characters - - $@\^`{}~ - - must be represented by a single byte, and that byte must be the - same byte that represents that character in ASCII. - - 2. No character may require more than 4 bytes to encode. - - 3. All characters encoded must have Unicode scalar values <= - 0xFFFF, (i.e., characters that would be encoded by surrogates in - UTF-16 are not allowed). Note that this restriction doesn't - apply to the built-in support for UTF-8 and UTF-16. - - 4. No Unicode character may be encoded by more than one distinct - sequence of bytes. -*/ -typedef struct { - int map[256]; - void *data; - int (XMLCALL *convert)(void *data, const char *s); - void (XMLCALL *release)(void *data); -} XML_Encoding; - -/* This is called for an encoding that is unknown to the parser. - - The encodingHandlerData argument is that which was passed as the - second argument to XML_SetUnknownEncodingHandler. - - The name argument gives the name of the encoding as specified in - the encoding declaration. - - If the callback can provide information about the encoding, it must - fill in the XML_Encoding structure, and return XML_STATUS_OK. - Otherwise it must return XML_STATUS_ERROR. - - If info does not describe a suitable encoding, then the parser will - return an XML_UNKNOWN_ENCODING error. -*/ -typedef int (XMLCALL *XML_UnknownEncodingHandler) ( - void *encodingHandlerData, - const XML_Char *name, - XML_Encoding *info); - -XMLPARSEAPI(void) -XML_SetElementHandler(XML_Parser parser, - XML_StartElementHandler start, - XML_EndElementHandler end); - -XMLPARSEAPI(void) -XML_SetStartElementHandler(XML_Parser parser, - XML_StartElementHandler handler); - -XMLPARSEAPI(void) -XML_SetEndElementHandler(XML_Parser parser, - XML_EndElementHandler handler); - -XMLPARSEAPI(void) -XML_SetCharacterDataHandler(XML_Parser parser, - XML_CharacterDataHandler handler); - -XMLPARSEAPI(void) -XML_SetProcessingInstructionHandler(XML_Parser parser, - XML_ProcessingInstructionHandler handler); -XMLPARSEAPI(void) -XML_SetCommentHandler(XML_Parser parser, - XML_CommentHandler handler); - -XMLPARSEAPI(void) -XML_SetCdataSectionHandler(XML_Parser parser, - XML_StartCdataSectionHandler start, - XML_EndCdataSectionHandler end); - -XMLPARSEAPI(void) -XML_SetStartCdataSectionHandler(XML_Parser parser, - XML_StartCdataSectionHandler start); - -XMLPARSEAPI(void) -XML_SetEndCdataSectionHandler(XML_Parser parser, - XML_EndCdataSectionHandler end); - -/* This sets the default handler and also inhibits expansion of - internal entities. These entity references will be passed to the - default handler, or to the skipped entity handler, if one is set. -*/ -XMLPARSEAPI(void) -XML_SetDefaultHandler(XML_Parser parser, - XML_DefaultHandler handler); - -/* This sets the default handler but does not inhibit expansion of - internal entities. The entity reference will not be passed to the - default handler. -*/ -XMLPARSEAPI(void) -XML_SetDefaultHandlerExpand(XML_Parser parser, - XML_DefaultHandler handler); - -XMLPARSEAPI(void) -XML_SetDoctypeDeclHandler(XML_Parser parser, - XML_StartDoctypeDeclHandler start, - XML_EndDoctypeDeclHandler end); - -XMLPARSEAPI(void) -XML_SetStartDoctypeDeclHandler(XML_Parser parser, - XML_StartDoctypeDeclHandler start); - -XMLPARSEAPI(void) -XML_SetEndDoctypeDeclHandler(XML_Parser parser, - XML_EndDoctypeDeclHandler end); - -XMLPARSEAPI(void) -XML_SetUnparsedEntityDeclHandler(XML_Parser parser, - XML_UnparsedEntityDeclHandler handler); - -XMLPARSEAPI(void) -XML_SetNotationDeclHandler(XML_Parser parser, - XML_NotationDeclHandler handler); - -XMLPARSEAPI(void) -XML_SetNamespaceDeclHandler(XML_Parser parser, - XML_StartNamespaceDeclHandler start, - XML_EndNamespaceDeclHandler end); - -XMLPARSEAPI(void) -XML_SetStartNamespaceDeclHandler(XML_Parser parser, - XML_StartNamespaceDeclHandler start); - -XMLPARSEAPI(void) -XML_SetEndNamespaceDeclHandler(XML_Parser parser, - XML_EndNamespaceDeclHandler end); - -XMLPARSEAPI(void) -XML_SetNotStandaloneHandler(XML_Parser parser, - XML_NotStandaloneHandler handler); - -XMLPARSEAPI(void) -XML_SetExternalEntityRefHandler(XML_Parser parser, - XML_ExternalEntityRefHandler handler); - -/* If a non-NULL value for arg is specified here, then it will be - passed as the first argument to the external entity ref handler - instead of the parser object. -*/ -XMLPARSEAPI(void) -XML_SetExternalEntityRefHandlerArg(XML_Parser parser, - void *arg); - -XMLPARSEAPI(void) -XML_SetSkippedEntityHandler(XML_Parser parser, - XML_SkippedEntityHandler handler); - -XMLPARSEAPI(void) -XML_SetUnknownEncodingHandler(XML_Parser parser, - XML_UnknownEncodingHandler handler, - void *encodingHandlerData); - -/* This can be called within a handler for a start element, end - element, processing instruction or character data. It causes the - corresponding markup to be passed to the default handler. -*/ -XMLPARSEAPI(void) -XML_DefaultCurrent(XML_Parser parser); - -/* If do_nst is non-zero, and namespace processing is in effect, and - a name has a prefix (i.e. an explicit namespace qualifier) then - that name is returned as a triplet in a single string separated by - the separator character specified when the parser was created: URI - + sep + local_name + sep + prefix. - - If do_nst is zero, then namespace information is returned in the - default manner (URI + sep + local_name) whether or not the name - has a prefix. - [truncated at 1000 lines; 523 more skipped]

1 0

[ion] 16362: Kill off more of rosrtl
by ion＠svn.reactos.com 01 Jul '05

01 Jul '05

Kill off more of rosrtl Deleted: trunk/reactos/include/rosrtl/registry.h Deleted: trunk/reactos/include/rosrtl/string.h Modified: trunk/reactos/lib/iphlpapi/iphlpapi_private.h Modified: trunk/reactos/lib/rosrtl/registry/registry.c Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/unicode.c _____ Deleted: trunk/reactos/include/rosrtl/registry.h --- trunk/reactos/include/rosrtl/registry.h 2005-07-01 03:03:06 UTC (rev 16361) +++ trunk/reactos/include/rosrtl/registry.h 2005-07-01 03:14:40 UTC (rev 16362) @@ -1,16 +0,0 @@ -#ifndef _ROSRTL_REGISTRY_H_ -#define _ROSRTL_REGISTRY_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -NTSTATUS NTAPI RosReadRegistryValue( IN PUNICODE_STRING Key, - IN PUNICODE_STRING Value, - OUT PUNICODE_STRING Result ); - -#ifdef __cplusplus -}; -#endif - -#endif/*_ROSRTL_REGISTRY_H_*/ _____ Deleted: trunk/reactos/include/rosrtl/string.h --- trunk/reactos/include/rosrtl/string.h 2005-07-01 03:03:06 UTC (rev 16361) +++ trunk/reactos/include/rosrtl/string.h 2005-07-01 03:14:40 UTC (rev 16362) @@ -1,157 +0,0 @@ -/* $Id$ - */ - -#ifndef ROSRTL_STRING_H__ -#define ROSRTL_STRING_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -#define RosInitializeString( \ - __PDEST_STRING__, \ - __LENGTH__, \ - __MAXLENGTH__, \ - __BUFFER__ \ -) \ -{ \ - (__PDEST_STRING__)->Length = (__LENGTH__); \ - (__PDEST_STRING__)->MaximumLength = (__MAXLENGTH__); \ - (__PDEST_STRING__)->Buffer = (__BUFFER__); \ -} - -#define RtlRosInitStringFromLiteral( \ - __PDEST_STRING__, __SOURCE_STRING__) \ - RosInitializeString( \ - (__PDEST_STRING__), \ - sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \ - sizeof(__SOURCE_STRING__), \ - (__SOURCE_STRING__) \ - ) - -#define RtlRosInitUnicodeStringFromLiteral \ - RtlRosInitStringFromLiteral - -#define ROS_STRING_INITIALIZER(__SOURCE_STRING__) \ -{ \ - sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \ - sizeof(__SOURCE_STRING__), \ - (__SOURCE_STRING__) \ -} - -#define ROS_EMPTY_STRING {0, 0, NULL} - -NTSTATUS -FASTCALL -RtlpOemStringToCountedUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToAnsiString( - IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToCountedOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToOemString ( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpDowncaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpAnsiStringToUnicodeString( - IN OUT PUNICODE_STRING DestinationString, - IN PANSI_STRING SourceString, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUnicodeStringToAnsiString( - IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpOemStringToUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUnicodeStringToOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -BOOLEAN -FASTCALL -RtlpCreateUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCWSTR Source, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUnicodeStringToCountedOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS STDCALL -RtlpDuplicateUnicodeString( - INT AddNull, - IN PUNICODE_STRING SourceString, - PUNICODE_STRING DestinationString, - POOL_TYPE PoolType); - -NTSTATUS NTAPI RosAppendUnicodeString( PUNICODE_STRING ResultFirst, - PUNICODE_STRING Second, - BOOL Deallocate ); - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____ Modified: trunk/reactos/lib/iphlpapi/iphlpapi_private.h --- trunk/reactos/lib/iphlpapi/iphlpapi_private.h 2005-07-01 03:03:06 UTC (rev 16361) +++ trunk/reactos/lib/iphlpapi/iphlpapi_private.h 2005-07-01 03:14:40 UTC (rev 16362) @@ -24,7 +24,6 @@ #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include <rosrtl/string.h> #include <winsock2.h> #include <nspapi.h> #include <iptypes.h> _____ Modified: trunk/reactos/lib/rosrtl/registry/registry.c --- trunk/reactos/lib/rosrtl/registry/registry.c 2005-07-01 03:03:06 UTC (rev 16361) +++ trunk/reactos/lib/rosrtl/registry/registry.c 2005-07-01 03:14:40 UTC (rev 16362) @@ -1,3 +1,4 @@ +#if 0 #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> @@ -74,4 +75,5 @@ return Status; } +#endif _____ Modified: trunk/reactos/lib/rtl/rtl.h --- trunk/reactos/lib/rtl/rtl.h 2005-07-01 03:03:06 UTC (rev 16361) +++ trunk/reactos/lib/rtl/rtl.h 2005-07-01 03:14:40 UTC (rev 16362) @@ -26,4 +26,5 @@ #else #define PAGED_CODE_RTL() #endif + /* EOF */ _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-07-01 03:03:06 UTC (rev 16361) +++ trunk/reactos/lib/rtl/unicode.c 2005-07-01 03:14:40 UTC (rev 16362) @@ -21,7 +21,6 @@ */ #define __NTDRIVER__ #include "rtl.h" -#include <rosrtl/string.h> #define NDEBUG #include <debug.h> @@ -972,30 +971,7 @@ return Size+1; //NB: incl. nullterm } - /* - * @implemented - * - - * NOTES - * See RtlpUnicodeStringToAnsiString - */ -NTSTATUS -STDCALL -RtlUnicodeStringToAnsiString( - IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) -{ - return RtlpUnicodeStringToAnsiString( - AnsiDest, - UniSource, - AllocateDestinationString, - PagedPool); -} - - -/* * private * * NOTES @@ -1056,28 +1032,27 @@ return Status; } - /* * @implemented * + * NOTES - * See RtlpOemStringToUnicodeString + * See RtlpUnicodeStringToAnsiString */ NTSTATUS STDCALL -RtlOemStringToUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, +RtlUnicodeStringToAnsiString( + IN OUT PANSI_STRING AnsiDest, + IN PUNICODE_STRING UniSource, IN BOOLEAN AllocateDestinationString) { - return RtlpOemStringToUnicodeString( - UniDest, - OemSource, + return RtlpUnicodeStringToAnsiString( + AnsiDest, + UniSource, AllocateDestinationString, PagedPool); } - /* * private * @@ -1145,24 +1120,22 @@ * @implemented * * NOTES - * See RtlpUnicodeStringToOemString. + * See RtlpOemStringToUnicodeString */ NTSTATUS STDCALL -RtlUnicodeStringToOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) +RtlOemStringToUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN POEM_STRING OemSource, + IN BOOLEAN AllocateDestinationString) { - return RtlpUnicodeStringToOemString( - OemDest, - UniSource, + return RtlpOemStringToUnicodeString( + UniDest, + OemSource, AllocateDestinationString, PagedPool); } - - /* * private * @@ -1224,8 +1197,26 @@ return Status; } +/* + * @implemented + * + * NOTES + * See RtlpUnicodeStringToOemString. + */ +NTSTATUS +STDCALL +RtlUnicodeStringToOemString( + IN OUT POEM_STRING OemDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString) +{ + return RtlpUnicodeStringToOemString( + OemDest, + UniSource, + AllocateDestinationString, + PagedPool); +} - #define ITU_IMPLEMENTED_TESTS (IS_TEXT_UNICODE_ODD_LENGTH|IS_TEXT_UNICODE_SIGNATURE) @@ -1287,29 +1278,7 @@ return Length; } - /* - * @implemented - * - * NOTES - * See RtlpOemStringToCountedUnicodeString - */ -NTSTATUS -STDCALL -RtlOemStringToCountedUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString) -{ - return RtlpOemStringToCountedUnicodeString( - UniDest, - OemSource, - AllocateDestinationString, - PagedPool); -} - - -/* * private * * NOTES @@ -1365,6 +1334,25 @@ return Status; } +/* + * @implemented + * + * NOTES + * See RtlpOemStringToCountedUnicodeString + */ +NTSTATUS +STDCALL +RtlOemStringToCountedUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN POEM_STRING OemSource, + IN BOOLEAN AllocateDestinationString) +{ + return RtlpOemStringToCountedUnicodeString( + UniDest, + OemSource, + AllocateDestinationString, + PagedPool); +} /* * @implemented @@ -1655,26 +1643,6 @@ } /* - * @implemented - * - * NOTES - * See RtlpUnicodeStringToCountedOemString. - */ -NTSTATUS -STDCALL -RtlUnicodeStringToCountedOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) -{ - return RtlpUnicodeStringToCountedOemString( - OemDest, - UniSource, - AllocateDestinationString, - PagedPool); -} - -/* * private * * NOTES @@ -1733,6 +1701,25 @@ return Status; } +/* + * @implemented + * + * NOTES + * See RtlpUnicodeStringToCountedOemString. + */ +NTSTATUS +STDCALL +RtlUnicodeStringToCountedOemString( + IN OUT POEM_STRING OemDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString) +{ + return RtlpUnicodeStringToCountedOemString( + OemDest, + UniSource, + AllocateDestinationString, + PagedPool); +} /* * @implemented @@ -1783,31 +1770,7 @@ return STATUS_SUCCESS; } - - /* - * @implemented - * - * NOTES - * See RtlpUpcaseUnicodeString - */ -NTSTATUS -STDCALL -RtlUpcaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) -{ - - return RtlpUpcaseUnicodeString( - UniDest, - UniSource, - AllocateDestinationString, - PagedPool); -} - - -/* * private * * NOTES @@ -1851,23 +1814,22 @@ return STATUS_SUCCESS; } - - /* * @implemented * * NOTES - * See RtlpUpcaseUnicodeStringToAnsiString + * See RtlpUpcaseUnicodeString */ NTSTATUS STDCALL -RtlUpcaseUnicodeStringToAnsiString( - IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, +RtlUpcaseUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PCUNICODE_STRING UniSource, IN BOOLEAN AllocateDestinationString) { - return RtlpUpcaseUnicodeStringToAnsiString( - AnsiDest, + + return RtlpUpcaseUnicodeString( + UniDest, UniSource, AllocateDestinationString, PagedPool); @@ -1939,30 +1901,26 @@ return Status; } - - /* * @implemented * * NOTES - * See RtlpUpcaseUnicodeStringToCountedOemString + * See RtlpUpcaseUnicodeStringToAnsiString */ NTSTATUS STDCALL -RtlUpcaseUnicodeStringToCountedOemString( - IN OUT POEM_STRING OemDest, +RtlUpcaseUnicodeStringToAnsiString( + IN OUT PANSI_STRING AnsiDest, IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) + IN BOOLEAN AllocateDestinationString) { - return RtlpUpcaseUnicodeStringToCountedOemString( - OemDest, + return RtlpUpcaseUnicodeStringToAnsiString( + AnsiDest, UniSource, AllocateDestinationString, PagedPool); } - - /* * private * @@ -2026,28 +1984,26 @@ return Status; } - /* * @implemented + * * NOTES - * See RtlpUpcaseUnicodeStringToOemString + * See RtlpUpcaseUnicodeStringToCountedOemString */ NTSTATUS STDCALL -RtlUpcaseUnicodeStringToOemString ( +RtlUpcaseUnicodeStringToCountedOemString( IN OUT POEM_STRING OemDest, IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString -) + IN BOOLEAN AllocateDestinationString) { - return RtlpUpcaseUnicodeStringToOemString( + return RtlpUpcaseUnicodeStringToCountedOemString( OemDest, UniSource, AllocateDestinationString, PagedPool); } - /* * private * @@ -2114,6 +2070,25 @@ return Status; } +/* + * @implemented + * NOTES + * See RtlpUpcaseUnicodeStringToOemString + */ +NTSTATUS +STDCALL +RtlUpcaseUnicodeStringToOemString ( + IN OUT POEM_STRING OemDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString +) +{ + return RtlpUpcaseUnicodeStringToOemString( + OemDest, + UniSource, + AllocateDestinationString, + PagedPool); +} /* * @implemented @@ -2309,26 +2284,7 @@ DestinationString->Length = copylen; } - /* - * @implemented - * - * NOTES - * See RtlpCreateUnicodeString - */ -BOOLEAN -STDCALL -RtlCreateUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCWSTR Source) -{ - - DPRINT("RtlCreateUnicodeString\n"); - return RtlpCreateUnicodeString(UniDest, Source, PagedPool); -} - - -/* * private * * Creates a nullterminated UNICODE_STRING @@ -2358,7 +2314,22 @@ return TRUE; } +/* + * @implemented + * + * NOTES + * See RtlpCreateUnicodeString + */ +BOOLEAN +STDCALL +RtlCreateUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PCWSTR Source) +{ + DPRINT("RtlCreateUnicodeString\n"); + return RtlpCreateUnicodeString(UniDest, Source, PagedPool); +} /* * @implemented @@ -2382,29 +2353,7 @@ return NT_SUCCESS(Status); } - - /* - * @implemented - * - * NOTES - * See RtlpDowncaseUnicodeString - */ -NTSTATUS STDCALL -RtlDowncaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) -{ - return RtlpDowncaseUnicodeString( - UniDest, - UniSource, - AllocateDestinationString, - PagedPool); -} - - -/* * private * * NOTES @@ -2462,8 +2411,25 @@ return STATUS_SUCCESS; } +/* + * @implemented + * + * NOTES + * See RtlpDowncaseUnicodeString + */ +NTSTATUS STDCALL +RtlDowncaseUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString) +{ + return RtlpDowncaseUnicodeString( + UniDest, + UniSource, + AllocateDestinationString, + PagedPool); +} - /* * @implemented * @@ -2492,30 +2458,7 @@ return(STATUS_SUCCESS); } - /* - * @implemented - * - * NOTES - * See RtlpAnsiStringToUnicodeString - */ -NTSTATUS -STDCALL -RtlAnsiStringToUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PANSI_STRING AnsiSource, - IN BOOLEAN AllocateDestinationString) -{ - return RtlpAnsiStringToUnicodeString( - UniDest, - AnsiSource, - AllocateDestinationString, - PagedPool); -} - - - -/* * private * * NOTES @@ -2577,8 +2520,26 @@ return Status; } +/* + * @implemented + * + * NOTES + * See RtlpAnsiStringToUnicodeString + */ +NTSTATUS +STDCALL +RtlAnsiStringToUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PANSI_STRING AnsiSource, + IN BOOLEAN AllocateDestinationString) +{ + return RtlpAnsiStringToUnicodeString( + UniDest, + AnsiSource, + AllocateDestinationString, + PagedPool); +} - /* * @implemented * @@ -2684,31 +2645,10 @@ return RtlUnicodeStringToOemSize(UnicodeString); } - /* * @implemented - * - * NOTES - * See RtlpDuplicateUnicodeString */ NTSTATUS STDCALL -RtlDuplicateUnicodeString( - INT AddNull, - IN PUNICODE_STRING SourceString, - PUNICODE_STRING DestinationString) -{ - return RtlpDuplicateUnicodeString( - AddNull, - SourceString, - DestinationString, - PagedPool); -} - - -/* - * @implemented - */ -NTSTATUS STDCALL RtlpDuplicateUnicodeString( INT AddNull, IN PUNICODE_STRING SourceString, @@ -2747,6 +2687,24 @@ return STATUS_SUCCESS; } +/* + * @implemented + * + * NOTES + * See RtlpDuplicateUnicodeString + */ +NTSTATUS STDCALL +RtlDuplicateUnicodeString( + INT AddNull, + IN PUNICODE_STRING SourceString, + PUNICODE_STRING DestinationString) +{ + return RtlpDuplicateUnicodeString( + AddNull, + SourceString, + DestinationString, + PagedPool); +} /* * @implemented

1 0

[ion] 16361: PCH for csrss and win32csr, and remove rosrtl usage
by ion＠svn.reactos.com 01 Jul '05

01 Jul '05

PCH for csrss and win32csr, and remove rosrtl usage Modified: trunk/reactos/subsys/csrss/api/handle.c Modified: trunk/reactos/subsys/csrss/api/process.c Modified: trunk/reactos/subsys/csrss/api/user.c Modified: trunk/reactos/subsys/csrss/api/wapi.c Modified: trunk/reactos/subsys/csrss/csrss.c Added: trunk/reactos/subsys/csrss/csrss.h Modified: trunk/reactos/subsys/csrss/csrss.xml Modified: trunk/reactos/subsys/csrss/init.c Modified: trunk/reactos/subsys/csrss/print.c Modified: trunk/reactos/subsys/csrss/video.c Modified: trunk/reactos/subsys/csrss/win32csr/conio.c Modified: trunk/reactos/subsys/csrss/win32csr/desktopbg.c Modified: trunk/reactos/subsys/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsys/csrss/win32csr/exitros.c Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsys/csrss/win32csr/tuiconsole.c Added: trunk/reactos/subsys/csrss/win32csr/w32csr.h Modified: trunk/reactos/subsys/csrss/win32csr/win32csr.xml _____ Modified: trunk/reactos/subsys/csrss/api/handle.c --- trunk/reactos/subsys/csrss/api/handle.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/api/handle.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -9,12 +9,8 @@ /* INCLUDES ******************************************************************/ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include "csrss.h" -#include "api.h" - #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/csrss/api/process.c --- trunk/reactos/subsys/csrss/api/process.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/api/process.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -9,13 +9,8 @@ /* INCLUDES ******************************************************************/ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include "csrss.h" -#include "api.h" -#include "conio.h" - #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/csrss/api/user.c --- trunk/reactos/subsys/csrss/api/user.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/api/user.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -9,16 +9,11 @@ /* INCLUDES ******************************************************************/ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include "csrss.h" -#include "api.h" - #define NDEBUG #include <debug.h> - /* GLOBALS *******************************************************************/ static BOOLEAN ServicesProcessIdValid = FALSE; _____ Modified: trunk/reactos/subsys/csrss/api/wapi.c --- trunk/reactos/subsys/csrss/api/wapi.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/api/wapi.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -10,13 +10,8 @@ /* INCLUDES ******************************************************************/ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <rosrtl/thread.h> +#include "csrss.h" -#include "api.h" - #define NDEBUG #include <debug.h> @@ -170,7 +165,7 @@ /* Close the port and exit the thread */ NtClose(ServerPort); - RtlRosExitUserThread(STATUS_SUCCESS); + NtTerminateThread(NtCurrentThread(), STATUS_SUCCESS); } /********************************************************************** _____ Modified: trunk/reactos/subsys/csrss/csrss.c --- trunk/reactos/subsys/csrss/csrss.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/csrss.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -32,14 +32,8 @@ * actually does nothing but running). */ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <csrss/csrss.h> -#include <reactos/buildno.h> +#include "csrss.h" -#include "api.h" - #define NDEBUG #include <debug.h> _____ Added: trunk/reactos/subsys/csrss/csrss.h --- trunk/reactos/subsys/csrss/csrss.h 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/csrss.h 2005-07-01 03:03:06 UTC (rev 16361) @@ -0,0 +1,17 @@ +/* PSDK/NDK Headers */ +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +/* Build Number */ +#include <reactos/buildno.h> + +/* Subsystem Manager Header */ +#include <sm/helper.h> + +/* Internal CSRSS Headers */ +#include <api.h> +#include <conio.h> +#include <csrplugin.h> + +/* EOF */ _____ Modified: trunk/reactos/subsys/csrss/csrss.xml --- trunk/reactos/subsys/csrss/csrss.xml 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/csrss.xml 2005-07-01 03:03:06 UTC (rev 16361) @@ -13,6 +13,7 @@ <file>user.c</file> <file>wapi.c</file> </directory> + <pch>csrss.h</pch> <file>csrss.c</file> <file>init.c</file> <file>print.c</file> _____ Modified: trunk/reactos/subsys/csrss/init.c --- trunk/reactos/subsys/csrss/init.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/init.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -10,14 +10,8 @@ /* INCLUDES ******************************************************************/ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <sm/helper.h> +#include "csrss.h" -#include "api.h" -#include "csrplugin.h" - #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/csrss/print.c --- trunk/reactos/subsys/csrss/print.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/print.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -27,11 +27,11 @@ * Compiled successfully with egcs 1.1.2 */ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <csrss/csrss.h> +#include "csrss.h" +#define NDEBUG +#include <debug.h> + VOID STDCALL DisplayString(LPCWSTR lpwString) { UNICODE_STRING us; _____ Modified: trunk/reactos/subsys/csrss/video.c --- trunk/reactos/subsys/csrss/video.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/video.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -3,16 +3,16 @@ * ReactOS Project */ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <rosrtl/string.h> +#include "csrss.h" +#define NDEBUG +#include <debug.h> + ULONG InitializeVideoAddressSpace(VOID) { OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING PhysMemName; + UNICODE_STRING PhysMemName = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); NTSTATUS Status; HANDLE PhysMemHandle; PVOID BaseAddress; @@ -25,7 +25,6 @@ /* * Open the physical memory section */ - RtlRosInitUnicodeStringFromLiteral(&PhysMemName, L"\\Device\\PhysicalMemory"); InitializeObjectAttributes(&ObjectAttributes, &PhysMemName, 0, _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -8,21 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <ddk/ntddblue.h> -#include <rosrtl/string.h> +#include "w32csr.h" -#include <string.h> - -#include "api.h" -#include "conio.h" -#include "desktopbg.h" -#include "guiconsole.h" -#include "tuiconsole.h" -#include "win32csr.h" - #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/csrss/win32csr/desktopbg.c --- trunk/reactos/subsys/csrss/win32csr/desktopbg.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/desktopbg.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -7,13 +7,8 @@ * ReactOS Operating System */ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include "w32csr.h" -#include "api.h" -#include "desktopbg.h" - #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/csrss/win32csr/dllmain.c --- trunk/reactos/subsys/csrss/win32csr/dllmain.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/dllmain.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -8,11 +8,7 @@ /* INCLUDES ******************************************************************/ -#include <windows.h> -#include "csrplugin.h" -#include "conio.h" -#include "desktopbg.h" -#include "guiconsole.h" +#include "w32csr.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/csrss/win32csr/exitros.c --- trunk/reactos/subsys/csrss/win32csr/exitros.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/exitros.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -8,14 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <reactos/winlogon.h> +#include "w32csr.h" -#include "api.h" -#include "win32csr.h" - #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c --- trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -8,10 +8,7 @@ /* INCLUDES ******************************************************************/ -#include <windows.h> -#include "conio.h" -#include "guiconsole.h" -#include "win32csr.h" +#include "w32csr.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/csrss/win32csr/tuiconsole.c --- trunk/reactos/subsys/csrss/win32csr/tuiconsole.c 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/tuiconsole.c 2005-07-01 03:03:06 UTC (rev 16361) @@ -6,13 +6,7 @@ * PURPOSE: Implementation of text-mode consoles */ -#include <windows.h> -#include <ddk/ntddblue.h> -#include <string.h> -#include "api.h" -#include "conio.h" -#include "tuiconsole.h" -#include "win32csr.h" +#include "w32csr.h" #define NDEBUG #include <debug.h> _____ Added: trunk/reactos/subsys/csrss/win32csr/w32csr.h --- trunk/reactos/subsys/csrss/win32csr/w32csr.h 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/w32csr.h 2005-07-01 03:03:06 UTC (rev 16361) @@ -0,0 +1,21 @@ +/* PSDK/NDK Headers */ +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +/* Our own BLUE.SYS Driver for Console Output */ +#include <ddk/ntddblue.h> + +/* External Winlogon Header */ +#include <winlogon.h> + +/* Internal CSRSS Headers */ +#include <api.h> +#include <conio.h> +#include <csrplugin.h> +#include <desktopbg.h> +#include "guiconsole.h" +#include "tuiconsole.h" +#include <win32csr.h> + +/* EOF */ _____ Modified: trunk/reactos/subsys/csrss/win32csr/win32csr.xml --- trunk/reactos/subsys/csrss/win32csr/win32csr.xml 2005-07-01 02:47:15 UTC (rev 16360) +++ trunk/reactos/subsys/csrss/win32csr/win32csr.xml 2005-07-01 03:03:06 UTC (rev 16361) @@ -8,6 +8,7 @@ <library>kernel32</library> <library>user32</library> <library>gdi32</library> + <pch>w32csr.h</pch> <file>conio.c</file> <file>desktopbg.c</file> <file>dllmain.c</file>

1 0

[ion] 16360: PCH for SMSS, and remove rosrtl usage
by ion＠svn.reactos.com 01 Jul '05

01 Jul '05

PCH for SMSS, and remove rosrtl usage Modified: trunk/reactos/subsys/smss/smapi.c Modified: trunk/reactos/subsys/smss/smss.h Modified: trunk/reactos/subsys/smss/smss.xml _____ Modified: trunk/reactos/subsys/smss/smapi.c --- trunk/reactos/subsys/smss/smapi.c 2005-07-01 01:54:55 UTC (rev 16359) +++ trunk/reactos/subsys/smss/smapi.c 2005-07-01 02:47:15 UTC (rev 16360) @@ -357,11 +357,9 @@ SmCreateApiPort(VOID) { OBJECT_ATTRIBUTES ObjectAttributes = {0}; - UNICODE_STRING UnicodeString = {0}; + UNICODE_STRING UnicodeString = RTL_CONSTANT_STRING(L"\\SmApiPort"); NTSTATUS Status = STATUS_SUCCESS; - RtlRosInitUnicodeStringFromLiteral(&UnicodeString, - L"\\SmApiPort"); InitializeObjectAttributes(&ObjectAttributes, &UnicodeString, PORT_ALL_ACCESS, _____ Modified: trunk/reactos/subsys/smss/smss.h --- trunk/reactos/subsys/smss/smss.h 2005-07-01 01:54:55 UTC (rev 16359) +++ trunk/reactos/subsys/smss/smss.h 2005-07-01 02:47:15 UTC (rev 16360) @@ -3,12 +3,8 @@ #include <windows.h> #define NTOS_MODE_USER -#define READY_FOR_NEW_NTDLL #include <ndk/ntndk.h> -#include <rosrtl/string.h> -#include <wchar.h> - #include <sm/api.h> #include <sm/helper.h> _____ Modified: trunk/reactos/subsys/smss/smss.xml --- trunk/reactos/subsys/smss/smss.xml 2005-07-01 01:54:55 UTC (rev 16359) +++ trunk/reactos/subsys/smss/smss.xml 2005-07-01 02:47:15 UTC (rev 16360) @@ -5,6 +5,7 @@ <library>smlib</library> <library>ntdll</library> <linkerflag>-lgcc</linkerflag> + <pch>smss.h</pch> <file>client.c</file> <file>debug.c</file> <file>init.c</file>

1 0

[ion] 16359: Kill large parts of rosrtl. devmode conversion implented in gdi32 because it's actually an exported api, 2nd converstion used only once so inlined. logfont conversion implented as functions directly in the ddl. rtlrosmin/max replaced by actual macros, and resource rtlros function in aclui replace by actual win32 call. other rosrtl code was already deprecated.
by ion＠svn.reactos.com 01 Jul '05

01 Jul '05

Kill large parts of rosrtl. devmode conversion implented in gdi32 because it's actually an exported api, 2nd converstion used only once so inlined. logfont conversion implented as functions directly in the ddl. rtlrosmin/max replaced by actual macros, and resource rtlros function in aclui replace by actual win32 call. other rosrtl code was already deprecated. Deleted: trunk/reactos/include/rosrtl/devmode.h Deleted: trunk/reactos/include/rosrtl/gdimacro.h Deleted: trunk/reactos/include/rosrtl/logfont.h Deleted: trunk/reactos/include/rosrtl/minmax.h Deleted: trunk/reactos/include/rosrtl/path.h Deleted: trunk/reactos/include/rosrtl/priv.h Deleted: trunk/reactos/include/rosrtl/resstr.h Deleted: trunk/reactos/include/rosrtl/sparse.h Modified: trunk/reactos/lib/aclui/aclui.c Modified: trunk/reactos/lib/gdi32/include/precomp.h Modified: trunk/reactos/lib/gdi32/misc/stubs.c Modified: trunk/reactos/lib/gdi32/objects/dc.c Modified: trunk/reactos/lib/gdi32/objects/font.c Modified: trunk/reactos/lib/gdi32/objects/utils.c Modified: trunk/reactos/lib/rosrtl/file/sparse.c Modified: trunk/reactos/lib/rosrtl/misc/devmode.c Modified: trunk/reactos/lib/rosrtl/misc/logfont.c Modified: trunk/reactos/lib/rosrtl/thread/priv.c Modified: trunk/reactos/lib/user32/include/user32p.h Modified: trunk/reactos/lib/user32/misc/desktop.c Modified: trunk/reactos/lib/user32/misc/display.c Modified: trunk/reactos/subsys/csrss/win32csr/conio.c _____ Deleted: trunk/reactos/include/rosrtl/devmode.h --- trunk/reactos/include/rosrtl/devmode.h 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/include/rosrtl/devmode.h 2005-07-01 01:54:55 UTC (rev 16359) @@ -1,18 +0,0 @@ -/* devmode.h - */ - -#ifdef __cplusplus -extern "C" -{ -#endif - -void -RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA ); -void -RosRtlDevModeW2A( LPDEVMODEA pA, const LPDEVMODEW pW ); - -#ifdef __cplusplus -} -#endif - -/* EOF */ _____ Deleted: trunk/reactos/include/rosrtl/gdimacro.h --- trunk/reactos/include/rosrtl/gdimacro.h 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/include/rosrtl/gdimacro.h 2005-07-01 01:54:55 UTC (rev 16359) @@ -1,24 +0,0 @@ -/* - * gdimacro.h - */ - -#ifndef ROSRTL_GDIMACRO_H -#define ROSRTL_GDIMACRO_H - -#define IN_RECT(r,x,y) \ -( \ - (x) >= (r).left && \ - (y) >= (r).top && \ - (x) < (r).right && \ - (y) < (r).bottom \ -) - -#define RECT_OVERLAP(a,b) \ -( \ - (a).left < (b).right && \ - (b).left < (a).right && \ - (a).top < (b).bottom && \ - (b).top < (a).bottom \ -) - -#endif /* ROSRTL_GDIMACRO_H */ _____ Deleted: trunk/reactos/include/rosrtl/logfont.h --- trunk/reactos/include/rosrtl/logfont.h 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/include/rosrtl/logfont.h 2005-07-01 01:54:55 UTC (rev 16359) @@ -1,19 +0,0 @@ -/* logfont.h - */ - -#ifdef __cplusplus -extern "C" -{ -#endif - -void -RosRtlLogFontA2W ( LPLOGFONTW pW, const LOGFONTA *pA ); - -void -RosRtlLogFontW2A ( LPLOGFONTA pA, const LOGFONTW *pW ); - -#ifdef __cplusplus -} -#endif - -/* EOF */ _____ Deleted: trunk/reactos/include/rosrtl/minmax.h --- trunk/reactos/include/rosrtl/minmax.h 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/include/rosrtl/minmax.h 2005-07-01 01:54:55 UTC (rev 16359) @@ -1,23 +0,0 @@ -/* $Id$ - */ - -#ifndef ROSRTL_MINMAX_H__ -#define ROSRTL_MINMAX_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -#define RtlRosMin(X,Y) (((X) < (Y))? (X) : (Y)) -#define RtlRosMax(X,Y) (((X) > (Y))? (X) : (Y)) -#define RtlRosMin3(X,Y,Z) (((X) < (Y)) ? RtlRosMin(X,Z) : RtlRosMin(Y,Z)) -#define RtlRosMax3(X,Y,Z) (((X) > (Y)) ? RtlRosMax(X,Z) : RtlRosMax(Y,Z)) - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____ Deleted: trunk/reactos/include/rosrtl/path.h --- trunk/reactos/include/rosrtl/path.h 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/include/rosrtl/path.h 2005-07-01 01:54:55 UTC (rev 16359) @@ -1,21 +0,0 @@ -/* - */ - -#ifndef ROSRTL_PATH_H__ -#define ROSRTL_PATH_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -BOOL STDCALL MakeSureDirectoryPathExistsExA(LPCSTR DirPath, BOOL FileAtEnd); -BOOL STDCALL MakeSureDirectoryPathExistsExW(LPCWSTR DirPath, BOOL FileAtEnd); - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____ Deleted: trunk/reactos/include/rosrtl/priv.h --- trunk/reactos/include/rosrtl/priv.h 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/include/rosrtl/priv.h 2005-07-01 01:54:55 UTC (rev 16359) @@ -1,23 +0,0 @@ -/* $Id$ - */ - -#ifndef ROSRTL_SEC_H__ -#define ROSRTL_SEC_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -BOOL -RosEnableThreadPrivileges(HANDLE *hToken, LUID *Privileges, DWORD PrivilegeCount); -BOOL -RosResetThreadPrivileges(HANDLE hToken); - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____ Deleted: trunk/reactos/include/rosrtl/resstr.h --- trunk/reactos/include/rosrtl/resstr.h 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/include/rosrtl/resstr.h 2005-07-01 01:54:55 UTC (rev 16359) @@ -1,43 +0,0 @@ -/* $Id$ - */ - -#ifndef ROSRTL_RESSTR_H__ -#define ROSRTL_RESSTR_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -int -RosLenOfStrResource(HINSTANCE hInst, UINT uID); -int -RosAllocAndLoadStringA(LPSTR *lpTarget, HINSTANCE hInst, UINT uID); -int -RosAllocAndLoadStringW(LPWSTR *lpTarget, HINSTANCE hInst, UINT uID); -DWORD -RosFormatStrA(LPSTR *lpTarget, LPSTR lpFormat, ...); -DWORD -RosFormatStrW(LPWSTR *lpTarget, LPWSTR lpFormat, ...); -DWORD -RosLoadAndFormatStrA(HINSTANCE hInst, UINT uID, LPSTR *lpTarget, ...); -DWORD -RosLoadAndFormatStrW(HINSTANCE hInst, UINT uID, LPWSTR *lpTarget, ...); - -#ifdef UNICODE -# define RosFmtString RosFmtStringW -# define RosAllocAndLoadString RosAllocAndLoadStringW -# define RosLoadAndFormatStr RosLoadAndFormatStrW -#else -# define RosFmtString RosFmtStringA -# define RosAllocAndLoadString RosAllocAndLoadStringA -# define RosLoadAndFormatStr RosLoadAndFormatStrA -#endif - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____ Deleted: trunk/reactos/include/rosrtl/sparse.h --- trunk/reactos/include/rosrtl/sparse.h 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/include/rosrtl/sparse.h 2005-07-01 01:54:55 UTC (rev 16359) @@ -1,36 +0,0 @@ -/* $Id$ - */ - -#ifndef ROSRTL_SPARSE_H__ -#define ROSRTL_SPARSE_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -BOOL -STDCALL -SetFileSparse(HANDLE hFile); - -BOOL -STDCALL -ZeroFileData(HANDLE hFile, - PLARGE_INTEGER pliFileOffset, - PLARGE_INTEGER pliBeyondFinalZero); - -DWORD -STDCALL -QueryAllocatedFileRanges(HANDLE hFile, - PLARGE_INTEGER pliFileOffset, - PLARGE_INTEGER pliLength, - PFILE_ALLOCATED_RANGE_BUFFER lpAllocatedRanges, - DWORD dwBufferSize); - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____ Modified: trunk/reactos/lib/aclui/aclui.c --- trunk/reactos/lib/aclui/aclui.c 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/lib/aclui/aclui.c 2005-07-01 01:54:55 UTC (rev 16359) @@ -31,7 +31,6 @@ #include <commctrl.h> #include <prsht.h> #include <aclui.h> -#include <rosrtl/resstr.h> #include "internal.h" #include "resource.h" @@ -184,7 +183,7 @@ SI_OBJECT_INFO ObjectInfo; PROPSHEETHEADER psh; HPROPSHEETPAGE hPages[1]; - LPWSTR lpCaption; + LPVOID lpCaption; BOOL Ret; if(psi == NULL) @@ -229,8 +228,15 @@ { /* 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. */ - RosLoadAndFormatStr(hDllInstance, IDS_PSP_TITLE, &lpCaption, ObjectInfo.pszObjectName); + allocate the right amount of memory. */ + FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ARGUMENT_ARRAY, + hDllInstance, + IDS_PSP_TITLE, + 0, + (LPSTR)lpCaption, + 0, + (va_list*)&ObjectInfo.pszObjectName); /* Acc. to MSDN, should work */ psh.pszCaption = lpCaption; } psh.nPages = sizeof(hPages) / sizeof(HPROPSHEETPAGE); _____ Modified: trunk/reactos/lib/gdi32/include/precomp.h --- trunk/reactos/lib/gdi32/include/precomp.h 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/lib/gdi32/include/precomp.h 2005-07-01 01:54:55 UTC (rev 16359) @@ -20,10 +20,6 @@ /* Win32K External Headers */ #include <win32k/kapi.h> -/* FIXME: ROSRTL */ -#include <rosrtl/logfont.h> -#include <rosrtl/devmode.h> - #define NtUserGetDCBrushColor(hbr) \ (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_GETDCCOLOR) @@ -73,4 +69,16 @@ BOOL STDCALL CalculateColorTableSize(CONST BITMAPINFOHEADER *BitmapInfoHeader, UINT *ColorSpec, UINT *ColorTableSize); LPBITMAPINFO STDCALL ConvertBitmapInfo(CONST BITMAPINFO *BitmapInfo, UINT ColorSpec, UINT *BitmapInfoSize, BOOL FollowedByData); +/* == CONVERSION FUNCTIONS ================================================== */ +DEVMODEW * +STDCALL +GdiConvertToDevmodeW(DEVMODEA *dm); + +VOID +STDCALL +LogFontA2W(LPLOGFONTW pW, CONST LOGFONTA *pA); + +VOID +STDCALL +LogFontW2A(LPLOGFONTA pA, CONST LOGFONTW *pW); /* EOF */ _____ Modified: trunk/reactos/lib/gdi32/misc/stubs.c --- trunk/reactos/lib/gdi32/misc/stubs.c 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-01 01:54:55 UTC (rev 16359) @@ -11,12 +11,15 @@ #include "precomp.h" +#define SIZEOF_DEVMODEA_300 124 +#define SIZEOF_DEVMODEA_400 148 +#define SIZEOF_DEVMODEA_500 156 +#define SIZEOF_DEVMODEW_300 188 +#define SIZEOF_DEVMODEW_400 212 +#define SIZEOF_DEVMODEW_500 220 + #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__); - - - - /* * @unimplemented */ @@ -2676,15 +2679,74 @@ } /* - * @unimplemented + * @implemented */ DEVMODEW * STDCALL GdiConvertToDevmodeW(DEVMODEA *dm) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + LPDEVMODEW dmw; + + dmw = HEAP_alloc(sizeof(DEVMODEW)); +#define COPYS(f,len) MultiByteToWideChar ( CP_THREAD_ACP, 0, (LPSTR)dm->f, len, dmw->f, len ) +#define COPYN(f) dmw->f = dm->f + COPYS(dmDeviceName, CCHDEVICENAME ); + COPYN(dmSpecVersion); + COPYN(dmDriverVersion); + switch ( dm->dmSize ) + { + case SIZEOF_DEVMODEA_300: + dmw->dmSize = SIZEOF_DEVMODEW_300; + break; + case SIZEOF_DEVMODEA_400: + dmw->dmSize = SIZEOF_DEVMODEW_400; + break; + case SIZEOF_DEVMODEA_500: + default: /* FIXME what to do??? */ + dmw->dmSize = SIZEOF_DEVMODEW_500; + break; + } + COPYN(dmDriverExtra); + COPYN(dmFields); + COPYN(dmPosition.x); + COPYN(dmPosition.y); + COPYN(dmScale); + COPYN(dmCopies); + COPYN(dmDefaultSource); + COPYN(dmPrintQuality); + COPYN(dmColor); + COPYN(dmDuplex); + COPYN(dmYResolution); + COPYN(dmTTOption); + COPYN(dmCollate); + COPYS(dmFormName,CCHFORMNAME); + COPYN(dmLogPixels); + COPYN(dmBitsPerPel); + COPYN(dmPelsWidth); + COPYN(dmPelsHeight); + COPYN(dmDisplayFlags); // aka dmNup + COPYN(dmDisplayFrequency); + + if ( dm->dmSize <= SIZEOF_DEVMODEA_300 ) + return dmw; // we're done with 0x300 fields + + COPYN(dmICMMethod); + COPYN(dmICMIntent); + COPYN(dmMediaType); + COPYN(dmDitherType); + COPYN(dmReserved1); + COPYN(dmReserved2); + + if ( dm->dmSize <= SIZEOF_DEVMODEA_400 ) + return dmw; // we're done with 0x400 fields + + COPYN(dmPanningWidth); + COPYN(dmPanningHeight); + + return dmw; + +#undef COPYN +#undef COPYS } /* _____ Modified: trunk/reactos/lib/gdi32/objects/dc.c --- trunk/reactos/lib/gdi32/objects/dc.c 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/lib/gdi32/objects/dc.c 2005-07-01 01:54:55 UTC (rev 16359) @@ -147,7 +147,7 @@ NTSTATUS Status; LPWSTR lpszDriverW, lpszDeviceW, lpszOutputW; UNICODE_STRING Driver, Device, Output; - DEVMODEW dvmInitW; + LPDEVMODEW dvmInitW; HDC rc = 0; Status = HEAP_strdupA2W ( &lpszDriverW, lpszDriver ); @@ -166,7 +166,7 @@ else { if ( lpdvmInit ) - RosRtlDevModeA2W ( &dvmInitW, (const LPDEVMODEA)lpdvmInit ); + dvmInitW = GdiConvertToDevmodeW((LPDEVMODEA)lpdvmInit); RtlInitUnicodeString(&Driver, lpszDriverW); RtlInitUnicodeString(&Device, lpszDeviceW); @@ -174,8 +174,8 @@ rc = NtGdiCreateIC ( &Driver, &Device, &Output, - lpdvmInit ? &dvmInitW : NULL ); - + lpdvmInit ? dvmInitW : NULL ); + HEAP_free (dvmInitW); HEAP_free ( lpszOutputW ); } HEAP_free ( lpszDeviceW ); @@ -264,7 +264,7 @@ { return 0; } - RosRtlLogFontW2A((LPLOGFONTA) Buffer, &LogFontW); + LogFontW2A((LPLOGFONTA) Buffer, &LogFontW); Result = sizeof(LOGFONTA); } else @@ -362,11 +362,14 @@ CONST DEVMODEA *lpInitData ) { - DEVMODEW InitDataW; + LPDEVMODEW InitDataW; + HDC hDc; - RosRtlDevModeA2W ( &InitDataW, (CONST LPDEVMODEA)lpInitData ); + InitDataW = GdiConvertToDevmodeW((LPDEVMODEA)lpInitData); - return NtGdiResetDC ( hdc, &InitDataW ); + hDc = NtGdiResetDC ( hdc, InitDataW ); + HEAP_free(InitDataW); + return hDc; } _____ Modified: trunk/reactos/lib/gdi32/objects/font.c --- trunk/reactos/lib/gdi32/objects/font.c 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/lib/gdi32/objects/font.c 2005-07-01 01:54:55 UTC (rev 16359) @@ -231,7 +231,7 @@ } else { - RosRtlLogFontW2A(&EnumLogFontExA.elfLogFont, &Info[i].EnumLogFontEx.elfLogFont); + LogFontW2A(&EnumLogFontExA.elfLogFont, &Info[i].EnumLogFontEx.elfLogFont); WideCharToMultiByte(CP_THREAD_ACP, 0, Info[i].EnumLogFontEx.elfFullName, -1, (LPSTR)EnumLogFontExA.elfFullName, LF_FULLFACESIZE, NULL, NULL); WideCharToMultiByte(CP_THREAD_ACP, 0, Info[i].EnumLogFontEx.elfStyle, -1, @@ -292,7 +292,7 @@ { LOGFONTW LogFontW; - RosRtlLogFontA2W(&LogFontW, lpLogfont); + LogFontA2W(&LogFontW, lpLogfont); /* no need to convert LogFontW back to lpLogFont b/c it's an [in] parameter only */ return IntEnumFontFamilies(hdc, &LogFontW, lpEnumFontFamExProc, lParam, FALSE); @@ -532,7 +532,7 @@ { LOGFONTW tlf; - RosRtlLogFontA2W(&tlf, lplf); + LogFontA2W(&tlf, lplf); return NtGdiCreateFontIndirect(&tlf); } _____ Modified: trunk/reactos/lib/gdi32/objects/utils.c --- trunk/reactos/lib/gdi32/objects/utils.c 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/lib/gdi32/objects/utils.c 2005-07-01 01:54:55 UTC (rev 16359) @@ -331,3 +331,55 @@ return NewBitmapInfo; } + +VOID +STDCALL +LogFontA2W(LPLOGFONTW pW, CONST LOGFONTA *pA) +{ +#define COPYS(f,len) MultiByteToWideChar ( CP_THREAD_ACP, 0, pA->f, len, pW->f, len ) +#define COPYN(f) pW->f = pA->f + + COPYN(lfHeight); + COPYN(lfWidth); + COPYN(lfEscapement); + COPYN(lfOrientation); + COPYN(lfWeight); + COPYN(lfItalic); + COPYN(lfUnderline); + COPYN(lfStrikeOut); + COPYN(lfCharSet); + COPYN(lfOutPrecision); + COPYN(lfClipPrecision); + COPYN(lfQuality); + COPYN(lfPitchAndFamily); + COPYS(lfFaceName,LF_FACESIZE); + +#undef COPYN +#undef COPYS +} + +VOID +STDCALL +LogFontW2A(LPLOGFONTA pA, CONST LOGFONTW *pW) +{ +#define COPYS(f,len) WideCharToMultiByte ( CP_THREAD_ACP, 0, pW->f, len, pA->f, len, NULL, NULL ) +#define COPYN(f) pA->f = pW->f + + COPYN(lfHeight); + COPYN(lfWidth); + COPYN(lfEscapement); + COPYN(lfOrientation); + COPYN(lfWeight); + COPYN(lfItalic); + COPYN(lfUnderline); + COPYN(lfStrikeOut); + COPYN(lfCharSet); + COPYN(lfOutPrecision); + COPYN(lfClipPrecision); + COPYN(lfQuality); + COPYN(lfPitchAndFamily); + COPYS(lfFaceName,LF_FACESIZE); + +#undef COPYN +#undef COPYS +} _____ Modified: trunk/reactos/lib/rosrtl/file/sparse.c --- trunk/reactos/lib/rosrtl/file/sparse.c 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/lib/rosrtl/file/sparse.c 2005-07-01 01:54:55 UTC (rev 16359) @@ -1,3 +1,4 @@ +#if 0 #include <windows.h> #include <ddk/ntifs.h> #include <string.h> @@ -113,3 +114,4 @@ return 0; } +#endif _____ Modified: trunk/reactos/lib/rosrtl/misc/devmode.c --- trunk/reactos/lib/rosrtl/misc/devmode.c 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/lib/rosrtl/misc/devmode.c 2005-07-01 01:54:55 UTC (rev 16359) @@ -1,3 +1,4 @@ +#if 0 #include <windows.h> #include <string.h> #include <rosrtl/devmode.h> @@ -144,3 +145,4 @@ #undef SIZEOF_DEVMODEW_300 #undef SIZEOF_DEVMODEW_400 #undef SIZEOF_DEVMODEW_500 +#endif _____ Modified: trunk/reactos/lib/rosrtl/misc/logfont.c --- trunk/reactos/lib/rosrtl/misc/logfont.c 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/lib/rosrtl/misc/logfont.c 2005-07-01 01:54:55 UTC (rev 16359) @@ -1,3 +1,4 @@ +#if 0 #include <windows.h> #include <string.h> #include <rosrtl/logfont.h> @@ -51,3 +52,4 @@ #undef COPYN #undef COPYS } +#endif _____ Modified: trunk/reactos/lib/rosrtl/thread/priv.c --- trunk/reactos/lib/rosrtl/thread/priv.c 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/lib/rosrtl/thread/priv.c 2005-07-01 01:54:55 UTC (rev 16359) @@ -1,3 +1,4 @@ +#if 0 #include <windows.h> #include <rosrtl/priv.h> @@ -117,4 +118,5 @@ } return FALSE; } +#endif _____ Modified: trunk/reactos/lib/user32/include/user32p.h --- trunk/reactos/lib/user32/include/user32p.h 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/lib/user32/include/user32p.h 2005-07-01 01:54:55 UTC (rev 16359) @@ -124,5 +124,9 @@ PUSER32_THREAD_DATA User32GetThreadData(); +DEVMODEW * +STDCALL +GdiConvertToDevmodeW(DEVMODEA *dm); + #endif /* EOF */ _____ Modified: trunk/reactos/lib/user32/misc/desktop.c --- trunk/reactos/lib/user32/misc/desktop.c 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/lib/user32/misc/desktop.c 2005-07-01 01:54:55 UTC (rev 16359) @@ -10,9 +10,33 @@ */ #include <user32.h> -#include <rosrtl/devmode.h> -#include <rosrtl/logfont.h> +VOID +STDCALL +LogFontW2A(LPLOGFONTA pA, CONST LOGFONTW *pW) +{ +#define COPYS(f,len) WideCharToMultiByte ( CP_THREAD_ACP, 0, pW->f, len, pA->f, len, NULL, NULL ) +#define COPYN(f) pA->f = pW->f + + COPYN(lfHeight); + COPYN(lfWidth); + COPYN(lfEscapement); + COPYN(lfOrientation); + COPYN(lfWeight); + COPYN(lfItalic); + COPYN(lfUnderline); + COPYN(lfStrikeOut); + COPYN(lfCharSet); + COPYN(lfOutPrecision); + COPYN(lfClipPrecision); + COPYN(lfQuality); + COPYN(lfPitchAndFamily); + COPYS(lfFaceName,LF_FACESIZE); + +#undef COPYN +#undef COPYS +} + /* * @implemented */ @@ -76,11 +100,11 @@ nclma->iSmCaptionHeight = nclmw.iSmCaptionHeight; nclma->iMenuWidth = nclmw.iMenuWidth; nclma->iMenuHeight = nclmw.iMenuHeight; - RosRtlLogFontW2A(&(nclma->lfCaptionFont), &(nclmw.lfCaptionFont)); - RosRtlLogFontW2A(&(nclma->lfSmCaptionFont), &(nclmw.lfSmCaptionFont)); - RosRtlLogFontW2A(&(nclma->lfMenuFont), &(nclmw.lfMenuFont)); - RosRtlLogFontW2A(&(nclma->lfStatusFont), &(nclmw.lfStatusFont)); - RosRtlLogFontW2A(&(nclma->lfMessageFont), &(nclmw.lfMessageFont)); + LogFontW2A(&(nclma->lfCaptionFont), &(nclmw.lfCaptionFont)); + LogFontW2A(&(nclma->lfSmCaptionFont), &(nclmw.lfSmCaptionFont)); + LogFontW2A(&(nclma->lfMenuFont), &(nclmw.lfMenuFont)); + LogFontW2A(&(nclma->lfStatusFont), &(nclmw.lfStatusFont)); + LogFontW2A(&(nclma->lfMessageFont), &(nclmw.lfMessageFont)); return TRUE; } case SPI_GETICONTITLELOGFONT: @@ -88,7 +112,7 @@ LOGFONTW lfw; if (!SystemParametersInfoW(uiAction, 0, &lfw, fWinIni)) return FALSE; - RosRtlLogFontW2A(pvParam, &lfw); + LogFontW2A(pvParam, &lfw); return TRUE; } case SPI_GETDESKWALLPAPER: @@ -310,7 +334,7 @@ ANSI_STRING DesktopNameA; UNICODE_STRING DesktopNameU; HDESK hDesktop; - DEVMODEW DevmodeW; + LPDEVMODEW DevmodeW; if (lpszDesktop != NULL) { @@ -322,11 +346,11 @@ RtlInitUnicodeString(&DesktopNameU, NULL); } - RosRtlDevModeA2W ( &DevmodeW, pDevmode ); + DevmodeW = GdiConvertToDevmodeW(pDevmode); hDesktop = CreateDesktopW(DesktopNameU.Buffer, NULL, - &DevmodeW, + DevmodeW, dwFlags, dwDesiredAccess, lpsa); _____ Modified: trunk/reactos/lib/user32/misc/display.c --- trunk/reactos/lib/user32/misc/display.c 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/lib/user32/misc/display.c 2005-07-01 01:54:55 UTC (rev 16359) @@ -29,8 +29,14 @@ /* INCLUDES ******************************************************************/ #include <user32.h> -#include <rosrtl/devmode.h> +#define SIZEOF_DEVMODEA_300 124 +#define SIZEOF_DEVMODEA_400 148 +#define SIZEOF_DEVMODEA_500 156 +#define SIZEOF_DEVMODEW_300 188 +#define SIZEOF_DEVMODEW_400 212 +#define SIZEOF_DEVMODEW_500 220 + /* FUNCTIONS *****************************************************************/ /* @@ -211,8 +217,62 @@ rc = NtUserEnumDisplaySettings ( &DeviceName, iModeNum, &lpDevModeW, dwFlags ); - RosRtlDevModeW2A ( lpDevMode, &lpDevModeW ); +#define COPYS(f,len) WideCharToMultiByte( CP_THREAD_ACP, 0, lpDevModeW.f, len, (LPSTR)lpDevMode->f, len, NULL, NULL ) +#define COPYN(f) lpDevMode->f = lpDevModeW.f + COPYS(dmDeviceName, CCHDEVICENAME ); + COPYN(dmSpecVersion); + COPYN(dmDriverVersion); + switch ( lpDevModeW.dmSize ) + { + case SIZEOF_DEVMODEW_300: + lpDevMode->dmSize = SIZEOF_DEVMODEA_300; + break; + case SIZEOF_DEVMODEW_400: + lpDevMode->dmSize = SIZEOF_DEVMODEA_400; + break; + case SIZEOF_DEVMODEW_500: + default: /* FIXME what to do??? */ + lpDevMode->dmSize = SIZEOF_DEVMODEA_500; + break; + } + COPYN(dmDriverExtra); + COPYN(dmFields); + COPYN(dmPosition.x); + COPYN(dmPosition.y); + COPYN(dmScale); + COPYN(dmCopies); + COPYN(dmDefaultSource); + COPYN(dmPrintQuality); + COPYN(dmColor); + COPYN(dmDuplex); + COPYN(dmYResolution); + COPYN(dmTTOption); + COPYN(dmCollate); + COPYS(dmFormName,CCHFORMNAME); + COPYN(dmLogPixels); + COPYN(dmBitsPerPel); + COPYN(dmPelsWidth); + COPYN(dmPelsHeight); + COPYN(dmDisplayFlags); // aka dmNup + COPYN(dmDisplayFrequency); + if ( lpDevModeW.dmSize <= SIZEOF_DEVMODEW_300 ) + goto done; // we're done with 0x300 fields + + COPYN(dmICMMethod); + COPYN(dmICMIntent); + COPYN(dmMediaType); + COPYN(dmDitherType); + COPYN(dmReserved1); + COPYN(dmReserved2); + + if ( lpDevModeW.dmSize <= SIZEOF_DEVMODEW_400 ) + goto done; // we're done with 0x400 fields + + COPYN(dmPanningWidth); + COPYN(dmPanningHeight); + +done: RtlFreeUnicodeString ( &DeviceName ); @@ -380,8 +440,7 @@ LONG rc; UNICODE_STRING DeviceName; PUNICODE_STRING pDeviceName = &DeviceName; - DEVMODEW DevModeW; - LPDEVMODEW pDevModeW = &DevModeW; + LPDEVMODEW pDevModeW; if (lpszDeviceName != NULL) { @@ -395,7 +454,7 @@ pDeviceName = NULL; if (lpDevMode != NULL) - RosRtlDevModeA2W ( pDevModeW, lpDevMode ); + pDevModeW = GdiConvertToDevmodeW(lpDevMode); else pDevModeW = NULL; _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-06-30 22:40:36 UTC (rev 16358) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-01 01:54:55 UTC (rev 16359) @@ -13,7 +13,6 @@ #include <ndk/ntndk.h> #include <ddk/ntddblue.h> #include <rosrtl/string.h> -#include <rosrtl/minmax.h> #include <string.h> @@ -420,8 +419,8 @@ } Offset = 2 * ((Buff->CurrentY * Buff->MaxX) + Buff->CurrentX); SET_CELL_BUFFER(Buff, Offset, ' ', Buff->DefaultAttrib); - UpdateRect.left = RtlRosMin(UpdateRect.left, Buff->CurrentX); - UpdateRect.right = RtlRosMax(UpdateRect.right, (LONG) Buff->CurrentX); + UpdateRect.left = min(UpdateRect.left, Buff->CurrentX); + UpdateRect.right = max(UpdateRect.right, (LONG) Buff->CurrentX); } continue; } @@ -429,8 +428,8 @@ else if (Buffer[i] == '\r') { Buff->CurrentX = 0; - UpdateRect.left = RtlRosMin(UpdateRect.left, Buff->CurrentX); - UpdateRect.right = RtlRosMax(UpdateRect.right, (LONG) Buff->CurrentX); + UpdateRect.left = min(UpdateRect.left, Buff->CurrentX); + UpdateRect.right = max(UpdateRect.right, (LONG) Buff->CurrentX); continue; } /* --- TAB --- */ @@ -438,7 +437,7 @@ { UINT EndX; - UpdateRect.left = RtlRosMin(UpdateRect.left, Buff->CurrentX); + UpdateRect.left = min(UpdateRect.left, Buff->CurrentX); EndX = (Buff->CurrentX + 8) & ~7; if (EndX > Buff->MaxX) { @@ -451,7 +450,7 @@ Offset += 2; Buff->CurrentX++; } - UpdateRect.right = RtlRosMax(UpdateRect.right, (LONG) Buff->CurrentX - 1); + UpdateRect.right = max(UpdateRect.right, (LONG) Buff->CurrentX - 1); if (Buff->CurrentX == Buff->MaxX) { if (Buff->Mode & ENABLE_WRAP_AT_EOL_OUTPUT) @@ -467,8 +466,8 @@ continue; } } - UpdateRect.left = RtlRosMin(UpdateRect.left, Buff->CurrentX); - UpdateRect.right = RtlRosMax(UpdateRect.right, (LONG) Buff->CurrentX); + UpdateRect.left = min(UpdateRect.left, Buff->CurrentX); + UpdateRect.right = max(UpdateRect.right, (LONG) Buff->CurrentX); Offset = 2 * (((Buff->CurrentY * Buff->MaxX)) + Buff->CurrentX); Buff->Buffer[Offset++] = Buffer[i]; if (Attrib) @@ -679,10 +678,10 @@ } ConioInitRect(Intersection, - RtlRosMax(Rect1->top, Rect2->top), - RtlRosMax(Rect1->left, Rect2->left), - RtlRosMin(Rect1->bottom, Rect2->bottom), - RtlRosMin(Rect1->right, Rect2->right)); + max(Rect1->top, Rect2->top), + max(Rect1->left, Rect2->left), + min(Rect1->bottom, Rect2->bottom), + min(Rect1->right, Rect2->right)); return TRUE; } @@ -711,10 +710,10 @@ else { ConioInitRect(Union, - RtlRosMin(Rect1->top, Rect2->top), - RtlRosMin(Rect1->left, Rect2->left), - RtlRosMax(Rect1->bottom, Rect2->bottom), - RtlRosMax(Rect1->right, Rect2->right)); + min(Rect1->top, Rect2->top), + min(Rect1->left, Rect2->left), + max(Rect1->bottom, Rect2->bottom), + max(Rect1->right, Rect2->right)); } return TRUE; @@ -2299,8 +2298,8 @@ WriteRegion.right = Request->Data.WriteConsoleOutputRequest.WriteRegion.Right; WriteRegion.bottom = Request->Data.WriteConsoleOutputRequest.WriteRegion.Bottom; - SizeY = RtlRosMin(BufferSize.Y - BufferCoord.Y, ConioRectHeight(&WriteRegion)); - SizeX = RtlRosMin(BufferSize.X - BufferCoord.X, ConioRectWidth(&WriteRegion)); + SizeY = min(BufferSize.Y - BufferCoord.Y, ConioRectHeight(&WriteRegion)); + SizeX = min(BufferSize.X - BufferCoord.X, ConioRectWidth(&WriteRegion)); WriteRegion.bottom = WriteRegion.top + SizeY - 1; WriteRegion.right = WriteRegion.left + SizeX - 1; @@ -2797,8 +2796,8 @@ return Request->Status ; } - SizeY = RtlRosMin(BufferSize.Y - BufferCoord.Y, ConioRectHeight(&ReadRegion)); - SizeX = RtlRosMin(BufferSize.X - BufferCoord.X, ConioRectWidth(&ReadRegion)); + SizeY = min(BufferSize.Y - BufferCoord.Y, ConioRectHeight(&ReadRegion)); + SizeX = min(BufferSize.X - BufferCoord.X, ConioRectWidth(&ReadRegion)); ReadRegion.bottom = ReadRegion.top + SizeY; ReadRegion.right = ReadRegion.left + SizeX;

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