Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 28541: code improvements and various bug fixes
by gedmurphy＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: gedmurphy Date: Sat Aug 25 17:41:44 2007 New Revision: 28541 URL: http://svn.reactos.org/svn/reactos?rev=28541&view=rev Log: code improvements and various bug fixes Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/progress.c trunk/reactos/base/applications/mscutils/servman/query.c Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c Sat Aug 25 17:41:44 2007 @@ -15,7 +15,7 @@ /* Toolbar buttons */ -TBBUTTON Buttons [NUM_BUTTONS] = +static const TBBUTTON Buttons [] = { /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ {TBICON_PROP, ID_PROP, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0}, /* properties */ {TBICON_REFRESH, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* refresh */ @@ -141,31 +141,19 @@ { HMENU hMainMenu; DWORD Flags, State; + UINT i; /* get handle to menu */ hMainMenu = GetMenu(Info->hMainWnd); /* set all to greyed */ - EnableMenuItem(hMainMenu, ID_START, MF_GRAYED); - EnableMenuItem(hMainMenu, ID_STOP, MF_GRAYED); - EnableMenuItem(hMainMenu, ID_PAUSE, MF_GRAYED); - EnableMenuItem(hMainMenu, ID_RESUME, MF_GRAYED); - EnableMenuItem(hMainMenu, ID_RESTART, MF_GRAYED); - - EnableMenuItem(Info->hShortcutMenu, ID_START, MF_GRAYED); - EnableMenuItem(Info->hShortcutMenu, ID_STOP, MF_GRAYED); - EnableMenuItem(Info->hShortcutMenu, ID_PAUSE, MF_GRAYED); - EnableMenuItem(Info->hShortcutMenu, ID_RESUME, MF_GRAYED); - EnableMenuItem(Info->hShortcutMenu, ID_RESTART, MF_GRAYED); - - SendMessage(Info->hTool, TB_SETSTATE, ID_START, - (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); - SendMessage(Info->hTool, TB_SETSTATE, ID_STOP, - (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); - SendMessage(Info->hTool, TB_SETSTATE, ID_PAUSE, - (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); - SendMessage(Info->hTool, TB_SETSTATE, ID_RESTART, - (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); + for (i = ID_START; i <= ID_RESTART; i++) + { + EnableMenuItem(hMainMenu, i, MF_GRAYED); + EnableMenuItem(Info->hShortcutMenu, ID_START, MF_GRAYED); + SendMessage(Info->hTool, TB_SETSTATE, i, + (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); + } if (Info->SelectedItem != NO_ITEM_SELECTED) { @@ -249,7 +237,7 @@ static BOOL pCreateToolbar(PMAIN_WND_INFO Info) { - INT NumButtons = sizeof(Buttons) / sizeof(Buttons[0]); + INT numButtons = sizeof(Buttons) / sizeof(Buttons[0]); Info->hTool = CreateWindowEx(0, TOOLBARCLASSNAME, @@ -288,7 +276,7 @@ SendMessage(Info->hTool, TB_ADDBUTTONS, - NumButtons, + numButtons, (LPARAM)Buttons); return TRUE; @@ -346,7 +334,6 @@ (void)ListView_SetImageList(Info->hListView, hLarge, LVSIL_NORMAL); - } @@ -472,7 +459,6 @@ if(Info->hStatus == NULL) return FALSE; - SendMessage(Info->hStatus, SB_SETPARTS, sizeof(StatWidths) / sizeof(INT), @@ -485,7 +471,6 @@ ListViewSelectionChanged(PMAIN_WND_INFO Info, LPNMLISTVIEW pnmv) { - HMENU hMainMenu; /* get handle to menu */ @@ -543,16 +528,19 @@ } -static VOID +static BOOL InitMainWnd(PMAIN_WND_INFO Info) { if (!pCreateToolbar(Info)) + { DisplayString(_T("error creating toolbar")); + return FALSE; + } if (!CreateListView(Info)) { DisplayString(_T("error creating list view")); - return; + return FALSE; } if (!CreateStatusBar(Info)) @@ -563,6 +551,8 @@ MAKEINTRESOURCE(IDR_POPUP)); Info->hShortcutMenu = GetSubMenu(Info->hShortcutMenu, 0); + + return TRUE; } @@ -820,7 +810,8 @@ GWLP_USERDATA, (LONG_PTR)Info); - InitMainWnd(Info); + if (!InitMainWnd(Info)) + return -1; /* Show the window */ ShowWindow(hwnd, @@ -1007,10 +998,9 @@ case WM_CLOSE: { - /* Free service array */ HeapFree(ProcessHeap, 0, - Info->pServiceStatus); + Info->pAllServices); DestroyMenu(Info->hShortcutMenu); DestroyWindow(hwnd); @@ -1019,8 +1009,6 @@ case WM_DESTROY: { - //DestroyMainWnd(Info); - HeapFree(ProcessHeap, 0, Info); @@ -1028,7 +1016,6 @@ GWLP_USERDATA, 0); - /* Break the message queue loop */ PostQuitMessage(0); } break; @@ -1044,6 +1031,7 @@ } break; } + return Ret; } @@ -1122,4 +1110,3 @@ UnregisterClass(szMainWndClass, hInstance); } - Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h Sat Aug 25 17:41:44 2007 @@ -15,9 +15,6 @@ #define NO_ITEM_SELECTED -1 #define MAX_KEY_LENGTH 256 -#define NUM_BUTTONS 11 -#define PROGRESSRANGE 8 - typedef struct _MAIN_WND_INFO { @@ -28,7 +25,7 @@ HMENU hShortcutMenu; int nCmdShow; - ENUM_SERVICE_STATUS_PROCESS *pServiceStatus; /* Stores the complete services array */ + ENUM_SERVICE_STATUS_PROCESS *pAllServices; ENUM_SERVICE_STATUS_PROCESS *CurrentService; /* Stores the current selected service */ INT SelectedItem;/* selection number in the list view */ @@ -79,7 +76,7 @@ LPTSTR GetDescription(LPTSTR); LPTSTR GetExecutablePath(PMAIN_WND_INFO Info); BOOL RefreshServiceList(PMAIN_WND_INFO Info); -DWORD GetServiceList(PMAIN_WND_INFO Info); +//DWORD GetServiceList(PMAIN_WND_INFO Info); /* propsheet.c */ LONG APIENTRY OpenPropSheet(PMAIN_WND_INFO Info); @@ -91,35 +88,27 @@ INT AllocAndLoadString(OUT LPTSTR *lpTarget, IN HINSTANCE hInst, IN UINT uID); - DWORD LoadAndFormatString(IN HINSTANCE hInstance, IN UINT uID, OUT LPTSTR *lpTarget, ...); - BOOL StatusBarLoadAndFormatString(IN HWND hStatusBar, IN INT PartId, IN HINSTANCE hInstance, IN UINT uID, ...); - BOOL StatusBarLoadString(IN HWND hStatusBar, IN INT PartId, IN HINSTANCE hInstance, IN UINT uID); - INT GetTextFromEdit(OUT LPTSTR lpString, IN HWND hDlg, IN UINT Res); - VOID GetError(VOID); - VOID DisplayString(PTCHAR); - HIMAGELIST InitImageList(UINT NumButtons, UINT StartResource, UINT Width, UINT Height); - #endif /* __SERVMAN_PRECOMP_H */ Modified: trunk/reactos/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/progress.c (original) +++ trunk/reactos/base/applications/mscutils/servman/progress.c Sat Aug 25 17:41:44 2007 @@ -8,6 +8,8 @@ */ #include "precomp.h" + +#define PROGRESSRANGE 8 VOID CompleteProgressBar(HWND hProgDlg) Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c Sat Aug 25 17:41:44 2007 @@ -25,7 +25,6 @@ /* return pointer to selected service */ return (ENUM_SERVICE_STATUS_PROCESS *)lvItem.lParam; } - /* get vendor of service binary */ @@ -99,21 +98,90 @@ } +static BOOL +GetServiceList(PMAIN_WND_INFO Info, + DWORD *NumServices) +{ + SC_HANDLE ScHandle; + BOOL bRet = FALSE; + + DWORD BytesNeeded = 0; + DWORD ResumeHandle = 0; + + *NumServices = 0; + + ScHandle = OpenSCManager(NULL, + NULL, + SC_MANAGER_ENUMERATE_SERVICE); + if (ScHandle != INVALID_HANDLE_VALUE) + { + if (!EnumServicesStatusEx(ScHandle, + SC_ENUM_PROCESS_INFO, + SERVICE_WIN32, + SERVICE_STATE_ALL, + NULL, + 0, + &BytesNeeded, + NumServices, + &ResumeHandle, + 0)) + { + /* Call function again if required size was returned */ + if (GetLastError() == ERROR_MORE_DATA) + { + /* reserve memory for service info array */ + Info->pAllServices = (ENUM_SERVICE_STATUS_PROCESS *) HeapAlloc(ProcessHeap, + 0, + BytesNeeded); + if (Info->pAllServices) + { + /* fill array with service info */ + if (EnumServicesStatusEx(ScHandle, + SC_ENUM_PROCESS_INFO, + SERVICE_WIN32, + SERVICE_STATE_ALL, + (LPBYTE)Info->pAllServices, + BytesNeeded, + &BytesNeeded, + NumServices, + &ResumeHandle, + 0)) + { + bRet = TRUE; + } + } + } + } + } + + if (ScHandle) + CloseServiceHandle(ScHandle); + + if (!bRet) + { + HeapFree(ProcessHeap, + 0, + Info->pAllServices); + } + + return bRet; +} + + BOOL RefreshServiceList(PMAIN_WND_INFO Info) { + ENUM_SERVICE_STATUS_PROCESS *pService; LVITEM lvItem; TCHAR szNumServices[32]; TCHAR szStatus[64]; - DWORD NumServices = 0; + DWORD NumServices; DWORD Index; LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); (void)ListView_DeleteAllItems(Info->hListView); - NumServices = GetServiceList(Info); - - if (NumServices) + if (GetServiceList(Info, &NumServices)) { TCHAR buf[300]; /* buffer to hold key path */ INT NumListedServ = 0; /* how many services were listed */ @@ -122,38 +190,43 @@ { HKEY hKey = NULL; LPTSTR lpDescription = NULL; - LPTSTR LogOnAs = NULL; + LPTSTR lpLogOnAs = NULL; DWORD StartUp = 0; DWORD dwValueSize; + + /* copy the service info over */ + pService = &Info->pAllServices[Index]; /* open the registry key for the service */ _sntprintf(buf, 300, Path, - Info->pServiceStatus[Index].lpServiceName); - - RegOpenKeyEx(HKEY_LOCAL_MACHINE, - buf, + pService->lpServiceName); + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + buf, + 0, + KEY_READ, + &hKey) != ERROR_SUCCESS) + { + HeapFree(ProcessHeap, 0, - KEY_READ, - &hKey); - + pService); + continue; + } /* set the display name */ ZeroMemory(&lvItem, sizeof(LVITEM)); lvItem.mask = LVIF_TEXT | LVIF_PARAM; - lvItem.pszText = Info->pServiceStatus[Index].lpDisplayName; - - /* Set a pointer for each service so we can query it later. - * Not all services are added to the list, so we can't query - * the item number as they become out of sync with the array */ - lvItem.lParam = (LPARAM)&Info->pServiceStatus[Index]; - - lvItem.iItem = ListView_GetItemCount(Info->hListView); + lvItem.pszText = pService->lpDisplayName; + + /* Add the service pointer */ + lvItem.lParam = (LPARAM)pService; + + /* add it to the listview */ lvItem.iItem = ListView_InsertItem(Info->hListView, &lvItem); /* set the description */ - if ((lpDescription = GetDescription(Info->pServiceStatus[Index].lpServiceName))) + if ((lpDescription = GetDescription(pService->lpServiceName))) { lvItem.pszText = lpDescription; lvItem.iSubItem = 1; @@ -168,7 +241,7 @@ } /* set the status */ - if (Info->pServiceStatus[Index].ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + if (pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) { LoadString(hInstance, IDS_SERVICES_STARTED, @@ -189,18 +262,34 @@ NULL, NULL, (LPBYTE)&StartUp, - &dwValueSize)) - { - RegCloseKey(hKey); - continue; - } - - if (StartUp == 0x02) - { - LoadString(hInstance, - IDS_SERVICES_AUTO, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); + &dwValueSize) == ERROR_SUCCESS) + { + switch (StartUp) + { + case 2: + LoadStringW(hInstance, + IDS_SERVICES_AUTO, + szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + break; + case 3: + LoadStringW(hInstance, + IDS_SERVICES_MAN, + szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + break; + + case 4: + LoadStringW(hInstance, + IDS_SERVICES_DIS, + szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + break; + default: + szStatus[0] = 0; + break; + } + lvItem.pszText = szStatus; lvItem.iSubItem = 3; SendMessage(Info->hListView, @@ -208,32 +297,6 @@ lvItem.iItem, (LPARAM)&lvItem); } - else if (StartUp == 0x03) - { - LoadString(hInstance, - IDS_SERVICES_MAN, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - lvItem.pszText = szStatus; - lvItem.iSubItem = 3; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - } - else if (StartUp == 0x04) - { - LoadString(hInstance, - IDS_SERVICES_DIS, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - lvItem.pszText = szStatus; - lvItem.iSubItem = 3; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - } /* set Log On As */ dwValueSize = 0; @@ -242,52 +305,39 @@ NULL, NULL, NULL, - &dwValueSize)) - { + &dwValueSize) == ERROR_SUCCESS) + { + lpLogOnAs = HeapAlloc(ProcessHeap, + 0, + dwValueSize); + if (lpLogOnAs != NULL) + { + if(RegQueryValueEx(hKey, + _T("ObjectName"), + NULL, + NULL, + (LPBYTE)lpLogOnAs, + &dwValueSize) == ERROR_SUCCESS) + { + lvItem.pszText = lpLogOnAs; + lvItem.iSubItem = 4; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM)&lvItem); + } + + HeapFree(ProcessHeap, + 0, + lpLogOnAs); + } + RegCloseKey(hKey); - continue; - } - - LogOnAs = HeapAlloc(ProcessHeap, - HEAP_ZERO_MEMORY, - dwValueSize); - if (LogOnAs == NULL) - { - RegCloseKey(hKey); - return FALSE; - } - if(RegQueryValueEx(hKey, - _T("ObjectName"), - NULL, - NULL, - (LPBYTE)LogOnAs, - &dwValueSize)) - { - HeapFree(ProcessHeap, - 0, - LogOnAs); - RegCloseKey(hKey); - continue; - } - - lvItem.pszText = LogOnAs; - lvItem.iSubItem = 4; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - - HeapFree(ProcessHeap, - 0, - LogOnAs); - - RegCloseKey(hKey); - + } } + /* set the number of listed services in the status bar */ NumListedServ = ListView_GetItemCount(Info->hListView); - - /* set the number of listed services in the status bar */ LoadString(hInstance, IDS_NUM_SERVICES, szNumServices, @@ -308,78 +358,7 @@ SendMessage (Info->hListView, WM_SETREDRAW, TRUE, - 0) ; + 0); return TRUE; } - - - - -DWORD -GetServiceList(PMAIN_WND_INFO Info) -{ - SC_HANDLE ScHandle; - BOOL bGotServices = FALSE; - - DWORD BytesNeeded = 0; - DWORD ResumeHandle = 0; - DWORD NumServices = 0; - - ScHandle = OpenSCManager(NULL, - NULL, - SC_MANAGER_ENUMERATE_SERVICE); - if (ScHandle != INVALID_HANDLE_VALUE) - { - if (!EnumServicesStatusEx(ScHandle, - SC_ENUM_PROCESS_INFO, - SERVICE_WIN32, - SERVICE_STATE_ALL, - (LPBYTE)Info->pServiceStatus, - 0, - &BytesNeeded, - &NumServices, - &ResumeHandle, - 0)) - { - /* Call function again if required size was returned */ - if (GetLastError() == ERROR_MORE_DATA) - { - /* reserve memory for service info array */ - Info->pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) - HeapAlloc(ProcessHeap, - 0, - BytesNeeded); - if (Info->pServiceStatus == NULL) - return FALSE; - - /* fill array with service info */ - if (EnumServicesStatusEx(ScHandle, - SC_ENUM_PROCESS_INFO, - SERVICE_WIN32, - SERVICE_STATE_ALL, - (LPBYTE)Info->pServiceStatus, - BytesNeeded, - &BytesNeeded, - &NumServices, - &ResumeHandle, - 0)) - { - bGotServices = TRUE; - } - } - } - } - - if (ScHandle) - CloseServiceHandle(ScHandle); - - if (!bGotServices) - { - HeapFree(ProcessHeap, - 0, - Info->pServiceStatus); - } - - return NumServices; -}

1 0

[greatlrd] 28540: make AddFontResourceExA lite faster.
by greatlrd＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: greatlrd Date: Sat Aug 25 15:38:35 2007 New Revision: 28540 URL: http://svn.reactos.org/svn/reactos?rev=28540&view=rev Log: make AddFontResourceExA lite faster. Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Sat Aug 25 15:38:35 2007 @@ -1116,16 +1116,22 @@ PWSTR FilenameW; int rc = 0; - Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); - if ( !NT_SUCCESS (Status) ) - { - SetLastError (RtlNtStatusToDosError(Status)); + if (!(fl & (FR_PRIVATE | FR_NOT_ENUM))) + { + SetLastError( ERROR_INVALID_PARAMETER ); } else { - rc = AddFontResourceExW ( FilenameW, fl, pvReserved ); - - HEAP_free ( FilenameW ); + Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); + if ( !NT_SUCCESS (Status) ) + { + SetLastError (RtlNtStatusToDosError(Status)); + } + else + { + rc = GdiAddFontResourceW ( FilenameW, fl, 0 ); + HEAP_free ( FilenameW ); + } } return rc; }

1 0

[greatlrd] 28539: Fix : make AddFontResourceA acts like AddFontResourceW Fix : smaller typo in AddFontResourceW
by greatlrd＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: greatlrd Date: Sat Aug 25 15:34:16 2007 New Revision: 28539 URL: http://svn.reactos.org/svn/reactos?rev=28539&view=rev Log: Fix : make AddFontResourceA acts like AddFontResourceW Fix : smaller typo in AddFontResourceW Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Sat Aug 25 15:34:16 2007 @@ -1112,14 +1112,16 @@ STDCALL AddFontResourceExA ( LPCSTR lpszFilename, DWORD fl, PVOID pvReserved ) { - NTSTATUS Status; - PWSTR FilenameW; - int rc = 0; - - Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); - if ( !NT_SUCCESS (Status) ) - SetLastError (RtlNtStatusToDosError(Status)); - else + NTSTATUS Status; + PWSTR FilenameW; + int rc = 0; + + Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); + if ( !NT_SUCCESS (Status) ) + { + SetLastError (RtlNtStatusToDosError(Status)); + } + else { rc = AddFontResourceExW ( FilenameW, fl, pvReserved ); @@ -1136,7 +1138,22 @@ STDCALL AddFontResourceA ( LPCSTR lpszFilename ) { - return AddFontResourceExA ( lpszFilename, 0, 0 ); + NTSTATUS Status; + PWSTR FilenameW; + int rc = 0; + + Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); + if ( !NT_SUCCESS (Status) ) + { + SetLastError (RtlNtStatusToDosError(Status)); + } + else + { + rc = GdiAddFontResourceW ( FilenameW, 0, 0); + + HEAP_free ( FilenameW ); + } + return rc; } @@ -1147,7 +1164,7 @@ STDCALL AddFontResourceW ( LPCWSTR lpszFilename ) { - return AddFontResourceExW ( lpszFilename, 0, 0 ); + return GdiAddFontResourceW ( lpszFilename, 0, 0 ); }

1 0

[spetreolle] 28538: report freeldr bugs at ros-dev@reactos.org
by spetreolle＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: spetreolle Date: Sat Aug 25 13:58:30 2007 New Revision: 28538 URL: http://svn.reactos.org/svn/reactos?rev=28538&view=rev Log: report freeldr bugs at ros-dev(a)reactos.org Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S Sat Aug 25 13:58:30 2007 @@ -83,7 +83,7 @@ .ascii "An error occured in FreeLoader\n" .ascii VERSION .ascii "\n" - .asciz "Report this error to the ReactOS Development mailing list <ros-dev(a)reactos.com>\n\n" + .asciz "Report this error to the ReactOS Development mailing list <ros-dev(a)reactos.org>\n\n" i386DivideByZeroText: .asciz "Exception 00: DIVIDE BY ZERO\n\n"

1 0

[fireball] 28537: - Do not ignore BIOS memory map anymore. Private BIOS ranges (such as ACPI, SMBIOS, VideoROM, etc) are not assumed "free" anymore (which would result in hardware failure, crashes and/or corrupted memory). - Enhance the FreeLDR 2 NTLDR Compatibility Layer: * Use a special routine for grabbing static memory descriptors, so that if we ever run out, we will bugcheck. * The descriptors need to contain physical addresses, not virtual. Do proper fixups to handle this. * Add a "Free" m
by fireball＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: fireball Date: Sat Aug 25 13:38:13 2007 New Revision: 28537 URL: http://svn.reactos.org/svn/reactos?rev=28537&view=rev Log: - Do not ignore BIOS memory map anymore. Private BIOS ranges (such as ACPI, SMBIOS, VideoROM, etc) are not assumed "free" anymore (which would result in hardware failure, crashes and/or corrupted memory). - Enhance the FreeLDR 2 NTLDR Compatibility Layer: * Use a special routine for grabbing static memory descriptors, so that if we ever run out, we will bugcheck. * The descriptors need to contain physical addresses, not virtual. Do proper fixups to handle this. * Add a "Free" memory descriptor for all memory on the system. This needs to be fragmented later. * Add memory descriptors for each reserved entry in the BIOS memory map. * Add memory descriptors for the PDE and KPCR pages that FreeLDR allocates. * Add a memory descriptor for page 0, which is reserved. * Add a memory descriptor for the Video frame buffer at 0xA0000. This is the location on most systems, and also the location that ReactOS hard-codes in other Mm code. - Bug found and NTLDR memory descriptor analysis by Alex. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Sat Aug 25 13:38:13 2007 @@ -599,7 +599,7 @@ if (LoaderBlock.MmapLength) { ULONG i; - + LoaderBlock.Flags |= MB_FLAGS_MEM_INFO | MB_FLAGS_MMAP_INFO; LoaderBlock.MmapAddr = (unsigned long)&reactos_memory_map; reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24 for (i=0; i<(LoaderBlock.MmapLength/sizeof(memory_map_t)); i++) Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Sat Aug 25 13:38:13 2007 @@ -23,6 +23,12 @@ /* FreeLDR Loader Data */ PROS_LOADER_PARAMETER_BLOCK KeRosLoaderBlock; BOOLEAN AcpiTableDetected; +ADDRESS_RANGE KeMemoryMap[64]; +ULONG KeMemoryMapRangeCount; + +/* NT Loader Module/Descriptor Count */ +ULONG BldrCurrentMd; +ULONG BldrCurrentMod; /* NT Loader Data. Eats up about 80KB! */ LOADER_PARAMETER_BLOCK BldrLoaderBlock; // 0x0000 @@ -44,6 +50,15 @@ // 0x1443C /* FUNCTIONS *****************************************************************/ + +PMEMORY_ALLOCATION_DESCRIPTOR +NTAPI +KiRosGetMdFromArray(VOID) +{ + /* Return the next MD from the list, but make sure we don't overflow */ + if (BldrCurrentMd > 64) KEBUGCHECK(0); + return &BldrMemoryDescriptors[BldrCurrentMd++]; +} VOID NTAPI @@ -69,6 +84,7 @@ AcpiTableDetected = (RosLoaderBlock->Flags & MB_FLAGS_ACPI_TABLE) ? TRUE : FALSE; MmFreeLdrMemHigher = RosLoaderBlock->MemHigher; MmFreeLdrPageDirectoryEnd = RosLoaderBlock->PageDirectoryEnd; + if (!MmFreeLdrPageDirectoryEnd) MmFreeLdrPageDirectoryEnd = 0x40000; /* Set the NT Loader block and initialize it */ *NtLoaderBlock = LoaderBlock = &BldrLoaderBlock; @@ -88,6 +104,64 @@ InitializeListHead(&LoaderBlock->MemoryDescriptorListHead); InitializeListHead(&LoaderBlock->BootDriverListHead); InitializeListHead(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); + + /* Create one large blob of free memory */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderFree; + MdEntry->BasePage = 0; + MdEntry->PageCount = MmFreeLdrMemHigher / 4; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); + + /* + * FIXME: Instead of just "inserting" MDs into the list, + * we need to make then be "consumed" from the Free Descriptor. + * This will happen soon (and also ensure a sorted list). + */ + + /* Loop the BIOS Memory Map */ + for (j = 0; j < KeMemoryMapRangeCount; j++) + { + /* Check if this is a reserved entry */ + if (KeMemoryMap[j].Type == 2) + { + /* It is, build an entry for it */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderSpecialMemory; + MdEntry->BasePage = KeMemoryMap[j].BaseAddrLow >> PAGE_SHIFT; + MdEntry->PageCount = (KeMemoryMap[j].LengthLow + PAGE_SIZE - 1) >> PAGE_SHIFT; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, + &MdEntry->ListEntry); + } + } + + /* Page 0 is reserved: build an entry for it */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderFirmwarePermanent; + MdEntry->BasePage = 0; + MdEntry->PageCount = 1; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); + + /* Build an entry for the KPCR (which we put in page 1) */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderMemoryData; + MdEntry->BasePage = 1; + MdEntry->PageCount = 1; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); + + /* Build an entry for the PDE */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderMemoryData; + MdEntry->BasePage = (ULONG_PTR)MmGetPageDirectory() >> PAGE_SHIFT; + MdEntry->PageCount = (MmFreeLdrPageDirectoryEnd - + (ULONG_PTR)MmGetPageDirectory()) / PAGE_SIZE; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); + + /* Mark Video ROM as reserved */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderFirmwarePermanent; + MdEntry->BasePage = 0xA0000 >> PAGE_SHIFT; + MdEntry->PageCount = (0xE8000 - 0xA0000) / PAGE_SIZE; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); /* Loop boot driver list */ for (i = 0; i < RosLoaderBlock->ModsCount; i++) @@ -106,9 +180,9 @@ LoaderBlock->NlsData->AnsiCodePageData = ModStart; /* Create an MD for it */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderNlsData; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1)>> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -121,9 +195,9 @@ LoaderBlock->NlsData->OemCodePageData = ModStart; /* Create an MD for it */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderNlsData; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -136,9 +210,9 @@ LoaderBlock->NlsData->UnicodeCodePageData = ModStart; /* Create an MD for it */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderNlsData; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -158,9 +232,9 @@ LoaderBlock->SetupLdrBlock = NULL; /* Create an MD for it */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderRegistryData; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -173,9 +247,9 @@ { /* Create an MD for it */ ModStart = RVA(ModStart, KSEG0_BASE); - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderRegistryData; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -186,9 +260,9 @@ if (!(_stricmp(DriverName, "ntoskrnl.exe"))) { /* Create an MD for it */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderSystemCode; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -196,9 +270,9 @@ else if (!(_stricmp(DriverName, "hal.dll"))) { /* Create an MD for the HAL */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderHalCode; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -206,9 +280,9 @@ else { /* Create an MD for any driver */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderBootDriver; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -356,6 +430,7 @@ IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { PLOADER_PARAMETER_BLOCK NtLoaderBlock; + ULONG size, i; #if defined(_M_IX86) PKTSS Tss; PKGDTENTRY TssEntry; @@ -387,6 +462,39 @@ KSEG0_BASE; MmFreeLdrLastKrnlPhysAddr = MmFreeLdrLastKernelAddress - KSEG0_BASE; + KeMemoryMapRangeCount = 0; + if (LoaderBlock->Flags & MB_FLAGS_MMAP_INFO) + { + /* We have a memory map from the nice BIOS */ + size = *((PULONG)(LoaderBlock->MmapAddr - sizeof(ULONG))); + i = 0; + + /* Map it until we run out of size */ + while (i < LoaderBlock->MmapLength) + { + /* Copy into the Kernel Memory Map */ + memcpy (&KeMemoryMap[KeMemoryMapRangeCount], + (PVOID)(LoaderBlock->MmapAddr + i), + sizeof(ADDRESS_RANGE)); + + /* Increase Memory Map Count */ + KeMemoryMapRangeCount++; + + /* Increase Size */ + i += size; + } + + /* Save data */ + LoaderBlock->MmapLength = KeMemoryMapRangeCount * sizeof(ADDRESS_RANGE); + LoaderBlock->MmapAddr = (ULONG)KeMemoryMap; + } + else + { + /* Nothing from BIOS */ + LoaderBlock->MmapLength = 0; + LoaderBlock->MmapAddr = (ULONG)KeMemoryMap; + } + #if defined(_M_IX86) /* Set up the VDM Data */ NtEarlyInitVdm(); Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sat Aug 25 13:38:13 2007 @@ -17,6 +17,10 @@ /* Spinlocks used only on X86 */ KSPIN_LOCK KiFreezeExecutionLock; KSPIN_LOCK Ki486CompatibilityLock; + +/* BIOS Memory Map. Not NTLDR-compliant yet */ +extern ULONG KeMemoryMapRangeCount; +extern ADDRESS_RANGE KeMemoryMap[64]; /* FUNCTIONS *****************************************************************/ @@ -536,8 +540,8 @@ MmInit1(MmFreeLdrFirstKrnlPhysAddr, MmFreeLdrLastKrnlPhysAddr, MmFreeLdrLastKernelAddress, - NULL, - 0, + KeMemoryMap, + KeMemoryMapRangeCount, 4096); /* Set basic CPU Features that user mode can read */ Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Sat Aug 25 13:38:13 2007 @@ -301,6 +301,34 @@ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); } +PCHAR +MemType[] = { + "ExceptionBlock ", // ? + "SystemBlock ", // ? + "Free ", + "Bad ", // used + "LoadedProgram ", // == Free + "FirmwareTemporary ", // == Free + "FirmwarePermanent ", // == Bad + "OsloaderHeap ", // used + "OsloaderStack ", // == Free + "SystemCode ", + "HalCode ", + "BootDriver ", // not used + "ConsoleInDriver ", // ? + "ConsoleOutDriver ", // ? + "StartupDpcStack ", // ? + "StartupKernelStack", // ? + "StartupPanicStack ", // ? + "StartupPcrPage ", // ? + "StartupPdrPage ", // ? + "RegistryData ", // used + "MemoryData ", // not used + "NlsData ", // used + "SpecialMemory ", // == Bad + "BBTMemory " // == Bad +}; + VOID INIT_FUNCTION NTAPI @@ -324,6 +352,25 @@ LastKrnlPhysAddr, LastKernelAddress); + /* Dump memory descriptors */ + { + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR Md; + ULONG TotalPages = 0; + + DPRINT1("Base\t\tLength\t\tType\n"); + for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; + NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; + NextEntry = NextEntry->Flink) + { + Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); + DPRINT1("%08lX\t%08lX\t%s\n", Md->BasePage, Md->PageCount, MemType[Md->MemoryType]); + TotalPages += Md->PageCount; + } + + DPRINT1("Total: %08lX (%d MB)\n", TotalPages, (TotalPages * PAGE_SIZE) / 1024 / 1024); + } + /* Set the page directory */ PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart = (ULONG)MmGetPageDirectory();

1 0

[cfinck] 28536: Revert r28526 for now until a problem for the livecd breakage has been found
by cfinck＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: cfinck Date: Sat Aug 25 13:00:19 2007 New Revision: 28536 URL: http://svn.reactos.org/svn/reactos?rev=28536&view=rev Log: Revert r28526 for now until a problem for the livecd breakage has been found Modified: trunk/reactos/media/inf/inf.rbuild trunk/reactos/tools/rbuild/automaticdependency.cpp trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/cdfile.cpp trunk/reactos/tools/rbuild/directory.cpp trunk/reactos/tools/rbuild/installfile.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=2… ============================================================================== --- trunk/reactos/media/inf/inf.rbuild (original) +++ trunk/reactos/media/inf/inf.rbuild Sat Aug 25 13:00:19 2007 @@ -1,23 +1,21 @@ <group> - <installfile base="inf">acpi.inf</installfile> - <installfile base="inf">cdrom.inf</installfile> - <installfile base="inf">display.inf</installfile> - <installfile base="inf">hdc.inf</installfile> - <installfile base="inf">keyboard.inf</installfile> - <installfile base="inf">layout.inf</installfile> - <installfile base="inf">machine.inf</installfile> - <installfile base="inf">msmouse.inf</installfile> - <installfile base="inf">NET_NIC.inf</installfile> - <installfile base="inf">netamd.inf</installfile> - <installfile base="inf">netisa.inf</installfile> - <installfile base="inf">netrtpnt.inf</installfile> - <installfile base="inf">nettcpip.inf</installfile> - <installfile base="inf">ports.inf</installfile> - <installfile base="inf">scsi.inf</installfile> - <installfile base="inf">usbport.inf</installfile> - <installfile base="inf">usbstor.inf</installfile> - <installfile base="inf">xboxdisp.inf</installfile> - -  - <installfile base="inf" base="$(OUTPUT)">syssetup.inf</installfile> -</group> +<installfile base="inf">acpi.inf</installfile> +<installfile base="inf">cdrom.inf</installfile> +<installfile base="inf">display.inf</installfile> +<installfile base="inf">hdc.inf</installfile> +<installfile base="inf">keyboard.inf</installfile> +<installfile base="inf">layout.inf</installfile> +<installfile base="inf">machine.inf</installfile> +<installfile base="inf">msmouse.inf</installfile> +<installfile base="inf">NET_NIC.inf</installfile> +<installfile base="inf">netamd.inf</installfile> +<installfile base="inf">netisa.inf</installfile> +<installfile base="inf">netrtpnt.inf</installfile> +<installfile base="inf">nettcpip.inf</installfile> +<installfile base="inf">ports.inf</installfile> +<installfile base="inf">scsi.inf</installfile> +<installfile base="inf" root="output">syssetup.inf</installfile> +<installfile base="inf">usbport.inf</installfile> +<installfile base="inf">usbstor.inf</installfile> +<installfile base="inf">xboxdisp.inf</installfile> +<group> Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/automaticdepe… ============================================================================== --- trunk/reactos/tools/rbuild/automaticdependency.cpp (original) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp Sat Aug 25 13:00:19 2007 @@ -354,7 +354,6 @@ return path; } -/* string AutomaticDependency::ResolveVariablesInPath ( const string& path ) { @@ -363,7 +362,6 @@ s = ReplaceVariable ( "$(INSTALL)", Environment::GetInstallPath (), s ); return s; } -*/ bool AutomaticDependency::LocateIncludedFile ( const string& directory, Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Sat Aug 25 13:00:19 2007 @@ -74,6 +74,18 @@ __LINE__ ); } +string +Bootstrap::ReplaceVariable ( const string& name, + const string& value, + string path ) +{ + size_t i = path.find ( name ); + if ( i != string::npos ) + return path.replace ( i, name.length (), value ); + else + return path; +} + void Bootstrap::Initialize () { Modified: trunk/reactos/tools/rbuild/cdfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/cdfile.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/cdfile.cpp (original) +++ trunk/reactos/tools/rbuild/cdfile.cpp Sat Aug 25 13:00:19 2007 @@ -22,7 +22,6 @@ using std::string; -/* string CDFile::ReplaceVariable ( const string& name, const string& value, @@ -34,7 +33,6 @@ else return path; } -*/ CDFile::CDFile ( const Project& project_, const XMLElement& cdfileNode, @@ -44,7 +42,7 @@ { const XMLAttribute* att = node.GetAttribute ( "base", false ); if ( att != NULL ) - base = ResolveVariablesInPath ( att->value ); + base = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); else base = ""; Modified: trunk/reactos/tools/rbuild/directory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/directory.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/directory.cpp (original) +++ trunk/reactos/tools/rbuild/directory.cpp Sat Aug 25 13:00:19 2007 @@ -116,6 +116,28 @@ return directoryWasCreated; } +string +Directory::ReplaceVariable ( const string& name, + const string& value, + string path ) +{ + size_t i = path.find ( name ); + if ( i != string::npos ) + return path.replace ( i, name.length (), value ); + else + return path; +} + +void +Directory::ResolveVariablesInPath ( char* buf, + const string& path ) +{ + string s = ReplaceVariable ( "$(INTERMEDIATE)", Environment::GetIntermediatePath (), path ); + s = ReplaceVariable ( "$(OUTPUT)", Environment::GetOutputPath (), s ); + s = ReplaceVariable ( "$(INSTALL)", Environment::GetInstallPath (), s ); + strcpy ( buf, s.c_str () ); +} + void Directory::GenerateTree ( const string& parent, bool verbose ) @@ -130,10 +152,8 @@ path = parent + sSep + name; else path = parent; - - path = ResolveVariablesInPath ( path ); - - if ( CreateDirectory ( path ) && verbose ) + ResolveVariablesInPath ( buf, path ); + if ( CreateDirectory ( buf ) && verbose ) printf ( "Created %s\n", buf ); } else Modified: trunk/reactos/tools/rbuild/installfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/installfile.c… ============================================================================== --- trunk/reactos/tools/rbuild/installfile.cpp (original) +++ trunk/reactos/tools/rbuild/installfile.cpp Sat Aug 25 13:00:19 2007 @@ -28,22 +28,7 @@ : project ( project_ ), node ( installfileNode ) { -} - -InstallFile::~InstallFile () -{ -} - -void -InstallFile::ProcessXML() -{ - const XMLAttribute* att = node.GetAttribute ( "root", false ); - if ( att != NULL ) - this->path = ResolveVariablesInPath ( att->value ); - else - this->path = path; - - att = node.GetAttribute ( "base", false ); + const XMLAttribute* att = node.GetAttribute ( "base", false ); if ( att != NULL ) base = att->value; else @@ -55,6 +40,28 @@ else newname = node.value; name = node.value; + + att = node.GetAttribute ( "root", false ); + if ( att != NULL) + { + if ( att->value == "intermediate" ) + this->path = "$(INTERMEDIATE)" + sSep + path; + else if ( att->value == "output" ) + this->path = "$(OUTPUT)" + sSep + path; + else + { + throw InvalidAttributeValueException ( + node.location, + "root", + att->value ); + } + } + else + this->path = path; +} + +InstallFile::~InstallFile () +{ } string @@ -63,3 +70,7 @@ return path + sSep + name; } +void +InstallFile::ProcessXML() +{ +} Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Sat Aug 25 13:00:19 2007 @@ -22,31 +22,6 @@ using std::string; using std::vector; - -string -ResolveVariablesInPath ( const string& path ) -{ - string s; - - s = ReplaceVariable ( "$(INTERMEDIATE)", Environment::GetIntermediatePath (), path ); - s = ReplaceVariable ( "$(OUTPUT)", Environment::GetOutputPath (), s ); - s = ReplaceVariable ( "$(INSTALL)", Environment::GetInstallPath (), s ); - s = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), s ); - - return s; -} - -string -ReplaceVariable ( const string& name, - const string& value, - string path ) -{ - size_t i = path.find ( name ); - if ( i != string::npos ) - return path.replace ( i, name.length (), value ); - else - return path; -} string Right ( const string& s, size_t n ) Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Sat Aug 25 13:00:19 2007 @@ -119,9 +119,12 @@ const std::string& parent ); private: bool mkdir_p ( const char* path ); + std::string ReplaceVariable ( const std::string& name, + const std::string& value, + std::string path ); std::string GetEnvironmentVariable ( const std::string& name ); - //void ResolveVariablesInPath ( char* buf, - // const std::string& path ); + void ResolveVariablesInPath ( char* buf, + const std::string& path ); bool CreateDirectory ( std::string path ); }; @@ -780,7 +783,7 @@ std::string ReplaceVariable ( const std::string& name, const std::string& value, std::string path ); -// std::string ResolveVariablesInPath ( const std::string& path ); + std::string ResolveVariablesInPath ( const std::string& path ); std::map<std::string, SourceFile*> sourcefile_map; }; @@ -802,6 +805,9 @@ private: bool IsSupportedModuleType ( ModuleType type ); void Initialize(); + static std::string ReplaceVariable ( const std::string& name, + const std::string& value, + std::string path ); }; @@ -822,6 +828,9 @@ void ProcessXML(); std::string GetPath () const; private: + static std::string ReplaceVariable ( const std::string& name, + const std::string& value, + std::string path ); }; @@ -841,7 +850,6 @@ ~InstallFile (); void ProcessXML (); std::string GetPath () const; -private: }; @@ -989,14 +997,6 @@ InitializeEnvironment (); extern std::string -ResolveVariablesInPath ( const std::string& path ); - -extern std::string -ReplaceVariable ( const std::string& name, - const std::string& value, - std::string path ); - -extern std::string Right ( const std::string& s, size_t n ); extern std::string

1 0

[greatlrd] 28535: forget some stubs
by greatlrd＠svn.reactos.org 24 Aug '07

24 Aug '07

Author: greatlrd Date: Sat Aug 25 03:54:44 2007 New Revision: 28535 URL: http://svn.reactos.org/svn/reactos?rev=28535&view=rev Log: forget some stubs Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sat Aug 25 03:54:44 2007 @@ -1555,14 +1555,29 @@ * @unimplemented */ BOOL STDCALL -NtGdiEngFillPath(SURFOBJ *pso,PATHOBJ *ppo,CLIPOBJ *pco,BRUSHOBJ *pbo,POINTL *pptlBrushOrg,MIX mix,FLONG flOptions) +NtGdiEngFillPath(SURFOBJ *pso, + PATHOBJ *ppo, + CLIPOBJ *pco, + BRUSHOBJ *pbo, + POINTL *pptlBrushOrg, + MIX mix, + FLONG flOptions) { UNIMPLEMENTED; return FALSE; } BOOL STDCALL -EngGradientFill(SURFOBJ *psoDest,CLIPOBJ *pco,XLATEOBJ *pxlo,TRIVERTEX *pVertex,ULONG nVertex,PVOID pMesh,ULONG nMesh,RECTL *prclExtents,POINTL *pptlDitherOrg,ULONG ulMode) +NtGdiEngGradientFill(SURFOBJ *psoDest, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + TRIVERTEX *pVertex, + ULONG nVertex, + PVOID pMesh, + ULONG nMesh, + RECTL *prclExtents, + POINTL *pptlDitherOrg, + ULONG ulMode) { UNIMPLEMENTED; return FALSE; @@ -1593,3 +1608,62 @@ UNIMPLEMENTED; return FALSE; } + + +/* + * @unimplemented + */ +BOOL STDCALL +NtGdiEngPaint(IN SURFOBJ *Surface, + IN CLIPOBJ *ClipRegion, + IN BRUSHOBJ *Brush, + IN POINTL *BrushOrigin, + IN MIX Mix) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOL STDCALL +NtGdiEngPlgBlt(SURFOBJ *psoTrg, + SURFOBJ *psoSrc, + SURFOBJ *psoMsk, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + COLORADJUSTMENT *pca, + POINTL *pptlBrushOrg, + POINTFIX *pptfx, + RECTL *prcl, + POINTL *pptl, + ULONG iMode) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOL STDCALL +NtGdiEngStretchBltROP(SURFOBJ *psoDest, + SURFOBJ *psoSrc, + SURFOBJ *psoMask, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + COLORADJUSTMENT *pca, + POINTL *pptlHTOrg, + RECTL *prclDest, + RECTL *prclSrc, + POINTL *pptlMask, + ULONG iMode, + BRUSHOBJ *pbo, + DWORD rop4) +{ + UNIMPLEMENTED; + return FALSE; +} + +

1 0

[greatlrd] 28534: update the good list of api
by greatlrd＠svn.reactos.org 24 Aug '07

24 Aug '07

Author: greatlrd Date: Sat Aug 25 02:46:38 2007 New Revision: 28534 URL: http://svn.reactos.org/svn/reactos?rev=28534&view=rev Log: update the good list of api Modified: trunk/reactos/dll/win32/gdi32/good api.def Modified: trunk/reactos/dll/win32/gdi32/good api.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/good%20api… ============================================================================== --- trunk/reactos/dll/win32/gdi32/good api.def (original) +++ trunk/reactos/dll/win32/gdi32/good api.def Sat Aug 25 02:46:38 2007 @@ -7,24 +7,70 @@ ; if bugs exists their or verify ; +AddFontResourceA@4 +AddFontResourceExW@12 +AddFontResourceW@4 +AnyLinkedFonts@0 +BRUSHOBJ_hGetColorTransform@4 +BRUSHOBJ_hGetColorTransform@4 BRUSHOBJ_pvAllocRbrush@8 BRUSHOBJ_pvGetRbrush@4 BRUSHOBJ_ulGetBrushColor@4 +ChoosePixelFormat@8 +CLIPOBJ_bEnum@12 +CLIPOBJ_cEnumStart@20 +CLIPOBJ_ppoGetPath@4 +CombineTransform@12 +CreateDiscardableBitmap@12 CreateEllipticRgn@16 +CreateEllipticRgnIndirect@4 +CreateHalftonePalette@4 +CreatePalette@4 CreatePenIndirect@4 -BRUSHOBJ_hGetColorTransform@4 -CLIPOBJ_ppoGetPath@4 -CreatePalette@4 -ChoosePixelFormat@8 -CreateEllipticRgnIndirect@4 -CLIPOBJ_bEnum@12 +CreatePolygonRgn@12 +CreatePolyPolygonRgn@16 +CreateRectRgnIndirect@4 CreateRoundRectRgn@24 -AddFontResourceExW@12 -CreateRectRgnIndirect@4 -CombineTransform@12 -CreateHalftonePalette@4 -CreateDiscardableBitmap@12 -CLIPOBJ_cEnumStart@20 -AnyLinkedFonts@0 -AddFontResourceA@4 -AddFontResourceW@4 +DeleteColorSpace@4 +DescribePixelFormat@16 +DeviceCapabilitiesExA@20 +DeviceCapabilitiesExW@20 +EnableEUDC@4 +EngAcquireSemaphore@4 +EngAlphaBlend@28 +EngAssociateSurface@12 +EngBitBlt@44 +EngCheckAbort@4 +EngCopyBits@24 +EngCreateBitmap@24 +EngCreateClip@0 +EngCreateDeviceBitmap@16 +EngCreateDeviceSurface@16 +EngCreatePalette@24 +EngDeleteClip@4 +EngDeletePath@4 +EngDeleteSurface@4 +EngEraseSurface@12 +EngFillPath@28 +EngFreeModule@4 +EngGetCurrentCodePage@8 +EngGetPrinterDataFileName@4 +EngGradientFill@40 +EngLineTo@36 +EngLoadModule@4 +EngLockSurface@4 +EngMarkBandingSurface@4 +EngMultiByteToUnicodeN@20 +EngMultiByteToWideChar@20 +EngPaint@20 +EngPlgBlt@44 +EngQueryLocalTime@4 +EngReleaseSemaphore@4 +EngStretchBlt@44 +EngStretchBltROP@52 +EngStrokeAndFillPath@40 +EngStrokePath@32 +EngTextOut@40 +EngTransparentBlt@32 +EngUnicodeToMultiByteN@20 +

1 0

[greatlrd] 28533: * redirect EngCopyBits, EngCreateBitmap, EngCreatePalette, EngDeletePalette, EngDeletePath, EngDeleteSurface, EngEraseSurface, EngFillPath, EngMarkBandingSurface, EngPaint, EngPlgBlt, EngStrokeAndFillPath, EngStrokePath, EngTextOut, EngTransparentBlt to win32k.sys * add smaller code for Ellipse * redirect EngMultiByteToUnicodeN to RtlMultiByteToUnicodeN * redirect EngUnicodeToMultiByteN to RtlUnicodeToMultiByteN
by greatlrd＠svn.reactos.org 24 Aug '07

24 Aug '07

Author: greatlrd Date: Sat Aug 25 02:44:36 2007 New Revision: 28533 URL: http://svn.reactos.org/svn/reactos?rev=28533&view=rev Log: * redirect EngCopyBits, EngCreateBitmap, EngCreatePalette, EngDeletePalette, EngDeletePath, EngDeleteSurface, EngEraseSurface, EngFillPath, EngMarkBandingSurface, EngPaint, EngPlgBlt, EngStrokeAndFillPath, EngStrokePath, EngTextOut, EngTransparentBlt to win32k.sys * add smaller code for Ellipse * redirect EngMultiByteToUnicodeN to RtlMultiByteToUnicodeN * redirect EngUnicodeToMultiByteN to RtlUnicodeToMultiByteN Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Sat Aug 25 02:44:36 2007 @@ -93,9 +93,10 @@ DeleteMetaFile@4 DeleteObject@4 DescribePixelFormat@16 -DeviceCapabilitiesExA -DeviceCapabilitiesExW +DeviceCapabilitiesExA@20 +DeviceCapabilitiesExW@20 DrawEscape@16 +Ellipse@20 EnableEUDC@4=NtGdiEnableEudc@4 EndDoc@4 EndFormPage@4 @@ -104,20 +105,50 @@ EngAcquireSemaphore@4 EngAlphaBlend@28=NtGdiEngAlphaBlend@28 EngAssociateSurface@12=NtGdiEngAssociateSurface@12 -EngBitBlt@44=NtGdiEngBitBlt@44 -EngCreateClip@0=NtGdiEngCreateClip@0 -EngDeleteClip@4=NtGdiEngDeleteClip@4 +EngBitBlt=NtGdiEngBitBlt@44 EngCheckAbort@4=NtGdiEngCheckAbort@4 EngComputeGlyphSet@12 +EngCopyBits@24=NtGdiEngCopyBits@24 +EngCreateBitmap@24=NtGdiEngCreateBitmap@24 +EngCreateClip@0=NtGdiEngCreateClip@0 +EngCreateDeviceBitmap@16=NtGdiEngCreateDeviceBitmap@16 +EngCreateDeviceSurface@16=NtGdiEngCreateDeviceSurface@16 +EngCreatePalette@24=NtGdiEngCreatePalette@24 EngCreateSemaphore@0 -EngCreateBitmap@24 -EngCreateDeviceSurface@16=NtGdiEngCreateDeviceSurface@16 -EngCreateDeviceBitmap@16=NtGdiEngCreateDeviceBitmap@16 +EngDeleteClip@4=NtGdiEngDeleteClip@4 +EngDeletePalette@4=NtGdiEngDeletePalette@4 +EngDeletePath@4=NtGdiEngDeletePath@4 +EngDeleteSemaphore@4 +EngDeleteSurface@4=NtGdiEngDeleteSurface@4 +EngEraseSurface@12=NtGdiEngEraseSurface@12 +EngFillPath@28=NtGdiEngFillPath@28 +EngFindResource@16 +EngFreeModule@4 +EngGetCurrentCodePage@8 +EngGetDriverName@4 +EngGetPrinterDataFileName@4 +EngGradientFill@40=NtGdiEngGradientFill@40 +EngLineTo@36=NtGdiEngLineTo@36 +EngLoadModule@4 +EngLockSurface@4=NtGdiEngLockSurface@4 +EngMarkBandingSurface@4=NtGdiEngMarkBandingSurface@4 +EngMultiByteToUnicodeN@20=RtlMultiByteToUnicodeN@20 +EngMultiByteToWideChar@20 +EngPaint@20=NtGdiEngPaint@20 +EngPlgBlt@44=NtGdiEngPlgBlt@44 +EngQueryEMFInfo@8 +EngQueryLocalTime@4 +EngReleaseSemaphore@4 +EngStretchBlt@44=NtGdiEngStretchBlt@44 +EngStretchBltROP@52=NtGdiEngStretchBltROP@52 +EngStrokeAndFillPath@40=NtGdiEngStrokeAndFillPath@40 +EngStrokePath@32=NtGdiEngStrokePath@32 +EngTextOut@40=NtGdiEngTextOut@40 +EngTransparentBlt@32=NtGdiEngTransparentBlt@32 +EngUnicodeToMultiByteN@20=RtlUnicodeToMultiByteN@20 ClearBitmapAttributes@8 ClearBrushAttributes@8 -DeleteObject@4 -DescribePixelFormat@16 DdEntry1@16=NtGdiD3dContextCreate@16 DdEntry2@4=NtGdiD3dContextDestroy@4 DdEntry3@4=NtGdiD3dContextDestroyAll@4 @@ -174,39 +205,6 @@ DdEntry54@8=NtGdiDdUnlockD3D@8 DdEntry55@12=NtGdiDdUpdateOverlay@12 DdEntry56@8=NtGdiDdWaitForVerticalBlank@8 -Ellipse@20=NtGdiEllipse@20 -EngCopyBits@24 -EngCreatePalette@24 -EngDeletePalette@4 -EngDeletePath@4 -EngDeleteSemaphore@4 -EngDeleteSurface@4 -EngEraseSurface@12 -EngFillPath@28 -EngFindResource@16 -EngFreeModule@4 -EngGetCurrentCodePage@8 -EngGetDriverName@4 -EngGetPrinterDataFileName@4 -EngGradientFill@40 -EngLineTo@36 -EngLoadModule@4 -EngLockSurface@4=NtGdiEngLockSurface@4 -EngMarkBandingSurface@4 -EngMultiByteToUnicodeN@20 -EngMultiByteToWideChar@20 -EngPaint@20 -EngPlgBlt@44 -EngQueryEMFInfo@8 -EngQueryLocalTime@4 -EngReleaseSemaphore@4 -EngStretchBlt@44=NtGdiEngStretchBlt@44 -EngStretchBltROP@52 -EngStrokeAndFillPath@40 -EngStrokePath@32 -EngTextOut@40 -EngTransparentBlt@32 -EngUnicodeToMultiByteN@20 EngUnlockSurface@4 EngWideCharToMultiByte@20 EnumEnhMetaFile@20 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Aug 25 02:44:36 2007 @@ -2468,54 +2468,6 @@ /* * @unimplemented */ -BOOL STDCALL -EngCopyBits(SURFOBJ *Dest, - SURFOBJ *Source, - CLIPOBJ *Clip, - XLATEOBJ *ColorTranslation, - RECTL *DestRect, - POINTL *SourcePoint) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HBITMAP STDCALL -EngCreateBitmap(IN SIZEL Size, - IN LONG Width, - IN ULONG Format, - IN ULONG Flags, - IN PVOID Bits) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented - */ -HPALETTE STDCALL -EngCreatePalette(IN ULONG Mode, - IN ULONG NumColors, - IN ULONG *Colors, - IN ULONG Red, - IN ULONG Green, - IN ULONG Blue) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ HSEMAPHORE STDCALL EngCreateSemaphore ( VOID ) @@ -2528,26 +2480,7 @@ -/* - * @unimplemented - */ -BOOL STDCALL -EngDeletePalette(IN HPALETTE Palette) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -VOID STDCALL -EngDeletePath(PATHOBJ *ppo) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -} + /* * @unimplemented @@ -2562,40 +2495,11 @@ RtlFreeHeap( GetProcessHeap(), 0, hsem ); } -/* - * @unimplemented - */ -BOOL STDCALL -EngDeleteSurface(IN HSURF Surface) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL STDCALL -EngEraseSurface(SURFOBJ *Surface, - RECTL *Rect, - ULONG iColor) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL STDCALL -EngFillPath(SURFOBJ *pso,PATHOBJ *ppo,CLIPOBJ *pco,BRUSHOBJ *pbo,POINTL *pptlBrushOrg,MIX mix,FLONG flOptions) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + + + + + /* * @unimplemented @@ -2656,48 +2560,16 @@ } /* - * @unimplemented + * @implemented */ LPWSTR STDCALL EngGetPrinterDataFileName(HDEV hdev) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL STDCALL -EngGradientFill(SURFOBJ *psoDest,CLIPOBJ *pco,XLATEOBJ *pxlo,TRIVERTEX *pVertex,ULONG nVertex,PVOID pMesh,ULONG nMesh,RECTL *prclExtents,POINTL *pptlDitherOrg,ULONG ulMode) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL STDCALL -EngLineTo(SURFOBJ *Surface, - CLIPOBJ *Clip, - BRUSHOBJ *Brush, - LONG x1, - LONG y1, - LONG x2, - LONG y2, - RECTL *RectBounds, - MIX mix) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented + return EngGetDriverName(hdev); +} + +/* + * @implemented */ HANDLE STDCALL EngLoadModule(LPWSTR pwsz) @@ -2707,37 +2579,7 @@ /* - * @unimplemented - */ -BOOL STDCALL -EngMarkBandingSurface(HSURF hsurf) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -VOID STDCALL -EngMultiByteToUnicodeN(OUT LPWSTR UnicodeString, - IN ULONG MaxBytesInUnicodeString, - OUT PULONG BytesInUnicodeString, - IN PCHAR MultiByteString, - IN ULONG BytesInMultiByteString) -{ - RtlMultiByteToUnicodeN( - UnicodeString, - MaxBytesInUnicodeString, - BytesInUnicodeString, - MultiByteString, - BytesInMultiByteString - ); -} - -/* - * @unimplemented + * @implemented */ INT STDCALL EngMultiByteToWideChar(UINT CodePage, @@ -2746,41 +2588,11 @@ LPSTR MultiByteString, INT BytesInMultiByteString) { - return MultiByteToWideChar( - CodePage, - 0, - MultiByteString, - BytesInMultiByteString, - WideCharString, - (BytesInWideCharString/sizeof(WCHAR)) /* Bytes to (in WCHARs) */ - ); -} - -/* - * @unimplemented - */ -BOOL STDCALL -EngPaint(IN SURFOBJ *Surface, - IN CLIPOBJ *ClipRegion, - IN BRUSHOBJ *Brush, - IN POINTL *BrushOrigin, - IN MIX Mix) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL STDCALL -EngPlgBlt(SURFOBJ *psoTrg,SURFOBJ *psoSrc,SURFOBJ *psoMsk,CLIPOBJ *pco,XLATEOBJ *pxlo,COLORADJUSTMENT *pca,POINTL *pptlBrushOrg,POINTFIX *pptfx,RECTL *prcl,POINTL *pptl,ULONG iMode) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + return MultiByteToWideChar(CodePage,0,MultiByteString,BytesInMultiByteString,WideCharString,BytesInWideCharString / sizeof(WCHAR)); +} + + + /* * @implemented @@ -2821,87 +2633,20 @@ RtlLeaveCriticalSection( (PRTL_CRITICAL_SECTION) hsem); } - - -/* - * @unimplemented - */ -BOOL STDCALL -EngStretchBltROP(SURFOBJ *psoDest,SURFOBJ *psoSrc,SURFOBJ *psoMask,CLIPOBJ *pco,XLATEOBJ *pxlo,COLORADJUSTMENT *pca,POINTL *pptlHTOrg,RECTL *prclDest,RECTL *prclSrc,POINTL *pptlMask,ULONG iMode,BRUSHOBJ *pbo,DWORD rop4) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL STDCALL -EngStrokeAndFillPath(SURFOBJ *pso,PATHOBJ *ppo,CLIPOBJ *pco,XFORMOBJ *pxo,BRUSHOBJ *pboStroke,LINEATTRS *plineattrs,BRUSHOBJ *pboFill,POINTL *pptlBrushOrg,MIX mixFill,FLONG flOptions) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL STDCALL -EngStrokePath(SURFOBJ *pso,PATHOBJ *ppo,CLIPOBJ *pco,XFORMOBJ *pxo,BRUSHOBJ *pbo,POINTL *pptlBrushOrg,LINEATTRS *plineattrs,MIX mix) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL STDCALL -EngTextOut(SURFOBJ *pso,STROBJ *pstro,FONTOBJ *pfo,CLIPOBJ *pco,RECTL *prclExtra,RECTL *prclOpaque,BRUSHOBJ *pboFore,BRUSHOBJ *pboOpaque,POINTL *pptlOrg,MIX mix) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL STDCALL -EngTransparentBlt(IN SURFOBJ *Dest, - IN SURFOBJ *Source, - IN CLIPOBJ *Clip, - IN XLATEOBJ *ColorTranslation, - IN PRECTL DestRect, - IN PRECTL SourceRect, - IN ULONG TransparentColor, - IN ULONG Reserved) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -VOID STDCALL -EngUnicodeToMultiByteN(OUT PCHAR MultiByteString, - IN ULONG MaxBytesInMultiByteString, - OUT PULONG BytesInMultiByteString, - IN PWSTR UnicodeString, - IN ULONG BytesInUnicodeString) -{ - RtlUnicodeToMultiByteN( - MultiByteString, - MaxBytesInMultiByteString, - BytesInMultiByteString, - UnicodeString, - BytesInUnicodeString - ); +/* + * @implemented + */ +BOOL +STDCALL +Ellipse( + HDC hdc, + int nLeftRect, + int nTopRect, + int nRightRect, + int nBottomRect) +{ + /* FIXME some parts need be done in user mode */ + return NtGdiEllipse(hdc,nLeftRect,nTopRect,nRightRect,nBottomRect); } /*

1 0

[greatlrd] 28532: add stub for NtGdiEngPlgBlt, NtGdiEngMarkBandingSurface, NtGdiEngFillPath, NtGdiEngPaint, NtGdiEngLineTo, NtGdiEngGradientFill, NtGdiEngStretchBltROP
by greatlrd＠svn.reactos.org 24 Aug '07

24 Aug '07

Author: greatlrd Date: Sat Aug 25 02:24:26 2007 New Revision: 28532 URL: http://svn.reactos.org/svn/reactos?rev=28532&view=rev Log: add stub for NtGdiEngPlgBlt, NtGdiEngMarkBandingSurface, NtGdiEngFillPath, NtGdiEngPaint, NtGdiEngLineTo, NtGdiEngGradientFill, NtGdiEngStretchBltROP Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sat Aug 25 02:24:26 2007 @@ -1542,3 +1542,54 @@ return FALSE; } + + + + + + + + + +/* + * @unimplemented + */ +BOOL STDCALL +NtGdiEngFillPath(SURFOBJ *pso,PATHOBJ *ppo,CLIPOBJ *pco,BRUSHOBJ *pbo,POINTL *pptlBrushOrg,MIX mix,FLONG flOptions) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL STDCALL +EngGradientFill(SURFOBJ *psoDest,CLIPOBJ *pco,XLATEOBJ *pxlo,TRIVERTEX *pVertex,ULONG nVertex,PVOID pMesh,ULONG nMesh,RECTL *prclExtents,POINTL *pptlDitherOrg,ULONG ulMode) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL STDCALL +NtGdiEngLineTo(SURFOBJ *Surface, + CLIPOBJ *Clip, + BRUSHOBJ *Brush, + LONG x1, + LONG y1, + LONG x2, + LONG y2, + RECTL *RectBounds, + MIX mix) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL STDCALL +NtGdiEngMarkBandingSurface(HSURF hsurf) +{ + UNIMPLEMENTED; + return FALSE; +} Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Aug 25 02:24:26 2007 @@ -619,18 +619,18 @@ NtGdiEngLockSurface 1 NtGdiEngBitBlt 11 NtGdiEngStretchBlt 11 -# NtGdiEngPlgBlt 11 -# NtGdiEngMarkBandingSurface 1 +NtGdiEngPlgBlt 11 +NtGdiEngMarkBandingSurface 1 NtGdiEngStrokePath 8 -# NtGdiEngFillPath 7 +NtGdiEngFillPath 7 NtGdiEngStrokeAndFillPath 10 -# NtGdiEngPaint 5 -# NtGdiEngLineTo 9 +NtGdiEngPaint 5 +NtGdiEngLineTo 9 NtGdiEngAlphaBlend 7 -# NtGdiEngGradientFill 10 +NtGdiEngGradientFill 10 NtGdiEngTransparentBlt 8 NtGdiEngTextOut 10 -# NtGdiEngStretchBltROP 13 +NtGdiEngStretchBltROP 13 # NtGdiXLATEOBJ_cGetPalette 4 # NtGdiXLATEOBJ_iXlate 2 # NtGdiXLATEOBJ_hGetColorTransform 1

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