Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[greatlrd] 37311: Fix a bug for vista dx. I did have time exam vista for a while now. And it contain the file dxg.sys and it start dx driver almost same way as XP does. and it seam the interface are same.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Nov 12 11:53:54 2008 New Revision: 37311 URL: http://svn.reactos.org/svn/reactos?rev=37311&view=rev Log: Fix a bug for vista dx. I did have time exam vista for a while now. And it contain the file dxg.sys and it start dx driver almost same way as XP does. and it seam the interface are same. Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Wed Nov 12 11:53:54 2008 @@ -132,21 +132,13 @@ * no code have been writen for it yet */ - /* FIXME ReactOS does not loading the dxapi.sys or import functions from it yet */ // DxApiGetVersion() - /* Loading the kernel interface of directx for win32k */ - - DPRINT1("Warning: trying loading vista dxkrnl.sys\n"); - ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxkrnl.sys"); - if ( ghDxGraphics == NULL) - { - DPRINT1("Warning: dxkrnl.sys not found\n"); - /* try loading vista dx kernel */ - DPRINT1("Warning: trying loading xp/2003/reactos dxg.sys\n"); - ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); - } + /* Loading the kernel dxg interface of directx for win32k */ + DPRINT1("Warning: trying loading xp/2003/vista/reactos dxg.sys\n"); + ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); + if ( ghDxGraphics == NULL) {

15 years, 12 months

[dchapyshev] 37310: - Update Russian translation

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Nov 12 11:02:37 2008 New Revision: 37310 URL: http://svn.reactos.org/svn/reactos?rev=37310&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc trunk/reactos/base/applications/mmc/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/system/regsvr32/lang/ru-RU.rc Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] Wed Nov 12 11:02:37 2008 @@ -200,25 +200,25 @@ IDS_DIRECTPLAY_COL_NAME2 "Ðååñòð" IDS_DIRECTPLAY_COL_NAME3 "Ôàéë" IDS_DIRECTPLAY_COL_NAME4 "Âåðñèÿ" - IDS_DIRECTPLAY8_MODEMSP "DirectPlay8-Modem Service Provider" - IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 Serial Service Provider" - IDS_DIRECTPLAY8_IPXSP "DirectPlay8 IPX Service Provider" - IDS_DIRECTPLAY8_TCPSP "DirectPlay8-TCP/IP Service Provider" + IDS_DIRECTPLAY8_MODEMSP "Ïîñòàâùèê ñëóæáû ìîäåìà DirectPlay8" + IDS_DIRECTPLAY8_SERIALSP "Ïîñòàâùèê ñëóæáû ïîñë. ïîðòà DirectPlay8" + IDS_DIRECTPLAY8_IPXSP "Ïîñòàâùèê ñëóæáû IPX DirectPlay8" + IDS_DIRECTPLAY8_TCPSP "Ïîñòàâùèê ñëóæáû TCP/IP DirectPlay8" IDS_DIRECTPLAY_TCPCONN "Èíòåðíåò-ïîäêëþ÷åíèå TCP/IP äëÿ DirectPlay" IDS_DIRECTPLAY_IPXCONN "IPX ïîäêëþ÷åíèå äëÿ DirectPlay" - IDS_DIRECTPLAY_MODEMCONN "Modem Connection For DirectPlay" - IDS_DIRECTPLAY_SERIALCONN "Serial Connection For DirectPlay" + IDS_DIRECTPLAY_MODEMCONN "Ïîäêëþ÷åíèå ÷åðåç ìîäåì äëÿ DirectPlay" + IDS_DIRECTPLAY_SERIALCONN "Ïîñëåäîâàòåëüíîå ïîäêëþ÷åíèå äëÿ DirectPlay" IDS_REG_SUCCESS "OK" IDS_REG_FAIL "Îøèáêà" IDS_DDTEST_ERROR "Ñáîé â ïðîâåðêå!" IDS_DDTEST_DESCRIPTION "Áóäåò ïðîèçâåäåíà ïðîâåðêà DirecDraw íà ýòîì óñòðîéñòâå. Ïðîäîëæèòü?" - IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary surface. Black and white rectangles should be drawn. Continue?" - IDS_DDPRIMARY_RESULT "Did you see black and white rectangles?" - IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen buffer. Moving white rectangle should be drawn. Continue?" - IDS_DDOFFSCREEN_RESULT "Did you see white moving reactangle?" - IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Continue?" - IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen mode?" + IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary surface. Black and white rectangles should be drawn. Ïðîäîëæèòü?" + IDS_DDPRIMARY_RESULT "Âû âèäåëè ÷åðíûå è áåëûå ïðÿìîóãîëüíèêè?" + IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen buffer. Moving white rectangle should be drawn. Ïðîäîëæèòü?" + IDS_DDOFFSCREEN_RESULT "Âû âèäåëè ïåðåìåùàþùèéñÿ áåëûé ïðÿìîóãîëüíèê?" + IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Ïðîäîëæèòü?" + IDS_DDFULLSCREEN_RESULT "Âû âèäåëè áåëûé ïåðåìåøàþùèéñÿ ïðÿìîóãîëüíèê â ïîëíîýêðàííîì ðåæèìå?" IDS_FORMAT_ADAPTER_MEM "%u Ìá" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uÃö)" - IDS_OPTION_NO "No" -END + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u áèò)(%uÃö)" + IDS_OPTION_NO "Íåò" +END Modified: trunk/reactos/base/applications/mmc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/ru-RU.rc [iso-8859-1] Wed Nov 12 11:02:37 2008 @@ -12,7 +12,7 @@ POPUP "&Ñïðàâêà" BEGIN - MENUITEM "&Î Êîíñîëè óïðàâëåíèÿ ReactOS...", ID_HELP_ABOUT + MENUITEM "&Î ïðîãðàììå...", ID_HELP_ABOUT END END Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Wed Nov 12 11:02:37 2008 @@ -77,7 +77,7 @@ CONTROL "Óñòàíîâèòü çàãðóç÷èê íà äèñê (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,49,278,11 CONTROL "Íå óñòàíàâëèâàòü çàãðóç÷èê", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,60,278,11 PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Îòìåíà", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/system/regsvr32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/lang/ru-RU.rc [iso-8859-1] Wed Nov 12 11:02:37 2008 @@ -17,7 +17,7 @@ IDS_SwitchN_NoI, "Íåèçâåñòíûé ïàðàìåòð: /n äîëæåí èñïîëüçîâàòüñÿ ñîâìåñòíî ñ ïàðàìåòðîì /i" -IDS_DllNotLoaded, "LoadLibrary('%s') çàâåðøèëñÿ íåóäà÷åé.\nGetLastError âîçâðàùàåò 0x%08x." +IDS_DllNotLoaded, "Âûçîâ LoadLibrary('%s') çàâåðøèëñÿ íåóäà÷åé.\nÔóíêöèÿ GetLastError âîçâðàòèëà êîä îøèáêè: 0x%08x." IDS_MissingEntry, "%s áûë çàãðóæåí, íî òî÷êà âõîäà %s íå íàéäåíà.\n\n\ %s ìîæåò áûòü íåýêñïîðòèðóåìîé èëè ïîâðåæäåííàÿ âåðñèÿ %s íàõîäèòñÿ â ïàìÿòè. Èñïîëüçóéòå PView, ÷òîáû îáíàðóæèòü è óäàëèòü åãî."

15 years, 12 months

[mkupfer] 37309: - basic install drive listing code (due to lack of reactos functionality not working yet) - add and enable advanced settings dialog - get install directory from txtsetup.sif - set changed install directory - fix dialog resource for several languages

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Wed Nov 12 10:08:28 2008 New Revision: 37309 URL: http://svn.reactos.org/svn/reactos?rev=37309&view=rev Log: - basic install drive listing code (due to lack of reactos functionality not working yet) - add and enable advanced settings dialog - get install directory from txtsetup.sif - set changed install directory - fix dialog resource for several languages Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc trunk/reactos/base/setup/reactos/lang/cs-CZ.rc trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc trunk/reactos/base/setup/reactos/lang/fr-FR.rc trunk/reactos/base/setup/reactos/lang/it-IT.rc trunk/reactos/base/setup/reactos/lang/no-NO.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/reactos/reactos.c trunk/reactos/base/setup/reactos/reactos.rbuild trunk/reactos/base/setup/reactos/resource.h Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/bg… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -76,6 +76,8 @@ CONTROL "Ñëàãàíå íà íà÷àëåí çàðåæäà÷ (MBR) íà òâúðäèÿ äèñê", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Áåç ñëàãàíå íà íà÷àëåí çàðåæäà÷", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/cs… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -78,6 +78,8 @@ CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -76,6 +76,8 @@ CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -76,6 +76,8 @@ CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -79,6 +79,8 @@ CONTROL "Instalar el cargador de arranque en el disco duro (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No instalar el cargador de arranque", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fr… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -74,6 +74,8 @@ CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/it… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -76,6 +76,8 @@ CONTROL "Installazione del Boot loader sul disco fisso (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Non installare il Boot loader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/no… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -76,6 +76,8 @@ CONTROL "Installer oppstartslaster på harddiskens (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Ikke installer oppstartslaster", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -82,6 +82,8 @@ CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -76,6 +76,8 @@ CONTROL "Óñòàíîâèòü çàãðóç÷èê íà äèñê (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,49,278,11 CONTROL "Íå óñòàíàâëèâàòü çàãðóç÷èê", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,60,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -81,6 +81,8 @@ CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -29,6 +29,8 @@ #include <commctrl.h> #include <tchar.h> #include <setupapi.h> +#include <initguid.h> +#include <devguid.h> #include <wine/unicode.h> #include "resource.h" @@ -69,7 +71,7 @@ LONG FormatPart; // type of format the partition LONG SelectedLangId; // selected language (table index) LONG SelectedKBLayout; // selected keyboard layout (table index) - WCHAR InstallationDirectory[MAX_PATH]; // installation directory on hdd + TCHAR InstallDir[MAX_PATH]; // installation directory on hdd LONG SelectedComputer; // selected computer type (table index) LONG SelectedDisplay; // selected display type (table index) LONG SelectedKeyboard; // selected keyboard type (table index) @@ -513,11 +515,46 @@ } static INT_PTR CALLBACK +MoreOptDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + CheckDlgButton(hwndDlg, IDC_INSTFREELDR, BST_CHECKED); + SendMessage(GetDlgItem(hwndDlg, IDC_PATH),WM_SETTEXT, + (WPARAM)0,(LPARAM)SetupData.InstallDir); + break; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + SendMessage(GetDlgItem(hwndDlg, IDC_PATH),WM_GETTEXT, + (WPARAM)sizeof(SetupData.InstallDir)/sizeof(TCHAR),(LPARAM)SetupData.InstallDir); + + EndDialog(hwndDlg, IDOK); + break; + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + break; + } + } + return FALSE; +} + + +static INT_PTR CALLBACK DriveDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + HDEVINFO h; + HWND hList; + SP_DEVINFO_DATA DevInfoData; + DWORD i; switch (uMsg) { case WM_INITDIALOG: @@ -530,15 +567,55 @@ dwStyle = GetWindowLong(hwndControl, GWL_STYLE); SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); - CheckDlgButton(hwndDlg, IDC_INSTFREELDR, BST_CHECKED); /* Set title font */ /*SendDlgItemMessage(hwndDlg, IDC_STARTTITLE, WM_SETFONT, (WPARAM)hTitleFont, (LPARAM)TRUE);*/ -} - break; + h = SetupDiGetClassDevs(&GUID_DEVCLASS_DISKDRIVE, NULL, NULL, + DIGCF_PRESENT); + if (h != INVALID_HANDLE_VALUE) + { + hList =GetDlgItem(hwndDlg, IDC_PARTITION); + DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + for (i=0;SetupDiEnumDeviceInfo(h,i,&DevInfoData);i++) + { + DWORD DataT; + LPTSTR buffer = NULL; + DWORD buffersize = 0; + while (!SetupDiGetDeviceRegistryProperty( + h,&DevInfoData, + SPDRP_DEVICEDESC,&DataT,(PBYTE)buffer, + buffersize,&buffersize)) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + if (buffer) LocalFree(buffer); + buffer = LocalAlloc(LPTR,buffersize * 2); + } else + break; + } + if (buffer) + { + SendMessage(hList,LB_ADDSTRING,(WPARAM)0,(LPARAM)buffer); + LocalFree(buffer); + } + } + SetupDiDestroyDeviceInfoList(h); + } + } + break; + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDC_PARTMOREOPTS: + DialogBox(hInstance,MAKEINTRESOURCE(IDD_BOOTOPTIONS),hwndDlg,MoreOptDlgProc); + break; + } + + } case WM_NOTIFY: { LPNMHDR lpnm = (LPNMHDR)lParam; @@ -601,6 +678,8 @@ { case PSN_SETACTIVE: PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT ); + // disable all buttons during installation process + // PropSheet_SetWizButtons(GetParent(hwndDlg), 0 ); break; default: break; @@ -827,6 +906,14 @@ while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.KeybCount); } } + // get install directory + if (SetupFindFirstLine(hTxtsetupSif, _T("SetupData"), + _T("DefaultPath"),&InfContext)) + { + SetupGetStringField(&InfContext, 1, + SetupData.InstallDir, + sizeof(SetupData.InstallDir) / sizeof(TCHAR), &LineLength); + } SetupCloseInfFile(hTxtsetupSif); } } @@ -859,6 +946,7 @@ (_tcsicmp(szValue, _T("yes"))==0)) { result = 1; // unattendSetup enabled + // read values and store in SetupData } } Modified: trunk/reactos/base/setup/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.rbuild [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -8,6 +8,7 @@ <library>user32</library> <library>comctl32</library> <library>setupapi</library> + <library>uuid</library> <file>reactos.c</file> <file>reactos.rc</file> </module> Modified: trunk/reactos/base/setup/reactos/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc… ============================================================================== --- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -50,6 +50,7 @@ #define IDS_ABORTSETUP2 2039 #define IDC_ACTION 2040 #define IDC_PARTMOREOPTS 2041 +#define IDD_BOOTOPTIONS 2042 #define IDI_MAIN 3000

15 years, 12 months

[tkreuzer] 37308: Implement RtlLookupFunctionTable, RtlLookupFunctionEntry and a usermode/kernelmode version of RtlpLookupModuleBase helper function.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 12 09:24:40 2008 New Revision: 37308 URL: http://svn.reactos.org/svn/reactos?rev=37308&view=rev Log: Implement RtlLookupFunctionTable, RtlLookupFunctionEntry and a usermode/kernelmode version of RtlpLookupModuleBase helper function. Added: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c (with props) Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Wed Nov 12 09:24:40 2008 @@ -14,6 +14,8 @@ #include <debug.h> SIZE_T RtlpAllocDeallocQueryBufferSize = PAGE_SIZE; +#define IMAGE_DOS_MAGIC 0x5a4d +#define IMAGE_PE_MAGIC 0x00004550 /* FUNCTIONS ***************************************************************/ @@ -356,6 +358,62 @@ } return NULL; +} + +PVOID +NTAPI +RtlpLookupModuleBase( + PVOID Address) +{ + NTSTATUS Status; + MEMORY_BASIC_INFORMATION MemoryInformation; + ULONG_PTR Base, Limit; + PIMAGE_DOS_HEADER DosHeader; + PIMAGE_NT_HEADERS NtHeader; + + Status = NtQueryVirtualMemory(NtCurrentProcess(), + Address, + MemoryBasicInformation, + &MemoryInformation, + sizeof(MEMORY_BASIC_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) + { + return NULL; + } + + /* FIXME: remove these checks? */ + Base = (ULONG_PTR)MemoryInformation.BaseAddress; + Limit = Base + MemoryInformation.RegionSize; + if ( ((ULONG_PTR)Address < Base) || + ((ULONG_PTR)Address >= Limit) ) + { + /* WTF? */ + return NULL; + } + + /* Check if we got the right kind of memory */ + if ( (MemoryInformation.State != MEM_COMMIT) || + (MemoryInformation.Type != MEM_IMAGE) ) + { + return NULL; + } + + /* Check DOS magic */ + DosHeader = MemoryInformation.AllocationBase; + if (DosHeader->e_magic != IMAGE_DOS_MAGIC) + { + return NULL; + } + + /* Check NT header */ + NtHeader = (PVOID)((ULONG_PTR)DosHeader + DosHeader->e_lfanew); + if (NtHeader->Signature != IMAGE_PE_MAGIC) + { + return NULL; + } + + return MemoryInformation.AllocationBase; } Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c [iso-8859-1] Wed Nov 12 09:24:40 2008 @@ -13,19 +13,6 @@ #include <debug.h> /* PUBLIC FUNCTIONS **********************************************************/ - -/* - * @unimplemented - */ -PVOID -NTAPI -RtlLookupFunctionEntry(IN ULONGLONG ControlPC, - OUT PULONGLONG ImageBase, - OUT PULONGLONG TargetGp) -{ - UNIMPLEMENTED; - return NULL; -} /* * @unimplemented Added: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c (added) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Wed Nov 12 09:24:40 2008 @@ -1,0 +1,153 @@ +/* COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Exception related functions + * PROGRAMMER: Timo Kreuzer + */ + +/* INCLUDES *****************************************************************/ + +#include <rtl.h> + +#define NDEBUG +#include <debug.h> + +#define UNWIND_HISTORY_TABLE_NONE 0 +#define UNWIND_HISTORY_TABLE_GLOBAL 1 +#define UNWIND_HISTORY_TABLE_LOCAL 2 + +PVOID +NTAPI +RtlpLookupModuleBase( + PVOID Address); + +/* FUNCTIONS *****************************************************************/ + +PRUNTIME_FUNCTION +NTAPI +RtlLookupFunctionTable( + IN DWORD64 ControlPc, + OUT PDWORD64 ImageBase, + OUT PULONG Length) +{ + PIMAGE_DOS_HEADER DosHeader; + PIMAGE_NT_HEADERS NtHeader; + PIMAGE_DATA_DIRECTORY Directory; + + /* Find ModuleBase */ + DosHeader = RtlpLookupModuleBase((PVOID)ControlPc); + if (!DosHeader) + { + return NULL; + } + + /* Locate NT header and check number of directories */ + NtHeader = (PVOID)((ULONG64)DosHeader + DosHeader->e_lfanew); + if (NtHeader->OptionalHeader.NumberOfRvaAndSizes + < IMAGE_DIRECTORY_ENTRY_EXCEPTION) + { + return NULL; + } + + /* Locate the exception directory */ + Directory = &NtHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXCEPTION]; + *Length = Directory->Size / sizeof(RUNTIME_FUNCTION); + *ImageBase = (ULONG64)DosHeader; + if (!Directory->VirtualAddress) + { + return NULL; + } + + return (PVOID)((ULONG64)DosHeader + Directory->VirtualAddress); +} + + +// http://msdn.microsoft.com/en-us/library/ms680597(VS.85).aspx +PRUNTIME_FUNCTION +NTAPI +RtlLookupFunctionEntry( + IN DWORD64 ControlPc, + OUT PDWORD64 ImageBase, + OUT PUNWIND_HISTORY_TABLE HistoryTable) +{ + PRUNTIME_FUNCTION FunctionTable, FunctionEntry; + ULONG TableLength; + ULONG IndexLo, IndexHi, IndexMid; + + /* Find the corresponding table */ + FunctionTable = RtlLookupFunctionTable(ControlPc, + ImageBase, + &TableLength); + + /* Fail, if no table is found */ + if (!FunctionTable) + { + return (PVOID)1; + } + + /* Use relative virtual address */ + ControlPc -= *ImageBase; + + /* Do a binary search */ + IndexLo = 0; + IndexHi = TableLength; + + while (IndexHi > IndexLo) + { + IndexMid = (IndexLo + IndexHi) / 2; + FunctionEntry = &FunctionTable[IndexMid]; + + if ( (ControlPc >= FunctionEntry->BeginAddress) && + (ControlPc < FunctionEntry->EndAddress) ) + { + /* ControlPc is within limits, return entry */ + return FunctionEntry; + } + + if (ControlPc < FunctionEntry->BeginAddress) + { + /* Continue search in lower half */ + IndexHi = IndexMid; + } + else + { + /* Continue search in upper half */ + IndexLo = IndexMid + 1; + } + } + + /* Nothing found, return NULL */ + return NULL; +} + + +PEXCEPTION_ROUTINE +NTAPI +RtlVirtualUnwind( + IN ULONG HandlerType, + IN ULONG64 ImageBase, + IN ULONG64 ControlPc, + IN PRUNTIME_FUNCTION FunctionEntry, + IN OUT PCONTEXT ContextRecord, + OUT PVOID *HandlerData, + OUT PULONG64 EstablisherFrame, + IN OUT PKNONVOLATILE_CONTEXT_POINTERS ContextPointers) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +NTAPI +RtlUnwindEx( + IN ULONG64 TargetFrame, + IN ULONG64 TargetIp, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PVOID ReturnValue, + OUT PCONTEXT OriginalContext, + IN PUNWIND_HISTORY_TABLE HistoryTable) +{ + UNIMPLEMENTED; + return; +} + + Propchange: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c ------------------------------------------------------------------------------ svn:mergeinfo = Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Wed Nov 12 09:24:40 2008 @@ -39,6 +39,7 @@ <if property="ARCH" value="amd64"> <directory name="amd64"> <file>debug_asm.S</file> + <file>unwind.c</file> <file>stubs.c</file> </directory> <file>mem.c</file> Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Wed Nov 12 09:24:40 2008 @@ -68,14 +68,10 @@ STUB(KdpGdbStubInit) STUB(KdbpSafeReadMemory) STUB(RtlFillMemoryUlong) -STUB(RtlCaptureContext) -STUB(RtlpGetExceptionAddress) -STUB(RtlDispatchException) STUB(DbgkDebugObjectType) STUB(KdbEnterDebuggerException) STUB(KdbpCliModuleLoaded) STUB(RtlUnwind) -STUB(RtlInitializeContext) STUB(DbgCommandString) STUB(ExAcquireRundownProtection) STUB(ExAcquireRundownProtectionCacheAware) @@ -180,7 +176,6 @@ STUB(RtlCopyMemory) STUB(RtlCopyMemoryNonTemporal) STUB(RtlFillMemory) -STUB(RtlLookupFunctionEntry) STUB(RtlMoveMemory) STUB(RtlOemStringToUnicodeSize) STUB(RtlPcToFileHeader) @@ -196,8 +191,6 @@ STUB(RtlTraceDatabaseValidate) STUB(RtlUnicodeStringToAnsiSize) STUB(RtlUnicodeStringToOemSize) -STUB(RtlUnwindEx) -STUB(RtlVirtualUnwind) STUB(RtlZeroMemory) STUB(SeReportSecurityEvent) STUB(SeSetAuditParameter) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Wed Nov 12 09:24:40 2008 @@ -1047,6 +1047,18 @@ VOID ); +PVOID +NTAPI +KiPcToFileHeader(IN PVOID Eip, + OUT PLDR_DATA_TABLE_ENTRY *LdrEntry, + IN BOOLEAN DriversOnly, + OUT PBOOLEAN InKernel); + +PVOID +NTAPI +KiRosPcToUserFileHeader(IN PVOID Eip, + OUT PLDR_DATA_TABLE_ENTRY *LdrEntry); + #include "ke_x.h" #endif /* __NTOSKRNL_INCLUDE_INTERNAL_KE_H */ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Wed Nov 12 09:24:40 2008 @@ -27,6 +27,30 @@ SIZE_T RtlpAllocDeallocQueryBufferSize = 128; /* FUNCTIONS *****************************************************************/ + +PVOID +NTAPI +RtlpLookupModuleBase( + PVOID Address) +{ + PLDR_DATA_TABLE_ENTRY LdrEntry; + BOOLEAN InSystem; + PVOID p; + + /* Get the base for this file */ + if ((ULONG_PTR)Address > (ULONG_PTR)MmHighestUserAddress) + { + /* We are in kernel */ + p = KiPcToFileHeader(Address, &LdrEntry, FALSE, &InSystem); + } + else + { + /* We are in user land */ + p = KiRosPcToUserFileHeader(Address, &LdrEntry); + } + + return p; +} VOID NTAPI

15 years, 12 months

[tkreuzer] 37307: Add UNWIND_HISTORY_TABLE_ENTRY and UNWIND_HISTORY_TABLE

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 12 09:23:16 2008 New Revision: 37307 URL: http://svn.reactos.org/svn/reactos?rev=37307&view=rev Log: Add UNWIND_HISTORY_TABLE_ENTRY and UNWIND_HISTORY_TABLE Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] Wed Nov 12 09:23:16 2008 @@ -2301,16 +2301,33 @@ #define RUNTIME_FUNCTION_INDIRECT 0x1 - typedef struct _RUNTIME_FUNCTION { +typedef struct _RUNTIME_FUNCTION { DWORD BeginAddress; DWORD EndAddress; DWORD UnwindData; - } RUNTIME_FUNCTION,*PRUNTIME_FUNCTION; - - typedef PRUNTIME_FUNCTION (*PGET_RUNTIME_FUNCTION_CALLBACK)(DWORD64 ControlPc,PVOID Context); - typedef DWORD (*POUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK)(HANDLE Process,PVOID TableAddress,PDWORD Entries,PRUNTIME_FUNCTION *Functions); - - #define OUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK_EXPORT_NAME "OutOfProcessFunctionTableCallback" +} RUNTIME_FUNCTION,*PRUNTIME_FUNCTION; + +#define UNWIND_HISTORY_TABLE_SIZE 12 + +typedef struct _UNWIND_HISTORY_TABLE_ENTRY +{ + ULONG64 ImageBase; + PRUNTIME_FUNCTION FunctionEntry; +} UNWIND_HISTORY_TABLE_ENTRY, *PUNWIND_HISTORY_TABLE_ENTRY; + +typedef struct _UNWIND_HISTORY_TABLE +{ + ULONG Count; + UCHAR Search; + ULONG64 LowAddress; + ULONG64 HighAddress; + UNWIND_HISTORY_TABLE_ENTRY Entry[UNWIND_HISTORY_TABLE_SIZE]; +} UNWIND_HISTORY_TABLE, *PUNWIND_HISTORY_TABLE; + +typedef PRUNTIME_FUNCTION (*PGET_RUNTIME_FUNCTION_CALLBACK)(DWORD64 ControlPc,PVOID Context); +typedef DWORD (*POUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK)(HANDLE Process,PVOID TableAddress,PDWORD Entries,PRUNTIME_FUNCTION *Functions); + +#define OUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK_EXPORT_NAME "OutOfProcessFunctionTableCallback" NTSYSAPI VOID

15 years, 12 months

[tkreuzer] 37306: Warn if a section doesn't fit into the ImageSize

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 12 08:43:25 2008 New Revision: 37306 URL: http://svn.reactos.org/svn/reactos?rev=37306&view=rev Log: Warn if a section doesn't fit into the ImageSize Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/imageldr.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/imageldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] Wed Nov 12 08:43:25 2008 @@ -543,6 +543,12 @@ Section[i].Misc.VirtualSize); } } + else + { + DbgPrint("Section %s in %s doesn't fit: VA: %lx, Size: %lx\n", + Section[i].Name, Name, Section[i].VirtualAddress, + Section[i].Misc.VirtualSize); + } } /* Calculate Difference between Real Base and Compiled Base*/

15 years, 12 months

[tkreuzer] 37305: Oops, fix SizeOfImage

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 12 08:39:46 2008 New Revision: 37305 URL: http://svn.reactos.org/svn/reactos?rev=37305&view=rev Log: Oops, fix SizeOfImage Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] Wed Nov 12 08:39:46 2008 @@ -517,7 +517,7 @@ File->FileHeader->NumberOfSections = File->UsedSections + 2; // FIXME!!! /* Update SizeOfImage */ - Size = File->xdata.psh->PointerToRawData + Size = File->xdata.psh->VirtualAddress + File->xdata.psh->SizeOfRawData; File->OptionalHeader->SizeOfImage = Size;

15 years, 12 months

[janderwald] 37304: - Fix length check - CID 556/R2

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Nov 12 08:23:36 2008 New Revision: 37304 URL: http://svn.reactos.org/svn/reactos?rev=37304&view=rev Log: - Fix length check - CID 556/R2 Modified: trunk/reactos/base/services/dhcp/dhclient.c Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Wed Nov 12 08:23:36 2008 @@ -1775,7 +1775,7 @@ case ACTION_APPEND: len = ip->client-> config->defaults[i].len + - lease->options[i].len; + lease->options[i].len + 1; if (len > sizeof(dbuf)) { warning("no space to %s %s", "append option",

15 years, 12 months

[dchapyshev] 37303: - Sync uxtheme with wine head

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Nov 12 07:02:29 2008 New Revision: 37303 URL: http://svn.reactos.org/svn/reactos?rev=37303&view=rev Log: - Sync uxtheme with wine head Added: trunk/reactos/dll/win32/uxtheme/buffer.c (with props) Modified: trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/msstyles.c trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/uxini.c trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild trunk/reactos/dll/win32/uxtheme/uxtheme.spec trunk/reactos/include/psdk/uxtheme.h Added: trunk/reactos/dll/win32/uxtheme/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/buffer.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/buffer.c (added) +++ trunk/reactos/dll/win32/uxtheme/buffer.c [iso-8859-1] Wed Nov 12 07:02:29 2008 @@ -1,0 +1,77 @@ +/* + * uxtheme Double-buffered Drawing API + * + * Copyright (C) 2008 Reece H. Dunn + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdlib.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "wingdi.h" +#include "vfwmsgs.h" +#include "uxtheme.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); + +/*********************************************************************** + * BufferedPaintInit (UXTHEME.@) + */ +HRESULT WINAPI BufferedPaintInit(VOID) +{ + FIXME("Stub ()\n"); + return S_OK; +} + +/*********************************************************************** + * BufferedPaintUnInit (UXTHEME.@) + */ +HRESULT WINAPI BufferedPaintUnInit(VOID) +{ + FIXME("Stub ()\n"); + return S_OK; +} + +/*********************************************************************** + * BeginBufferedPaint (UXTHEME.@) + */ +HPAINTBUFFER WINAPI BeginBufferedPaint(HDC hdcTarget, + const RECT * prcTarget, + BP_BUFFERFORMAT dwFormat, + BP_PAINTPARAMS *pPaintParams, + HDC *phdc) +{ + FIXME("Stub (%p %p %d %p %p)\n", hdcTarget, prcTarget, dwFormat, + pPaintParams, phdc); + return NULL; +} + + +/*********************************************************************** + * EndBufferedPaint (UXTHEME.@) + */ +HRESULT WINAPI EndBufferedPaint(HPAINTBUFFER hPaintBuffer, BOOL fUpdateTarget) +{ + FIXME("Stub (%p %d)\n", hPaintBuffer, fUpdateTarget); + return S_OK; +} Propchange: trunk/reactos/dll/win32/uxtheme/buffer.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Wed Nov 12 07:02:29 2008 @@ -52,19 +52,18 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags) { static const WCHAR szTab[] = { 'T','a','b',0 }; - HRESULT hr; + BOOL res; TRACE("(%p,0x%08x\n", hwnd, dwFlags); - hr = SetPropW (hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled), + res = SetPropW (hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled), (HANDLE)(dwFlags|0x80000000)); /* 0x80000000 serves as a "flags set" flag */ - if (FAILED(hr)) - return hr; + if (!res) + return HRESULT_FROM_WIN32(GetLastError()); if (dwFlags & ETDT_USETABTEXTURE) return SetWindowTheme (hwnd, NULL, szTab); else return SetWindowTheme (hwnd, NULL, NULL); - return S_OK; } /*********************************************************************** @@ -1178,8 +1177,8 @@ + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0); /* Init some vars */ - OuterPen = InnerPen = (HPEN)GetStockObject(NULL_PEN); - SavePen = (HPEN)SelectObject(hdc, InnerPen); + OuterPen = InnerPen = GetStockObject(NULL_PEN); + SavePen = SelectObject(hdc, InnerPen); spx = spy = epx = epy = 0; /* Satisfy the compiler... */ /* Determine the colors of the edges */ @@ -1374,8 +1373,8 @@ HPEN hpsave; HPEN hp = get_edge_pen ((uFlags & BF_MONO) ? EDGE_WINDOW : EDGE_FILL, theme, part, state); - hbsave = (HBRUSH)SelectObject(hdc, hb); - hpsave = (HPEN)SelectObject(hdc, hp); + hbsave = SelectObject(hdc, hb); + hpsave = SelectObject(hdc, hp); Polygon(hdc, Points, 4); SelectObject(hdc, hbsave); SelectObject(hdc, hpsave); @@ -1427,8 +1426,8 @@ && !(uFlags & (BF_FLAT|BF_MONO)) ) ? E_FAIL : S_OK; /* Init some vars */ - LTInnerPen = LTOuterPen = RBInnerPen = RBOuterPen = (HPEN)GetStockObject(NULL_PEN); - SavePen = (HPEN)SelectObject(hdc, LTInnerPen); + LTInnerPen = LTOuterPen = RBInnerPen = RBOuterPen = GetStockObject(NULL_PEN); + SavePen = SelectObject(hdc, LTInnerPen); /* Determine the colors of the edges */ if(uFlags & BF_MONO) Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] Wed Nov 12 07:02:29 2008 @@ -132,14 +132,14 @@ hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); goto invalid_theme; } - pszColors = (LPWSTR)LoadResource(hTheme, hrsc); + pszColors = LoadResource(hTheme, hrsc); if(!(hrsc = FindResourceW(hTheme, MAKEINTRESOURCEW(1), szSizeNamesResource))) { TRACE("Size names resource not found\n"); hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); goto invalid_theme; } - pszSizes = (LPWSTR)LoadResource(hTheme, hrsc); + pszSizes = LoadResource(hTheme, hrsc); /* Validate requested color against what's available from the theme */ if(pszColorName) { @@ -298,7 +298,7 @@ TRACE("FILERESNAMES map not found\n"); return NULL; } - tmp = (LPWSTR)LoadResource(tf->hTheme, hrsc); + tmp = LoadResource(tf->hTheme, hrsc); dwResourceIndex = (dwSizeCount * dwColorNum) + dwSizeNum; for(i=0; i < dwResourceIndex; i++) { tmp += lstrlenW(tmp)+1; Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Wed Nov 12 07:02:29 2008 @@ -122,7 +122,7 @@ WCHAR cNull = '\0'; nBytesToAlloc = dwUnExpDataLen; - szData = (LPWSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); + szData = LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); RegQueryValueExW (hKey, lpszValue, 0, NULL, (LPBYTE)szData, &nBytesToAlloc); dwExpDataLen = ExpandEnvironmentStringsW(szData, &cNull, 1); dwUnExpDataLen = max(nBytesToAlloc, dwExpDataLen); @@ -131,7 +131,7 @@ else { nBytesToAlloc = (lstrlenW(pvData) + 1) * sizeof(WCHAR); - szData = (LPWSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc ); + szData = LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc ); lstrcpyW(szData, pvData); dwExpDataLen = ExpandEnvironmentStringsW(szData, pvData, MAX_PATH ); if (dwExpDataLen > MAX_PATH) dwRet = ERROR_MORE_DATA; @@ -566,6 +566,7 @@ BOOL WINAPI IsThemeActive(void) { TRACE("\n"); + SetLastError(ERROR_SUCCESS); return bThemeActive; } Modified: trunk/reactos/dll/win32/uxtheme/uxini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxini.c?… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] Wed Nov 12 07:02:29 2008 @@ -68,7 +68,7 @@ TRACE("Loading resource INI %s\n", debugstr_w(lpName)); if((hrsc = FindResourceW(hTheme, lpName, szTextFileResource))) { - if(!(lpThemesIni = (LPCWSTR)LoadResource(hTheme, hrsc))) { + if(!(lpThemesIni = LoadResource(hTheme, hrsc))) { TRACE("%s resource not found\n", debugstr_w(lpName)); return NULL; } Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxtheme.… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild [iso-8859-1] Wed Nov 12 07:02:29 2008 @@ -6,6 +6,7 @@ <include base="uxtheme">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <file>buffer.c</file> <file>draw.c</file> <file>main.c</file> <file>metric.c</file> Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxtheme.… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] Wed Nov 12 07:02:29 2008 @@ -43,6 +43,9 @@ 63 stub -noname MarkSelection # Standard functions +@ stdcall BeginBufferedPaint(ptr ptr long ptr ptr) +@ stdcall BufferedPaintInit() +@ stdcall BufferedPaintUnInit() @ stdcall CloseThemeData(ptr) @ stdcall DrawThemeBackground(ptr ptr long long ptr ptr) @ stdcall DrawThemeBackgroundEx(ptr ptr long long ptr ptr) @@ -52,6 +55,7 @@ @ stdcall DrawThemeText(ptr ptr long long wstr long long long ptr) @ stdcall EnableThemeDialogTexture(ptr long) @ stdcall EnableTheming(long) +@ stdcall EndBufferedPaint(ptr long) @ stdcall GetCurrentThemeName(wstr long wstr long wstr long) @ stdcall GetThemeAppProperties() @ stdcall GetThemeBackgroundContentRect(ptr ptr long long ptr ptr) Modified: trunk/reactos/include/psdk/uxtheme.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/uxtheme.h?rev… ============================================================================== --- trunk/reactos/include/psdk/uxtheme.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/uxtheme.h [iso-8859-1] Wed Nov 12 07:02:29 2008 @@ -11,60 +11,83 @@ #endif #if (_WIN32_WINNT >= 0x0501) -#define DTBG_CLIPRECT 0x00000001 -#define DTBG_DRAWSOLID 0x00000002 -#define DTBG_OMITBORDER 0x00000004 -#define DTBG_OMITCONTENT 0x00000008 -#define DTBG_COMPUTINGREGION 0x00000010 -#define DTBG_MIRRORDC 0x00000020 -#define DTT_GRAYED 0x00000001 -#define ETDT_DISABLE 0x00000001 -#define ETDT_ENABLE 0x00000002 -#define ETDT_USETABTEXTURE 0x00000004 -#define ETDT_ENABLETAB (ETDT_ENABLE|ETDT_USETABTEXTURE) -#define STAP_ALLOW_NONCLIENT 0x00000001 -#define STAP_ALLOW_CONTROLS 0x00000002 -#define STAP_ALLOW_WEBCONTENT 0x00000004 -#define HTTB_BACKGROUNDSEG 0x0000 -#define HTTB_FIXEDBORDER 0x0002 -#define HTTB_CAPTION 0x0004 -#define HTTB_RESIZINGBORDER_LEFT 0x0010 -#define HTTB_RESIZINGBORDER_TOP 0x0020 -#define HTTB_RESIZINGBORDER_RIGHT 0x0040 -#define HTTB_RESIZINGBORDER_BOTTOM 0x0080 -#define HTTB_RESIZINGBORDER (HTTB_RESIZINGBORDER_LEFT|HTTB_RESIZINGBORDER_TOP|HTTB_RESIZINGBORDER_RIGHT|HTTB_RESIZINGBORDER_BOTTOM) -#define HTTB_SIZINGTEMPLATE 0x0100 -#define HTTB_SYSTEMSIZINGMARGINS 0x0200 +#define DTBG_CLIPRECT 0x00000001 +#define DTBG_DRAWSOLID 0x00000002 +#define DTBG_OMITBORDER 0x00000004 +#define DTBG_OMITCONTENT 0x00000008 +#define DTBG_COMPUTINGREGION 0x00000010 +#define DTBG_MIRRORDC 0x00000020 +#define DTT_GRAYED 0x00000001 +#define ETDT_DISABLE 0x00000001 +#define ETDT_ENABLE 0x00000002 +#define ETDT_USETABTEXTURE 0x00000004 +#define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE) +#define STAP_ALLOW_NONCLIENT 0x00000001 +#define STAP_ALLOW_CONTROLS 0x00000002 +#define STAP_ALLOW_WEBCONTENT 0x00000004 +#define HTTB_BACKGROUNDSEG 0x0000 +#define HTTB_FIXEDBORDER 0x0002 +#define HTTB_CAPTION 0x0004 +#define HTTB_RESIZINGBORDER_LEFT 0x0010 +#define HTTB_RESIZINGBORDER_TOP 0x0020 +#define HTTB_RESIZINGBORDER_RIGHT 0x0040 +#define HTTB_RESIZINGBORDER_BOTTOM 0x0080 +#define HTTB_RESIZINGBORDER (HTTB_RESIZINGBORDER_LEFT|HTTB_RESIZINGBORDER_TOP|HTTB_RESIZINGBORDER_RIGHT|HTTB_RESIZINGBORDER_BOTTOM) +#define HTTB_SIZINGTEMPLATE 0x0100 +#define HTTB_SYSTEMSIZINGMARGINS 0x0200 + +typedef HANDLE HPAINTBUFFER; +typedef HANDLE HTHEME; + +typedef enum _BP_BUFFERFORMAT +{ + BPBF_COMPATIBLEBITMAP, + BPBF_DIB, + BPBF_TOPDOWNDIB, + BPBF_TOPDOWNMONODIB +} BP_BUFFERFORMAT; + +typedef struct _BP_PAINTPARAMS +{ + DWORD cbSize; + DWORD dwFlags; + const RECT *prcExclude; + const BLENDFUNCTION *pBlendFunction; +} BP_PAINTPARAMS, *PBP_PAINTPARAMS; typedef enum PROPERTYORIGIN { - PO_STATE = 0, - PO_PART = 1, - PO_CLASS = 2, - PO_GLOBAL = 3, - PO_NOTFOUND = 4 + PO_STATE = 0, + PO_PART = 1, + PO_CLASS = 2, + PO_GLOBAL = 3, + PO_NOTFOUND = 4 } PROPERTYORIGIN; + typedef enum THEMESIZE { - TS_MIN, - TS_TRUE, - TS_DRAW + TS_MIN, + TS_TRUE, + TS_DRAW } THEMESIZE; + typedef struct _DTBGOPTS { - DWORD dwSize; - DWORD dwFlags; - RECT rcClip; + DWORD dwSize; + DWORD dwFlags; + RECT rcClip; } DTBGOPTS, *PDTBGOPTS; + #define MAX_INTLIST_COUNT 10 + typedef struct _INTLIST { - int iValueCount; - int iValues[MAX_INTLIST_COUNT]; + int iValueCount; + int iValues[MAX_INTLIST_COUNT]; } INTLIST, *PINTLIST; + typedef struct _MARGINS { - int cxLeftWidth; - int cxRightWidth; - int cyTopHeight; - int cyBottomHeight; + int cxLeftWidth; + int cxRightWidth; + int cyTopHeight; + int cyBottomHeight; } MARGINS, *PMARGINS; -typedef HANDLE HTHEME; HRESULT WINAPI CloseThemeData(HTHEME); HRESULT WINAPI DrawThemeBackground(HTHEME,HDC,int,int,const RECT*,const RECT*);

15 years, 12 months

[tkreuzer] 37302: Update SizeOfImage in PE header, fixes boot.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 12 06:30:19 2008 New Revision: 37302 URL: http://svn.reactos.org/svn/reactos?rev=37302&view=rev Log: Update SizeOfImage in PE header, fixes boot. Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] Wed Nov 12 06:30:19 2008 @@ -197,10 +197,16 @@ break; /* PSEH types */ case 0x1c: + printf("found 1c at %lx\n", State->Location); State->Scope = 1; break; case 0x1d: + printf("found 1d at %lx\n", State->Location); State->Scope = 2; + break; + case 0x1e: + printf("found 1e at %lx\n", State->Location); + State->Scope = 3; break; default: fprintf(stderr, "unknown instruction 0x%x at 0x%p\n", Code, pc); @@ -507,8 +513,13 @@ int ret, Size, Pos; DWORD Checksum; - /* Correct section count */ + /* Update section count */ File->FileHeader->NumberOfSections = File->UsedSections + 2; // FIXME!!! + + /* Update SizeOfImage */ + Size = File->xdata.psh->PointerToRawData + + File->xdata.psh->SizeOfRawData; + File->OptionalHeader->SizeOfImage = Size; /* Calculate size of file beginning */ Size = File->SectionHeaders[File->UsedSections].PointerToRawData;

15 years, 12 months

← Newer
1
...
45
46
47
48
49
50
51
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008