Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 36352: -fix resource leaks -don't free memory allocated by LocalAlloc with HeapFree
by cwittich＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: cwittich Date: Sat Sep 20 09:13:10 2008 New Revision: 36352 URL: http://svn.reactos.org/svn/reactos?rev=36352&view=rev Log: -fix resource leaks -don't free memory allocated by LocalAlloc with HeapFree Modified: trunk/rosapps/applications/devutils/genguid/genguid.c trunk/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c trunk/rosapps/applications/devutils/vgafontedit/fontwnd.c trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c Modified: trunk/rosapps/applications/devutils/genguid/genguid.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/geng… ============================================================================== --- trunk/rosapps/applications/devutils/genguid/genguid.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/genguid/genguid.c [iso-8859-1] Sat Sep 20 09:13:10 2008 @@ -23,8 +23,7 @@ int main(int argc, char *argv[]) { - GUID m_guid; - m_guid = GUID_NULL; + GUID m_guid = GUID_NULL; int arg; HRESULT result; char *strfmt = ""; Modified: trunk/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c [iso-8859-1] Sat Sep 20 09:13:10 2008 @@ -108,10 +108,11 @@ UCHAR uCharacterRow; UCHAR uBit; WCHAR szInfoText[9]; + HBITMAP hBitmapOld; // Preparations hBoxDC = CreateCompatibleDC(NULL); - SelectObject(hBoxDC, Info->MainWndInfo->hBoxBmp); + hBitmapOld = SelectObject(hBoxDC, Info->MainWndInfo->hBoxBmp); hFont = CreateFontW(13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, L"Tahoma"); hOldFont = SelectObject(ps->hdc, hFont); @@ -177,6 +178,7 @@ } } + SelectObject(hBoxDC, hBitmapOld); SelectObject(ps->hdc, hOldFont); DeleteObject(hFont); SelectObject(ps->hdc, hOldBrush); Modified: trunk/rosapps/applications/devutils/vgafontedit/fontwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/fontwnd.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/fontwnd.c [iso-8859-1] Sat Sep 20 09:13:10 2008 @@ -146,7 +146,7 @@ LoadAndFormatString(IDS_SAVEPROMPT, &pszPrompt, szFile); nMsgBoxResult = MessageBoxW(hwnd, pszPrompt, szAppName, MB_YESNOCANCEL | MB_ICONQUESTION); - HeapFree(hProcessHeap, 0, pszPrompt); + LocalFree(pszPrompt); switch(nMsgBoxResult) { @@ -394,7 +394,7 @@ (LPARAM)Info ); if(!OpenInfo->pszFileName) - HeapFree(hProcessHeap, 0, pszWindowTitle); + LocalFree(pszWindowTitle); if(hFontWnd) { Modified: trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c [iso-8859-1] Sat Sep 20 09:13:10 2008 @@ -15,15 +15,16 @@ { HDC hMemDC; HDC hMainDC; - HPEN hPen; + HPEN hPen, hPenOld; RECT rect; + HBITMAP hBitmapOld; hMemDC = CreateCompatibleDC(NULL); hMainDC = GetDC(Info->hMainWnd); // Create the "Box" bitmap Info->hBoxBmp = CreateCompatibleBitmap(hMainDC, CHARACTER_BOX_WIDTH, CHARACTER_BOX_HEIGHT); - SelectObject(hMemDC, Info->hBoxBmp); + hBitmapOld = SelectObject(hMemDC, Info->hBoxBmp); rect.left = 0; rect.top = 0; @@ -31,20 +32,24 @@ rect.bottom = CHARACTER_INFO_BOX_HEIGHT; FillRect( hMemDC, &rect, (HBRUSH)(COLOR_BTNFACE + 1) ); - SelectObject( hMemDC, GetStockObject(WHITE_PEN) ); + hPenOld = SelectObject( hMemDC, GetStockObject(WHITE_PEN) ); Rectangle(hMemDC, 0, 0, CHARACTER_INFO_BOX_WIDTH - 1, 2); Rectangle(hMemDC, 0, 2, 2, CHARACTER_INFO_BOX_HEIGHT - 1); + hPen = SelectObject(hMemDC, hPenOld); hPen = CreatePen( PS_SOLID, 1, RGB(128, 128, 128) ); - SelectObject(hMemDC, hPen); + hPenOld = SelectObject(hMemDC, hPen); Rectangle(hMemDC, 1, CHARACTER_INFO_BOX_HEIGHT - 2, CHARACTER_INFO_BOX_WIDTH, CHARACTER_INFO_BOX_HEIGHT); Rectangle(hMemDC, CHARACTER_INFO_BOX_WIDTH - 2, 1, CHARACTER_INFO_BOX_WIDTH, CHARACTER_INFO_BOX_HEIGHT - 2); SetPixel( hMemDC, CHARACTER_INFO_BOX_WIDTH - 1, 0, RGB(128, 128, 128) ); SetPixel( hMemDC, 0, CHARACTER_INFO_BOX_HEIGHT - 1, RGB(128, 128, 128) ); - + SelectObject(hMemDC, hBitmapOld); + + hPen = SelectObject(hMemDC, hPenOld); DeleteObject(hPen); DeleteDC(hMemDC); + ReleaseDC(Info->hMainWnd, hMainDC); } static VOID

1 0

[sginsberg] 36351: - Fix CMTRACE macro
by sginsberg＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: sginsberg Date: Sat Sep 20 09:11:25 2008 New Revision: 36351 URL: http://svn.reactos.org/svn/reactos?rev=36351&view=rev Log: - Fix CMTRACE macro Modified: trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sat Sep 20 09:11:25 2008 @@ -29,6 +29,7 @@ BOOLEAN CmpNoWrite; BOOLEAN CmpForceForceFlush; BOOLEAN CmpWasSetupBoot; +ULONG CmpTraceLevel = 0; extern BOOLEAN CmFirstTime; Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Sat Sep 20 09:11:25 2008 @@ -11,7 +11,7 @@ // // Define this if you want debugging support // -#define _CM_DEBUG_ 0x00 +#define _CM_DEBUG_ 0x01 // // These define the Debug Masks Supported @@ -1438,6 +1438,7 @@ // // Global variables accessible from all of Cm // +extern ULONG CmpTraceLevel; extern BOOLEAN CmpSpecialBootCondition; extern BOOLEAN CmpFlushOnLockRelease; extern BOOLEAN CmpShareSystemHives;

1 0

[dchapyshev] 36350: - Implement RealChildWindowFromPoint (based on wine) - Add checking params for BeginDeferWindowPos
by dchapyshev＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: dchapyshev Date: Sat Sep 20 08:47:33 2008 New Revision: 36350 URL: http://svn.reactos.org/svn/reactos?rev=36350&view=rev Log: - Implement RealChildWindowFromPoint (based on wine) - Add checking params for BeginDeferWindowPos Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sat Sep 20 08:47:33 2008 @@ -66,6 +66,11 @@ HDWP STDCALL BeginDeferWindowPos(int nNumWindows) { + if (nNumWindows < 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } #if 0 UNIMPLEMENTED; return (HDWP)0; @@ -1561,14 +1566,13 @@ /* - * @unimplemented + * @implemented */ HWND STDCALL RealChildWindowFromPoint(HWND hwndParent, POINT ptParentClientCoords) { - UNIMPLEMENTED; - return (HWND)0; + return ChildWindowFromPointEx(hwndParent, ptParentClientCoords, CWP_SKIPTRANSPARENT); } /*

1 0

[cwittich] 36349: fix formatting
by cwittich＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: cwittich Date: Sat Sep 20 08:45:33 2008 New Revision: 36349 URL: http://svn.reactos.org/svn/reactos?rev=36349&view=rev Log: fix formatting Modified: trunk/rosapps/applications/magnify/magnifier.c Modified: trunk/rosapps/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/magnify/magni… ============================================================================== --- trunk/rosapps/applications/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/rosapps/applications/magnify/magnifier.c [iso-8859-1] Sat Sep 20 08:45:33 2008 @@ -44,36 +44,36 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { - // TODO: Place code here. - MSG msg; - HACCEL hAccelTable; - - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpCmdLine); - - // Initialize global strings - LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); - MyRegisterClass(hInstance); - - // Perform application initialization: - if (!InitInstance (hInstance, nCmdShow)) - { - return FALSE; - } - - hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_MAGNIFIER)); - - // Main message loop: - while (GetMessage(&msg, NULL, 0, 0)) - { - if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } - - return (int) msg.wParam; + // TODO: Place code here. + MSG msg; + HACCEL hAccelTable; + + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpCmdLine); + + // Initialize global strings + LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); + MyRegisterClass(hInstance); + + // Perform application initialization: + if (!InitInstance (hInstance, nCmdShow)) + { + return FALSE; + } + + hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_MAGNIFIER)); + + // Main message loop: + while (GetMessage(&msg, NULL, 0, 0)) + { + if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + + return (int) msg.wParam; } @@ -93,20 +93,20 @@ // ATOM MyRegisterClass(HINSTANCE hInstance) { - WNDCLASS wc; - - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = WndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = hInstance; - wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON)); - wc.hCursor = LoadCursor(NULL, IDC_ARROW); - wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); - wc.lpszMenuName = MAKEINTRESOURCE(IDC_MAGNIFIER); - wc.lpszClassName = szWindowClass; - - return RegisterClass(&wc); + WNDCLASS wc; + + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = WndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = hInstance; + wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON)); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wc.lpszMenuName = MAKEINTRESOURCE(IDC_MAGNIFIER); + wc.lpszClassName = szWindowClass; + + return RegisterClass(&wc); } // @@ -123,20 +123,20 @@ { hInst = hInstance; // Store instance handle in our global variable - // Create the Window + // Create the Window hMainWnd = CreateWindowEx( - WS_EX_TOPMOST, - szWindowClass, - szTitle, - WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, - CW_USEDEFAULT, - CW_USEDEFAULT, - CW_USEDEFAULT, - NULL, - NULL, - hInstance, - NULL); + WS_EX_TOPMOST, + szWindowClass, + szTitle, + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + NULL, + NULL, + hInstance, + NULL); if (!hMainWnd) { @@ -156,130 +156,130 @@ void Refresh () { - if (!IsIconic(hMainWnd)) - { - // Invalidate the client area forcing a WM_PAINT message - InvalidateRgn(hMainWnd, NULL, TRUE); - } + if (!IsIconic(hMainWnd)) + { + // Invalidate the client area forcing a WM_PAINT message + InvalidateRgn(hMainWnd, NULL, TRUE); + } } void Draw(HDC aDc) { - HDC desktopHdc = NULL; - HDC HdcStrech; - HANDLE hOld; - HBITMAP HbmpStrech; - - RECT R; - RECT appRect; - DWORD rop = SRCCOPY; - CURSORINFO cinfo; + HDC desktopHdc = NULL; + HDC HdcStrech; + HANDLE hOld; + HBITMAP HbmpStrech; + + RECT R; + RECT appRect; + DWORD rop = SRCCOPY; + CURSORINFO cinfo; ICONINFO iinfo; int Width, Height, AppWidth, AppHeight; LONG blitAreaWidth, blitAreaHeight, blitAreaX, blitAreaY; - desktopHdc = GetWindowDC (hDesktopWindow); - - GetClientRect(hMainWnd, &appRect); - GetWindowRect(hDesktopWindow, &R); + desktopHdc = GetWindowDC (hDesktopWindow); + + GetClientRect(hMainWnd, &appRect); + GetWindowRect(hDesktopWindow, &R); ZeroMemory(&cinfo, sizeof(CURSORINFO)); - ZeroMemory(&iinfo, sizeof(ICONINFO)); + ZeroMemory(&iinfo, sizeof(ICONINFO)); cinfo.cbSize = sizeof(cinfo); GetCursorInfo(&cinfo); GetIconInfo(cinfo.hCursor, &iinfo); - /* Create a memory DC compatible with client area DC.*/ - HdcStrech = CreateCompatibleDC(desktopHdc); - - /* Create a bitmap compatible with the client area DC.*/ - HbmpStrech = CreateCompatibleBitmap( - desktopHdc, - R.right, - R.bottom); - - /* Select our bitmap in memory DC and save the old one.*/ - hOld = SelectObject (HdcStrech , HbmpStrech); - - /* Paint the screen bitmap to our in memory DC */ - BitBlt( - HdcStrech, - 0, - 0, - R.right, - R.bottom, - desktopHdc, - 0, - 0, - SRCCOPY); - - /* Draw the mouse pointer in the right position */ - DrawIcon( - HdcStrech , - pMouse.x - iinfo.xHotspot, // - 10, - pMouse.y - iinfo.yHotspot, // - 10, - cinfo.hCursor); - - Width = (R.right - R.left); - Height = (R.bottom - R.top); - - AppWidth = (appRect.right - appRect.left); - AppHeight = (appRect.bottom - appRect.top); - - blitAreaWidth = AppWidth / iZoom; - blitAreaHeight = AppHeight / iZoom; - - blitAreaX = (cp.x) - (blitAreaWidth /2); - blitAreaY = (cp.y) - (blitAreaHeight /2); - - if (blitAreaX < 0) - { - blitAreaX = 0; - } - - if (blitAreaY < 0) - { - blitAreaY = 0; - } - - if (blitAreaX > (Width - blitAreaWidth)) - { - blitAreaX = (Width - blitAreaWidth); - } - - if (blitAreaY > (Height - blitAreaHeight)) - { - blitAreaY = (Height - blitAreaHeight); - } - - if (bInvertColors) - { - rop = NOTSRCCOPY; - } - - /* Blast the stretched image from memory DC to window DC.*/ - StretchBlt( - aDc, - 0, - 0, - AppWidth, - AppHeight, - HdcStrech, - blitAreaX, - blitAreaY, - blitAreaWidth, - blitAreaHeight, - rop); - - /* Cleanup.*/ - if (iinfo.hbmMask) - DeleteObject(iinfo.hbmMask); - if (iinfo.hbmColor) - DeleteObject(iinfo.hbmColor); - SelectObject (HdcStrech, hOld); - DeleteObject (HbmpStrech); - DeleteDC (HdcStrech); + /* Create a memory DC compatible with client area DC.*/ + HdcStrech = CreateCompatibleDC(desktopHdc); + + /* Create a bitmap compatible with the client area DC.*/ + HbmpStrech = CreateCompatibleBitmap( + desktopHdc, + R.right, + R.bottom); + + /* Select our bitmap in memory DC and save the old one.*/ + hOld = SelectObject (HdcStrech , HbmpStrech); + + /* Paint the screen bitmap to our in memory DC */ + BitBlt( + HdcStrech, + 0, + 0, + R.right, + R.bottom, + desktopHdc, + 0, + 0, + SRCCOPY); + + /* Draw the mouse pointer in the right position */ + DrawIcon( + HdcStrech , + pMouse.x - iinfo.xHotspot, // - 10, + pMouse.y - iinfo.yHotspot, // - 10, + cinfo.hCursor); + + Width = (R.right - R.left); + Height = (R.bottom - R.top); + + AppWidth = (appRect.right - appRect.left); + AppHeight = (appRect.bottom - appRect.top); + + blitAreaWidth = AppWidth / iZoom; + blitAreaHeight = AppHeight / iZoom; + + blitAreaX = (cp.x) - (blitAreaWidth /2); + blitAreaY = (cp.y) - (blitAreaHeight /2); + + if (blitAreaX < 0) + { + blitAreaX = 0; + } + + if (blitAreaY < 0) + { + blitAreaY = 0; + } + + if (blitAreaX > (Width - blitAreaWidth)) + { + blitAreaX = (Width - blitAreaWidth); + } + + if (blitAreaY > (Height - blitAreaHeight)) + { + blitAreaY = (Height - blitAreaHeight); + } + + if (bInvertColors) + { + rop = NOTSRCCOPY; + } + + /* Blast the stretched image from memory DC to window DC.*/ + StretchBlt( + aDc, + 0, + 0, + AppWidth, + AppHeight, + HdcStrech, + blitAreaX, + blitAreaY, + blitAreaWidth, + blitAreaHeight, + rop); + + /* Cleanup.*/ + if (iinfo.hbmMask) + DeleteObject(iinfo.hbmMask); + if (iinfo.hbmColor) + DeleteObject(iinfo.hbmColor); + SelectObject (HdcStrech, hOld); + DeleteObject (HbmpStrech); + DeleteDC (HdcStrech); ReleaseDC(hDesktopWindow, desktopHdc); } @@ -295,252 +295,252 @@ // LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - int wmId, wmEvent; - - switch (message) - { - case WM_TIMER: - { - POINT pNewMouse; - POINT pNewCaret; - POINT pNewFocus; - HWND hwnd1, hwnd2, hwnd3; - DWORD a, b; - RECT controlRect; - - //Get current mouse position - GetCursorPos (&pNewMouse); - - //Get caret position - hwnd1 = GetForegroundWindow (); - a = GetWindowThreadProcessId(hwnd1, NULL); - b = GetCurrentThreadId(); - AttachThreadInput (a, b, TRUE); - hwnd2 = GetFocus(); - - GetCaretPos( &pNewCaret); - ClientToScreen (hwnd2, (LPPOINT) &pNewCaret); - AttachThreadInput (a, b, FALSE); - - //Get current control focus - hwnd3 = GetFocus (); - GetWindowRect (hwnd3 , &controlRect); - pNewFocus.x = controlRect.left; - pNewFocus.y = controlRect.top; - - //If mouse has moved .... - if (((pMouse.x != pNewMouse.x) || (pMouse.y != pNewMouse.y)) && bFollowMouse) - { - //Update to new position - pMouse = pNewMouse; - cp = pNewMouse; - Refresh(); - } - else if (((pCaret.x != pNewCaret.x) || (pCaret.y != pNewCaret.y)) && bFollowCaret) - { - //Update to new position - pCaret = pNewCaret; - cp = pNewCaret; - Refresh(); - } - else if (((pFocus.x != pNewFocus.x) || (pFocus.y != pNewFocus.y)) && bFollowFocus) - { - //Update to new position - pFocus = pNewFocus; - cp = pNewFocus; - Refresh(); - } - } - break; - case WM_COMMAND: - wmId = LOWORD(wParam); - wmEvent = HIWORD(wParam); - // Parse the menu selections: - switch (wmId) - { - case IDM_OPTIONS: - DialogBox(hInst, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hWnd, (DLGPROC)OptionsProc); - break; - case IDM_ABOUT: - DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, (DLGPROC)AboutProc); - break; - case IDM_EXIT: - DestroyWindow(hWnd); - break; - default: - return DefWindowProc(hWnd, message, wParam, lParam); - } - break; + int wmId, wmEvent; + + switch (message) + { + case WM_TIMER: + { + POINT pNewMouse; + POINT pNewCaret; + POINT pNewFocus; + HWND hwnd1, hwnd2, hwnd3; + DWORD a, b; + RECT controlRect; + + //Get current mouse position + GetCursorPos (&pNewMouse); + + //Get caret position + hwnd1 = GetForegroundWindow (); + a = GetWindowThreadProcessId(hwnd1, NULL); + b = GetCurrentThreadId(); + AttachThreadInput (a, b, TRUE); + hwnd2 = GetFocus(); + + GetCaretPos( &pNewCaret); + ClientToScreen (hwnd2, (LPPOINT) &pNewCaret); + AttachThreadInput (a, b, FALSE); + + //Get current control focus + hwnd3 = GetFocus (); + GetWindowRect (hwnd3 , &controlRect); + pNewFocus.x = controlRect.left; + pNewFocus.y = controlRect.top; + + //If mouse has moved .... + if (((pMouse.x != pNewMouse.x) || (pMouse.y != pNewMouse.y)) && bFollowMouse) + { + //Update to new position + pMouse = pNewMouse; + cp = pNewMouse; + Refresh(); + } + else if (((pCaret.x != pNewCaret.x) || (pCaret.y != pNewCaret.y)) && bFollowCaret) + { + //Update to new position + pCaret = pNewCaret; + cp = pNewCaret; + Refresh(); + } + else if (((pFocus.x != pNewFocus.x) || (pFocus.y != pNewFocus.y)) && bFollowFocus) + { + //Update to new position + pFocus = pNewFocus; + cp = pNewFocus; + Refresh(); + } + } + break; + case WM_COMMAND: + wmId = LOWORD(wParam); + wmEvent = HIWORD(wParam); + // Parse the menu selections: + switch (wmId) + { + case IDM_OPTIONS: + DialogBox(hInst, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hWnd, (DLGPROC)OptionsProc); + break; + case IDM_ABOUT: + DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, (DLGPROC)AboutProc); + break; + case IDM_EXIT: + DestroyWindow(hWnd); + break; + default: + return DefWindowProc(hWnd, message, wParam, lParam); + } + break; case WM_PAINT: - { - PAINTSTRUCT PaintStruct; - HDC dc; - dc = BeginPaint(hWnd, &PaintStruct); - Draw(dc); - EndPaint(hWnd, &PaintStruct); - } + { + PAINTSTRUCT PaintStruct; + HDC dc; + dc = BeginPaint(hWnd, &PaintStruct); + Draw(dc); + EndPaint(hWnd, &PaintStruct); + } break; case WM_ERASEBKGND: - //handle WM_ERASEBKGND by simply returning non-zero because we did all the drawing in WM_PAINT. - break; - case WM_DESTROY: - //Save settings to registry - SaveSettings (); - KillTimer (hWnd , 1); - PostQuitMessage(0); - break; - case WM_CREATE: - //Load settings from registry - LoadSettings (); - - //Get the desktop window - hDesktopWindow = GetDesktopWindow(); - - //Set the timer - SetTimer (hWnd , 1, REPAINT_SPEED , NULL); - break; - default: - return DefWindowProc(hWnd, message, wParam, lParam); - } - return 0; + //handle WM_ERASEBKGND by simply returning non-zero because we did all the drawing in WM_PAINT. + break; + case WM_DESTROY: + //Save settings to registry + SaveSettings (); + KillTimer (hWnd , 1); + PostQuitMessage(0); + break; + case WM_CREATE: + //Load settings from registry + LoadSettings (); + + //Get the desktop window + hDesktopWindow = GetDesktopWindow(); + + //Set the timer + SetTimer (hWnd , 1, REPAINT_SPEED , NULL); + break; + default: + return DefWindowProc(hWnd, message, wParam, lParam); + } + return 0; } // Message handler for about box. INT_PTR CALLBACK AboutProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - switch (message) - { - case WM_INITDIALOG: - return (INT_PTR)TRUE; - - case WM_COMMAND: - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) - { - EndDialog(hDlg, LOWORD(wParam)); - return (INT_PTR)TRUE; - } - break; - } - return (INT_PTR)FALSE; + UNREFERENCED_PARAMETER(lParam); + switch (message) + { + case WM_INITDIALOG: + return (INT_PTR)TRUE; + + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, LOWORD(wParam)); + return (INT_PTR)TRUE; + } + break; + } + return (INT_PTR)FALSE; } // Message handler for options box. INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - switch (message) - { - case WM_INITDIALOG: - { - //Add the zoom items.... - SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("1")); - SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("2")); - SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("3")); - SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("4")); - SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("5")); - SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("6")); - SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("7")); - SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("8")); - - // - SendDlgItemMessage(hDlg, IDC_ZOOM, CB_SETCURSEL, iZoom - 1, 0); - - if (bFollowMouse) - SendDlgItemMessage(hDlg,IDC_FOLLOWMOUSECHECK,BM_SETCHECK , wParam ,0); - - if (bFollowFocus) - SendDlgItemMessage(hDlg,IDC_FOLLOWKEYBOARDCHECK,BM_SETCHECK , wParam ,0); - - if (bFollowCaret) - SendDlgItemMessage(hDlg,IDC_FOLLOWTEXTEDITINGCHECK,BM_SETCHECK , wParam ,0); - - if (bInvertColors) - SendDlgItemMessage(hDlg,IDC_INVERTCOLORSCHECK,BM_SETCHECK , wParam ,0); - - if (bStartMinimized) - SendDlgItemMessage(hDlg,IDC_STARTMINIMIZEDCHECK,BM_SETCHECK , wParam ,0); - - if (bShowMagnifier) - SendDlgItemMessage(hDlg,IDC_SHOWMAGNIFIERCHECK,BM_SETCHECK , wParam ,0); - - return (INT_PTR)TRUE; - } - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDOK: - case IDCANCEL: - EndDialog(hDlg, LOWORD(wParam)); - return (INT_PTR)TRUE; - - case IDC_BUTTON_HELP: - /* unimplemented */ - MessageBox(hDlg , TEXT("Magnifier help not available yet!") , TEXT("Help") , MB_OK); - break; + UNREFERENCED_PARAMETER(lParam); + switch (message) + { + case WM_INITDIALOG: + { + //Add the zoom items.... + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("1")); + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("2")); + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("3")); + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("4")); + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("5")); + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("6")); + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("7")); + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("8")); + + // + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_SETCURSEL, iZoom - 1, 0); + + if (bFollowMouse) + SendDlgItemMessage(hDlg,IDC_FOLLOWMOUSECHECK,BM_SETCHECK , wParam ,0); + + if (bFollowFocus) + SendDlgItemMessage(hDlg,IDC_FOLLOWKEYBOARDCHECK,BM_SETCHECK , wParam ,0); + + if (bFollowCaret) + SendDlgItemMessage(hDlg,IDC_FOLLOWTEXTEDITINGCHECK,BM_SETCHECK , wParam ,0); + + if (bInvertColors) + SendDlgItemMessage(hDlg,IDC_INVERTCOLORSCHECK,BM_SETCHECK , wParam ,0); + + if (bStartMinimized) + SendDlgItemMessage(hDlg,IDC_STARTMINIMIZEDCHECK,BM_SETCHECK , wParam ,0); + + if (bShowMagnifier) + SendDlgItemMessage(hDlg,IDC_SHOWMAGNIFIERCHECK,BM_SETCHECK , wParam ,0); + + return (INT_PTR)TRUE; + } + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + case IDCANCEL: + EndDialog(hDlg, LOWORD(wParam)); + return (INT_PTR)TRUE; + + case IDC_BUTTON_HELP: + /* unimplemented */ + MessageBox(hDlg , TEXT("Magnifier help not available yet!") , TEXT("Help") , MB_OK); + break; case IDC_ZOOM: - if(HIWORD(wParam) == CBN_SELCHANGE) - { - HWND hCombo = GetDlgItem(hDlg,IDC_ZOOM); - - /* Get index of current selection and the text of that selection. */ - iZoom = SendMessage( hCombo, CB_GETCURSEL, (WPARAM) wParam, (LPARAM) lParam ) + 1; - - //Update the magnigier UI - Refresh (); - } - break; - case IDC_INVERTCOLORSCHECK: - bInvertColors = IsDlgButtonChecked (hDlg, IDC_INVERTCOLORSCHECK); - Refresh (); - break; - case IDC_FOLLOWMOUSECHECK: - bFollowMouse = IsDlgButtonChecked (hDlg, IDC_FOLLOWMOUSECHECK); - break; - case IDC_FOLLOWKEYBOARDCHECK: - bFollowFocus = IsDlgButtonChecked (hDlg, IDC_FOLLOWKEYBOARDCHECK); - break; - case IDC_FOLLOWTEXTEDITINGCHECK: - bFollowCaret = IsDlgButtonChecked (hDlg, IDC_FOLLOWTEXTEDITINGCHECK); - break; - case IDC_STARTMINIMIZEDCHECK: - bStartMinimized = IsDlgButtonChecked (hDlg, IDC_STARTMINIMIZEDCHECK); - break; - case IDC_SHOWMAGNIFIER: - bShowMagnifier = IsDlgButtonChecked (hDlg, IDC_SHOWMAGNIFIERCHECK); - if (bShowMagnifier){ - ShowWindow (hMainWnd , SW_SHOW); - }else{ - ShowWindow (hMainWnd , SW_HIDE); - } - break; - } - } - return (INT_PTR)FALSE; + if(HIWORD(wParam) == CBN_SELCHANGE) + { + HWND hCombo = GetDlgItem(hDlg,IDC_ZOOM); + + /* Get index of current selection and the text of that selection. */ + iZoom = SendMessage( hCombo, CB_GETCURSEL, (WPARAM) wParam, (LPARAM) lParam ) + 1; + + //Update the magnigier UI + Refresh (); + } + break; + case IDC_INVERTCOLORSCHECK: + bInvertColors = IsDlgButtonChecked (hDlg, IDC_INVERTCOLORSCHECK); + Refresh (); + break; + case IDC_FOLLOWMOUSECHECK: + bFollowMouse = IsDlgButtonChecked (hDlg, IDC_FOLLOWMOUSECHECK); + break; + case IDC_FOLLOWKEYBOARDCHECK: + bFollowFocus = IsDlgButtonChecked (hDlg, IDC_FOLLOWKEYBOARDCHECK); + break; + case IDC_FOLLOWTEXTEDITINGCHECK: + bFollowCaret = IsDlgButtonChecked (hDlg, IDC_FOLLOWTEXTEDITINGCHECK); + break; + case IDC_STARTMINIMIZEDCHECK: + bStartMinimized = IsDlgButtonChecked (hDlg, IDC_STARTMINIMIZEDCHECK); + break; + case IDC_SHOWMAGNIFIER: + bShowMagnifier = IsDlgButtonChecked (hDlg, IDC_SHOWMAGNIFIERCHECK); + if (bShowMagnifier){ + ShowWindow (hMainWnd , SW_SHOW); + }else{ + ShowWindow (hMainWnd , SW_HIDE); + } + break; + } + } + return (INT_PTR)FALSE; } // Message handler for warning box. INT_PTR CALLBACK WarningProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - - switch (message) - { - case WM_INITDIALOG: - return (INT_PTR)TRUE; - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDC_SHOWWARNINGCHECK: - bShowWarning = !IsDlgButtonChecked (hDlg, IDC_SHOWWARNINGCHECK); - break; - } - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) - { - EndDialog(hDlg, LOWORD(wParam)); - return (INT_PTR)TRUE; - } - break; - } - return (INT_PTR)FALSE; -} + UNREFERENCED_PARAMETER(lParam); + + switch (message) + { + case WM_INITDIALOG: + return (INT_PTR)TRUE; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDC_SHOWWARNINGCHECK: + bShowWarning = !IsDlgButtonChecked (hDlg, IDC_SHOWWARNINGCHECK); + break; + } + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, LOWORD(wParam)); + return (INT_PTR)TRUE; + } + break; + } + return (INT_PTR)FALSE; +}

1 0

[dchapyshev] 36348: - Fix formatting. No code change
by dchapyshev＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: dchapyshev Date: Sat Sep 20 08:45:10 2008 New Revision: 36348 URL: http://svn.reactos.org/svn/reactos?rev=36348&view=rev Log: - Fix formatting. No code change Modified: trunk/reactos/dll/win32/user32/windows/caret.c trunk/reactos/dll/win32/user32/windows/clipboard.c trunk/reactos/dll/win32/user32/windows/cursor.c trunk/reactos/dll/win32/user32/windows/dc.c trunk/reactos/dll/win32/user32/windows/rect.c Modified: trunk/reactos/dll/win32/user32/windows/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/caret.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/caret.c [iso-8859-1] Sat Sep 20 08:45:10 2008 @@ -33,95 +33,120 @@ #include <wine/debug.h> /* FUNCTIONS *****************************************************************/ -void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo) +void +DrawCaret(HWND hWnd, + PTHRDCARETINFO CaretInfo) { - HDC hDC, hComp; + HDC hDC, hComp; - hDC = GetDC(hWnd); - if(hDC) - { - if(CaretInfo->Bitmap && GetBitmapDimensionEx(CaretInfo->Bitmap, &CaretInfo->Size)) + hDC = GetDC(hWnd); + if(hDC) { - hComp = CreateCompatibleDC(hDC); - if(hComp) - { - SelectObject(hComp, CaretInfo->Bitmap); - BitBlt(hDC, CaretInfo->Pos.x, CaretInfo->Pos.y, CaretInfo->Size.cx, CaretInfo->Size.cy, hComp, 0, 0, SRCINVERT); - DeleteDC(hComp); - } - else - PatBlt(hDC, CaretInfo->Pos.x, CaretInfo->Pos.y, CaretInfo->Size.cx, CaretInfo->Size.cy, DSTINVERT); + if(CaretInfo->Bitmap && GetBitmapDimensionEx(CaretInfo->Bitmap, &CaretInfo->Size)) + { + hComp = CreateCompatibleDC(hDC); + if(hComp) + { + SelectObject(hComp, CaretInfo->Bitmap); + BitBlt(hDC, + CaretInfo->Pos.x, + CaretInfo->Pos.y, + CaretInfo->Size.cx, + CaretInfo->Size.cy, + hComp, + 0, + 0, + SRCINVERT); + DeleteDC(hComp); + } + else + PatBlt(hDC, + CaretInfo->Pos.x, + CaretInfo->Pos.y, + CaretInfo->Size.cx, + CaretInfo->Size.cy, + DSTINVERT); + } + else + { + PatBlt(hDC, + CaretInfo->Pos.x, + CaretInfo->Pos.y, + CaretInfo->Size.cx, + CaretInfo->Size.cy, + DSTINVERT); + } + ReleaseDC(hWnd, hDC); } - else - { - PatBlt(hDC, CaretInfo->Pos.x, CaretInfo->Pos.y, CaretInfo->Size.cx, CaretInfo->Size.cy, DSTINVERT); - } - ReleaseDC(hWnd, hDC); - } } /* * @implemented */ -BOOL STDCALL +BOOL +STDCALL CreateCaret(HWND hWnd, - HBITMAP hBitmap, - int nWidth, - int nHeight) + HBITMAP hBitmap, + int nWidth, + int nHeight) { - return (BOOL)NtUserCreateCaret(hWnd, hBitmap, nWidth, nHeight); + return (BOOL)NtUserCreateCaret(hWnd, hBitmap, nWidth, nHeight); } /* * @implemented */ -BOOL STDCALL +BOOL +STDCALL DestroyCaret(VOID) { - return (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_DESTROY_CARET); + return (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_DESTROY_CARET); } /* * @implemented */ -UINT STDCALL +UINT +STDCALL GetCaretBlinkTime(VOID) { - return NtUserGetCaretBlinkTime(); + return NtUserGetCaretBlinkTime(); } /* * @implemented */ -BOOL STDCALL +BOOL +STDCALL GetCaretPos(LPPOINT lpPoint) { - return (BOOL)NtUserGetCaretPos(lpPoint); + return (BOOL)NtUserGetCaretPos(lpPoint); } /* * @implemented */ -BOOL STDCALL +BOOL +STDCALL SetCaretBlinkTime(UINT uMSeconds) { - return NtUserSetCaretBlinkTime(uMSeconds); + return NtUserSetCaretBlinkTime(uMSeconds); } /* * @implemented */ -BOOL STDCALL +BOOL +STDCALL SetCaretPos(int X, - int Y) + int Y) { - return NtUserSetCaretPos(X, Y); + return NtUserSetCaretPos(X, Y); } - /* EOF */ Modified: trunk/reactos/dll/win32/user32/windows/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] Sat Sep 20 08:45:10 2008 @@ -26,17 +26,19 @@ /* * @implemented */ -BOOL STDCALL +BOOL +STDCALL OpenClipboard(HWND hWndNewOwner) { - BOOL ret = NtUserOpenClipboard(hWndNewOwner, 0); - return ret; -} - -/* - * @implemented - */ -BOOL STDCALL + BOOL ret = NtUserOpenClipboard(hWndNewOwner, 0); + return ret; +} + +/* + * @implemented + */ +BOOL +STDCALL CloseClipboard(VOID) { BOOL ret; @@ -47,7 +49,8 @@ /* * @implemented */ -INT STDCALL +INT +STDCALL CountClipboardFormats(VOID) { INT ret = NtUserCountClipboardFormats(); @@ -57,7 +60,8 @@ /* * @implemented */ -BOOL STDCALL +BOOL +STDCALL EmptyClipboard(VOID) { return NtUserEmptyClipboard(); @@ -66,7 +70,8 @@ /* * @implemented */ -UINT STDCALL +UINT +STDCALL EnumClipboardFormats(UINT format) { UINT ret = NtUserCallOneParam(format, ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS); @@ -76,7 +81,8 @@ /* * @implemented */ -HANDLE STDCALL +HANDLE +STDCALL GetClipboardData(UINT uFormat) { HGLOBAL hGlobal = NULL; @@ -109,8 +115,11 @@ /* * @implemented */ -INT STDCALL -GetClipboardFormatNameA(UINT format, LPSTR lpszFormatName, int cchMaxCount) +INT +STDCALL +GetClipboardFormatNameA(UINT format, + LPSTR lpszFormatName, + int cchMaxCount) { LPWSTR lpBuffer; UNICODE_STRING FormatName; @@ -123,32 +132,35 @@ return 0; } - FormatName.Length = 0; - FormatName.MaximumLength = cchMaxCount * sizeof(WCHAR); - FormatName.Buffer = lpBuffer; + FormatName.Length = 0; + FormatName.MaximumLength = cchMaxCount * sizeof(WCHAR); + FormatName.Buffer = lpBuffer; /* we need a UNICODE string */ - Length = NtUserGetClipboardFormatName(format, &FormatName, cchMaxCount); - - if (Length != 0) - { - if (!WideCharToMultiByte(CP_ACP, 0, lpBuffer, Length, lpszFormatName, cchMaxCount, NULL, NULL)) - { - /* clear result string */ - Length = 0; - } - lpszFormatName[Length] = '\0'; - } - - RtlFreeHeap(RtlGetProcessHeap(), 0, lpBuffer); - return Length; -} - -/* - * @implemented - */ -INT STDCALL -GetClipboardFormatNameW(UINT format, LPWSTR lpszFormatName, INT cchMaxCount) + Length = NtUserGetClipboardFormatName(format, &FormatName, cchMaxCount); + + if (Length != 0) + { + if (!WideCharToMultiByte(CP_ACP, 0, lpBuffer, Length, lpszFormatName, cchMaxCount, NULL, NULL)) + { + /* clear result string */ + Length = 0; + } + lpszFormatName[Length] = '\0'; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, lpBuffer); + return Length; +} + +/* + * @implemented + */ +INT +STDCALL +GetClipboardFormatNameW(UINT format, + LPWSTR lpszFormatName, + INT cchMaxCount) { UNICODE_STRING FormatName; ULONG Ret; @@ -164,43 +176,48 @@ /* * @implemented */ -HWND STDCALL +HWND +STDCALL GetClipboardOwner(VOID) { - return NtUserGetClipboardOwner(); -} - -/* - * @implemented - */ -DWORD STDCALL + return NtUserGetClipboardOwner(); +} + +/* + * @implemented + */ +DWORD +STDCALL GetClipboardSequenceNumber(VOID) { - return NtUserGetClipboardSequenceNumber(); -} - -/* - * @implemented - */ -HWND STDCALL + return NtUserGetClipboardSequenceNumber(); +} + +/* + * @implemented + */ +HWND +STDCALL GetClipboardViewer(VOID) { - return NtUserGetClipboardViewer(); -} - -/* - * @implemented - */ -HWND STDCALL + return NtUserGetClipboardViewer(); +} + +/* + * @implemented + */ +HWND +STDCALL GetOpenClipboardWindow(VOID) { - return NtUserGetOpenClipboardWindow(); -} - -/* - * @implemented - */ -INT STDCALL + return NtUserGetOpenClipboardWindow(); +} + +/* + * @implemented + */ +INT +STDCALL GetPriorityClipboardFormat(UINT *paFormatPriorityList, INT cFormats) { INT ret = NtUserGetPriorityClipboardFormat(paFormatPriorityList, cFormats); @@ -210,7 +227,8 @@ /* * @implemented */ -BOOL STDCALL +BOOL +STDCALL IsClipboardFormatAvailable(UINT format) { BOOL ret = NtUserIsClipboardFormatAvailable(format); @@ -221,7 +239,8 @@ * @implemented */ -UINT STDCALL +UINT +STDCALL RegisterClipboardFormatA(LPCSTR lpszFormat) { UINT ret = 0; @@ -253,7 +272,8 @@ /* * @implemented */ -UINT STDCALL +UINT +STDCALL RegisterClipboardFormatW(LPCWSTR lpszFormat) { UINT ret = 0; @@ -278,71 +298,73 @@ return ret; } -HGLOBAL renderLocale (DWORD Locale) -{ - DWORD* pLocale; - HGLOBAL hGlobal; - - hGlobal = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, sizeof(DWORD)); - - if(!hGlobal) - { - return hGlobal; - } +HGLOBAL +renderLocale(DWORD Locale) +{ + DWORD* pLocale; + HGLOBAL hGlobal; + + hGlobal = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, sizeof(DWORD)); + + if(!hGlobal) + { + return hGlobal; + } pLocale = (DWORD*)GlobalLock(hGlobal); - *pLocale = Locale; - - GlobalUnlock(hGlobal); - - return hGlobal; -} - -/* - * @implemented - */ -HANDLE STDCALL + *pLocale = Locale; + + GlobalUnlock(hGlobal); + + return hGlobal; +} + +/* + * @implemented + */ +HANDLE +STDCALL SetClipboardData(UINT uFormat, HANDLE hMem) { - DWORD size; - LPVOID pMem; - HANDLE ret = NULL; - - if (hMem == NULL) - { - return NtUserSetClipboardData(uFormat, 0, 0); - } - - if (uFormat == CF_BITMAP) - { - /* GlobalLock should return 0 for GDI handles - pMem = GlobalLock(hMem); - if (pMem) - { - // not a GDI handle - GlobalUnlock(hMem); - return ret; - } - else - { - */ - /* check if this GDI handle is a HBITMAP */ - /* GetObject for HBITMAP not implemented in ReactOS */ - //if (GetObject(hMem, 0, NULL) == sifeof(BITMAP)) - //{ - return NtUserSetClipboardData(CF_BITMAP, hMem, 0); - //} - /*}*/ - } + DWORD size; + LPVOID pMem; + HANDLE ret = NULL; + + if (hMem == NULL) + { + return NtUserSetClipboardData(uFormat, 0, 0); + } + + if (uFormat == CF_BITMAP) + { + /* GlobalLock should return 0 for GDI handles + pMem = GlobalLock(hMem); + if (pMem) + { + // not a GDI handle + GlobalUnlock(hMem); + return ret; + } + else + { + */ + /* check if this GDI handle is a HBITMAP */ + /* GetObject for HBITMAP not implemented in ReactOS */ + //if (GetObject(hMem, 0, NULL) == sifeof(BITMAP)) + //{ + return NtUserSetClipboardData(CF_BITMAP, hMem, 0); + //} + /*}*/ + } size = GlobalSize(hMem); pMem = GlobalLock(hMem); - if ((pMem) && (size)) - { - size = GlobalSize(hMem); - ret = NtUserSetClipboardData(uFormat, pMem, size); + if ((pMem) && (size)) + { + size = GlobalSize(hMem); + ret = NtUserSetClipboardData(uFormat, pMem, size); //should i unlock hMem? GlobalUnlock(hMem); } @@ -358,25 +380,29 @@ /* * @implemented */ -HWND STDCALL +HWND +STDCALL SetClipboardViewer(HWND hWndNewViewer) { - return NtUserSetClipboardViewer(hWndNewViewer); -} - -/* - * @implemented - */ -BOOL STDCALL -ChangeClipboardChain(HWND hWndRemove, HWND hWndNewNext) -{ - return NtUserChangeClipboardChain(hWndRemove, hWndNewNext); + return NtUserSetClipboardViewer(hWndNewViewer); +} + +/* + * @implemented + */ +BOOL +STDCALL +ChangeClipboardChain(HWND hWndRemove, + HWND hWndNewNext) +{ + return NtUserChangeClipboardChain(hWndRemove, hWndNewNext); } /* * @unimplemented */ -BOOL STDCALL +BOOL +STDCALL AddClipboardFormatListener(HWND hwnd) { UNIMPLEMENTED; @@ -385,7 +411,8 @@ /* * @unimplemented */ -BOOL STDCALL +BOOL +STDCALL RemoveClipboardFormatListener(HWND hwnd) { UNIMPLEMENTED; @@ -395,11 +422,11 @@ /* * @unimplemented */ -BOOL STDCALL -GetUpdatedClipboardFormats( - PUINT lpuiFormats, - UINT cFormats, - PUINT pcFormatsOut) +BOOL +STDCALL +GetUpdatedClipboardFormats(PUINT lpuiFormats, + UINT cFormats, + PUINT pcFormatsOut) { UNIMPLEMENTED; return FALSE; Modified: trunk/reactos/dll/win32/user32/windows/cursor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/cursor.c [iso-8859-1] Sat Sep 20 08:45:10 2008 @@ -42,25 +42,27 @@ /* INTERNAL ******************************************************************/ /* This callback routine is called directly after switching to gui mode */ -NTSTATUS STDCALL -User32SetupDefaultCursors(PVOID Arguments, ULONG ArgumentLength) -{ - BOOL *DefaultCursor = (BOOL*)Arguments; - LRESULT Result = TRUE; - - if(*DefaultCursor) - { - /* set default cursor */ - SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); - } - else - { - /* FIXME load system cursor scheme */ - SetCursor(0); - SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); - } - - return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); +NTSTATUS +STDCALL +User32SetupDefaultCursors(PVOID Arguments, + ULONG ArgumentLength) +{ + BOOL *DefaultCursor = (BOOL*)Arguments; + LRESULT Result = TRUE; + + if(*DefaultCursor) + { + /* set default cursor */ + SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); + } + else + { + /* FIXME load system cursor scheme */ + SetCursor(0); + SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); + } + + return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); } /* FUNCTIONS *****************************************************************/ @@ -69,270 +71,301 @@ /* * @implemented */ -HCURSOR STDCALL +HCURSOR +STDCALL CopyCursor(HCURSOR pcur) { - ICONINFO IconInfo; - - if(GetIconInfo((HANDLE)pcur, &IconInfo)) - { + ICONINFO IconInfo; + + if(GetIconInfo((HANDLE)pcur, &IconInfo)) + { + return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE); + } + return (HCURSOR)0; +} + +/* + * @implemented + */ +HCURSOR +STDCALL +CreateCursor(HINSTANCE hInst, + int xHotSpot, + int yHotSpot, + int nWidth, + int nHeight, + CONST VOID *pvANDPlane, + CONST VOID *pvXORPlane) +{ + ICONINFO IconInfo; + BYTE BitmapInfoBuffer[sizeof(BITMAPINFOHEADER) + 2 * sizeof(RGBQUAD)]; + BITMAPINFO *bwBIH = (BITMAPINFO *)BitmapInfoBuffer; + HDC hScreenDc; + + hScreenDc = CreateCompatibleDC(NULL); + if (hScreenDc == NULL) + return NULL; + + bwBIH->bmiHeader.biBitCount = 1; + bwBIH->bmiHeader.biWidth = nWidth; + bwBIH->bmiHeader.biHeight = -nHeight * 2; + bwBIH->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bwBIH->bmiHeader.biPlanes = 1; + bwBIH->bmiHeader.biSizeImage = 0; + bwBIH->bmiHeader.biCompression = BI_RGB; + bwBIH->bmiHeader.biClrImportant = 0; + bwBIH->bmiHeader.biClrUsed = 0; + bwBIH->bmiHeader.biXPelsPerMeter = 0; + bwBIH->bmiHeader.biYPelsPerMeter = 0; + + bwBIH->bmiColors[0].rgbBlue = 0; + bwBIH->bmiColors[0].rgbGreen = 0; + bwBIH->bmiColors[0].rgbRed = 0; + bwBIH->bmiColors[0].rgbReserved = 0; + + bwBIH->bmiColors[1].rgbBlue = 0xff; + bwBIH->bmiColors[1].rgbGreen = 0xff; + bwBIH->bmiColors[1].rgbRed = 0xff; + bwBIH->bmiColors[1].rgbReserved = 0; + + IconInfo.hbmMask = CreateDIBitmap(hScreenDc, &bwBIH->bmiHeader, 0, + NULL, bwBIH, DIB_RGB_COLORS); + if (IconInfo.hbmMask) + { + SetDIBits(hScreenDc, IconInfo.hbmMask, 0, nHeight, + pvXORPlane, bwBIH, DIB_RGB_COLORS); + SetDIBits(hScreenDc, IconInfo.hbmMask, nHeight, nHeight, + pvANDPlane, bwBIH, DIB_RGB_COLORS); + } + else + { + return NULL; + } + + DeleteDC(hScreenDc); + + IconInfo.fIcon = FALSE; + IconInfo.xHotspot = xHotSpot; + IconInfo.yHotspot = yHotSpot; + IconInfo.hbmColor = 0; + return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE); - } - return (HCURSOR)0; -} - -/* - * @implemented - */ -HCURSOR STDCALL -CreateCursor(HINSTANCE hInst, - int xHotSpot, - int yHotSpot, - int nWidth, - int nHeight, - CONST VOID *pvANDPlane, - CONST VOID *pvXORPlane) -{ - ICONINFO IconInfo; - BYTE BitmapInfoBuffer[sizeof(BITMAPINFOHEADER) + 2 * sizeof(RGBQUAD)]; - BITMAPINFO *bwBIH = (BITMAPINFO *)BitmapInfoBuffer; - HDC hScreenDc; - - hScreenDc = CreateCompatibleDC(NULL); - if (hScreenDc == NULL) - return NULL; - - bwBIH->bmiHeader.biBitCount = 1; - bwBIH->bmiHeader.biWidth = nWidth; - bwBIH->bmiHeader.biHeight = -nHeight * 2; - bwBIH->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bwBIH->bmiHeader.biPlanes = 1; - bwBIH->bmiHeader.biSizeImage = 0; - bwBIH->bmiHeader.biCompression = BI_RGB; - bwBIH->bmiHeader.biClrImportant = 0; - bwBIH->bmiHeader.biClrUsed = 0; - bwBIH->bmiHeader.biXPelsPerMeter = 0; - bwBIH->bmiHeader.biYPelsPerMeter = 0; - - bwBIH->bmiColors[0].rgbBlue = 0; - bwBIH->bmiColors[0].rgbGreen = 0; - bwBIH->bmiColors[0].rgbRed = 0; - bwBIH->bmiColors[0].rgbReserved = 0; - - bwBIH->bmiColors[1].rgbBlue = 0xff; - bwBIH->bmiColors[1].rgbGreen = 0xff; - bwBIH->bmiColors[1].rgbRed = 0xff; - bwBIH->bmiColors[1].rgbReserved = 0; - - IconInfo.hbmMask = CreateDIBitmap(hScreenDc, &bwBIH->bmiHeader, 0, - NULL, bwBIH, DIB_RGB_COLORS); - if (IconInfo.hbmMask) - { - SetDIBits(hScreenDc, IconInfo.hbmMask, 0, nHeight, - pvXORPlane, bwBIH, DIB_RGB_COLORS); - SetDIBits(hScreenDc, IconInfo.hbmMask, nHeight, nHeight, - pvANDPlane, bwBIH, DIB_RGB_COLORS); - } - else - { - return NULL; - } - - DeleteDC(hScreenDc); - - IconInfo.fIcon = FALSE; - IconInfo.xHotspot = xHotSpot; - IconInfo.yHotspot = yHotSpot; - IconInfo.hbmColor = 0; - - return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE); -} - - -/* - * @implemented - */ -BOOL STDCALL +} + + +/* + * @implemented + */ +BOOL +STDCALL DestroyCursor(HCURSOR hCursor) { - return (BOOL)NtUserDestroyCursor((HANDLE)hCursor, 0); -} - - -/* - * @implemented - */ -BOOL STDCALL + return (BOOL)NtUserDestroyCursor((HANDLE)hCursor, 0); +} + + +/* + * @implemented + */ +BOOL +STDCALL GetClipCursor(LPRECT lpRect) { - return NtUserGetClipCursor(lpRect); -} - - -/* - * @implemented - */ -HCURSOR STDCALL + return NtUserGetClipCursor(lpRect); +} + + +/* + * @implemented + */ +HCURSOR +STDCALL GetCursor(VOID) { - CURSORINFO ci; - ci.cbSize = sizeof(CURSORINFO); - if(NtUserGetCursorInfo(&ci)) - return ci.hCursor; - else - return (HCURSOR)0; -} - - -/* - * @implemented - */ -BOOL STDCALL + CURSORINFO ci; + ci.cbSize = sizeof(CURSORINFO); + if(NtUserGetCursorInfo(&ci)) + return ci.hCursor; + else + return (HCURSOR)0; +} + + +/* + * @implemented + */ +BOOL +STDCALL GetCursorInfo(PCURSORINFO pci) { - return (BOOL)NtUserGetCursorInfo(pci); -} - - -/* - * @implemented - */ -BOOL STDCALL + return (BOOL)NtUserGetCursorInfo(pci); +} + + +/* + * @implemented + */ +BOOL +STDCALL GetCursorPos(LPPOINT lpPoint) { - BOOL res; - /* Windows doesn't check if lpPoint == NULL, we do */ - if(!lpPoint) - { - SetLastError(ERROR_INVALID_PARAMETER); + BOOL res; + /* Windows doesn't check if lpPoint == NULL, we do */ + if(!lpPoint) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + res = NtUserGetCursorPos(lpPoint); + + return res; +} + + +/* + * @implemented + */ +HCURSOR +STDCALL +LoadCursorA(HINSTANCE hInstance, + LPCSTR lpCursorName) +{ + return(LoadImageA(hInstance, + lpCursorName, + IMAGE_CURSOR, + 0, + 0, + LR_SHARED | LR_DEFAULTSIZE)); +} + + +/* + * @implemented + */ +HCURSOR +STDCALL +LoadCursorFromFileA(LPCSTR lpFileName) +{ + UNICODE_STRING FileName; + HCURSOR Result; + RtlCreateUnicodeStringFromAsciiz(&FileName, (LPSTR)lpFileName); + Result = LoadImageW(0, + FileName.Buffer, + IMAGE_CURSOR, + 0, + 0, + LR_LOADFROMFILE | LR_DEFAULTSIZE); + RtlFreeUnicodeString(&FileName); + return(Result); +} + + +/* + * @implemented + */ +HCURSOR +STDCALL +LoadCursorFromFileW(LPCWSTR lpFileName) +{ + return(LoadImageW(0, + lpFileName, + IMAGE_CURSOR, + 0, + 0, + LR_LOADFROMFILE | LR_DEFAULTSIZE)); +} + + +/* + * @implemented + */ +HCURSOR +STDCALL +LoadCursorW(HINSTANCE hInstance, + LPCWSTR lpCursorName) +{ + return(LoadImageW(hInstance, + lpCursorName, + IMAGE_CURSOR, + 0, + 0, + LR_SHARED | LR_DEFAULTSIZE)); +} + + +/* + * @implemented + */ +BOOL +STDCALL +ClipCursor(CONST RECT *lpRect) +{ + return NtUserClipCursor((RECT *)lpRect); +} + + +/* + * @implemented + */ +HCURSOR +STDCALL +SetCursor(HCURSOR hCursor) +{ + return NtUserSetCursor(hCursor); +} + + +/* + * @implemented + */ +BOOL +STDCALL +SetCursorPos(int X, + int Y) +{ + INPUT Input; + + Input.type = INPUT_MOUSE; + Input.mi.dx = (LONG)X; + Input.mi.dy = (LONG)Y; + Input.mi.mouseData = 0; + Input.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; + Input.mi.time = 0; + Input.mi.dwExtraInfo = 0; + + NtUserSendInput(1, &Input, sizeof(INPUT)); + return TRUE; +} + + +/* + * @unimplemented + */ +BOOL +STDCALL +SetSystemCursor(HCURSOR hcur, + DWORD id) +{ + UNIMPLEMENTED; return FALSE; - } - - res = NtUserGetCursorPos(lpPoint); - - return res; -} - - -/* - * @implemented - */ -HCURSOR STDCALL -LoadCursorA(HINSTANCE hInstance, - LPCSTR lpCursorName) -{ - return(LoadImageA(hInstance, lpCursorName, IMAGE_CURSOR, 0, 0, - LR_SHARED | LR_DEFAULTSIZE)); -} - - -/* - * @implemented - */ -HCURSOR STDCALL -LoadCursorFromFileA(LPCSTR lpFileName) -{ - UNICODE_STRING FileName; - HCURSOR Result; - RtlCreateUnicodeStringFromAsciiz(&FileName, (LPSTR)lpFileName); - Result = LoadImageW(0, FileName.Buffer, IMAGE_CURSOR, 0, 0, - LR_LOADFROMFILE | LR_DEFAULTSIZE); - RtlFreeUnicodeString(&FileName); - return(Result); -} - - -/* - * @implemented - */ -HCURSOR STDCALL -LoadCursorFromFileW(LPCWSTR lpFileName) -{ - return(LoadImageW(0, lpFileName, IMAGE_CURSOR, 0, 0, - LR_LOADFROMFILE | LR_DEFAULTSIZE)); -} - - -/* - * @implemented - */ -HCURSOR STDCALL -LoadCursorW(HINSTANCE hInstance, - LPCWSTR lpCursorName) -{ - return(LoadImageW(hInstance, lpCursorName, IMAGE_CURSOR, 0, 0, - LR_SHARED | LR_DEFAULTSIZE)); -} - - -/* - * @implemented - */ -BOOL -STDCALL -ClipCursor( - CONST RECT *lpRect) -{ - return NtUserClipCursor((RECT *)lpRect); -} - - -/* - * @implemented - */ -HCURSOR STDCALL -SetCursor(HCURSOR hCursor) -{ - return NtUserSetCursor(hCursor); -} - - -/* - * @implemented - */ -BOOL STDCALL -SetCursorPos(int X, - int Y) -{ - INPUT Input; - - Input.type = INPUT_MOUSE; - Input.mi.dx = (LONG)X; - Input.mi.dy = (LONG)Y; - Input.mi.mouseData = 0; - Input.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; - Input.mi.time = 0; - Input.mi.dwExtraInfo = 0; - - NtUserSendInput(1, &Input, sizeof(INPUT)); - return TRUE; -} - - -/* - * @unimplemented - */ -BOOL STDCALL -SetSystemCursor(HCURSOR hcur, - DWORD id) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @implemented - */ -int STDCALL +} + + +/* + * @implemented + */ +int +STDCALL ShowCursor(BOOL bShow) { - return NtUserShowCursor(bShow); -} - -HCURSOR -CursorIconToCursor(HICON hIcon, BOOL SemiTransparent) -{ - UNIMPLEMENTED; - return 0; -} + return NtUserShowCursor(bShow); +} + +HCURSOR +CursorIconToCursor(HICON hIcon, + BOOL SemiTransparent) +{ + UNIMPLEMENTED; + return 0; +} Modified: trunk/reactos/dll/win32/user32/windows/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dc.c [iso-8859-1] Sat Sep 20 08:45:10 2008 @@ -39,10 +39,9 @@ */ HDC STDCALL -GetDC( - HWND hWnd) +GetDC(HWND hWnd) { - return NtUserGetDC(hWnd); + return NtUserGetDC(hWnd); } @@ -51,12 +50,11 @@ */ HDC STDCALL -GetDCEx( - HWND hWnd, - HRGN hrgnClip, - DWORD flags) +GetDCEx(HWND hWnd, + HRGN hrgnClip, + DWORD flags) { - return NtUserGetDCEx(hWnd, hrgnClip, flags); + return NtUserGetDCEx(hWnd, hrgnClip, flags); } @@ -65,32 +63,32 @@ */ HDC STDCALL -GetWindowDC( - HWND hWnd) +GetWindowDC(HWND hWnd) { - return (HDC)NtUserGetWindowDC(hWnd); + return (HDC)NtUserGetWindowDC(hWnd); } -BOOL STDCALL GdiReleaseDC(HDC hdc); +BOOL +STDCALL +GdiReleaseDC(HDC hdc); /* * @implemented */ int STDCALL -ReleaseDC( - HWND hWnd, - HDC hDC) +ReleaseDC(HWND hWnd, + HDC hDC) { - // From msdn: if the DC was not released return zero. - // if the DC was released return one. + // From msdn: if the DC was not released return zero. + // if the DC was released return one. - if (!hDC) return FALSE; // Null hDC return zero. + if (!hDC) return FALSE; // Null hDC return zero. - GdiReleaseDC ( hDC ); // Release locals. - // Win 3.1 throw back, hWnd is ignored and not used. - return NtUserCallOneParam( (DWORD) hDC, ONEPARAM_ROUTINE_RELEASEDC); + GdiReleaseDC ( hDC ); // Release locals. + // Win 3.1 throw back, hWnd is ignored and not used. + return NtUserCallOneParam((DWORD) hDC, ONEPARAM_ROUTINE_RELEASEDC); } @@ -99,8 +97,7 @@ */ HWND STDCALL -WindowFromDC( - HDC hDC) +WindowFromDC(HDC hDC) { - return NtUserWindowFromDC(hDC); + return NtUserWindowFromDC(hDC); } Modified: trunk/reactos/dll/win32/user32/windows/rect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/r… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/rect.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/rect.c [iso-8859-1] Sat Sep 20 08:45:10 2008 @@ -37,202 +37,227 @@ /* * @implemented */ -BOOL STDCALL -CopyRect(LPRECT lprcDst, CONST RECT *lprcSrc) -{ - if(lprcDst == NULL || lprcSrc == NULL) - return(FALSE); - - *lprcDst = *lprcSrc; - return(TRUE); -} - - -/* - * @implemented - */ -BOOL STDCALL -EqualRect( - CONST RECT *lprc1, - CONST RECT *lprc2) -{ - if (lprc1 == NULL || lprc2 == NULL) - return FALSE; - - return (lprc1->left == lprc2->left) && (lprc1->top == lprc2->top) && - (lprc1->right == lprc2->right) && (lprc1->bottom == lprc2->bottom); -} - - -/* - * @implemented - */ -BOOL STDCALL -InflateRect(LPRECT rect, int dx, int dy) -{ - rect->left -= dx; - rect->top -= dy; - rect->right += dx; - rect->bottom += dy; - return(TRUE); -} - - -/* - * @implemented - */ -BOOL STDCALL +BOOL +STDCALL +CopyRect(LPRECT lprcDst, + CONST RECT *lprcSrc) +{ + if(lprcDst == NULL || lprcSrc == NULL) + return(FALSE); + + *lprcDst = *lprcSrc; + return(TRUE); +} + + +/* + * @implemented + */ +BOOL +STDCALL +EqualRect(CONST RECT *lprc1, + CONST RECT *lprc2) +{ + if (lprc1 == NULL || lprc2 == NULL) + return FALSE; + + return (lprc1->left == lprc2->left) && (lprc1->top == lprc2->top) && + (lprc1->right == lprc2->right) && (lprc1->bottom == lprc2->bottom); +} + + +/* + * @implemented + */ +BOOL +STDCALL +InflateRect(LPRECT rect, + int dx, + int dy) +{ + rect->left -= dx; + rect->top -= dy; + rect->right += dx; + rect->bottom += dy; + return(TRUE); +} + + +/* + * @implemented + */ +BOOL +STDCALL IntersectRect(LPRECT lprcDst, - CONST RECT *lprcSrc1, - CONST RECT *lprcSrc2) -{ - if (IsRectEmpty(lprcSrc1) || IsRectEmpty(lprcSrc2) || - lprcSrc1->left >= lprcSrc2->right || - lprcSrc2->left >= lprcSrc1->right || - lprcSrc1->top >= lprcSrc2->bottom || - lprcSrc2->top >= lprcSrc1->bottom) - { - SetRectEmpty(lprcDst); - return(FALSE); - } - lprcDst->left = max(lprcSrc1->left, lprcSrc2->left); - lprcDst->right = min(lprcSrc1->right, lprcSrc2->right); - lprcDst->top = max(lprcSrc1->top, lprcSrc2->top); - lprcDst->bottom = min(lprcSrc1->bottom, lprcSrc2->bottom); - return(TRUE); -} - - -/* - * @implemented - */ -BOOL STDCALL + CONST RECT *lprcSrc1, + CONST RECT *lprcSrc2) +{ + if (IsRectEmpty(lprcSrc1) || IsRectEmpty(lprcSrc2) || + lprcSrc1->left >= lprcSrc2->right || + lprcSrc2->left >= lprcSrc1->right || + lprcSrc1->top >= lprcSrc2->bottom || + lprcSrc2->top >= lprcSrc1->bottom) + { + SetRectEmpty(lprcDst); + return(FALSE); + } + lprcDst->left = max(lprcSrc1->left, lprcSrc2->left); + lprcDst->right = min(lprcSrc1->right, lprcSrc2->right); + lprcDst->top = max(lprcSrc1->top, lprcSrc2->top); + lprcDst->bottom = min(lprcSrc1->bottom, lprcSrc2->bottom); + return(TRUE); +} + + +/* + * @implemented + */ +BOOL +STDCALL IsRectEmpty(CONST RECT *lprc) { - return((lprc->left >= lprc->right) || (lprc->top >= lprc->bottom)); -} - - -/* - * @implemented - */ -BOOL STDCALL -OffsetRect(LPRECT rect, int dx, int dy) -{ - if(rect == NULL) - return(FALSE); - - rect->left += dx; - rect->top += dy; - rect->right += dx; - rect->bottom += dy; - return(TRUE); -} - - -/* - * @implemented - */ -BOOL STDCALL -PtInRect(CONST RECT *lprc, POINT pt) -{ - return((pt.x >= lprc->left) && (pt.x < lprc->right) && - (pt.y >= lprc->top) && (pt.y < lprc->bottom)); -} - -BOOL STDCALL -SetRect(LPRECT lprc, int xLeft, int yTop, int xRight, int yBottom) -{ - lprc->left = xLeft; - lprc->top = yTop; - lprc->right = xRight; - lprc->bottom = yBottom; - return(TRUE); -} - - -/* - * @implemented - */ -BOOL STDCALL + return((lprc->left >= lprc->right) || (lprc->top >= lprc->bottom)); +} + + +/* + * @implemented + */ +BOOL +STDCALL +OffsetRect(LPRECT rect, + int dx, + int dy) +{ + if(rect == NULL) + return(FALSE); + + rect->left += dx; + rect->top += dy; + rect->right += dx; + rect->bottom += dy; + return(TRUE); +} + + +/* + * @implemented + */ +BOOL +STDCALL +PtInRect(CONST RECT *lprc, + POINT pt) +{ + return((pt.x >= lprc->left) && (pt.x < lprc->right) && + (pt.y >= lprc->top) && (pt.y < lprc->bottom)); +} + +BOOL +STDCALL +SetRect(LPRECT lprc, + int xLeft, + int yTop, + int xRight, + int yBottom) +{ + lprc->left = xLeft; + lprc->top = yTop; + lprc->right = xRight; + lprc->bottom = yBottom; + return(TRUE); +} + + +/* + * @implemented + */ +BOOL +STDCALL SetRectEmpty(LPRECT lprc) { - lprc->left = lprc->right = lprc->top = lprc->bottom = 0; - return(TRUE); -} - - -/* - * @implemented - */ -BOOL STDCALL -SubtractRect(LPRECT lprcDst, CONST RECT *lprcSrc1, CONST RECT *lprcSrc2) -{ - RECT tempRect; - - if(lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL) - return(FALSE); - - CopyRect(lprcDst, lprcSrc1); - - if(!IntersectRect(&tempRect, lprcSrc1, lprcSrc2)) - return(TRUE); - - if (EqualRect(&tempRect, lprcDst)) - { - SetRectEmpty(lprcDst); - return FALSE; - } - if(lprcDst->top == tempRect.top && lprcDst->bottom == tempRect.bottom) - { - if(lprcDst->left == tempRect.left) - lprcDst->left = tempRect.right; - else if(lprcDst->right == tempRect.right) - lprcDst->right = tempRect.left; - } - else if(lprcDst->left == tempRect.left && lprcDst->right == tempRect.right) - { - if(lprcDst->top == tempRect.top) - lprcDst->top = tempRect.bottom; - else if(lprcDst->right == tempRect.right) - lprcDst->right = tempRect.left; - } - - return(TRUE); -} - - -/* - * @implemented - */ -BOOL STDCALL -UnionRect(LPRECT lprcDst, CONST RECT *lprcSrc1, CONST RECT *lprcSrc2) -{ - if (IsRectEmpty(lprcSrc1)) - { - if (IsRectEmpty(lprcSrc2)) - { - SetRectEmpty(lprcDst); - return(FALSE); - } - else - { - *lprcDst = *lprcSrc2; - } - } - else - { - if (IsRectEmpty(lprcSrc2)) - { - *lprcDst = *lprcSrc1; - } - else - { - lprcDst->left = min(lprcSrc1->left, lprcSrc2->left); - lprcDst->top = min(lprcSrc1->top, lprcSrc2->top); - lprcDst->right = max(lprcSrc1->right, lprcSrc2->right); - lprcDst->bottom = max(lprcSrc1->bottom, lprcSrc2->bottom); - } - } - return(TRUE); -} + lprc->left = lprc->right = lprc->top = lprc->bottom = 0; + return(TRUE); +} + + +/* + * @implemented + */ +BOOL +STDCALL +SubtractRect(LPRECT lprcDst, + CONST RECT *lprcSrc1, + CONST RECT *lprcSrc2) +{ + RECT tempRect; + + if(lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL) + return(FALSE); + + CopyRect(lprcDst, lprcSrc1); + + if(!IntersectRect(&tempRect, lprcSrc1, lprcSrc2)) + return(TRUE); + + if (EqualRect(&tempRect, lprcDst)) + { + SetRectEmpty(lprcDst); + return FALSE; + } + if(lprcDst->top == tempRect.top && lprcDst->bottom == tempRect.bottom) + { + if(lprcDst->left == tempRect.left) + lprcDst->left = tempRect.right; + else if(lprcDst->right == tempRect.right) + lprcDst->right = tempRect.left; + } + else if(lprcDst->left == tempRect.left && lprcDst->right == tempRect.right) + { + if(lprcDst->top == tempRect.top) + lprcDst->top = tempRect.bottom; + else if(lprcDst->right == tempRect.right) + lprcDst->right = tempRect.left; + } + + return(TRUE); +} + + +/* + * @implemented + */ +BOOL +STDCALL +UnionRect(LPRECT lprcDst, + CONST RECT *lprcSrc1, + CONST RECT *lprcSrc2) +{ + if (IsRectEmpty(lprcSrc1)) + { + if (IsRectEmpty(lprcSrc2)) + { + SetRectEmpty(lprcDst); + return(FALSE); + } + else + { + *lprcDst = *lprcSrc2; + } + } + else + { + if (IsRectEmpty(lprcSrc2)) + { + *lprcDst = *lprcSrc1; + } + else + { + lprcDst->left = min(lprcSrc1->left, lprcSrc2->left); + lprcDst->top = min(lprcSrc1->top, lprcSrc2->top); + lprcDst->right = max(lprcSrc1->right, lprcSrc2->right); + lprcDst->bottom = max(lprcSrc1->bottom, lprcSrc2->bottom); + } + } + + return(TRUE); +}

1 0

[cwittich] 36347: fix resource leaks
by cwittich＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: cwittich Date: Sat Sep 20 08:44:56 2008 New Revision: 36347 URL: http://svn.reactos.org/svn/reactos?rev=36347&view=rev Log: fix resource leaks Modified: trunk/rosapps/applications/magnify/magnifier.c Modified: trunk/rosapps/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/magnify/magni… ============================================================================== --- trunk/rosapps/applications/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/rosapps/applications/magnify/magnifier.c [iso-8859-1] Sat Sep 20 08:44:56 2008 @@ -184,7 +184,8 @@ GetClientRect(hMainWnd, &appRect); GetWindowRect(hDesktopWindow, &R); - memset(&cinfo, 0, sizeof(cinfo)); + ZeroMemory(&cinfo, sizeof(CURSORINFO)); + ZeroMemory(&iinfo, sizeof(ICONINFO)); cinfo.cbSize = sizeof(cinfo); GetCursorInfo(&cinfo); GetIconInfo(cinfo.hCursor, &iinfo); @@ -272,6 +273,10 @@ rop); /* Cleanup.*/ + if (iinfo.hbmMask) + DeleteObject(iinfo.hbmMask); + if (iinfo.hbmColor) + DeleteObject(iinfo.hbmColor); SelectObject (HdcStrech, hOld); DeleteObject (HbmpStrech); DeleteDC (HdcStrech);

1 0

[cwittich] 36346: fix some non standard conformant code
by cwittich＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: cwittich Date: Sat Sep 20 08:36:26 2008 New Revision: 36346 URL: http://svn.reactos.org/svn/reactos?rev=36346&view=rev Log: fix some non standard conformant code Modified: trunk/rosapps/applications/fontview/fontview.c Modified: trunk/rosapps/applications/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fontview/font… ============================================================================== --- trunk/rosapps/applications/fontview/fontview.c [iso-8859-1] (original) +++ trunk/rosapps/applications/fontview/fontview.c [iso-8859-1] Sat Sep 20 08:36:26 2008 @@ -93,6 +93,8 @@ HWND hMainWnd; MSG msg; WNDCLASSEXW wincl; + HINSTANCE hDLL; + PGFRI GetFontResourceInfoW; g_hInstance = hThisInstance; @@ -112,8 +114,8 @@ } /* Load the GetFontResourceInfo function from gdi32.dll */ - HINSTANCE hDLL = LoadLibraryW(L"GDI32.DLL"); - PGFRI GetFontResourceInfoW = (PGFRI)GetProcAddress(hDLL, "GetFontResourceInfoW"); + hDLL = LoadLibraryW(L"GDI32.DLL"); + GetFontResourceInfoW = (PGFRI)GetProcAddress(hDLL, "GetFontResourceInfoW"); /* Get the font name */ dwSize = sizeof(g_ExtLogFontW.elfFullName);

1 0

[cwittich] 36345: convert this mess into actual C code
by cwittich＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: cwittich Date: Sat Sep 20 07:58:28 2008 New Revision: 36345 URL: http://svn.reactos.org/svn/reactos?rev=36345&view=rev Log: convert this mess into actual C code Modified: trunk/rosapps/applications/downloader/main.c Modified: trunk/rosapps/applications/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/downloader/ma… ============================================================================== --- trunk/rosapps/applications/downloader/main.c [iso-8859-1] (original) +++ trunk/rosapps/applications/downloader/main.c [iso-8859-1] Sat Sep 20 07:58:28 2008 @@ -32,24 +32,21 @@ BOOL getUninstaller(WCHAR* RegName, WCHAR* Uninstaller) { - - const DWORD ArraySize = 200; - HKEY hKey1; HKEY hKey2; DWORD Type = 0; - DWORD Size = ArraySize; - WCHAR Value[ArraySize]; - WCHAR KeyName[ArraySize]; + DWORD Size = MAX_PATH; + WCHAR Value[MAX_PATH]; + WCHAR KeyName[MAX_PATH]; LONG i = 0; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall",0,KEY_READ,&hKey1) == ERROR_SUCCESS) { while (RegEnumKeyExW(hKey1,i,KeyName,&Size,NULL,NULL,NULL,NULL) == ERROR_SUCCESS) { ++i; RegOpenKeyExW(hKey1,KeyName,0,KEY_READ,&hKey2); - Size = ArraySize; + Size = MAX_PATH; if (RegQueryValueExW(hKey2,L"DisplayName",0,&Type,(LPBYTE)Value,&Size) == ERROR_SUCCESS) { - Size = ArraySize; + Size = MAX_PATH; if (StrCmpW(Value,RegName) == 0) { if (RegQueryValueExW(hKey2,L"UninstallString",0,&Type,(LPBYTE)Uninstaller,&Size) == ERROR_SUCCESS) { RegCloseKey(hKey2); @@ -63,7 +60,7 @@ } } RegCloseKey(hKey2); - Size = ArraySize; + Size = MAX_PATH; } RegCloseKey(hKey1); } @@ -107,6 +104,7 @@ { struct Application* CurrentApplication; TV_INSERTSTRUCTW Insert; + WCHAR Uninstaller[200]; SelectedApplication = NULL; if(Category->Children && !Category->Apps) @@ -126,8 +124,6 @@ Insert.hParent = TVI_ROOT; CurrentApplication = Category->Apps; - - WCHAR Uninstaller[200]; while(CurrentApplication) { Insert.item.lParam = (UINT)CurrentApplication; @@ -145,10 +141,13 @@ BOOL CreateToolTip(HWND hwndTool, HWND hDlg, WCHAR* pText) { + HWND hwndTip; + TOOLINFO toolInfo; + if (!hwndTool || !hDlg || !pText) return FALSE; - HWND hwndTip = CreateWindowExW(0, TOOLTIPS_CLASS, NULL, + hwndTip = CreateWindowExW(0, TOOLTIPS_CLASS, NULL, WS_POPUP |TTS_ALWAYSTIP | TTS_BALLOON, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, @@ -157,7 +156,7 @@ if (!hwndTip) return FALSE; - TOOLINFO toolInfo = {0}; + ZeroMemory(&toolInfo, sizeof(TOOLINFO)); toolInfo.cbSize = sizeof(toolInfo); toolInfo.hwnd = hDlg; toolInfo.uFlags = TTF_IDISHWND | TTF_SUBCLASS; @@ -176,17 +175,14 @@ HINSTANCE hInstance = GetModuleHandle(NULL); WCHAR Cats[MAX_STRING_LENGHT], Apps[MAX_STRING_LENGHT]; WCHAR Tooltip1[MAX_STRING_LENGHT], Tooltip2[MAX_STRING_LENGHT], Tooltip3[MAX_STRING_LENGHT]; - TCHAR Buf[MAX_PATH]; - char Tmp[MAX_PATH]; - int i; - - // Getting downloader.xml path - if(!GetSystemDirectory(Buf,sizeof(Buf)/sizeof(char))) return FALSE; - lstrcat((LPTSTR)Buf, L"\\downloader.xml"); - for (i = 0; i < _tcslen(Buf) + 1; i++) Tmp[i] = Buf[i]; + char Buf[MAX_PATH]; + + // Getting downloader.xml path + if(!GetSystemDirectoryA(Buf,sizeof(Buf))) return FALSE; + strcat(Buf, "\\downloader.xml"); // Parse the XML file - if (!ProcessXML(Tmp, &Root)) + if (!ProcessXML(Buf, &Root)) return FALSE; LoadStringW(hInstance, IDS_CATS_TITLE, Cats, MAX_STRING_LENGHT); @@ -394,6 +390,7 @@ { HKEY hKey; TCHAR szBuf[MAX_PATH]; + DWORD dwValue; if (RegOpenKey(HKEY_LOCAL_MACHINE, TEXT("Software\\ReactOS\\Downloader"), @@ -425,7 +422,6 @@ (DWORD)(sizeof(szBuf) / sizeof(TCHAR)))) return FALSE; - DWORD dwValue; if (SendDlgItemMessage(hwnd, IDC_DELINST_FILES_CHECKBOX, BM_GETCHECK, 0, 0) == BST_CHECKED) dwValue = 0x1; else @@ -449,6 +445,7 @@ HKEY hKey; TCHAR Buf[MAX_PATH]; DWORD dwDisp, dwSize; + DWORD dwValue, dwType = REG_DWORD; if (RegOpenKey(HKEY_LOCAL_MACHINE, TEXT("Software\\ReactOS\\Downloader"), @@ -476,10 +473,11 @@ } else { - if (!GetWindowsDirectory(Buf, sizeof(Buf) / sizeof(TCHAR))) return FALSE; - TCHAR DPath[256]; int i; + + if (!GetWindowsDirectory(Buf, sizeof(Buf) / sizeof(TCHAR))) return FALSE; + for (i = 0; i < 4; i++) { if (i == 3) @@ -532,7 +530,6 @@ } } - DWORD dwValue, dwType = REG_DWORD; dwSize = sizeof(DWORD); if (RegQueryValueEx(hKey, L"DeleteInstaller", @@ -776,6 +773,8 @@ case WM_NOTIFY: { LPNMHDR data = (LPNMHDR)lParam; + WCHAR Uninstaller[200]; + if(data->code == TVN_SELCHANGED) { BOOL bShowUninstaller = FALSE; @@ -809,7 +808,6 @@ StrCatW(ApplicationText, L"\n"); StrCatW(ApplicationText, SelectedApplication->Description); ShowMessage(SelectedApplication->Name, ApplicationText); - WCHAR Uninstaller[200]; if(StrCmpW(SelectedApplication->RegName, L"")) { if(getUninstaller(SelectedApplication->RegName, Uninstaller)) { bShowUninstaller = TRUE; @@ -840,10 +838,11 @@ { int Split_Hozizontal = (HIWORD(lParam)-(45+60))/2 + 60; int Split_Vertical = 200; + RECT Rect; ResizeControl(hCategories, 10, 60, Split_Vertical, HIWORD(lParam)-10); ResizeControl(hApps, Split_Vertical+5, 60, LOWORD(lParam)-10, Split_Hozizontal); - RECT Rect = {Split_Vertical+5, Split_Hozizontal+5, LOWORD(lParam)-10, HIWORD(lParam)-50}; + SetRect(&Rect, Split_Vertical+5, Split_Hozizontal+5, LOWORD(lParam)-10, HIWORD(lParam)-50); DescriptionRect = Rect; MoveWindow(hHelpButton, LOWORD(lParam)-50, 10, 40, 40, TRUE);

1 0

[cwittich] 36344: fix broken rc files
by cwittich＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: cwittich Date: Sat Sep 20 04:38:20 2008 New Revision: 36344 URL: http://svn.reactos.org/svn/reactos?rev=36344&view=rev Log: fix broken rc files Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc trunk/reactos/base/setup/reactos/lang/fr-FR.rc trunk/reactos/base/setup/reactos/lang/no-NO.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Sat Sep 20 04:38:20 2008 @@ -8,9 +8,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Willkommen beim ReactOS Setup Assistenten.", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "ReactOS kann noch nicht direkt von dieser CD installiert werden! "\ - "Bitte starten Sie Ihren Computer mit dieser CD um ReactOS zu "\ - "installieren.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "ReactOS kann noch nicht direkt von dieser CD installiert werden! Bitte starten Sie Ihren Computer mit dieser CD um ReactOS zu installieren.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Klicken Sie auf Beenden um das Setup zu verlassen.", IDC_STATIC, 115, 169, 195, 17 END @@ -103,8 +101,7 @@ LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart "\ - "your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 END Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Sat Sep 20 04:38:20 2008 @@ -8,9 +8,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "You cannot install ReactOS directly from this CD yet! "\ - "Please restart your computer from this CD in order to "\ - "install ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "You cannot install ReactOS directly from this CD yet! Please restart your computer from this CD in order to install ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17 END @@ -103,8 +101,7 @@ LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart "\ - "your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 END Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] Sat Sep 20 04:38:20 2008 @@ -11,9 +11,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenido al Asistente de Instalación de ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "¡Aún no puede instalar ReactOS directamente desde este CD! "\ - "Por favor, reinicie su equipo desde este CD para "\ - "instalar ReactOS.", IDC_STATIC, 115, 40, 200, 100 + LTEXT "¡Aún no puede instalar ReactOS directamente desde este CD! Por favor, reinicie su equipo desde este CD para instalar ReactOS.", IDC_STATIC, 115, 40, 200, 100 LTEXT "Pulse Finalizar para salir del instalador.", IDC_STATIC, 115, 169, 195, 17 END @@ -106,8 +104,7 @@ LTEXT "Cuando presione Finalizar, su equipo será reiniciado.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Si hay un CD en alguna unidad, retírelo. Luego, para reiniciar "\ - "su equipo, presione Finalizar.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Si hay un CD en alguna unidad, retírelo. Luego, para reiniciar su equipo, presione Finalizar.", IDC_STATIC, 10, 180, 297, 20 END Modified: trunk/reactos/base/setup/reactos/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fr… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] Sat Sep 20 04:38:20 2008 @@ -6,9 +6,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenue dans l'assistant d'installation de ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Vous ne pouvez pas encore installer ReactOS directement depuis ce CD ! "\ - "Veuillez redÃ©marrer votre ordinateur depuis ce CD pour pouvoir "\ - "installer ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Vous ne pouvez pas encore installer ReactOS directement depuis ce CD ! Veuillez redÃ©marrer votre ordinateur depuis ce CD pour pouvoir installer ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Cliquez sur Terminer pour quitter l'installation.", IDC_STATIC, 115, 169, 195, 17 END @@ -101,8 +99,7 @@ LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart "\ - "your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 END Modified: trunk/reactos/base/setup/reactos/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/no… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] Sat Sep 20 04:38:20 2008 @@ -8,9 +8,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Velkommen til ReactOS installering veiviseren.", IDC_STARTTITLE, 115, 8, 220, 24 - LTEXT "Du kan ennå ikke installere ReactOS direkte fra denne CD-en! "\ - "Vennligst start datamaskinen på nytt og start fra denne platen for å "\ - "installere ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Du kan ennå ikke installere ReactOS direkte fra denne CD-en! Vennligst start datamaskinen på nytt og start fra denne platen for å installere ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Trykk på Fullført for å avslutte installeringen.", IDC_STATIC, 115, 169, 195, 17 END @@ -103,8 +101,7 @@ LTEXT "Når du trykker Fullført, vil din datamaskin starte på nytt.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Hvis du fortsatt har CD platen i stasjon, fjern denne. Også, for å starte "\ - "din datamaskin på nytt, trykk på Fullført.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Hvis du fortsatt har CD platen i stasjon, fjern denne. Også, for å starte din datamaskin på nytt, trykk på Fullført.", IDC_STATIC, 10, 180, 297, 20 END Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] Sat Sep 20 04:38:20 2008 @@ -14,9 +14,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Witaj w Kreatorze instalacji ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Nie mo¿esz zainstalowaæ ReactOS bezporednio! "\ - "Uruchom ponownie komputer z tej p³yty aby "\ - "zainstalowaæ ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Nie mo¿esz zainstalowaæ ReactOS bezporednio! Uruchom ponownie komputer z tej p³yty aby zainstalowaæ ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Nacinij przycisk aby zakoñczyæ pracê Instalatora.", IDC_STATIC, 115, 169, 195, 17 END @@ -109,8 +107,7 @@ LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart "\ - "your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 END Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Sat Sep 20 04:38:20 2008 @@ -8,9 +8,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Âàñ ïðèâåòñòâóåò ïðîãðàììà óñòàíîâêè ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Óñòàíîâêó ReactOS ìîæíî ïðîèçâîäèòü òîëüêî çàãðóçèâøèñü ñ ýòîãî äèñêà! "\ - "Ïîñëå ïåðåçàïóñêà êîìïüþòåðà âûáåðèòå çàãðóçêó ñ CD è íà÷íèòå"\ - " óñòàíîâêó ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Óñòàíîâêó ReactOS ìîæíî ïðîèçâîäèòü òîëüêî çàãðóçèâøèñü ñ ýòîãî äèñêà! Ïîñëå ïåðåçàïóñêà êîìïüþòåðà âûáåðèòå çàãðóçêó ñ CD è íà÷íèòå óñòàíîâêó ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Íàæìèòå êíîïêó ""Çàâåðøèòü"" äëÿ âûõîäà.", IDC_STATIC, 115, 169, 195, 17 END @@ -103,8 +101,7 @@ LTEXT "Ïîñëå íàæàòèÿ êëàâèøè ""Çàâåðøèòü"" âàø êîìïüþòåð áóäåò ïåðåçàãðóæåí.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Âû ìîæåòå èçâëå÷ü óñòàíîâî÷íûé äèñê. Äëÿ ïåðåçàãðóçêè êîìïüþòåðà "\ - "íàæìèòå êëàâèøó ""Çàâåðøèòü"".", IDC_STATIC, 10, 176, 297, 20 + LTEXT "Âû ìîæåòå èçâëå÷ü óñòàíîâî÷íûé äèñê. Äëÿ ïåðåçàãðóçêè êîìïüþòåðà íàæìèòå êëàâèøó ""Çàâåðøèòü"".", IDC_STATIC, 10, 176, 297, 20 END

1 0

[tkreuzer] 36343: Map the APIC page.
by tkreuzer＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: tkreuzer Date: Sat Sep 20 04:33:53 2008 New Revision: 36343 URL: http://svn.reactos.org/svn/reactos?rev=36343&view=rev Log: Map the APIC page. Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Sat Sep 20 04:33:53 2008 @@ -193,11 +193,6 @@ * * Returns: * None. - * - * Remarks: - * We are setting PDEs, but using the equvivalent (for our purpose) PTE structure. - * As such, please note that PageFrameNumber == PageEntryNumber. - * *--*/ VOID FASTCALL @@ -255,6 +250,12 @@ DbgPrint("Could not map KUSER_SHARED_DATA page.\n", KernelPages); } + /* Map APIC page */ + if (!FrLdrMapSinglePage(APIC_BASE, APIC_PHYS_BASE)) + { + DbgPrint("Could not map APIC page.\n", KernelPages); + } + } VOID Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Sat Sep 20 04:33:53 2008 @@ -41,7 +41,9 @@ #define HYPERSPACE_BASE 0xfffff70000000000ULL #define HAL_BASE 0xffffffff80000000ULL -#define APIC_BASE 0xffffffffff000000ULL // FIXME +#define APIC_BASE 0xfffffffffee00000ULL // FIXME + +#define APIC_PHYS_BASE 0xfee00000 #define NUM_PAGES_KERNEL

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