ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
April 2007
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
19 participants
380 discussions
Start a n
N
ew thread
[dgorbachev] 26373: Update Norwegian translation (bug #1756).
by dgorbachev@svn.reactos.org
Author: dgorbachev Date: Tue Apr 17 19:13:46 2007 New Revision: 26373 URL:
http://svn.reactos.org/svn/reactos?rev=26373&view=rev
Log: Update Norwegian translation (bug #1756). Modified: trunk/reactos/dll/win32/shell32/shell32_No.rc Modified: trunk/reactos/dll/win32/shell32/shell32_No.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_…
============================================================================== --- trunk/reactos/dll/win32/shell32/
…
[View More]
shell32_No.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_No.rc Tue Apr 17 19:13:46 2007 @@ -21,7 +21,7 @@ MENU_001 MENU DISCARDABLE BEGIN MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON - MENUITEM "&Små ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Små ikoner", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END @@ -45,17 +45,17 @@ BEGIN MENUITEM "Etter &navn", 0x30 /* column 0 */ MENUITEM "Etter &type", 0x32 /* column 2 */ - MENUITEM "Etter &størrelse", 0x31 /* ... */ + MENUITEM "Etter &størrelse",0x31 /* ... */ MENUITEM "Etter &dato", 0x33 MENUITEM SEPARATOR - MENUITEM "Ordne &automatisk", FCIDM_SHVIEW_AUTOARRANGE + MENUITEM "Ordne &automatisk", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Still opp ikoner", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR MENUITEM "Oppdater", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "Lim inn", FCIDM_SHVIEW_INSERT - MENUITEM "Lim inn som snarvei", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Lim inn som snarvei", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR POPUP "Ny" BEGIN @@ -83,7 +83,7 @@ MENUITEM SEPARATOR MENUITEM "&Opprett snarvei", FCIDM_SHVIEW_CREATELINK MENUITEM "&Slett", FCIDM_SHVIEW_DELETE - MENUITEM "&Gi nytt navn", FCIDM_SHVIEW_RENAME + MENUITEM "&Gi nytt navn", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR MENUITEM "Egenska&per", FCIDM_SHVIEW_PROPERTIES END @@ -128,7 +128,7 @@ CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Bla . . .", 12288, 170, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Bla gjennom . . .", 12288, 170, 63, 54, 14, WS_TABSTOP } STRINGTABLE DISCARDABLE @@ -169,30 +169,30 @@ /* message box strings */ IDS_RESTART_TITLE "Starte på nytt" - IDS_RESTART_PROMPT "Vil du simulere en omstart av Windows?" + IDS_RESTART_PROMPT "Vil du starte på nytt?" IDS_SHUTDOWN_TITLE "Avslutt" - IDS_SHUTDOWN_PROMPT "Vil du avslutte Wine-økten?" + IDS_SHUTDOWN_PROMPT "Vil du slå av maskinen?" /* shell folder path default values */ IDS_PROGRAMS "Start-meny\\Programmer" IDS_PERSONAL "Mine dokumenter" IDS_FAVORITES "Favoritter" IDS_STARTUP "Start-meny\\Programmer\\Oppstart" - IDS_RECENT "Recent" - IDS_SENDTO "SendTo" + IDS_RECENT "Siste" + IDS_SENDTO "Send til" IDS_STARTMENU "Start-meny" IDS_MYMUSIC "Mine dokumenter\\Min musikk" IDS_MYVIDEO "Mine dokumenter\\Mine videoklipp" IDS_DESKTOPDIRECTORY "Skrivebord" IDS_NETHOOD "NetHood" - IDS_TEMPLATES "Templates" - IDS_APPDATA "Application Data" - IDS_PRINTHOOD "PrintHood" - IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" - IDS_COOKIES "Cookies" - IDS_HISTORY "Local Settings\\History" - IDS_PROGRAM_FILES "Program Files" + IDS_TEMPLATES "Maler" + IDS_APPDATA "Applikasjon Data" + IDS_PRINTHOOD "Skrivere" + IDS_LOCAL_APPDATA "Lokale innstillinger\\Applikasjon Data" + IDS_INTERNET_CACHE "Lokale innstillinger\\Midlertidig Internett Filer" + IDS_COOKIES "Informasjonskapsler" + IDS_HISTORY "Lokale innstillinger\\Historie" + IDS_PROGRAM_FILES "Program Filer" IDS_MYPICTURES "Mine dokumenter\\Mine bilder" IDS_PROGRAM_FILES_COMMON "Programfiler\\Fellesfiler" IDS_COMMON_DOCUMENTS "Dokumenter" @@ -200,5 +200,5 @@ IDS_COMMON_MUSIC "Dokumenter\\Min musikk" IDS_COMMON_PICTURES "Dokumenter\\Mine bilder" IDS_COMMON_VIDEO "Dokumenter\\Mine videoklipp" - IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" -} + IDS_CDBURN_AREA "Lokale innstillinger\\Applikasjon Data\\Microsoft\\CD Brenning" +}
[View Less]
17 years, 10 months
1
0
0
0
[cwittich] 26372: fix "FIXME"-text
by cwittich@svn.reactos.org
Author: cwittich Date: Tue Apr 17 17:59:54 2007 New Revision: 26372 URL:
http://svn.reactos.org/svn/reactos?rev=26372&view=rev
Log: fix "FIXME"-text Modified: trunk/reactos/dll/directx/dsound/dsound_main.c Modified: trunk/reactos/dll/directx/dsound/dsound_main.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound_…
============================================================================== --- trunk/reactos/dll/directx/dsound/dsound_main.c (original) ++
…
[View More]
+ trunk/reactos/dll/directx/dsound/dsound_main.c Tue Apr 17 17:59:54 2007 @@ -180,7 +180,7 @@ else if (strcmp(buffer, "Emulation") == 0) ds_hw_accel = DS_HW_ACCEL_EMULATION; } - FIXME("dsound are Hardcode to software emulation until we fix it in ros"); + FIXME("dsound is hardcoded to software emulation until we fix it in ros\n"); ds_hw_accel = DS_HW_ACCEL_EMULATION; if (!get_config_key( hkey, appkey, "DefaultPlayback", buffer, MAX_PATH ))
[View Less]
17 years, 10 months
1
0
0
0
[cwittich] 26371: add cryptui.dll (stubbed) needed by SmartFTP
by cwittich@svn.reactos.org
Author: cwittich Date: Tue Apr 17 17:02:53 2007 New Revision: 26371 URL:
http://svn.reactos.org/svn/reactos?rev=26371&view=rev
Log: add cryptui.dll (stubbed) needed by SmartFTP Added: trunk/reactos/dll/win32/cryptui/ trunk/reactos/dll/win32/cryptui/cryptui.c trunk/reactos/dll/win32/cryptui/cryptui.def trunk/reactos/dll/win32/cryptui/cryptui.rbuild trunk/reactos/include/psdk/cryptuiapi.h Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/win32.
…
[View More]
rbuild Modified: trunk/reactos/baseaddress.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=263…
============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Tue Apr 17 17:02:53 2007 @@ -61,6 +61,7 @@ <property name="BASEADDRESS_NETAPI32" value="0x71c00000" /> <property name="BASEADDRESS_DPLAY" value="0x71e80000" /> <property name="BASEADDRESS_SECURITY" value="0x71f10000" /> + <property name="BASEADDRESS_CRYPTUI" value="0x720D0000" /> <property name="BASEADDRESS_WINFAX" value="0x722C0000" /> <property name="BASEADDRESS_WINSCARD" value="0x723d0000" /> <property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> Added: trunk/reactos/dll/win32/cryptui/cryptui.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.…
============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.c (added) +++ trunk/reactos/dll/win32/cryptui/cryptui.c Tue Apr 17 17:02:53 2007 @@ -1,0 +1,43 @@ +/* $Id: dllmain.c 21873 2006-05-10 08:41:27Z cwittich $ +* +* COPYRIGHT: See COPYING in the top level directory +* PROJECT: ReactOS system libraries +* FILE: dll/win32/crypui/cryptui.c +* PURPOSE: Library main function +* PROGRAMMER: Christoph von Wittich +* UPDATE HISTORY: +* +*/ + +#include <windows.h> +#include <cryptuiapi.h> + +#define NDEBUG +#include <debug.h> + +INT STDCALL +DllMain(PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + break; + + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +BOOL +WINAPI +CryptUIDlgCertMgr(PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr) +{ + UNIMPLEMENTED + return FALSE; +} + + +/* EOF */ Added: trunk/reactos/dll/win32/cryptui/cryptui.def URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.…
============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.def (added) +++ trunk/reactos/dll/win32/cryptui/cryptui.def Tue Apr 17 17:02:53 2007 @@ -1,0 +1,10 @@ +; $Id: advapi32.def 24529 2006-10-15 19:58:57Z weiden $ +; +; cryptui.def +; +; ReactOS Operating System +; +LIBRARY cryptui.dll +EXPORTS +CryptUIDlgCertMgr@4 +; EOF Added: trunk/reactos/dll/win32/cryptui/cryptui.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.…
============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rbuild (added) +++ trunk/reactos/dll/win32/cryptui/cryptui.rbuild Tue Apr 17 17:02:53 2007 @@ -1,0 +1,13 @@ +<module name="cryptui" type="win32dll" baseaddress="${BASEADDRESS_CRYPTUI}" installbase="system32" installname="cryptui.dll" allowwarnings="true"> + <importlibrary definition="cryptui.def" /> + <include base="cryptui">.</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>advapi32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>cryptui.c</file> +</module> Modified: trunk/reactos/dll/win32/win32.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev…
============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Tue Apr 17 17:02:53 2007 @@ -49,6 +49,9 @@ <directory name="cryptdll"> <xi:include href="cryptdll/cryptdll.rbuild" /> </directory> +<directory name="cryptui"> + <xi:include href="cryptui/cryptui.rbuild" /> +</directory> <directory name="dbghelp"> <xi:include href="dbghelp/dbghelp.rbuild" /> </directory> Added: trunk/reactos/include/psdk/cryptuiapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cryptuiapi.h?…
============================================================================== --- trunk/reactos/include/psdk/cryptuiapi.h (added) +++ trunk/reactos/include/psdk/cryptuiapi.h Tue Apr 17 17:02:53 2007 @@ -1,0 +1,13 @@ + +typedef struct _CRYPTUI_CERT_MGR_STRUCT { + DWORD dwSize; + HWND hwndParent; + DWORD dwFlags; + LPCWSTR pwszTitle; + LPCSTR pszInitUsageOID; +} CRYPTUI_CERT_MGR_STRUCT, + *PCRYPTUI_CERT_MGR_STRUCT; + +typedef const CRYPTUI_CERT_MGR_STRUCT *PCCRYPTUI_CERT_MGR_STRUCT; + +BOOL WINAPI CryptUIDlgCertMgr(PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr);
[View Less]
17 years, 10 months
1
0
0
0
[cwittich] 26370: implemented DrawCaptionTempA/W (NtUserDrawCaptionTemp is still missing)
by cwittich@svn.reactos.org
Author: cwittich Date: Tue Apr 17 15:27:42 2007 New Revision: 26370 URL:
http://svn.reactos.org/svn/reactos?rev=26370&view=rev
Log: implemented DrawCaptionTempA/W (NtUserDrawCaptionTemp is still missing) Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/
…
[View More]
dll/win32/user32/windows/n…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c Tue Apr 17 15:27:42 2007 @@ -1102,13 +1102,13 @@ } /* - * @unimplemented + * @implemented */ BOOL STDCALL DrawCaptionTempW( - HWND hwnd, - HDC hdc, + HWND hWnd, + HDC hDC, const RECT *rect, HFONT hFont, HICON hIcon, @@ -1116,12 +1116,11 @@ UINT uFlags ) { - UNIMPLEMENTED; - return FALSE; + return NtUserDrawCaptionTemp(hWnd, hDC, rect, hFont, hIcon, str, uFlags); } /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -1135,8 +1134,21 @@ UINT uFlags ) { - UNIMPLEMENTED; - return FALSE; + LPWSTR strW; + INT len; + BOOL ret = FALSE; + + if (!(uFlags & DC_TEXT) || !str) + return DrawCaptionTempW(hwnd, hdc, rect, hFont, hIcon, NULL, uFlags); + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + if ((strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + { + MultiByteToWideChar(CP_ACP, 0, str, -1, strW, len ); + ret = DrawCaptionTempW(hwnd, hdc, rect, hFont, hIcon, strW, uFlags); + HeapFree(GetProcessHeap(), 0, strW); + } + return ret; } /*********************************************************************** Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu…
============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Tue Apr 17 15:27:42 2007 @@ -716,16 +716,16 @@ LPCRECT lpRc, UINT uFlags); -DWORD +BOOL STDCALL NtUserDrawCaptionTemp( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6); + HWND hWnd, + HDC hDC, + const RECT *rect, + HFONT hFont, + HICON hIcon, + LPCWSTR str, + UINT uFlags); BOOL NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Tue Apr 17 15:27:42 2007 @@ -180,20 +180,19 @@ return 0; } -DWORD +BOOL STDCALL NtUserDrawCaptionTemp( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6) -{ - UNIMPLEMENTED - - return 0; + HWND hWnd, + HDC hDC, + const RECT *rect, + HFONT hFont, + HICON hIcon, + LPCWSTR str, + UINT uFlags) +{ + UNIMPLEMENTED + return FALSE; } BOOL
[View Less]
17 years, 10 months
1
0
0
0
[arty] 26369: Add the ability to load freeldr in qemu-system-ppc for the first time. Use '-append bootprep' to force prep mode (not great yet).
by arty@svn.reactos.org
Author: arty Date: Tue Apr 17 15:22:30 2007 New Revision: 26369 URL:
http://svn.reactos.org/svn/reactos?rev=26369&view=rev
Log: Add the ability to load freeldr in qemu-system-ppc for the first time. Use '-append bootprep' to force prep mode (not great yet). Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c branches/
…
[View More]
powerpc/reactos/tools/ppc.lost+found/bootcd (with props) branches/powerpc/reactos/tools/ppc.lost+found/ofboot.b Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s Tue Apr 17 15:22:30 2007 @@ -16,17 +16,25 @@ stw %r5,ofw_call_addr@l(%r10) bl zero_registers - + /* Zero CTR */ mtcr %r31 lis %r3,PpcInit@ha addi %r3,%r3,PpcInit@l mtlr %r3 - + + /* Check for ofw */ + lis %r3,ofw_call_addr@ha + lwz %r3,ofw_call_addr@l(%r3) + cmpw %r3,%r31 /* Zero? */ + mr %r3,%r31 + beq bootme + lis %r3,call_ofw@ha addi %r3,%r3,call_ofw@l +bootme: blr zero_registers: Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Tue Apr 17 15:22:30 2007 @@ -21,6 +21,7 @@ #include "of.h" #include "mmu.h" #include "ppcboot.h" +#include "prep.h" #include "compat.h" extern void BootMain( LPSTR CmdLine ); @@ -32,12 +33,12 @@ part_handle = -1, kernel_mem = 0; int mmu_handle = 0, FixedMemory = 0; BOOLEAN AcpiPresent = FALSE; -char BootPath[0x100] = { 0 }, BootPart[0x100] = { 0 }, CmdLine[0x100] = { 0 }; +char BootPath[0x100] = { 0 }, BootPart[0x100] = { 0 }, CmdLine[0x100] = { "bootprep" }; jmp_buf jmp; volatile char *video_mem = 0; boot_infos_t BootInfo; -void PpcPutChar( int ch ) { +void PpcOfwPutChar( int ch ) { char buf[3]; if( ch == 0x0a ) { buf[0] = 0x0d; buf[1] = 0x0a; } else { buf[0] = ch; buf[1] = 0; } @@ -64,7 +65,7 @@ if( !nth && match ) return parent; - for( i = 0; i < depth; i++ ) PpcPutChar( ' ' ); + for( i = 0; i < depth; i++ ) PpcOfwPutChar( ' ' ); if( depth == 1 ) { if( gotname > 0 ) { @@ -97,17 +98,14 @@ } VOID PpcVideoGetDisplaySize( PULONG Width, PULONG Height, PULONG Depth ) { - //ofw_print_string("GetDisplaySize\n"); *Width = 80; *Height = 25; *Depth = 16; - //printf("GetDisplaySize(%d,%d,%d)\n", *Width, *Height, *Depth); } ULONG PpcVideoGetBufferSize() { ULONG Width, Height, Depth; - //ofw_print_string("PpcVideoGetBufferSize\n"); - PpcVideoGetDisplaySize( &Width, &Height, &Depth ); + MachVideoGetDisplaySize( &Width, &Height, &Depth ); return Width * Height * Depth / 8; } @@ -137,14 +135,14 @@ PCHAR ChBuf = Buffer; int offset = 0; - PpcVideoGetDisplaySize( &w, &h, &d ); + MachVideoGetDisplaySize( &w, &h, &d ); for( i = 0; i < h; i++ ) { for( j = 0; j < w; j++ ) { offset = (j * 2) + (i * w * 2); if( ChBuf[offset] != video_mem[offset] ) { video_mem[offset] = ChBuf[offset]; - PpcVideoPutChar(ChBuf[offset],0,j+1,i+1); + MachVideoPutChar(ChBuf[offset],0,j+1,i+1); } } } @@ -380,7 +378,7 @@ RemainingPath[0] = 0; } *Device = 0; - return PpcDiskGetBootVolume(DriveNumber, StartSector, SectorCount, FsType); + return MachDiskGetBootVolume(DriveNumber, StartSector, SectorCount, FsType); } BOOLEAN PpcDiskGetBootPath( char *OutBootPath, unsigned Size ) { @@ -493,14 +491,15 @@ extern int _bss; typedef unsigned int uint32_t; -void PpcInit( of_proxy the_ofproxy ) { - int len; - ofproxy = the_ofproxy; - + +void PpcOfwInit() +{ //SetPhys(0x900, (19 << 26) | (50 << 1)); chosen_package = ofw_finddevice( "/chosen" ); + ofw_getprop(chosen_package, "bootargs", + CmdLine, sizeof(CmdLine)); ofw_getprop( chosen_package, "stdin", (char *)&stdin_handle, sizeof(stdin_handle) ); ofw_getprop( chosen_package, "stdout", @@ -508,7 +507,7 @@ ofw_getprop( chosen_package, "mmu", (char *)&mmu_handle, sizeof(mmu_handle) ); - MachVtbl.ConsPutChar = PpcPutChar; + MachVtbl.ConsPutChar = PpcOfwPutChar; MachVtbl.ConsKbHit = PpcConsKbHit; MachVtbl.ConsGetCh = PpcConsGetCh; @@ -549,21 +548,27 @@ MachVtbl.HwDetect = PpcHwDetect; + // Allow forcing prep for broken OFW + if(!strncmp(CmdLine, "bootprep", 8)) + { + printf("Going to PREP init...\n"); + PpcPrepInit(); + return; + } + printf( "FreeLDR version [%s]\n", GetFreeLoaderVersionString() ); - len = ofw_getprop(chosen_package, "bootargs", - CmdLine, sizeof(CmdLine)); - - if( len < 0 ) len = 0; - CmdLine[len] = 0; - - printf("bootargs: len %d [%s]\n", len, CmdLine); - BootMain( CmdLine ); } +void PpcInit( of_proxy the_ofproxy ) { + ofproxy = the_ofproxy; + if(ofproxy) PpcOfwInit(); + else PpcPrepInit(); +} + void MachInit(const char *CmdLine) { - int len, i; + int i, len; char *sep; BootPart[0] = 0; Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c Tue Apr 17 15:22:30 2007 @@ -32,6 +32,44 @@ "blr" ); +__asm__("\t.globl GetPhysHalf\n" + "GetPhysHalf:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "isync\n\t" + "sync\n\t" + "lhz 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 GetPhysByte\n" + "GetPhysByte:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "isync\n\t" + "sync\n\t" + "lbz 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" @@ -42,6 +80,27 @@ "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 SetPhysHalf\n" + "SetPhysHalf:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "sync\n\t" + "eieio\n\t" + "sth 4,0(3)\n\t" /* Set actual value at phys addr r3 */ "dcbst 0,3\n\t" "mtmsr 5\n\t" "sync\n\t" Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c (added) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c Tue Apr 17 15:22:30 2007 @@ -1,0 +1,101 @@ +#include "freeldr.h" +#include "machine.h" +#include "mmu.h" +#include "prep.h" + +int prep_serial = 0x800003f8; + +void sync() { __asm__("sync\n\teieio"); } + +/* Simple serial */ + +void PpcPrepPutChar( int ch ) { + if( ch == 0x0a ) { + SetPhysByte(prep_serial, 0x0d); + sync(); + } + SetPhysByte(prep_serial, ch); + sync(); +} + +BOOLEAN PpcPrepDiskReadLogicalSectors +( ULONG DriveNumber, ULONGLONG SectorNumber, + ULONG SectorCount, PVOID Buffer ) { + int secct; + + for(secct = 0; secct < SectorCount; secct++) + { + ide_seek(&ide1_desc, SectorNumber + secct, 0); + ide_read(&ide1_desc, ((PCHAR)Buffer) + secct * 512, 512); + } + /* Never give up! */ + return TRUE; +} + +BOOLEAN PpcPrepConsKbHit() +{ + return GetPhysByte(prep_serial+5) & 1; +} + +int PpcPrepConsGetCh() +{ + while(!PpcPrepConsKbHit()); + return GetPhysByte(prep_serial); +} + +void PpcPrepVideoClearScreen(UCHAR Attr) +{ + printf("\033c"); +} + +VIDEODISPLAYMODE PpcPrepVideoSetDisplayMode( char *DisplayMode, BOOLEAN Init ) +{ + return VideoTextMode; +} + +void PpcPrepVideoGetDisplaySize( PULONG Width, PULONG Height, PULONG Depth ) +{ + *Width = 80; + *Height = 25; + *Depth = 16; +} + +void PpcPrepVideoPrepareForReactOS() +{ +} + +ULONG PpcPrepGetMemoryMap( PBIOS_MEMORY_MAP BiosMemoryMap, + ULONG MaxMemoryMapSize ) +{ + // xxx fixme + BiosMemoryMap[0].Type = 1; + BiosMemoryMap[0].BaseAddress = 0; + BiosMemoryMap[0].Length = 64 * 1024 * 1024; + return 1; +} + +void PpcPrepInit() +{ + MachVtbl.ConsPutChar = PpcPrepPutChar; + printf("Breathing ...\n"); + + ide_setup( &ide1_desc ); + + MachVtbl.DiskReadLogicalSectors = PpcPrepDiskReadLogicalSectors; + + MachVtbl.ConsKbHit = PpcPrepConsKbHit; + MachVtbl.ConsGetCh = PpcPrepConsGetCh; + + MachVtbl.VideoClearScreen = PpcPrepVideoClearScreen; + MachVtbl.VideoSetDisplayMode = PpcPrepVideoSetDisplayMode; + MachVtbl.VideoGetDisplaySize = PpcPrepVideoGetDisplaySize; + + MachVtbl.VideoPrepareForReactOS = PpcPrepVideoPrepareForReactOS; + + MachVtbl.GetMemoryMap = PpcPrepGetMemoryMap; + + printf( "FreeLDR version [%s]\n", GetFreeLoaderVersionString() ); + + BootMain( "" ); +} + Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h (added) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h Tue Apr 17 15:22:30 2007 @@ -1,0 +1,12 @@ +#ifndef FREELDR_ARCH_POWERPC_PREP_H +#define FREELDR_ARCH_POWERPC_PREP_H + +extern struct _idectl_desc ide1_desc; + +void sync(); +void PpcPrepInit(); +void ide_seek( void *extension, int low, int high ); +void ide_read( void *extension, char *buffer, int bytes ); +void ide_setup( void *extension ); + +#endif//FREELDR_ARCH_POWERPC_PREP_H Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c (added) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c Tue Apr 17 15:22:30 2007 @@ -1,0 +1,99 @@ +#include "freeldr.h" +#include "machine.h" +#include "mmu.h" +#include "prep.h" + +#define SWAP_W(x) ((((x) & 0xff) << 8) | (((x) >> 8) & 0xff)) + +typedef struct _idectl_desc { + int port; + long long seekto; + int seek_cylinder, seek_head, seek_sector; + int cylinders, heads, sectors, bytespersec; +} idectl_desc; + +idectl_desc ide1_desc = { 0x800001f0 }; + +void ide_seek( void *extension, int low, int high ) { + idectl_desc *desc = (idectl_desc *)extension; + long long seekto = ((((long long)high) << 32) | (low & 0xffffffff)) / desc->bytespersec; + /* order = sector, head, cylinder */ + desc->seek_sector = seekto % desc->sectors; + seekto /= desc->sectors; + desc->seek_head = seekto % desc->heads; + seekto /= desc->heads; + desc->seek_cylinder = seekto; + desc->seekto = seekto; +} + +/* Thanks chuck moore. This is based on the color forth ide code */ +/* Wait for ready */ +void ide_rdy( void *extension ) { + idectl_desc *desc = (idectl_desc *)extension; + while( !(GetPhysByte(desc->port+7) & 8) ) sync(); +} + +void ide_bsy( void *extension ) { + idectl_desc *desc = (idectl_desc *)extension; + while( GetPhysByte(desc->port+7) & 0x80 ) sync(); +} + +int ide_read( void *extension, char *buffer, int bytes ) { + idectl_desc *desc = (idectl_desc *)extension; + short *databuf = (short *)buffer; + short in; + int inwords; + + ide_bsy( extension ); + SetPhysByte(desc->port+2, bytes / desc->bytespersec); + SetPhysByte(desc->port+3, desc->seek_sector + 1); + SetPhysByte(desc->port+4, desc->seek_cylinder); + SetPhysByte(desc->port+5, desc->seek_cylinder >> 8); + SetPhysByte(desc->port+6, desc->seek_head | 0xa0); + SetPhysByte(desc->port+7, 0x20); + + sync(); + + for( inwords = 0; inwords < desc->bytespersec / sizeof(short); inwords++ ) { + ide_rdy( extension ); + in = GetPhysHalf(desc->port); + databuf[inwords] = SWAP_W(in); + sync(); + } + + desc->seekto += desc->bytespersec; + ide_seek( extension, desc->seekto, desc->seekto >> 32 ); + + return bytes - (bytes % desc->bytespersec); +} + +void ide_setup( void *extension ) { + idectl_desc *desc = (idectl_desc *)extension; + short identbuffer[256]; + char namebuf[41]; + short *databuf = (short *)identbuffer, in; + int inwords; + + ide_bsy( extension ); + SetPhysByte(desc->port+7, 0xec); + desc->bytespersec = 512; + + sync(); + + for( inwords = 0; inwords < desc->bytespersec / sizeof(short); inwords++ ) { + ide_rdy( extension ); + in = GetPhysHalf(desc->port); + databuf[inwords] = SWAP_W(in); + sync(); + } + + desc->cylinders = identbuffer[1]; + desc->heads = identbuffer[3]; + desc->sectors = identbuffer[6]; + + /* Debug: Write out hard disc model */ + + strncpy(namebuf, (char *)(identbuffer+0x1b), 41); + printf("HARD DISC MODEL: %s c,h,s %d,%d,%d\n", + namebuf, desc->cylinders, desc->heads, desc->sectors); +} Modified: branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Tue Apr 17 15:22:30 2007 @@ -71,6 +71,8 @@ <file>ofw.c</file> <file>mmu.c</file> <file>mach.c</file> + <file>prep.c</file> + <file>prep_ide.c</file> <file>mboot.c</file> </module> </if> Added: branches/powerpc/reactos/tools/ppc.lost+found/bootcd URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%…
============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/bootcd (added) +++ branches/powerpc/reactos/tools/ppc.lost+found/bootcd Tue Apr 17 15:22:30 2007 @@ -1,0 +1,20 @@ +#!/bin/sh +# +# Create an iso that can be booted under qemu. +# For now, this is just to make ofwldr available to qemu. A disk image will +# still be required yet. +# + +CD=output-ppc/ppcboot +I=$CD/install + +tools/ppc.lost+found/link-freeldr + +mkdir -p $I +cp freeldr.elf $I/yaboot +cp `dirname $0`/ofboot.b $I + +mkisofs -chrp-boot -U -part -hfs -T -r -l -J -A "ReactOS" -sysid PPC \ + -V "ReactOS" -volset 1 -volset-size 1 -volset-seqno 1 \ + -hfs-volid "ReactOS" -hfs-bless $I -map hfsmap.lst \ + -no-desktop -allow-multidot -o ppcboot.iso $CD Propchange: branches/powerpc/reactos/tools/ppc.lost+found/bootcd ------------------------------------------------------------------------------ svn:executable = * Modified: branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%…
============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr (original) +++ branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Tue Apr 17 15:22:30 2007 @@ -53,6 +53,8 @@ obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw.o \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/mmu.o \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/mboot.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep_ide.o \ obj-ppc/boot/freeldr/freeldr/bootmgr.o \ obj-ppc/boot/freeldr/freeldr/drivemap.o \ obj-ppc/boot/freeldr/freeldr/miscboot.o \ Added: branches/powerpc/reactos/tools/ppc.lost+found/ofboot.b URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%…
============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/ofboot.b (added) +++ branches/powerpc/reactos/tools/ppc.lost+found/ofboot.b Tue Apr 17 15:22:30 2007 @@ -1,0 +1,64 @@ +<CHRP-BOOT> +<COMPATIBLE> +MacRISC MacRISC3 MacRISC4 +</COMPATIBLE> +<DESCRIPTION> +GNU/Linux PPC bootloader +</DESCRIPTION> +<BOOT-SCRIPT> +" screen" output +load-base release-load-area +boot cd:,\install\yaboot +</BOOT-SCRIPT> +<OS-BADGE-ICONS> +1010 +000000000000F8FEACF6000000000000 +0000000000F5FFFFFEFEF50000000000 +00000000002BFAFEFAFCF70000000000 +0000000000F65D5857812B0000000000 +0000000000F5350B2F88560000000000 +0000000000F6335708F8FE0000000000 +00000000005600F600F5FD8100000000 +00000000F9F8000000F5FAFFF8000000 +000000008100F5F50000F6FEFE000000 +000000F8F700F500F50000FCFFF70000 +00000088F70000F50000F5FCFF2B0000 +0000002F582A00F5000008ADE02C0000 +00090B0A35A62B0000002D3B350A0000 +000A0A0B0B3BF60000505E0B0A0B0A00 +002E350B0B2F87FAFCF45F0B2E090000 +00000007335FF82BF72B575907000000 +000000000000ACFFFF81000000000000 +000000000081FFFFFFFF810000000000 +0000000000FBFFFFFFFFAC0000000000 +000000000081DFDFDFFFFB0000000000 +000000000081DD5F83FFFD0000000000 +000000000081DDDF5EACFF0000000000 +0000000000FDF981F981FFFF00000000 +00000000FFACF9F9F981FFFFAC000000 +00000000FFF98181F9F981FFFF000000 +000000ACACF981F981F9F9FFFFAC0000 +000000FFACF9F981F9F981FFFFFB0000 +00000083DFFBF981F9F95EFFFFFC0000 +005F5F5FDDFFFBF9F9F983DDDD5F0000 +005F5F5F5FDD81F9F9E7DF5F5F5F5F00 +0083DD5F5F83FFFFFFFFDF5F835F0000 +000000FBDDDFACFBACFBDFDFFB000000 +000000000000FFFFFFFF000000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFFFF00000000 +00000000FFFFFFFFFFFFFFFFFF000000 +00000000FFFFFFFFFFFFFFFFFF000000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 +00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00 +00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFF000000 +</OS-BADGE-ICONS> +</CHRP-BOOT>
[View Less]
17 years, 10 months
1
0
0
0
[ekohl] 26368: - Replace the listview control on the pointer page by an ownerdrawn listbox and add necessary code changes. - Add missing "Horizontal Resize" string resource. - Make the cursor preview work for the system cursors.
by ekohl@svn.reactos.org
Author: ekohl Date: Tue Apr 17 14:41:07 2007 New Revision: 26368 URL:
http://svn.reactos.org/svn/reactos?rev=26368&view=rev
Log: - Replace the listview control on the pointer page by an ownerdrawn listbox and add necessary code changes. - Add missing "Horizontal Resize" string resource. - Make the cursor preview work for the system cursors. Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc trunk/reactos/dll/cpl/main/lang/de-DE.rc trunk/reactos/dll/cpl/main/lang/en-US.rc
…
[View More]
trunk/reactos/dll/cpl/main/lang/es-ES.rc trunk/reactos/dll/cpl/main/lang/fr-FR.rc trunk/reactos/dll/cpl/main/lang/hu-HU.rc trunk/reactos/dll/cpl/main/lang/id-ID.rc trunk/reactos/dll/cpl/main/lang/it-IT.rc trunk/reactos/dll/cpl/main/lang/ja-JP.rc trunk/reactos/dll/cpl/main/lang/nl-NL.rc trunk/reactos/dll/cpl/main/lang/ru-RU.rc trunk/reactos/dll/cpl/main/lang/uk-UA.rc trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/dll/cpl/main/resource.h Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/cs-CZ.rc…
============================================================================== --- trunk/reactos/dll/cpl/main/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/main/lang/cs-CZ.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Sc&héma", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "&Uloit jako...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Odstranit", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "Vl&astní", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Zobrazit stín pod ukazatelem", IDC_CHECK_DROP_SHADOW, 5, 200, 110, 10 PUSHBUTTON "Pouít &výchozí", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Procházet", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -153,6 +153,7 @@ IDS_NWPEN "Psaní rukou" IDS_NO "Není k dispozici" IDS_SIZENS "Zmìna výky" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Diagonální zmìna velikosti 1" IDS_SIZENESW "Diagonální zmìna velikosti 2" IDS_SIZEALL "Pøesunout" Modified: trunk/reactos/dll/cpl/main/lang/de-DE.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/de-DE.rc…
============================================================================== --- trunk/reactos/dll/cpl/main/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/main/lang/de-DE.rc Tue Apr 17 14:41:07 2007 @@ -55,14 +55,14 @@ BEGIN GROUPBOX "Tastenkonfiguration", -1, 5, 5, 230, 70 CHECKBOX "&Primäre und sekundäre Taste umschalten", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 145, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Aktivieren Sie dieses Kontrollkästchen, um die rechte Maustaste für primäre Funktionen, wie Auswählen und Ziehen zu verwenden.", -1, 10, 30, 150, 31 GROUPBOX "Doppelklickgeschwindigkeit", -1, 5, 75, 230, 70 LTEXT "Doppelklicken Sie auf den Ordner, um die Einstellung zu testen. Verwenden Sie eine langsamere Einstellung, wenn der Ordner sich nicht öffnen oder schließen lässt.", -1, 10, 85, 150, 32 LTEXT "Langsam", -1, 10, 120, 90, 8 LTEXT "Schnell", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "KlickEinrasten", -1, 5, 150, 230, 70 CHECKBOX "&KlickEinrasten aktivieren", IDC_CHECK_CLICK_LOCK, 10, 160, 91, 20 PUSHBUTTON "&Einstellungen...", IDC_BUTTON_CLICK_LOCK, 167, 160, 60, 14 @@ -76,11 +76,11 @@ BEGIN GROUPBOX "S&chema", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Speichern &unter...", IDC_BUTTON_SAVEAS_SCHEME, 55, 30, 65, 15 PUSHBUTTON "&Löschen", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "An&passen:", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "Zeigerschatten &aktivieren", IDC_CHECK_DROP_SHADOW, 5, 200, 95, 10 PUSHBUTTON "&Standard verwenden", IDC_BUTTON_USE_DEFAULT_CURSOR, 99, 200, 73, 15 PUSHBUTTON "&Durchsuchen...", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 56, 15 @@ -96,7 +96,6 @@ PUSHBUTTON "&OK", IDOK, 60, 45, 50, 15 PUSHBUTTON "&Abbrechen", IDCANCEL, 115, 45, 50, 15 END - IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION @@ -135,7 +134,7 @@ LTEXT "Durch Drehen des Rades um eine Einbuchtung wird ein Bildlauf durchgeführt um:", -1, 60, 11, 150, 16 CONTROL "&Folgende Anzahl Zeilen:", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 CONTROL "&Eine Bildschirmseite", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 END @@ -156,6 +155,7 @@ IDS_NWPEN "Handschrift" IDS_NO "Nicht verfügbar" IDS_SIZENS "Vertikale Größenänderung" + IDS_SIZEWE "Horizontale Größenänderung" IDS_SIZENWSE "Diagonale Größenänderung 1" IDS_SIZENESW "Diagonale Größenänderung 2" IDS_SIZEALL "Verschieben" Modified: trunk/reactos/dll/cpl/main/lang/en-US.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/en-US.rc…
============================================================================== --- trunk/reactos/dll/cpl/main/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/main/lang/en-US.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Scheme", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -153,6 +153,7 @@ IDS_NWPEN "Handwriting" IDS_NO "Unavailable" IDS_SIZENS "Vertical Resize" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Diagonal Resize 1" IDS_SIZENESW "Diagonal Resize 2" IDS_SIZEALL "Move" Modified: trunk/reactos/dll/cpl/main/lang/es-ES.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/es-ES.rc…
============================================================================== --- trunk/reactos/dll/cpl/main/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/main/lang/es-ES.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Scheme", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -154,6 +154,7 @@ IDS_NWPEN "Handwriting" IDS_NO "Unavailable" IDS_SIZENS "Vertical Resize" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Diagonal Resize 1" IDS_SIZENESW "Diagonal Resize 2" IDS_SIZEALL "Move" Modified: trunk/reactos/dll/cpl/main/lang/fr-FR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/fr-FR.rc…
============================================================================== --- trunk/reactos/dll/cpl/main/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/main/lang/fr-FR.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Profil", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Sa&uver...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Effacer", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Modifier", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Afficher l'ombre du curseur", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Par dé&faut", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Choisir", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -154,6 +154,7 @@ IDS_NWPEN "Écriture" IDS_NO "Indisponible" IDS_SIZENS "Redimensionnement vertical" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Redimensionnement en diagonale 1" IDS_SIZENESW "Redimensionnement en diagonale 2" IDS_SIZEALL "Déplacer" Modified: trunk/reactos/dll/cpl/main/lang/hu-HU.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/hu-HU.rc…
============================================================================== --- trunk/reactos/dll/cpl/main/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/hu-HU.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Scheme", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -154,6 +154,7 @@ IDS_NWPEN "Handwriting" IDS_NO "Unavailable" IDS_SIZENS "Vertical Resize" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Diagonal Resize 1" IDS_SIZENESW "Diagonal Resize 2" IDS_SIZEALL "Move" Modified: trunk/reactos/dll/cpl/main/lang/id-ID.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/id-ID.rc…
============================================================================== --- trunk/reactos/dll/cpl/main/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/main/lang/id-ID.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Skema", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Simpan Seba&gai...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Hapus", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Kustomisasi", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "Hidupkan ba&yangan pointer", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Gunakan Standa&r", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Lihat", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -153,6 +153,7 @@ IDS_NWPEN "Tulisan tangan" IDS_NO "Tidak tersedia" IDS_SIZENS "Ukur ulang Vertikal" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Ukur ulang Diagonal 1" IDS_SIZENESW "Ukur ulang Diagonal 2" IDS_SIZEALL "Pindah" Modified: trunk/reactos/dll/cpl/main/lang/it-IT.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/it-IT.rc…
============================================================================== --- trunk/reactos/dll/cpl/main/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/main/lang/it-IT.rc Tue Apr 17 14:41:07 2007 @@ -76,11 +76,11 @@ BEGIN GROUPBOX "Schema", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Salva come...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Cancella", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Personalizza", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Abilita l'ombra del puntatore", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Usa predefinito", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Esplora", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -155,6 +155,7 @@ IDS_NWPEN "Scrittura manuale" IDS_NO "Non disponibile" IDS_SIZENS "Ridimensiona in verticale" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Ridimensiona in Diagonale 1" IDS_SIZENESW "Ridimensiona in Diagonale 2" IDS_SIZEALL "Muovi" Modified: trunk/reactos/dll/cpl/main/lang/ja-JP.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ja-JP.rc…
============================================================================== --- trunk/reactos/dll/cpl/main/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ja-JP.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Scheme", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -153,6 +153,7 @@ IDS_NWPEN "Handwriting" IDS_NO "Unavailable" IDS_SIZENS "Vertical Resize" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Diagonal Resize 1" IDS_SIZENESW "Diagonal Resize 2" IDS_SIZEALL "Move" Modified: trunk/reactos/dll/cpl/main/lang/nl-NL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/nl-NL.rc…
============================================================================== --- trunk/reactos/dll/cpl/main/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/main/lang/nl-NL.rc Tue Apr 17 14:41:07 2007 @@ -73,11 +73,11 @@ BEGIN GROUPBOX "Scheme", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -152,6 +152,7 @@ IDS_NWPEN "Handwriting" IDS_NO "Unavailable" IDS_SIZENS "Vertical Resize" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Diagonal Resize 1" IDS_SIZENESW "Diagonal Resize 2" IDS_SIZEALL "Move" Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ru-RU.rc…
============================================================================== --- trunk/reactos/dll/cpl/main/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ru-RU.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Scheme", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -154,6 +154,7 @@ IDS_NWPEN "Handwriting" IDS_NO "Unavailable" IDS_SIZENS "Vertical Resize" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Diagonal Resize 1" IDS_SIZENESW "Diagonal Resize 2" IDS_SIZEALL "Move" Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc…
============================================================================== --- trunk/reactos/dll/cpl/main/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/main/lang/uk-UA.rc Tue Apr 17 14:41:07 2007 @@ -82,11 +82,11 @@ BEGIN GROUPBOX "Ñõåìà", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Çáåðåãòè &ÿê...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "Â&èäàëèòè", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Íàëàøòóâàííÿ", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Ââ³ìêíóòè &ò³íü âêàç³âíèêà", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "&Çà çàìîâ÷óâàííÿì", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Îãëÿä", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -161,6 +161,7 @@ IDS_NWPEN "Ðóêîïèñíå ââåäåííÿ" IDS_NO "Îïåðàö³ÿ íåìîæëèâà" IDS_SIZENS "Çì³íà âåðòèêàëüíèõ ðîçì³ð³â" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Çì³íà ðîçì³ð³â ïî ä³àãîíàë³ 1" IDS_SIZENESW "Çì³íà ðîçì³ð³â ïî ä³àãîíàë³ 2" IDS_SIZEALL "Ïåðåì³ùåííÿ" Modified: trunk/reactos/dll/cpl/main/mouse.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2…
============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Tue Apr 17 14:41:07 2007 @@ -105,6 +105,34 @@ } WHEEL_DATA, *PWHEEL_DATA; +typedef struct _CURSOR_DATA +{ + UINT uStringId; + LPWSTR uDefaultCursorId; + HCURSOR hCursor; + TCHAR szCursorName[MAX_PATH]; + TCHAR szCursorPath[MAX_PATH]; +} CURSOR_DATA, *PCURSOR_DATA; + + +CURSOR_DATA g_CursorData[] = +{{IDS_ARROW, IDC_ARROW, 0, _T(""), _T("")}, + {IDS_HELP, IDC_HELP, 0, _T(""), _T("")}, + {IDS_APPSTARTING, IDC_APPSTARTING, 0, _T(""), _T("")}, + {IDS_WAIT, IDC_WAIT, 0, _T(""), _T("")}, + {IDS_CROSSHAIR, IDC_CROSS, 0, _T(""), _T("")}, + {IDS_IBEAM, IDC_IBEAM, 0, _T(""), _T("")}, + {IDS_NWPEN, 0/*IDC_NWPEN*/, 0, _T(""), _T("")}, + {IDS_NO, IDC_NO, 0, _T(""), _T("")}, + {IDS_SIZENS, IDC_SIZENS, 0, _T(""), _T("")}, + {IDS_SIZEWE, IDC_SIZEWE, 0, _T(""), _T("")}, + {IDS_SIZENWSE, IDC_SIZENWSE, 0, _T(""), _T("")}, + {IDS_SIZENESW, IDC_SIZENESW, 0, _T(""), _T("")}, + {IDS_SIZEALL, IDC_SIZEALL, 0, _T(""), _T("")}, + {IDS_UPARROW, IDC_UPARROW, 0, _T(""), _T("")}, + {IDS_HAND, IDC_HAND, 0, _T(""), _T("")}}; + + TCHAR g_CurrentScheme[MAX_PATH]; TCHAR g_szArrow[MAX_PATH]; TCHAR g_szHelp[MAX_PATH]; @@ -123,6 +151,8 @@ TCHAR g_szHand[MAX_PATH]; TCHAR g_szNewScheme[MAX_PATH]; + + /* Property page dialog callback */ @@ -554,12 +584,13 @@ static VOID RefreshCursorList(HWND hwndDlg) { - TCHAR szCursorName[MAX_PATH]; - HWND hDlgCtrl; - LV_ITEM listItem; - LV_COLUMN column; - INT index = 0; - +// TCHAR szCursorName[MAX_PATH]; +// HWND hDlgCtrl; +// LV_ITEM listItem; +// LV_COLUMN column; + INT index = 0, i; + +#if 0 hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTVIEW_CURSOR); (void)ListView_DeleteAllItems(hDlgCtrl); @@ -634,6 +665,14 @@ LoadString(hApplet, IDS_HAND, szCursorName, MAX_PATH); listItem.iItem = index++; (void)ListView_InsertItem(hDlgCtrl, &listItem); +#endif + + SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_RESETCONTENT, 0, 0); + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + { + LoadString(hApplet, index, g_CursorData[i].szCursorName, MAX_PATH); + SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_ADDSTRING, 0, (LPARAM)i); + } } @@ -720,6 +759,7 @@ static VOID LoadCurrentCursorScheme(LPTSTR lpName, BOOL bSystem) { +#if 0 HKEY hCursorKey; TCHAR szValue[2048]; TCHAR szRaw[256]; @@ -803,6 +843,85 @@ } } } +#endif + + UINT index, i; + + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + { + if (g_CursorData[i].hCursor != NULL) + { + DestroyCursor(g_CursorData[i].hCursor); + g_CursorData[i].hCursor = 0; + } + } + + if (lpName == NULL) + { + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + { + g_CursorData[i].hCursor = LoadCursor(NULL, g_CursorData[i].uDefaultCursorId); + } + } + else + { + + } +} + + +static VOID +OnDrawItem(UINT idCtl, + LPDRAWITEMSTRUCT lpdis) +{ + RECT rc; + + if (lpdis->itemState & ODS_SELECTED) + { + FillRect(lpdis->hDC, + &lpdis->rcItem, + (HBRUSH)(COLOR_HIGHLIGHT + 1)); + SetBkColor(lpdis->hDC, + GetSysColor(COLOR_HIGHLIGHT)); + SetTextColor(lpdis->hDC, + GetSysColor(COLOR_HIGHLIGHTTEXT)); + } + else + { + FillRect(lpdis->hDC, + &lpdis->rcItem, + (HBRUSH)(COLOR_WINDOW + 1)); + SetBkColor(lpdis->hDC, + GetSysColor(COLOR_WINDOW)); + SetTextColor(lpdis->hDC, + GetSysColor(COLOR_WINDOWTEXT)); + } + + if (lpdis->itemID != -1) + { + CopyRect(&rc, &lpdis->rcItem); + rc.left += 5; + DrawText(lpdis->hDC, + g_CursorData[lpdis->itemData].szCursorName, + -1, + &rc, + DT_SINGLELINE | DT_VCENTER | DT_LEFT); + + if (g_CursorData[lpdis->itemData].hCursor != NULL) + { + DrawIcon(lpdis->hDC, + lpdis->rcItem.right - 32 - 4, + lpdis->rcItem.top + 2, + g_CursorData[lpdis->itemData].hCursor); + } + } + + if (lpdis->itemState & ODS_FOCUS) + { + CopyRect(&rc, &lpdis->rcItem); + InflateRect(&rc, -1, -1); + DrawFocusRect(lpdis->hDC, &rc); + } } @@ -832,6 +951,7 @@ EnumerateCursorSchemes(hwndDlg); RefreshCursorList(hwndDlg); + SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_SETCURSEL, 0, 0); /* Get drop shadow setting */ if (!SystemParametersInfo(SPI_GETDROPSHADOW, 0, &pPointerData->bDropShadow, 0)) @@ -845,10 +965,19 @@ SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - if ((INT)wParam == IDC_LISTVIEW_CURSOR) + if ((INT)wParam == IDC_LISTBOX_CURSOR) return TRUE; else return FALSE; + + case WM_MEASUREITEM: + ((LPMEASUREITEMSTRUCT)lParam)->itemHeight = 32 + 4; + break; + + case WM_DRAWITEM: + if (wParam == IDC_LISTBOX_CURSOR) + OnDrawItem((UINT)wParam, (LPDRAWITEMSTRUCT)lParam); + return TRUE; case WM_DESTROY: HeapFree(GetProcessHeap(), 0, pPointerData); @@ -873,35 +1002,48 @@ break; case WM_COMMAND: - switch(HIWORD(wParam)) - { - case CBN_SELENDOK: - { - BOOL bEnable; - LPTSTR lpName; - - wParam = SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0); - if(wParam == CB_ERR) - break; - SendMessage((HWND)lParam, CB_GETLBTEXT, wParam, (LPARAM)buffer); - LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); - if(_tcsstr(buffer, szSystemScheme) || wParam == 0) //avoid the default scheme can be deleted - bEnable = FALSE; - else - bEnable = TRUE; - - /* delete button */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_DELETE_SCHEME); - EnableWindow(hDlgCtrl, bEnable); - - lpName = (LPTSTR)SendMessage((HWND)lParam, CB_GETITEMDATA, wParam, 0); - LoadCurrentCursorScheme(lpName, !bEnable); - break; - } - } - switch (LOWORD(wParam)) { + case IDC_COMBO_CURSOR_SCHEME: + switch(HIWORD(wParam)) + { + case CBN_SELENDOK: + { + BOOL bEnable; + LPTSTR lpName; + + wParam = SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0); + if(wParam == CB_ERR) + break; + SendMessage((HWND)lParam, CB_GETLBTEXT, wParam, (LPARAM)buffer); + LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); + if(_tcsstr(buffer, szSystemScheme) || wParam == 0) //avoid the default scheme can be deleted + bEnable = FALSE; + else + bEnable = TRUE; + + /* delete button */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_DELETE_SCHEME); + EnableWindow(hDlgCtrl, bEnable); + + lpName = (LPTSTR)SendMessage((HWND)lParam, CB_GETITEMDATA, wParam, 0); + LoadCurrentCursorScheme(lpName, !bEnable); + break; + } + } + break; + + case IDC_LISTBOX_CURSOR: + if (HIWORD(wParam) == LBN_SELCHANGE) + { + UINT uSel, uIndex; + uSel = SendMessage((HWND)lParam, LB_GETCURSEL, 0, 0); + uIndex = (UINT)SendMessage((HWND)lParam, LB_GETITEMDATA, (WPARAM)uSel, 0); + SendDlgItemMessage(hwndDlg, IDC_IMAGE_CURRENT_CURSOR, STM_SETIMAGE, IMAGE_CURSOR, + (LPARAM)g_CursorData[uIndex].hCursor); + } + break; + case IDC_BUTTON_SAVEAS_SCHEME: if (DialogBox(hApplet, MAKEINTRESOURCE(IDD_CURSOR_SCHEME_SAVEAS), hwndDlg, SaveSchemeProc)) { @@ -911,7 +1053,7 @@ break; case IDC_BUTTON_USE_DEFAULT_CURSOR: - hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTVIEW_CURSOR); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTBOX_CURSOR); lResult = SendMessage(hDlgCtrl, CB_GETCURSEL, 0, 0); if (lResult != CB_ERR) { @@ -950,7 +1092,7 @@ case IDC_BUTTON_BROWSE_CURSOR: memset(buffer, 0x0, sizeof(buffer)); - hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTVIEW_CURSOR); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTBOX_CURSOR); lResult = SendMessage(hDlgCtrl, CB_GETCURSEL, 0, 0); if (lResult == CB_ERR) MessageBox(hwndDlg, _T("CB_ERR"), _T(""),MB_ICONERROR); Modified: trunk/reactos/dll/cpl/main/resource.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resource.h?re…
============================================================================== --- trunk/reactos/dll/cpl/main/resource.h (original) +++ trunk/reactos/dll/cpl/main/resource.h Tue Apr 17 14:41:07 2007 @@ -20,10 +20,30 @@ #define IDD_CURSOR_SCHEME_SAVEAS 107 #define IDD_CLICK_LOCK 108 -#define IDS_CPLNAME_1 1000 -#define IDS_CPLDESCRIPTION_1 1001 -#define IDS_CPLNAME_2 1002 -#define IDS_CPLDESCRIPTION_2 1003 +/* Strings */ +#define IDS_CPLNAME_1 1000 +#define IDS_CPLDESCRIPTION_1 1001 +#define IDS_CPLNAME_2 1002 +#define IDS_CPLDESCRIPTION_2 1003 + +#define IDS_ARROW 1016 +#define IDS_HELP 1017 +#define IDS_APPSTARTING 1018 +#define IDS_WAIT 1019 +#define IDS_CROSSHAIR 1020 +#define IDS_IBEAM 1021 +#define IDS_NWPEN 1022 +#define IDS_NO 1023 +#define IDS_SIZENS 1024 +#define IDS_SIZEWE 1025 +#define IDS_SIZENWSE 1026 +#define IDS_SIZENESW 1027 +#define IDS_SIZEALL 1028 +#define IDS_UPARROW 1029 +#define IDS_HAND 1030 +#define IDS_NONE 1031 +#define IDS_SYSTEM_SCHEME 1032 + #define IDC_SWAP_MOUSE_BUTTONS 2000 #define IDC_SLIDER_DOUBLE_CLICK_SPEED 2001 @@ -40,24 +60,8 @@ #define IDC_CHECK_POINTER_TRAIL 2012 #define IDC_CHECK_POINTER_PRECISION 2013 #define IDC_SLIDER_POINTER_TRAIL 2014 -#define IDC_LISTVIEW_CURSOR 2015 -#define IDS_ARROW 2016 -#define IDS_HELP 2017 -#define IDS_APPSTARTING 2018 -#define IDS_WAIT 2019 -#define IDS_CROSSHAIR 2020 -#define IDS_IBEAM 2021 -#define IDS_NWPEN 2022 -#define IDS_NO 2023 -#define IDS_SIZENS 2024 -#define IDS_SIZENWSE 2025 -#define IDS_SIZENESW 2026 -#define IDS_SIZEALL 2027 -#define IDS_UPARROW 2028 -#define IDS_HAND 2029 +#define IDC_LISTBOX_CURSOR 2015 #define IDC_COMBO_CURSOR_SCHEME 2030 -#define IDS_NONE 2031 -#define IDS_SYSTEM_SCHEME 2032 #define IDC_BUTTON_DELETE_SCHEME 2033 #define IDC_CHECK_DROP_SHADOW 2034 #define IDC_IMAGE_SWAP_MOUSE 2035
[View Less]
17 years, 10 months
1
0
0
0
[cwittich] 26367: display the icons again - but something is still wrong
by cwittich@svn.reactos.org
Author: cwittich Date: Tue Apr 17 05:15:24 2007 New Revision: 26367 URL:
http://svn.reactos.org/svn/reactos?rev=26367&view=rev
Log: display the icons again - but something is still wrong Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
============================================================================== --- trunk/reactos/
…
[View More]
subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Apr 17 05:15:24 2007 @@ -1841,7 +1841,7 @@ return Ret; } - if (RetCount >= count) + if (RetCount <= count) { SafeBuf = ExAllocatePoolWithTag(PagedPool, count, TAG_GDIOBJ); if(!SafeBuf)
[View Less]
17 years, 10 months
1
0
0
0
[dgorbachev] 26366: Detect i8042 IRQs by edge. This should fix endless loop in i8042 driver on machines with VIA and ALI chipsets. (See bug report #2159.) Thanks Peter K. and other testers for help.
by dgorbachev@svn.reactos.org
Author: dgorbachev Date: Tue Apr 17 03:03:41 2007 New Revision: 26366 URL:
http://svn.reactos.org/svn/reactos?rev=26366&view=rev
Log: Detect i8042 IRQs by edge. This should fix endless loop in i8042 driver on machines with VIA and ALI chipsets. (See bug report #2159.) Thanks Peter K. and other testers for help. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/
…
[View More]
drivers/input/i8042prt/i80…
============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.c (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c Tue Apr 17 03:03:41 2007 @@ -886,7 +886,7 @@ MappedIrqKeyboard, DirqlKeyboard, DirqlMax, - LevelSensitive, + Latched, FALSE, Affinity, FALSE); @@ -902,7 +902,7 @@ MappedIrqMouse, DirqlMouse, DirqlMax, - LevelSensitive, + Latched, FALSE, Affinity, FALSE);
[View Less]
17 years, 10 months
1
0
0
0
[dgorbachev] 26365: Do not change reserved ELCR bits.
by dgorbachev@svn.reactos.org
Author: dgorbachev Date: Tue Apr 17 03:02:54 2007 New Revision: 26365 URL:
http://svn.reactos.org/svn/reactos?rev=26365&view=rev
Log: Do not change reserved ELCR bits. Modified: trunk/reactos/hal/halx86/generic/irq.S Modified: trunk/reactos/hal/halx86/generic/irq.S URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r…
============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++
…
[View More]
trunk/reactos/hal/halx86/generic/irq.S Tue Apr 17 03:02:54 2007 @@ -254,6 +254,7 @@ in al, dx mov dx, 1 shl dx, cl + and dx, 0xDEF8 /* Check if this is a latched interrupt */ cmp dword ptr [esp+12], 0
[View Less]
17 years, 10 months
1
0
0
0
[arty] 26364: Streamline freeldr now that we're in BE all the way.
by arty@svn.reactos.org
Author: arty Date: Mon Apr 16 17:48:22 2007 New Revision: 26364 URL:
http://svn.reactos.org/svn/reactos?rev=26364&view=rev
Log: Streamline freeldr now that we're in BE all the way. Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/ofw_util.s Removed: branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s branches/
…
[View More]
powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild branches/powerpc/reactos/tools/ofw_interface/calls.ofw branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Removed: branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/bo…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s (original) +++ branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s (removed) @@ -1,445 +1,0 @@ - .section .text - .globl ofw_functions - .globl ofw_call_addr -call_ofw: - /* R3 has the function offset to call (n * 4) - * Other arg registers are unchanged. */ - subi %r1,%r1,0x100 - stw %r8,24(%r1) - mflr %r8 - stw %r8,0(%r1) - stw %r3,4(%r1) - stw %r4,8(%r1) - stw %r5,12(%r1) - stw %r6,16(%r1) - stw %r7,20(%r1) - stw %r9,28(%r1) - stw %r10,32(%r1) - stw %r20,36(%r1) - - lis %r10,0xe00000@ha - addi %r8,%r10,ofw_functions@l - add %r8,%r3,%r8 - lwz %r9,0(%r8) - mtctr %r9 - - mr %r3,%r4 - mr %r4,%r5 - mr %r5,%r6 - mr %r6,%r7 - mr %r7,%r8 - mr %r8,%r9 - - /* Call ofw proxy function */ - bctrl - - lwz %r8,0(%r1) - mtlr %r8 - lwz %r4,8(%r1) - lwz %r5,12(%r1) - lwz %r6,16(%r1) - lwz %r7,20(%r1) - lwz %r8,24(%r1) - lwz %r9,28(%r1) - lwz %r10,32(%r1) - lwz %r20,36(%r1) - addi %r1,%r1,0x100 - blr - -prim_strlen: - mr %r5,%r3 -prim_strlen_loop: - lbz %r4,0(%r3) - cmpi 0,0,%r4,0 - beq prim_strlen_done - addi %r3,%r3,1 - b prim_strlen_loop - -prim_strlen_done: - sub %r3,%r3,%r5 - blr - -copy_bits: - cmp 0,0,%r3,%r4 - bgelr - - andi. %r6,%r3,0xfff - beql ofw_dumpregs - mtdec %r3 - - lwz %r6,0(%r3) - stw %r6,0(%r5) - addi %r3,%r3,4 - addi %r5,%r5,4 - b copy_bits - -ofw_print_string: - /* Reserve some stack space */ - subi %r1,%r1,32 - - /* Save args */ - stw %r3,0(%r1) - - /* Save the lr, a scratch register */ - stw %r8,8(%r1) - mflr %r8 - stw %r8,12(%r1) - - /* Load the package name */ - lis %r3,0xe00000@ha - addi %r3,%r3,ofw_chosen_name - _start - - /* Fire */ - bl ofw_finddevice - - /* Load up for getprop */ - stw %r3,16(%r1) - - lis %r4,0xe00000@ha - addi %r4,%r4,ofw_stdout_name - _start - - addi %r5,%r1,20 - - li %r6,4 - - bl ofw_getprop - - /* Measure the string and remember the length */ - lwz %r3,0(%r1) - bl prim_strlen - mr %r5,%r3 - - lwz %r3,20(%r1) - lwz %r4,0(%r1) - - /* Write the string */ - bl ofw_write - - /* Return */ - lwz %r8,12(%r1) - mtlr %r8 - lwz %r8,8(%r1) - - addi %r1,%r1,32 - blr - - /* Print 8 hex digits representing a number in r3 */ -ofw_print_number: - subi %r1,%r1,32 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - stw %r9,8(%r1) - - xor %r9,%r9,%r9 - stw %r9,12(%r1) - - /* Set up and, devide, shift */ - mr %r8,%r3 - lis %r6,0xf0000000@ha - lis %r7,0x10000000@ha - li %r9,8 - -ofw_number_loop: - nop - cmpi 0,0,%r9,0 - beq ofw_number_return - subi %r9,%r9,1 - - /* Body: isolate digit, divide, print */ - and %r5,%r6,%r8 - divwu %r4,%r5,%r7 - srwi %r6,%r6,4 - srwi %r7,%r7,4 - - nop - - cmpi 0,0,%r4,10 - bge ofw_number_letter - addi %r4,%r4,'0' - b ofw_number_digit_out - -ofw_number_letter: - addi %r4,%r4,'A' - 10 - -ofw_number_digit_out: - stb %r4,12(%r1) - addi %r3,%r1,12 - - stw %r6,16(%r1) - stw %r7,20(%r1) - stw %r8,24(%r1) - stw %r9,28(%r1) - - bl ofw_print_string - - lwz %r6,16(%r1) - lwz %r7,20(%r1) - lwz %r8,24(%r1) - lwz %r9,28(%r1) - - b ofw_number_loop - -ofw_number_return: - /* Return */ - lwz %r9,8(%r1) - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,32 - blr - -ofw_print_eol: - subi %r1,%r1,16 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - li %r4,0x0d0a - sth %r4,8(%r1) - xor %r4,%r4,%r4 - sth %r4,10(%r1) - addi %r3,%r1,8 - bl ofw_print_string - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,16 - blr - -ofw_print_nothing: - subi %r1,%r1,16 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - li %r4,0 - sth %r4,8(%r1) - xor %r4,%r4,%r4 - sth %r4,10(%r1) - addi %r3,%r1,8 - bl ofw_print_string - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,16 - blr - -ofw_print_space: - subi %r1,%r1,16 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - li %r4,0x2000 - sth %r4,8(%r1) - xor %r4,%r4,%r4 - sth %r4,10(%r1) - addi %r3,%r1,8 - bl ofw_print_string - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,16 - blr - -ofw_dumpregs: - /* Construct ofw exit call */ - subi %r1,%r1,0xa0 - - stw %r0,0(%r1) - stw %r1,4(%r1) - stw %r2,8(%r1) - stw %r3,12(%r1) - - stw %r4,16(%r1) - stw %r5,20(%r1) - stw %r6,24(%r1) - stw %r7,28(%r1) - - stw %r8,32(%r1) - stw %r9,36(%r1) - stw %r10,40(%r1) - stw %r11,44(%r1) - - stw %r12,48(%r1) - stw %r13,52(%r1) - stw %r14,56(%r1) - stw %r15,60(%r1) - - stw %r16,64(%r1) - stw %r17,68(%r1) - stw %r18,72(%r1) - stw %r19,76(%r1) - - stw %r20,80(%r1) - stw %r21,84(%r1) - stw %r22,88(%r1) - stw %r23,92(%r1) - - stw %r24,96(%r1) - stw %r25,100(%r1) - stw %r26,104(%r1) - stw %r27,108(%r1) - - stw %r28,112(%r1) - stw %r29,116(%r1) - stw %r30,120(%r1) - stw %r31,124(%r1) - - mflr %r0 - stw %r0,128(%r1) - mfcr %r0 - stw %r0,132(%r1) - mfctr %r0 - stw %r0,136(%r1) - mfmsr %r0 - stw %r0,140(%r1) - - /* Count at zero */ - xor %r0,%r0,%r0 - stw %r0,144(%r1) - mr %r3,%r1 - stw %r3,148(%r1) - - /* Body, print the regname, then the register */ -ofw_register_loop: - lwz %r3,144(%r1) - cmpi 0,0,%r3,32 - beq ofw_register_special - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_init - _start - bl ofw_print_string - lwz %r3,144(%r1) - bl ofw_print_number - bl ofw_print_space - lwz %r3,144(%r1) - mulli %r3,%r3,4 - add %r3,%r1,%r3 - lwz %r3,0(%r3) - stw %r3,152(%r1) - bl ofw_print_number - lwz %r3,144(%r1) - addi %r3,%r3,1 - stw %r3,144(%r1) - - bl ofw_print_space - - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_init - _start - bl ofw_print_string - lwz %r3,144(%r1) - bl ofw_print_number - bl ofw_print_space - lwz %r3,144(%r1) - mulli %r3,%r3,4 - add %r3,%r1,%r3 - lwz %r3,0(%r3) - stw %r3,152(%r1) - bl ofw_print_number - lwz %r3,144(%r1) - addi %r3,%r3,1 - stw %r3,144(%r1) - - b done_dump - -dump_optional: - bl ofw_print_space - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,0(%r3) - bl ofw_print_number - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,4(%r3) - bl ofw_print_number - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,8(%r3) - bl ofw_print_number - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,12(%r3) - bl ofw_print_number - bl ofw_print_space -done_dump: - bl ofw_print_eol - b ofw_register_loop - -ofw_register_special: - /* LR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_lr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,128(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* CR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_cr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,132(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* CTR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_ctr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,136(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* MSR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_msr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,140(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* Return */ - lwz %r0,128(%r1) - mtlr %r0 - - lwz %r0,0(%r1) - lwz %r2,8(%r1) - lwz %r3,12(%r1) - - lwz %r4,16(%r1) - lwz %r5,20(%r1) - lwz %r6,24(%r1) - lwz %r7,28(%r1) - - addi %r1,%r1,0xa0 - - blr - -ofw_chosen_name: - .ascii "/chosen\0" - -ofw_stdout_name: - .ascii "stdout\0" - -ofw_memory_name: - .ascii "/memory@0\0" - -ofw_reg_name: - .ascii "reg\0" - -freeldr_reg_init: - .ascii "r\0" - -freeldr_reg_lr: - .ascii "lr \0" - -freeldr_reg_cr: - .ascii "cr \0" - -freeldr_reg_ctr: - .ascii "ctr\0" - -freeldr_reg_msr: - .ascii "msr\0" Removed: branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/bo…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s (original) +++ branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s (removed) @@ -1,105 +1,0 @@ - .section .text - -_start: - .long 0xe00000 + 12 - .long 0 - .long 0 - - .globl _begin - .globl call_ofw - .globl ofw_functions -_begin: - sync - isync - - lis %r1,stack@ha - addi %r1,%r1,stack@l - addi %r1,%r1,16384 - 0x10 - - /* Store ofw call addr */ - mr %r21,%r5 - lis %r10,0xe00000@ha - stw %r5,ofw_call_addr - _start@l(%r10) - - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_banner - _start - - bl ofw_print_string - bl ofw_print_eol - bl zero_registers - - /* Zero CTR */ - mtcr %r31 - - lis %r3,0xe17000@ha - addi %r3,%r3,0xe17000@l - - mtlr %r3 - lis %r3,0xe00000@ha - addi %r3,%r3,call_ofw - _start@l - - blr - -zero_registers: - xor %r2,%r2,%r2 - mr %r0,%r2 - mr %r3,%r2 - - mr %r4,%r2 - mr %r5,%r2 - mr %r6,%r2 - mr %r7,%r2 - - mr %r8,%r2 - mr %r9,%r2 - mr %r10,%r2 - mr %r11,%r2 - - mr %r12,%r2 - mr %r13,%r2 - mr %r14,%r2 - mr %r15,%r2 - - mr %r12,%r2 - mr %r13,%r2 - mr %r14,%r2 - mr %r15,%r2 - - mr %r16,%r2 - mr %r17,%r2 - mr %r18,%r2 - mr %r19,%r2 - - mr %r20,%r2 - mr %r21,%r2 - mr %r22,%r2 - mr %r23,%r2 - - mr %r24,%r2 - mr %r25,%r2 - mr %r26,%r2 - mr %r27,%r2 - - mr %r28,%r2 - mr %r29,%r2 - mr %r30,%r2 - mr %r31,%r2 - - blr - -freeldr_banner: - .ascii "ReactOS OpenFirmware Boot Program\r\n\0" - -freeldr_halt: - .ascii "ReactOS OpenFirmware Boot Program Halting\r\n\0" - -ofw_memory_size: - .long 0 - .long 0 - .long 0 - .long 0 - - .org 0x1000 -stack: - .space 0x4000 - Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s Mon Apr 16 17:48:22 2007 @@ -1,6 +1,90 @@ + .section ".text" .extern PpcInit + .globl _start + .globl call_ofw _start: - b PpcInit + sync + isync + + lis %r1,stack@ha + addi %r1,%r1,stack@l + addi %r1,%r1,16384 - 0x10 + + /* Store ofw call addr */ + mr %r21,%r5 + lis %r10,ofw_call_addr@ha + stw %r5,ofw_call_addr@l(%r10) + + bl zero_registers + + /* Zero CTR */ + mtcr %r31 + + lis %r3,PpcInit@ha + addi %r3,%r3,PpcInit@l + mtlr %r3 + + lis %r3,call_ofw@ha + addi %r3,%r3,call_ofw@l + + blr + +zero_registers: + xor %r2,%r2,%r2 + mr %r0,%r2 + mr %r3,%r2 + + mr %r4,%r2 + mr %r5,%r2 + mr %r6,%r2 + mr %r7,%r2 + + mr %r8,%r2 + mr %r9,%r2 + mr %r10,%r2 + mr %r11,%r2 + + mr %r12,%r2 + mr %r13,%r2 + mr %r14,%r2 + mr %r15,%r2 + + mr %r12,%r2 + mr %r13,%r2 + mr %r14,%r2 + mr %r15,%r2 + + mr %r16,%r2 + mr %r17,%r2 + mr %r18,%r2 + mr %r19,%r2 + + mr %r20,%r2 + mr %r21,%r2 + mr %r22,%r2 + mr %r23,%r2 + + mr %r24,%r2 + mr %r25,%r2 + mr %r26,%r2 + mr %r27,%r2 + + mr %r28,%r2 + mr %r29,%r2 + mr %r30,%r2 + mr %r31,%r2 + + blr + +ofw_memory_size: + .long 0 + .long 0 + .long 0 + .long 0 + + .org 0x1000 +stack: + .space 0x4000 .globl _bss .section ".bss" Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Mon Apr 16 17:48:22 2007 @@ -28,7 +28,8 @@ extern ULONG CacheSizeLimit; of_proxy ofproxy; void *PageDirectoryStart, *PageDirectoryEnd; -static int chosen_package, stdin_handle, part_handle = -1, kernel_mem = 0; +static int chosen_package, stdin_handle, stdout_handle, + part_handle = -1, kernel_mem = 0; int mmu_handle = 0, FixedMemory = 0; BOOLEAN AcpiPresent = FALSE; char BootPath[0x100] = { 0 }, BootPart[0x100] = { 0 }, CmdLine[0x100] = { 0 }; @@ -41,7 +42,7 @@ if( ch == 0x0a ) { buf[0] = 0x0d; buf[1] = 0x0a; } else { buf[0] = ch; buf[1] = 0; } buf[2] = 0; - ofw_print_string( buf ); + ofw_write(stdout_handle, buf, strlen(buf)); } int PpcFindDevice( int depth, int parent, char *devname, int *nth ) { @@ -93,7 +94,6 @@ } void PpcVideoClearScreen( UCHAR Attr ) { - ofw_print_string("ClearScreen\n"); } VOID PpcVideoGetDisplaySize( PULONG Width, PULONG Height, PULONG Depth ) { @@ -494,7 +494,7 @@ extern int _bss; typedef unsigned int uint32_t; void PpcInit( of_proxy the_ofproxy ) { - int len, stdin_handle_chosen, mmu_handle_chosen; + int len; ofproxy = the_ofproxy; //SetPhys(0x900, (19 << 26) | (50 << 1)); @@ -502,16 +502,11 @@ chosen_package = ofw_finddevice( "/chosen" ); ofw_getprop( chosen_package, "stdin", - (char *)&stdin_handle_chosen, sizeof(stdin_handle_chosen) ); + (char *)&stdin_handle, sizeof(stdin_handle) ); + ofw_getprop( chosen_package, "stdout", + (char *)&stdout_handle, sizeof(stdout_handle) ); ofw_getprop( chosen_package, "mmu", - (char *)&mmu_handle_chosen, sizeof(mmu_handle_chosen) ); - - ofw_print_string("Found stdin "); - ofw_print_number(stdin_handle_chosen); - ofw_print_string("\r\n"); - - stdin_handle = stdin_handle_chosen; - mmu_handle = mmu_handle_chosen; + (char *)&mmu_handle, sizeof(mmu_handle) ); MachVtbl.ConsPutChar = PpcPutChar; MachVtbl.ConsKbHit = PpcConsKbHit; Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/ofw_util.s URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/ofw_util.s (added) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/ofw_util.s Mon Apr 16 17:48:22 2007 @@ -1,0 +1,49 @@ + .section .text + .globl ofw_functions + .globl ofw_call_addr + .globl call_ofw +call_ofw: + /* R3 has the function offset to call (n * 4) + * Other arg registers are unchanged. */ + subi %r1,%r1,0x100 + stw %r8,24(%r1) + mflr %r8 + stw %r8,0(%r1) + stw %r3,4(%r1) + stw %r4,8(%r1) + stw %r5,12(%r1) + stw %r6,16(%r1) + stw %r7,20(%r1) + stw %r9,28(%r1) + stw %r10,32(%r1) + stw %r20,36(%r1) + + lis %r10,ofw_functions@ha + addi %r8,%r10,ofw_functions@l + add %r8,%r3,%r8 + lwz %r9,0(%r8) + mtctr %r9 + + mr %r3,%r4 + mr %r4,%r5 + mr %r5,%r6 + mr %r6,%r7 + mr %r7,%r8 + mr %r8,%r9 + + /* Call ofw proxy function */ + bctrl + + lwz %r8,0(%r1) + mtlr %r8 + lwz %r4,8(%r1) + lwz %r5,12(%r1) + lwz %r6,16(%r1) + lwz %r7,20(%r1) + lwz %r8,24(%r1) + lwz %r9,28(%r1) + lwz %r10,32(%r1) + lwz %r20,36(%r1) + addi %r1,%r1,0x100 + blr + Modified: branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Mon Apr 16 17:48:22 2007 @@ -66,6 +66,8 @@ <compilerflag>-mno-toc</compilerflag> <compilerflag>-meabi</compilerflag> <file>boot.s</file> + <file>ofw_calls.s</file> + <file>ofw_util.s</file> <file>ofw.c</file> <file>mmu.c</file> <file>mach.c</file> Modified: branches/powerpc/reactos/tools/ofw_interface/calls.ofw URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter…
============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/calls.ofw (original) +++ branches/powerpc/reactos/tools/ofw_interface/calls.ofw Mon Apr 16 17:48:22 2007 @@ -20,12 +20,6 @@ package-to-path 3 1 int char*:arg2 int int # Declare the call-method BE function +call-method 0 0 -# Convenience functions that interact closely with OFW (written in BE asm) --dumpregs 0 0 --print_string 1 0 char* --print_number 1 0 int --print_eol 0 0 --print_space 0 0 # MMU Methods @phys2virt!translate 4 1 int int int int&0 int @virt2phys!translate 2 1 int int&1 int Modified: branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter…
============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp (original) +++ branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp Mon Apr 16 17:48:22 2007 @@ -131,7 +131,7 @@ local_offset = (3 + rets + args) * 4; total_stack = round_up(12 + local_offset, 16); - function << "ofw_" << name << ":\n" + function << "asm_ofw_" << name << ":\n" << "\t/* Reserve stack space */\n" << "\tsubi %r1,%r1," << total_stack << "\n" << "\t/* Store r8, r9, lr */\n" @@ -140,8 +140,8 @@ << "\tmflr %r8\n" << "\tstw %r8," << (local_offset + 8) << "(%r1)\n" << "\t/* Get read name */\n" - << "\tlis %r8," << wrapper.base << "@ha\n" - << "\taddi %r9,%r8," << name << "_ofw_name - _start\n" + << "\tlis %r8," << name << "_ofw_name@ha\n" + << "\taddi %r9,%r8," << name << "_ofw_name@l\n" << "\tstw %r9,0(%r1)\n" << "\t/* " << args << " arguments and " << rets << " return */\n" << "\tli %r9," << args << "\n" @@ -153,7 +153,8 @@ function << "\tstw %r" << (i+3) << "," << (4 * (i + 3)) << "(%r1)\n"; function << "\t/* Load up the call address */\n" - << "\tlwz %r9,ofw_call_addr - _start(%r8)\n" + << "\tlis %r10,ofw_call_addr@ha\n" + << "\tlwz %r9,ofw_call_addr@l(%r10)\n" << "\tmtlr %r9\n" << "\t/* Set argument */\n" << "\tmr %r3,%r1\n" @@ -228,7 +229,7 @@ } if( !method_call ) { wrapper.names += name + "_ofw_name:\n\t.asciz \"" + nametext + "\"\n"; - wrapper.calltable += std::string("\t.long ofw_") + name + "\n"; + wrapper.calltable += std::string("\t.long asm_ofw_") + name + "\n"; wrapper.ctindex++; } } @@ -286,6 +287,7 @@ << "\t.section .text\n" << "\t.align 4\n" << "\t.globl _start\n" + << "\t.globl ofw_functions\n" << "\t.globl ofw_call_addr\n" << "ofw_call_addr:\n" << "\t.long 0\n" @@ -294,6 +296,7 @@ << "\n/* Function Names */\n\n" << wrappers.names << "\n/* Function Call Table for Freeldr */\n\n" + << "\t.align 4\n" << "ofw_functions:\n" << wrappers.calltable << "\n/* End */\n"; Modified: branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter…
============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak (original) +++ branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak Mon Apr 16 17:48:22 2007 @@ -5,7 +5,7 @@ OFW_INTERFACE_OUT = $(OUTPUT_)$(OFW_INTERFACE_BASE) OFW_INTERFACE_OUT_ = $(OFW_INTERFACE_OUT)$(SEP) -OFW_INTERFACE_OUTPUT = boot/freeldr/bootsect/ofw.s +OFW_INTERFACE_OUTPUT = boot/freeldr/freeldr/arch/powerpc/ofw_calls.s OFW_INTERFACE_SOURCE = boot/freeldr/freeldr/arch/powerpc/ofw.c OFW_INTERFACE_HEADER = boot/freeldr/freeldr/include/of_call.h OFW_INTERFACE_INPUT = $(OFW_INTERFACE_BASE_)calls.ofw Modified: branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%…
============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr (original) +++ branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Mon Apr 16 17:48:22 2007 @@ -5,6 +5,8 @@ -g -nostartfiles -nostdlib -N -Ttext=0xe17000 \ -o freeldr.elf \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/boot.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw_util.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw_calls.o \ obj-ppc/boot/freeldr/freeldr/cache/blocklist.o \ obj-ppc/boot/freeldr/freeldr/cache/cache.o \ obj-ppc/boot/freeldr/freeldr/comm/rs232.o \ @@ -63,9 +65,3 @@ obj-ppc/lib/string/string.a \ obj-ppc/lib/rtl/rtl.a \ /usr/local/pkg/reactos-powerpc/lib/libgcc.a -powerpc-unknown-linux-gnu-objcopy -O binary freeldr.elf freeldr.tmp -(dd if=/dev/zero bs=4k count=16 ; echo 'byebye') >> freeldr.tmp -powerpc-unknown-linux-gnu-objcopy -I binary -B powerpc:common -O elf32-powerpc freeldr.tmp ofwldr.payload -reactos-powerpc-as -mbig -o ofwboot.o boot/freeldr/bootsect/ofwboot.s boot/freeldr/bootsect/ofw_util.s boot/freeldr/bootsect/ofw.s -powerpc-unknown-linux-gnu-ld -EB -Ttext 0xe00000 -Tdata 0xe17000 -e _begin -o ofwldr.x ofwboot.o ofwldr.payload -powerpc-unknown-linux-gnu-objcopy --only-section=.text --only-section=.data --only-section=.bss ofwldr.x ofwldr
[View Less]
17 years, 10 months
1
0
0
0
← Newer
1
...
21
22
23
24
25
26
27
...
38
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
Results per page:
10
25
50
100
200