Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[cwittich] 38660: -convert to unicode -fix a big memory leak

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Jan 9 01:46:07 2009 New Revision: 38660 URL: http://svn.reactos.org/svn/reactos?rev=38660&view=rev Log: -convert to unicode -fix a big memory leak Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Fri Jan 9 01:46:07 2009 @@ -24,45 +24,44 @@ */ #include "eventvwr.h" -#include <windows.h> // Standard windows include file -#include <commctrl.h> // For ListView control APIs -#include <tchar.h> // For TCHAR and string functions. +#include <windows.h> +#include <commctrl.h> #include <stdio.h> #include <time.h> #if _MSC_VER - #pragma warning(disable: 4996) // 'strdup' was declared deprecated - #define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions + #pragma warning(disable: 4996) /* 'strdup' was declared deprecated */ + #define _CRT_SECURE_NO_DEPRECATE /* all deprecated unsafe string functions */ #endif -static const LPTSTR EVENT_SOURCE_APPLICATION = _TEXT("Application"); -static const LPTSTR EVENT_SOURCE_SECURITY = _TEXT("Security"); -static const LPTSTR EVENT_SOURCE_SYSTEM = _TEXT("System"); -static const TCHAR szWindowClass[] = _TEXT("EVENTVWR"); // the main window class name +static const LPWSTR EVENT_SOURCE_APPLICATION = L"Application"; +static const LPWSTR EVENT_SOURCE_SECURITY = L"Security"; +static const LPWSTR EVENT_SOURCE_SYSTEM = L"System"; +static const WCHAR szWindowClass[] = L"EVENTVWR"; /* the main window class name*/ //MessageFile message buffer size #define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 #define EVENT_MESSAGE_FILE_BUFFER 1024*10 -#define EVENT_DLL_SEPARATOR _TEXT(";") -#define EVENT_MESSAGE_FILE _TEXT("EventMessageFile") -#define EVENT_CATEGORY_MESSAGE_FILE _TEXT("CategoryMessageFile") -#define EVENT_PARAMETER_MESSAGE_FILE _TEXT("ParameterMessageFile") +#define EVENT_DLL_SEPARATOR L";" +#define EVENT_MESSAGE_FILE L"EventMessageFile" +#define EVENT_CATEGORY_MESSAGE_FILE L"CategoryMessageFile" +#define EVENT_PARAMETER_MESSAGE_FILE L"ParameterMessageFile" #define MAX_LOADSTRING 255 -// Global Variables: -HINSTANCE hInst; // current instance -TCHAR szTitle[MAX_LOADSTRING]; // The title bar text - -// Globals -HWND hwndMainWindow; // Main window -HWND hwndListView; // ListView control -HWND hwndStatus; // Status bar - -LPTSTR lpSourceLogName = NULL; -LPTSTR lpComputerName = NULL; - -// Forward declarations of functions included in this code module: +/* Globals */ +HINSTANCE hInst; /* current instance */ +WCHAR szTitle[MAX_LOADSTRING]; /* The title bar text */ +HWND hwndMainWindow; /* Main window */ +HWND hwndListView; /* ListView control */ +HWND hwndStatus; /* Status bar */ +PEVENTLOGRECORD *g_RecordPtrs = NULL; +DWORD g_TotalRecords = 0; + +LPWSTR lpSourceLogName = NULL; +LPWSTR lpComputerName = NULL; + +/* Forward declarations of functions included in this code module: */ ATOM MyRegisterClass(HINSTANCE hInstance); BOOL InitInstance(HINSTANCE, int); LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); @@ -72,9 +71,9 @@ int APIENTRY -_tWinMain(HINSTANCE hInstance, +wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, + LPWSTR lpCmdLine, int nCmdShow) { MSG msg; @@ -84,18 +83,18 @@ UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(lpCmdLine); - // Whenever any of the common controls are used in your app, - // you must call InitCommonControlsEx() to register the classes - // for those controls. + /* Whenever any of the common controls are used in your app, + * you must call InitCommonControlsEx() to register the classes + * for those controls. */ iccx.dwSize = sizeof(INITCOMMONCONTROLSEX); iccx.dwICC = ICC_LISTVIEW_CLASSES; InitCommonControlsEx(&iccx); - // Initialize global strings - LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); + /* Initialize global strings */ + LoadStringW(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); MyRegisterClass(hInstance); - // Perform application initialization: + /* Perform application initialization: */ if (!InitInstance(hInstance, nCmdShow)) { return FALSE; @@ -103,10 +102,10 @@ hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_EVENTVWR)); - // Main message loop: - while (GetMessage(&msg, NULL, 0, 0)) - { - if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) + /* Main message loop: */ + while (GetMessageW(&msg, NULL, 0, 0)) + { + if (!TranslateAcceleratorW(msg.hwnd, hAccelTable, &msg)) { TranslateMessage(&msg); DispatchMessage(&msg); @@ -116,6 +115,18 @@ return (int)msg.wParam; } +static void FreeRecords(void) +{ + DWORD iIndex; + + if (!g_RecordPtrs) + return; + + for (iIndex = 0; iIndex < g_TotalRecords; iIndex++) + HeapFree(GetProcessHeap(), 0, (PEVENTLOGRECORD) g_RecordPtrs[iIndex]); + HeapFree(GetProcessHeap(), 0, (PEVENTLOGRECORD) g_RecordPtrs); + g_RecordPtrs = NULL; +} VOID EventTimeToSystemTime(DWORD EventTime, @@ -139,70 +150,69 @@ void -TrimNulls(LPTSTR s) -{ - TCHAR *c; +TrimNulls(LPWSTR s) +{ + WCHAR *c; if (s != NULL) { - c = s + _tcslen(s) - 1; - while (c >= s && _istspace(*c)) + c = s + wcslen(s) - 1; + while (c >= s && iswspace(*c)) --c; - *++c = _TEXT('\0'); + *++c = L'\0'; } } BOOL -GetEventMessageFileDLL(IN LPCTSTR lpLogName, - IN LPCTSTR SourceName, - IN LPCTSTR EntryName, - OUT LPTSTR ExpandedName) +GetEventMessageFileDLL(IN LPCWSTR lpLogName, + IN LPCWSTR SourceName, + IN LPCWSTR EntryName, + OUT LPWSTR ExpandedName) { DWORD dwSize; BYTE szModuleName[MAX_PATH]; - TCHAR szKeyName[MAX_PATH]; + WCHAR szKeyName[MAX_PATH]; HKEY hAppKey = NULL; HKEY hSourceKey = NULL; - BOOL bReturn = FALSE; // Return - - _tcscpy(szKeyName, _TEXT("SYSTEM\\CurrentControlSet\\Services\\EventLog")); - _tcscat(szKeyName, _TEXT("\\")); - _tcscat(szKeyName, lpLogName); - - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + BOOL bReturn = FALSE; + + wcscpy(szKeyName, L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"); + wcscat(szKeyName, lpLogName); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szKeyName, 0, KEY_READ, &hAppKey) == ERROR_SUCCESS) { - if (RegOpenKeyEx(hAppKey, + if (RegOpenKeyExW(hAppKey, SourceName, 0, KEY_READ, &hSourceKey) == ERROR_SUCCESS) { dwSize = MAX_PATH; - if (RegQueryValueEx(hSourceKey, + if (RegQueryValueExW(hSourceKey, EntryName, NULL, NULL, (LPBYTE)szModuleName, &dwSize) == ERROR_SUCCESS) { - // Returns a string containing the requested substituted environment variable. - ExpandEnvironmentStrings((LPCTSTR)szModuleName, ExpandedName, MAX_PATH); - - // Succesfull + /* Returns a string containing the requested substituted environment variable. */ + ExpandEnvironmentStringsW((LPCWSTR)szModuleName, ExpandedName, MAX_PATH); + + /* Succesfull */ bReturn = TRUE; } } } else { - MessageBox(NULL, - _TEXT("Registry access failed!"), - _TEXT("Event Log"), + MessageBoxW(NULL, + L"Registry access failed!", + L"Event Log", MB_OK | MB_ICONINFORMATION); } @@ -217,53 +227,53 @@ BOOL -GetEventCategory(IN LPCTSTR KeyName, - IN LPCTSTR SourceName, +GetEventCategory(IN LPCWSTR KeyName, + IN LPCWSTR SourceName, IN EVENTLOGRECORD *pevlr, - OUT LPTSTR CategoryName) + OUT LPWSTR CategoryName) { HANDLE hLibrary = NULL; - TCHAR szMessageDLL[MAX_PATH]; + WCHAR szMessageDLL[MAX_PATH]; LPVOID lpMsgBuf = NULL; if (GetEventMessageFileDLL (KeyName, SourceName, EVENT_CATEGORY_MESSAGE_FILE , szMessageDLL)) { - hLibrary = LoadLibraryEx(szMessageDLL, + hLibrary = LoadLibraryExW(szMessageDLL, NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); if (hLibrary != NULL) { - // Retrieve the message string. - if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ARGUMENT_ARRAY, + /* Retrieve the message string. */ + if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ARGUMENT_ARRAY, hLibrary, pevlr->EventCategory, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpMsgBuf, + (LPWSTR)&lpMsgBuf, EVENT_MESSAGE_FILE_BUFFER, NULL) != 0) { if (lpMsgBuf) { - // Trim the string - TrimNulls((LPTSTR)lpMsgBuf); - - // Copy the category name - _tcscpy(CategoryName, (LPCTSTR)lpMsgBuf); + /* Trim the string */ + TrimNulls((LPWSTR)lpMsgBuf); + + /* Copy the category name */ + wcscpy(CategoryName, (LPCWSTR)lpMsgBuf); } else { - _tcscpy(CategoryName, (LPCTSTR)lpMsgBuf); + wcscpy(CategoryName, (LPCWSTR)lpMsgBuf); } } else { - _tcscpy(CategoryName, _TEXT("None")); + wcscpy(CategoryName, L"None"); } if (hLibrary != NULL) FreeLibrary(hLibrary); - // Free the buffer allocated by FormatMessage + /* Free the buffer allocated by FormatMessage */ if (lpMsgBuf) LocalFree(lpMsgBuf); @@ -271,37 +281,37 @@ } } - _tcscpy(CategoryName, _TEXT("None")); + wcscpy(CategoryName, L"None"); return FALSE; } BOOL -GetEventMessage(IN LPCTSTR KeyName, - IN LPCTSTR SourceName, +GetEventMessage(IN LPCWSTR KeyName, + IN LPCWSTR SourceName, IN EVENTLOGRECORD *pevlr, - OUT LPTSTR EventText) + OUT LPWSTR EventText) { DWORD i; HANDLE hLibrary = NULL; - TCHAR SourceModuleName[1000]; - TCHAR ParameterModuleName[1000]; - LPTSTR lpMsgBuf = NULL; - TCHAR szStringIDNotFound[MAX_LOADSTRING]; - LPTSTR szDll; - LPTSTR szMessage; - LPTSTR *szArguments; + WCHAR SourceModuleName[1000]; + WCHAR ParameterModuleName[1000]; + LPWSTR lpMsgBuf = NULL; + WCHAR szStringIDNotFound[MAX_LOADSTRING]; + LPWSTR szDll; + LPWSTR szMessage; + LPWSTR *szArguments; BOOL bDone = FALSE; /* TODO : GetEventMessageFileDLL can return a comma separated list of DLLs */ - if (GetEventMessageFileDLL (KeyName , SourceName, EVENT_MESSAGE_FILE , SourceModuleName)) - { - // Get the event message - szMessage = (LPTSTR)((LPBYTE)pevlr + pevlr->StringOffset); - - // Allocate space for parameters - szArguments = (LPTSTR*)malloc(sizeof(LPVOID) * pevlr->NumStrings); + if (GetEventMessageFileDLL (KeyName, SourceName, EVENT_MESSAGE_FILE, SourceModuleName)) + { + /* Get the event message */ + szMessage = (LPWSTR)((LPBYTE)pevlr + pevlr->StringOffset); + + /* Allocate space for parameters */ + szArguments = (LPWSTR*)malloc(sizeof(LPVOID) * pevlr->NumStrings); if (!szArguments) { return FALSE; @@ -309,63 +319,63 @@ for (i = 0; i < pevlr->NumStrings ; i++) { - if (_tcsstr(szMessage , _TEXT("%%"))) - { - if (GetEventMessageFileDLL(KeyName , SourceName, EVENT_PARAMETER_MESSAGE_FILE, ParameterModuleName)) + if (wcsstr(szMessage , L"%%")) + { + if (GetEventMessageFileDLL(KeyName, SourceName, EVENT_PARAMETER_MESSAGE_FILE, ParameterModuleName)) { - // Not yet support for reading messages from parameter message DLL + /* Not yet support for reading messages from parameter message DLL */ } szArguments[i] = szMessage; - szMessage += _tcslen(szMessage) + 1; + szMessage += wcslen(szMessage) + 1; } else { szArguments[i] = szMessage; - szMessage += _tcslen(szMessage) + 1; + szMessage += wcslen(szMessage) + 1; } } - szDll = _tcstok(SourceModuleName, EVENT_DLL_SEPARATOR); + szDll = wcstok(SourceModuleName, EVENT_DLL_SEPARATOR); while ((szDll != NULL) && (!bDone)) { - hLibrary = LoadLibraryEx(szDll, + hLibrary = LoadLibraryExW(szDll, NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); if (hLibrary == NULL) { - // The DLL could not be loaded try the next one (if any) - szDll = _tcstok(NULL, EVENT_DLL_SEPARATOR); + /* The DLL could not be loaded try the next one (if any) */ + szDll = wcstok(NULL, EVENT_DLL_SEPARATOR); } else { - // Retrieve the message string. - if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | + /* Retrieve the message string. */ + if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ARGUMENT_ARRAY, hLibrary, pevlr->EventID, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpMsgBuf, + (LPWSTR)&lpMsgBuf, 0, (va_list*)szArguments) == 0) { - // We haven't found the string , get next DLL (if any) - szDll = _tcstok(NULL, EVENT_DLL_SEPARATOR); + /* We haven't found the string , get next DLL (if any) */ + szDll = wcstok(NULL, EVENT_DLL_SEPARATOR); } else { if (lpMsgBuf) { - // The ID was found and the message was formated + /* The ID was found and the message was formated */ bDone = TRUE; - // Trim the string - TrimNulls((LPTSTR)lpMsgBuf); - - // Copy the event text - _tcscpy(EventText ,lpMsgBuf); + /* Trim the string */ + TrimNulls((LPWSTR)lpMsgBuf); + + /* Copy the event text */ + wcscpy(EventText ,lpMsgBuf); } } @@ -375,18 +385,18 @@ if (!bDone) { - LoadString(hInst, IDC_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); - wsprintf(EventText, szStringIDNotFound, (DWORD)(pevlr->EventID & 0xFFFF), SourceName); + LoadStringW(hInst, IDC_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); + swprintf(EventText, szStringIDNotFound, (DWORD)(pevlr->EventID & 0xFFFF), SourceName); } free(szArguments); - // No more dlls to try , return result + /* No more dlls to try, return result */ return bDone; } - LoadString(hInst, IDC_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); - wsprintf(EventText, szStringIDNotFound, (DWORD)(pevlr->EventID & 0xFFFF), SourceName); + LoadStringW(hInst, IDC_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); + swprintf(EventText, szStringIDNotFound, (DWORD)(pevlr->EventID & 0xFFFF), SourceName); return FALSE; } @@ -394,52 +404,52 @@ VOID GetEventType(IN WORD dwEventType, - OUT LPTSTR eventTypeText) + OUT LPWSTR eventTypeText) { switch (dwEventType) { case EVENTLOG_ERROR_TYPE: - LoadString(hInst, IDC_EVENTLOG_ERROR_TYPE, eventTypeText, MAX_LOADSTRING); + LoadStringW(hInst, IDC_EVENTLOG_ERROR_TYPE, eventTypeText, MAX_LOADSTRING); break; case EVENTLOG_WARNING_TYPE: - LoadString(hInst, IDC_EVENTLOG_WARNING_TYPE, eventTypeText, MAX_LOADSTRING); + LoadStringW(hInst, IDC_EVENTLOG_WARNING_TYPE, eventTypeText, MAX_LOADSTRING); break; case EVENTLOG_INFORMATION_TYPE: - LoadString(hInst, IDC_EVENTLOG_INFORMATION_TYPE, eventTypeText, MAX_LOADSTRING); + LoadStringW(hInst, IDC_EVENTLOG_INFORMATION_TYPE, eventTypeText, MAX_LOADSTRING); break; case EVENTLOG_AUDIT_SUCCESS: - LoadString(hInst, IDC_EVENTLOG_AUDIT_SUCCESS, eventTypeText, MAX_LOADSTRING); + LoadStringW(hInst, IDC_EVENTLOG_AUDIT_SUCCESS, eventTypeText, MAX_LOADSTRING); break; case EVENTLOG_AUDIT_FAILURE: - LoadString(hInst, IDC_EVENTLOG_AUDIT_FAILURE, eventTypeText, MAX_LOADSTRING); + LoadStringW(hInst, IDC_EVENTLOG_AUDIT_FAILURE, eventTypeText, MAX_LOADSTRING); break; case EVENTLOG_SUCCESS: - LoadString(hInst, IDC_EVENTLOG_SUCCESS, eventTypeText, MAX_LOADSTRING); + LoadStringW(hInst, IDC_EVENTLOG_SUCCESS, eventTypeText, MAX_LOADSTRING); break; default: - LoadString(hInst, IDC_EVENTLOG_UNKNOWN_TYPE, eventTypeText, MAX_LOADSTRING); + LoadStringW(hInst, IDC_EVENTLOG_UNKNOWN_TYPE, eventTypeText, MAX_LOADSTRING); break; } } BOOL GetEventUserName(EVENTLOGRECORD *pelr, - OUT LPTSTR pszUser) + OUT LPWSTR pszUser) { PSID lpSid; - TCHAR szName[1024]; - TCHAR szDomain[1024]; + WCHAR szName[1024]; + WCHAR szDomain[1024]; SID_NAME_USE peUse; DWORD cbName = 1024; DWORD cbDomain = 1024; - // Point to the SID. + /* Point to the SID. */ lpSid = (PSID)((LPBYTE)pelr + pelr->UserSidOffset); - // User SID + /* User SID */ if (pelr->UserSidLength > 0) { - if (LookupAccountSid(NULL, + if (LookupAccountSidW(NULL, lpSid, szName, &cbName, @@ -447,7 +457,7 @@ &cbDomain, &peUse)) { - _tcscpy(pszUser, szName); + wcscpy(pszUser, szName); return TRUE; } } @@ -487,67 +497,66 @@ BOOL -QueryEventMessages(LPTSTR lpMachineName, - LPTSTR lpLogName) +QueryEventMessages(LPWSTR lpMachineName, + LPWSTR lpLogName) { HWND hwndDlg; HANDLE hEventLog; EVENTLOGRECORD *pevlr; - BYTE bBuffer[MAX_PATH]; DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords, dwCurrentRecord = 1, dwRecordsToRead = 0, dwFlags; - LPTSTR lpSourceName; - LPTSTR lpComputerName; - LPTSTR lpEventStr; - LPTSTR lpData; - BOOL bResult = TRUE; // Read succeeded. - - TCHAR szWindowTitle[MAX_PATH]; - TCHAR szStatusText[MAX_PATH]; - TCHAR szLocalDate[MAX_PATH]; - TCHAR szLocalTime[MAX_PATH]; - TCHAR szEventID[MAX_PATH]; - TCHAR szEventTypeText[MAX_PATH]; - TCHAR szCategoryID[MAX_PATH]; - TCHAR szUsername[MAX_PATH]; - TCHAR szEventText[EVENT_MESSAGE_FILE_BUFFER]; - TCHAR szCategory[MAX_PATH]; + LPWSTR lpSourceName; + LPWSTR lpComputerName; + LPWSTR lpEventStr; + LPWSTR lpData; + BOOL bResult = TRUE; /* Read succeeded. */ + + WCHAR szWindowTitle[MAX_PATH]; + WCHAR szStatusText[MAX_PATH]; + WCHAR szLocalDate[MAX_PATH]; + WCHAR szLocalTime[MAX_PATH]; + WCHAR szEventID[MAX_PATH]; + WCHAR szEventTypeText[MAX_PATH]; + WCHAR szCategoryID[MAX_PATH]; + WCHAR szUsername[MAX_PATH]; + WCHAR szEventText[EVENT_MESSAGE_FILE_BUFFER]; + WCHAR szCategory[MAX_PATH]; SYSTEMTIME time; - LVITEM lviEventItem; + LVITEMW lviEventItem; dwFlags = EVENTLOG_FORWARDS_READ | EVENTLOG_SEQUENTIAL_READ; lpSourceLogName = lpLogName; lpComputerName = lpMachineName; - // Open the event log. - hEventLog = OpenEventLog(lpMachineName, + /* Open the event log. */ + hEventLog = OpenEventLogW(lpMachineName, lpLogName); if (hEventLog == NULL) { - MessageBox(NULL, - _TEXT("Could not open the event log."), - _TEXT("Event Log"), + MessageBoxW(NULL, + L"Could not open the event log.", + L"Event Log", MB_OK | MB_ICONINFORMATION); return FALSE; } - // Disable listview redraw + /* Disable listview redraw */ SendMessage(hwndListView, WM_SETREDRAW, FALSE, 0); - // Clear the list view + /* Clear the list view */ (void)ListView_DeleteAllItems (hwndListView); - - // Initialize the event record buffer. - pevlr = (EVENTLOGRECORD *)&bBuffer; - - // Get the record number of the oldest event log record. + FreeRecords(); + GetOldestEventLogRecord(hEventLog, &dwThisRecord); - // Get the total number of event log records. + /* Get the total number of event log records. */ GetNumberOfEventLogRecords (hEventLog , &dwTotalRecords); - - //If we have at least 1000 records show the waiting dialog + g_TotalRecords = dwTotalRecords; + + g_RecordPtrs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwTotalRecords * sizeof(PEVENTLOGRECORD)); + + /* If we have at least 1000 records show the waiting dialog */ if (dwTotalRecords > 1000) { CreateThread(NULL, @@ -560,20 +569,23 @@ while (dwCurrentRecord < dwTotalRecords) { - pevlr = (EVENTLOGRECORD*)malloc(MAX_PATH); + pevlr = (EVENTLOGRECORD*) HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD) * dwTotalRecords); + g_RecordPtrs[dwCurrentRecord] = pevlr; bResult = ReadEventLog(hEventLog, // Event log handle dwFlags, // Sequential read 0, // Ignored for sequential read pevlr, // Pointer to buffer - MAX_PATH, // Size of buffer + sizeof(EVENTLOGRECORD), // Size of buffer &dwRead, // Number of bytes read &dwNeeded); // Bytes in the next record if((!bResult) && (GetLastError () == ERROR_INSUFFICIENT_BUFFER)) { - pevlr = (EVENTLOGRECORD*)malloc (dwNeeded); - - ReadEventLog(hEventLog, // event log handle + HeapFree(GetProcessHeap(), 0, pevlr); + pevlr = (EVENTLOGRECORD*) HeapAlloc(GetProcessHeap(), 0, dwNeeded); + g_RecordPtrs[dwCurrentRecord] = pevlr; + + ReadEventLogW(hEventLog, // event log handle dwFlags, // read flags 0, // offset; default is 0 pevlr, // pointer to buffer @@ -584,21 +596,21 @@ while (dwRead > 0) { - _tcscpy(szUsername , _TEXT("N/A")); - _tcscpy(szEventText , _TEXT("N/A")); - _tcscpy(szCategory , _TEXT("None")); + wcscpy(szUsername , L"N/A"); + wcscpy(szEventText , L"N/A"); + wcscpy(szCategory , L"None"); // Get the event source name. - lpSourceName = (LPTSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD)); + lpSourceName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD)); // Get the computer name - lpComputerName = (LPTSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + (_tcslen(lpSourceName) + 1) * sizeof(TCHAR)); + lpComputerName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + (wcslen(lpSourceName) + 1) * sizeof(WCHAR)); // This ist the data section of the current event - lpData = (LPTSTR)((LPBYTE)pevlr + pevlr->DataOffset); + lpData = (LPWSTR)((LPBYTE)pevlr + pevlr->DataOffset); // This is the text of the current event - lpEventStr = (LPTSTR)((LPBYTE)pevlr + pevlr->StringOffset); + lpEventStr = (LPWSTR)((LPBYTE)pevlr + pevlr->StringOffset); // Compute the event type EventTimeToSystemTime(pevlr->TimeWritten, &time); @@ -606,14 +618,14 @@ // Get the username that generated the event GetEventUserName(pevlr, szUsername); - GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, MAX_PATH); - GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &time, NULL, szLocalTime, MAX_PATH); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, MAX_PATH); + GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &time, NULL, szLocalTime, MAX_PATH); GetEventType(pevlr->EventType, szEventTypeText); GetEventCategory(lpLogName, lpSourceName, pevlr, szCategory); - wsprintf(szEventID, _TEXT("%u"), (DWORD)(pevlr->EventID & 0xFFFF)); - wsprintf(szCategoryID, _TEXT("%u"), (DWORD)(pevlr->EventCategory)); + swprintf(szEventID, L"%u", (DWORD)(pevlr->EventID & 0xFFFF)); + swprintf(szCategoryID, L"%u", (DWORD)(pevlr->EventCategory)); lviEventItem.mask = LVIF_IMAGE | LVIF_TEXT | LVIF_PARAM; lviEventItem.iItem = 0; @@ -665,24 +677,22 @@ dwRecordsToRead--; dwCurrentRecord++; - - pevlr = (EVENTLOGRECORD *)&bBuffer; } // All events loaded EndDialog(hwndDlg, 0); - wsprintf(szWindowTitle, _TEXT("%s - %s Log on \\\\%s"), szTitle, lpLogName, lpComputerName); - wsprintf(szStatusText, _TEXT("%s has %d event(s)"), lpLogName, dwTotalRecords); + swprintf(szWindowTitle, L"%s - %s Log on \\\\%s", szTitle, lpLogName, lpComputerName); + swprintf(szStatusText, L"%s has %d event(s)", lpLogName, dwTotalRecords); // Update the status bar - SendMessage(hwndStatus, SB_SETTEXT, (WPARAM)0, (LPARAM)szStatusText); + SendMessageW(hwndStatus, SB_SETTEXT, (WPARAM)0, (LPARAM)szStatusText); // Set the window title - SetWindowText(hwndMainWindow, szWindowTitle); + SetWindowTextW(hwndMainWindow, szWindowTitle); // Resume list view redraw - SendMessage(hwndListView, WM_SETREDRAW, TRUE, 0); + SendMessageW(hwndListView, WM_SETREDRAW, TRUE, 0); // Close the event log. CloseEventLog(hEventLog); @@ -715,7 +725,7 @@ ATOM MyRegisterClass(HINSTANCE hInstance) { - WNDCLASSEX wcex; + WNDCLASSEXW wcex; wcex.cbSize = sizeof(WNDCLASSEX); @@ -731,7 +741,7 @@ wcex.lpszClassName = szWindowClass; wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL)); - return RegisterClassEx(&wcex); + return RegisterClassExW(&wcex); } @@ -750,11 +760,11 @@ int nCmdShow) { HIMAGELIST hSmall; - LVCOLUMN lvc = {0}; + LVCOLUMNW lvc = {0}; hInst = hInstance; // Store instance handle in our global variable - hwndMainWindow = CreateWindow(szWindowClass, + hwndMainWindow = CreateWindowW(szWindowClass, szTitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, @@ -767,9 +777,9 @@ return FALSE; } - hwndStatus = CreateWindowEx(0, // no extended styles - STATUSCLASSNAME, // status bar - _TEXT("Done."), // no text + hwndStatus = CreateWindowExW(0, // no extended styles + STATUSCLASSNAMEW, // status bar + L"Done.", // no text WS_CHILD | WS_BORDER | WS_VISIBLE, // styles 0, 0, 0, 0, // x, y, cx, cy hwndMainWindow, // parent window @@ -780,9 +790,9 @@ // Create our listview child window. Note that I use WS_EX_CLIENTEDGE // and WS_BORDER to create the normal "sunken" look. Also note that // LVS_EX_ styles cannot be set in CreateWindowEx(). - hwndListView = CreateWindowEx(WS_EX_CLIENTEDGE, - WC_LISTVIEW, - _TEXT(""), + hwndListView = CreateWindowExW(WS_EX_CLIENTEDGE, + WC_LISTVIEWW, + L"", LVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | LVS_REPORT, 0, 0, @@ -814,39 +824,39 @@ // Now set up the listview with its columns. lvc.mask = LVCF_TEXT | LVCF_WIDTH; lvc.cx = 90; - lvc.pszText = _T("Type"); + lvc.pszText = L"Type"; (void)ListView_InsertColumn(hwndListView, 0, &lvc); lvc.cx = 70; - lvc.pszText = _T("Date"); + lvc.pszText = L"Date"; (void)ListView_InsertColumn(hwndListView, 1, &lvc); lvc.cx = 70; - lvc.pszText = _T("Time"); + lvc.pszText = L"Time"; (void)ListView_InsertColumn(hwndListView, 2, &lvc); lvc.cx = 150; - lvc.pszText = _T("Source"); + lvc.pszText = L"Source"; (void)ListView_InsertColumn(hwndListView, 3, &lvc); lvc.cx = 100; - lvc.pszText = _T("Category"); + lvc.pszText = L"Category"; (void)ListView_InsertColumn(hwndListView, 4, &lvc); lvc.cx = 60; - lvc.pszText = _T("Event"); + lvc.pszText = L"Event"; (void)ListView_InsertColumn(hwndListView, 5, &lvc); lvc.cx = 120; - lvc.pszText = _T("User"); + lvc.pszText = L"User"; (void)ListView_InsertColumn(hwndListView, 6, &lvc); lvc.cx = 100; - lvc.pszText = _T("Computer"); + lvc.pszText = L"Computer"; (void)ListView_InsertColumn(hwndListView, 7, &lvc); lvc.cx = 0; - lvc.pszText = _T("Event Data"); + lvc.pszText = L"Event Data"; (void)ListView_InsertColumn(hwndListView, 8, &lvc); ShowWindow(hwndMainWindow, nCmdShow); @@ -955,9 +965,9 @@ break; case IDM_HELP: - MessageBox(NULL, - _TEXT("Help not implemented yet!"), - _TEXT("Event Log"), + MessageBoxW(NULL, + L"Help not implemented yet!", + L"Event Log", MB_OK | MB_ICONINFORMATION); break; @@ -987,8 +997,8 @@ SendMessage(hwndStatus, message, wParam, lParam); } break; - case WM_DESTROY: + FreeRecords(); PostQuitMessage(0); break; @@ -1027,18 +1037,18 @@ VOID DisplayEvent(HWND hDlg) { - TCHAR szEventType[MAX_PATH]; - TCHAR szTime[MAX_PATH]; - TCHAR szDate[MAX_PATH]; - TCHAR szUser[MAX_PATH]; - TCHAR szComputer[MAX_PATH]; - TCHAR szSource[MAX_PATH]; - TCHAR szCategory[MAX_PATH]; - TCHAR szEventID[MAX_PATH]; - TCHAR szEventText[EVENT_MESSAGE_EVENTTEXT_BUFFER]; - TCHAR szEventData[MAX_PATH]; + WCHAR szEventType[MAX_PATH]; + WCHAR szTime[MAX_PATH]; + WCHAR szDate[MAX_PATH]; + WCHAR szUser[MAX_PATH]; + WCHAR szComputer[MAX_PATH]; + WCHAR szSource[MAX_PATH]; + WCHAR szCategory[MAX_PATH]; + WCHAR szEventID[MAX_PATH]; + WCHAR szEventText[EVENT_MESSAGE_EVENTTEXT_BUFFER]; + WCHAR szEventData[MAX_PATH]; BOOL bEventData = FALSE; - LVITEM li; + LVITEMW li; EVENTLOGRECORD* pevlr; int iIndex; @@ -1055,14 +1065,14 @@ if (iIndex != -1) { - ListView_GetItemText(hwndListView, iIndex, 0, szEventType, sizeof(szEventType)); - ListView_GetItemText(hwndListView, iIndex, 1, szDate, sizeof(szDate)); - ListView_GetItemText(hwndListView, iIndex, 2, szTime, sizeof(szTime)); - ListView_GetItemText(hwndListView, iIndex, 3, szSource, sizeof(szSource)); - ListView_GetItemText(hwndListView, iIndex, 4, szCategory, sizeof(szCategory)); - ListView_GetItemText(hwndListView, iIndex, 5, szEventID, sizeof(szEventID)); - ListView_GetItemText(hwndListView, iIndex, 6, szUser, sizeof(szUser)); - ListView_GetItemText(hwndListView, iIndex, 7, szComputer, sizeof(szComputer)); + ListView_GetItemText(hwndListView, iIndex, 0, szEventType, sizeof(szEventType) * sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 1, szDate, sizeof(szDate) * sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 2, szTime, sizeof(szTime) * sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 3, szSource, sizeof(szSource) * sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 4, szCategory, sizeof(szCategory) * sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 5, szEventID, sizeof(szEventID) * sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 6, szUser, sizeof(szUser) * sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 7, szComputer, sizeof(szComputer) * sizeof(WCHAR)); bEventData = !(pevlr->DataLength == 0); @@ -1081,22 +1091,22 @@ EnableWindow(GetDlgItem(hDlg, IDC_BYTESRADIO), bEventData); EnableWindow(GetDlgItem(hDlg, IDC_WORDRADIO), bEventData); - SetDlgItemText(hDlg, IDC_EVENTDATESTATIC, szDate); - SetDlgItemText(hDlg, IDC_EVENTTIMESTATIC, szTime); - SetDlgItemText(hDlg, IDC_EVENTUSERSTATIC, szUser); - SetDlgItemText(hDlg, IDC_EVENTSOURCESTATIC, szSource); - SetDlgItemText(hDlg, IDC_EVENTCOMPUTERSTATIC, szComputer); - SetDlgItemText(hDlg, IDC_EVENTCATEGORYSTATIC, szCategory); - SetDlgItemText(hDlg, IDC_EVENTIDSTATIC, szEventID); - SetDlgItemText(hDlg, IDC_EVENTTYPESTATIC, szEventType); - SetDlgItemText(hDlg, IDC_EVENTTEXTEDIT, szEventText); - SetDlgItemText(hDlg, IDC_EVENTDATAEDIT, szEventData); + SetDlgItemTextW(hDlg, IDC_EVENTDATESTATIC, szDate); + SetDlgItemTextW(hDlg, IDC_EVENTTIMESTATIC, szTime); + SetDlgItemTextW(hDlg, IDC_EVENTUSERSTATIC, szUser); + SetDlgItemTextW(hDlg, IDC_EVENTSOURCESTATIC, szSource); + SetDlgItemTextW(hDlg, IDC_EVENTCOMPUTERSTATIC, szComputer); + SetDlgItemTextW(hDlg, IDC_EVENTCATEGORYSTATIC, szCategory); + SetDlgItemTextW(hDlg, IDC_EVENTIDSTATIC, szEventID); + SetDlgItemTextW(hDlg, IDC_EVENTTYPESTATIC, szEventType); + SetDlgItemTextW(hDlg, IDC_EVENTTEXTEDIT, szEventText); + SetDlgItemTextW(hDlg, IDC_EVENTDATAEDIT, szEventData); } else { - MessageBox(NULL, - _TEXT("No Items in ListView"), - _TEXT("Error"), + MessageBoxW(NULL, + L"No Items in ListView", + L"Error", MB_OK | MB_ICONINFORMATION); } } @@ -1164,9 +1174,9 @@ return (INT_PTR)TRUE; case IDHELP: - MessageBox(NULL, - _TEXT("Help not implemented yet!"), - _TEXT("Event Log"), + MessageBoxW(NULL, + L"Help not implemented yet!", + L"Event Log", MB_OK | MB_ICONINFORMATION); return (INT_PTR)TRUE;

15 years, 8 months

[mjmartin] 38659: - Run process notification routines after successfully creating process.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Fri Jan 9 00:13:14 2009 New Revision: 38659 URL: http://svn.reactos.org/svn/reactos?rev=38659&view=rev Log: - Run process notification routines after successfully creating process. Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Fri Jan 9 00:13:14 2009 @@ -822,6 +822,9 @@ } _SEH2_END; + /* Run the Notification Routines */ + PspRunCreateProcessNotifyRoutines(Process, TRUE); + CleanupWithRef: /* * Dereference the process. For failures, kills the process and does

15 years, 8 months

[tkreuzer] 38658: - Remove the dib pointer from SURFACE - Handle mapped sections in SURFACE_Cleanup - Handle user provided bitfields, when creating a dib - Some code cleanup

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 8 20:06:39 2009 New Revision: 38658 URL: http://svn.reactos.org/svn/reactos?rev=38658&view=rev Log: - Remove the dib pointer from SURFACE - Handle mapped sections in SURFACE_Cleanup - Handle user provided bitfields, when creating a dib - Some code cleanup Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/include/surface.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Thu Jan 8 20:06:39 2009 @@ -93,35 +93,56 @@ BOOL INTERNAL_CALL SURFACE_Cleanup(PVOID ObjectBody) { - PSURFACE psurf = (PSURFACE)ObjectBody; - - if (psurf->SurfObj.pvBits != NULL && - (psurf->flFlags & BITMAPOBJ_IS_APIBITMAP)) - { - if (psurf->dib == NULL) - { - ExFreePool(psurf->SurfObj.pvBits); - } - else - { - EngFreeUserMem(psurf->SurfObj.pvBits); - } - if (psurf->hDIBPalette != NULL) - { - NtGdiDeleteObject(psurf->hDIBPalette); - } - } - - if (NULL != psurf->BitsLock) - { - ExFreePoolWithTag(psurf->BitsLock, TAG_SURFACE); - psurf->BitsLock = NULL; - } - - if (psurf->dib) - ExFreePoolWithTag(psurf->dib, TAG_DIB); - - return TRUE; + PSURFACE psurf = (PSURFACE)ObjectBody; + PVOID pvBits = psurf->SurfObj.pvBits; + + /* If this is an API bitmap, free the bits */ + if (pvBits != NULL && + (psurf->flFlags & BITMAPOBJ_IS_APIBITMAP)) + { + /* Check if we have a DIB section */ + if (psurf->hSecure) + { + // FIXME: IMPLEMENT ME! + // MmUnsecureVirtualMemory(psurf->hSecure); + if (psurf->hDIBSection) + { + /* DIB was created from a section */ + NTSTATUS Status; + + pvBits = (PVOID)((ULONG_PTR)pvBits - psurf->dwOffset); + Status = ZwUnmapViewOfSection(NtCurrentProcess(), pvBits); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not unmap section view!\n"); + // Should we BugCheck here? + } + } + else + { + /* DIB was allocated */ + EngFreeUserMem(pvBits); + } + } + else + { + // FIXME: use TAG + ExFreePool(psurf->SurfObj.pvBits); + } + + if (psurf->hDIBPalette != NULL) + { + NtGdiDeleteObject(psurf->hDIBPalette); + } + } + + if (NULL != psurf->BitsLock) + { + ExFreePoolWithTag(psurf->BitsLock, TAG_SURFACE); + psurf->BitsLock = NULL; + } + + return TRUE; } BOOL INTERNAL_CALL @@ -408,7 +429,9 @@ psurf->flFlags = 0; psurf->dimension.cx = 0; psurf->dimension.cy = 0; - psurf->dib = NULL; + + psurf->hSecure = NULL; + psurf->hDIBSection = NULL; SURFACE_UnlockSurface(psurf); Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Thu Jan 8 20:06:39 2009 @@ -486,7 +486,7 @@ if (psurfSrc->SurfObj.iBitmapFormat == BMF_1BPP) { /* DIB sections need special handling */ - if (psurfSrc->dib) + if (psurfSrc->hSecure) { PPALGDI ppal = PALETTE_LockPalette(psurfSrc->hDIBPalette); if (ppal) Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Thu Jan 8 20:06:39 2009 @@ -8,5 +8,8 @@ INT FASTCALL DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse); INT APIENTRY BITMAP_GetObject(SURFACE * bmp, INT count, LPVOID buffer); HBITMAP FASTCALL IntCreateBitmap(IN SIZEL Size, IN LONG Width, IN ULONG Format, IN ULONG Flags, IN PVOID Bits); +HBITMAP FASTCALL BITMAP_CopyBitmap (HBITMAP hBitmap); +UINT FASTCALL BITMAP_GetRealBitsPixel(UINT nBitsPixel); +INT FASTCALL BITMAP_GetWidthBytes (INT bmWidth, INT bpp); #endif Modified: trunk/reactos/subsystems/win32/win32k/include/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/surface.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/surface.h [iso-8859-1] Thu Jan 8 20:06:39 2009 @@ -20,9 +20,15 @@ the actual bits in the bitmap */ /* For device-independent bitmaps: */ - DIBSECTION *dib; + HANDLE hDIBSection; + HANDLE hSecure; + DWORD dwOffset; + HPALETTE hDIBPalette; HDC hDC; // Doc in "Undocumented Windows", page 546, seems to be supported with XP. + DWORD dsBitfields[3]; // hack, should probably use palette instead + DWORD biClrUsed; + DWORD biClrImportant; } SURFACE, *PSURFACE; #define BITMAPOBJ_IS_APIBITMAP 0x1 @@ -50,9 +56,6 @@ BOOL INTERNAL_CALL SURFACE_Cleanup(PVOID ObjectBody); BOOL INTERNAL_CALL SURFACE_InitBitsLock(SURFACE *pBMObj); void INTERNAL_CALL SURFACE_CleanupBitsLock(SURFACE *pBMObj); -INT FASTCALL SURFACE_GetWidthBytes (INT bmWidth, INT bpp); -UINT FASTCALL SURFACE_GetRealBitsPixel(UINT nBitsPixel); -HBITMAP FASTCALL SURFACE_CopyBitmap (HBITMAP hBitmap); #define GDIDEV(SurfObj) ((GDIDEVICE *)((SurfObj)->hdev)) #define GDIDEVFUNCS(SurfObj) ((GDIDEVICE *)((SurfObj)->hdev))->DriverFunctions Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Thu Jan 8 20:06:39 2009 @@ -567,8 +567,8 @@ { if(Indirect) { - CurIcon->IconInfo.hbmMask = SURFACE_CopyBitmap(CurIcon->IconInfo.hbmMask); - CurIcon->IconInfo.hbmColor = SURFACE_CopyBitmap(CurIcon->IconInfo.hbmColor); + CurIcon->IconInfo.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); + CurIcon->IconInfo.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor); } if(CurIcon->IconInfo.hbmColor && (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor))) @@ -651,8 +651,8 @@ RtlCopyMemory(&ii, &CurIcon->IconInfo, sizeof(ICONINFO)); /* Copy bitmaps */ - ii.hbmMask = SURFACE_CopyBitmap(CurIcon->IconInfo.hbmMask); - ii.hbmColor = SURFACE_CopyBitmap(CurIcon->IconInfo.hbmColor); + ii.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); + ii.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor); /* Copy fields */ _SEH2_TRY @@ -1244,8 +1244,8 @@ ProbeForRead(pIconInfo, sizeof(ICONINFO), 1); RtlCopyMemory(&CurIcon->IconInfo, pIconInfo, sizeof(ICONINFO)); - CurIcon->IconInfo.hbmMask = SURFACE_CopyBitmap(pIconInfo->hbmMask); - CurIcon->IconInfo.hbmColor = SURFACE_CopyBitmap(pIconInfo->hbmColor); + CurIcon->IconInfo.hbmMask = BITMAP_CopyBitmap(pIconInfo->hbmMask); + CurIcon->IconInfo.hbmColor = BITMAP_CopyBitmap(pIconInfo->hbmColor); if (CurIcon->IconInfo.hbmColor) { Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Thu Jan 8 20:06:39 2009 @@ -44,7 +44,7 @@ LONG WidthBytes; /* NOTE: Windows also doesn't store nr. of planes separately! */ - BitsPixel = SURFACE_GetRealBitsPixel(BitsPixel * Planes); + BitsPixel = BITMAP_GetRealBitsPixel(BitsPixel * Planes); /* Check parameters */ if (BitsPixel == 0 || Width <= 0 || Width >= 0x8000000 || Height == 0) @@ -54,7 +54,7 @@ return 0; } - WidthBytes = SURFACE_GetWidthBytes(Width, BitsPixel); + WidthBytes = BITMAP_GetWidthBytes(Width, BitsPixel); Size.cx = Width; Size.cy = abs(Height); @@ -113,7 +113,7 @@ if (pUnsafeBits) { BOOL Hit = FALSE; - UINT cjBits = SURFACE_GetWidthBytes(Width, BitsPixel) * abs(Height); + UINT cjBits = BITMAP_GetWidthBytes(Width, BitsPixel) * abs(Height); _SEH2_TRY { @@ -689,7 +689,7 @@ /* Internal Functions */ UINT FASTCALL -SURFACE_GetRealBitsPixel(UINT nBitsPixel) +BITMAP_GetRealBitsPixel(UINT nBitsPixel) { if (nBitsPixel <= 1) return 1; @@ -708,7 +708,7 @@ } INT FASTCALL -SURFACE_GetWidthBytes (INT bmWidth, INT bpp) +BITMAP_GetWidthBytes (INT bmWidth, INT bpp) { #if 0 switch(bpp) @@ -742,7 +742,7 @@ } HBITMAP FASTCALL -SURFACE_CopyBitmap(HBITMAP hBitmap) +BITMAP_CopyBitmap(HBITMAP hBitmap) { HBITMAP res; BITMAP bm; @@ -807,45 +807,59 @@ } INT APIENTRY -BITMAP_GetObject(SURFACE * bmp, INT Count, LPVOID buffer) -{ +BITMAP_GetObject(SURFACE *psurf, INT Count, LPVOID buffer) +{ + PBITMAP pBitmap; + + if (!buffer) return sizeof(BITMAP); if ((UINT)Count < sizeof(BITMAP)) return 0; - if(bmp->dib) - { - if((UINT)Count < sizeof(DIBSECTION)) - { - Count = sizeof(BITMAP); - } - else - { - Count = sizeof(DIBSECTION); - } - if (buffer) - { - memcpy(buffer, bmp->dib, Count); - } - return Count; + /* always fill a basic BITMAP structure */ + pBitmap = buffer; + pBitmap->bmType = 0; + pBitmap->bmWidth = psurf->SurfObj.sizlBitmap.cx; + pBitmap->bmHeight = psurf->SurfObj.sizlBitmap.cy; + pBitmap->bmWidthBytes = abs(psurf->SurfObj.lDelta); + pBitmap->bmPlanes = 1; + pBitmap->bmBitsPixel = BitsPerFormat(psurf->SurfObj.iBitmapFormat); + + /* Check for DIB section */ + if(psurf->hSecure) + { + /* Set bmBits in this case */ + pBitmap->bmBits = psurf->SurfObj.pvBits; + + if (Count >= sizeof(DIBSECTION)) + { + /* Fill rest of DIBSECTION */ + PDIBSECTION pds = buffer; + + pds->dsBmih.biSize = + pds->dsBmih.biWidth = pds->dsBm.bmWidth; + pds->dsBmih.biHeight = pds->dsBm.bmHeight; + pds->dsBmih.biPlanes = pds->dsBm.bmPlanes; + pds->dsBmih.biBitCount = pds->dsBm.bmBitsPixel; + pds->dsBmih.biCompression = 0; // FIXME! + pds->dsBmih.biSizeImage = psurf->SurfObj.cjBits; + pds->dsBmih.biXPelsPerMeter = 0; + pds->dsBmih.biYPelsPerMeter = 0; + pds->dsBmih.biClrUsed = psurf->biClrUsed; + pds->dsBmih.biClrImportant = psurf->biClrImportant; + pds->dsBitfields[0] = psurf->dsBitfields[0]; + pds->dsBitfields[1] = psurf->dsBitfields[1]; + pds->dsBitfields[2] = psurf->dsBitfields[2]; + pds->dshSection = psurf->hDIBSection; + pds->dsOffset = psurf->dwOffset; + + return sizeof(DIBSECTION); + } } else { - Count = sizeof(BITMAP); - if (buffer) - { - BITMAP Bitmap; - - Count = sizeof(BITMAP); - Bitmap.bmType = 0; - Bitmap.bmWidth = bmp->SurfObj.sizlBitmap.cx; - Bitmap.bmHeight = bmp->SurfObj.sizlBitmap.cy; - Bitmap.bmWidthBytes = abs(bmp->SurfObj.lDelta); - Bitmap.bmPlanes = 1; - Bitmap.bmBitsPixel = BitsPerFormat(bmp->SurfObj.iBitmapFormat); - Bitmap.bmBits = NULL; /* not set according to wine test, confirmed in win2k */ - memcpy(buffer, &Bitmap, Count); - } - return Count; - } + pBitmap->bmBits = NULL; /* not set according to wine test, confirmed in win2k */ + } + + return sizeof(BITMAP); } /* @@ -917,9 +931,10 @@ psurfBmp->hDC = hDC; // if we're working with a DIB, get the palette [fixme: only create if the selected palette is null] - if(psurfBmp->dib) + if(psurfBmp->hSecure) { - pDC->w.bitsPerPixel = psurfBmp->dib->dsBmih.biBitCount; +// pDC->w.bitsPerPixel = psurfBmp->dib->dsBmih.biBitCount; ??? + pDC->w.bitsPerPixel = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat); } else { Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Thu Jan 8 20:06:39 2009 @@ -437,7 +437,7 @@ PGDIBRUSHOBJ BrushObject; HBITMAP hPattern; - hPattern = SURFACE_CopyBitmap(hBitmap); + hPattern = BITMAP_CopyBitmap(hBitmap); if (hPattern == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu Jan 8 20:06:39 2009 @@ -76,6 +76,7 @@ PSURFACE psurf; PPALGDI PalGDI; UINT Index; + ULONG biBitCount; if (!(dc = DC_LockDc(hDC))) return 0; if (dc->DC_Type == DC_TYPE_INFO) @@ -92,7 +93,7 @@ return 0; } - if (psurf->dib == NULL) + if (psurf->hSecure == NULL) { SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); @@ -100,11 +101,11 @@ return 0; } - if (psurf->dib->dsBmih.biBitCount <= 8 && - StartIndex < (1 << psurf->dib->dsBmih.biBitCount)) + biBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); + if (biBitCount <= 8 && StartIndex < (1 << biBitCount)) { - if (StartIndex + Entries > (1 << psurf->dib->dsBmih.biBitCount)) - Entries = (1 << psurf->dib->dsBmih.biBitCount) - StartIndex; + if (StartIndex + Entries > (1 << biBitCount)) + Entries = (1 << biBitCount) - StartIndex; PalGDI = PALETTE_LockPalette(psurf->hDIBPalette); if (PalGDI == NULL) @@ -141,6 +142,7 @@ PSURFACE psurf; PPALGDI PalGDI; UINT Index; + ULONG biBitCount; if (!(dc = DC_LockDc(hDC))) return 0; if (dc->DC_Type == DC_TYPE_INFO) @@ -157,7 +159,7 @@ return 0; } - if (psurf->dib == NULL) + if (psurf->hSecure == NULL) { SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); @@ -165,11 +167,12 @@ return 0; } - if (psurf->dib->dsBmih.biBitCount <= 8 && - StartIndex < (1 << psurf->dib->dsBmih.biBitCount)) + biBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); + if (biBitCount <= 8 && + StartIndex < (1 << biBitCount)) { - if (StartIndex + Entries > (1 << psurf->dib->dsBmih.biBitCount)) - Entries = (1 << psurf->dib->dsBmih.biBitCount) - StartIndex; + if (StartIndex + Entries > (1 << biBitCount)) + Entries = (1 << biBitCount) - StartIndex; PalGDI = PALETTE_LockPalette(psurf->hDIBPalette); if (PalGDI == NULL) @@ -750,7 +753,8 @@ case 4: case 8: Info->bmiHeader.biClrUsed = 0; - if ( psurf->dib && psurf->dib->dsBm.bmBitsPixel == Info->bmiHeader.biBitCount) + if ( psurf->hSecure && + BitsPerFormat(psurf->SurfObj.iBitmapFormat) == Info->bmiHeader.biBitCount) { if (Usage == DIB_RGB_COLORS) { @@ -1316,7 +1320,6 @@ { HBITMAP res = 0; SURFACE *bmp = NULL; - DIBSECTION *dib = NULL; void *mapBits = NULL; PDC_ATTR pDc_Attr; @@ -1327,6 +1330,8 @@ BITMAP bm; SIZEL Size; RGBQUAD *lpRGB; + HANDLE hSecure; + DWORD dsBitfields[3] = {0}; DPRINT("format (%ld,%ld), planes %d, bpp %d, size %ld, colors %ld (%s)\n", bi->biWidth, bi->biHeight, bi->biPlanes, bi->biBitCount, @@ -1374,7 +1379,7 @@ } mapOffset = offset - (offset % Sbi.AllocationGranularity); - mapSize = dib->dsBmih.biSizeImage + (offset - mapOffset); + mapSize = bi->biSizeImage + (offset - mapOffset); SectionOffset.LowPart = mapOffset; SectionOffset.HighPart = 0; @@ -1405,44 +1410,44 @@ bm.bmBits = EngAllocUserMem( totalSize, 0 ); } +// hSecure = MmSecureVirtualMemory(bm.bmBits, totalSize, PAGE_READWRITE); + hSecure = (HANDLE)0x1; // HACK OF UNIMPLEMENTED KERNEL STUFF !!!! + if(usage == DIB_PAL_COLORS) lpRGB = DIB_MapPaletteColors(dc, bmi); else lpRGB = bmi->bmiColors; - // Allocate Memory for DIB and fill structure - if (bm.bmBits) - { - dib = ExAllocatePoolWithTag(PagedPool, sizeof(DIBSECTION), TAG_DIB); - if (dib != NULL) RtlZeroMemory(dib, sizeof(DIBSECTION)); - } - - if (dib) - { - dib->dsBm = bm; /* Set dsBitfields values */ if ( usage == DIB_PAL_COLORS || bi->biBitCount <= 8) { - dib->dsBitfields[0] = dib->dsBitfields[1] = dib->dsBitfields[2] = 0; - } - else switch(bi->biBitCount) - { - case 15: - case 16: - dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0x7c00; - dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x03e0; - dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x001f; - break; - - case 24: - case 32: - dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0xff0000; - dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x00ff00; - dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x0000ff; - break; - } - dib->dshSection = section; - dib->dsOffset = offset; + dsBitfields[0] = dsBitfields[1] = dsBitfields[2] = 0; + } + else if (bi->biCompression == BI_RGB) + { + switch(bi->biBitCount) + { + case 15: + case 16: + dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0x7c00; + dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x03e0; + dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x001f; + break; + + case 24: + case 32: + dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0xff0000; + dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x00ff00; + dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x0000ff; + break; + } + } + else + { + dsBitfields[0] = ((DWORD*)bmi->bmiColors)[0]; + dsBitfields[1] = ((DWORD*)bmi->bmiColors)[1]; + dsBitfields[2] = ((DWORD*)bmi->bmiColors)[2]; + } // Create Device Dependent Bitmap and add DIB pointer Size.cx = bm.bmWidth; @@ -1469,12 +1474,19 @@ { ExFreePoolWithTag(lpRGB, TAG_COLORMAP); } - SetLastWin32Error(ERROR_INVALID_HANDLE); - NtGdiDeleteObject(bmp); - return NULL; - } - bmp->dib = (DIBSECTION *) dib; + SetLastWin32Error(ERROR_INVALID_HANDLE); + NtGdiDeleteObject(bmp); + return NULL; + } + bmp->hDIBSection = section; + bmp->hSecure = hSecure; + bmp->dwOffset = offset; bmp->flFlags = BITMAPOBJ_IS_APIBITMAP; + bmp->dsBitfields[0] = dsBitfields[0]; + bmp->dsBitfields[1] = dsBitfields[1]; + bmp->dsBitfields[2] = dsBitfields[2]; + bmp->biClrUsed = bi->biClrUsed; + bmp->biClrImportant = bi->biClrImportant; /* WINE NOTE: WINE makes use of a colormap, which is a color translation table between the DIB and the X physical device. Obviously, @@ -1490,20 +1502,17 @@ bmp->hDIBPalette = PALETTE_AllocPaletteIndexedRGB(bi->biClrUsed, lpRGB); else bmp->hDIBPalette = PALETTE_AllocPalette(PAL_BITFIELDS, 0, NULL, - dib->dsBitfields[0], - dib->dsBitfields[1], - dib->dsBitfields[2]); - - dib->dsBmih = *bi; - dib->dsBmih.biSizeImage = totalSize; - } + dsBitfields[0], + dsBitfields[1], + dsBitfields[2]); // Clean up in case of errors - if (!res || !bmp || !dib || !bm.bmBits) - { - DPRINT("got an error res=%08x, bmp=%p, dib=%p, bm.bmBits=%p\n", res, bmp, dib, bm.bmBits); + if (!res || !bmp || !bm.bmBits) + { + DPRINT("got an error res=%08x, bmp=%p, bm.bmBits=%p\n", res, bmp, bm.bmBits); if (bm.bmBits) { + // MmUnsecureVirtualMemory(hSecure); // FIXME: Implement this! if (section) { ZwUnmapViewOfSection(NtCurrentProcess(), mapBits); @@ -1514,7 +1523,6 @@ EngFreeUserMem(bm.bmBits), bm.bmBits = NULL; } - if (dib) { ExFreePoolWithTag(dib, TAG_DIB); dib = NULL; } if (bmp) { bmp = NULL; } if (res) { SURFACE_FreeSurfaceByHandle(res); res = 0; } }

15 years, 8 months

[tkreuzer] 38657: More tests for NtGdiCreateDIBSection

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 8 18:52:04 2009 New Revision: 38657 URL: http://svn.reactos.org/svn/reactos?rev=38657&view=rev Log: More tests for NtGdiCreateDIBSection Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c [iso-8859-1] Thu Jan 8 18:52:04 2009 @@ -34,6 +34,7 @@ ULONG cjHeader; PVOID pvBits = NULL; ULONG cEntries; + DIBSECTION dibsection; struct { @@ -71,6 +72,12 @@ TEST(pvBits != NULL); TEST(hbmp != 0); // TEST(GetLastError() == 0); + TEST(GetObject(hbmp, sizeof(DIBSECTION), &dibsection) == sizeof(DIBSECTION)); + TEST(dibsection.dsBitfields[0] == 0); + TEST(dibsection.dsBitfields[1] == 0); + TEST(dibsection.dsBitfields[2] == 0); + TEST(dibsection.dshSection == 0); + TEST(dibsection.dsOffset == 0); if (hbmp) DeleteObject(hbmp); @@ -155,6 +162,90 @@ TEST(hbmp == 0); TEST(GetLastError() == 0); if (hbmp) DeleteObject(hbmp); + + /* Test different bitcount */ + pbih->biBitCount = 4; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(hbmp != 0); + + pbih->biBitCount = 8; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(hbmp != 0); + + cjHeader = pbih->biSize; + pbih->biBitCount = 16; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(hbmp != 0); + + pbih->biBitCount = 24; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(hbmp != 0); + + pbih->biBitCount = 32; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(hbmp != 0); + + /* Test BI_BITFIELDS */ + cEntries = 3; + cjHeader = pbih->biSize + cEntries * sizeof(DWORD); + pbih->biBitCount = 16; + pbih->biCompression = BI_BITFIELDS; + ((DWORD*)pbmi->bmiColors)[0] = 0x0007; + ((DWORD*)pbmi->bmiColors)[1] = 0x0038; + ((DWORD*)pbmi->bmiColors)[2] = 0x01C0; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(hbmp != 0); + TEST(GetObject(hbmp, sizeof(DIBSECTION), &dibsection) == sizeof(DIBSECTION)); + TEST(dibsection.dsBm.bmType == 0); + TEST(dibsection.dsBm.bmWidth == 2); + TEST(dibsection.dsBm.bmHeight == 2); + TEST(dibsection.dsBm.bmWidthBytes == 4); + TEST(dibsection.dsBm.bmPlanes == 1); + TEST(dibsection.dsBm.bmBitsPixel == 16); + TEST(dibsection.dsBm.bmBits == pvBits); + TEST(dibsection.dsBmih.biSize == sizeof(BITMAPINFOHEADER)); + TEST(dibsection.dsBmih.biWidth == 2); + TEST(dibsection.dsBmih.biHeight == 2); + TEST(dibsection.dsBmih.biPlanes == 1); + TEST(dibsection.dsBmih.biBitCount == 16); + TEST(dibsection.dsBmih.biCompression == BI_BITFIELDS); + TEST(dibsection.dsBmih.biSizeImage == 8); + TEST(dibsection.dsBmih.biXPelsPerMeter == 0); + TEST(dibsection.dsBmih.biYPelsPerMeter == 0); + TEST(dibsection.dsBmih.biClrUsed == 0); + TEST(dibsection.dsBmih.biClrImportant == 0); + TEST(dibsection.dsBitfields[0] == 0x0007); + TEST(dibsection.dsBitfields[1] == 0x0038); + TEST(dibsection.dsBitfields[2] == 0x01C0); + TEST(dibsection.dshSection == 0); + TEST(dibsection.dsOffset == 0); + +printf("dib with bitfileds: %p\n", hbmp); +//system("PAUSE"); + + if (hbmp) DeleteObject(hbmp); + + + /* Test BI_BITFIELDS */ + SetLastError(0); + pvBits = 0; + + pbih->biSize = sizeof(BITMAPINFOHEADER); + pbih->biWidth = 2; + pbih->biHeight = 2; + pbih->biPlanes = 1; + pbih->biBitCount = 4; + pbih->biCompression = BI_RGB; + pbih->biSizeImage = 0; + pbih->biXPelsPerMeter = 100; + pbih->biYPelsPerMeter = 100; + pbih->biClrUsed = 0; + pbih->biClrImportant = 0; + ((DWORD*)pbmi->bmiColors)[0] = 0xF800; + ((DWORD*)pbmi->bmiColors)[1] = 0x00ff00; + ((DWORD*)pbmi->bmiColors)[2] = 0x0000ff; + cEntries = 0; + cjHeader = bmi.bmiHeader.biSize + cEntries * 4 + 20; /** iUsage = 1 (DIB_PAL_COLORS) ***********************************************/ @@ -349,8 +440,6 @@ TEST(GetLastError() == 8); if (hbmp) DeleteObject(hbmp); - printf("GetLastError() == %ld\n", GetLastError()); - /* Test section */ HANDLE hSection; NTSTATUS Status; @@ -365,14 +454,6 @@ SEC_COMMIT, NULL); ASSERT(NT_SUCCESS(Status)); - Status = ZwCreateSection(&hSection, - SECTION_ALL_ACCESS, - NULL, - &MaximumSize, - PAGE_READWRITE, - SEC_COMMIT, - NULL); - ASSERT(NT_SUCCESS(Status)); SetLastError(0); pvBits = 0; @@ -381,7 +462,7 @@ TEST(hbmp != 0); // TEST(GetLastError() == 0); printf("hbmp = %p, pvBits = %p, hSection = %p\n", hbmp, pvBits, hSection); - system("PAUSE"); +//system("PAUSE"); if (hbmp) DeleteObject(hbmp);

15 years, 8 months

[tkreuzer] 38656: More tests for GetObject

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 8 18:50:20 2009 New Revision: 38656 URL: http://svn.reactos.org/svn/reactos?rev=38656&view=rev Log: More tests for GetObject Modified: trunk/rostests/apitests/gdi32api/tests/GetObject.c Modified: trunk/rostests/apitests/gdi32api/tests/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/tests/GetObject.c [iso-8859-1] Thu Jan 8 18:50:20 2009 @@ -98,15 +98,16 @@ static INT Test_Dibsection(PTESTINFO pti) { - BITMAPINFO bmi = {{sizeof(BITMAPINFOHEADER), 10, 10, 1, 8, BI_RGB, 0, 10, 10, 0,0}}; + BITMAPINFO bmi = {{sizeof(BITMAPINFOHEADER), 10, 9, 1, 8, BI_RGB, 0, 10, 10, 0,0}}; HBITMAP hBitmap; + BITMAP bitmap; DIBSECTION dibsection; PVOID pData; FillMemory(&dibsection, sizeof(DIBSECTION), 0x77); HDC hDC = GetDC(0); hBitmap = CreateDIBSection(hDC, &bmi, DIB_RGB_COLORS, &pData, NULL, 0); - if(!hBitmap) return FALSE; + ASSERT(hBitmap); SetLastError(ERROR_SUCCESS); RTEST(GetObject(hBitmap, sizeof(DIBSECTION), NULL) == sizeof(BITMAP)); @@ -115,8 +116,15 @@ RTEST(GetObject(hBitmap, -5, NULL) == sizeof(BITMAP)); RTEST(GetObject(hBitmap, 0, &dibsection) == 0); RTEST(GetObject(hBitmap, 5, &dibsection) == 0); - RTEST(GetObject(hBitmap, sizeof(BITMAP), &dibsection) == sizeof(BITMAP)); - RTEST(GetObject(hBitmap, sizeof(BITMAP)+2, &dibsection) == sizeof(BITMAP)); + RTEST(GetObject(hBitmap, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + RTEST(GetObject(hBitmap, sizeof(BITMAP)+2, &bitmap) == sizeof(BITMAP)); + TEST(bitmap.bmType == 0); + TEST(bitmap.bmWidth == 10); + TEST(bitmap.bmHeight == 9); + TEST(bitmap.bmWidthBytes == 12); + TEST(bitmap.bmPlanes == 1); + TEST(bitmap.bmBitsPixel == 8); + TEST(bitmap.bmBits == pData); RTEST(GetObject(hBitmap, sizeof(DIBSECTION), &dibsection) == sizeof(DIBSECTION)); RTEST(GetObject(hBitmap, sizeof(DIBSECTION)+2, &dibsection) == sizeof(DIBSECTION)); RTEST(GetObject(hBitmap, -5, &dibsection) == sizeof(DIBSECTION));

15 years, 8 months

[cfinck] 38655: - It actually wasn't a very good idea to authenticate against the MD5 password hash instead of the password itself. This didn't really improve security, but just made things more difficult for the user. Change that, so the web service and rosautotest expect a password in the "rosautotest.ini" file now. - Read the "rosautotest.ini" from the application's directory instead of the Windows directory. - Little adjustmensts here and there

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Jan 8 17:09:10 2009 New Revision: 38655 URL: http://svn.reactos.org/svn/reactos?rev=38655&view=rev Log: - It actually wasn't a very good idea to authenticate against the MD5 password hash instead of the password itself. This didn't really improve security, but just made things more difficult for the user. Change that, so the web service and rosautotest expect a password in the "rosautotest.ini" file now. - Read the "rosautotest.ini" from the application's directory instead of the Windows directory. - Little adjustmensts here and there Modified: trunk/rostests/rosautotest/main.c trunk/rostests/rosautotest/webservice.c trunk/web/reactos.org/htdocs/testman/webservice/index.php Modified: trunk/rostests/rosautotest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/main.c?rev=38… ============================================================================== --- trunk/rostests/rosautotest/main.c [iso-8859-1] (original) +++ trunk/rostests/rosautotest/main.c [iso-8859-1] Thu Jan 8 17:09:10 2009 @@ -53,22 +53,22 @@ } /** - * Gets the username and password hash from the "rosautotest.ini" file if the user enabled submitting the results to the web service. + * Gets the username and password from the "rosautotest.ini" file if the user enabled submitting the results to the web service. * The "rosautotest.ini" file should look like this: * * [Login] * UserName=TestMan - * PasswordHash=1234567890abcdef1234567890abcdef + * Password=TestPassword */ static BOOL IntGetConfigurationValues() { - const CHAR PasswordHashProp[] = "&passwordhash="; + const CHAR PasswordProp[] = "&password="; const CHAR UserNameProp[] = "&username="; DWORD DataLength; DWORD Length; - PCHAR PasswordHash; + PCHAR Password; PCHAR UserName; WCHAR ConfigFile[MAX_PATH]; @@ -76,13 +76,17 @@ if(!AppOptions.Submit) return TRUE; - /* Build the path to the configuration file */ - Length = GetWindowsDirectoryW(ConfigFile, MAX_PATH); + /* Build the path to the configuration file from the application's path */ + GetModuleFileNameW(NULL, ConfigFile, MAX_PATH); + Length = wcsrchr(ConfigFile, '\\') - ConfigFile; wcscpy(&ConfigFile[Length], L"\\rosautotest.ini"); /* Check if it exists */ if(GetFileAttributesW(ConfigFile) == INVALID_FILE_ATTRIBUTES) + { + StringOut("Missing \"rosautotest.ini\" configuration file!\n"); return FALSE; + } /* Get the required length of the authentication request string */ DataLength = sizeof(UserNameProp) - 1; @@ -97,12 +101,12 @@ /* Some characters might need to be escaped and an escaped character takes 3 bytes */ DataLength += 3 * Length; - DataLength += sizeof(PasswordHashProp) - 1; - Length = IntGetINIValueA(L"Login", L"PasswordHash", ConfigFile, &PasswordHash); + DataLength += sizeof(PasswordProp) - 1; + Length = IntGetINIValueA(L"Login", L"Password", ConfigFile, &Password); if(!Length) { - StringOut("PasswordHash is missing in the configuration file\n"); + StringOut("Password is missing in the configuration file\n"); return FALSE; } @@ -114,8 +118,8 @@ strcpy(AuthenticationRequestString, UserNameProp); EscapeString(&AuthenticationRequestString[strlen(AuthenticationRequestString)], UserName); - strcat(AuthenticationRequestString, PasswordHashProp); - EscapeString(&AuthenticationRequestString[strlen(AuthenticationRequestString)], PasswordHash); + strcat(AuthenticationRequestString, PasswordProp); + EscapeString(&AuthenticationRequestString[strlen(AuthenticationRequestString)], Password); return TRUE; } Modified: trunk/rostests/rosautotest/webservice.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/webservice.c?… ============================================================================== --- trunk/rostests/rosautotest/webservice.c [iso-8859-1] (original) +++ trunk/rostests/rosautotest/webservice.c [iso-8859-1] Thu Jan 8 17:09:10 2009 @@ -170,6 +170,7 @@ { StringOut("Expected Test ID, but received:\n"); StringOut(Data); + StringOut("\n"); HeapFree(hProcessHeap, 0, Data); return NULL; } @@ -248,6 +249,7 @@ { StringOut("Expected Suite ID, but received:\n"); StringOut(Data); + StringOut("\n"); HeapFree(hProcessHeap, 0, Data); return NULL; } Modified: trunk/web/reactos.org/htdocs/testman/webservice/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/web… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/webservice/index.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/testman/webservice/index.php [iso-8859-1] Thu Jan 8 17:09:10 2009 @@ -24,7 +24,7 @@ // Entry point - if(!isset($_POST["username"]) || !isset($_POST["passwordhash"]) || !isset($_POST["testtype"])) + if(!isset($_POST["username"]) || !isset($_POST["password"]) || !isset($_POST["testtype"])) die("Necessary information not specified!"); // Check the login credentials @@ -38,9 +38,9 @@ die("Could not establish the DB connection"); } - $stmt = $dbh->prepare("SELECT user_id FROM " . DB_ROSCMS . ".users WHERE user_name = :username AND user_roscms_password = :passwordhash AND user_account_enabled = 'yes'"); + $stmt = $dbh->prepare("SELECT user_id FROM " . DB_ROSCMS . ".users WHERE user_name = :username AND user_roscms_password = MD5(:password) AND user_account_enabled = 'yes'"); $stmt->bindParam(":username", $_POST["username"]); - $stmt->bindParam(":passwordhash", $_POST["passwordhash"]); + $stmt->bindParam(":password", $_POST["password"]); $stmt->execute() or die("SQL failed #1"); $user_id = (int)$stmt->fetchColumn();

15 years, 8 months

[dchapyshev] 38654: - Fix regression of Dependency Walker See issue #3374 for more details.

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Thu Jan 8 14:49:11 2009 New Revision: 38654 URL: http://svn.reactos.org/svn/reactos?rev=38654&view=rev Log: - Fix regression of Dependency Walker See issue #3374 for more details. Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ac… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/actctx.c [iso-8859-1] Thu Jan 8 14:49:11 2009 @@ -191,8 +191,13 @@ ULONG_PTR ulCookie ) { + NTSTATUS Status; + DPRINT("DeactivateActCtx(%08lx %08lx)\n", dwFlags, ulCookie); - RtlDeactivateActivationContext(dwFlags, ulCookie); + Status = RtlDeactivateActivationContext(dwFlags, ulCookie); + + if (!NT_SUCCESS(Status)) return FALSE; + return TRUE; } Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=38654… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Thu Jan 8 14:49:11 2009 @@ -14,6 +14,19 @@ #include <debug.h> #define QUERY_ACTCTX_FLAG_ACTIVE (0x00000001) + +#define ACTCTX_FLAGS_ALL (\ + ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID |\ + ACTCTX_FLAG_LANGID_VALID |\ + ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID |\ + ACTCTX_FLAG_RESOURCE_NAME_VALID |\ + ACTCTX_FLAG_SET_PROCESS_DEFAULT |\ + ACTCTX_FLAG_APPLICATION_NAME_VALID |\ + ACTCTX_FLAG_SOURCE_IS_ASSEMBLYREF |\ + ACTCTX_FLAG_HMODULE_VALID ) + +#define ACTCTX_FAKE_HANDLE ((HANDLE) 0xf00baa) +#define ACTCTX_FAKE_COOKIE ((ULONG_PTR) 0xf00bad) /* FUNCTIONS ***************************************************************/ @@ -46,7 +59,10 @@ RtlGetActiveActivationContext(IN PVOID *Context) { UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + + *Context = ACTCTX_FAKE_HANDLE; + + return STATUS_SUCCESS; } VOID @@ -112,6 +128,10 @@ ULONG_PTR ulCookie) { UNIMPLEMENTED; + + if (ulCookie == ACTCTX_FAKE_COOKIE) + return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } @@ -128,13 +148,28 @@ RtlActivateActivationContext(IN ULONG Unknown, IN HANDLE Handle, OUT PULONG_PTR Cookie) { UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + + if (Cookie) + *Cookie = ACTCTX_FAKE_COOKIE; + + return STATUS_SUCCESS; } NTSTATUS NTAPI RtlCreateActivationContext(OUT PHANDLE Handle, IN OUT PVOID ReturnedData) { + PCACTCTXW pActCtx = (PCACTCTXW) ReturnedData; + UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + + if (!pActCtx) + *Handle = INVALID_HANDLE_VALUE; + if (pActCtx->cbSize != sizeof *pActCtx) + *Handle = INVALID_HANDLE_VALUE; + if (pActCtx->dwFlags & ~ACTCTX_FLAGS_ALL) + *Handle = INVALID_HANDLE_VALUE; + *Handle = ACTCTX_FAKE_HANDLE; + + return STATUS_SUCCESS; }

15 years, 8 months

[dchapyshev] 38653: - Sync ICO_ExtractIconExW with Wine head. This fixed exception in wine tests. All tests for PrivateExtractIconsA/W passed now

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Thu Jan 8 14:28:19 2009 New Revision: 38653 URL: http://svn.reactos.org/svn/reactos?rev=38653&view=rev Log: - Sync ICO_ExtractIconExW with Wine head. This fixed exception in wine tests. All tests for PrivateExtractIconsA/W passed now Modified: trunk/reactos/dll/win32/user32/misc/exticon.c Modified: trunk/reactos/dll/win32/user32/misc/exticon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/exti… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/exticon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/exticon.c [iso-8859-1] Thu Jan 8 14:28:19 2009 @@ -287,9 +287,9 @@ CloseHandle(fmapping); cx1 = LOWORD(cxDesired); - cx2 = HIWORD(cxDesired) ? HIWORD(cxDesired) : cx1; + cx2 = HIWORD(cxDesired); cy1 = LOWORD(cyDesired); - cy2 = HIWORD(cyDesired) ? HIWORD(cyDesired) : cy1; + cy2 = HIWORD(cyDesired); if (pIconId) /* Invalidate first icon identifier */ *pIconId = 0xFFFFFFFF; @@ -439,7 +439,7 @@ iconDirCount = icongroupresdir->NumberOfNamedEntries + icongroupresdir->NumberOfIdEntries; /* only number of icons requested */ - if( nIcons == 0 ) + if( !pIconId ) { ret = iconDirCount; goto end; /* success */ @@ -479,13 +479,13 @@ } /* assure we don't get too much */ - if( nIcons / 2 > iconDirCount - nIconIndex ) - nIcons = 2 * (iconDirCount - nIconIndex); + if( nIcons > iconDirCount - nIconIndex ) + nIcons = iconDirCount - nIconIndex; /* starting from specified index */ xresent = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(icongroupresdir+1) + nIconIndex; - for (i=0; i < nIcons; i++) + for (i=0; i < nIcons; i++,xresent++) { const IMAGE_RESOURCE_DIRECTORY *resdir; @@ -519,8 +519,8 @@ FIXME("no matching real address for icongroup!\n"); goto end; /* failure */ } - pIconId[i] = LookupIconIdFromDirectoryEx(igdata, TRUE, (i & 1) ? cx2 : cx1, (i & 1) ? cy2 : cy1, flags); - if (i & 1) xresent++; + pIconId[i] = LookupIconIdFromDirectoryEx(igdata, TRUE, cx1, cy1, flags); + if (cx2 && cy2) pIconId[++i] = LookupIconIdFromDirectoryEx(igdata, TRUE, cx2, cy2, flags); } if (!(iconresdir=find_entry_by_id(rootresdir,LOWORD(RT_ICON),rootresdir))) @@ -535,16 +535,16 @@ xresdir = find_entry_by_id(iconresdir, LOWORD(pIconId[i]), rootresdir); if (!xresdir) { - WARN("find_entry_by_id failed\n"); - ret = 0xFFFFFFFF; - goto end; + WARN("icon entry %d not found\n", LOWORD(pIconId[i])); + RetPtr[i]=0; + continue; } xresdir = find_entry_default(xresdir, rootresdir); if (!xresdir) { - WARN("find_entry_default failed\n"); - ret = 0xFFFFFFFF; - goto end; + WARN("icon entry %d not found\n", LOWORD(pIconId[i])); + RetPtr[i]=0; + continue; } idataent = (PIMAGE_RESOURCE_DATA_ENTRY)xresdir; idata = NULL; @@ -564,8 +564,9 @@ RetPtr[i]=0; continue; } - RetPtr[i] = (HICON) CreateIconFromResourceEx(idata,idataent->Size,TRUE,0x00030000, - (i & 1) ? cx2 : cx1, (i & 1) ? cy2 : cy1, flags); + RetPtr[i] = CreateIconFromResourceEx(idata, idataent->Size, TRUE, 0x00030000, cx1, cy1, flags); + if (cx2 && cy2) + RetPtr[++i] = CreateIconFromResourceEx(idata, idataent->Size, TRUE, 0x00030000, cx2, cy2, flags); } ret = i; /* return number of retrieved icons */ } /* if(sig == IMAGE_NT_SIGNATURE) */

15 years, 8 months

[dchapyshev] 38652: - Add Wine implementation LoadStringA/W. This is fixed all wine tests for LoadString

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Thu Jan 8 13:47:29 2009 New Revision: 38652 URL: http://svn.reactos.org/svn/reactos?rev=38652&view=rev Log: - Add Wine implementation LoadStringA/W. This is fixed all wine tests for LoadString Modified: trunk/reactos/dll/win32/user32/misc/resources.c Modified: trunk/reactos/dll/win32/user32/misc/resources.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/reso… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] Thu Jan 8 13:47:29 2009 @@ -20,223 +20,85 @@ static HINSTANCE hSetupApi = NULL; -BOOL -WINAPI -_InternalLoadString(HINSTANCE hInstance, - UINT uID, - PUNICODE_STRING pwstrDest) -{ - HRSRC hrsStringTable; - HGLOBAL hResource; - PWCHAR pStringTable; - unsigned i; - unsigned l = uID % 16; /* (1) */ - - /* parameter validation */ - if (IsBadWritePtr(pwstrDest, sizeof(UNICODE_STRING))) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* - find the string table. String tables are created by grouping, 16 by 16, string - resources whose identifiers, divided by 16, have the same integer quotient. - Holes in the numbering are filled with zero-length strings. String table ids - (actual resource ids) start from 1. See (1) and (2) - */ - /* TODO: some sort of cache, here, would be great */ - hrsStringTable = FindResourceW((HMODULE)hInstance, - MAKEINTRESOURCEW((uID / 16) + 1), /* (2) */ - RT_STRING); - - /* failure */ - if (hrsStringTable == NULL) return FALSE; - - /* load the string table into memory */ - hResource = LoadResource((HMODULE)hInstance, hrsStringTable); - - /* failure */ - if (hResource == NULL) return FALSE; - - /* lock the resource into memory */ - pStringTable = LockResource(hResource); - - /* failure */ - if (pStringTable == NULL) return FALSE; - - /* - string tables are packed Unicode Pascal strings. The first WCHAR contains the - length, in characters, of the current string. Zero-length strings, if any, are - placeholders for unused slots, and should therefore be considered non-present. - See also (3). Here, we walk all the strings before that of interest - */ - for(i = 0; i < l; ++ i) - { - /* skip the length and the current string */ - pStringTable += 1 + (*pStringTable); - } - - /* we've reached the string of interest */ - if ((*pStringTable) == 0) - { - /* the string is empty (unallocated) */ - SetLastError(ERROR_RESOURCE_NAME_NOT_FOUND); - return FALSE; /* 3 */ - } - - /* string length in bytes */ - pwstrDest->Length = pwstrDest->MaximumLength = (*pStringTable) * sizeof(WCHAR); - - /* string */ - pwstrDest->Buffer = pStringTable + 1; - - /* success */ - return TRUE; -} - - -/* - * @implemented + +/* + * @implemented (Synced with Wine 08.01.2009) */ int WINAPI -LoadStringA(HINSTANCE hInstance, - UINT uID, - LPSTR lpBuffer, - int nBufferMax) -{ - UNICODE_STRING wstrResStr; - ANSI_STRING strBuf; - INT retSize; - - /* parameter validation */ - - if (nBufferMax < 1) - { - return -1; - } - - if (IsBadWritePtr(lpBuffer, nBufferMax * sizeof(lpBuffer[0]))) - { - SetLastError(ERROR_INVALID_PARAMETER); +LoadStringA(HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen) +{ + HGLOBAL hmem; + HRSRC hrsrc; + DWORD retval = 0; + + if (!buflen) return -1; + + /* Use loword (incremented by 1) as resourceid */ + if ((hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), + (LPWSTR)RT_STRING )) && + (hmem = LoadResource( instance, hrsrc ))) + { + const WCHAR *p = LockResource(hmem); + unsigned int id = resource_id & 0x000f; + + while (id--) p += *p + 1; + + RtlUnicodeToMultiByteN( buffer, buflen - 1, &retval, (PWSTR)(p + 1), *p * sizeof(WCHAR) ); + } + buffer[retval] = 0; + return retval; +} + + +/* + * @implemented (Synced with Wine 08.01.2009) + */ +int +WINAPI +LoadStringW(HINSTANCE instance, UINT resource_id, LPWSTR buffer, INT buflen) +{ + HGLOBAL hmem; + HRSRC hrsrc; + WCHAR *p; + int string_num; + int i; + + if(buffer == NULL) return 0; - } - - /* get the UNICODE_STRING descriptor of the in-memory image of the string */ - if (!_InternalLoadString(hInstance, uID, &wstrResStr)) - { - /* failure */ + + /* Use loword (incremented by 1) as resourceid */ + hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), + (LPWSTR)RT_STRING ); + if (!hrsrc) return 0; + hmem = LoadResource( instance, hrsrc ); + if (!hmem) return 0; + + p = LockResource(hmem); + string_num = resource_id & 0x000f; + for (i = 0; i < string_num; i++) + p += *p + 1; + + /*if buflen == 0, then return a read-only pointer to the resource itself in buffer + it is assumed that buffer is actually a (LPWSTR *) */ + if(buflen == 0) + { + *((LPWSTR *)buffer) = p + 1; + return *p; + } + + i = min(buflen - 1, *p); + if (i > 0) { + memcpy(buffer, p + 1, i * sizeof (WCHAR)); + buffer[i] = 0; + } else { + if (buflen > 1) { + buffer[0] = 0; return 0; } - - /* - convert the string. The Unicode string may be in UTF-16 (multi-byte), so we - don't alter wstrResStr.Length, and let RtlUnicodeStringToAnsiString truncate - it, if necessary - */ - strBuf.Length = 0; - strBuf.MaximumLength = nBufferMax * sizeof(CHAR); - strBuf.Buffer = lpBuffer; - - retSize = WideCharToMultiByte(CP_ACP, - 0, - wstrResStr.Buffer, - wstrResStr.Length / sizeof(WCHAR), - strBuf.Buffer, - strBuf.MaximumLength, - NULL, - NULL); - - if (!retSize) - { - /* failure */ - return 0; - } - else - { - strBuf.Length = retSize; - } - - /* the ANSI string may not be null-terminated */ - if (strBuf.Length >= strBuf.MaximumLength) - { - /* length greater than the buffer? whatever */ - int nStringLen = strBuf.MaximumLength / sizeof(CHAR) - 1; - - /* zero the last character in the buffer */ - strBuf.Buffer[nStringLen] = 0; - - /* success */ - return nStringLen; - } - else - { - /* zero the last character in the string */ - strBuf.Buffer[strBuf.Length / sizeof(CHAR)] = 0; - - /* success */ - return strBuf.Length / sizeof(CHAR); - } -} - - -/* - * @implemented - */ -int -WINAPI -LoadStringW(HINSTANCE hInstance, - UINT uID, - LPWSTR lpBuffer, - int nBufferMax) -{ - UNICODE_STRING wstrResStr; - int nStringLen; - - /* parameter validation */ - if ((nBufferMax < 0) || (lpBuffer == NULL) || - ((nBufferMax > 0) && IsBadWritePtr(lpBuffer, nBufferMax * sizeof(lpBuffer[0]))) || - /* undocumented: If nBufferMax is 0, LoadStringW will copy a pointer to the - in-memory image of the string to the specified buffer and return the length - of the string in WCHARs */ - ((nBufferMax == 0) && IsBadWritePtr(lpBuffer, sizeof(lpBuffer)))) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - /* get the UNICODE_STRING descriptor of the in-memory image of the string */ - if (!_InternalLoadString(hInstance, uID, &wstrResStr)) - { - /* failure */ - return 0; - } - - /* get the length in characters */ - nStringLen = wstrResStr.Length / sizeof(WCHAR); - - if (nBufferMax > 0) - { - /* the buffer must be enough to contain the string and the null terminator */ - if (nBufferMax < (nStringLen + 1)) - { - /* otherwise, the string is truncated */ - nStringLen = nBufferMax - 1; - } - - /* copy the string */ - memcpy(lpBuffer, wstrResStr.Buffer, nStringLen * sizeof(WCHAR)); - - /* null-terminate it */ - lpBuffer[nStringLen] = 0; - } - else - { - *((LPWSTR*)lpBuffer) = wstrResStr.Buffer; - } - /* success */ - return nStringLen; + } + + return i; }

15 years, 8 months

[dchapyshev] 38651: - Fix NtUserCopyAcceleratorTable and NtUserCreateAcceleratorTable (ported from Wine). This is fixed 5 wine resources tests

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Thu Jan 8 13:35:29 2009 New Revision: 38651 URL: http://svn.reactos.org/svn/reactos?rev=38651&view=rev Log: - Fix NtUserCopyAcceleratorTable and NtUserCreateAcceleratorTable (ported from Wine). This is fixed 5 wine resources tests Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] Thu Jan 8 13:35:29 2009 @@ -293,31 +293,39 @@ int EntriesCount) { PACCELERATOR_TABLE Accel; - NTSTATUS Status; int Ret; + BOOL Done = FALSE; DECLARE_RETURN(int); DPRINT("Enter NtUserCopyAcceleratorTable\n"); UserEnterShared(); - if (!(Accel = UserGetAccelObject(hAccel))) + Accel = UserGetAccelObject(hAccel); + + if ((Entries && (EntriesCount < 1)) || ((hAccel == NULL) || (!Accel))) { RETURN(0); } - if(Entries) - { - Ret = min(EntriesCount, Accel->Count); - Status = MmCopyToCaller(Entries, Accel->Table, Ret * sizeof(ACCEL)); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN(0); - } - } - else - { - Ret = Accel->Count; + if (Accel->Count < EntriesCount) + EntriesCount = Accel->Count; + + Ret = 0; + + while (!Done) + { + if (Entries) + { + Entries[Ret].fVirt = Accel->Table[Ret].fVirt & 0x7f; + Entries[Ret].key = Accel->Table[Ret].key; + Entries[Ret].cmd = Accel->Table[Ret].cmd; + + if(Ret + 1 == EntriesCount) Done = TRUE; + } + + if((Accel->Table[Ret].fVirt & 0x80) != 0) Done = TRUE; + + Ret++; } RETURN(Ret); @@ -335,17 +343,18 @@ SIZE_T EntriesCount) { PACCELERATOR_TABLE Accel; - NTSTATUS Status; HACCEL hAccel; + INT Index; DECLARE_RETURN(HACCEL); DPRINT("Enter NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d)\n", Entries, EntriesCount); UserEnterExclusive(); - if (!Entries || !EntriesCount) - { - RETURN( (HACCEL) 0 ); + if (!Entries || EntriesCount < 1) + { + SetLastNtError(STATUS_INVALID_PARAMETER); + RETURN( (HACCEL) NULL ); } Accel = UserCreateObject(gHandleTable, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); @@ -353,7 +362,7 @@ if (Accel == NULL) { SetLastNtError(STATUS_NO_MEMORY); - RETURN( (HACCEL) 0 ); + RETURN( (HACCEL) NULL ); } Accel->Count = EntriesCount; @@ -365,18 +374,21 @@ UserDereferenceObject(Accel); UserDeleteObject(hAccel, otAccel); SetLastNtError(STATUS_NO_MEMORY); - RETURN( (HACCEL) 0); - } - - Status = MmCopyFromCaller(Accel->Table, Entries, EntriesCount * sizeof(ACCEL)); - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(Accel->Table, TAG_ACCEL); - UserDereferenceObject(Accel); - UserDeleteObject(hAccel, otAccel); - SetLastNtError(Status); - RETURN((HACCEL) 0); - } + RETURN( (HACCEL) NULL); + } + + for (Index = 0; Index < EntriesCount; Index++) + { + Accel->Table[Index].fVirt = Entries[Index].fVirt&0x7f; + if(Accel->Table[Index].fVirt & FVIRTKEY) + { + Accel->Table[Index].key = Entries[Index].key; + } + Accel->Table[Index].cmd = Entries[Index].cmd; + } + + /* Set the end-of-table terminator. */ + Accel->Table[EntriesCount - 1].fVirt |= 0x80; } /* FIXME: Save HandleTable in a list somewhere so we can clean it up again */

15 years, 8 months

← Newer
1
...
57
58
59
60
61
62
63
...
76
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009