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
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
July 2006
----- 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
662 discussions
Start a n
N
ew thread
[greatlrd] 23098: patch from : Fork : Bug#: 1633 : Norwegian translation
by greatlrd@svn.reactos.org
Author: greatlrd Date: Mon Jul 17 04:31:16 2006 New Revision: 23098 URL:
http://svn.reactos.org/svn/reactos?rev=23098&view=rev
Log: patch from : Fork : Bug#: 1633 : Norwegian translation Added: trunk/reactos/dll/win32/user32/No.rc (with props) Modified: trunk/reactos/dll/win32/user32/user32.rc Added: trunk/reactos/dll/win32/user32/No.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/No.rc?rev…
============================================================================== --- trunk/reactos/dll/win32/user32/No.rc (added) +++ trunk/reactos/dll/win32/user32/No.rc Mon Jul 17 04:31:16 2006 @@ -1,0 +1,79 @@ +// +// Norwegian Translation by Fork +// + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +///////////////////////////////////////////////////////////////////////////// +// +// Dialogs +// + +SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 +STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Velg Vindu" +BEGIN + LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL + PUSHBUTTON "&OK", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Avbryt", 2, 120, 120, 40, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +///////////////////////////////////////////////////////////////////////////// +// +// Menus +// + +EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + POPUP "DUMMY" + BEGIN + MENUITEM "&Angre", EM_UNDO + MENUITEM SEPARATOR + MENUITEM "Klipp u&t", WM_CUT + MENUITEM "&Kopier", WM_COPY + MENUITEM "&Lim inn", WM_PASTE + MENUITEM "&Slett", WM_CLEAR + MENUITEM SEPARATOR + MENUITEM "&Merk Alt", EM_SETSEL + END +} + + +SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + MENUITEM "&Gjenopprett", 61728 + MENUITEM "&Flytt", 61456 + MENUITEM "&Størrelse", 61440 + MENUITEM "Mi&nimer", 61472 + MENUITEM "&Maksimer", 61488 + MENUITEM SEPARATOR + MENUITEM "&Lukk\tAlt-F4", 61536 +} + +///////////////////////////////////////////////////////////////////////////// +// +// Strings +// + +STRINGTABLE +{ + IDS_ERROR, "Feil" + IDS_OK, "OK" + IDS_CANCEL, "Avbryt" + IDS_ABORT, "&Avbryt" + IDS_RETRY, "&Retry" + IDS_IGNORE, "&Ignorer" + IDS_YES, "&Ja" + IDS_NO, "&Nei" + IDS_HELP, "Hjelp" + IDS_TRYAGAIN, "&Prøv på nytt" + IDS_CONTINUE, "&Fortsett" +} + +STRINGTABLE +{ + IDS_MDI_MOREWINDOWS, "&Flere vinduer..." +} + Propchange: trunk/reactos/dll/win32/user32/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/user32/user32.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rc…
============================================================================== --- trunk/reactos/dll/win32/user32/user32.rc (original) +++ trunk/reactos/dll/win32/user32/user32.rc Mon Jul 17 04:31:16 2006 @@ -68,6 +68,7 @@ #include "De.rc" #include "Fr.rc" #include "Nl.rc" +#include "No.rc" #include "Pl.rc" #include "Ja.rc" #include "Sv.rc"
18 years, 5 months
1
0
0
0
[greatlrd] 23097: patch from : Fork : Bug#: 1633 : Norwegian translation
by greatlrd@svn.reactos.org
Author: greatlrd Date: Mon Jul 17 04:27:59 2006 New Revision: 23097 URL:
http://svn.reactos.org/svn/reactos?rev=23097&view=rev
Log: patch from : Fork : Bug#: 1633 : Norwegian translation Added: trunk/reactos/dll/win32/syssetup/syssetup_No.rc (with props) Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu…
============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc Mon Jul 17 04:27:59 2006 @@ -46,6 +46,7 @@ #include "syssetup_De.rc" #include "syssetup_Fr.rc" #include "syssetup_Nl.rc" +#include "syssetup_No.rc" #include "syssetup_Ja.rc" #include "syssetup_Es.rc" #include "syssetup_Hu.rc" Added: trunk/reactos/dll/win32/syssetup/syssetup_No.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu…
============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup_No.rc (added) +++ trunk/reactos/dll/win32/syssetup/syssetup_No.rc Mon Jul 17 04:27:59 2006 @@ -1,0 +1,225 @@ +/* + * Norwegian Translation by Fork + * + * + * Copyright (C) 2004 Filip Navara + * Copyright (C) 2004 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + + +IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS installasjon" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Velkommen til ReactOS installasjon Veiviser.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "Denne Veiviseren installerer ReactOS på din datamaskin. Veiviseren "\ + "Må samle sammen nødvendig informasjon om deg og din datamaskin "\ + "for å sette opp ReactOS skikkelig.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Klikk Neste for å fortsette installasjonen.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS installasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS utviklerene anerkjenner de følgende Åpen kilde prosjektene, "\ + "(deler av) som ble brukt til og skape ReactOS:", + IDC_STATIC,15,7,286,19 + LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | + LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "ReactOS er lisensert under GPL, så hvis du vil bruke eller gi ut "\ + "(deler av) ReactOS, må du respektere GPL", + IDC_STATIC,15,110,227,19 + PUSHBUTTON "&Vis GPL...",IDC_VIEWGPL,251,110,50,19 + LTEXT "Klikk Neste for å fortsette installasjonen.",IDC_STATIC,15,136, + 195,17 +END + + +IDD_OWNERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS installasjon" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Skriv inn ditt fulle navn og navnet på din bedrift eller organisasjon.", + IDC_STATIC, 54, 7, 242, 21 + LTEXT "Na&vn:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Organisasjon:", IDC_STATIC, 54, 57, 44, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + + +IDD_COMPUTERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS installasjon" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Skriv inn et navn for din datamaskin som er 63 karakterer eller mindre. "\ + "Hvis du er på et nettverk, så må ditt datamaskin navn være unikt.", + IDC_STATIC, 54, 7, 250, 24 + LTEXT "&Datamaskin navn:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + LTEXT "Installasjonen vil lage en bruker konto som blir kalt Administrator. "\ + "Du kan bruke denne kontoen hvis du trenger full adgang til din datamaskin.", + IDC_STATIC, 54, 57, 250, 25 + LTEXT "Skriv inn et Administrator passord som er 14 karakterer eller mindre.", + IDC_STATIC, 54, 87, 250, 8 + LTEXT "&Administrator Passord:", IDC_STATIC, 54, 104, 75, 8 + EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "B&ekreft Passord:", IDC_STATIC, 54, 123, 75, 8 + EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + + +IDD_LOCALEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS installasjon" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Systemets språk og region burde samsvare med språket på programmene "\ + "du vil bruke. Instillingene for språk og region kontrollerer hvordan tall, "\ + "valutaer, og dato vises.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "<locale text>", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "For å forandre systemets språk og region instilling, Trykk på Tilpass.", + IDC_STATIC, 53, 60, 184, 8 + PUSHBUTTON "&Tilpass...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "Tastatur oppsettet kontrollerer karakterene som kommer opp når du trykker.", + IDC_STATIC, 53, 86, 253, 8 + LTEXT "<layout text>", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "For å forandre tastatur oppsettet, trykk på Tilpass.", + IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "T&ilpass...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 +END + + +IDD_DATETIMEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS installasjon" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Dato og Tid", IDC_STATIC, 53, 7, 253, 8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Tidssone", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "Juster klokken automatisk for &sommertid", + IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + + +IDD_PROCESSPAGE DIALOG 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS installasjon" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 +END + + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Fullfører ReactOS installasjonen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Fullfører ReactOS installasjon Veiviser", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Installasjonen av ReactOS er fullført.\n\n" \ + "Når du trykker på fullfør, vil datamaskinen bli restartet.", IDC_STATIC, 115, 40, 195, 100 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 + LTEXT "Fjern en eventuell CD-ROM fra stasjonen. Klikk Fullfør "\ + "for å starte datamaskinen på nytt.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_GPL DIALOG 0, 0, 333, 230 +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GNU General Public License" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | + ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,141,209,50,14 +END + + +STRINGTABLE +BEGIN + IDS_ACKTITLE "Annerkjennelser" + IDS_ACKSUBTITLE "Skuldrene ReactOS står på og lisens informasjon" + IDS_OWNERTITLE "Personaliserer Dine Programmer" + IDS_OWNERSUBTITLE "Installasjonen bruker denne informasjonen om deg selv til og personalisere ReactOS." + IDS_COMPUTERTITLE "Datamaskin navn og Administrator passord" + IDS_COMPUTERSUBTITLE "Du må anngi et Navn og et Administrator Passord for din datamaskin." + IDS_LOCALETITLE "Regionale instillinger" + IDS_LOCALESUBTITLE "Du kan stille inn ReactOS for andre regioner og språk." + IDS_DATETIMETITLE "Dato og Tid" + IDS_DATETIMESUBTITLE "Still inn dato og tid for din datamaskin." + IDS_PROCESSTITLE "Bearbeid side tittel" + IDS_PROCESSSUBTITLE "Bearbeider side undertittel" +END + +STRINGTABLE +BEGIN + IDS_CMT_WINEFILE "Start Winefile" + IDS_CMT_IBROWSER "Start iBrowser" + IDS_CMT_GETFIREFOX "Last Ned/Installer Firefox" +END + +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Tilbehør" + IDS_CMT_CALC "Start Kalkulator" + IDS_CMT_CMD "Åpne command prompt" + IDS_CMT_EXPLORER "Start Explorer" + IDS_CMT_NOTEPAD "Start Tekst Editor" + IDS_CMT_REGEDIT "Start Register Editor" + IDS_CMT_WORDPAD "Start Dokument Editor" + IDS_CMT_SCREENSHOT "Ta Skjermbilde" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Spill" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "ReactOS installasjon" + IDS_UNKNOWN_ERROR "Ukjent Feil" + IDS_REGISTERING_COMPONENTS "Registrerer Komponenter..." + IDS_LOADLIBRARY_FAILED "LoadLibrary Feilet: " + IDS_GETPROCADDR_FAILED "GetProcAddr Feilet: " + IDS_REGSVR_FAILED "DllRegisterServer Feilet: " + IDS_DLLINSTALL_FAILED "DllInstall Feilet: " + IDS_TIMEOUT "Avbrudd i løpet av registrering" + IDS_REASON_UNKNOWN "" +END + +/* EOF */ Propchange: trunk/reactos/dll/win32/syssetup/syssetup_No.rc ------------------------------------------------------------------------------ svn:eol-style = native
18 years, 5 months
1
0
0
0
[greatlrd] 23096: patch from Apal : Bug#: 1630 : Greek Translation files for explorer
by greatlrd@svn.reactos.org
Author: greatlrd Date: Mon Jul 17 04:04:45 2006 New Revision: 23096 URL:
http://svn.reactos.org/svn/reactos?rev=23096&view=rev
Log: patch from Apal : Bug#: 1630 : Greek Translation files for explorer Added: trunk/reactos/base/shell/explorer/explorer-gr.rc (with props) Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc Added: trunk/reactos/base/shell/explorer/explorer-gr.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
============================================================================== --- trunk/reactos/base/shell/explorer/explorer-gr.rc (added) +++ trunk/reactos/base/shell/explorer/explorer-gr.rc Mon Jul 17 04:04:45 2006 @@ -1,0 +1,401 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_GRE) +#ifdef _WIN32 +LANGUAGE LANG_GREEK, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_MDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Áñ÷åßï" + BEGIN + MENUITEM "&ÅêôÝëåóç...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "¸&îïäïò", ID_FILE_EXIT + END + POPUP "&ÅìöÜíéóç" + BEGIN + MENUITEM "&ñáììÞ åñãáëåßùí", ID_VIEW_TOOL_BAR + MENUITEM "&ÅðéðëÝïí ãñáììÞ", ID_VIEW_EXTRA_BAR + MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR + MENUITEM "&ÃñáììÞ êáôáóôáóçò", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&ÁíáíÝùóç\tF5", ID_REFRESH + MENUITEM "Ð&ëÞñçò Ïèüíç\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI + END + POPUP "&ÐáñÜèõñï" + BEGIN + MENUITEM "ÍÝï &ÐáñÜèõñï", ID_WINDOW_NEW + MENUITEM "Cascading\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ + MENUITEM "Tile &Vertically\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT + MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE + END + POPUP "&Åñãáëåßá" + BEGIN + MENUITEM "&ÅðéëïãÝò", ID_TOOLS_OPTIONS + END + POPUP "&ÂïÞèåéá" + BEGIN + MENUITEM "Åîåñåýíçóç &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Ó÷åôêÜ ìå ôçí Åîåñåýíçóç...", ID_ABOUT_EXPLORER + MENUITEM "Ó÷åôéêÜ ìå ôï &OS...", ID_ABOUT_WINDOWS + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Ñõèìßóåéò...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Task Manager...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&Ó÷åôêÜ ìå ôçí Åîåñåýíçóç...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Open Volume Control", ID_TRAY_VOLUME + MENUITEM "Adjust Audio Properties", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&ÅìöÜíéóç êñõììÝíí åéêïíéäßùí", ID_SHOW_HIDDEN_ICONS + MENUITEM "Show Icon &Button", ID_SHOW_ICON_BUTTON + MENUITEM "&Configure Notifications...", ID_CONFIG_NOTIFYAREA + MENUITEM "Ñýèìéóç Çìåñïìçíßáò/&¿ñáò...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&Ó÷åôêÜ ìå ôçí Åîåñåýíçóç", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Áñ÷åßï" + BEGIN + MENUITEM "&ÅêôÝëåóç...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "&Êëåßóéìï", ID_FILE_EXIT + END + POPUP "&ÅìöÜíéóç" + BEGIN + MENUITEM "&ñáììÞ åñãáëåßùí", ID_VIEW_TOOL_BAR + MENUITEM "&ÅðéðëÝïí ãñáììÞ", ID_VIEW_EXTRA_BAR + MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR + MENUITEM "&ÃñáììÞ êáôáóôáóçò", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&ÁíáíÝùóç\tF5", ID_REFRESH + MENUITEM "Ð&ëÞñçò Ïèüíç\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "MDI", ID_VIEW_MDI + END + POPUP "&Tools" + BEGIN + MENUITEM "&Options", ID_TOOLS_OPTIONS + END + POPUP "&Help" + BEGIN + MENUITEM "Åîåñåýíçóç &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Ó÷åôéêÜìå ôçí Åîåñåýíçóç...", ID_ABOUT_EXPLORER + MENUITEM "Ó÷åôéêÜ ìå ôï &OS...", ID_ABOUT_WINDOWS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÅêôÝëåóç" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 + CONTROL "&Command:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + 45,71,12 + DEFPUSHBUTTON "&OK",1,158,6,47,14 + PUSHBUTTON "&Áêýñùóç",2,158,23,47,14 + PUSHBUTTON "&ÂïÞèåéá",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "ÁíáæÞôçóç ðñïãñÜììáôïò ôï ìåíïý 'Ýíáñîç'" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Ößëôñï:",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&Check Entries",IDC_CHECK_ENTRIES,143,7,50,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Éäéüôçôåò åðéöÜíåéáò åñãáóßáò" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Please select your prefered icon alignment algorithm:", + IDC_STATIC,7,7,166,8 + CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "Display &Version Number",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Taskbar Properties" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "show &clock",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,52,10 + CONTROL "&hide inactive notification icons", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,111,10 + PUSHBUTTON "&Notifications...",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Éäéüôçôåò ìåíïý 'Ýíáñîç'" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Configure Notification Icons" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Tooltip Text:",IDC_LABEL1,7,44,40,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL + LTEXT "W&indow Title:",IDC_LABEL2,7,63,44,8 + EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL + LTEXT "&Module Path:",IDC_LABEL3,7,81,43,8 + EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL + GROUPBOX "&Display Mode",IDC_LABEL4,7,96,157,28 + CONTROL "&show",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,33,10 + CONTROL "&hide",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + 108,29,10 + CONTROL "a&utohide",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,43,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "&Last Change:",IDC_LABEL6,7,132,43,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "sho&w hidden",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Cancel",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Choose Explorer window mode" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "Please select your prefered explorer user interface:", + IDC_STATIC,7,7,160,8 + CONTROL "&MDI (Multiple Document Interface)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 + CONTROL "&SDI (Single Document Interface)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,62,118,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 + CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "Open Subfolders in s&eparate windows", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,135,10 + LTEXT "This setting will be used as default for all explorer windows in the future.", + IDC_STATIC,7,111,174,22 + DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&Cancel",IDCANCEL,106,136,50,14 +END + +IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ó÷åôéêÜìå ôçí Åîåñåýíçóç ôïõ ReactOS" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Åîåñåýíçóç ReactOS",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "
http://www.sky.franken.de/explorer/
",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "ReactOS Explorer" + IDS_START "Ýíáñîç" + IDS_LOGOFF "Áðïóýíäåóç..." + IDS_SHUTDOWN "Ôåñìáôéóìüò..." + IDS_LAUNCH "ÅêôÝëåóç..." + IDS_START_HELP "ÂïÞèåéá" + IDS_SEARCH_FILES "ÁíáæÞôçóç..." + IDS_DOCUMENTS "Ôá ÝããñáöÜ ìïõ" + IDS_FAVORITES "ÁãáðçìÝíá" + IDS_PROGRAMS "ÐñïãñÜììáôá" + IDS_SETTINGS "Ñõèìßóåéò" + IDS_EXPLORE "Åîåñåýíçóç" + IDS_EMPTY "(¢äåéï)" + IDS_RECENT "Ðñüóöáôá Ýããñáöá" + IDS_ADMIN "Äéá÷åßñéóç" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Startmenu" + IDS_MINIMIZE_ALL "Åëá÷éóôïðïßçóç üëùí ôùí ðáñáèõñùí" + IDS_DESKTOP_NUM "ÅðéöÜíåéá åñãáóßáò %d" + IDS_VOLUME "´¸íôáóç Þ÷ïõ" + IDS_ITEMS_CUR "current items" + IDS_ITEMS_CONFIGURED "configuration" + IDS_ITEMS_VISIBLE "ïñáôü" + IDS_ITEMS_HIDDEN "êñõììÝíï" + IDS_NOTIFY_SHOW "åìöÜíéóç" + IDS_NOTIFY_HIDE "áðüêñõøç" + IDS_NOTIFY_AUTOHIDE "autohide" + IDS_SHOW_HIDDEN_ICONS "ÅìöÜùéóç êñõììÝíùí åéêïíéäßùí" + IDS_HIDE_ICONS "Áðüêñõøç åéêïíéäßùí" + IDS_TERMINATE "Ôåñìáôéóìüò ôçò Åîåñåýíçóçò ôïõ ROS" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORK "Äßêôõï" + IDS_CONNECTIONS "ÓõíäÝóåéò Äêôýïõ" + IDS_DRIVES "Drives" + IDS_SEARCH_COMPUTER "ÁíáæÞôçóç ÕðïëïãéóôÞ..." + IDS_SETTINGS_MENU "Settings Menu" + IDS_CONTROL_PANEL "ÊÝíôñï ÅëÝã÷ïõ" + IDS_PRINTERS "ÅêôõðùôÝò" + IDS_BROWSE "Browse Files" + IDS_SEARCH_PRG "ÁíáæÞôçóç ÐñïãñÜììáôïò..." + IDS_ALL_USERS "All Users\\" + IDS_SEARCH "ÁíáæÞôçóç" + IDS_ABOUT_EXPLORER "&Ó÷åôéêÜ ìå ôçí Åîåñåýíçóç..." + IDS_LAUNCH_MANY_PROGRAMS + "¸÷åôå åðéëÝîåé ðáñáðÜíù ôïõ åíüò ðñïãñÜììáôá.\nÅßóôå óßãïõñïé üôé èÝëåôå íá åêôåëåóôïýí üëá;" + IDS_DESKTOPBAR_SETTINGS "Ñõèìßóåéò ÅðéöÜíåéáò Åñãáóßáò" + IDS_DESKTOP "ÅðéöÜíåéá Åñãáóßáò" + IDS_TASKBAR "Taskbar" +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/reactos/base/shell/explorer/explorer-gr.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
============================================================================== --- trunk/reactos/base/shell/explorer/explorer_intres.rc (original) +++ trunk/reactos/base/shell/explorer/explorer_intres.rc Mon Jul 17 04:04:45 2006 @@ -218,6 +218,7 @@ #include "explorer-uk.rc" #include "explorer-it.rc" #include "explorer-nl.rc" +#include "explorer-gr.rc" #ifndef __WINDRES__ #include "explorer-cn.rc"
18 years, 5 months
1
0
0
0
[greatlrd] 23095: more code, from alex patch I got over one year ago, thanks alex for all help and for all code he wrote. and sorry for the mess at moment in the file. it will be pretty large update to this file, for the patch have been lying on my harddisk for some time. + remove dead code same time, almost whole alex big patch are in. + clean up need + Gdientry2 need some bugfix, but lest we got one now. + vbe drv framebuf interface need some more dx hal api before it functions.
by greatlrd@svn.reactos.org
Author: greatlrd Date: Mon Jul 17 03:32:57 2006 New Revision: 23095 URL:
http://svn.reactos.org/svn/reactos?rev=23095&view=rev
Log: more code, from alex patch I got over one year ago, thanks alex for all help and for all code he wrote. and sorry for the mess at moment in the file. it will be pretty large update to this file, for the patch have been lying on my harddisk for some time. + remove dead code same time, almost whole alex big patch are in. + clean up need + Gdientry2 need some bugfix, but lest we got one now. + vbe drv framebuf interface need some more dx hal api before it functions. Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien…
============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Mon Jul 17 03:32:57 2006 @@ -95,7 +95,7 @@ (PDD_FLIPDATA)Flip); } -WORD +DWORD WINAPI DdLock(LPDDHAL_LOCKDATA Lock) { @@ -327,6 +327,8 @@ } /* PRIVATE FUNCTIONS *********************************************************/ +static ULONG RemberDdQueryDisplaySettingsUniquenessID = 0; + BOOL WINAPI bDDCreateSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface, @@ -438,24 +440,13 @@ return Return; } - - - -static LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobalInternal; -static ULONG RemberDdQueryDisplaySettingsUniquenessID = 0; - +/* + * @implemented + * + * GDIEntry 2 + */ BOOL -intDDCreateSurface ( LPDDRAWI_DDRAWSURFACE_LCL pSurface, - BOOL bComplete); - - - - -/* - * @unimplemented - */ -BOOL -STDCALL +WINAPI DdQueryDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, LPDDHALINFO pHalInfo, LPDDHAL_DDCALLBACKS pDDCallbacks, @@ -467,36 +458,324 @@ LPDDSURFACEDESC pD3dTextureFormats, LPDWORD pdwFourCC, LPVIDMEM pvmList) -{ - BOOL bStatus = FALSE; - DD_HALINFO DDHalInfo; - LPVOID pCallBackFlags[3]; - DWORD NumHeaps; - DWORD NumFourCC; - - DDHalInfo.dwSize = sizeof(DD_HALINFO); - - pCallBackFlags[0] = pDDCallbacks; - pCallBackFlags[1] = pDDSurfaceCallbacks; - pCallBackFlags[2] = pDDPaletteCallbacks; - - bStatus = NtGdiDdQueryDirectDrawObject( - (HANDLE)pDirectDrawGlobal->hDD, - (DD_HALINFO *)&DDHalInfo, - (DWORD *)pCallBackFlags, - (LPD3DNTHAL_CALLBACKS)pD3dCallbacks, - (LPD3DNTHAL_GLOBALDRIVERDATA)pD3dDriverData, - (PDD_D3DBUFCALLBACKS)pD3dBufferCallbacks, - (LPDDSURFACEDESC)pD3dTextureFormats, - (DWORD *)&NumHeaps, - (VIDEOMEMORY *)pvmList, - (DWORD *)&NumFourCC, - (DWORD *)pdwFourCC); - - - //SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return bStatus; -} + { + PVIDEOMEMORY VidMemList = NULL; + DD_HALINFO HalInfo; + D3DNTHAL_CALLBACKS D3dCallbacks; + D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; + DD_D3DBUFCALLBACKS D3dBufferCallbacks; + DWORD CallbackFlags[3]; + DWORD dwNumHeaps=0, FourCCs; + DWORD Flags; + + /* Check if we got a list pointer */ + if (pvmList) + { + /* Allocate memory for it */ + VidMemList = LocalAlloc(LMEM_ZEROINIT, + sizeof(VIDEOMEMORY) * + pHalInfo->vmiData.dwNumHeaps); + } + + /* Clear the structures */ + RtlZeroMemory(&HalInfo, sizeof(DD_HALINFO)); + RtlZeroMemory(&D3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)); + RtlZeroMemory(&D3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + RtlZeroMemory(&D3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)); + + //* Do the query */ + if (!NtGdiDdQueryDirectDrawObject(GetDdHandle(pDirectDrawGlobal->hDD), + &HalInfo, + CallbackFlags, + &D3dCallbacks, + &D3dDriverData, + &D3dBufferCallbacks, + pD3dTextureFormats, + &dwNumHeaps, + VidMemList, + &FourCCs, + pdwFourCC)) + { + /* We failed, free the memory and return */ + if (VidMemList) LocalFree(VidMemList); + return FALSE; + } + + /* Clear the incoming pointer */ + RtlZeroMemory(pHalInfo, sizeof(DDHALINFO)); + + /* Convert all the data */ + pHalInfo->dwSize = sizeof(DDHALINFO); + pHalInfo->lpDDCallbacks = pDDCallbacks; + pHalInfo->lpDDSurfaceCallbacks = pDDSurfaceCallbacks; + pHalInfo->lpDDPaletteCallbacks = pDDPaletteCallbacks; + + /* Check for NT5+ D3D Data */ + if (D3dCallbacks.dwSize && D3dDriverData.dwSize) + { + /* Write these down */ + pHalInfo->lpD3DGlobalDriverData = (ULONG_PTR)pD3dDriverData; + pHalInfo->lpD3DHALCallbacks = (ULONG_PTR)pD3dCallbacks; + + /* Check for Buffer Callbacks */ + if (D3dBufferCallbacks.dwSize) + { + /* Write this one too */ + pHalInfo->lpDDExeBufCallbacks = pD3dBufferCallbacks; + } + } + + /* Continue converting the rest */ + pHalInfo->vmiData.dwFlags = HalInfo.vmiData.dwFlags; + pHalInfo->vmiData.dwDisplayWidth = HalInfo.vmiData.dwDisplayWidth; + pHalInfo->vmiData.dwDisplayHeight = HalInfo.vmiData.dwDisplayHeight; + pHalInfo->vmiData.lDisplayPitch = HalInfo.vmiData.lDisplayPitch; + pHalInfo->vmiData.fpPrimary = 0; + pHalInfo->vmiData.ddpfDisplay = HalInfo.vmiData.ddpfDisplay; + pHalInfo->vmiData.dwOffscreenAlign = HalInfo.vmiData.dwOffscreenAlign; + pHalInfo->vmiData.dwOverlayAlign = HalInfo.vmiData.dwOverlayAlign; + pHalInfo->vmiData.dwTextureAlign = HalInfo.vmiData.dwTextureAlign; + pHalInfo->vmiData.dwZBufferAlign = HalInfo.vmiData.dwZBufferAlign; + pHalInfo->vmiData.dwAlphaAlign = HalInfo.vmiData.dwAlphaAlign; + pHalInfo->vmiData.dwNumHeaps = dwNumHeaps; + pHalInfo->vmiData.pvmList = pvmList; + // pHalInfo->ddCaps = HalInfo.ddCaps; + // pHalInfo->ddCaps.dwNumFourCCCodes = FourCCs; + pHalInfo->lpdwFourCC = pdwFourCC; + pHalInfo->ddCaps.dwRops[6] = 0x1000; + pHalInfo->dwFlags = HalInfo.dwFlags | DDHALINFO_GETDRIVERINFOSET; + // pHalInfo->GetDriverInfo = DdGetDriverInfo; + + /* Now check if we got any DD callbacks */ + if (pDDCallbacks) + { + /* Zero the structure */ + RtlZeroMemory(pDDCallbacks, sizeof(DDHAL_DDCALLBACKS)); + + /* Set the flags for this structure */ + Flags = CallbackFlags[0]; + + /* Write the header */ + pDDCallbacks->dwSize = sizeof(DDHAL_DDCALLBACKS); + pDDCallbacks->dwFlags = Flags; + + /* Now write the pointers, if applicable */ + if (Flags & DDHAL_CB32_CREATESURFACE) + { + pDDCallbacks->CreateSurface = DdCreateSurface; + } + if (Flags & DDHAL_CB32_WAITFORVERTICALBLANK) + { + pDDCallbacks->WaitForVerticalBlank = DdWaitForVerticalBlank; + } + if (Flags & DDHAL_CB32_CANCREATESURFACE) + { + pDDCallbacks->CanCreateSurface = DdCanCreateSurface; + } + if (Flags & DDHAL_CB32_GETSCANLINE) + { + pDDCallbacks->GetScanLine = DdGetScanLine; + } + } + + /* Check for DD Surface Callbacks */ + if (pDDSurfaceCallbacks) + { + /* Zero the structures */ + RtlZeroMemory(pDDSurfaceCallbacks, sizeof(DDHAL_DDSURFACECALLBACKS)); + + /* Set the flags for this one */ + Flags = CallbackFlags[1]; + + + /* Write the header, note that some functions are always exposed */ + pDDSurfaceCallbacks->dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); + + pDDSurfaceCallbacks->dwFlags = Flags; + /* + pDDSurfaceCallBacks->dwFlags = (DDHAL_SURFCB32_LOCK | + DDHAL_SURFCB32_UNLOCK | + DDHAL_SURFCB32_SETCOLORKEY | + DDHAL_SURFCB32_DESTROYSURFACE) | Flags; + */ + + /* Write the always-on functions */ + pDDSurfaceCallbacks->Lock = DdLock; + pDDSurfaceCallbacks->Unlock = DdUnlock; + pDDSurfaceCallbacks->SetColorKey = DdSetColorKey; + pDDSurfaceCallbacks->DestroySurface = DdDestroySurface; + + /* Write the optional ones */ + if (Flags & DDHAL_SURFCB32_FLIP) + { + pDDSurfaceCallbacks->Flip = DdFlip; + } + if (Flags & DDHAL_SURFCB32_BLT) + { + pDDSurfaceCallbacks->Blt = DdBlt; + } + if (Flags & DDHAL_SURFCB32_GETBLTSTATUS) + { + pDDSurfaceCallbacks->GetBltStatus = DdGetBltStatus; + } + if (Flags & DDHAL_SURFCB32_GETFLIPSTATUS) + { + pDDSurfaceCallbacks->GetFlipStatus = DdGetFlipStatus; + } + if (Flags & DDHAL_SURFCB32_UPDATEOVERLAY) + { + pDDSurfaceCallbacks->UpdateOverlay = DdUpdateOverlay; + } + if (Flags & DDHAL_SURFCB32_SETOVERLAYPOSITION) + { + pDDSurfaceCallbacks->SetOverlayPosition = DdSetOverlayPosition; + } + if (Flags & DDHAL_SURFCB32_ADDATTACHEDSURFACE) + { + pDDSurfaceCallbacks->AddAttachedSurface = DdAddAttachedSurface; + } + } + + /* Check for DD Palette Callbacks */ + if (pDDPaletteCallbacks) + { + /* Zero the struct */ + RtlZeroMemory(pDDPaletteCallbacks, sizeof(DDHAL_DDPALETTECALLBACKS)); + + /* Get the flags for this one */ + Flags = CallbackFlags[2]; + + /* Write the header */ + pDDPaletteCallbacks->dwSize = sizeof(DDHAL_DDPALETTECALLBACKS); + pDDPaletteCallbacks->dwFlags = Flags; + } + + /* Check for D3D Callbacks */ + if (pD3dCallbacks) + { + /* Zero the struct */ + RtlZeroMemory(pD3dCallbacks, sizeof(D3DHAL_CALLBACKS)); + + /* Check if we have one */ + if (D3dCallbacks.dwSize) + { + /* Write the header */ + pD3dCallbacks->dwSize = sizeof(D3DHAL_CALLBACKS); + + /* Now check for each callback */ + if (D3dCallbacks.ContextCreate) + { + /* FIXME + pD3dCallbacks->ContextCreate = D3dContextCreate; + */ + } + if (D3dCallbacks.ContextDestroy) + { + pD3dCallbacks->ContextDestroy = (LPD3DHAL_CONTEXTDESTROYCB) NtGdiD3dContextDestroy; + } + if (D3dCallbacks.ContextDestroyAll) + { + /* FIXME + pD3dCallbacks->ContextDestroyAll = (LPD3DHAL_CONTEXTDESTROYALLCB) NtGdiD3dContextDestroyAll; + */ + } + } + } + + /* Check for D3D Driver Data */ + if (pD3dDriverData) + { + /* Copy the struct */ + RtlMoveMemory(pD3dDriverData, + &D3dDriverData, + sizeof(D3DHAL_GLOBALDRIVERDATA)); + + /* Write the pointer to the texture formats */ + pD3dDriverData->lpTextureFormats = pD3dTextureFormats; + } + + /* FIXME: Check for D3D Buffer Callbacks */ + + /* Check if we have a video memory list */ + if (VidMemList) + { + /* Start a loop here */ + PVIDEOMEMORY VidMem = VidMemList; + + /* Loop all the heaps we have */ + while (dwNumHeaps--) + { + /* Copy from one format to the other */ + pvmList->dwFlags = VidMem->dwFlags; + pvmList->fpStart = VidMem->fpStart; + pvmList->fpEnd = VidMem->fpEnd; + pvmList->ddsCaps = VidMem->ddsCaps; + pvmList->ddsCapsAlt = VidMem->ddsCapsAlt; + pvmList->dwHeight = VidMem->dwHeight; + + /* Advance in both structures */ + pvmList++; + VidMem++; + } + + /* Free our structure */ + LocalFree(VidMemList); + } + + + return TRUE; +} + +/* + * @implemented + * + * GDIEntry 3 + */ +BOOL +WINAPI +DdDeleteDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal) +{ + BOOL Return = FALSE; + + /* If this is the global object */ + if(pDirectDrawGlobal->hDD) + { + /* Free it */ + Return = NtGdiDdDeleteDirectDrawObject((HANDLE)pDirectDrawGlobal->hDD); + } + else if (ghDirectDraw) + { + /* Always success here */ + Return = TRUE; + + /* Make sure this is the last instance */ + if (!(--gcDirectDraw)) + { + /* Delete the object */ + Return = NtGdiDdDeleteDirectDrawObject(ghDirectDraw); + ghDirectDraw = 0; + } + } + + /* Return */ + return Return; +} + +/* + * @implemented + * + * GDIEntry 4 + */ +BOOL +WINAPI +DdCreateSurfaceObject( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + BOOL bPrimarySurface) +{ + return bDDCreateSurface(pSurfaceLocal, TRUE); + //return bDdCreateSurfaceObject(pSurfaceLocal, TRUE); +} + + /* * @unimplemented @@ -517,50 +796,6 @@ /* * @implemented * - * GDIEntry 3 - */ -BOOL -STDCALL -DdDeleteDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal) -{ - BOOL status; - /* if pDirectDrawGlobal->hDD == NULL and pDirectDrawGlobalInternal->hDD == NULL - return false */ - - if (!pDirectDrawGlobal->hDD) - { - if (!pDirectDrawGlobalInternal->hDD) - { - return FALSE; - } - return NtGdiDdDeleteDirectDrawObject((HANDLE)pDirectDrawGlobalInternal->hDD); - } - - status = NtGdiDdDeleteDirectDrawObject((HANDLE)pDirectDrawGlobal->hDD); - if ((status == TRUE) && (pDirectDrawGlobalInternal->hDD != 0)) - { - pDirectDrawGlobalInternal->hDD = 0; - } - - return status; -} - -/* - * @implemented - * - * GDIEntry 4 - */ -BOOL -STDCALL -DdCreateSurfaceObject( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, - BOOL bPrimarySurface) -{ - return intDDCreateSurface(pSurfaceLocal,1); -} - -/* - * @implemented - * * GDIEntry 5 */ BOOL @@ -621,20 +856,13 @@ * GDIEntry 10 */ BOOL -STDCALL +WINAPI DdReenableDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, BOOL *pbNewMode) { - if (!pDirectDrawGlobal->hDD) - { - if (!pDirectDrawGlobalInternal->hDD) - { - return FALSE; - } - return NtGdiDdReenableDirectDrawObject((HANDLE)pDirectDrawGlobalInternal->hDD, pbNewMode); - } - - return NtGdiDdReenableDirectDrawObject((HANDLE)pDirectDrawGlobal->hDD, pbNewMode); + /* Call win32k directly */ + return NtGdiDdReenableDirectDrawObject(GetDdHandle(pDirectDrawGlobal->hDD), + pbNewMode); } /* @@ -647,26 +875,27 @@ DdAttachSurface( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom, LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo) { - - /* Create Surface if it does not exits one */ - if (pSurfaceFrom->hDDSurface) - { - if (!intDDCreateSurface(pSurfaceFrom,FALSE)) - { - return FALSE; - } - } - - /* Create Surface if it does not exits one */ - if (pSurfaceTo->hDDSurface) - { - if (!intDDCreateSurface(pSurfaceTo,FALSE)) - { - return FALSE; - } - } - - return NtGdiDdAttachSurface( (HANDLE) pSurfaceFrom->hDDSurface, (HANDLE) pSurfaceTo->hDDSurface); + /* Create Surface if it does not exits one */ + if (pSurfaceFrom->hDDSurface) + { + if (!bDDCreateSurface(pSurfaceFrom, FALSE)) + { + return FALSE; + } + } + + /* Create Surface if it does not exits one */ + if (pSurfaceTo->hDDSurface) + { + if (!bDDCreateSurface(pSurfaceTo, FALSE)) + { + return FALSE; + } + } + + /* Call win32k */ + return NtGdiDdAttachSurface((HANDLE)pSurfaceFrom->hDDSurface, + (HANDLE)pSurfaceTo->hDDSurface); } /* @@ -700,27 +929,24 @@ * GDIEntry 14 */ HANDLE -STDCALL +WINAPI DdGetDxHandle(LPDDRAWI_DIRECTDRAW_LCL pDDraw, LPDDRAWI_DDRAWSURFACE_LCL pSurface, BOOL bRelease) { - if (pSurface) - { - return ((HANDLE) NtGdiDdGetDxHandle(NULL, (HANDLE)pSurface->hDDSurface, bRelease)); - } - - - if (!pDDraw->lpGbl->hDD) - { - if (!pDirectDrawGlobalInternal->hDD) - { - return FALSE; + HANDLE hDD = NULL; + HANDLE hSurface = (HANDLE)pSurface->hDDSurface; + + /* Check if we already have a surface */ + if (!pSurface) + { + /* We don't have one, use the DirectDraw Object handle instead */ + hSurface = NULL; + hDD = GetDdHandle(pDDraw->lpGbl->hDD); } - return ((HANDLE) NtGdiDdGetDxHandle( (HANDLE) pDirectDrawGlobalInternal->hDD, (HANDLE) pSurface->hDDSurface, bRelease)); - } - - return ((HANDLE) NtGdiDdGetDxHandle((HANDLE)pDDraw->lpGbl->hDD, (HANDLE) pSurface->hDDSurface, bRelease)); + + /* Call the API */ + return (HANDLE)NtGdiDdGetDxHandle(hDD, hSurface, bRelease); } /* @@ -728,22 +954,16 @@ * * GDIEntry 15 */ -BOOL STDCALL DdSetGammaRamp( -LPDDRAWI_DIRECTDRAW_LCL pDDraw, -HDC hdc, -LPVOID lpGammaRamp -) -{ - if (!pDDraw->lpGbl->hDD) - { - if (!pDirectDrawGlobalInternal->hDD) - { - return FALSE; - } - return NtGdiDdSetGammaRamp((HANDLE)pDirectDrawGlobalInternal->hDD,hdc,lpGammaRamp); - } - - return NtGdiDdSetGammaRamp((HANDLE)pDDraw->lpGbl->hDD,hdc,lpGammaRamp); +BOOL +WINAPI +DdSetGammaRamp(LPDDRAWI_DIRECTDRAW_LCL pDDraw, + HDC hdc, + LPVOID lpGammaRamp) +{ + /* Call win32k directly */ + return NtGdiDdSetGammaRamp(GetDdHandle(pDDraw->lpGbl->hDD), + hdc, + lpGammaRamp); } /* @@ -761,67 +981,4 @@ } -/* interal create surface */ -BOOL -intDDCreateSurface ( LPDDRAWI_DDRAWSURFACE_LCL pSurface, - BOOL bComplete) -{ - DD_SURFACE_LOCAL SurfaceLocal; - DD_SURFACE_GLOBAL SurfaceGlobal; - DD_SURFACE_MORE SurfaceMore; - - /* Zero struct */ - RtlZeroMemory(&SurfaceLocal, sizeof(DD_SURFACE_LOCAL)); - RtlZeroMemory(&SurfaceGlobal, sizeof(DD_SURFACE_GLOBAL)); - RtlZeroMemory(&SurfaceMore, sizeof(DD_SURFACE_MORE)); - - /* Set up SurfaceLocal struct */ - SurfaceLocal.ddsCaps.dwCaps = pSurface->ddsCaps.dwCaps; - SurfaceLocal.dwFlags = pSurface->dwFlags; - - /* Set up SurfaceMore struct */ - /* copy pSurface->ddckCKDestBlt and pSurface->ddckCKSrcBlt to SurfaceMore.ddsCapsEx */ - memcpy(&SurfaceMore.ddsCapsEx, &pSurface->ddckCKDestBlt, sizeof(DDSCAPSEX)); - SurfaceMore.dwSurfaceHandle = (DWORD) pSurface->dbnOverlayNode.object_int->lpVtbl; - - - /* Set up SurfaceGlobal struct */ - SurfaceGlobal.fpVidMem = pSurface->lpGbl->fpVidMem; - SurfaceGlobal.dwLinearSize = pSurface->lpGbl->dwLinearSize; - SurfaceGlobal.wHeight = pSurface->lpGbl->wHeight; - SurfaceGlobal.wWidth = pSurface->lpGbl->wWidth; - - /* check which memory type should be use */ - if ((pSurface->dwFlags & DDRAWISURFGBL_LOCKVRAMSTYLE) == DDRAWISURFGBL_LOCKVRAMSTYLE) - { - memcpy(&SurfaceGlobal.ddpfSurface,&pSurface->lpGbl->lpDD->vmiData.ddpfDisplay, sizeof(DDPIXELFORMAT)); - } - else - { - memcpy(&SurfaceGlobal.ddpfSurface,&pSurface->lpGbl->ddpfSurface, sizeof(DDPIXELFORMAT)); - } - - /* Determer if Gdi32 chace of directdraw handler or not */ - if (pSurface->lpGbl->lpDD->hDD) - { - pSurface->hDDSurface = ((DWORD) NtGdiDdCreateSurfaceObject( (HANDLE) pSurface->lpGbl->lpDD->hDD, - (HANDLE) pSurface->hDDSurface, &SurfaceLocal, - &SurfaceMore, &SurfaceGlobal, bComplete)); - } - else - { - pSurface->hDDSurface = ((DWORD) NtGdiDdCreateSurfaceObject( (HANDLE) pDirectDrawGlobalInternal->hDD, - (HANDLE) pSurface->hDDSurface, &SurfaceLocal, - &SurfaceMore, - &SurfaceGlobal, - bComplete)); - } - - /* return status */ - if (pSurface->hDDSurface) - { - return TRUE; - } - - return FALSE; -} +
18 years, 5 months
1
0
0
0
[fireball] 23094: - Fix "ret 0" to "ret 4" in a fastcall function taking 3 parameters. - Fix some prototypes in comments, so they correspond to reality
by fireball@svn.reactos.org
Author: fireball Date: Mon Jul 17 01:40:11 2006 New Revision: 23094 URL:
http://svn.reactos.org/svn/reactos?rev=23094&view=rev
Log: - Fix "ret 0" to "ret 4" in a fastcall function taking 3 parameters. - Fix some prototypes in comments, so they correspond to reality Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/fastinter…
============================================================================== --- trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S (original) +++ trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S Mon Jul 17 01:40:11 2006 @@ -150,7 +150,7 @@ #endif /*PLIST_ENTRY - *NTAPI + *FASTCALL *ExfInterlockedInsertTailList(IN PLIST_ENTRY ListHead, * IN PLIST_ENTRY ListEntry, * IN PKSPIN_LOCK Lock) @@ -270,7 +270,7 @@ /*PSINGLE_LIST_ENTRY *FASTCALL *ExfInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead, - * IN PKSPIN_LOCK Lock) + * IN PKSPIN_LOCK Lock) */ .global @ExfInterlockedPopEntryList@8 @ExfInterlockedPopEntryList@8: @@ -320,7 +320,7 @@ #endif /*PSINGLE_LIST_ENTRY - *NTAPI + *FASTCALL *ExfInterlockedPushEntryList(IN PSINGLE_LIST_ENTRY ListHead, * IN PSINGLE_LIST_ENTRY ListEntry, * IN PKSPIN_LOCK Lock) @@ -375,7 +375,7 @@ #endif /*PSINGLE_LIST_ENTRY - *NTAPI + *FASTCALL *ExInterlockedPopEntrySList(IN PSINGLE_LIST_ENTRY ListHead, * IN PKSPIN_LOCK Lock) */ @@ -415,7 +415,7 @@ ret /*PSINGLE_LIST_ENTRY - *NTAPI + *FASTCALL *ExInterlockedPushEntrySList(IN PSINGLE_LIST_ENTRY ListHead, * IN PSINGLE_LIST_ENTRY ListEntry, * IN PKSPIN_LOCK Lock) @@ -459,7 +459,7 @@ ret /*PSINGLE_LIST_ENTRY - *NTAPI + *FASTCALL *ExInterlockedFlushSList(IN PSINGLE_LIST_ENTRY ListHead) */ .global @ExInterlockedFlushSList@4 @@ -682,7 +682,7 @@ /*** Non-586 functions ***/ /*PSINGLE_LIST_ENTRY - *NTAPI + *FASTCALL *ExfInterlockedPopEntrySList(IN PSINGLE_LIST_ENTRY ListHead, * IN PKSPIN_LOCK Lock) */ @@ -729,10 +729,10 @@ #endif /*PSINGLE_LIST_ENTRY - *NTAPI - *ExInterlockedPushEntrySList(IN PSINGLE_LIST_ENTRY ListHead, - * IN PSINGLE_LIST_ENTRY ListEntry, - * IN PKSPIN_LOCK Lock) + *FASTCALL + *ExfInterlockedPushEntrySList(IN PSINGLE_LIST_ENTRY ListHead, + * IN PSINGLE_LIST_ENTRY ListEntry, + * IN PKSPIN_LOCK Lock) */ .global @ExfInterlockedPushEntrySList@12 @ExfInterlockedPushEntrySList@12: @@ -767,7 +767,7 @@ /* Restore flags and return */ popfd - ret 0 + ret 4 #ifdef CONFIG_SMP .spinb:
18 years, 5 months
1
0
0
0
[hpoussin] 23093: Implement NtQueryDirectoryObject, based on code which was deleted in revision 20004
by hpoussin@svn.reactos.org
Author: hpoussin Date: Mon Jul 17 01:15:16 2006 New Revision: 23093 URL:
http://svn.reactos.org/svn/reactos?rev=23093&view=rev
Log: Implement NtQueryDirectoryObject, based on code which was deleted in revision 20004 Modified: trunk/reactos/ntoskrnl/ob/obdir.c Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=23…
============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c Mon Jul 17 01:15:16 2006 @@ -411,6 +411,8 @@ POBJECT_DIRECTORY Directory; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); ULONG SkipEntries = 0; + ULONG NextEntry = 0; + ULONG CopyBytes = 0; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); @@ -454,8 +456,196 @@ NULL); if (NT_SUCCESS(Status)) { - /* FIXME: TODO. UNIMPLEMENTED */ - Status = STATUS_INSUFFICIENT_RESOURCES; + PVOID TemporaryBuffer = ExAllocatePool(NonPagedPool, + BufferLength); + if(TemporaryBuffer != NULL) + { + POBJECT_HEADER EntryHeader; + ULONG RequiredSize = sizeof(OBJECT_DIRECTORY_INFORMATION); + ULONG nDirectories = 0; + POBJECT_DIRECTORY_INFORMATION DirInfo = (POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer; + POBJECT_DIRECTORY_ENTRY DirectoryEntry; + ULONG i; + BOOLEAN StopIt = FALSE; + + Status = STATUS_NO_MORE_ENTRIES; + + KeEnterCriticalRegion(); + ExAcquireResourceSharedLite(&Directory->Lock, TRUE); + + for (i = 0; i < NUMBER_HASH_BUCKETS && !StopIt; i++) + { + DirectoryEntry = Directory->HashBuckets[i]; + while (DirectoryEntry) + { + NextEntry++; + if (SkipEntries == 0) + { + PUNICODE_STRING Name, Type; + ULONG EntrySize; + + EntryHeader = OBJECT_TO_OBJECT_HEADER(DirectoryEntry->Object); + + /* Calculate the size of the required buffer space for this entry */ + Name = (OBJECT_HEADER_TO_NAME_INFO(EntryHeader)->Name.Length != 0 ? &OBJECT_HEADER_TO_NAME_INFO(EntryHeader)->Name : NULL); + Type = &EntryHeader->Type->Name; + EntrySize = sizeof(OBJECT_DIRECTORY_INFORMATION) + + ((Name != NULL) ? ((ULONG)Name->Length + sizeof(WCHAR)) : 0) + + (ULONG)EntryHeader->Type->Name.Length + sizeof(WCHAR); + + if (RequiredSize + EntrySize <= BufferLength) + { + /* The buffer is large enough to receive this entry. It would've + been much easier if the strings were directly appended to the + OBJECT_DIRECTORY_INFORMATION structured written into the buffer */ + if (Name != NULL && Name->Length > 0) + DirInfo->ObjectName = *Name; + else + { + DirInfo->ObjectName.Length = DirInfo->ObjectName.MaximumLength = 0; + DirInfo->ObjectName.Buffer = NULL; + } + DirInfo->ObjectTypeName = *Type; + + nDirectories++; + RequiredSize += EntrySize; + + Status = STATUS_SUCCESS; + + if (ReturnSingleEntry) + { + /* We're only supposed to query one entry, so bail and copy the + strings to the buffer */ + StopIt = TRUE; + break; + } + DirInfo++; + } + else + { + if (ReturnSingleEntry) + { + /* The buffer is too small, so return the number of bytes that + would've been required for this query */ + RequiredSize += EntrySize; + Status = STATUS_BUFFER_TOO_SMALL; + } + + /* We couldn't query this entry, so leave the index that will be stored + in Context to this entry so the caller can query it the next time + he queries (hopefully with a buffer that is large enough then...) */ + NextEntry--; + + /* Just copy the entries that fit into the buffer */ + StopIt = TRUE; + break; + } + } + else + { + /* Skip the entry */ + SkipEntries--; + } + DirectoryEntry = DirectoryEntry->ChainLink; + } + } + + if (!ReturnSingleEntry) + { + /* Check if there are more entries to enumerate but the buffer is already + full. Only tell this to the user if he queries multiple entries */ + if (DirectoryEntry) + Status = STATUS_MORE_ENTRIES; + else + for (; i < NUMBER_HASH_BUCKETS; i++) + if (Directory->HashBuckets[i]) + { + Status = STATUS_MORE_ENTRIES; + break; + } + } + + if (NT_SUCCESS(Status) && nDirectories > 0) + { + PWSTR strbuf = (PWSTR)((POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer + nDirectories + 1); + PWSTR deststrbuf = (PWSTR)((POBJECT_DIRECTORY_INFORMATION)Buffer + nDirectories + 1); + memset((POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer + nDirectories, 0, sizeof(OBJECT_DIRECTORY_INFORMATION)); + + CopyBytes = (nDirectories + 1) * sizeof(OBJECT_DIRECTORY_INFORMATION); + + /* Copy the names from the objects and append them to the list of the + objects. copy to the temporary buffer only because the directory + lock can't be released and the buffer might be pagable memory! */ + for (DirInfo = (POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer; + nDirectories > 0; + nDirectories--, DirInfo++) + { + ULONG NameLength; + + if (DirInfo->ObjectName.Length > 0) + { + RtlCopyMemory(strbuf, + DirInfo->ObjectName.Buffer, + DirInfo->ObjectName.Length); + /* Change the buffer pointer to the buffer */ + DirInfo->ObjectName.Buffer = deststrbuf; + NameLength = DirInfo->ObjectName.Length / sizeof(WCHAR); + /* NULL-terminate the string */ + strbuf[NameLength] = L'\0'; + strbuf += NameLength + 1; + deststrbuf += NameLength + 1; + + CopyBytes += (NameLength + 1) * sizeof(WCHAR); + } + + RtlCopyMemory(strbuf, + DirInfo->ObjectTypeName.Buffer, + DirInfo->ObjectTypeName.Length); + /* Change the buffer pointer to the buffer */ + DirInfo->ObjectTypeName.Buffer = deststrbuf; + NameLength = DirInfo->ObjectTypeName.Length / sizeof(WCHAR); + /* NULL-terminate the string */ + strbuf[NameLength] = L'\0'; + strbuf += NameLength + 1; + deststrbuf += NameLength + 1; + + CopyBytes += (NameLength + 1) * sizeof(WCHAR); + } + } + + ExReleaseResourceLite(&Directory->Lock); + KeLeaveCriticalRegion(); + ObDereferenceObject(Directory); + + if (NT_SUCCESS(Status) || ReturnSingleEntry) + { + _SEH_TRY + { + if (CopyBytes != 0) + { + RtlCopyMemory(Buffer, + TemporaryBuffer, + CopyBytes); + } + *Context = NextEntry; + if(ReturnLength != NULL) + { + *ReturnLength = RequiredSize; + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + ExFreePool(TemporaryBuffer); + } + else + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } } /* Return status to caller */
18 years, 5 months
1
0
0
0
[greatlrd] 23092: more code, from alex patch I got over one year ago, thanks alex for all help and for all code he wrote. and sorry for the mess at moment in the file. it will be pretty large update to this file, for the patch have been lying on my harddisk for some time. 1. Cleanup GdiEntry1 and optimze it by alex
by greatlrd@svn.reactos.org
Author: greatlrd Date: Mon Jul 17 01:10:13 2006 New Revision: 23092 URL:
http://svn.reactos.org/svn/reactos?rev=23092&view=rev
Log: more code, from alex patch I got over one year ago, thanks alex for all help and for all code he wrote. and sorry for the mess at moment in the file. it will be pretty large update to this file, for the patch have been lying on my harddisk for some time. 1. Cleanup GdiEntry1 and optimze it by alex Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien…
============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Mon Jul 17 01:10:13 2006 @@ -308,6 +308,138 @@ return Return; } +DWORD +APIENTRY +DdSetColorKey(LPDDHAL_SETCOLORKEYDATA pSetColorKey) +{ + /* Call win32k */ + return NtGdiDdSetColorKey((HANDLE)pSetColorKey->lpDDSurface->hDDSurface, + (PDD_SETCOLORKEYDATA)pSetColorKey); +} + +DWORD +APIENTRY +DdGetScanLine(LPDDHAL_GETSCANLINEDATA pGetScanLine) +{ + /* Call win32k */ + return NtGdiDdGetScanLine(GetDdHandle(pGetScanLine->lpDD->hDD), + (PDD_GETSCANLINEDATA)pGetScanLine); +} + +/* PRIVATE FUNCTIONS *********************************************************/ +BOOL +WINAPI +bDDCreateSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface, + BOOL bComplete) +{ + DD_SURFACE_LOCAL SurfaceLocal; + DD_SURFACE_GLOBAL SurfaceGlobal; + DD_SURFACE_MORE SurfaceMore; + + /* Zero struct */ + RtlZeroMemory(&SurfaceLocal, sizeof(DD_SURFACE_LOCAL)); + RtlZeroMemory(&SurfaceGlobal, sizeof(DD_SURFACE_GLOBAL)); + RtlZeroMemory(&SurfaceMore, sizeof(DD_SURFACE_MORE)); + + /* Set up SurfaceLocal struct */ + SurfaceLocal.ddsCaps.dwCaps = pSurface->ddsCaps.dwCaps; + SurfaceLocal.dwFlags = pSurface->dwFlags; + + /* Set up SurfaceMore struct */ + RtlMoveMemory(&SurfaceMore.ddsCapsEx, + &pSurface->ddckCKDestBlt, + sizeof(DDSCAPSEX)); + SurfaceMore.dwSurfaceHandle = (DWORD)pSurface->dbnOverlayNode.object_int->lpVtbl; + + /* Set up SurfaceGlobal struct */ + SurfaceGlobal.fpVidMem = pSurface->lpGbl->fpVidMem; + SurfaceGlobal.dwLinearSize = pSurface->lpGbl->dwLinearSize; + SurfaceGlobal.wHeight = pSurface->lpGbl->wHeight; + SurfaceGlobal.wWidth = pSurface->lpGbl->wWidth; + + /* Check if we have a pixel format */ + if (pSurface->dwFlags & DDSD_PIXELFORMAT) + { + /* Use global one */ + SurfaceGlobal.ddpfSurface = pSurface->lpGbl->lpDD->vmiData.ddpfDisplay; + SurfaceGlobal.ddpfSurface.dwSize = sizeof(DDPIXELFORMAT); + } + else + { + /* Use local one */ + SurfaceGlobal.ddpfSurface = pSurface->lpGbl->lpDD->vmiData.ddpfDisplay; + } + + /* Create the object */ + pSurface->hDDSurface = (DWORD)NtGdiDdCreateSurfaceObject(GetDdHandle(pSurface->lpGbl->lpDD->hDD), + (HANDLE)pSurface->hDDSurface, + &SurfaceLocal, + &SurfaceMore, + &SurfaceGlobal, + bComplete); + + /* Return status */ + if (pSurface->hDDSurface) return TRUE; + return FALSE; +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + * + * GDIEntry 1 + */ +BOOL +WINAPI +DdCreateDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, + HDC hdc) +{ + BOOL Return = FALSE; + + /* Check if the global hDC (hdc == 0) is being used */ + if (!hdc) + { + /* We'll only allow this if the global object doesn't exist yet */ + if (!ghDirectDraw) + { + /* Create the DC */ + if ((hdc = CreateDC(L"Display", NULL, NULL, NULL))) + { + /* Create the DDraw Object */ + ghDirectDraw = NtGdiDdCreateDirectDrawObject(hdc); + + /* Delete our DC */ + NtGdiDeleteObjectApp(hdc); + } + } + + /* If we created the object, or had one ...*/ + if (ghDirectDraw) + { + /* Increase count and set success */ + gcDirectDraw++; + Return = TRUE; + } + + /* Zero the handle */ + pDirectDrawGlobal->hDD = 0; + } + else + { + /* Using the per-process object, so create it */ + pDirectDrawGlobal->hDD = (ULONG_PTR)NtGdiDdCreateDirectDrawObject(hdc); + + /* Set the return value */ + Return = pDirectDrawGlobal->hDD ? TRUE : FALSE; + } + + /* Return to caller */ + return Return; +} + + + static LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobalInternal; static ULONG RemberDdQueryDisplaySettingsUniquenessID = 0; @@ -316,65 +448,8 @@ intDDCreateSurface ( LPDDRAWI_DDRAWSURFACE_LCL pSurface, BOOL bComplete); -/* - * @implemented - * - * GDIEntry 1 - */ -BOOL -STDCALL -DdCreateDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, - HDC hdc) -{ - HDC newHdc; - /* check see if HDC is NULL or not - if it null we need create the DC */ - - if (hdc != NULL) - { - pDirectDrawGlobal->hDD = (ULONG_PTR)NtGdiDdCreateDirectDrawObject(hdc); - - /* if hDD ==NULL */ - if (!pDirectDrawGlobal->hDD) - { - return FALSE; - } - return TRUE; - } - - /* The hdc was not null we need check see if we alread - have create a directdraw handler */ - - /* if hDD !=NULL */ - if (pDirectDrawGlobalInternal->hDD) - { - /* we have create a directdraw handler already */ - - pDirectDrawGlobal->hDD = pDirectDrawGlobalInternal->hDD; - return TRUE; - } - - /* Now we create the DC */ - newHdc = CreateDC(L"DISPLAY\0", NULL, NULL, NULL); - - /* we are checking if we got a hdc or not */ - if ((ULONG_PTR)newHdc != pDirectDrawGlobalInternal->hDD) - { - pDirectDrawGlobalInternal->hDD = (ULONG_PTR) NtGdiDdCreateDirectDrawObject(newHdc); - NtGdiDeleteObjectApp(newHdc); - } - - /* pDirectDrawGlobal->hDD = pDirectDrawGlobalInternal->hDD; ? */ - pDirectDrawGlobal->hDD = 0; /* ? */ - - /* test see if we got a handler */ - if (!pDirectDrawGlobalInternal->hDD) - { - return FALSE; - } - - return TRUE; -} + + /* * @unimplemented
18 years, 5 months
1
0
0
0
[greatlrd] 23091: more code, from alex patch I got over one year ago, thanks alex for all help and for all code he wrote. and sorry for the mess at moment in the file. it will be pretty large update to this file, for the patch have been lying on my harddisk for some time.
by greatlrd@svn.reactos.org
Author: greatlrd Date: Mon Jul 17 00:35:25 2006 New Revision: 23091 URL:
http://svn.reactos.org/svn/reactos?rev=23091&view=rev
Log: more code, from alex patch I got over one year ago, thanks alex for all help and for all code he wrote. and sorry for the mess at moment in the file. it will be pretty large update to this file, for the patch have been lying on my harddisk for some time. Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien…
============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Mon Jul 17 00:35:25 2006 @@ -14,13 +14,14 @@ #include <ddrawi.h> #include <ddrawint.h> #include <ddrawgdi.h> +#include <ntgdi.h> /* DATA **********************************************************************/ HANDLE ghDirectDraw; ULONG gcDirectDraw; -#define GetDdHandle(Handle) (Handle ? Handle : ghDirectDraw) +#define GetDdHandle(Handle) ((HANDLE)Handle ? (HANDLE)Handle : ghDirectDraw) /* CALLBACKS *****************************************************************/ @@ -104,7 +105,208 @@ (HANDLE)Lock->lpDDSurface->hDC); } - +DWORD +WINAPI +DdUnlock(LPDDHAL_UNLOCKDATA Unlock) +{ + /* Call win32k */ + return NtGdiDdUnlock((HANDLE)Unlock->lpDDSurface->hDDSurface, + (PDD_UNLOCKDATA)Unlock); +} + +DWORD +WINAPI +DdGetBltStatus(LPDDHAL_GETBLTSTATUSDATA GetBltStatus) +{ + /* Call win32k */ + return NtGdiDdGetBltStatus((HANDLE)GetBltStatus->lpDDSurface->hDDSurface, + (PDD_GETBLTSTATUSDATA)GetBltStatus); +} + +DWORD +WINAPI +DdGetFlipStatus(LPDDHAL_GETFLIPSTATUSDATA GetFlipStatus) +{ + /* Call win32k */ + return NtGdiDdGetFlipStatus((HANDLE)GetFlipStatus->lpDDSurface->hDDSurface, + (PDD_GETFLIPSTATUSDATA)GetFlipStatus); +} + +DWORD +APIENTRY +DdUpdateOverlay(LPDDHAL_UPDATEOVERLAYDATA UpdateOverlay) +{ + /* We have to handle this manually here */ + if (UpdateOverlay->dwFlags & DDOVER_KEYDEST) + { + /* Use the override */ + UpdateOverlay->dwFlags &= ~DDOVER_KEYDEST; + UpdateOverlay->dwFlags |= DDOVER_KEYDESTOVERRIDE; + + /* Set the overlay */ + UpdateOverlay->overlayFX.dckDestColorkey = + UpdateOverlay->lpDDDestSurface->ddckCKDestOverlay; + } + if (UpdateOverlay->dwFlags & DDOVER_KEYSRC) + { + /* Use the override */ + UpdateOverlay->dwFlags &= ~DDOVER_KEYSRC; + UpdateOverlay->dwFlags |= DDOVER_KEYSRCOVERRIDE; + + /* Set the overlay */ + UpdateOverlay->overlayFX.dckSrcColorkey = + UpdateOverlay->lpDDSrcSurface->ddckCKSrcOverlay; + } + + /* Call win32k */ + return NtGdiDdUpdateOverlay((HANDLE)UpdateOverlay->lpDDDestSurface->hDDSurface, + (HANDLE)UpdateOverlay->lpDDSrcSurface->hDDSurface, + (PDD_UPDATEOVERLAYDATA)UpdateOverlay); +} + +DWORD +APIENTRY +DdSetOverlayPosition(LPDDHAL_SETOVERLAYPOSITIONDATA SetOverlayPosition) +{ + /* Call win32k */ + return NtGdiDdSetOverlayPosition((HANDLE)SetOverlayPosition-> + lpDDSrcSurface->hDDSurface, + (HANDLE)SetOverlayPosition-> + lpDDDestSurface->hDDSurface, + (PDD_SETOVERLAYPOSITIONDATA) + SetOverlayPosition); +} + +/* + * Dd Callbacks + */ +DWORD +WINAPI +DdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA WaitForVerticalBlank) +{ + /* Call win32k */ + return NtGdiDdWaitForVerticalBlank(GetDdHandle( + WaitForVerticalBlank->lpDD->hDD), + (PDD_WAITFORVERTICALBLANKDATA) + WaitForVerticalBlank); +} + +DWORD +WINAPI +DdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA CanCreateSurface) +{ + /* Call win32k */ + return NtGdiDdCanCreateSurface(GetDdHandle(CanCreateSurface->lpDD->hDD), + (PDD_CANCREATESURFACEDATA)CanCreateSurface); +} + +DWORD +APIENTRY +DdCreateSurface(LPDDHAL_CREATESURFACEDATA pCreateSurface) +{ + DWORD Return = DDHAL_DRIVER_NOTHANDLED; + ULONG SurfaceCount = pCreateSurface->dwSCnt; + DD_SURFACE_LOCAL DdSurfaceLocal; + DD_SURFACE_MORE DdSurfaceMore; + DD_SURFACE_GLOBAL DdSurfaceGlobal; + HANDLE hPrevSurface, hSurface; + DD_SURFACE_LOCAL* pDdSurfaceLocal; + DD_SURFACE_MORE* pDdSurfaceMore; + DD_SURFACE_GLOBAL* pDdSurfaceGlobal; + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal; + //LPDDRAWI_DDRAWSURFACE_MORE pSurfaceMore; + LPDDRAWI_DDRAWSURFACE_GBL pSurfaceGlobal; + PHANDLE phSurface = NULL, puhSurface = NULL; + ULONG i; + LPDDSURFACEDESC pSurfaceDesc; + + /* Check how many surfaces there are */ + if (SurfaceCount != 1) + { + /* We'll have to allocate more data, our stack isn't big enough */ + + } + else + { + /* We'll use what we have on the stack */ + pDdSurfaceLocal = &DdSurfaceLocal; + pDdSurfaceMore = &DdSurfaceMore; + pDdSurfaceGlobal = &DdSurfaceGlobal; + phSurface = &hPrevSurface; + puhSurface = &hSurface; + + /* Clear the structures */ + RtlZeroMemory(&DdSurfaceLocal, sizeof(DdSurfaceLocal)); + RtlZeroMemory(&DdSurfaceGlobal, sizeof(DdSurfaceGlobal)); + RtlZeroMemory(&DdSurfaceMore, sizeof(DdSurfaceMore)); + } + + /* Loop for each surface */ + for (i = 0; i < pCreateSurface->dwSCnt; i++) + { + /* Get data */ + pSurfaceLocal = pCreateSurface->lplpSList[i]; + pSurfaceGlobal = pSurfaceLocal->lpGbl; + pSurfaceDesc = pCreateSurface->lpDDSurfaceDesc; + + /* Check if it has pixel data */ + if (pSurfaceDesc->dwFlags & DDRAWISURF_HASPIXELFORMAT) + { + /* Use its pixel data */ + DdSurfaceGlobal.ddpfSurface = pSurfaceDesc->ddpfPixelFormat; + DdSurfaceGlobal.ddpfSurface.dwSize = sizeof(DDPIXELFORMAT); + } + else + { + /* Use the one from the global surface */ + DdSurfaceGlobal.ddpfSurface = pSurfaceGlobal->lpDD->vmiData.ddpfDisplay; + } + + /* Convert data */ + DdSurfaceGlobal.wWidth = pSurfaceGlobal->wWidth; + DdSurfaceGlobal.wHeight = pSurfaceGlobal->wHeight; + DdSurfaceGlobal.lPitch = pSurfaceGlobal->lPitch; + DdSurfaceGlobal.fpVidMem = pSurfaceGlobal->fpVidMem; + DdSurfaceGlobal.dwBlockSizeX = pSurfaceGlobal->dwBlockSizeX; + DdSurfaceGlobal.dwBlockSizeY = pSurfaceGlobal->dwBlockSizeY; + // DdSurfaceGlobal.ddsCaps = pSurfaceLocal->ddsCaps | 0xBF0000; + + /* FIXME: Ddscapsex stuff missing */ + + /* Call win32k now */ + pCreateSurface->ddRVal = E_FAIL; + + Return = NtGdiDdCreateSurface(GetDdHandle(pCreateSurface->lpDD->hDD), + (HANDLE *)phSurface, + pSurfaceDesc, + &DdSurfaceGlobal, + &DdSurfaceLocal, + &DdSurfaceMore, + (PDD_CREATESURFACEDATA)pCreateSurface, + puhSurface); + + + /* FIXME: Ddscapsex stuff missing */ + + /* Convert the data back */ + pSurfaceGlobal->lPitch = DdSurfaceGlobal.lPitch; + pSurfaceGlobal->fpVidMem = DdSurfaceGlobal.fpVidMem; + pSurfaceGlobal->dwBlockSizeX = DdSurfaceGlobal.dwBlockSizeX; + pSurfaceGlobal->dwBlockSizeY = DdSurfaceGlobal.dwBlockSizeY; + pCreateSurface->lplpSList[i]->hDDSurface = (DWORD) hSurface; + + /* FIXME: Ddscapsex stuff missing */ + } + + /* Check if we have to free all our local allocations */ + if (SurfaceCount > 1) + { + /* FIXME: */ + } + + /* Return */ + return Return; +} static LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobalInternal;
18 years, 5 months
1
0
0
0
[fireball] 23090: Alexey Minnekhanov: Improve monitor.bmp for desk.cpl
by fireball@svn.reactos.org
Author: fireball Date: Mon Jul 17 00:10:48 2006 New Revision: 23090 URL:
http://svn.reactos.org/svn/reactos?rev=23090&view=rev
Log: Alexey Minnekhanov: Improve monitor.bmp for desk.cpl Modified: trunk/reactos/dll/cpl/desk/resources/monitor.bmp Modified: trunk/reactos/dll/cpl/desk/resources/monitor.bmp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resources/mon…
============================================================================== Binary files - no diff available.
18 years, 5 months
1
0
0
0
[fireball] 23089: Slightly improve debug prints in IoInvalidateDeviceRelations()
by fireball@svn.reactos.org
Author: fireball Date: Mon Jul 17 00:05:18 2006 New Revision: 23089 URL:
http://svn.reactos.org/svn/reactos?rev=23089&view=rev
Log: Slightly improve debug prints in IoInvalidateDeviceRelations() Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.…
============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Mon Jul 17 00:05:18 2006 @@ -2314,7 +2314,7 @@ NTSTATUS Status; ULONG i; - DPRINT("DeviceNode 0x%p\n", DeviceNode); + DPRINT("DeviceNode 0x%p, Type %d\n", DeviceNode, Type); DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n"); @@ -2443,6 +2443,7 @@ return Status; } + DPRINT("IopInvalidateDeviceRelations() finished\n"); return STATUS_SUCCESS; }
18 years, 5 months
1
0
0
0
← Newer
1
...
28
29
30
31
32
33
34
...
67
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
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
Results per page:
10
25
50
100
200