Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 24998: - implement 'blur' and 'sharpness' - implement 'contrast' allowing for separate adjustment of RGB colours - Decorate the contrast / blur function names to make GCC happy. These functions will be merged at a later stage - implement fading in and out of the floating windows. To activate, hover your cursor over one of the windows, then away again. Only works in Windows, ROS has missing translucency functionality at the moment.
by gedmurphy＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: gedmurphy Date: Thu Nov 30 22:02:14 2006 New Revision: 24998 URL: http://svn.reactos.org/svn/reactos?rev=24998&view=rev Log: - implement 'blur' and 'sharpness' - implement 'contrast' allowing for separate adjustment of RGB colours - Decorate the contrast / blur function names to make GCC happy. These functions will be merged at a later stage - implement fading in and out of the floating windows. To activate, hover your cursor over one of the windows, then away again. Only works in Windows, ROS has missing translucency functionality at the moment. Added: trunk/reactos/base/applications/imagesoft/contrast.c Modified: trunk/reactos/base/applications/imagesoft/adjust.c trunk/reactos/base/applications/imagesoft/brightness.c trunk/reactos/base/applications/imagesoft/floatwindow.c trunk/reactos/base/applications/imagesoft/imageprop.h trunk/reactos/base/applications/imagesoft/imagesoft.rbuild trunk/reactos/base/applications/imagesoft/lang/en-US.rc trunk/reactos/base/applications/imagesoft/mainwnd.c trunk/reactos/base/applications/imagesoft/precomp.h trunk/reactos/base/applications/imagesoft/resource.h Modified: trunk/reactos/base/applications/imagesoft/adjust.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/adjust.c (original) +++ trunk/reactos/base/applications/imagesoft/adjust.c Thu Nov 30 22:02:14 2006 @@ -61,13 +61,13 @@ g = GetGValue(Val); r = GetBValue(Val); - // get the average color value - Val = (r+g+b)/3; - - // assign to RGB color + /* get the average color value */ + Val = (r + g + b) / 3; + + /* assign to RGB color */ Val = RGB(Val, Val, Val); - CopyMemory(&pBits[Count], - &Val, + CopyMemory(&pBits[Count], + &Val, 4); Count+=4; @@ -156,11 +156,11 @@ b = 255 - GetRValue(Val); g = 255 - GetGValue(Val); r = 255 - GetBValue(Val); - + Val = RGB(b, g, r); - CopyMemory(&pBits[Count], - &Val, + CopyMemory(&pBits[Count], + &Val, 4); Count+=4; @@ -189,3 +189,337 @@ return TRUE; } + + + +BOOL +DisplayBlur(HWND hwnd, + HDC hdcMem, + HBITMAP hBitmap) +{ + BITMAPINFO bi; + BITMAP bitmap; + BOOL bRes; + DWORD Count = 0; + INT i, j; + PBYTE pBits, pBitsTemp; + RECT rc; + + GetObject(hBitmap, + sizeof(BITMAP), + &bitmap); + + /* Bitmap header */ + bi.bmiHeader.biSize = sizeof(bi.bmiHeader); + bi.bmiHeader.biWidth = bitmap.bmWidth; + bi.bmiHeader.biHeight = bitmap.bmHeight; + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = 32; + bi.bmiHeader.biCompression = BI_RGB; + bi.bmiHeader.biSizeImage = bitmap.bmWidth * bitmap.bmHeight * 4; + bi.bmiHeader.biClrUsed = 0; + bi.bmiHeader.biClrImportant = 0; + + /* Buffer */ + pBits = (PBYTE)HeapAlloc(ProcessHeap, + 0, + bitmap.bmWidth * bitmap.bmHeight * 4); + pBitsTemp = (PBYTE)HeapAlloc(ProcessHeap, + 0, + bitmap.bmWidth * bitmap.bmHeight * 4); + if (!pBits || !pBitsTemp) + return FALSE; + + /* get the bits from the original bitmap */ + bRes = GetDIBits(hdcMem, + hBitmap, + 0, + bitmap.bmHeight, + pBits, + &bi, + DIB_RGB_COLORS); + + for (i = 0; i < bitmap.bmHeight; i++) + { + for (j = 0; j < bitmap.bmWidth; j++) + { + LONG Val = 0; + INT b, g, r; + INT c1, c2, c3, c4, c5; + + CopyMemory(&Val, + &pBits[Count], + 4); + + b = GetRValue(Val); + g = GetGValue(Val); + r = GetBValue(Val); + + c1 = r; + /* Red */ + if ((Count < ((bitmap.bmHeight - 1) * bitmap.bmWidth * 4lu)) && + (Count > (bitmap.bmWidth * 4lu))) + { + CopyMemory(&Val, &pBits[Count - (bitmap.bmWidth * 4)], 4); + c2 = GetBValue(Val); + + CopyMemory(&Val, &pBits[Count + 4], 4); + c3 = GetBValue(Val); + + CopyMemory(&Val, &pBits[(Count + (bitmap.bmWidth * 4))], 4); + c4 = GetBValue(Val); + + CopyMemory(&Val, &pBits[Count - 4], 4); + c5 = GetBValue(Val); + + r = (c1 + c2 + c3 + c4 + c5) / 5; + } + + /* Green */ + c1 = g; + if ((Count < ((bitmap.bmHeight - 1) * bitmap.bmWidth * 4lu)) && + (Count > (bitmap.bmWidth * 4lu))) + { + CopyMemory(&Val, &pBits[(Count - (bitmap.bmWidth * 4lu))], 4); + c2 = GetGValue(Val); + + CopyMemory(&Val, &pBits[Count + 4], 4); + c3 = GetGValue(Val); + + CopyMemory(&Val, &pBits[(Count + (bitmap.bmWidth * 4lu))], 4); + c4 = GetGValue(Val); + + CopyMemory(&Val, &pBits[Count-4], 4); + c5 = GetGValue(Val); + + g = (c1 + c2 + c3 + c4 + c5) / 5; + } + + /* Blue */ + c1 = b; + if ((Count < ((bitmap.bmHeight - 1) * bitmap.bmWidth * 4lu)) && + (Count > (bitmap.bmWidth * 4lu))) + { + CopyMemory(&Val, &pBits[(Count - (bitmap.bmWidth * 4l))], 4); + c2 = GetRValue(Val); + + CopyMemory(&Val, &pBits[Count + 4], 4); + c3 = GetRValue(Val); + + CopyMemory(&Val, &pBits[(Count + (bitmap.bmWidth * 4l))], 4); + c4 = GetRValue(Val); + + CopyMemory(&Val, &pBits[Count-4], 4); + c5 = GetRValue(Val); + + b = (c1 + c2 + c3 + c4 + c5) / 5; + } + + Val = RGB(b, g, r); + + CopyMemory(&pBitsTemp[Count], + &Val, + 4); + + Count+=4; + } + } + + /* Set the new pixel bits */ + SetDIBits(hdcMem, + hBitmap, + 0, + bRes, + pBitsTemp, + &bi, + DIB_RGB_COLORS); + + HeapFree(ProcessHeap, + 0, + pBits); + HeapFree(ProcessHeap, + 0, + pBitsTemp); + + GetClientRect(hwnd, + &rc); + + InvalidateRect(hwnd, + &rc, + FALSE); + + return TRUE; +} + + + +BOOL +DisplaySharpness(HWND hwnd, + HDC hdcMem, + HBITMAP hBitmap) +{ + BITMAPINFO bi; + BITMAP bitmap; + BOOL bRes; + DWORD Count = 0; + INT i, j; + PBYTE pBits, pBitsTemp; + RECT rc; + + GetObject(hBitmap, + sizeof(BITMAP), + &bitmap); + + /* Bitmap header */ + bi.bmiHeader.biSize = sizeof(bi.bmiHeader); + bi.bmiHeader.biWidth = bitmap.bmWidth; + bi.bmiHeader.biHeight = bitmap.bmHeight; + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = 32; + bi.bmiHeader.biCompression = BI_RGB; + bi.bmiHeader.biSizeImage = bitmap.bmWidth * bitmap.bmHeight * 4; + bi.bmiHeader.biClrUsed = 0; + bi.bmiHeader.biClrImportant = 0; + + /* Buffer */ + pBits = (PBYTE)HeapAlloc(ProcessHeap, + 0, + bitmap.bmWidth * bitmap.bmHeight * 4); + pBitsTemp = (PBYTE)HeapAlloc(ProcessHeap, + 0, + bitmap.bmWidth * bitmap.bmHeight * 4); + if (!pBits || !pBitsTemp) + return FALSE; + + /* get the bits from the original bitmap */ + bRes = GetDIBits(hdcMem, + hBitmap, + 0, + bitmap.bmHeight, + pBits, + &bi, + DIB_RGB_COLORS); + + for (i = 0; i < bitmap.bmHeight; i++) + { + for (j = 0; j < bitmap.bmWidth; j++) + { + LONG Val = 0; + INT b, g, r; + INT c1, c2, c3, c4, c5; + + CopyMemory(&Val, + &pBits[Count], + 4); + + b = GetRValue(Val); + g = GetGValue(Val); + r = GetBValue(Val); + + c1 = r; + /* Red */ + if ((Count < ((bitmap.bmHeight - 1) * bitmap.bmWidth * 4lu)) && + (Count > (bitmap.bmWidth * 4lu))) + { + CopyMemory(&Val, &pBits[Count - (bitmap.bmWidth * 4l)], 4); + c2 = GetBValue(Val); + + CopyMemory(&Val, &pBits[Count + 4], 4); + c3 = GetBValue(Val); + + CopyMemory(&Val, &pBits[(Count + (bitmap.bmWidth * 4l))], 4); + c4 = GetBValue(Val); + + CopyMemory(&Val, &pBits[Count - 4], 4); + c5 = GetBValue(Val); + + r = (c1 * 5) - (c2 + c3 + c4 + c5); + } + + /* Green */ + c1 = g; + if ((Count < ((bitmap.bmHeight - 1)* bitmap.bmWidth * 4lu)) && + (Count > (bitmap.bmWidth * 4lu))) + { + CopyMemory(&Val, &pBits[(Count - (bitmap.bmWidth * 4l))], 4); + c2 = GetGValue(Val); + + CopyMemory(&Val, &pBits[Count + 4], 4); + c3 = GetGValue(Val); + + CopyMemory(&Val, &pBits[(Count + (bitmap.bmWidth * 4l))], 4); + c4 = GetGValue(Val); + + CopyMemory(&Val, &pBits[Count - 4], 4); + c5 = GetGValue(Val); + + g = (c1 * 5) - (c2 + c3 + c4 + c5); + } + + /* Blue */ + c1 = b; + if ((Count < ((bitmap.bmHeight - 1) * bitmap.bmWidth * 4lu)) && + (Count > (bitmap.bmWidth * 4lu))) + { + CopyMemory(&Val, &pBits[(Count - (bitmap.bmWidth * 4l))], 4); + c2 = GetRValue(Val); + + CopyMemory(&Val, &pBits[Count + 4], 4); + c3 = GetRValue(Val); + + CopyMemory(&Val, &pBits[(Count+(bitmap.bmWidth * 4l))], 4); + c4 = GetRValue(Val); + + CopyMemory(&Val, &pBits[Count - 4], 4); + c5 = GetRValue(Val); + + b = (c1 * 5) - (c2 + c3 + c4 + c5); + } + + /* Red */ + if (r > 255) r = 255; + if (r < 0) r = 0; + + /* Green */ + if (g > 255) g = 255; + if (g < 0)g = 0; + + /* Blue */ + if (b > 255) b = 255; + if (b < 0) b = 0; + + Val = RGB(b, g, r); + + CopyMemory(&pBitsTemp[Count], + &Val, + 4); + + Count+=4; + } + } + + /* Set the new pixel bits */ + SetDIBits(hdcMem, + hBitmap, + 0, + bRes, + pBitsTemp, + &bi, + DIB_RGB_COLORS); + + HeapFree(ProcessHeap, + 0, + pBits); + HeapFree(ProcessHeap, + 0, + pBitsTemp); + + GetClientRect(hwnd, + &rc); + + InvalidateRect(hwnd, + &rc, + FALSE); + + return TRUE; +} Modified: trunk/reactos/base/applications/imagesoft/brightness.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/brightness.c (original) +++ trunk/reactos/base/applications/imagesoft/brightness.c Thu Nov 30 22:02:14 2006 @@ -116,7 +116,7 @@ static PIMAGEADJUST -OnInitDialog(PIMAGEADJUST pImgAdj, +Bri_OnInitDialog(PIMAGEADJUST pImgAdj, HWND hDlg, LPARAM lParam) { @@ -188,7 +188,7 @@ static VOID -OnDrawItem(PIMAGEADJUST pImgAdj, +Bri_OnDrawItem(PIMAGEADJUST pImgAdj, LPARAM lParam) { LPDRAWITEMSTRUCT lpDrawItem; @@ -219,7 +219,7 @@ static VOID -OnTrackBar(PIMAGEADJUST pImgAdj, +Bri_OnTrackBar(PIMAGEADJUST pImgAdj, HWND hDlg) { HDC hdcMem; @@ -268,7 +268,7 @@ static BOOL -OnCommand(PIMAGEADJUST pImgAdj, +Bri_OnCommand(PIMAGEADJUST pImgAdj, HWND hDlg, UINT uID) { @@ -321,9 +321,9 @@ { case WM_INITDIALOG: { - pImgAdj = OnInitDialog(pImgAdj, - hDlg, - lParam); + pImgAdj = Bri_OnInitDialog(pImgAdj, + hDlg, + lParam); if (!pImgAdj) { EndDialog(hDlg, -1); @@ -335,8 +335,8 @@ case WM_DRAWITEM: { - OnDrawItem(pImgAdj, - lParam); + Bri_OnDrawItem(pImgAdj, + lParam); return TRUE; } @@ -345,8 +345,8 @@ if (LOWORD(wParam) == TB_THUMBTRACK || LOWORD(wParam) == TB_ENDTRACK) { - OnTrackBar(pImgAdj, - hDlg); + Bri_OnTrackBar(pImgAdj, + hDlg); } return TRUE; @@ -354,9 +354,9 @@ case WM_COMMAND: { - return OnCommand(pImgAdj, - hDlg, - LOWORD(wParam)); + return Bri_OnCommand(pImgAdj, + hDlg, + LOWORD(wParam)); } case WM_DESTROY: Added: trunk/reactos/base/applications/imagesoft/contrast.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/contrast.c (added) +++ trunk/reactos/base/applications/imagesoft/contrast.c Thu Nov 30 22:02:14 2006 @@ -1,0 +1,380 @@ +#include "precomp.h" + +#define BASECOLOUR 100 + + +VOID +AdjustContrast(HBITMAP hOrigBitmap, + HBITMAP hNewBitmap, + HWND hwnd, + HDC hdcMem, + INT RedVal, + INT GreenVal, + INT BlueVal) +{ + BITMAPINFO bi; + BITMAP bitmap; + BOOL bRes; + DWORD Count = 0; + INT i, j; + PBYTE pBits; + RECT rc; + + GetObject(hNewBitmap, + sizeof(BITMAP), + &bitmap); + + /* Bitmap header */ + bi.bmiHeader.biSize = sizeof(bi.bmiHeader); + bi.bmiHeader.biWidth = bitmap.bmWidth; + bi.bmiHeader.biHeight = bitmap.bmHeight; + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = 32; + bi.bmiHeader.biCompression = BI_RGB; + bi.bmiHeader.biSizeImage = bitmap.bmWidth * bitmap.bmHeight * 4; + bi.bmiHeader.biClrUsed = 0; + bi.bmiHeader.biClrImportant = 0; + + /* Buffer */ + pBits = (PBYTE)HeapAlloc(ProcessHeap, + 0, + bitmap.bmWidth * bitmap.bmHeight * 4); + if (!pBits) + return; + + /* get the bits from the original bitmap */ + bRes = GetDIBits(hdcMem, + hOrigBitmap, + 0, + bitmap.bmHeight, + pBits, + &bi, + DIB_RGB_COLORS); + + for (i = 0; i < bitmap.bmHeight; i++) + { + for (j = 0; j < bitmap.bmWidth; j++) + { + DWORD Val = 0; + INT b, g, r; + + CopyMemory(&Val, + &pBits[Count], + 4); + + /* Get pixels in reverse order */ + b = GetRValue(Val); + g = GetGValue(Val); + r = GetBValue(Val); + + r = ((r - 128) * RedVal) / 100 + 128; + g = ((g - 128) * GreenVal) / 100 + 128; + b = ((b - 128) * BlueVal) / 100 + 128; + + /* Red */ + if (r > 255) r = 255; + else if (r < 0) r = 0; + + /* Green */ + if (g > 255) g = 255; + else if (g < 0) g = 0; + + /* Blue */ + if (b > 255) b = 255; + else if (b < 0) b = 0; + + /* Store in reverse order */ + Val = RGB(b, g, r); + CopyMemory(&pBits[Count], + &Val, + 4); + + /* RGB color take 4 bytes.The high-order byte must be zero */ + Count += 4; + } + } + + /* Set the new pixel bits */ + SetDIBits(hdcMem, + hNewBitmap, + 0, + bRes, + pBits, + &bi, + DIB_RGB_COLORS); + + HeapFree(ProcessHeap, + 0, + pBits); + + GetClientRect(hwnd, + &rc); + + InvalidateRect(hwnd, + &rc, + FALSE); +} + + +static PIMAGEADJUST +Cont_OnInitDialog(PIMAGEADJUST pImgAdj, + HWND hDlg, + LPARAM lParam) +{ + pImgAdj = HeapAlloc(ProcessHeap, + 0, + sizeof(IMAGEADJUST)); + if (!pImgAdj) + return NULL; + + + pImgAdj->Info = (PMAIN_WND_INFO)lParam; + if (!pImgAdj->Info->ImageEditors) + goto fail; + + + pImgAdj->hPicPrev = GetDlgItem(hDlg, IDC_PICPREVIEW); + GetClientRect(pImgAdj->hPicPrev, + &pImgAdj->ImageRect); + + /* Make a static copy of the main image */ + pImgAdj->hBitmap = CopyImage(pImgAdj->Info->ImageEditors->hBitmap, + IMAGE_BITMAP, + pImgAdj->ImageRect.right, + pImgAdj->ImageRect.bottom, + LR_CREATEDIBSECTION); + if (!pImgAdj->hBitmap) + goto fail; + + /* Make a copy which will be updated */ + pImgAdj->hPreviewBitmap = CopyImage(pImgAdj->Info->ImageEditors->hBitmap, + IMAGE_BITMAP, + pImgAdj->ImageRect.right, + pImgAdj->ImageRect.bottom, + LR_CREATEDIBSECTION); + if (!pImgAdj->hPreviewBitmap) + goto fail; + + + pImgAdj->RedVal = pImgAdj->BlueVal = pImgAdj->GreenVal = 100; + + /* setup dialog */ + SendDlgItemMessage(hDlg, + IDC_BRI_FULL, + BM_SETCHECK, + BST_CHECKED, + 0); + SendDlgItemMessage(hDlg, + IDC_BRI_TRACKBAR, + TBM_SETRANGE, + TRUE, + (LPARAM)MAKELONG(0, 200)); + SendDlgItemMessage(hDlg, + IDC_BRI_TRACKBAR, + TBM_SETPOS, + TRUE, + (LPARAM)BASECOLOUR); + SetDlgItemText(hDlg, + IDC_BRI_EDIT, + _T("100")); + + return pImgAdj; + +fail: + HeapFree(ProcessHeap, + 0, + pImgAdj); + return NULL; +} + + +static VOID +Cont_OnDrawItem(PIMAGEADJUST pImgAdj, + LPARAM lParam) +{ + LPDRAWITEMSTRUCT lpDrawItem; + HDC hdcMem; + + lpDrawItem = (LPDRAWITEMSTRUCT)lParam; + + hdcMem = CreateCompatibleDC(lpDrawItem->hDC); + + if(lpDrawItem->CtlID == IDC_PICPREVIEW) + { + SelectObject(hdcMem, + pImgAdj->hPreviewBitmap); + + BitBlt(lpDrawItem->hDC, + pImgAdj->ImageRect.left, + pImgAdj->ImageRect.top, + pImgAdj->ImageRect.right, + pImgAdj->ImageRect.bottom, + hdcMem, + 0, + 0, + SRCCOPY); + + DeleteDC(hdcMem); + } +} + + +static VOID +Cont_OnTrackBar(PIMAGEADJUST pImgAdj, + HWND hDlg) +{ + HDC hdcMem; + DWORD TrackPos; + + TrackPos = (DWORD)SendDlgItemMessage(hDlg, + IDC_BRI_TRACKBAR, + TBM_GETPOS, + 0, + 0); + + SetDlgItemInt(hDlg, + IDC_BRI_EDIT, + TrackPos, + FALSE); + + if (IsDlgButtonChecked(hDlg, IDC_BRI_FULL) == BST_CHECKED) + { + pImgAdj->RedVal = pImgAdj->GreenVal = pImgAdj->BlueVal = TrackPos - BASECOLOUR + 100; + } + else if (IsDlgButtonChecked(hDlg, IDC_BRI_RED) == BST_CHECKED) + { + pImgAdj->RedVal = TrackPos - BASECOLOUR + 100; + } + else if (IsDlgButtonChecked(hDlg, IDC_BRI_GREEN) == BST_CHECKED) + { + pImgAdj->GreenVal = TrackPos - BASECOLOUR + 100; + } + else if (IsDlgButtonChecked(hDlg, IDC_BRI_BLUE) == BST_CHECKED) + { + pImgAdj->BlueVal = TrackPos - BASECOLOUR + 100; + } + + hdcMem = GetDC(pImgAdj->hPicPrev); + + AdjustContrast(pImgAdj->hBitmap, + pImgAdj->hPreviewBitmap, + pImgAdj->hPicPrev, + hdcMem, + pImgAdj->RedVal, + pImgAdj->GreenVal, + pImgAdj->BlueVal); + + ReleaseDC(pImgAdj->hPicPrev, hdcMem); +} + + +static BOOL +Cont_OnCommand(PIMAGEADJUST pImgAdj, + HWND hDlg, + UINT uID) +{ + switch (uID) + { + case IDOK: + { + HDC hdcMem; + + hdcMem = GetDC(pImgAdj->Info->ImageEditors->hSelf); + + AdjustContrast(pImgAdj->Info->ImageEditors->hBitmap, + pImgAdj->Info->ImageEditors->hBitmap, + pImgAdj->Info->ImageEditors->hSelf, + hdcMem, + pImgAdj->RedVal, + pImgAdj->GreenVal, + pImgAdj->BlueVal); + + ReleaseDC(pImgAdj->Info->ImageEditors->hSelf, + hdcMem); + + EndDialog(hDlg, + uID); + + return TRUE; + } + + case IDCANCEL: + { + EndDialog(hDlg, + uID); + return TRUE; + } + } + + return FALSE; +} + + +INT_PTR CALLBACK +ContrastProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + static PIMAGEADJUST pImgAdj = NULL; + + switch (message) + { + case WM_INITDIALOG: + { + pImgAdj = Cont_OnInitDialog(pImgAdj, + hDlg, + lParam); + if (!pImgAdj) + { + EndDialog(hDlg, -1); + return FALSE; + } + + return TRUE; + } + + case WM_DRAWITEM: + { + Cont_OnDrawItem(pImgAdj, + lParam); + return TRUE; + } + + case WM_HSCROLL: + { + if (LOWORD(wParam) == TB_THUMBTRACK || + LOWORD(wParam) == TB_ENDTRACK) + { + Cont_OnTrackBar(pImgAdj, + hDlg); + } + + return TRUE; + } + + case WM_COMMAND: + { + return Cont_OnCommand(pImgAdj, + hDlg, + LOWORD(wParam)); + } + + case WM_DESTROY: + { + if (pImgAdj) + { + if (pImgAdj->hBitmap) + DeleteObject(pImgAdj->hBitmap); + if (pImgAdj->hPreviewBitmap) + DeleteObject(pImgAdj->hPreviewBitmap); + + HeapFree(ProcessHeap, + 0, + pImgAdj); + } + } + } + + return FALSE; +} Modified: trunk/reactos/base/applications/imagesoft/floatwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/floatwindow.c (original) +++ trunk/reactos/base/applications/imagesoft/floatwindow.c Thu Nov 30 22:02:14 2006 @@ -1,8 +1,10 @@ -#include <precomp.h> +#include "precomp.h" static const TCHAR szFloatWndClass[] = TEXT("ImageSoftFloatWndClass"); -#define ID_TIMER 1 +#define ID_TIMER1 1 +#define ID_TIMER2 2 +#define ID_TIMER3 3 TBBUTTON ToolsButtons[] = { /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ @@ -338,6 +340,116 @@ return FALSE; } + +static VOID +DoTimer(PFLT_WND FltInfo, + UINT idTimer) +{ + switch (idTimer) + { + /* timer to check if cursor is in toolbar coords */ + case ID_TIMER1: + { + POINT pt; + + /* kill timer if toobar is not opaque */ + if (FltInfo->bOpaque != TRUE) + { + KillTimer(FltInfo->hSelf, + ID_TIMER1); + break; + } + + if (GetCursorPos(&pt)) + { + RECT rect; + + if (GetWindowRect(FltInfo->hSelf, + &rect)) + { + if (!PtInRect(&rect, + pt)) + { + KillTimer(FltInfo->hSelf, + ID_TIMER1); + KillTimer(FltInfo->hSelf, + ID_TIMER2); + + /* timer to fade out toolbar */ + SetTimer(FltInfo->hSelf, + ID_TIMER3, + 50, + NULL); + } + } + } + } + break; + + /* timer to fade in toolbar */ + case ID_TIMER2: + { + SetLayeredWindowAttributes(FltInfo->hSelf, + 0, + (255 * FltInfo->Transparancy) / 100, + LWA_ALPHA); + + /* increment transparancy until it is opaque (100) */ + FltInfo->Transparancy += 5; + + if (FltInfo->Transparancy == 100) + { + SetWindowLongPtr(FltInfo->hSelf, + GWL_EXSTYLE, + GetWindowLongPtr(FltInfo->hSelf, + GWL_EXSTYLE) & ~WS_EX_LAYERED); + + FltInfo->bOpaque = TRUE; + + KillTimer(FltInfo->hSelf, + ID_TIMER2); + } + } + break; + + case ID_TIMER3: + { + LONG Style; + + Style = GetWindowLongPtr(FltInfo->hSelf, + GWL_EXSTYLE); + + if (Style & ~WS_EX_LAYERED) + { + SetWindowLongPtr(FltInfo->hSelf, + GWL_EXSTYLE, + Style | WS_EX_LAYERED); + } + + FltInfo->Transparancy -= 5; + + if (FltInfo->Transparancy >= 60) + { + /* set the tranclucency to 60% */ + SetLayeredWindowAttributes(FltInfo->hSelf, + 0, + (255 * FltInfo->Transparancy) / 100, + LWA_ALPHA); + + if (FltInfo->Transparancy == 60) + { + FltInfo->bOpaque = FALSE; + + KillTimer(FltInfo->hSelf, + ID_TIMER3); + } + + } + } + break; + } +} + LRESULT CALLBACK FloatToolbarWndProc(HWND hwnd, UINT Message, @@ -363,6 +475,10 @@ /*FIXME: read this from registry */ // FltInfo->bShow = TRUE; + SetWindowLongPtr(hwnd, + GWLP_USERDATA, + (LONG_PTR)FltInfo); + FltInfo->bOpaque = FALSE; SetWindowLongPtr(hwnd, @@ -371,53 +487,18 @@ GWL_EXSTYLE) | WS_EX_LAYERED); /* set the tranclucency to 60% */ + FltInfo->Transparancy = 60; SetLayeredWindowAttributes(hwnd, 0, - (255 * 60) / 100, + (255 * FltInfo->Transparancy) / 100, LWA_ALPHA); } break; case WM_TIMER: { - POINT pt; - - if (FltInfo->bOpaque != TRUE) - { - KillTimer(hwnd, - ID_TIMER); - break; - } - - if (GetCursorPos(&pt)) - { - RECT rect; - - if (GetWindowRect(hwnd, - &rect)) - { - if (! PtInRect(&rect, - pt)) - { - KillTimer(hwnd, - ID_TIMER); - - FltInfo->bOpaque = FALSE; - - SetWindowLongPtr(hwnd, - GWL_EXSTYLE, - GetWindowLongPtr(hwnd, - GWL_EXSTYLE) | WS_EX_LAYERED); - - /* set the tranclucency to 60% */ - SetLayeredWindowAttributes(hwnd, - 0, - (255 * 60) / 100, - LWA_ALPHA); - - } - } - } + DoTimer(FltInfo, + wParam); } break; @@ -426,10 +507,6 @@ { if (FltInfo->bOpaque == FALSE) { - SetWindowLongPtr(hwnd, - GWL_EXSTYLE, - GetWindowLongPtr(hwnd, - GWL_EXSTYLE) & ~WS_EX_LAYERED); RedrawWindow(hwnd, NULL, @@ -437,10 +514,18 @@ RDW_ERASE | RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN); FltInfo->bOpaque = TRUE; - MessageBox(NULL, _T("in"), _T("Hit test"), MB_OK | MB_ICONEXCLAMATION); + //MessageBox(NULL, _T("in"), _T("Hit test"), MB_OK | MB_ICONEXCLAMATION); + + /* timer to check if cursor is in toolbar coords */ SetTimer(hwnd, - ID_TIMER, + ID_TIMER1, 200, + NULL); + + /* timer to fade in the toolbars */ + SetTimer(hwnd, + ID_TIMER2, + 50, NULL); } } @@ -541,3 +626,4 @@ hInstance); } + Modified: trunk/reactos/base/applications/imagesoft/imageprop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imageprop.h (original) +++ trunk/reactos/base/applications/imagesoft/imageprop.h Thu Nov 30 22:02:14 2006 @@ -22,6 +22,11 @@ WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ContrastProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam); + VOID AdjustBrightness(HBITMAP hOrigBitmap, HBITMAP hNewBitmap, HWND hwnd, @@ -30,5 +35,15 @@ INT GreenVal, INT BlueVal); -BOOL DisplayBlackAndWhite(HWND hwnd, HDC hdcMem, HBITMAP hBitmap); -BOOL DisplayInvertedColors(HWND hwnd, HDC hdcMem, HBITMAP hBitmap); +BOOL DisplayBlackAndWhite(HWND hwnd, + HDC hdcMem, + HBITMAP hBitmap); +BOOL DisplayInvertedColors(HWND hwnd, + HDC hdcMem, + HBITMAP hBitmap); +BOOL DisplayBlur(HWND hwnd, + HDC hdcMem, + HBITMAP hBitmap); +BOOL DisplaySharpness(HWND hwnd, + HDC hdcMem, + HBITMAP hBitmap); Modified: trunk/reactos/base/applications/imagesoft/imagesoft.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.rbuild (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.rbuild Thu Nov 30 22:02:14 2006 @@ -19,6 +19,7 @@ <file>about.c</file> <file>adjust.c</file> <file>brightness.c</file> + <file>contrast.c</file> <file>custcombo.c</file> <file>floatwindow.c</file> <file>font.c</file> Modified: trunk/reactos/base/applications/imagesoft/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/lang/en-US.rc (original) +++ trunk/reactos/base/applications/imagesoft/lang/en-US.rc Thu Nov 30 22:02:14 2006 @@ -50,14 +50,14 @@ MENUITEM "Brightness...", ID_BRIGHTNESS MENUITEM "Contrast...", -1, GRAYED MENUITEM "Hue/Saturation...", -1, GRAYED - POPUP "Color" + POPUP "Colour" BEGIN MENUITEM "Black and White" ID_BLACKANDWHITE - MENUITEM "Invert Colors" ID_INVERTCOLORS + MENUITEM "Invert Colours" ID_INVERTCOLORS END MENUITEM SEPARATOR - MENUITEM "Blur", -1, GRAYED - MENUITEM "Sharpen", -1, GRAYED + MENUITEM "Blur", ID_BLUR + MENUITEM "Sharpen", ID_SHARPEN MENUITEM "Smooth Edges", -1, GRAYED MENUITEM "Add Shadow", -1, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/imagesoft/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/mainwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/mainwnd.c Thu Nov 30 22:02:14 2006 @@ -904,7 +904,15 @@ Info->hSelf, BrightnessProc, (LPARAM)Info); - break; + break; + + case ID_CONTRAST: + DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_BRIGHTNESS), + Info->hSelf, + ContrastProc, + (LPARAM)Info); + break; case ID_BLACKANDWHITE: { @@ -925,7 +933,29 @@ Info->ImageEditors->hDCMem, Info->ImageEditors->hBitmap); } - } + } + break; + + case ID_BLUR: + { + if (Info->ImageEditors) + { + DisplayBlur(Info->ImageEditors->hSelf, + Info->ImageEditors->hDCMem, + Info->ImageEditors->hBitmap); + } + } + break; + + case ID_SHARPEN: + { + if (Info->ImageEditors) + { + DisplaySharpness(Info->ImageEditors->hSelf, + Info->ImageEditors->hDCMem, + Info->ImageEditors->hBitmap); + } + } break; case ID_EXIT: Modified: trunk/reactos/base/applications/imagesoft/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/precomp.h (original) +++ trunk/reactos/base/applications/imagesoft/precomp.h Thu Nov 30 22:02:14 2006 @@ -49,6 +49,7 @@ INT y; INT Width; INT Height; + INT Transparancy; BOOL bOpaque; } FLT_WND, *PFLT_WND; Modified: trunk/reactos/base/applications/imagesoft/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/resource.h (original) +++ trunk/reactos/base/applications/imagesoft/resource.h Thu Nov 30 22:02:14 2006 @@ -80,8 +80,11 @@ /* Adjust */ #define ID_BRIGHTNESS 2100 -#define ID_BLACKANDWHITE 2101 -#define ID_INVERTCOLORS 2102 +#define ID_CONTRAST 2101 +#define ID_BLACKANDWHITE 2102 +#define ID_INVERTCOLORS 2103 +#define ID_BLUR 2104 +#define ID_SHARPEN 2105 #define ID_ABOUT 2400

1 0

[ion] 24997: - Fix a bug in DbgkOpenHandles which was causing file handles to get lost. - Process create, thread create and DLL load events are now working perfectly. See http://www.tinykrnl.org/dbgworking.png
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 21:30:05 2006 New Revision: 24997 URL: http://svn.reactos.org/svn/reactos?rev=24997&view=rev Log: - Fix a bug in DbgkOpenHandles which was causing file handles to get lost. - Process create, thread create and DLL load events are now working perfectly. See http://www.tinykrnl.org/dbgworking.png Modified: trunk/reactos/ntoskrnl/dbgk/debug.c Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Thu Nov 30 21:30:05 2006 @@ -1039,7 +1039,7 @@ 0, DUPLICATE_SAME_ACCESS, KernelMode); - if (NT_SUCCESS(Status)) *DupHandle = NULL; + if (!NT_SUCCESS(Status)) *DupHandle = NULL; /* Close the original handle */ ObCloseHandle(Handle, KernelMode);

1 0

[ion] 24996: - Fix critical I/O bugs in IopParseFile which were causing the file object's device object pointer to be associated to the FSD (File System Device) instead of the Disk Driver, as well as the dereference of the FSD after the Disk Driver had been referenced (causing too many derefs for one, and to many refs for the other). Also fix a bug in IopQueryDeviceInformation which was querying the Disk Driver instead of the FSD. - This also fixes IopQueryNameFile to properly return the entire
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 21:04:22 2006 New Revision: 24996 URL: http://svn.reactos.org/svn/reactos?rev=24996&view=rev Log: - Fix critical I/O bugs in IopParseFile which were causing the file object's device object pointer to be associated to the FSD (File System Device) instead of the Disk Driver, as well as the dereference of the FSD after the Disk Driver had been referenced (causing too many derefs for one, and to many refs for the other). Also fix a bug in IopQueryDeviceInformation which was querying the Disk Driver instead of the FSD. - This also fixes IopQueryNameFile to properly return the entire name of the file now, instead of only the FSD part (probably fixes a dozen regressions). Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Thu Nov 30 21:04:22 2006 @@ -101,7 +101,7 @@ !(OpenPacket->RelatedFileObject->Flags & FO_DIRECT_DEVICE_OPEN)) { /* The device object is the one we were given */ - DeviceObject = OriginalDeviceObject; + DeviceObject = ParseObject; /* Check if the related FO had a VPB */ if (OpenPacket->RelatedFileObject->Vpb) @@ -119,11 +119,11 @@ DeviceObject = OriginalDeviceObject; /* Check if it has a VPB */ - if ((DeviceObject->Vpb) && !(DirectOpen)) + if ((OriginalDeviceObject->Vpb) && !(DirectOpen)) { /* Check if the VPB is mounted, and mount it */ Vpb = IopCheckVpbMounted(OpenPacket, - DeviceObject, + OriginalDeviceObject, RemainingName, &Status); if (!Vpb) return Status; @@ -145,7 +145,7 @@ if (!Irp) { /* Dereference the device and VPB, then fail */ - IopDereferenceDeviceObject(DeviceObject, FALSE); + IopDereferenceDeviceObject(OriginalDeviceObject, FALSE); if (Vpb) IopDereferenceVpb(Vpb); return STATUS_INSUFFICIENT_RESOURCES; } @@ -243,7 +243,7 @@ IoFreeIrp(Irp); /* Dereference the device and VPB */ - IopDereferenceDeviceObject(DeviceObject, FALSE); + IopDereferenceDeviceObject(OriginalDeviceObject, FALSE); if (Vpb) IopDereferenceVpb(Vpb); /* We failed, return status */ @@ -320,7 +320,7 @@ FileObject->Type = IO_TYPE_FILE; FileObject->Size = sizeof(FILE_OBJECT); FileObject->RelatedFileObject = OpenPacket->RelatedFileObject; - FileObject->DeviceObject = DeviceObject; + FileObject->DeviceObject = OriginalDeviceObject; /* Check if this is a direct device open */ if (DirectOpen) FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; @@ -353,7 +353,7 @@ IoFreeIrp(Irp); /* Dereference the device object and VPB */ - IopDereferenceDeviceObject(DeviceObject, FALSE); + IopDereferenceDeviceObject(OriginalDeviceObject, FALSE); if (Vpb) IopDereferenceVpb(Vpb); /* Clear the FO and dereference it */ @@ -391,7 +391,7 @@ { /* We'll have to complete it ourselves */ ASSERT(!Irp->PendingReturned); - ASSERT(!Irp->MdlAddress ); + ASSERT(!Irp->MdlAddress); /* Completion happens at APC_LEVEL */ KeRaiseIrql(APC_LEVEL, &OldIrql); @@ -445,7 +445,10 @@ /* Dereference the file object */ if (!UseDummyFile) ObDereferenceObject(FileObject); - /* Unless the driver canelled the open, dereference the VPB */ + /* Dereference the device object */ + IopDereferenceDeviceObject(OriginalDeviceObject, FALSE); + + /* Unless the driver cancelled the open, dereference the VPB */ if (!(OpenCancelled) && (Vpb)) IopDereferenceVpb(Vpb); /* Set the status and return */ @@ -929,10 +932,6 @@ if (!LocalInfo) return STATUS_INSUFFICIENT_RESOURCES; /* Query the name */ - DPRINT("Do. Drv, DrvName: %p %p %wZ\n", - FileObject->DeviceObject, - FileObject->DeviceObject->DriverObject, - &FileObject->DeviceObject->DriverObject->DriverName); Status = ObQueryNameString(FileObject->DeviceObject, LocalInfo, Length, @@ -1416,7 +1415,7 @@ else if ((OpenPacket.FileObject) && (OpenPacket.ParseCheck != 1)) { /* - * This can happen in the very bizare case where the parse routine + * This can happen in the very bizarre case where the parse routine * actually executed more then once (due to a reparse) and ended * up failing after already having created the File Object. */ Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Thu Nov 30 21:04:22 2006 @@ -450,7 +450,7 @@ //IopQueueIrpToThread(Irp); /* Call the Driver */ - Status = IoCallDriver(FileObject->DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); /* Check if this was synch I/O */ if (!LocalEvent) Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Thu Nov 30 21:04:22 2006 @@ -3470,7 +3470,6 @@ AllocationAttributes, FileHandle, NULL); - if (NT_SUCCESS(Status)) { Status = ObInsertObject ((PVOID)SectionObject,

1 0

[greatlrd] 24995: did forget this file
by greatlrd＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: greatlrd Date: Thu Nov 30 20:23:54 2006 New Revision: 24995 URL: http://svn.reactos.org/svn/reactos?rev=24995&view=rev Log: did forget this file Added: trunk/tools/Qemu GUI/Runner.cs Added: trunk/tools/Qemu GUI/Runner.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/Runner.cs?rev=249… ============================================================================== --- trunk/tools/Qemu GUI/Runner.cs (added) +++ trunk/tools/Qemu GUI/Runner.cs Thu Nov 30 20:23:54 2006 @@ -1,0 +1,156 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Diagnostics; +using System.Windows.Forms; + +namespace Qemu_GUI +{ + public class Runner + { + private Data data; + private string ErrBuffer = ""; + private Process p; + + public Runner(Data In) + { + p = new Process(); + data = In; + p.StartInfo.RedirectStandardError = true; + //p.StartInfo.RedirectStandardOutput = true; + p.StartInfo.UseShellExecute = false; + p.StartInfo.CreateNoWindow = true; + p.EnableRaisingEvents = true; + p.Exited += new EventHandler(ListenerStop); + } + + public bool StartQemu(Platforms Platform) + { + switch (Platform) + { + case Platforms.x86: + case Platforms.x86_ISA: + p.StartInfo.FileName = data.Paths.QEmu + "\\qemu.exe"; + break; + case Platforms.x64: + case Platforms.x64_ISA: + p.StartInfo.FileName = data.Paths.QEmu + "\\qemu-system-x86_64.exe"; + break; + case Platforms.ARM_integratorcp1026: + case Platforms.ARM_integratorcp926: + case Platforms.ARM_versatileab: + case Platforms.ARM_versatilepb: + p.StartInfo.FileName = data.Paths.QEmu + "\\qemu-system-arm.exe"; + break; + case Platforms.PPC_g3bw: + case Platforms.PPC_mac99: + case Platforms.PPC_prep: + p.StartInfo.FileName = data.Paths.QEmu + "\\qemu-system-ppc.exe"; + break; + case Platforms.Sparc_sun4m: + p.StartInfo.FileName = data.Paths.QEmu + "\\qemu-system-sparc.exe"; + break; + } + + try + { + p.StartInfo.WorkingDirectory = data.Paths.QEmu; + p.StartInfo.Arguments = data.GetArgv(); + } + catch(Exception e) + { + MessageBox.Show("Invalid path or arguments.\nException Information: " + e.Message , "Error"); + return false; + } + + /* show the command line */ + ErrBuffer = "Path:" + p.StartInfo.FileName.ToString() + " \n\rArguments:" + data.GetArgv(); + + try + { + p.Start(); + } + catch + { + ErrBuffer += "\n\rError: " + p.StartInfo.FileName + " not found!"; + MessageBox.Show(ErrBuffer, "Error"); + return false; + } + return true; + } + + public bool CreateImage(string FileName, long Size, string Format) + { + long d = Size * 1024; + string argv = " create -f " + Format + " \"" + FileName + "\" " + d.ToString(); ; + + p.StartInfo.FileName = data.Paths.QEmu + "\\" + "qemu-img.exe"; + p.StartInfo.WorkingDirectory = data.Paths.QEmu; + p.StartInfo.Arguments = argv; + try + { + p.Start(); + } + catch + { + ErrBuffer += "\n\rError: " + p.StartInfo.FileName + " not found!"; + MessageBox.Show(ErrBuffer, "Error"); + return false; + } + return true; + } + + public string GetErrorBuffer() + { + return ErrBuffer; + } + + public bool MountImage() + { + p.StartInfo.FileName = data.Paths.VDK + "\\vdk.exe"; + p.StartInfo.WorkingDirectory = data.Paths.VDK; + p.StartInfo.Arguments = "open 0 " + "\"" + data.Tools.vdk.Image + "\" /RW /L:" + data.Tools.vdk.DriveLetter; + + try + { + p.Start(); + } + catch + { + ErrBuffer += "\n\rError: " + p.StartInfo.FileName + " not found!"; + MessageBox.Show(ErrBuffer, "Error"); + return false; + } + return true; + } + + public bool UnmountImage() + { + p.StartInfo.FileName = data.Paths.VDK + "\\vdk.exe"; + p.StartInfo.WorkingDirectory = data.Paths.VDK; + p.StartInfo.Arguments = "CLOSE * /F"; + + try + { + p.Start(); + } + catch + { + ErrBuffer += "\n\rError: " + p.StartInfo.FileName + " not found!"; + MessageBox.Show(ErrBuffer, "Error"); + return false; + } + return true; + } + + public void ListenerStop(object sender, EventArgs e) + { + string buff = p.StandardError.ReadToEnd(); + ErrBuffer += "\n\rError:\n\r" + buff; + if(buff.Length > 0) + MessageBox.Show(ErrBuffer, "Program wrote to error stream!"); + } + } + +}

1 0

[janderwald] 24993: - various msvc compability fixes - 2 errors remaining: conio.c(2104) : error C2065: 'CONSOLE_INPUT_MODE_VALID' : undeclared identifier conio.c(2108) : error C2065: 'CONSOLE_OUTPUT_MODE_VALID' : undeclared identifier those two constants should be moved into the NDK(declared in wincon.h)...
by janderwald＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: janderwald Date: Thu Nov 30 19:48:13 2006 New Revision: 24993 URL: http://svn.reactos.org/svn/reactos?rev=24993&view=rev Log: - various msvc compability fixes - 2 errors remaining: conio.c(2104) : error C2065: 'CONSOLE_INPUT_MODE_VALID' : undeclared identifier conio.c(2108) : error C2065: 'CONSOLE_OUTPUT_MODE_VALID' : undeclared identifier those two constants should be moved into the NDK(declared in wincon.h)... Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Thu Nov 30 19:48:13 2006 @@ -13,9 +13,6 @@ #define NDEBUG #include <debug.h> -/* FIXME: Is there a way to create real aliasses with gcc? [CSH] */ -#define ALIAS(Name, Target) typeof(Target) Name = Target - /* GLOBALS *******************************************************************/ #define ConioInitRect(Rect, Top, Left, Bottom, Right) \ @@ -110,7 +107,7 @@ Buffer->Header.ReferenceCount = 0; Buffer->ShowX = 0; Buffer->ShowY = 0; - Buffer->Buffer = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, Buffer->MaxX * Buffer->MaxY * sizeof(WCHAR)); + Buffer->Buffer = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, Buffer->MaxX * Buffer->MaxY * 2); if (NULL == Buffer->Buffer) { return STATUS_INSUFFICIENT_RESOURCES; @@ -721,7 +718,7 @@ } } -inline BOOLEAN ConioIsEqualRect( +BOOLEAN __inline ConioIsEqualRect( RECT *Rect1, RECT *Rect2) { @@ -729,7 +726,7 @@ (Rect1->top == Rect2->top) && (Rect1->bottom == Rect2->bottom)); } -inline BOOLEAN ConioGetIntersection( +BOOLEAN __inline ConioGetIntersection( RECT *Intersection, RECT *Rect1, RECT *Rect2) @@ -755,7 +752,7 @@ return TRUE; } -inline BOOLEAN ConioGetUnion( +BOOLEAN __inline ConioGetUnion( RECT *Union, RECT *Rect1, RECT *Rect2) @@ -788,7 +785,7 @@ return TRUE; } -inline BOOLEAN ConioSubtractRect( +BOOLEAN __inline ConioSubtractRect( RECT *Subtraction, RECT *Rect1, RECT *Rect2) @@ -1519,7 +1516,7 @@ return Request->Status = STATUS_SUCCESS; } -static FASTCALL VOID +static VOID FASTCALL ConioComputeUpdateRect(PCSRSS_SCREEN_BUFFER Buff, RECT *UpdateRect, COORD *Start, UINT Length) { if (Buff->MaxX <= Start->X + Length) @@ -2527,13 +2524,17 @@ RECT ClipRectangle; NTSTATUS Status; BOOLEAN DoFill; + HANDLE ConsoleHandle; + BOOLEAN UseClipRectangle; + COORD DestinationOrigin; + CHAR_INFO Fill; DPRINT("CsrScrollConsoleScreenBuffer\n"); - ALIAS(ConsoleHandle,Request->Data.ScrollConsoleScreenBufferRequest.ConsoleHandle); - ALIAS(UseClipRectangle,Request->Data.ScrollConsoleScreenBufferRequest.UseClipRectangle); - ALIAS(DestinationOrigin,Request->Data.ScrollConsoleScreenBufferRequest.DestinationOrigin); - ALIAS(Fill,Request->Data.ScrollConsoleScreenBufferRequest.Fill); + ConsoleHandle = Request->Data.ScrollConsoleScreenBufferRequest.ConsoleHandle; + UseClipRectangle = Request->Data.ScrollConsoleScreenBufferRequest.UseClipRectangle; + DestinationOrigin = Request->Data.ScrollConsoleScreenBufferRequest.DestinationOrigin; + Fill = Request->Data.ScrollConsoleScreenBufferRequest.Fill; Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status))

1 0

[cwittich] 24992: check for compiler version
by cwittich＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: cwittich Date: Thu Nov 30 18:11:26 2006 New Revision: 24992 URL: http://svn.reactos.org/svn/reactos?rev=24992&view=rev Log: check for compiler version Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Thu Nov 30 18:11:26 2006 @@ -685,10 +685,23 @@ compilerCommand = compilerPrefix + "-gcc"; detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); } + if ( detectedCompiler ) - printf ( "detected (%s)\n", compilerCommand.c_str () ); + { + string compilerVersion = GetCompilerVersion ( compilerCommand ); + if ( IsSupportedCompilerVersion ( compilerVersion ) ) + printf ( "detected (%s %s)\n", compilerCommand.c_str (), compilerVersion.c_str() ); + else + { + printf ( "detected (%s), but with unsupported version (%s)\n", + compilerCommand.c_str (), + compilerVersion.c_str () ); + throw UnsupportedBuildToolException ( compilerCommand, compilerVersion ); + } + } else printf ( "not detected\n" ); + } bool @@ -701,6 +714,56 @@ NUL ); int exitcode = system ( command.c_str () ); return (exitcode == 0); +} + +string +MingwBackend::GetCompilerVersion ( const string& compilerCommand ) +{ + FILE *fp; + int ch, i; + char buffer[81]; + + string versionCommand = ssprintf ( "%s --version gcc", + compilerCommand.c_str (), + NUL, + NUL ); + fp = popen ( versionCommand.c_str () , "r" ); + for( i = 0; + ( i < 80 ) && + ( feof ( fp ) == 0 && + ( ( ch = fgetc( fp ) ) != -1 ) ); + i++ ) + { + buffer[i] = (char) ch; + } + buffer[i] = '\0'; + pclose ( fp ); + + char separators[] = " "; + char *token; + char *prevtoken = NULL; + + string version; + + token = strtok ( buffer, separators ); + while ( token != NULL ) + { + prevtoken = token; + version = string( prevtoken ); + if ( version.find('.') != std::string::npos ) + break; + token = strtok ( NULL, separators ); + } + return version; +} + +bool +MingwBackend::IsSupportedCompilerVersion ( const string& compilerVersion ) +{ + if ( strcmp ( compilerVersion.c_str (), "3.4.5") < 0 ) + return false; + else + return true; } bool Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h Thu Nov 30 18:11:26 2006 @@ -85,6 +85,8 @@ bool IncludeDirectoryTarget ( const std::string& directory ) const; bool TryToDetectThisCompiler ( const std::string& compiler ); void DetectCompiler (); + std::string GetCompilerVersion ( const std::string& compilerCommand ); + bool IsSupportedCompilerVersion ( const std::string& compilerVersion ); bool TryToDetectThisNetwideAssembler ( const std::string& assembler ); bool TryToDetectThisBinutils ( const std::string& binutils ); std::string GetBinutilsVersion ( const std::string& binutilsCommand );

1 0

[janderwald] 24991: - fix msvc_clean target - implement cleaning up def files which are generated by fixdef
by janderwald＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: janderwald Date: Thu Nov 30 15:20:40 2006 New Revision: 24991 URL: http://svn.reactos.org/svn/reactos?rev=24991&view=rev Log: - fix msvc_clean target - implement cleaning up def files which are generated by fixdef Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/msvc.h Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Thu Nov 30 15:20:40 2006 @@ -344,26 +344,43 @@ else file = ReplaceExtension ( file, ".obj" ); for ( size_t j = 0; j < cfgs.size () / 2; j++ ) - out.push_back ( cfgs[j] + "\\" + file ); + out.push_back ( cfgs[j] + file ); } } //common files in intermediate dir for ( i = 0; i < cfgs.size () / 2; i++) { - out.push_back ( cfgs[i] + "\\" + "BuildLog.htm" ); - out.push_back ( cfgs[i] + "\\" + dbg + "0.pdb" ); - out.push_back ( cfgs[i] + "\\" + dbg + "0.idb" ); - out.push_back ( cfgs[i] + "\\" + module.name + ".pch" ); + out.push_back ( cfgs[i] + "BuildLog.htm" ); + out.push_back ( cfgs[i] + dbg + "0.pdb" ); + out.push_back ( cfgs[i] + dbg + "0.idb" ); + out.push_back ( cfgs[i] + module.name + ".pch" ); } //files in the output dir for ( i = cfgs.size () / 2; i < cfgs.size (); i++ ) { - out.push_back ( cfgs[i] + "\\" + module.GetTargetName () ); - out.push_back ( cfgs[i] + "\\" + module.name + ".pdb" ); - out.push_back ( cfgs[i] + "\\" + module.name + ".lib" ); - out.push_back ( cfgs[i] + "\\" + module.name + ".exp" ); - out.push_back ( cfgs[i] + "\\" + module.name + ".ilk" ); + out.push_back ( cfgs[i] + module.GetTargetName () ); + out.push_back ( cfgs[i] + module.name + ".pdb" ); + out.push_back ( cfgs[i] + module.name + ".lib" ); + out.push_back ( cfgs[i] + module.name + ".exp" ); + out.push_back ( cfgs[i] + module.name + ".ilk" ); + } +} + +void +MSVCBackend::_get_def_files ( const Module& module, vector<string>& out) const +{ + if (module.HasImportLibrary ()) + { + string modulename = module.GetBasePath (); + string file = module.importLibrary->definition; + size_t pos = file.find (".def"); + if (pos != string::npos) + { + file.insert (pos, "_msvc"); + } + modulename += "\\" + file; + out.push_back (modulename); } } @@ -395,9 +412,10 @@ remove ( vcproj_file_user.c_str () ); _get_object_files ( module, out ); + _get_def_files ( module, out ); for ( size_t j = 0; j < out.size (); j++) { - //printf("Cleaning file %s\n", out[j].c_str () ); + printf("Cleaning file %s\n", out[j].c_str () ); remove ( out[j].c_str () ); } } Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h Thu Nov 30 15:20:40 2006 @@ -139,6 +139,7 @@ std::string vcproj_guid ); void _clean_project_files ( void ); void _get_object_files ( const Module& module, std::vector<std::string>& out ) const; + void _get_def_files ( const Module& module, std::vector<std::string>& out ) const; void _install_files ( const std::string& vcdir, const std::string& config ); bool _copy_file ( const std::string& inputname, const std::string& targetname ) const; const Property* _lookup_property ( const Module& module, const std::string& name ) const;

1 0

[janderwald] 24990: - silence debug prints - create new generated file with _msvc postfix
by janderwald＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: janderwald Date: Thu Nov 30 14:24:46 2006 New Revision: 24990 URL: http://svn.reactos.org/svn/reactos?rev=24990&view=rev Log: - silence debug prints - create new generated file with _msvc postfix Modified: trunk/reactos/tools/fixdef/fixdef.cpp Modified: trunk/reactos/tools/fixdef/fixdef.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/fixdef/fixdef.cpp?re… ============================================================================== --- trunk/reactos/tools/fixdef/fixdef.cpp (original) +++ trunk/reactos/tools/fixdef/fixdef.cpp Thu Nov 30 14:24:46 2006 @@ -215,7 +215,7 @@ bool convertFile(string filename, vector<string> & file) { bool modified = false; - cerr << "entered with: "<< filename << " size: " << file.size () << endl; + //cerr << "entered with: "<< filename << " size: " << file.size () << endl; for(size_t i = 0; i < file.size(); i++) { @@ -251,9 +251,8 @@ modified = true; remove_stdcall_convention(line); } - cout << line; - } - exit(0); + //cout << line; + } return modified; } @@ -296,12 +295,15 @@ { vector<string> file; file.clear (); - if (readFile(def_files[i], file)) - { - if (convertFile(def_files[i], file)) - { - writeFile(def_files[i], file); - } + string filename = def_files[i]; + + + if (readFile(filename, file)) + { + convertFile(filename, file); + filename.insert (filename.find(_T(".")), _T("_msvc")); + cout << "Writing file: " << filename << endl; + writeFile(filename, file); } }

1 0

[fireball] 24989: Fix HALMP build
by fireball＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: fireball Date: Thu Nov 30 14:24:03 2006 New Revision: 24989 URL: http://svn.reactos.org/svn/reactos?rev=24989&view=rev Log: Fix HALMP build Modified: trunk/reactos/hal/halx86/mp/spinlock.c Modified: trunk/reactos/hal/halx86/mp/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/spinlock.c?r… ============================================================================== --- trunk/reactos/hal/halx86/mp/spinlock.c (original) +++ trunk/reactos/hal/halx86/mp/spinlock.c Thu Nov 30 14:24:03 2006 @@ -179,6 +179,17 @@ /* * @unimplemented */ +KIRQL +FASTCALL +KeAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ VOID FASTCALL KeReleaseQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle,

1 0

[ion] 24988: - Raw test app for DbgUi+Dbgk Debugging Subsystem (skeletal, and doesn't test Win32 APIs).
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 12:54:31 2006 New Revision: 24988 URL: http://svn.reactos.org/svn/reactos?rev=24988&view=rev Log: - Raw test app for DbgUi+Dbgk Debugging Subsystem (skeletal, and doesn't test Win32 APIs). Added: trunk/reactos/ntoskrnl/tests/TestDebug.c Modified: trunk/reactos/hal/hal/hal.c Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=24988&r1… ============================================================================== --- trunk/reactos/hal/hal/hal.c (original) +++ trunk/reactos/hal/hal/hal.c Thu Nov 30 12:54:31 2006 @@ -42,6 +42,38 @@ return STATUS_SUCCESS; } +/* +* @unimplemented +*/ +VOID +NTAPI +HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) +{ + KEBUGCHECK(0); + return; +} + +/* +* @unimplemented +*/ +VOID +NTAPI +HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) +{ + KEBUGCHECK(0); + return; +} + +/* +* @unimplemented +*/ +ULONG_PTR +NTAPI +HalSetProfileInterval(IN ULONG_PTR Interval) +{ + KEBUGCHECK(0); + return Interval; +} VOID FASTCALL @@ -1161,6 +1193,14 @@ return (KIRQL)0; } +KIRQL +FASTCALL +KeAcquireQueuedSpinLockRaiseToSynch(IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + UNIMPLEMENTED; + return (KIRQL)0; +} + VOID FASTCALL KeReleaseQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle, Added: trunk/reactos/ntoskrnl/tests/TestDebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/tests/TestDebug.c… ============================================================================== --- trunk/reactos/ntoskrnl/tests/TestDebug.c (added) +++ trunk/reactos/ntoskrnl/tests/TestDebug.c Thu Nov 30 12:54:31 2006 @@ -1,0 +1,93 @@ +#define _X86_ +#include "ntndk.h" + +VOID +Main(VOID) +{ + NTSTATUS Status; + HANDLE hProcess; + OBJECT_ATTRIBUTES ObjectAttributes; + CLIENT_ID ClientId; + DBGUI_WAIT_STATE_CHANGE State; + BOOLEAN Alive = TRUE; + + printf("*** Native (DbgUi) Debugging Test Application\n"); + printf("Press any key to connect to Dbgk..."); + getchar(); + + Status = DbgUiConnectToDbg(); + printf(" Connection Established. Status: %lx\n", Status); + printf("Debug Object Handle: %lx\n", NtCurrentTeb()->DbgSsReserved[1]); + printf("Press any key to debug services.exe..."); + getchar(); + + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, 0, 0); + ClientId.UniqueThread = 0; + ClientId.UniqueProcess = UlongToHandle(168); + Status = NtOpenProcess(&hProcess, + PROCESS_ALL_ACCESS, + &ObjectAttributes, + &ClientId); + Status = DbgUiDebugActiveProcess(hProcess); + printf(" Debugger Attached. Status: %lx\n", Status); + printf("Press any key to get first debug event... "); + getchar(); + + while (Alive) + { + Status = DbgUiWaitStateChange(&State, NULL); + printf(" Event Received. Status: %lx\n", Status); + printf("New State: %lx. Application Client ID: %lx/%lx\n", + State.NewState, + State.AppClientId.UniqueProcess, State.AppClientId.UniqueThread); + + switch (State.NewState) + { + case DbgCreateProcessStateChange: + printf("Process Handle: %lx. Thread Handle: %lx\n", + State.StateInfo.CreateProcessInfo.HandleToProcess, + State.StateInfo.CreateProcessInfo.HandleToThread); + printf("Process image handle: %lx\n", + State.StateInfo.CreateProcessInfo.NewProcess.FileHandle); + printf("Process image base: %lx\n", + State.StateInfo.CreateProcessInfo.NewProcess.BaseOfImage); + break; + + case DbgCreateThreadStateChange: + printf("New thread: %lx\n", State.StateInfo.CreateThread.HandleToThread); + printf("Thread Start Address: %p\n", State.StateInfo.CreateThread.NewThread.StartAddress); + break; + + case DbgLoadDllStateChange: + printf("New DLL: %lx\n", State.StateInfo.LoadDll.FileHandle); + printf("DLL LoadAddress: %p\n", State.StateInfo.LoadDll.BaseOfDll); + break; + + case DbgBreakpointStateChange: + printf("Initial breakpoint hit at: %p!\n", + State.StateInfo.Exception.ExceptionRecord.ExceptionAddress); + break; + + case DbgExitThreadStateChange: + printf("Thread exited: %lx\n", State.StateInfo.ExitThread.ExitStatus); + break; + + case DbgExitProcessStateChange: + printf("Process exited: %lx\n", State.StateInfo.ExitProcess.ExitStatus); + Alive = FALSE; + break; + } + + printf("Press any key to continue debuggee..."); + getchar(); + + ClientId.UniqueProcess = State.AppClientId.UniqueProcess; + ClientId.UniqueThread = State.AppClientId.UniqueThread; + Status = DbgUiContinue(&ClientId, DBG_CONTINUE); + printf(" Debuggee Resumed. Status: %lx\n", Status); + printf("Press any key to get next debug event... "); + getchar(); + }; + printf("*** End of test\n"); + getchar(); +}

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