Ros-diffs January 2007

ros-diffs@reactos.org

21 participants
401 discussions

[gedmurphy] 25288: update text to 2007

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jan 4 02:12:19 2007 New Revision: 25288 URL: http://svn.reactos.org/svn/reactos?rev=25288&view=rev Log: update text to 2007 Modified: trunk/reactos/drivers/base/bootvid/bootimage.bmp Modified: trunk/reactos/drivers/base/bootvid/bootimage.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/booti… ============================================================================== Binary files - no diff available.

17 years, 9 months

[mbosma] 25287: Boot sector for regression tests: Do always boot hdd if there is a MDR, otherwise always start the installation.

by mbosma＠svn.reactos.org

Author: mbosma Date: Thu Jan 4 00:46:46 2007 New Revision: 25287 URL: http://svn.reactos.org/svn/reactos?rev=25287&view=rev Log: Boot sector for regression tests: Do always boot hdd if there is a MDR, otherwise always start the installation. Modified: trunk/reactos/boot/freeldr/bootsect/isobtrt.asm Modified: trunk/reactos/boot/freeldr/bootsect/isobtrt.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isobtrt.asm (original) +++ trunk/reactos/boot/freeldr/bootsect/isobtrt.asm Thu Jan 4 00:46:46 2007 @@ -40,8 +40,6 @@ ; Note: The Makefile builds one version with DEBUG_MESSAGES automatically. ;%define DEBUG_MESSAGES ; Uncomment to get debugging messages - -%define WAIT_FOR_KEY ; --------------------------------------------------------------------------- @@ -137,47 +135,22 @@ call writestr %endif - - ; Make sure the keyboard buffer is empty -%ifdef WAIT_FOR_KEY -.kbd_buffer_test: - call pollchar - jz .kbd_buffer_empty - call getchar - jmp .kbd_buffer_test -.kbd_buffer_empty: - - ; Check if there is harddisk +; check if there is a mbr on the hdd if so boot from it + pusha - mov ax, 0800h + mov ax, 0201h mov dx, 0080h + mov cx, 0001h + mov bx, trackbuf int 13h popa - jmp .boot_cdrom - - ; Display the 'Press key' message and wait for a maximum of 5 seconds - call crlf - mov si, presskey_msg ; si points to 'Press key' message - call writestr ; display the message - - mov byte [TimeoutCount], 5 -.next_second: - mov eax, [BIOS_timer] ; load current tick counter - add eax, 19 ; - -.poll_again: - call pollchar - jnz .boot_cdrom - - mov ebx, [BIOS_timer] - cmp eax, ebx - jnz .poll_again - - mov si, dot_msg ; print '.' - call writestr - dec byte [TimeoutCount] ; decrement timeout counter - jz .boot_harddisk - jmp .next_second + jc .boot_cdrom ; could not read hdd + + push ax + mov ax, word [trackbuf+510] + cmp ax, 0 + je .boot_cdrom ; no boot sector found (hopefully there are no weird bootsectors which begin with 0) + pop ax .boot_harddisk: call crlf @@ -199,14 +172,8 @@ mov dx, 0080h jmp 0:0x7C00 -%endif .boot_cdrom: -%ifdef WAIT_FOR_KEY - call crlf - call crlf -%endif - ; Save and display the boot drive number mov [DriveNo], dl %ifdef DEBUG_MESSAGES

17 years, 9 months

[gedmurphy] 25286: Add 24bpp formats. This will clean up the look of interface until I get time to finish the alpha code changes

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jan 3 23:58:37 2007 New Revision: 25286 URL: http://svn.reactos.org/svn/reactos?rev=25286&view=rev Log: Add 24bpp formats. This will clean up the look of interface until I get time to finish the alpha code changes Modified: trunk/reactos/base/shell/explorer/res/administration.ico trunk/reactos/base/shell/explorer/res/control-panel.ico trunk/reactos/base/shell/explorer/res/documents.ico trunk/reactos/base/shell/explorer/res/folder.ico trunk/reactos/base/shell/explorer/res/minimize.ico trunk/reactos/base/shell/explorer/res/network-conns.ico trunk/reactos/base/shell/explorer/res/printer.ico trunk/reactos/base/shell/explorer/res/search-doc.ico trunk/reactos/base/shell/explorer/res/speaker.ico Modified: trunk/reactos/base/shell/explorer/res/administration.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/ad… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/control-panel.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/co… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/documents.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/do… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/folder.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/fo… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/minimize.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/mi… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/network-conns.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/ne… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/printer.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/pr… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/search-doc.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/se… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/speaker.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/sp… ============================================================================== Binary files - no diff available.

17 years, 9 months

[gedmurphy] 25285: Add 24bpp formats. This will clean up the look of interface until I get time to finish the alpha changes

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jan 3 23:57:09 2007 New Revision: 25285 URL: http://svn.reactos.org/svn/reactos?rev=25285&view=rev Log: Add 24bpp formats. This will clean up the look of interface until I get time to finish the alpha changes Modified: trunk/reactos/dll/cpl/access/resources/applet.ico trunk/reactos/dll/cpl/appwiz/resources/applet.ico trunk/reactos/dll/cpl/desk/resources/applet.ico trunk/reactos/dll/cpl/hdwwiz/resources/applet.ico trunk/reactos/dll/cpl/intl/resources/applet.ico trunk/reactos/dll/cpl/main/resources/keyboard.ico trunk/reactos/dll/cpl/main/resources/mouse.ico trunk/reactos/dll/cpl/mmsys/resources/mmsys.ico trunk/reactos/dll/cpl/ncpa/resources/applet.ico trunk/reactos/dll/cpl/powercfg/resources/ac.ico trunk/reactos/dll/cpl/sysdm/resources/applet.ico trunk/reactos/dll/cpl/timedate/resources/applet.ico Modified: trunk/reactos/dll/cpl/access/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resources/a… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/appwiz/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/a… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/desk/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resources/app… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/hdwwiz/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/resources/a… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/intl/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/resources/app… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/keyboard.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/key… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/mouse.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/mou… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/mmsys/resources/mmsys.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/mm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/ncpa/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/resources/app… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/ac.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/sysdm/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resources/ap… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/timedate/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/resources… ============================================================================== Binary files - no diff available.

17 years, 9 months

[gedmurphy] 25284: These should have 24bpp versions.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jan 3 22:14:58 2007 New Revision: 25284 URL: http://svn.reactos.org/svn/reactos?rev=25284&view=rev Log: These should have 24bpp versions. Modified: trunk/reactos/base/shell/explorer/res/action.ico trunk/reactos/base/shell/explorer/res/search.ico Modified: trunk/reactos/base/shell/explorer/res/action.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/ac… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/search.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/se… ============================================================================== Binary files - no diff available.

17 years, 9 months

[mbosma] 25283: Do not show "Press any key to boot from CD"-Message if there is no MBR on the hard drive.

by mbosma＠svn.reactos.org

Author: mbosma Date: Wed Jan 3 17:33:41 2007 New Revision: 25283 URL: http://svn.reactos.org/svn/reactos?rev=25283&view=rev Log: Do not show "Press any key to boot from CD"-Message if there is no MBR on the hard drive. Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.asm Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.asm (original) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.asm Wed Jan 3 17:33:41 2007 @@ -139,13 +139,21 @@ jmp .kbd_buffer_test .kbd_buffer_empty: - ; Check if there is harddisk + ; Check for MBR on harddisk pusha - mov ax, 0800h + mov ax, 0201h mov dx, 0080h + mov cx, 0001h + mov bx, trackbuf int 13h popa - jc .boot_cdrom + jc .boot_cdrom ; could not read hdd + + push ax + mov ax, word [trackbuf] + cmp ax, 0 + je .boot_cdrom ; no boot sector found (hopefully there are no weird bootsectors which begin with 0) + pop ax ; Display the 'Press key' message and wait for a maximum of 5 seconds call crlf

17 years, 9 months

[tretiakov] 25282: set svn:ignore

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Wed Jan 3 14:23:36 2007 New Revision: 25282 URL: http://svn.reactos.org/svn/reactos?rev=25282&view=rev Log: set svn:ignore Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/ (props changed) Propchange: trunk/reactos/base/applications/testsets/user32/kbdlayout/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Jan 3 14:23:36 2007 @@ -1,0 +1,5 @@ +Debug +*.dsw +*.plg +*.opt +*.ncb

17 years, 9 months

[tretiakov] 25281: Test application for loading and switching keyboard layouts

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Wed Jan 3 14:16:47 2007 New Revision: 25281 URL: http://svn.reactos.org/svn/reactos?rev=25281&view=rev Log: Test application for loading and switching keyboard layouts Added: trunk/reactos/base/applications/testsets/user32/kbdlayout/ trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.dsp trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rbuild trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h Modified: trunk/reactos/base/applications/testsets/user32/user32.rbuild Added: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c (added) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c Wed Jan 3 14:16:47 2007 @@ -1,0 +1,352 @@ +/* + * PROJECT: ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/testset/user32/kbdlayout/kbdlayout.c + * PURPOSE: Keyboard layout testapp + * COPYRIGHT: Copyright 2007 Saveliy Tretiakov + */ + +#define UNICODE +#include<wchar.h> +#include <windows.h> +#include "resource.h" + + + +LRESULT MainDialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); + + +HINSTANCE hInst; +HWND hMainDlg; + + +typedef struct { + WNDPROC OrigProc; + WCHAR WndName[25]; +} WND_DATA; + +INT WINAPI WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpCmdLine, + int nCmdShow) +{ + + + hInst = hInstance; + + DialogBoxParam(hInst, + MAKEINTRESOURCE(IDD_MAINDIALOG), + NULL, + (DLGPROC)MainDialogProc, + (LPARAM)NULL); + + return 0; +} + + +int GetKlList(HKL **list) +{ + HKL *ret; + int n; + + n = GetKeyboardLayoutList(0, NULL); + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HKL)*n); + GetKeyboardLayoutList(n, ret); + *list = ret; + return n; +} + +void FreeKlList(HKL *list) +{ + HeapFree(GetProcessHeap(), 0, list); +} + + +void UpdateData(HWND hDlg) +{ + WCHAR buf[KL_NAMELENGTH]; + WCHAR buf2[512]; + + HWND hList; + HKL *klList, hKl; + int n, i,j; + + GetKeyboardLayoutName(buf); + swprintf(buf2, L"Active layout: %s (%x)", buf, GetKeyboardLayout(0)); + SetWindowText(GetDlgItem(hDlg, IDC_ACTIVE), buf2); + + hList = GetDlgItem(hDlg, IDC_LIST); + SendMessage(hList, LB_RESETCONTENT, 0, 0); + + n = GetKlList(&klList); + hKl = GetKeyboardLayout(0); + for(i = 0; i < n; i++) + { + swprintf(buf, L"%x", klList[i] ); + j = SendMessage(hList, LB_ADDSTRING, 0, (LPARAM) buf); + SendMessage(hList, LB_SETITEMDATA, j, (LPARAM) klList[i]); + if(klList[i] == hKl) SendMessage(hList, LB_SETCURSEL, j, 0); + } + + FreeKlList(klList); +} + +void FormatMsg(WCHAR *format, ...) +{ + WCHAR buf[255]; + va_list argptr; + va_start(argptr, format); + _vsnwprintf(buf, sizeof(buf)-1, format, argptr); + MessageBox(0, buf, L"msg", 0); + va_end(argptr); +} + +void FormatBox(HWND hWnd, DWORD Flags, WCHAR *Caption, WCHAR *Format, ...) +{ + WCHAR buf[255]; + va_list argptr; + va_start(argptr, Format); + _vsnwprintf(buf, sizeof(buf)-1, Format, argptr); + MessageBox(hWnd, buf, Caption, Flags); + va_end(argptr); +} + + +LRESULT CALLBACK WndSubclassProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + WND_DATA *data = (WND_DATA*)GetWindowLong(hwnd, GWL_USERDATA); + + if(uMsg == WM_INPUTLANGCHANGE) + { + FormatMsg(L"%s: WM_INPUTLANGCHANGE lParam=%x wParam=%x\n", data->WndName, lParam, wParam); + UpdateData(hMainDlg); + //Pass message to defwindowproc + } + else if(uMsg == WM_INPUTLANGCHANGEREQUEST) + { + FormatMsg(L"%s: WM_INPUTLANGCHANGEREQUEST lParam=%x wParam=%x\n", data->WndName, lParam, wParam); + UpdateData(hMainDlg); + //Pass message to defwindowproc + } + + return ( CallWindowProc( data->OrigProc, hwnd, uMsg, wParam, lParam) ); +} + +void SubclassWnd(HWND hWnd, WCHAR* Name) +{ + WND_DATA *data = HeapAlloc(GetProcessHeap(), 0, sizeof(WND_DATA)); + data->OrigProc = (WNDPROC)SetWindowLong( hWnd, GWL_WNDPROC, (LONG)WndSubclassProc); + wcsncpy(data->WndName, Name, 25); + SetWindowLong(hWnd, GWL_USERDATA, (LONG)data); + return; +} + +DWORD GetActivateFlags(HWND hDlg) +{ + DWORD ret = 0; + + if(IsDlgButtonChecked(hDlg, IDC_KLF_REORDER)) + ret |= KLF_REORDER; + +/* if(IsDlgButtonChecked(hDlg, IDC_KLF_RESET)) + ret |= KLF_RESET; + + if(IsDlgButtonChecked(hDlg, IDC_KLF_SHIFTLOCK)) + ret |= KLF_SHIFTLOCK;*/ + + if(IsDlgButtonChecked(hDlg, IDC_KLF_SETFORPROCESS)) + ret |= KLF_SETFORPROCESS; + + return ret; + +} + +DWORD GetLoadFlags(HWND hDlg) +{ + DWORD ret = 0; + + if(IsDlgButtonChecked(hDlg, IDL_KLF_ACTIVATE)) + ret |= KLF_ACTIVATE; + + if(IsDlgButtonChecked(hDlg, IDL_KLF_NOTELLSHELL)) + ret |= KLF_NOTELLSHELL; + + if(IsDlgButtonChecked(hDlg, IDL_KLF_REORDER)) + ret |= KLF_REORDER; + + if(IsDlgButtonChecked(hDlg, IDL_KLF_REPLACELANG)) + ret |= KLF_REPLACELANG; + + if(IsDlgButtonChecked(hDlg, IDL_KLF_SUBSTITUTE_OK)) + ret |= KLF_SUBSTITUTE_OK; + + if(IsDlgButtonChecked(hDlg, IDL_KLF_SETFORPROCESS)) + ret |= KLF_SETFORPROCESS; + + return ret; +} + +HKL GetSelectedLayout(HWND hDlg) +{ + int n; + HWND hList; + hList = GetDlgItem(hDlg, IDC_LIST); + if((n = SendMessage(hList, LB_GETCURSEL, 0, 0)) != LB_ERR) + return (HKL) SendMessage(hList, LB_GETITEMDATA, n, 0); + else return INVALID_HANDLE_VALUE; +} + +HKL GetActivateHandle(HWND hDlg) +{ + + if(IsDlgButtonChecked(hDlg, IDC_FROMLIST)) + return GetSelectedLayout(hDlg); + else if(IsDlgButtonChecked(hDlg, IDC_FROMEDIT)) + { + WCHAR buf[25]; + ULONG kl; + GetWindowText(GetDlgItem(hDlg, IDC_HANDLE), buf, 25); + swscanf(buf, L"%x", &kl); + return (HKL) kl; + } + else if(IsDlgButtonChecked(hDlg, IDC_HKL_NEXT)) + return (HKL)HKL_NEXT; + + return (HKL)HKL_PREV; + +} + + +/*************************************************** + * MainDialogProc * + ***************************************************/ + +LRESULT MainDialogProc(HWND hDlg, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + HKL hKl; + + switch (Msg) + { + case WM_INITDIALOG: + { + UpdateData(hDlg); + hMainDlg = hDlg; + + SubclassWnd(GetDlgItem(hDlg, IDC_LIST), L"List"); + SubclassWnd(GetDlgItem(hDlg, IDC_EDIT1), L"Edit1"); + SubclassWnd(GetDlgItem(hDlg, IDC_EDIT2), L"Edit2"); + SubclassWnd(GetDlgItem(hDlg, IDC_KLID), L"Klid"); + SubclassWnd(GetDlgItem(hDlg, IDC_HANDLE), L"Handle"); + SubclassWnd(GetDlgItem(hDlg, ID_CANCEL), L"Button"); + + CheckRadioButton(hDlg, IDC_FROMLIST, IDC_FROMEDIT, IDC_FROMLIST); + SetWindowText(GetDlgItem(hDlg, IDC_KLID), L"00000419"); + + return 0; + } /* WM_INITDIALOG */ + + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case ID_CANCEL: + { + EndDialog(hDlg, ERROR_CANCELLED); + break; + } + + case IDC_ACTIVATE: + { + if((hKl = GetActivateHandle(hDlg)) != INVALID_HANDLE_VALUE) + { + if(!ActivateKeyboardLayout(hKl, GetActivateFlags(hDlg))) + FormatBox(hDlg, MB_ICONERROR, L"Error", + L"ActivateKeyboardLayout() failed. %d", GetLastError()); + else UpdateData(hDlg); + } + else MessageBox(hDlg, L"No item selected", L"Error", MB_ICONERROR); + break; + } + + case IDC_UNLOAD: + { + if((hKl = GetSelectedLayout(hDlg)) != INVALID_HANDLE_VALUE) + { + if(!UnloadKeyboardLayout(hKl)) + FormatBox(hDlg, MB_ICONERROR, L"Error", + L"UnloadKeyboardLayout() failed. %d", + GetLastError()); + else UpdateData(hDlg); + } + else MessageBox(hDlg, L"No item selected", L"Error", MB_ICONERROR); + break; + } + + case IDC_LOAD: + { + WCHAR buf[255]; + GetWindowText(GetDlgItem(hDlg, IDC_KLID), buf, sizeof(buf)); + if(!LoadKeyboardLayout(buf, GetLoadFlags(hDlg))) + FormatBox(hDlg, MB_ICONERROR, L"Error", + L"LoadKeyboardLayout() failed. %d", + GetLastError()); + else UpdateData(hDlg); + break; + } + + case IDC_REFRESH: + { + UpdateData(hDlg); + break; + } + + case IDC_LIST: + { + if(HIWORD(wParam) == LBN_SELCHANGE) + { + WCHAR buf[25]; + if((hKl = GetSelectedLayout(hDlg)) != NULL) + { + swprintf(buf, L"%x", hKl); + SetWindowText(GetDlgItem(hDlg, IDC_HANDLE), buf); + } + } + break; + } + + } + + return TRUE; + } /* WM_COMMAND */ + + + case WM_INPUTLANGCHANGE: + { + FormatMsg(L"dlg WM_INPUTLANGCHANGE lParam=%x wParam=%x\n", lParam, wParam); + return FALSE; + } + + case WM_INPUTLANGCHANGEREQUEST: + { + FormatMsg(L"dlg WM_INPUTLANGCHANGEREQUEST lParam=%x wParam=%x\n", lParam, wParam); + return FALSE; + } + + case WM_CLOSE: + { + EndDialog(hDlg, ERROR_CANCELLED); + return TRUE; + } /* WM_CLOSE */ + + default: + return FALSE; + } + +} + + + + Added: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.dsp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.dsp (added) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.dsp Wed Jan 3 14:16:47 2007 @@ -1,0 +1,98 @@ +# Microsoft Developer Studio Project File - Name="kbdlayout" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=kbdlayout - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "kbdlayout.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "kbdlayout.mak" CFG="kbdlayout - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "kbdlayout - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "kbdlayout - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "kbdlayout - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x419 /d "NDEBUG" +# ADD RSC /l 0x419 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 + +!ELSEIF "$(CFG)" == "kbdlayout - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x419 /d "_DEBUG" +# ADD RSC /l 0x419 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "kbdlayout - Win32 Release" +# Name "kbdlayout - Win32 Debug" +# Begin Source File + +SOURCE=.\kbdlayout.c +# End Source File +# Begin Source File + +SOURCE=.\kbdlayout.rc +# End Source File +# Begin Source File + +SOURCE=.\resource.h +# End Source File +# End Target +# End Project Added: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rbuild (added) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rbuild Wed Jan 3 14:16:47 2007 @@ -1,0 +1,13 @@ +<module name="kbdlayout" type="win32gui" installbase="system32" installname="kbdlayout.exe"> + <include base="kbdlayout">.</include> + <define name="__USE_W32API" /> + <define name="_UNICODE" /> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>kbdlayout.c</file> + <file>kbdlayout.rc</file> +</module> Added: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc (added) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc Wed Jan 3 14:16:47 2007 @@ -1,0 +1,141 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Russian resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) +#ifdef _WIN32 +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +#pragma code_page(1251) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_MAINDIALOG DIALOG DISCARDABLE 0, 0, 403, 223 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU +CAPTION "Keyboard layout test" +FONT 8, "MS Sans Serif" +BEGIN + PUSHBUTTON "Exit",ID_CANCEL,138,202,121,14 + EDITTEXT IDC_EDIT1,7,140,195,58,ES_MULTILINE | ES_AUTOHSCROLL + LISTBOX IDC_LIST,185,17,101,87,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | + WS_TABSTOP + LTEXT "Loaded layouts",IDC_STATIC,190,7,49,8 + LTEXT "Active layout:",IDC_ACTIVE,7,127,173,10,SS_SUNKEN + EDITTEXT IDC_EDIT2,206,140,190,58,ES_MULTILINE | ES_AUTOHSCROLL + PUSHBUTTON "Unload",IDC_UNLOAD,186,105,48,14 + PUSHBUTTON "Activate",IDC_ACTIVATE,237,121,47,14 + GROUPBOX "Activate Flags",IDC_STATIC,293,7,103,67 + CONTROL "KLF_REORDER",IDC_KLF_REORDER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,299,22,69,10 + CONTROL "KLF_RESET",IDC_KLF_RESET,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,299,34,66,12 + CONTROL "KLF_SETFORPROCESS",IDC_KLF_SETFORPROCESS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,299,48,95,10 + CONTROL "KLF_SHIFTLOCK",IDC_KLF_SHIFTLOCK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,299,60,72,10 + GROUPBOX "Activate layout",IDC_STATIC,294,77,101,60 + CONTROL "From list",IDC_FROMLIST,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,298,90,41,10 + CONTROL "HKL_NEXT",IDC_HKL_NEXT,"Button",BS_AUTORADIOBUTTON,298, + 101,53,10 + CONTROL "HKL_PREV",IDC_HKL_PREV,"Button",BS_AUTORADIOBUTTON,298, + 112,53,10 + CONTROL "From edit",IDC_FROMEDIT,"Button",BS_AUTORADIOBUTTON,298, + 124,45,10 + GROUPBOX "Load layout",IDC_STATIC,7,7,173,118 + CONTROL "KLF_ACTIVATE",IDL_KLF_ACTIVATE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,42,67,10 + CONTROL "KLF_NOTELLSHELL",IDL_KLF_NOTELLSHELL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,15,55,83,10 + LTEXT "pwszKLID:",IDC_STATIC,15,22,35,8 + EDITTEXT IDC_KLID,53,21,64,14,ES_AUTOHSCROLL | ES_NUMBER + CONTROL "KLF_REORDER",IDL_KLF_REORDER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,68,69,10 + CONTROL "KLF_REPLACELANG",IDL_KLF_REPLACELANG,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,15,81,85,10 + CONTROL "KLF_SUBSTITUTE_OK",IDL_KLF_SUBSTITUTE_OK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,15,94,92,10 + CONTROL "KLF_SETFORPROCESS",IDL_KLF_SETFORPROCESS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,15,107,95,10 + PUSHBUTTON "Load",IDC_LOAD,125,21,50,14 + PUSHBUTTON "Refresh",IDC_REFRESH,237,106,48,14 + EDITTEXT IDC_HANDLE,185,122,49,14,ES_AUTOHSCROLL +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_MAINDIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 396 + TOPMARGIN, 7 + BOTTOMMARGIN, 216 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +#endif // Russian resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Added: trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h (added) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h Wed Jan 3 14:16:47 2007 @@ -1,0 +1,43 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Developer Studio generated include file. +// Used by lab17.rc +// +#define IDD_MAINDIALOG 101 +#define ID_CANCEL 1000 +#define IDC_EDIT1 1021 +#define IDC_LIST 1022 +#define IDC_ACTIVE 1023 +#define IDC_EDIT2 1024 +#define IDC_UNLOAD 1025 +#define IDC_ACTIVATE 1026 +#define IDC_KLF_REORDER 1027 +#define IDC_KLF_RESET 1028 +#define IDC_KLF_SETFORPROCESS 1029 +#define IDC_KLF_SHIFTLOCK 1030 +#define IDC_FROMLIST 1032 +#define IDC_HKL_NEXT 1033 +#define IDC_HKL_PREV 1034 +#define IDL_KLF_ACTIVATE 1035 +#define IDL_KLF_NOTELLSHELL 1036 +#define IDC_KLID 1037 +#define IDL_KLF_REORDER 1038 +#define IDL_KLF_REPLACELANG 1039 +#define IDL_KLF_SUBSTITUTE_OK 1040 +#define IDL_KLF_SETFORPROCESS 1041 +#define IDC_HKL_PREV2 1042 +#define IDC_FROMEDIT 1042 +#define IDC_LOAD 1043 +#define IDC_REFRESH 1044 +#define IDC_HANDLE 1046 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NO_MFC 1 +#define _APS_NEXT_RESOURCE_VALUE 105 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1049 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif Modified: trunk/reactos/base/applications/testsets/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/user32.rbuild (original) +++ trunk/reactos/base/applications/testsets/user32/user32.rbuild Wed Jan 3 14:16:47 2007 @@ -7,4 +7,7 @@ <directory name="sysicon"> <xi:include href="sysicon/sysicon.rbuild" /> </directory> +<directory name="kbdlayout"> + <xi:include href="kbdlayout/kbdlayout.rbuild" /> +</directory> </group>

17 years, 9 months

[arty] 25280: - Reserve and map a page for Pcr - Some stubs (KeInitExceptions, KeInitInterrupts, ...) - Normalize segments and bats

by arty＠svn.reactos.org

Author: arty Date: Wed Jan 3 12:31:26 2007 New Revision: 25280 URL: http://svn.reactos.org/svn/reactos?rev=25280&view=rev Log: - Reserve and map a page for Pcr - Some stubs (KeInitExceptions, KeInitInterrupts, ...) - Normalize segments and bats Added: branches/powerpc/reactos/ntoskrnl/ke/powerpc/cpu.c branches/powerpc/reactos/ntoskrnl/ke/powerpc/exp.c branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c branches/powerpc/reactos/ntoskrnl/ke/powerpc/mmu.c branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c Modified: branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild Added: branches/powerpc/reactos/ntoskrnl/ke/powerpc/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/pow… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/powerpc/cpu.c (added) +++ branches/powerpc/reactos/ntoskrnl/ke/powerpc/cpu.c Wed Jan 3 12:31:26 2007 @@ -1,0 +1,277 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/i386/cpu.c + * PURPOSE: Routines for CPU-level support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +/* CPU Features and Flags */ +ULONG KeProcessorArchitecture; +ULONG KeProcessorLevel; +ULONG KeProcessorRevision; +ULONG KeFeatureBits; +ULONG KeLargestCacheLine = 0x40; +ULONG KeDcacheFlushCount = 0; +ULONG KeIcacheFlushCount = 0; +ULONG KiDmaIoCoherency = 0; +CHAR KeNumberProcessors; +KAFFINITY KeActiveProcessors = 1; +BOOLEAN KiSMTProcessorsPresent; + +/* CPU Signatures */ +#if 0 +CHAR CmpIntelID[] = "GenuineIntel"; +CHAR CmpAmdID[] = "AuthenticAMD"; +CHAR CmpCyrixID[] = "CyrixInstead"; +CHAR CmpTransmetaID[] = "GenuineTMx86"; +CHAR CmpCentaurID[] = "CentaurHauls"; +CHAR CmpRiseID[] = "RiseRiseRise"; +#endif + +/* SUPPORT ROUTINES FOR MSVC COMPATIBILITY ***********************************/ + +VOID +NTAPI +CPUID(IN ULONG CpuInfo[4], + IN ULONG InfoType) +{ + RtlZeroMemory(CpuInfo, sizeof(CpuInfo)); +} + +VOID +WRMSR(IN ULONG Register, + IN LONGLONG Value) +{ +} + +LONGLONG +RDMSR(IN ULONG Register) +{ + LARGE_INTEGER LargeVal; + LargeVal.QuadPart = 0; + return LargeVal.QuadPart; +} + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +KiSetProcessorType(VOID) +{ +} + +ULONG +NTAPI +KiGetCpuVendor(VOID) +{ + return 0; +} + +ULONG +NTAPI +KiGetFeatureBits(VOID) +{ + ULONG FeatureBits = 0; + /* Return the Feature Bits */ + return FeatureBits; +} + +VOID +NTAPI +KiGetCacheInformation(VOID) +{ +} + +VOID +NTAPI +KiSetCR0Bits(VOID) +{ +} + +VOID +NTAPI +KiInitializeTSS2(IN PKTSS Tss, + IN PKGDTENTRY TssEntry OPTIONAL) +{ +} + +VOID +NTAPI +KiInitializeTSS(IN PKTSS Tss) +{ +} + +VOID +FASTCALL +Ki386InitializeTss(IN PKTSS Tss, + IN PKIDTENTRY Idt, + IN PKGDTENTRY Gdt) +{ +} + +VOID +NTAPI +KeFlushCurrentTb(VOID) +{ +} + +VOID +NTAPI +KiSaveProcessorControlState(IN PKPROCESSOR_STATE ProcessorState) +{ +} + +VOID +NTAPI +KiInitializeMachineType(VOID) +{ +} + +ULONG_PTR +NTAPI +KiLoadFastSyscallMachineSpecificRegisters(IN ULONG_PTR Context) +{ + return 0; +} + +VOID +NTAPI +KiRestoreFastSyscallReturnState(VOID) +{ +} + +ULONG_PTR +NTAPI +Ki386EnableDE(IN ULONG_PTR Context) +{ + return 0; +} + +ULONG_PTR +NTAPI +Ki386EnableFxsr(IN ULONG_PTR Context) +{ + return 0; +} + +ULONG_PTR +NTAPI +Ki386EnableXMMIExceptions(IN ULONG_PTR Context) +{ + /* FIXME: Support this */ + DPRINT1("Your machine supports XMMI exceptions but ReactOS doesn't\n"); + return 0; +} + +VOID +NTAPI +KiI386PentiumLockErrataFixup(VOID) +{ + /* FIXME: Support this */ + DPRINT1("WARNING: Your machine has a CPU bug that ReactOS can't bypass!\n"); +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +KeSaveFloatingPointState(OUT PKFLOATING_SAVE Save) +{ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +KeRestoreFloatingPointState(IN PKFLOATING_SAVE Save) +{ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +ULONG +NTAPI +KeGetRecommendedSharedDataAlignment(VOID) +{ + /* Return the global variable */ + return KeLargestCacheLine; +} + +/* + * @implemented + */ +VOID +NTAPI +KeFlushEntireTb(IN BOOLEAN Invalid, + IN BOOLEAN AllProcessors) +{ + KIRQL OldIrql; + + /* Raise the IRQL for the TB Flush */ + OldIrql = KeRaiseIrqlToSynchLevel(); + +#ifdef CONFIG_SMP + /* FIXME: Support IPI Flush */ +#error Not yet implemented! +#endif + + /* Flush the TB for the Current CPU */ + //KeFlushCurrentTb(); + + /* Return to Original IRQL */ + KeLowerIrql(OldIrql); +} + +/* + * @implemented + */ +VOID +NTAPI +KeSetDmaIoCoherency(IN ULONG Coherency) +{ + /* Save the coherency globally */ + KiDmaIoCoherency = Coherency; +} + +/* + * @implemented + */ +KAFFINITY +NTAPI +KeQueryActiveProcessors(VOID) +{ + PAGED_CODE(); + + /* Simply return the number of active processors */ + return KeActiveProcessors; +} + +/* + * @implemented + */ +VOID +__cdecl +KeSaveStateForHibernate(IN PKPROCESSOR_STATE State) +{ + /* Capture the context */ + RtlCaptureContext(&State->ContextFrame); + + /* Capture the control state */ + KiSaveProcessorControlState(State); +} Added: branches/powerpc/reactos/ntoskrnl/ke/powerpc/exp.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/pow… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/powerpc/exp.c (added) +++ branches/powerpc/reactos/ntoskrnl/ke/powerpc/exp.c Wed Jan 3 12:31:26 2007 @@ -1,0 +1,114 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/i386/exp.c + * PURPOSE: Exception Dispatching and Context<->Trap Frame Conversion + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Gregor Anich + * Skywing (skywing(a)valhallalegends.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +_SEH_DEFINE_LOCALS(KiCopyInfo) +{ + volatile EXCEPTION_RECORD SehExceptRecord; +}; + +_SEH_FILTER(KiCopyInformation) +{ + _SEH_ACCESS_LOCALS(KiCopyInfo); + + /* Copy the exception records and return to the handler */ + RtlMoveMemory((PVOID)&_SEH_VAR(SehExceptRecord), + _SEH_GetExceptionPointers()->ExceptionRecord, + sizeof(EXCEPTION_RECORD)); + return EXCEPTION_EXECUTE_HANDLER; +} + +VOID +INIT_FUNCTION +NTAPI +KeInitExceptions(VOID) +{ +} + +ULONG +NTAPI +KiEspFromTrapFrame(IN PKTRAP_FRAME TrapFrame) +{ + return 0; +} + +VOID +NTAPI +KiEspToTrapFrame(IN PKTRAP_FRAME TrapFrame, + IN ULONG Esp) +{ +} + +ULONG +NTAPI +KiSsFromTrapFrame(IN PKTRAP_FRAME TrapFrame) +{ + return 0; +} + +VOID +NTAPI +KiSsToTrapFrame(IN PKTRAP_FRAME TrapFrame, + IN ULONG Ss) +{ +} + +USHORT +NTAPI +KiTagWordFnsaveToFxsave(USHORT TagWord) +{ + return 0; +} + +VOID +NTAPI +KeContextToTrapFrame(IN PCONTEXT Context, + IN OUT PKEXCEPTION_FRAME ExceptionFrame, + IN OUT PKTRAP_FRAME TrapFrame, + IN ULONG ContextFlags, + IN KPROCESSOR_MODE PreviousMode) +{ +} + +VOID +NTAPI +KeTrapFrameToContext(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN OUT PCONTEXT Context) +{ +} + +VOID +NTAPI +KiDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PKTRAP_FRAME TrapFrame, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN FirstChance) +{ +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +KeRaiseUserException(IN NTSTATUS ExceptionCode) +{ + return STATUS_SUCCESS; +} + Added: branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/pow… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c (added) +++ branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c Wed Jan 3 12:31:26 2007 @@ -1,0 +1,339 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/powerpc/kiinit.c + * PURPOSE: Kernel Initialization for x86 CPUs + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Art Yerkes (ayerkes(a)speakeasy.net) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#include <reactos/ppcboot.h> + +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +extern LOADER_MODULE KeLoaderModules[64]; +extern ULONG KeLoaderModuleCount; +KPRCB PrcbData[MAXIMUM_PROCESSORS]; + +/* FUNCTIONS *****************************************************************/ + +extern void SetPhysByte(ULONG_PTR address, char value); + +VOID +DrawDigit(struct _boot_infos_t *BootInfo, ULONG Digit, int x, int y) +{ + int i,j,k; + + for( i = 0; i < 7; i++ ) { + for( j = 0; j < 8; j++ ) { + for( k = 0; k < BootInfo->dispDeviceDepth/8; k++ ) { + SetPhysByte(((ULONG_PTR)BootInfo->dispDeviceBase)+ + k + + (((j+x) * (BootInfo->dispDeviceDepth/8)) + + ((i+y) * (BootInfo->dispDeviceRowBytes))), + BootInfo->dispFont[Digit][i*8+j] == 'X' ? 255 : 0); + } + } + } +} + +VOID +DrawNumber(struct _boot_infos_t *BootInfo, ULONG Number, int x, int y) +{ + int i; + + for( i = 0; i < 8; i++, Number<<=4 ) { + DrawDigit(BootInfo,(Number>>28)&0xf,x+(i*8),y); + } +} + +VOID +DrawString(struct _boot_infos_t *BootInfo, const char *str, int x, int y) +{ + int i, xx; + + for( i = 0; str[i]; i++ ) { + xx = x + (i * 8); + if( str[i] >= '0' && str[i] <= '9' ) + DrawDigit(BootInfo, str[i] - '0', xx, y); + else if( str[i] >= 'A' && str[i] <= 'Z' ) + DrawDigit(BootInfo, str[i] - 'A' + 10, xx, y); + else if( str[i] >= 'a' && str[i] <= 'z' ) + DrawDigit(BootInfo, str[i] - 'a' + 10, xx, y); + else + DrawDigit(BootInfo, 37, xx, y); + } +} + +VOID +NTAPI +KiInitializePcr(IN ULONG ProcessorNumber, + IN PKIPCR Pcr, + IN PKTHREAD IdleThread, + IN PVOID DpcStack) +{ + TRACE; + Pcr->MajorVersion = PCR_MAJOR_VERSION; + TRACE; + Pcr->MinorVersion = PCR_MINOR_VERSION; + TRACE; + Pcr->CurrentIrql = PASSIVE_LEVEL; + TRACE; + Pcr->Prcb = PrcbData; + TRACEXY(Pcr->Prcb, PrcbData); + Pcr->Prcb->MajorVersion = 1; + TRACE; + Pcr->Prcb->MinorVersion = 1; + TRACE; + Pcr->Prcb->Number = 0; /* UP for now */ + TRACE; + Pcr->Prcb->SetMember = 1; + TRACE; + Pcr->Prcb->BuildType = 0; + TRACE; + Pcr->Prcb->DpcStack = DpcStack; + TRACE; + KiProcessorBlock[ProcessorNumber] = Pcr->Prcb; + TRACEXY(0xd00d,0xbeef); +} + +extern ULONG KiGetFeatureBits(); +extern VOID KiSetProcessorType(); +extern VOID KiGetCacheInformation(); + +VOID +NTAPI +KiInitializeKernel(IN PKPROCESS InitProcess, + IN PKTHREAD InitThread, + IN PVOID IdleStack, + IN PKPRCB Prcb, + IN CCHAR Number, + IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) +{ + ULONG FeatureBits; + LARGE_INTEGER PageDirectory; + PVOID DpcStack; + + /* Detect and set the CPU Type */ + KiSetProcessorType(); + + /* Initialize the Power Management Support for this PRCB */ + PoInitializePrcb(Prcb); + + /* Get the processor features for the CPU */ + FeatureBits = KiGetFeatureBits(); + + /* Save feature bits */ + Prcb->FeatureBits = FeatureBits; + + /* Get cache line information for this CPU */ + KiGetCacheInformation(); + + /* Initialize spinlocks and DPC data */ + KiInitSpinLocks(Prcb, Number); + + /* Check if this is the Boot CPU */ + if (!Number) + { + /* Set Node Data */ + KeNodeBlock[0] = &KiNode0; + Prcb->ParentNode = KeNodeBlock[0]; + KeNodeBlock[0]->ProcessorMask = Prcb->SetMember; + + /* Set boot-level flags */ + KeProcessorArchitecture = 0; + KeProcessorLevel = (USHORT)Prcb->CpuType; + KeFeatureBits = FeatureBits; + + /* Set the current MP Master KPRCB to the Boot PRCB */ + Prcb->MultiThreadSetMaster = Prcb; + + /* Initialize portable parts of the OS */ + KiInitSystem(); + + /* Initialize the Idle Process and the Process Listhead */ + InitializeListHead(&KiProcessListHead); + PageDirectory.QuadPart = 0; + KeInitializeProcess(InitProcess, + 0, + 0xFFFFFFFF, + &PageDirectory, + TRUE); + InitProcess->QuantumReset = MAXCHAR; + } + else + { + /* FIXME */ + DPRINT1("SMP Boot support not yet present\n"); + } + +#if 0 + /* Setup the Idle Thread */ + KeInitializeThread(InitProcess, + InitThread, + NULL, + NULL, + NULL, + NULL, + NULL, + IdleStack); +#endif + InitThread->NextProcessor = Number; + InitThread->Priority = HIGH_PRIORITY; + InitThread->State = Running; + InitThread->Affinity = 1 << Number; + InitThread->WaitIrql = DISPATCH_LEVEL; + InitProcess->ActiveProcessors = 1 << Number; + + /* Set up the thread-related fields in the PRCB */ + //Prcb->CurrentThread = InitThread; + Prcb->NextThread = NULL; + //Prcb->IdleThread = InitThread; + + /* Initialize the Kernel Executive */ + ExpInitializeExecutive(0, (PLOADER_PARAMETER_BLOCK)LoaderBlock); + + /* Only do this on the boot CPU */ + if (!Number) + { + /* Calculate the time reciprocal */ + KiTimeIncrementReciprocal = + KiComputeReciprocal(KeMaximumIncrement, + &KiTimeIncrementShiftCount); + + /* Update DPC Values in case they got updated by the executive */ + Prcb->MaximumDpcQueueDepth = KiMaximumDpcQueueDepth; + Prcb->MinimumDpcRate = KiMinimumDpcRate; + Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; + + /* Allocate the DPC Stack */ + DpcStack = MmCreateKernelStack(FALSE); + if (!DpcStack) KeBugCheckEx(NO_PAGES_AVAILABLE, 1, 0, 0, 0); + Prcb->DpcStack = DpcStack; + } + + /* Free Initial Memory */ + MiFreeInitMemory(); + + while (1) + { + LARGE_INTEGER Timeout; + Timeout.QuadPart = 0x7fffffffffffffffLL; + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + } + + /* Bug Check and loop forever if anything failed */ + KEBUGCHECK(0); + for(;;); +} + +/* translate address */ +int PpcVirt2phys( int virt, int inst ); +/* Add a new page table entry for the indicated mapping */ +BOOLEAN InsertPageEntry( int virt, int phys, int slot, int _sdr1 ); +void SetBat( int bat, int inst, int hi, int lo ); +void SetSR( int n, int val ); + +/* Use this for early boot additions to the page table */ +VOID +NTAPI +KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + ULONG Cpu, PhysicalPage, i; + PKIPCR Pcr = (PKIPCR)KPCR_BASE; + PKPRCB Prcb; + + /* Zero bats for now ... We may use these for something later */ + for( i = 0; i < 4; i++ ) { + SetBat( i, 0, 0, 0 ); + SetBat( i, 1, 0, 0 ); + } + + /* Set up segs for normal paged address space. */ + for( i = 0; i < 16; i++ ) { + SetSR(i, i); + } + + /* Save the loader block and get the current CPU */ + //KeLoaderBlock = LoaderBlock; + Cpu = KeNumberProcessors; + if (!Cpu) + { + /* Skippable initialization for secondary processor */ + /* We'll allocate a page from the end of the kernel area for KPCR. This code will probably + * change when we get SMP support. + */ + ULONG LastPage = ROUND_UP(KeLoaderModules[KeLoaderModuleCount-1].ModEnd,1<<PAGE_SHIFT); + PhysicalPage = PpcVirt2phys(LastPage, FALSE); + InsertPageEntry((ULONG)Pcr, PhysicalPage, 0, 0); + *((PULONG)Pcr) = -1; + if(!((PULONG)Pcr)) { + TRACEXY(0xCABBA9E, 0xC0FFEE); + while(1); + } + } + + /* Skip initial setup if this isn't the Boot CPU */ + if (Cpu) goto AppCpuInit; + + /* Initialize the PCR */ + RtlZeroMemory(Pcr, PAGE_SIZE); + KiInitializePcr(Cpu, + Pcr, + &KiInitialThread.Tcb, + KiDoubleFaultStack); + + TRACE; + /* Set us as the current process */ + KiInitialThread.Tcb.ApcState.Process = &KiInitialProcess.Pcb; + + TRACE; + /* Setup CPU-related fields */ +AppCpuInit: + TRACE; + Prcb = Pcr->Prcb; + Pcr->Number = Cpu; + Pcr->SetMember = 1 << Cpu; + Prcb->SetMember = 1 << Cpu; + + TRACE; + /* Initialize the Processor with HAL */ + HalInitializeProcessor(Cpu, LoaderBlock); + + TRACE; + /* Set active processors */ + KeActiveProcessors |= Pcr->SetMember; + KeNumberProcessors++; + + TRACE; + /* Initialize the Debugger for the Boot CPU */ + if (!Cpu) KdInitSystem (0, LoaderBlock); + + TRACE; + /* Check for break-in */ + if (KdPollBreakIn()) + { + DbgBreakPointWithStatus(1); + } + + TRACE; + /* Raise to HIGH_LEVEL */ + KfRaiseIrql(HIGH_LEVEL); + + TRACE; + /* Call main kernel intialization */ + KiInitializeKernel(&KiInitialProcess.Pcb, + &KiInitialThread.Tcb, + P0BootStack, + Prcb, + Cpu, + (PVOID)LoaderBlock); + TRACE; +} + Added: branches/powerpc/reactos/ntoskrnl/ke/powerpc/mmu.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/pow… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/powerpc/mmu.c (added) +++ branches/powerpc/reactos/ntoskrnl/ke/powerpc/mmu.c Wed Jan 3 12:31:26 2007 @@ -1,0 +1,397 @@ +#include <ntoskrnl.h> + +inline int GetMSR() { + register int res asm ("r3"); + __asm__("mfmsr 3"); + return res; +} + +inline int GetDEC() { + register int res asm ("r3"); + __asm__("mfdec 3"); + return res; +} + +extern int GetPhys(int Addr); +extern void SetPhys(int Addr, int Val); + +__asm__("\t.globl GetPhys\n" + "GetPhys:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "xori 3,3,4\n\t" /* Undo effects of LE without swapping */ + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "isync\n\t" + "sync\n\t" + "lwz 3,0(3)\n\t" /* Get actual value at phys addr r3 */ + "mtmsr 5\n\t" + "isync\n\t" + "sync\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +__asm__("\t.globl SetPhys\n" + "SetPhys:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "xori 3,3,4\n\t" /* Undo effects of LE without swapping */ + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "sync\n\t" + "eieio\n\t" + "stw 4,0(3)\n\t" /* Set actual value at phys addr r3 */ + "dcbst 0,3\n\t" + "mtmsr 5\n\t" + "sync\n\t" + "eieio\n\t" + "mr 3,4\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +__asm__("\t.globl SetPhysByte\n" + "SetPhysByte:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "xori 3,3,7\n\t" /* Undo effects of LE without swapping */ + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "sync\n\t" + "eieio\n\t" + "stb 4,0(3)\n\t" /* Set actual value at phys addr r3 */ + "dcbst 0,3\n\t" + "mtmsr 5\n\t" + "sync\n\t" + "eieio\n\t" + "mr 3,4\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +inline int GetSR(int n) { + register int res asm ("r3"); + switch( n ) { + case 0: + __asm__("mfsr 3,0"); + break; + case 1: + __asm__("mfsr 3,1"); + break; + case 2: + __asm__("mfsr 3,2"); + break; + case 3: + __asm__("mfsr 3,3"); + break; + case 4: + __asm__("mfsr 3,4"); + break; + case 5: + __asm__("mfsr 3,5"); + break; + case 6: + __asm__("mfsr 3,6"); + break; + case 7: + __asm__("mfsr 3,7"); + break; + case 8: + __asm__("mfsr 3,8"); + break; + case 9: + __asm__("mfsr 3,9"); + break; + case 10: + __asm__("mfsr 3,10"); + break; + case 11: + __asm__("mfsr 3,11"); + break; + case 12: + __asm__("mfsr 3,12"); + break; + case 13: + __asm__("mfsr 3,13"); + break; + case 14: + __asm__("mfsr 3,14"); + break; + case 15: + __asm__("mfsr 3,15"); + break; + } + return res; +} + +inline void SetSR(int n, int val) { + switch( n ) { + case 0: + __asm__("mtsr 4,0"); + break; + case 1: + __asm__("mtsr 4,1"); + break; + case 2: + __asm__("mtsr 4,2"); + break; + case 3: + __asm__("mtsr 4,3"); + break; + case 4: + __asm__("mtsr 4,4"); + break; + case 5: + __asm__("mtsr 4,5"); + break; + case 6: + __asm__("mtsr 4,6"); + break; + case 7: + __asm__("mtsr 4,7"); + break; + case 8: + __asm__("mtsr 4,8"); + break; + case 9: + __asm__("mtsr 4,9"); + break; + case 10: + __asm__("mtsr 4,10"); + break; + case 11: + __asm__("mtsr 4,11"); + break; + case 12: + __asm__("mtsr 4,12"); + break; + case 13: + __asm__("mtsr 4,13"); + break; + case 14: + __asm__("mtsr 4,14"); + break; + case 15: + __asm__("mtsr 4,15"); + break; + } +} + +inline void GetBat( int bat, int inst, int *batHi, int *batLo ) { + register int bh asm("r3"), bl asm("r4"); + if( inst ) { + switch( bat ) { + case 0: + __asm__("mfibatu 3,0"); + __asm__("mfibatl 4,0"); + break; + case 1: + __asm__("mfibatu 3,1"); + __asm__("mfibatl 4,1"); + break; + case 2: + __asm__("mfibatu 3,2"); + __asm__("mfibatl 4,2"); + break; + case 3: + __asm__("mfibatu 3,3"); + __asm__("mfibatl 4,3"); + break; + } + } else { + switch( bat ) { + case 0: + __asm__("mfdbatu 3,0"); + __asm__("mfdbatl 4,0"); + break; + case 1: + __asm__("mfdbatu 3,1"); + __asm__("mfdbatl 4,1"); + break; + case 2: + __asm__("mfdbatu 3,2"); + __asm__("mfdbatl 4,2"); + break; + case 3: + __asm__("mfdbatu 3,3"); + __asm__("mfdbatl 4,3"); + break; + } + } + *batHi = bh; + *batLo = bl; +} + +inline void SetBat( int bat, int inst, int batHi, int batLo ) { + register int bh asm("r3"), bl asm("r4"); + bh = batHi; + bl = batLo; + if( inst ) { + switch( bat ) { + case 0: + __asm__("mtibatu 0,3"); + __asm__("mtibatl 0,4"); + break; + case 1: + __asm__("mtibatu 1,3"); + __asm__("mtibatl 1,4"); + break; + case 2: + __asm__("mtibatu 2,3"); + __asm__("mtibatl 2,4"); + break; + case 3: + __asm__("mtibatu 3,3"); + __asm__("mtibatl 3,4"); + break; + } + } else { + switch( bat ) { + case 0: + __asm__("mtdbatu 0,3"); + __asm__("mtdbatl 0,4"); + break; + case 1: + __asm__("mtdbatu 1,3"); + __asm__("mtdbatl 1,4"); + break; + case 2: + __asm__("mtdbatu 2,3"); + __asm__("mtdbatl 2,4"); + break; + case 3: + __asm__("mtdbatu 3,3"); + __asm__("mtdbatl 3,4"); + break; + } + } + __asm__("isync\n\tsync"); +} + +inline int GetSDR1() { + register int res asm("r3"); + __asm__("mfsdr1 3"); + return res; +} + +inline void SetSDR1( int sdr ) { +#if 0 + int i,j; +#endif + __asm__("mtsdr1 3"); +#if 0 + __asm__("sync"); + __asm__("isync"); + __asm__("ptesync"); + + for( i = 0; i < 256; i++ ) { + j = i << 12; + __asm__("tlbie %0,0" : : "r" (j)); + } + __asm__("eieio"); + __asm__("tlbsync"); + __asm__("ptesync"); +#endif +} + +inline int BatHit( int bath, int batl, int virt ) { + int mask = 0xfffe0000 & ~((batl & 0x3f) << 17); + return (batl & 0x40) && ((virt & mask) == (bath & mask)); +} + +inline int BatTranslate( int bath, int batl, int virt ) { + return (virt & 0x007fffff) | (batl & 0xfffe0000); +} + +/* translate address */ +int PpcVirt2phys( int virt, int inst ) { + int msr = GetMSR(); + int txmask = inst ? 0x20 : 0x10; + int i, bath, batl, sr, sdr1, physbase, vahi, valo; + int npteg, hash, hashmask, ptehi, ptelo, ptegaddr; + int vsid, pteh, ptevsid, pteapi; + + if( msr & txmask ) { + sr = GetSR( virt >> 28 ); + vsid = sr & 0xfffffff; + vahi = vsid >> 4; + valo = (vsid << 28) | (virt & 0xfffffff); + if( sr & 0x80000000 ) { + return valo; + } + + for( i = 0; i < 4; i++ ) { + GetBat( i, inst, &bath, &batl ); + if( BatHit( bath, batl, virt ) ) { + return BatTranslate( bath, batl, virt ); + } + } + + sdr1 = GetSDR1(); + + physbase = sdr1 & ~0xffff; + hashmask = ((sdr1 & 0x1ff) << 10) | 0x3ff; + hash = (vsid & 0x7ffff) ^ ((valo >> 12) & 0xffff); + npteg = hashmask + 1; + + for( pteh = 0; pteh < 0x80; pteh += 64, hash ^= 0x7ffff ) { + ptegaddr = ((hashmask & hash) * 64) + physbase; + + for( i = 0; i < 8; i++ ) { + ptehi = GetPhys( ptegaddr + (i * 8) ); + ptelo = GetPhys( ptegaddr + (i * 8) + 4 ); + + ptevsid = (ptehi >> 7) & 0xffffff; + pteapi = ptehi & 0x3f; + + if( (ptehi & 64) != pteh ) continue; + if( ptevsid != (vsid & 0xffffff) ) continue; + if( pteapi != ((virt >> 22) & 0x3f) ) continue; + + return (ptelo & 0xfffff000) | (virt & 0xfff); + } + } + return -1; + } else { + return virt; + } +} + +/* Add a new page table entry for the indicated mapping */ +BOOLEAN InsertPageEntry( int virt, int phys, int slot, int _sdr1 ) { + int i, ptehi, ptelo; + int sdr1 = _sdr1 ? _sdr1 : GetSDR1(); + int sr = GetSR( (virt >> 28) & 0xf ); + int vsid = sr & 0xfffffff; + int physbase = sdr1 & ~0xffff; + int hashmask = ((sdr1 & 0x1ff) << 10) | 0x3ff; + int valo = (vsid << 28) | (virt & 0xfffffff); + int hash = (vsid & 0x7ffff) ^ ((valo >> 12) & 0xffff); + int ptegaddr = ((hashmask & hash) * 64) + physbase; + + for( i = 0; i < 8; i++ ) { + ptehi = GetPhys( ptegaddr + (i * 8) ); + + if( (slot != i) && (ptehi & 0x80000000) ) continue; + + ptehi = (1 << 31) | (vsid << 7) | ((virt >> 22) & 0x3f); + ptelo = phys & ~0xfff; + + SetPhys( ptegaddr + (i * 8), ptehi ); + SetPhys( ptegaddr + (i * 8) + 4, ptelo ); + + return TRUE; + } + + return FALSE; +} Added: branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/pow… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c (added) +++ branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c Wed Jan 3 12:31:26 2007 @@ -1,0 +1,739 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ke/i386/irq.c + * PURPOSE: IRQ handling + * + * PROGRAMMERS: David Welch (welch(a)mcmail.com) + */ + +/* + * NOTE: In general the PIC interrupt priority facilities are used to + * preserve the NT IRQL semantics, global interrupt disables are only used + * to keep the PIC in a consistent state + * + */ + +/* INCLUDES ****************************************************************/ + +#include <ntoskrnl.h> + +#define NDEBUG +#include <internal/debug.h> + +extern KDPC KiExpireTimerDpc; +extern ULONG KiMaximumDpcQueueDepth; +extern ULONG KiMinimumDpcRate; +extern ULONG KiAdjustDpcThreshold; +extern ULONG KiIdealDpcRate; +extern LONG KiTickOffset; +extern ULONG KeMaximumIncrement; +extern ULONG KeMinimumIncrement; +extern ULONG KeTimeAdjustment; +extern BOOLEAN KiClockSetupComplete; + +/* GLOBALS *****************************************************************/ + +/* Interrupt handler list */ + +#define NR_TRAPS 16 +#ifdef CONFIG_SMP + +#define INT_NAME2(intnum) KiUnexpectedInterrupt##intnum + +#define BUILD_INTERRUPT_HANDLER(intnum) \ +VOID INT_NAME2(intnum)(VOID); + +#define D(x,y) \ + BUILD_INTERRUPT_HANDLER(x##y) + +#define D16(x) \ + D(x,0) D(x,1) D(x,2) D(x,3) \ + D(x,4) D(x,5) D(x,6) D(x,7) \ + D(x,8) D(x,9) D(x,A) D(x,B) \ + D(x,C) D(x,D) D(x,E) D(x,F) + +D16(3) D16(4) D16(5) D16(6) +D16(7) D16(8) D16(9) D16(A) +D16(B) D16(C) D16(D) D16(E) +D16(F) + +#define L(x,y) \ + (ULONG)& INT_NAME2(x##y) + +#define L16(x) \ + L(x,0), L(x,1), L(x,2), L(x,3), \ + L(x,4), L(x,5), L(x,6), L(x,7), \ + L(x,8), L(x,9), L(x,A), L(x,B), \ + L(x,C), L(x,D), L(x,E), L(x,F) + +static ULONG irq_handler[ROUND_UP(NR_TRAPS, 16)] = { + L16(3), L16(4), L16(5), L16(6), + L16(7), L16(8), L16(9), L16(A), + L16(B), L16(C), L16(D), L16(E) +}; + +#undef L +#undef L16 +#undef D +#undef D16 + +#else /* CONFIG_SMP */ + +void trap_handler_0(void); +void trap_handler_1(void); +void trap_handler_2(void); +void trap_handler_3(void); +void trap_handler_4(void); +void trap_handler_5(void); +void trap_handler_6(void); +void trap_handler_7(void); +void trap_handler_8(void); +void trap_handler_9(void); +void trap_handler_10(void); +void trap_handler_11(void); +void trap_handler_12(void); +void trap_handler_13(void); +void trap_handler_14(void); +void trap_handler_15(void); + +static unsigned int trap_handler[NR_TRAPS] __attribute__((unused)) = +{ + (int)&trap_handler_0, + (int)&trap_handler_1, + (int)&trap_handler_2, + (int)&trap_handler_3, + (int)&trap_handler_4, + (int)&trap_handler_5, + (int)&trap_handler_6, + (int)&trap_handler_7, + (int)&trap_handler_8, + (int)&trap_handler_9, + (int)&trap_handler_10, + (int)&trap_handler_11, + (int)&trap_handler_12, + (int)&trap_handler_13, + (int)&trap_handler_14, + (int)&trap_handler_15, +}; + +#endif /* CONFIG_SMP */ + +/* + * PURPOSE: Object describing each isr + * NOTE: The data in this table is only modified at passsive level but can + * be accessed at any irq level. + */ + +typedef struct +{ + LIST_ENTRY ListHead; + KSPIN_LOCK Lock; + ULONG Count; +} +ISR_TABLE, *PISR_TABLE; + +#ifdef CONFIG_SMP +static ISR_TABLE IsrTable[NR_TRAPS][MAXIMUM_PROCESSORS]; +#else +static ISR_TABLE IsrTable[NR_TRAPS][1]; +#endif + +#define TAG_ISR_LOCK TAG('I', 'S', 'R', 'L') + +/* FUNCTIONS ****************************************************************/ + +VOID +INIT_FUNCTION +NTAPI +KeInitInterrupts (VOID) +{ + int i, j; + + /* + * Setup the IDT entries to point to the interrupt handlers + */ + for (i=0;i<NR_TRAPS;i++) + { +#ifdef CONFIG_SMP + for (j = 0; j < MAXIMUM_PROCESSORS; j++) +#else + j = 0; +#endif + { + InitializeListHead(&IsrTable[i][j].ListHead); + KeInitializeSpinLock(&IsrTable[i][j].Lock); + IsrTable[i][j].Count = 0; + } + } +} + +static VOID +KeIRQTrapFrameToTrapFrame(PKIRQ_TRAPFRAME IrqTrapFrame, + PKTRAP_FRAME TrapFrame) +{ +} + +static VOID +KeTrapFrameToIRQTrapFrame(PKTRAP_FRAME TrapFrame, + PKIRQ_TRAPFRAME IrqTrapFrame) +{ +} + +/* + * NOTE: On Windows this function takes exactly one parameter and EBP is + * guaranteed to point to KTRAP_FRAME. The function is used only + * by HAL, so there's no point in keeping that prototype. + * + * @implemented + */ +VOID +STDCALL +KeUpdateRunTime(IN PKTRAP_FRAME TrapFrame, + IN KIRQL Irql) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + PKTHREAD CurrentThread; + PKPROCESS CurrentProcess; + + /* Make sure we don't go further if we're in early boot phase. */ + if (!(Prcb) || !(Prcb->CurrentThread)) return; + + /* Get the current thread and process */ + CurrentThread = Prcb->CurrentThread; + CurrentProcess = CurrentThread->ApcState.Process; + + /* Check if we came from user mode */ + if (TrapFrame->PreviousMode != KernelMode) + { + /* Update user times */ + CurrentThread->UserTime++; + InterlockedIncrement((PLONG)&CurrentProcess->UserTime); + Prcb->UserTime++; + } + else + { + /* Check IRQ */ + if (Irql > DISPATCH_LEVEL) + { + /* This was an interrupt */ + Prcb->InterruptTime++; + } + else if ((Irql < DISPATCH_LEVEL) || !(Prcb->DpcRoutineActive)) + { + /* This was normal kernel time */ + CurrentThread->KernelTime++; + InterlockedIncrement((PLONG)&CurrentProcess->KernelTime); + } + else if (Irql == DISPATCH_LEVEL) + { + /* This was DPC time */ + Prcb->DpcTime++; + } + + /* Update CPU kernel time in all cases */ + Prcb->KernelTime++; + } + + /* Set the last DPC Count and request rate */ + Prcb->DpcLastCount = Prcb->DpcData[0].DpcCount; + Prcb->DpcRequestRate = ((Prcb->DpcData[0].DpcCount - Prcb->DpcLastCount) + + Prcb->DpcRequestRate) / 2; + + /* Check if we should request a DPC */ + if ((Prcb->DpcData[0].DpcQueueDepth) && !(Prcb->DpcRoutineActive)) + { + /* Request one */ + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + + /* Update the depth if needed */ + if ((Prcb->DpcRequestRate < KiIdealDpcRate) && + (Prcb->MaximumDpcQueueDepth > 1)) + { + /* Decrease the maximum depth by one */ + Prcb->MaximumDpcQueueDepth--; + } + } + else + { + /* Decrease the adjustment threshold */ + if (!(--Prcb->AdjustDpcThreshold)) + { + /* We've hit 0, reset it */ + Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; + + /* Check if we've hit queue maximum */ + if (KiMaximumDpcQueueDepth != Prcb->MaximumDpcQueueDepth) + { + /* Increase maximum by one */ + Prcb->MaximumDpcQueueDepth++; + } + } + } + + /* + * If we're at end of quantum request software interrupt. The rest + * is handled in KiDispatchInterrupt. + * + * NOTE: If one stays at DISPATCH_LEVEL for a long time the DPC routine + * which checks for quantum end will not be executed and decrementing + * the quantum here can result in overflow. This is not a problem since + * we don't care about the quantum value anymore after the QuantumEnd + * flag is set. + */ + if ((CurrentThread->Quantum -= 3) <= 0) + { + Prcb->QuantumEnd = TRUE; + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + } +} + + +/* + * NOTE: On Windows this function takes exactly zero parameters and EBP is + * guaranteed to point to KTRAP_FRAME. Also [esp+0] contains an IRQL. + * The function is used only by HAL, so there's no point in keeping + * that prototype. + * + * @implemented + */ +VOID +STDCALL +KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, + IN KIRQL Irql, + IN ULONG Increment) +{ + LONG OldOffset; + LARGE_INTEGER Time; + ASSERT(KeGetCurrentIrql() == PROFILE_LEVEL); + if (!KiClockSetupComplete) return; + + /* Update interrupt time */ + Time.LowPart = SharedUserData->InterruptTime.LowPart; + Time.HighPart = SharedUserData->InterruptTime.High1Time; + Time.QuadPart += Increment; + SharedUserData->InterruptTime.High2Time = Time.u.HighPart; + SharedUserData->InterruptTime.LowPart = Time.u.LowPart; + SharedUserData->InterruptTime.High1Time = Time.u.HighPart; + + /* Increase the tick offset */ + KiTickOffset -= Increment; + OldOffset = KiTickOffset; + + /* Check if this isn't a tick yet */ + if (KiTickOffset > 0) + { + /* Expire timers */ + KeInsertQueueDpc(&KiExpireTimerDpc, 0, 0); + } + else + { + /* Setup time structure for system time */ + Time.LowPart = SharedUserData->SystemTime.LowPart; + Time.HighPart = SharedUserData->SystemTime.High1Time; + Time.QuadPart += KeTimeAdjustment; + SharedUserData->SystemTime.High2Time = Time.HighPart; + SharedUserData->SystemTime.LowPart = Time.LowPart; + SharedUserData->SystemTime.High1Time = Time.HighPart; + + /* Setup time structure for tick time */ + Time.LowPart = KeTickCount.LowPart; + Time.HighPart = KeTickCount.High1Time; + Time.QuadPart += 1; + KeTickCount.High2Time = Time.HighPart; + KeTickCount.LowPart = Time.LowPart; + KeTickCount.High1Time = Time.HighPart; + SharedUserData->TickCount.High2Time = Time.HighPart; + SharedUserData->TickCount.LowPart = Time.LowPart; + SharedUserData->TickCount.High1Time = Time.HighPart; + + /* Update tick count in shared user data as well */ + SharedUserData->TickCountLowDeprecated++; + + /* Queue a DPC that will expire timers */ + KeInsertQueueDpc(&KiExpireTimerDpc, 0, 0); + } + + /* Update process and thread times */ + if (OldOffset <= 0) + { + /* This was a tick, calculate the next one */ + KiTickOffset += KeMaximumIncrement; + KeUpdateRunTime(TrapFrame, Irql); + } +} + +VOID STDCALL +KiInterruptDispatch2 (ULONG vector, KIRQL old_level) +/* + * FUNCTION: Calls all the interrupt handlers for a given irq. + * ARGUMENTS: + * vector - The number of the vector to call handlers for. + * old_level - The irql of the processor when the irq took place. + * NOTES: Must be called at DIRQL. + */ +{ + PKINTERRUPT isr; + PLIST_ENTRY current; + KIRQL oldlvl; + PISR_TABLE CurrentIsr; + + DPRINT("I(0x%.08x, 0x%.08x)\n", vector, old_level); + + /* + * Iterate the list until one of the isr tells us its device interrupted + */ + CurrentIsr = &IsrTable[vector][(ULONG)KeGetCurrentProcessorNumber()]; + + KiAcquireSpinLock(&CurrentIsr->Lock); + + CurrentIsr->Count++; + current = CurrentIsr->ListHead.Flink; + + while (current != &CurrentIsr->ListHead) + { + isr = CONTAINING_RECORD(current,KINTERRUPT,InterruptListEntry); + oldlvl = KeAcquireInterruptSpinLock(isr); + if (isr->ServiceRoutine(isr, isr->ServiceContext)) + { + KeReleaseInterruptSpinLock(isr, oldlvl); + break; + } + KeReleaseInterruptSpinLock(isr, oldlvl); + current = current->Flink; + } + KiReleaseSpinLock(&CurrentIsr->Lock); +} + +VOID +KiInterruptDispatch3 (ULONG vector, PKIRQ_TRAPFRAME Trapframe) +/* + * FUNCTION: Calls the irq specific handler for an irq + * ARGUMENTS: + * irq = IRQ that has interrupted + */ +{ + KIRQL old_level; + KTRAP_FRAME KernelTrapFrame; + PKTHREAD CurrentThread; + PKTRAP_FRAME OldTrapFrame=NULL; + + /* + * At this point we have interrupts disabled, nothing has been done to + * the PIC. + */ + + KeGetCurrentPrcb()->InterruptCount++; + + /* + * Notify the rest of the kernel of the raised irq level. For the + * default HAL this will send an EOI to the PIC and alter the IRQL. + */ + if (!HalBeginSystemInterrupt (vector, + vector, + &old_level)) + { + return; + } + + + /* + * Enable interrupts + * NOTE: Only higher priority interrupts will get through + */ + _enable(); + +#ifndef CONFIG_SMP + if (vector == 0) + { + KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); + KeUpdateSystemTime(&KernelTrapFrame, old_level, 100000); + } + else +#endif + { + /* + * Actually call the ISR. + */ + KiInterruptDispatch2(vector, old_level); + } + + /* + * End the system interrupt. + */ + _disable(); + + if (old_level==PASSIVE_LEVEL) + { + HalEndSystemInterrupt (APC_LEVEL, 0); + + CurrentThread = KeGetCurrentThread(); + if (CurrentThread!=NULL && CurrentThread->ApcState.UserApcPending) + { + DPRINT("PID: %d, TID: %d CS %04x/%04x\n", + ((PETHREAD)CurrentThread)->ThreadsProcess->UniqueProcessId, + ((PETHREAD)CurrentThread)->Cid.UniqueThread, + Trapframe->Cs, + CurrentThread->TrapFrame ? CurrentThread->TrapFrame->Cs : 0); + if (CurrentThread->TrapFrame == NULL) + { + OldTrapFrame = CurrentThread->TrapFrame; + KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); + CurrentThread->TrapFrame = &KernelTrapFrame; + } + + _enable(); + KiDeliverApc(UserMode, NULL, NULL); + _disable(); + + ASSERT(KeGetCurrentThread() == CurrentThread); + if (CurrentThread->TrapFrame == &KernelTrapFrame) + { + KeTrapFrameToIRQTrapFrame(&KernelTrapFrame, Trapframe); + CurrentThread->TrapFrame = OldTrapFrame; + } + } + KeLowerIrql(PASSIVE_LEVEL); + } + else + { + HalEndSystemInterrupt (old_level, 0); + } + +} + +static VOID +KeDumpIrqList(VOID) +{ + PKINTERRUPT current; + PLIST_ENTRY current_entry; + LONG i, j; + KIRQL oldlvl; + BOOLEAN printed; + + for (i=0;i<NR_TRAPS;i++) + { + printed = FALSE; + KeRaiseIrql(i,&oldlvl); + + for (j=0; j < KeNumberProcessors; j++) + { + KiAcquireSpinLock(&IsrTable[i][j].Lock); + + current_entry = IsrTable[i][j].ListHead.Flink; + current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry); + while (current_entry!=&(IsrTable[i][j].ListHead)) + { + if (printed == FALSE) + { + printed = TRUE; + DPRINT("For irq %x:\n",i); + } + DPRINT(" Isr %x\n",current); + current_entry = current_entry->Flink; + current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry); + } + KiReleaseSpinLock(&IsrTable[i][j].Lock); + } + KeLowerIrql(oldlvl); + } +} + +/* + * @implemented + */ +BOOLEAN +STDCALL +KeConnectInterrupt(PKINTERRUPT InterruptObject) +{ + KIRQL oldlvl,synch_oldlvl; + PKINTERRUPT ListHead; + ULONG Vector; + PISR_TABLE CurrentIsr; + BOOLEAN Result; + + DPRINT("KeConnectInterrupt()\n"); + + Vector = InterruptObject->Vector; + + if (Vector < 0 || Vector >= NR_TRAPS) + return FALSE; + + ASSERT (InterruptObject->Number < KeNumberProcessors); + + KeSetSystemAffinityThread(1 << InterruptObject->Number); + + CurrentIsr = &IsrTable[Vector][(ULONG)InterruptObject->Number]; + + KeRaiseIrql(Vector,&oldlvl); + KiAcquireSpinLock(&CurrentIsr->Lock); + + /* + * Check if the vector is already in use that we can share it + */ + if (!IsListEmpty(&CurrentIsr->ListHead)) + { + ListHead = CONTAINING_RECORD(CurrentIsr->ListHead.Flink,KINTERRUPT,InterruptListEntry); + if (InterruptObject->ShareVector == FALSE || ListHead->ShareVector==FALSE) + { + KiReleaseSpinLock(&CurrentIsr->Lock); + KeLowerIrql(oldlvl); + KeRevertToUserAffinityThread(); + return FALSE; + } + } + + synch_oldlvl = KeAcquireInterruptSpinLock(InterruptObject); + + DPRINT("%x %x\n",CurrentIsr->ListHead.Flink, CurrentIsr->ListHead.Blink); + + Result = HalEnableSystemInterrupt(Vector, InterruptObject->Irql, InterruptObject->Mode); + if (Result) + { + InsertTailList(&CurrentIsr->ListHead,&InterruptObject->InterruptListEntry); + DPRINT("%x %x\n",InterruptObject->InterruptListEntry.Flink, InterruptObject->InterruptListEntry.Blink); + } + + InterruptObject->Connected = TRUE; + KeReleaseInterruptSpinLock(InterruptObject, synch_oldlvl); + + /* + * Release the table spinlock + */ + KiReleaseSpinLock(&CurrentIsr->Lock); + KeLowerIrql(oldlvl); + + KeDumpIrqList(); + + KeRevertToUserAffinityThread(); + + return Result; +} + +/* + * @implemented + * + * FUNCTION: Releases a drivers isr + * ARGUMENTS: + * InterruptObject = isr to release + */ +BOOLEAN +STDCALL +KeDisconnectInterrupt(PKINTERRUPT InterruptObject) +{ + KIRQL oldlvl,synch_oldlvl; + PISR_TABLE CurrentIsr; + BOOLEAN State; + + DPRINT1("KeDisconnectInterrupt\n"); + ASSERT (InterruptObject->Number < KeNumberProcessors); + + /* Set the affinity */ + KeSetSystemAffinityThread(1 << InterruptObject->Number); + + /* Get the ISR Tabe */ + CurrentIsr = &IsrTable[InterruptObject->Vector] + [(ULONG)InterruptObject->Number]; + + /* Raise IRQL to required level and lock table */ + KeRaiseIrql(InterruptObject->Vector,&oldlvl); + KiAcquireSpinLock(&CurrentIsr->Lock); + + /* Check if it's actually connected */ + if ((State = InterruptObject->Connected)) + { + /* Lock the Interrupt */ + synch_oldlvl = KeAcquireInterruptSpinLock(InterruptObject); + + /* Remove this one, and check if all are gone */ + RemoveEntryList(&InterruptObject->InterruptListEntry); + if (IsListEmpty(&CurrentIsr->ListHead)) + { + /* Completely Disable the Interrupt */ + HalDisableSystemInterrupt(InterruptObject->Vector, InterruptObject->Irql); + } + + /* Disconnect it */ + InterruptObject->Connected = FALSE; + + /* Release the interrupt lock */ + KeReleaseInterruptSpinLock(InterruptObject, synch_oldlvl); + } + /* Release the table spinlock */ + KiReleaseSpinLock(&CurrentIsr->Lock); + KeLowerIrql(oldlvl); + + /* Go back to default affinity */ + KeRevertToUserAffinityThread(); + + /* Return Old Interrupt State */ + return State; +} + +/* + * @implemented + */ +VOID +STDCALL +KeInitializeInterrupt(PKINTERRUPT Interrupt, + PKSERVICE_ROUTINE ServiceRoutine, + PVOID ServiceContext, + PKSPIN_LOCK SpinLock, + ULONG Vector, + KIRQL Irql, + KIRQL SynchronizeIrql, + KINTERRUPT_MODE InterruptMode, + BOOLEAN ShareVector, + CHAR ProcessorNumber, + BOOLEAN FloatingSave) +{ + /* Set the Interrupt Header */ + Interrupt->Type = InterruptObject; + Interrupt->Size = sizeof(KINTERRUPT); + + /* Check if we got a spinlock */ + if (SpinLock) + { + Interrupt->ActualLock = SpinLock; + } + else + { + /* This means we'll be usin the built-in one */ + KeInitializeSpinLock(&Interrupt->SpinLock); + Interrupt->ActualLock = &Interrupt->SpinLock; + } + + /* Set the other settings */ + Interrupt->ServiceRoutine = ServiceRoutine; + Interrupt->ServiceContext = ServiceContext; + Interrupt->Vector = Vector; + Interrupt->Irql = Irql; + Interrupt->SynchronizeIrql = SynchronizeIrql; + Interrupt->Mode = InterruptMode; + Interrupt->ShareVector = ShareVector; + Interrupt->Number = ProcessorNumber; + Interrupt->FloatingSave = FloatingSave; + + /* Disconnect it at first */ + Interrupt->Connected = FALSE; +} + +VOID KePrintInterruptStatistic(VOID) +{ + LONG i, j; + + for (j = 0; j < KeNumberProcessors; j++) + { + DPRINT1("CPU%d:\n", j); + for (i = 0; i < NR_TRAPS; i++) + { + if (IsrTable[i][j].Count) + { + DPRINT1(" Irq %x(%d): %d\n", i, i, IsrTable[i][j].Count); + } + } + } +} + +/* EOF */ Modified: branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ntoskr… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild Wed Jan 3 12:31:26 2007 @@ -49,6 +49,9 @@ <if property="ARCH" value="powerpc"> <directory name="powerpc"> <file first="true">main_asm.S</file> + <file>mmu.c</file> + <file>cpu.c</file> + <file>exp.c</file> <file>kiinit.c</file> <file>ppc_irq.c</file> </directory>

17 years, 9 months

[ekohl] 25279: Add the appearance preview control. Right now it doesn't do much but sitting there and looking great. ; -)

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Jan 3 00:53:26 2007 New Revision: 25279 URL: http://svn.reactos.org/svn/reactos?rev=25279&view=rev Log: Add the appearance preview control. Right now it doesn't do much but sitting there and looking great. ;-) Added: trunk/reactos/dll/cpl/desk/preview.c trunk/reactos/dll/cpl/desk/preview.h Modified: trunk/reactos/dll/cpl/desk/Fr.rc trunk/reactos/dll/cpl/desk/It.rc trunk/reactos/dll/cpl/desk/Ja.rc trunk/reactos/dll/cpl/desk/Ru.rc trunk/reactos/dll/cpl/desk/Uk.rc trunk/reactos/dll/cpl/desk/cz.rc trunk/reactos/dll/cpl/desk/de.rc trunk/reactos/dll/cpl/desk/desk.c trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/desk/en.rc trunk/reactos/dll/cpl/desk/es.rc trunk/reactos/dll/cpl/desk/gr.rc trunk/reactos/dll/cpl/desk/hu.rc trunk/reactos/dll/cpl/desk/nl.rc trunk/reactos/dll/cpl/desk/pl.rc trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/sv.rc Modified: trunk/reactos/dll/cpl/desk/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Fr.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/Fr.rc (original) +++ trunk/reactos/dll/cpl/desk/Fr.rc Wed Jan 3 00:53:26 2007 @@ -52,13 +52,15 @@ PUSHBUTTON "&Gestion de l'alimentation",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Apparence" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Vide pour l'instant....",IDC_STATIC,66, - 90,112,8 + 150,112,8 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/It.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/It.rc (original) +++ trunk/reactos/dll/cpl/desk/It.rc Wed Jan 3 00:53:26 2007 @@ -46,13 +46,15 @@ PUSHBUTTON "&Alimentazione",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Aspetto" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Questo spazio è stato intenzionalmente lasciato in bianco.",IDC_STATIC,66, - 90,112,8 + 150,112,8 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ja.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ja.rc (original) +++ trunk/reactos/dll/cpl/desk/Ja.rc Wed Jan 3 00:53:26 2007 @@ -55,8 +55,10 @@ CAPTION "OÏÌfUC" FONT 9, "MS UI Gothic" BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "±±ÍÓ}IÉó¯½ÜÜÉµÄ èÜ·",IDC_STATIC,66, - 110,112,8 + 150,112,8 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 Modified: trunk/reactos/dll/cpl/desk/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ru.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ru.rc (original) +++ trunk/reactos/dll/cpl/desk/Ru.rc Wed Jan 3 00:53:26 2007 @@ -49,12 +49,14 @@ 15 END -IDD_APPEARANCE DIALOGEX 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Îôîðìëåíèå" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Íàñòðîéêè âðåìåííî îòñóòñâóþò",IDC_STATIC,65,87,114,8 + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "Íàñòðîéêè âðåìåííî îòñóòñâóþò",IDC_STATIC,65,150,114,8 END IDD_SETTINGS DIALOGEX 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Uk.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/Uk.rc (original) +++ trunk/reactos/dll/cpl/desk/Uk.rc Wed Jan 3 00:53:26 2007 @@ -54,13 +54,15 @@ PUSHBUTTON "Ïàðàìåòðè &æèâëåííÿ",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Îôîðìëåííÿ" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Öå ì³ñöå íàâìèñíî çàëèøåíå ïóñòèì",IDC_STATIC,66, - 90,112,8 + 150,112,8 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/cz.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/cz.rc (original) +++ trunk/reactos/dll/cpl/desk/cz.rc Wed Jan 3 00:53:26 2007 @@ -50,13 +50,15 @@ PUSHBUTTON "M&onosti napájení",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Vzhled" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 90,112,8 + 150,112,8 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/de.rc (original) +++ trunk/reactos/dll/cpl/desk/de.rc Wed Jan 3 00:53:26 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 205 +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hintergrund" FONT 8, "MS Shell Dlg" @@ -15,12 +15,14 @@ COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Bildschirmschoner" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Bildschrimschoner",IDC_SCREENS_DUMMY, 5, 7, 238, 136 + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 80, 10, 83, 57, WS_EX_STATICEDGE + + GROUPBOX "&Bildschrimschoner",IDC_STATIC, 5, 7, 238, 136 LTEXT "Installierte Bildschrimschoner:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | @@ -46,28 +48,19 @@ PUSHBUTTON "Energ&ieeinstellungen",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Darstellung" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 90,112,8 + 150,112,8 END -IDR_POPUP_MENU MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Konfigurieren", ID_MENU_CONFIG - MENUITEM "&Vorschau", ID_MENU_PREVIEW - MENUITEM SEPARATOR - MENUITEM "&Hinzufügen", ID_MENU_ADD - MENUITEM "&Löschen\tDel", ID_MENU_DELETE - END -END - -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Einstellungen" FONT 8, "MS Shell Dlg" @@ -88,11 +81,22 @@ PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,306,165,56,14 END -STRINGTABLE +IDR_POPUP_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Konfigurieren", ID_MENU_CONFIG + MENUITEM "&Vorschau", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Hinzufügen", ID_MENU_ADD + MENUITEM "&Löschen\tDel", ID_MENU_DELETE + END +END + +STRINGTABLE BEGIN IDS_CPLNAME "Anzeige" IDS_CPLDESCRIPTION "Passt die Darstellung des Hintergrundbildes und des Bildschirmschoners an." - IDS_NONE "(Keine)" IDS_CENTER "Zentriert" IDS_STRETCH "Gestreckt" Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c (original) +++ trunk/reactos/dll/cpl/desk/desk.c Wed Jan 3 00:53:26 2007 @@ -9,6 +9,7 @@ */ #include "desk.h" +#include "preview.h" #define NUM_APPLETS (1) @@ -114,15 +115,20 @@ BOOL WINAPI -DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) +DllMain(HINSTANCE hInstDLL, DWORD dwReason, LPVOID lpvReserved) { UNREFERENCED_PARAMETER(lpvReserved); switch (dwReason) { case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - hApplet = hinstDLL; + RegisterPreviewControl(hInstDLL); +// case DLL_THREAD_ATTACH: + hApplet = hInstDLL; + break; + + case DLL_PROCESS_DETACH: + UnregisterPreviewControl(hInstDLL); break; } Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rbuild (original) +++ trunk/reactos/dll/cpl/desk/desk.rbuild Wed Jan 3 00:53:26 2007 @@ -27,5 +27,6 @@ <file>appearance.c</file> <file>settings.c</file> <file>dibitmap.c</file> + <file>preview.c</file> <file>desk.rc</file> </module> Modified: trunk/reactos/dll/cpl/desk/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/en.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/en.rc (original) +++ trunk/reactos/dll/cpl/desk/en.rc Wed Jan 3 00:53:26 2007 @@ -46,13 +46,15 @@ PUSHBUTTON "P&ower Settings",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Appearance" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 90,112,8 + 150,112,8 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/es.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/es.rc (original) +++ trunk/reactos/dll/cpl/desk/es.rc Wed Jan 3 00:53:26 2007 @@ -57,13 +57,15 @@ PUSHBUTTON "Energía...",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Apariencia" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Este espacio se ha dejado en blanco intencionadamente",IDC_STATIC,33, - 89,181,10 + 150,181,10 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/gr.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/gr.rc (original) +++ trunk/reactos/dll/cpl/desk/gr.rc Wed Jan 3 00:53:26 2007 @@ -50,13 +50,15 @@ PUSHBUTTON "&Ñõèìßóåéò åíÝñãåéáò",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ÅìöÜíéóç" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 90,112,8 + 150,112,8 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/hu.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/hu.rc (original) +++ trunk/reactos/dll/cpl/desk/hu.rc Wed Jan 3 00:53:26 2007 @@ -42,12 +42,14 @@ PUSHBUTTON "E&nergiaellátás",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Megjelenés" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ez a terület szándékosan lett üresen hagyva",IDC_STATIC,66,90,112,8 + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "Ez a terület szándékosan lett üresen hagyva",IDC_STATIC,66,150,112,8 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/nl.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/nl.rc (original) +++ trunk/reactos/dll/cpl/desk/nl.rc Wed Jan 3 00:53:26 2007 @@ -50,13 +50,15 @@ PUSHBUTTON "Inst&ellingen",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Appearance" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 90,112,8 + 150,112,8 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/pl.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/pl.rc (original) +++ trunk/reactos/dll/cpl/desk/pl.rc Wed Jan 3 00:53:26 2007 @@ -51,13 +51,15 @@ PUSHBUTTON "Z&asilanie",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Wygl¹d" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "To miejsce pozosta³o celowo puste",IDC_STATIC,66, - 90,112,8 + 1590,112,8 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Added: trunk/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.c (added) +++ trunk/reactos/dll/cpl/desk/preview.c Wed Jan 3 00:53:26 2007 @@ -1,0 +1,282 @@ +/* + * PROJECT: ReactOS Timedate Control Panel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/cpl/desk/preview.c + * PURPOSE: Draws the preview control + * COPYRIGHT: Copyright 2006 Eric Kohl + */ + +#include "desk.h" +#include "preview.h" + +static const TCHAR szPreviewWndClass[] = TEXT("PreviewWndClass"); + +typedef struct _PREVIEW_DATA +{ + DWORD clrDesktop; + HBRUSH hbrDesktop; + + DWORD clrWindow; + HBRUSH hbrWindow; + + INT cxEdge; + INT cyEdge; + + INT cyCaption; + + RECT rcDesktop; + RECT rcInactiveFrame; + RECT rcInactiveCaption; + + RECT rcActiveFrame; + RECT rcActiveCaption; + RECT rcActiveClient; + RECT rcActiveScroll; + + RECT rcDialogFrame; + RECT rcDialogCaption; + RECT rcDialogClient; + + RECT rcDialogButton; + +} PREVIEW_DATA, *PPREVIEW_DATA; + + +static VOID +DrawCaptionButtons(HDC hdc, LPRECT lpRect, BOOL bMinMax) +{ + RECT rc3; + RECT rc4; + RECT rc5; + + rc3.left = lpRect->right - 2 - 16; + rc3.top = lpRect->top + 2; + rc3.right = lpRect->right - 2; + rc3.bottom = lpRect->bottom - 2; + + DrawFrameControl(hdc, &rc3, DFC_CAPTION, DFCS_CAPTIONCLOSE); + + if (bMinMax) + { + rc4.left = rc3.left - 16 - 2; + rc4.top = rc3.top; + rc4.right = rc3.right - 16 - 2; + rc4.bottom = rc3.bottom; + + DrawFrameControl(hdc, &rc4, DFC_CAPTION, DFCS_CAPTIONMAX); + + rc5.left = rc4.left - 16; + rc5.top = rc4.top; + rc5.right = rc4.right - 16; + rc5.bottom = rc4.bottom; + + DrawFrameControl(hdc, &rc5, DFC_CAPTION, DFCS_CAPTIONMIN); + } +} + + +static VOID +OnSize(INT cx, INT cy, PPREVIEW_DATA pPreviewData) +{ + int width, height; + + /* Get Desktop rectangle */ + pPreviewData->rcDesktop.left = 0; + pPreviewData->rcDesktop.top = 0; + pPreviewData->rcDesktop.right = cx; + pPreviewData->rcDesktop.bottom = cy; + + /* Calculate the inactive window rectangle */ + pPreviewData->rcInactiveFrame.left = pPreviewData->rcDesktop.left + 8; + pPreviewData->rcInactiveFrame.top = pPreviewData->rcDesktop.top + 8; + pPreviewData->rcInactiveFrame.right = pPreviewData->rcDesktop.right - 25; + pPreviewData->rcInactiveFrame.bottom = pPreviewData->rcDesktop.bottom - 30; + + /* Calculate the inactive caption rectangle */ + pPreviewData->rcInactiveCaption.left = pPreviewData->rcInactiveFrame.left + pPreviewData->cxEdge + 1/*3*/ + 1; + pPreviewData->rcInactiveCaption.top = pPreviewData->rcInactiveFrame.top + pPreviewData->cyEdge + 1/*3*/ + 1; + pPreviewData->rcInactiveCaption.right = pPreviewData->rcInactiveFrame.right - pPreviewData->cxEdge - 1/*3*/ - 1; + pPreviewData->rcInactiveCaption.bottom = pPreviewData->rcInactiveFrame.top + pPreviewData->cyCaption /*20*/ + 2; + + /* Calculate the active window rectangle */ + pPreviewData->rcActiveFrame.left = pPreviewData->rcInactiveFrame.left + 3 + 1; + pPreviewData->rcActiveFrame.top = pPreviewData->rcInactiveCaption.bottom + 2; + pPreviewData->rcActiveFrame.right = pPreviewData->rcDesktop.right - 10; + pPreviewData->rcActiveFrame.bottom = pPreviewData->rcDesktop.bottom - 25; + + /* Calculate the active caption rectangle */ + pPreviewData->rcActiveCaption.left = pPreviewData->rcActiveFrame.left + 3 + 1; + pPreviewData->rcActiveCaption.top = pPreviewData->rcActiveFrame.top + 3 + 1; + pPreviewData->rcActiveCaption.right = pPreviewData->rcActiveFrame.right - 3 - 1; + pPreviewData->rcActiveCaption.bottom = pPreviewData->rcActiveFrame.top + pPreviewData->cyCaption/*20*/ + 2; + + /* FIXME: Calculate the active menu bar rectangle */ + + /* Calculate the active client rectangle */ + pPreviewData->rcActiveClient.left = pPreviewData->rcActiveFrame.left + 3 + 1; + pPreviewData->rcActiveClient.top = pPreviewData->rcActiveCaption.bottom + 20 + 2; + pPreviewData->rcActiveClient.right = pPreviewData->rcActiveFrame.right - 3 - 1; + pPreviewData->rcActiveClient.bottom = pPreviewData->rcActiveFrame.bottom - 3 - 1; + + /* Calculate the active scroll rectangle */ + pPreviewData->rcActiveScroll.left = pPreviewData->rcActiveClient.right - 2 - 16; + pPreviewData->rcActiveScroll.top = pPreviewData->rcActiveClient.top + 2; + pPreviewData->rcActiveScroll.right = pPreviewData->rcActiveClient.right - 2; + pPreviewData->rcActiveScroll.bottom = pPreviewData->rcActiveClient.bottom - 2; + + + /* Dialog window */ + pPreviewData->rcDialogFrame.left = pPreviewData->rcActiveClient.left + 4; + pPreviewData->rcDialogFrame.top = (pPreviewData->rcDesktop.bottom * 60) / 100; + pPreviewData->rcDialogFrame.right = (pPreviewData->rcDesktop.right * 65) / 100; + pPreviewData->rcDialogFrame.bottom = pPreviewData->rcDesktop.bottom - 5; + + /* Calculate the dialog caption rectangle */ + pPreviewData->rcDialogCaption.left = pPreviewData->rcDialogFrame.left + 3; + pPreviewData->rcDialogCaption.top = pPreviewData->rcDialogFrame.top + 3; + pPreviewData->rcDialogCaption.right = pPreviewData->rcDialogFrame.right - 3; + pPreviewData->rcDialogCaption.bottom = pPreviewData->rcDialogFrame.top + 20 + 2; + + /* Calculate the dialog client rectangle */ + pPreviewData->rcDialogClient.left = pPreviewData->rcDialogFrame.left + 3; + pPreviewData->rcDialogClient.top = pPreviewData->rcDialogCaption.bottom + 1; + pPreviewData->rcDialogClient.right = pPreviewData->rcDialogFrame.right - 3; + pPreviewData->rcDialogClient.bottom = pPreviewData->rcDialogFrame.bottom - 3; + + /* Calculate the dialog button rectangle */ + width = 80; + height = 28; + + pPreviewData->rcDialogButton.left = + (pPreviewData->rcDialogClient.right + pPreviewData->rcDialogClient.left - width) / 2; + pPreviewData->rcDialogButton.right = pPreviewData->rcDialogButton.left + width; + pPreviewData->rcDialogButton.bottom = pPreviewData->rcDialogClient.bottom - 2; + pPreviewData->rcDialogButton.top = pPreviewData->rcDialogButton.bottom - height; +} + + +static VOID +DrawScrollbar(HDC hdc, LPRECT rc) +{ + +} + + +static LRESULT CALLBACK +PreviewWndProc(HWND hwnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PPREVIEW_DATA pPreviewData; + HDC hdc; + PAINTSTRUCT ps; + RECT rc; + + pPreviewData = (PPREVIEW_DATA)GetWindowLongPtr(hwnd, GWLP_USERDATA); + + switch (uMsg) + { + case WM_CREATE: + pPreviewData = (PPREVIEW_DATA)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(PREVIEW_DATA)); + if (pPreviewData) + { + SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pPreviewData); + pPreviewData->clrDesktop = GetSysColor(COLOR_DESKTOP); + pPreviewData->hbrDesktop = CreateSolidBrush(pPreviewData->clrDesktop); + pPreviewData->clrWindow = GetSysColor(COLOR_WINDOW); + pPreviewData->hbrWindow = CreateSolidBrush(pPreviewData->clrWindow); + + pPreviewData->cxEdge = GetSystemMetrics(SM_CXEDGE); + pPreviewData->cyEdge = GetSystemMetrics(SM_CXEDGE); + + pPreviewData->cyCaption = 20; //GetSystemMetrics(SM_CYCAPTION); + } + break; + + case WM_SIZE: + OnSize(LOWORD(lParam), HIWORD(lParam), pPreviewData); + break; + + case WM_PAINT: + hdc = BeginPaint(hwnd, &ps); + + /* Desktop */ + FillRect(hdc, &pPreviewData->rcDesktop, pPreviewData->hbrDesktop); + + /* Inactive Window */ + DrawEdge(hdc, &pPreviewData->rcInactiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); + DrawCaption(hwnd, hdc, &pPreviewData->rcInactiveCaption, DC_GRADIENT | DC_TEXT); + DrawCaptionButtons(hdc, &pPreviewData->rcInactiveCaption, TRUE); + + + /* Active Window */ + DrawEdge(hdc, &pPreviewData->rcActiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); + DrawCaption(hwnd, hdc, &pPreviewData->rcActiveCaption, DC_ACTIVE | DC_GRADIENT | DC_TEXT); + DrawCaptionButtons(hdc, &pPreviewData->rcActiveCaption, TRUE); + + /* FIXME: Draw the menu bar */ + CopyRect(&rc, &pPreviewData->rcActiveClient); + DrawEdge(hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_ADJUST); + FillRect(hdc, &rc, pPreviewData->hbrWindow); + + /* FIXME: Draw the client text */ + + /* Draw the scroll bar */ + DrawScrollbar(hdc, &pPreviewData->rcActiveScroll); + + + /* Dialog Window */ + DrawEdge(hdc, &pPreviewData->rcDialogFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); + DrawCaption(hwnd, hdc, &pPreviewData->rcDialogCaption, DC_ACTIVE | DC_GRADIENT | DC_TEXT); + DrawCaptionButtons(hdc, &pPreviewData->rcDialogCaption, FALSE); + + /* Draw Button */ + DrawFrameControl(hdc, &pPreviewData->rcDialogButton, DFC_BUTTON, DFCS_BUTTONPUSH); + + + EndPaint(hwnd, &ps); + break; + + case WM_DESTROY: + DeleteObject(pPreviewData->hbrDesktop); + DeleteObject(pPreviewData->hbrWindow); + + HeapFree(GetProcessHeap(), 0, pPreviewData); + break; + + default: + DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + } + + return TRUE; +} + + +BOOL +RegisterPreviewControl(IN HINSTANCE hInstance) +{ + WNDCLASSEX wc = {0}; + + wc.cbSize = sizeof(WNDCLASSEX); + wc.lpfnWndProc = PreviewWndProc; + wc.hInstance = hInstance; + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)NULL; //(COLOR_BTNFACE + 1); + wc.lpszClassName = szPreviewWndClass; + + return RegisterClassEx(&wc) != (ATOM)0; +} + + +VOID +UnregisterPreviewControl(IN HINSTANCE hInstance) +{ + UnregisterClass(szPreviewWndClass, + hInstance); +} Added: trunk/reactos/dll/cpl/desk/preview.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.h?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.h (added) +++ trunk/reactos/dll/cpl/desk/preview.h Wed Jan 3 00:53:26 2007 @@ -1,0 +1,4 @@ + + +BOOL RegisterPreviewControl(IN HINSTANCE hInstance); +VOID UnregisterPreviewControl(IN HINSTANCE hInstance); Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h (original) +++ trunk/reactos/dll/cpl/desk/resource.h Wed Jan 3 00:53:26 2007 @@ -36,8 +36,8 @@ /* Screensaver Page */ -#define IDC_SCREENS_CHOICES 1010 -#define IDC_SCREENS_PREVIEW 1011 +#define IDC_SCREENS_PREVIEW 1010 +#define IDC_SCREENS_CHOICES 1011 #define IDC_SCREENS_POWER_BUTTON 1012 #define IDC_SCREENS_SETTINGS 1013 #define IDC_SCREENS_TESTSC 1014 @@ -55,7 +55,7 @@ #define IDS_STRETCH 2004 #define IDS_TILE 2005 -#define IDC_SETTINGS_DEVICE 201 +#define IDC_SETTINGS_DEVICE 201 #define IDC_SETTINGS_BPP 202 #define IDC_SETTINGS_RESOLUTION 203 #define IDC_SETTINGS_RESOLUTION_TEXT 204 @@ -76,7 +76,11 @@ #define IDS_COLOR_8BIT 2908 #define IDS_COLOR_16BIT 2916 #define IDS_COLOR_24BIT 2924 -#define IDS_COLOR_32BIT 2932 +#define IDS_COLOR_32BIT 2932 + + +/* Appearance Page */ +#define IDC_APPEARANCE_PREVIEW 1500 #endif /* __CPL_DESK_RESOURCE_H__ */ Modified: trunk/reactos/dll/cpl/desk/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/sv.rc?rev=252… ============================================================================== --- trunk/reactos/dll/cpl/desk/sv.rc (original) +++ trunk/reactos/dll/cpl/desk/sv.rc Wed Jan 3 00:53:26 2007 @@ -53,13 +53,15 @@ PUSHBUTTON "Ins&tällningar",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Utseende" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Det här utrymmet har avsiktligt\nlämnats tomt",IDC_STATIC,66, - 90,112,20 + 150,112,20 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188

17 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2007