Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 37910: Merge 34758, 34771, 34786, 34787, 34906, 35826, 36174, 36274, 36444, 36445, 36446, 36447, 36448, 36477, 36511, 36898, 36903 from amd64 branch
by tkreuzer＠svn.reactos.org 07 Dec '08

07 Dec '08

Author: tkreuzer Date: Sun Dec 7 06:11:46 2008 New Revision: 37910 URL: http://svn.reactos.org/svn/reactos?rev=37910&view=rev Log: Merge 34758, 34771, 34786, 34787, 34906, 35826, 36174, 36274, 36444, 36445, 36446, 36447, 36448, 36477, 36511, 36898, 36903 from amd64 branch Modified: trunk/reactos/base/applications/calc/winmain.c trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/control/control.c trunk/reactos/base/applications/control/control.h trunk/reactos/base/applications/dxdiag/dxdiag.c trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp trunk/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp trunk/reactos/base/applications/games/solitaire/solgame.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/winemine/dialog.h trunk/reactos/base/applications/msconfig/msconfig.c trunk/reactos/base/applications/mscutils/devmgmt/about.c trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c trunk/reactos/base/applications/mscutils/devmgmt/precomp.h trunk/reactos/base/applications/mscutils/servman/about.c trunk/reactos/base/applications/mscutils/servman/create.c trunk/reactos/base/applications/mscutils/servman/delete.c trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/progress.c trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/network/ftp/cmds.c trunk/reactos/base/applications/network/ftp/ftp.c trunk/reactos/base/applications/network/ftp/ftp_var.h trunk/reactos/base/applications/network/ftp/main.c trunk/reactos/base/applications/notepad/dialog.c trunk/reactos/base/applications/notepad/dialog.h trunk/reactos/base/applications/notepad/main.c trunk/reactos/base/applications/regedit/regedit.rbuild trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/winhlp32/lex.yy.c trunk/reactos/base/applications/winhlp32/macro.c trunk/reactos/base/setup/usetup/cabinet.c trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/vmwinst/vmwinst.c trunk/reactos/base/setup/welcome/welcome.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h trunk/reactos/base/system/smss/client.c trunk/reactos/base/system/smss/initss.c trunk/reactos/base/system/smss/smapicomp.c trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/wlx.c trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/include/psdk/wincrypt.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/services/services.h Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -804,7 +804,7 @@ return str; } -static LRESULT CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { TCHAR buffer[SIZEOF(calc.buffer)]; DWORD n; @@ -1179,7 +1179,7 @@ return 1L; } -static LRESULT CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { unsigned int x; RECT rc; Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -188,7 +188,7 @@ static -BOOL +INT_PTR CALLBACK DlgProc(HWND hDlg, UINT Message, @@ -359,7 +359,7 @@ Ret = DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_CHARMAP), NULL, - (DLGPROC)DlgProc) >= 0; + DlgProc) >= 0; UnregisterMapClasses(hInstance); } Modified: trunk/reactos/base/applications/control/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/control.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/control/control.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -24,12 +24,12 @@ _tcscpy(szParameters, _T("/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}")); _tcscat(szParameters, lpFolderCLSID); - return (int) ShellExecute(NULL, - _T("open"), - _T("explorer.exe"), - szParameters, - NULL, - SW_SHOWDEFAULT) > 32; + return (INT_PTR)ShellExecute(NULL, + _T("open"), + _T("explorer.exe"), + szParameters, + NULL, + SW_SHOWDEFAULT) > 32; } static Modified: trunk/reactos/base/applications/control/control.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/control.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/control/control.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -15,4 +15,4 @@ /* Macro for calling "rundll32.exe" According to MSDN, ShellExecute returns a value greater than 32 if the operation was successful. */ -#define RUNDLL(param) ((int)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32) +#define RUNDLL(param) ((INT_PTR)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32) Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -238,7 +238,7 @@ hInst = hInstance; - DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, (DLGPROC) DxDiagWndProc); + DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, DxDiagWndProc); return 0; } Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -326,7 +326,7 @@ else { HWND hwnd = (HWND)parentWnd; - SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(id, BN_CLICKED), (LONG)hwnd); + SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(id, BN_CLICKED), (LONG_PTR)hwnd); } } } Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -298,7 +298,7 @@ else fDrawTips = TRUE; - if(yoffset != 0 && abs(xoffset) == 1 || xoffset != 0 && abs(yoffset) == 1) + if((yoffset != 0 && abs(xoffset) == 1) || (xoffset != 0 && abs(yoffset) == 1)) fDrawTips = TRUE; //draw horizontal strips Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -626,7 +626,7 @@ MoveDragCardTo(hdc, ix, iy); - if(attarget || ix == idestx && iy == idesty) + if(attarget || (ix == idestx && iy == idesty)) break; oldx = (int)x; Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -366,7 +366,7 @@ // // associate this class with the window // - SetWindowLong(hwnd, 0, (LONG)cs->lpCreateParams); + SetWindowLong(hwnd, 0, (LONG_PTR)cs->lpCreateParams); return 1; Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -118,8 +118,8 @@ } //can only drop if card is different colour - if( mystack[0].IsBlack() && !dragcard.IsRed() || - !mystack[0].IsBlack() && dragcard.IsRed() ) + if( (mystack[0].IsBlack() && !dragcard.IsRed()) || + (!mystack[0].IsBlack() && dragcard.IsRed()) ) { TRACE("EXIT RowStackDropProc(false)\n"); return false; Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -200,7 +200,7 @@ } -BOOL CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { @@ -358,7 +358,7 @@ } -BOOL CALLBACK CardBackDlgProc(HWND hDlg, +INT_PTR CALLBACK CardBackDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) Modified: trunk/reactos/base/applications/games/winemine/dialog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/dialog.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winemine/dialog.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -19,7 +19,7 @@ */ -BOOL CALLBACK CustomDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); -BOOL CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); -BOOL CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); -BOOL CALLBACK AboutDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); +INT_PTR CALLBACK CustomDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); +INT_PTR CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); +INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); +INT_PTR CALLBACK AboutDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -23,12 +23,12 @@ TCITEM item; hTabWnd = GetDlgItem(hWnd, IDC_TAB); - hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, (DLGPROC) GeneralPageWndProc); - hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, (DLGPROC) SystemPageWndProc); - hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, (DLGPROC) FreeLdrPageWndProc); - hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, (DLGPROC) ServicesPageWndProc); - hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, (DLGPROC) StartupPageWndProc); - hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, (DLGPROC) ToolsPageWndProc); + hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, GeneralPageWndProc); + hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, SystemPageWndProc); + hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, FreeLdrPageWndProc); + hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc); + hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, StartupPageWndProc); + hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc); LoadString(hInst, IDS_MSCONFIG, szTemp, 256); SetWindowText(hWnd, szTemp); @@ -202,7 +202,7 @@ break; case WM_NOTIFY: - idctrl = (int)wParam; + idctrl = wParam; pnmh = (LPNMHDR)lParam; if ((pnmh->hwndFrom == hTabWnd) && (pnmh->idFrom == IDC_TAB) && @@ -251,7 +251,7 @@ hInst = hInstance; - DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, (DLGPROC) MsConfigWndProc); + DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc); return 0; } Modified: trunk/reactos/base/applications/mscutils/devmgmt/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/about.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/about.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -9,7 +9,7 @@ #include "precomp.h" -BOOL CALLBACK +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { HWND hLicenseEditWnd; Modified: trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -464,7 +464,7 @@ DialogBox(hInstance, MAKEINTRESOURCE(IDD_ABOUTBOX), Info->hMainWnd, - (DLGPROC)AboutDialogProc); + AboutDialogProc); SetFocus(Info->hTreeView); } Modified: trunk/reactos/base/applications/mscutils/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -34,7 +34,7 @@ } MAIN_WND_INFO, *PMAIN_WND_INFO; -BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); /* devmgmt.c */ Modified: trunk/reactos/base/applications/mscutils/servman/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/about.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/about.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -9,7 +9,7 @@ #include "precomp.h" -BOOL CALLBACK +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) Modified: trunk/reactos/base/applications/mscutils/servman/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/create.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/create.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -164,7 +164,7 @@ } -BOOL CALLBACK +INT_PTR CALLBACK CreateHelpDialogProc(HWND hDlg, UINT message, WPARAM wParam, @@ -221,7 +221,7 @@ } -BOOL CALLBACK +INT_PTR CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, @@ -302,7 +302,7 @@ hHelp = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_DLG_HELP_OPTIONS), hDlg, - (DLGPROC)CreateHelpDialogProc); + CreateHelpDialogProc); if(hHelp != NULL) { bHelpOpen = TRUE; Modified: trunk/reactos/base/applications/mscutils/servman/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/delete.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/delete.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -56,7 +56,7 @@ } -BOOL CALLBACK +INT_PTR CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -432,7 +432,7 @@ ret = DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_DLG_CREATE), Info->hMainWnd, - (DLGPROC)CreateDialogProc, + CreateDialogProc, (LPARAM)Info); if (ret == IDOK) RefreshServiceList(Info); @@ -448,7 +448,7 @@ DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_DLG_DELETE), Info->hMainWnd, - (DLGPROC)DeleteDialogProc, + DeleteDialogProc, (LPARAM)Info); } else @@ -569,7 +569,7 @@ DialogBox(hInstance, MAKEINTRESOURCE(IDD_ABOUTBOX), Info->hMainWnd, - (DLGPROC)AboutDialogProc); + AboutDialogProc); SetFocus(Info->hListView); break; Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -43,10 +43,10 @@ } MAIN_WND_INFO, *PMAIN_WND_INFO; -BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); /* servman.c */ Modified: trunk/reactos/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -56,7 +56,7 @@ } } -BOOL CALLBACK +INT_PTR CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, @@ -113,7 +113,7 @@ hProgDlg = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_DLG_PROGRESS), hParent, - (DLGPROC)ProgressDialogProc); + ProgressDialogProc); if (hProgDlg != NULL) { /* write the info to the progress dialog */ Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -989,7 +989,7 @@ if (CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_GENERAL), pInfo->hTab, - (DLGPROC)GeneralDlgProc, + GeneralDlgProc, (LPARAM)pInfo)) { WCHAR str[256]; @@ -1004,7 +1004,7 @@ if (CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY), pInfo->hTab, - (DLGPROC)DisplayDlgProc, + DisplayDlgProc, (LPARAM)pInfo)) { WCHAR str[256]; @@ -1049,7 +1049,7 @@ } } -static BOOL CALLBACK +static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT Message, WPARAM wParam, @@ -1246,6 +1246,6 @@ return (DialogBoxParamW(hInst, MAKEINTRESOURCEW(IDD_CONNECTDIALOG), NULL, - (DLGPROC)DlgProc, + DlgProc, (LPARAM)pRdpSettings) == IDOK); } Modified: trunk/reactos/base/applications/network/ftp/cmds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -416,7 +416,7 @@ if (!*tp) { tp = cp; tp2 = tmpbuf; - while ((*tp2 = *tp) != (int) NULL) { + while ((*tp2 = *tp)) { if (isupper(*tp2)) { *tp2 = 'a' + *tp2 - 'A'; } @@ -573,7 +573,7 @@ if (!*tp) { tp = argv[2]; tp2 = tmpbuf; - while ((*tp2 = *tp) != (int) NULL) { + while ((*tp2 = *tp)) { if (isupper(*tp2)) { *tp2 = 'a' + *tp2 - 'A'; } @@ -715,7 +715,7 @@ if (!*tp) { tp = cp; tp2 = tmpbuf; - while ((*tp2 = *tp) != (int) NULL) { + while ((*tp2 = *tp)) { if (isupper(*tp2)) { *tp2 = 'a' + *tp2 - 'A'; } @@ -1686,7 +1686,7 @@ if (!connected) return; (void) command("QUIT"); - cout = (int) NULL; + cout = 0; connected = 0; data = -1; if (!proxy) { Modified: trunk/reactos/base/applications/network/ftp/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -295,7 +295,7 @@ printf("\n"); (void) fflush(stdout); } - if (cout == (int) NULL) { + if (cout == 0) { perror ("No control connection for command"); code = -1; return (0); @@ -583,7 +583,7 @@ return; } dout = dataconn(mode); - if (dout == (int)NULL) + if (!dout) goto abort; (void) gettimeofday(&start, (struct timezone *)0); null();// oldintp = signal(SIGPIPE, SIG_IGN); @@ -887,7 +887,7 @@ } } din = dataconn("r"); - if (din == (int)NULL) + if (!din) goto abort; if (strcmp(local, "-") == 0) fout = stdout; @@ -1271,7 +1271,7 @@ if (s < 0) { perror("ftp: accept"); (void) closesocket(data), data = -1; - return (int) (NULL); + return 0; } if(closesocket(data)) { int iret=WSAGetLastError (); Modified: trunk/reactos/base/applications/network/ftp/ftp_var.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -48,11 +48,6 @@ #define STRU_F 1 #define STRU_R 2 #define STRU_P 3 - -#define SIGQUIT 1 -#define SIGPIPE 2 -#define SIGALRM 3 - #define FORM_N 1 #define FORM_T 2 Modified: trunk/reactos/base/applications/network/ftp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/main.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -264,9 +264,9 @@ extern int data; if (connected) { - if (cout != (int) NULL) { + if (cout) { closesocket(cout); - cout = (int) NULL; + cout = 0; } if (data >= 0) { (void) shutdown(data, 1+1); @@ -277,9 +277,9 @@ } pswitch(1); if (connected) { - if (cout != (int)NULL) { + if (cout) { closesocket(cout); - cout = (int) NULL; + cout = 0; } connected = 0; } @@ -538,7 +538,7 @@ char *argv[]; { extern struct cmd cmdtab[]; - register struct cmd *c; + struct cmd *c; if (argc == 1) { register int i, j, w, k; @@ -591,7 +591,7 @@ else if (c == (struct cmd *)0) printf("?Invalid help command %s\n", arg); else - printf("%-*s\t%s\n", HELPINDENT, + printf("%-*s\t%s\n", (int)HELPINDENT, c->c_name, c->c_help); } (void) fflush(stdout); Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -926,7 +926,7 @@ #ifdef _MSC_VER #pragma warning(disable : 4100) #endif -BOOL CALLBACK +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { HWND hLicenseEditWnd; Modified: trunk/reactos/base/applications/notepad/dialog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -55,7 +55,7 @@ VOID DIALOG_TimeDate(VOID); -BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); /* utility functions */ VOID ShowLastError(void); Modified: trunk/reactos/base/applications/notepad/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/main.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -91,7 +91,7 @@ case CMD_ABOUT: DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_ABOUTBOX), Globals.hMainWnd, - (DLGPROC) AboutDialogProc); + AboutDialogProc); break; case CMD_ABOUT_WINE: DIALOG_HelpAboutWine(); break; Modified: trunk/reactos/base/applications/regedit/regedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<module name="regedit" type="win32gui" installname="regedit.exe"> +<module name="regedit" type="win32gui" installname="regedit.exe" allowwarnings="true"> <include base="regedit">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> @@ -10,7 +10,6 @@ <library>user32</library> <library>gdi32</library> <library>advapi32</library> - <library>comdlg32</library> <library>ole32</library> <library>shell32</library> <library>comctl32</library> Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -88,7 +88,7 @@ void PerfDataRefresh(void) { - SIZE_T ulSize; + ULONG ulSize; NTSTATUS status; LPBYTE pBuffer; ULONG BufferSize; @@ -393,7 +393,7 @@ for (Index = 0; Index < ProcessCount; Index++) { - if ((DWORD)pPerfData[Index].ProcessId == dwProcessId) + if (PtrToUlong(pPerfData[Index].ProcessId) == dwProcessId) { FoundIndex = Index; break; @@ -412,7 +412,7 @@ EnterCriticalSection(&PerfDataCriticalSection); if (Index < ProcessCount) - ProcessId = (ULONG)pPerfData[Index].ProcessId; + ProcessId = PtrToUlong(pPerfData[Index].ProcessId); else ProcessId = 0; Modified: trunk/reactos/base/applications/winhlp32/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -1670,7 +1670,7 @@ void macro_test(void) { WNDPROC lpfnDlg = MakeProcInstance(MACRO_TestDialogProc, Globals.hInstance); - DialogBox(Globals.hInstance, STRING_DIALOG_TEST, Globals.active_win->hMainWnd, (DLGPROC)lpfnDlg); + DialogBox(Globals.hInstance, STRING_DIALOG_TEST, Globals.active_win->hMainWnd, lpfnDlg); FreeProcInstance(lpfnDlg); macro = szTestMacro; } Modified: trunk/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -848,7 +848,7 @@ dll->class = dll->handler ? (dll->handler)(DW_WHATMSG, 0, 0) : DC_NOMSG; WINE_TRACE("Got class %x for DLL %s\n", dll->class, dll_name); if (dll->class & DC_INITTERM) dll->handler(DW_INIT, 0, 0); - if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (DWORD)Callbacks, 0); + if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (DWORD_PTR)Callbacks, 0); } else WINE_WARN("OOM\n"); } Modified: trunk/reactos/base/setup/usetup/cabinet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.… ============================================================================== --- trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -148,7 +148,7 @@ return CS_BADSTREAM; } - ZStream.next_in = (PUCHAR)((ULONG)InputBuffer + 2); + ZStream.next_in = ((PUCHAR)InputBuffer )+ 2; ZStream.avail_in = *InputLength - 2; ZStream.next_out = (PUCHAR)OutputBuffer; ZStream.avail_out = abs(*OutputLength); Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -699,7 +699,7 @@ INFCONTEXT Context; PWCHAR Value; UINT ErrorLine; - SIZE_T ReturnSize; + ULONG ReturnSize; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -903,7 +903,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; SYSTEM_DEVICE_INFORMATION Sdi; IO_STATUS_BLOCK Iosb; - SIZE_T ReturnSize; + ULONG ReturnSize; NTSTATUS Status; ULONG DiskNumber; WCHAR Buffer[MAX_PATH]; Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -504,7 +504,7 @@ } cleanup: - hThread = (HANDLE)InterlockedExchange((LONG*)&hInstallationThread, 0); + hThread = InterlockedExchangePointer((PVOID*)&hInstallationThread, 0); if(hThread != NULL) { CloseHandle(hThread); Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -179,7 +179,7 @@ rcRightPanel.left = rcLeftPanel.right; rcRightPanel.right = ulInnerWidth - 1; - if (!LoadString(hInstance, (UINT)MAKEINTRESOURCE(IDS_APPTITLE), szAppTitle, 80)) + if (!LoadString(hInstance, (UINT_PTR)MAKEINTRESOURCE(IDS_APPTITLE), szAppTitle, 80)) _tcscpy(szAppTitle, TEXT("ReactOS Welcome")); /* Create main window */ @@ -386,7 +386,7 @@ rcLeftPanel.right - rcLeftPanel.left, dwHeight, hWnd, - (HMENU)i, + (HMENU)IntToPtr(i), hInstance, NULL); hwndDefaultTopic = hwndTopicButton[i]; Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -307,10 +307,10 @@ ret = (hShExt)(NULL, _T("open"), filename, NULL, NULL, SW_SHOWNORMAL); - TRACE ("RunFile: ShellExecuteA/W returned %d\n", (DWORD)ret); + TRACE ("RunFile: ShellExecuteA/W returned 0x%p\n", ret); FreeLibrary(hShell32); - return (((DWORD)ret) > 32); + return (((DWORD_PTR)ret) > 32); } Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -117,13 +117,13 @@ PSERVICE -ScmGetServiceEntryByClientHandle(ULONG Handle) +ScmGetServiceEntryByClientHandle(HANDLE Handle) { PLIST_ENTRY ServiceEntry; PSERVICE CurrentService; DPRINT("ScmGetServiceEntryByClientHandle() called\n"); - DPRINT("looking for %lu\n", Handle); + DPRINT("looking for %p\n", Handle); ServiceEntry = ServiceListHead.Flink; while (ServiceEntry != &ServiceListHead) Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -1018,7 +1018,7 @@ return ERROR_INVALID_HANDLE; } - lpService = ScmGetServiceEntryByClientHandle(hServiceStatus); + lpService = ScmGetServiceEntryByClientHandle((HANDLE)hServiceStatus); if (lpService == NULL) { DPRINT1("lpService == NULL!\n"); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -107,7 +107,7 @@ PSERVICE ScmGetServiceEntryByName(LPWSTR lpServiceName); PSERVICE ScmGetServiceEntryByDisplayName(LPWSTR lpDisplayName); PSERVICE ScmGetServiceEntryByResumeCount(DWORD dwResumeCount); -PSERVICE ScmGetServiceEntryByClientHandle(ULONG ThreadId); +PSERVICE ScmGetServiceEntryByClientHandle(HANDLE Handle); DWORD ScmCreateNewServiceRecord(LPWSTR lpServiceName, PSERVICE *lpServiceRecord); VOID ScmDeleteServiceRecord(PSERVICE lpService); Modified: trunk/reactos/base/system/smss/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/client.c?… ============================================================================== --- trunk/reactos/base/system/smss/client.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/client.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -435,7 +435,7 @@ SmpClientDirectory.CandidateClient->ServerProcess = (HANDLE) ProcessInfo->ProcessHandle; SmpClientDirectory.CandidateClient->ServerProcessId = - (ULONG) ProcessInfo->ClientId.UniqueProcess; + (DWORD_PTR) ProcessInfo->ClientId.UniqueProcess; /* * Copy the program name */ Modified: trunk/reactos/base/system/smss/initss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initss.c?… ============================================================================== --- trunk/reactos/base/system/smss/initss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initss.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -41,8 +41,8 @@ RtlZeroMemory (& ProcessInfo, sizeof ProcessInfo); ProcessInfo.Size = sizeof ProcessInfo; - ProcessInfo.ProcessHandle = (HANDLE) SmSsProcessId; - ProcessInfo.ClientId.UniqueProcess = (HANDLE) SmSsProcessId; + ProcessInfo.ProcessHandle = (HANDLE) UlongToPtr(SmSsProcessId); + ProcessInfo.ClientId.UniqueProcess = (HANDLE) UlongToPtr(SmSsProcessId); DPRINT("SM: %s: ProcessInfo.ProcessHandle=%p\n", __FUNCTION__,ProcessInfo.ProcessHandle); Status = SmCreateClient (& ProcessInfo, PgmName); Modified: trunk/reactos/base/system/smss/smapicomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapicomp… ============================================================================== --- trunk/reactos/base/system/smss/smapicomp.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smapicomp.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -24,7 +24,7 @@ DPRINT("SM: %s: ClientId.UniqueProcess=%p\n", __FUNCTION__, Request->Header.ClientId.UniqueProcess); - Status = SmCompleteClientInitialization ((ULONG) Request->Header.ClientId.UniqueProcess); + Status = SmCompleteClientInitialization (PtrToUlong(Request->Header.ClientId.UniqueProcess)); if (!NT_SUCCESS(Status)) { DPRINT1("SM: %s: SmCompleteClientInitialization failed (Status=0x%08lx)\n", Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -505,7 +505,7 @@ return STATUS_SUCCESS; } -static BOOL CALLBACK +static INT_PTR CALLBACK ShutdownComputerWindowProc( IN HWND hwndDlg, IN UINT uMsg, Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -185,7 +185,7 @@ return Session->Gina.Functions.WlxRemoveStatusMessage(Session->Gina.Context); } -static BOOL CALLBACK +static INT_PTR CALLBACK GinaLoadFailedWindowProc( IN HWND hwndDlg, IN UINT uMsg, Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -23,7 +23,7 @@ /* FUNCTIONS ****************************************************************/ -static BOOL CALLBACK +static INT_PTR CALLBACK DefaultWlxWindowProc( IN HWND hwndDlg, IN UINT uMsg, Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -403,7 +403,7 @@ NTSTATUS Status; /* don't close null handle or a pseudo handle */ - if ((!hKey) || (((ULONG)hKey & 0xF0000000) == 0x80000000)) + if ((!hKey) || (((ULONG_PTR)hKey & 0xF0000000) == 0x80000000)) { return ERROR_INVALID_HANDLE; } @@ -1031,7 +1031,7 @@ return RtlNtStatusToDosError(Status); } - TRACE("ParentKey %x\n", (ULONG)ParentKey); + TRACE("ParentKey %p\n", ParentKey); if (lpClass != NULL) { @@ -1105,7 +1105,7 @@ return RtlNtStatusToDosError(Status); } - TRACE("ParentKey %x\n", (ULONG)ParentKey); + TRACE("ParentKey %p\n", ParentKey); RtlInitUnicodeString(&ClassString, lpClass); Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re… ============================================================================== --- trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -3788,7 +3788,7 @@ WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, CONST BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, CONST BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD); Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -2703,7 +2703,7 @@ #define STATE_SYSTEM_VALID 0x1fffffff #ifndef RC_INVOKED -typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); +typedef INT_PTR(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); typedef VOID(CALLBACK *TIMERPROC)(HWND,UINT,UINT,DWORD); typedef BOOL(CALLBACK *GRAYSTRINGPROC)(HDC,LPARAM,int); typedef LRESULT(CALLBACK *HOOKPROC)(int,WPARAM,LPARAM); Modified: trunk/reactos/include/reactos/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/services/s… ============================================================================== --- trunk/reactos/include/reactos/services/services.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/services/services.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -11,7 +11,7 @@ #define SERVICE_CONTROL_START 0 -typedef DWORD CLIENT_HANDLE; +DECLARE_HANDLE(CLIENT_HANDLE); typedef struct _SCM_CONTROL_PACKET {

1 0

[tkreuzer] 37909: don't truncate a handle
by tkreuzer＠svn.reactos.org 07 Dec '08

07 Dec '08

Author: tkreuzer Date: Sun Dec 7 04:56:42 2008 New Revision: 37909 URL: http://svn.reactos.org/svn/reactos?rev=37909&view=rev Log: don't truncate a handle Modified: branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c Modified: branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Dec 7 04:56:42 2008 @@ -1018,7 +1018,7 @@ return ERROR_INVALID_HANDLE; } - lpService = ScmGetServiceEntryByClientHandle(LongToPtr(hServiceStatus)); + lpService = ScmGetServiceEntryByClientHandle((HANDLE)hServiceStatus); if (lpService == NULL) { DPRINT1("lpService == NULL!\n");

1 0

[tkreuzer] 37908: fix definition of SOCKET TODO: revert "fixes" to code dealing with broken SOCKET definition
by tkreuzer＠svn.reactos.org 07 Dec '08

07 Dec '08

Author: tkreuzer Date: Sun Dec 7 02:36:06 2008 New Revision: 37908 URL: http://svn.reactos.org/svn/reactos?rev=37908&view=rev Log: fix definition of SOCKET TODO: revert "fixes" to code dealing with broken SOCKET definition Modified: branches/ros-amd64-bringup/reactos/include/psdk/winsock.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/winsock.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winsock.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winsock.h [iso-8859-1] Sun Dec 7 02:36:06 2008 @@ -26,7 +26,7 @@ typedef unsigned long u_long; #define _BSDTYPES_DEFINED #endif /* !defined _BSDTYPES_DEFINED */ -typedef u_int SOCKET; +typedef UINT_PTR SOCKET; #ifndef FD_SETSIZE #define FD_SETSIZE 64 #endif

1 0

[tkreuzer] 37907: clear direction flag on interrupt
by tkreuzer＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: tkreuzer Date: Sat Dec 6 17:37:30 2008 New Revision: 37907 URL: http://svn.reactos.org/svn/reactos?rev=37907&view=rev Log: clear direction flag on interrupt Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Sat Dec 6 17:37:30 2008 @@ -129,6 +129,8 @@ // KTRAP_FRAME_LastExceptionFromRip // KTRAP_FRAME_TrapFrame + /* Make sure the direction flag is cleared */ + cld .endm .macro LEAVE_TRAP_FRAME

1 0

[ekohl] 37906: - Introduce a common header file. - Use Wine-style debug code everywhere.
by ekohl＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: ekohl Date: Sat Dec 6 15:33:49 2008 New Revision: 37906 URL: http://svn.reactos.org/svn/reactos?rev=37906&view=rev Log: - Introduce a common header file. - Use Wine-style debug code everywhere. Added: trunk/reactos/dll/win32/lsasrv/lsasrv.h (with props) Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sat Dec 6 15:33:49 2008 @@ -6,6 +6,7 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> +#include "lsasrv.h" #include "lsa_s.h" #include <wine/debug.h> Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Sat Dec 6 15:33:49 2008 @@ -3,10 +3,11 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> -#define NDEBUG -#include <debug.h> +#include "lsasrv.h" -VOID LsarStartRpcServer(VOID); +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); NTSTATUS WINAPI @@ -14,7 +15,7 @@ { HANDLE hEvent; - DPRINT("LsapInitLsa() called\n"); + TRACE("LsapInitLsa()\n"); LsarStartRpcServer(); @@ -29,6 +30,7 @@ return STATUS_SUCCESS; } + void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, len); @@ -40,5 +42,4 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, ptr); } - /* EOF */ Added: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h (added) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sat Dec 6 15:33:49 2008 @@ -1,0 +1,12 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Local Security Authority (LSA) Server + * FILE: reactos/dll/win32/lsasrv/lsasrv.h + * PURPOSE: + * + * PROGRAMMERS: Eric Kohl + */ + +/* lsarpc.c */ +VOID LsarStartRpcServer(VOID); + Propchange: trunk/reactos/dll/win32/lsasrv/lsasrv.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/lsasrv/lsasrv.h ------------------------------------------------------------------------------ svn:keywords = author date revision

1 0

[fireball] 37905: - Fix a potential case of non-paged pool memory double freeing. Spotted by Michael Martin.
by fireball＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: fireball Date: Sat Dec 6 13:35:54 2008 New Revision: 37905 URL: http://svn.reactos.org/svn/reactos?rev=37905&view=rev Log: - Fix a potential case of non-paged pool memory double freeing. Spotted by Michael Martin. Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=379… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Sat Dec 6 13:35:54 2008 @@ -991,7 +991,6 @@ if (!KeInsertQueueApc(Apc, Apc, NULL, 2)) { /* The APC was already in the queue, fail */ - ExFreePool(Apc); Status = STATUS_UNSUCCESSFUL; } else

1 0

[tkreuzer] 37904: merge trunk head (37902)
by tkreuzer＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: tkreuzer Date: Sat Dec 6 13:06:05 2008 New Revision: 37904 URL: http://svn.reactos.org/svn/reactos?rev=37904&view=rev Log: merge trunk head (37902) Added: branches/ros-amd64-bringup/reactos/dll/win32/localui/ (props changed) - copied from r37902, trunk/reactos/dll/win32/localui/ branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/api.c - copied unchanged from r37902, trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/dma_master.c - copied unchanged from r37902, trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_master.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c - copied unchanged from r37902, trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/miniport.c - copied unchanged from r37902, trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.c - copied unchanged from r37902, trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.c - copied unchanged from r37902, trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/port.c - copied unchanged from r37902, trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c - copied unchanged from r37902, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c - copied unchanged from r37902, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c - copied unchanged from r37902, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c - copied unchanged from r37902, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c - copied unchanged from r37902, trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/registry.c - copied unchanged from r37902, trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/resource.c - copied unchanged from r37902, trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c branches/ros-amd64-bringup/reactos/include/ddk/winsplp.h - copied unchanged from r37902, trunk/reactos/include/ddk/winsplp.h Removed: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/Miniport.cpp branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/MiniportDMus.cpp branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/MiniportMidi.cpp branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/MiniportTopology.cpp branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/MiniportWaveCyclic.cpp branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/Port.cpp branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/PortDMus.cpp branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/PortMidi.cpp branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/PortTopology.cpp branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/PortWaveCyclic.cpp branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/miniport_factory.cpp Modified: branches/ros-amd64-bringup/reactos/base/services/umpnpmgr/umpnpmgr.c branches/ros-amd64-bringup/reactos/baseaddress.rbuild branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/brush.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/font.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.spec branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus_private.h branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphics.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphicspath.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/image.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/matrix.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/pen.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/region.c branches/ros-amd64-bringup/reactos/dll/win32/mlang/mlang.c branches/ros-amd64-bringup/reactos/dll/win32/setupapi/queue.c branches/ros-amd64-bringup/reactos/dll/win32/setupapi/setupapi.spec branches/ros-amd64-bringup/reactos/dll/win32/setupapi/stubs.c branches/ros-amd64-bringup/reactos/dll/win32/win32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/winspool/stubs.c branches/ros-amd64-bringup/reactos/dll/win32/winspool/winspool.spec branches/ros-amd64-bringup/reactos/drivers/storage/class/cdrom/cdrom.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/adapter.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/private.h branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/stubs.c branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h branches/ros-amd64-bringup/reactos/include/ddk/wdm.h branches/ros-amd64-bringup/reactos/include/ddk/winddk.h branches/ros-amd64-bringup/reactos/include/psdk/gdiplusenums.h branches/ros-amd64-bringup/reactos/include/psdk/gdiplusflat.h branches/ros-amd64-bringup/reactos/include/psdk/gdiplusgpstubs.h branches/ros-amd64-bringup/reactos/include/psdk/gdiplusimaging.h branches/ros-amd64-bringup/reactos/include/psdk/gdiplusmem.h branches/ros-amd64-bringup/reactos/include/psdk/ole2.h branches/ros-amd64-bringup/reactos/include/psdk/shlobj.h branches/ros-amd64-bringup/reactos/include/psdk/winspool.h branches/ros-amd64-bringup/reactos/include/reactos/arm/armddk.h branches/ros-amd64-bringup/reactos/media/doc/README.WINE branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/appswitch.c branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild branches/ros-amd64-bringup/reactos/tools/widl/client.c branches/ros-amd64-bringup/reactos/tools/widl/header.c branches/ros-amd64-bringup/reactos/tools/widl/header.h branches/ros-amd64-bringup/reactos/tools/widl/parser.l branches/ros-amd64-bringup/reactos/tools/widl/parser.tab.c branches/ros-amd64-bringup/reactos/tools/widl/parser.y branches/ros-amd64-bringup/reactos/tools/widl/parser.yy.c branches/ros-amd64-bringup/reactos/tools/widl/proxy.c branches/ros-amd64-bringup/reactos/tools/widl/server.c branches/ros-amd64-bringup/reactos/tools/widl/typegen.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-amd64-bringup/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/basea… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/matrix.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/queue.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/winspool/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Removed: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/Miniport.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Removed: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/MiniportDMus.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Removed: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/MiniportMidi.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Removed: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/MiniportTopology.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Removed: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/MiniportWaveCyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Removed: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/Port.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Removed: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/PortDMus.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Removed: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/PortMidi.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Removed: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/PortTopology.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Removed: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/PortWaveCyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Removed: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/miniport_factory.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/gdiplusenums.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/gdiplusgpstubs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/gdiplusimaging.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/gdiplusmem.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/ole2.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/winspool.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/appswitch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…

1 0

[tkreuzer] 37903: oops, looks like I forgot to commit this file (SEH2 stubs)
by tkreuzer＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: tkreuzer Date: Sat Dec 6 12:33:48 2008 New Revision: 37903 URL: http://svn.reactos.org/svn/reactos?rev=37903&view=rev Log: oops, looks like I forgot to commit this file (SEH2 stubs) Added: branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2_64.h (with props) Added: branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2_64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2_64.h (added) +++ branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2_64.h [iso-8859-1] Sat Dec 6 12:33:48 2008 @@ -1,0 +1,16 @@ +#ifndef KJK_PSEH2_H_ +#define KJK_PSEH2_H_ + + +#define _SEH2_TRY if(1) +#define _SEH2_EXCEPT(x) else +#define _SEH2_END +#define _SEH2_GetExceptionCode() (0) +#define _SEH2_YIELD(x) x +#define _SEH2_LEAVE + + + +#endif + +/* EOF */ Propchange: branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2_64.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 37902: - move CONTEXT stuff from wdm.h to winddk.h / armddk.h - inlcude intrin.h in wdm.h - avoid redefining PCONTEXT - use intrinsics for BitScanForward/Reverse
by tkreuzer＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: tkreuzer Date: Sat Dec 6 12:31:33 2008 New Revision: 37902 URL: http://svn.reactos.org/svn/reactos?rev=37902&view=rev Log: - move CONTEXT stuff from wdm.h to winddk.h / armddk.h - inlcude intrin.h in wdm.h - avoid redefining PCONTEXT - use intrinsics for BitScanForward/Reverse Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/arm/armddk.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=3790… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sat Dec 6 12:31:33 2008 @@ -9,7 +9,11 @@ #include <ntdef.h> #include <ntstatus.h> - +#ifdef __GNUC__ +#include "intrin.h" +#endif + +typedef struct _CONTEXT *PCONTEXT; // // Resource list definitions @@ -582,131 +586,6 @@ #define SERVICE_DEMAND_START 0x00000003 #define SERVICE_DISABLED 0x00000004 - - -// -// Architecture Defined Contexts -// -#if defined(_M_IX86) -#define SIZE_OF_80387_REGISTERS 80 -#define CONTEXT_i386 0x10000 -#define CONTEXT_i486 0x10000 -#define CONTEXT_CONTROL (CONTEXT_i386|0x00000001L) -#define CONTEXT_INTEGER (CONTEXT_i386|0x00000002L) -#define CONTEXT_SEGMENTS (CONTEXT_i386|0x00000004L) -#define CONTEXT_FLOATING_POINT (CONTEXT_i386|0x00000008L) -#define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386|0x00000010L) -#define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386|0x00000020L) -#define CONTEXT_FULL (CONTEXT_CONTROL|CONTEXT_INTEGER|CONTEXT_SEGMENTS) -#define MAXIMUM_SUPPORTED_EXTENSION 512 - -#define EXCEPTION_READ_FAULT 0 -#define EXCEPTION_WRITE_FAULT 1 -#define EXCEPTION_EXECUTE_FAULT 8 - -typedef struct _FLOATING_SAVE_AREA { - ULONG ControlWord; - ULONG StatusWord; - ULONG TagWord; - ULONG ErrorOffset; - ULONG ErrorSelector; - ULONG DataOffset; - ULONG DataSelector; - UCHAR RegisterArea[SIZE_OF_80387_REGISTERS]; - ULONG Cr0NpxState; -} FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA; - -typedef struct _CONTEXT { - ULONG ContextFlags; - ULONG Dr0; - ULONG Dr1; - ULONG Dr2; - ULONG Dr3; - ULONG Dr6; - ULONG Dr7; - FLOATING_SAVE_AREA FloatSave; - ULONG SegGs; - ULONG SegFs; - ULONG SegEs; - ULONG SegDs; - ULONG Edi; - ULONG Esi; - ULONG Ebx; - ULONG Edx; - ULONG Ecx; - ULONG Eax; - ULONG Ebp; - ULONG Eip; - ULONG SegCs; - ULONG EFlags; - ULONG Esp; - ULONG SegSs; - UCHAR ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; -} CONTEXT, *PCONTEXT; - -#elif defined(_M_AMD64) -#error FIXME-TODO: 64-bit -#elif defined(_M_ARM) - -// -// FIXME: Move to armddk.h? -// - -/* The following flags control the contents of the CONTEXT structure. */ - -#define CONTEXT_ARM 0x0000040 -#define CONTEXT_CONTROL (CONTEXT_ARM | 0x00000001L) -#define CONTEXT_INTEGER (CONTEXT_ARM | 0x00000002L) - -#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) - -typedef struct _CONTEXT { - /* The flags values within this flag control the contents of - a CONTEXT record. - - If the context record is used as an input parameter, then - for each portion of the context record controlled by a flag - whose value is set, it is assumed that that portion of the - context record contains valid context. If the context record - is being used to modify a thread's context, then only that - portion of the threads context will be modified. - - If the context record is used as an IN OUT parameter to capture - the context of a thread, then only those portions of the thread's - context corresponding to set flags will be returned. - - The context record is never used as an OUT only parameter. */ - - ULONG ContextFlags; - - /* This section is specified/returned if the ContextFlags word contains - the flag CONTEXT_INTEGER. */ - ULONG R0; - ULONG R1; - ULONG R2; - ULONG R3; - ULONG R4; - ULONG R5; - ULONG R6; - ULONG R7; - ULONG R8; - ULONG R9; - ULONG R10; - ULONG R11; - ULONG R12; - - ULONG Sp; - ULONG Lr; - ULONG Pc; - ULONG Psr; -} CONTEXT, *PCONTEXT; - -#else -#error "Undefined processor architecture" -#endif - - - // // Exception Records // Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sat Dec 6 12:31:33 2008 @@ -214,6 +214,10 @@ #define KERNEL_STACK_SIZE 12288 #define KERNEL_LARGE_STACK_SIZE 61440 #define KERNEL_LARGE_STACK_COMMIT 12288 + +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 #define DPFLTR_ERROR_LEVEL 0 #define DPFLTR_WARNING_LEVEL 1 @@ -5448,6 +5452,58 @@ #ifdef _X86_ +#define SIZE_OF_80387_REGISTERS 80 +#define CONTEXT_i386 0x10000 +#define CONTEXT_i486 0x10000 +#define CONTEXT_CONTROL (CONTEXT_i386|0x00000001L) +#define CONTEXT_INTEGER (CONTEXT_i386|0x00000002L) +#define CONTEXT_SEGMENTS (CONTEXT_i386|0x00000004L) +#define CONTEXT_FLOATING_POINT (CONTEXT_i386|0x00000008L) +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386|0x00000010L) +#define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386|0x00000020L) +#define CONTEXT_FULL (CONTEXT_CONTROL|CONTEXT_INTEGER|CONTEXT_SEGMENTS) +#define MAXIMUM_SUPPORTED_EXTENSION 512 + +typedef struct _FLOATING_SAVE_AREA { + ULONG ControlWord; + ULONG StatusWord; + ULONG TagWord; + ULONG ErrorOffset; + ULONG ErrorSelector; + ULONG DataOffset; + ULONG DataSelector; + UCHAR RegisterArea[SIZE_OF_80387_REGISTERS]; + ULONG Cr0NpxState; +} FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA; + +typedef struct _CONTEXT { + ULONG ContextFlags; + ULONG Dr0; + ULONG Dr1; + ULONG Dr2; + ULONG Dr3; + ULONG Dr6; + ULONG Dr7; + FLOATING_SAVE_AREA FloatSave; + ULONG SegGs; + ULONG SegFs; + ULONG SegEs; + ULONG SegDs; + ULONG Edi; + ULONG Esi; + ULONG Ebx; + ULONG Edx; + ULONG Ecx; + ULONG Eax; + ULONG Ebp; + ULONG Eip; + ULONG SegCs; + ULONG EFlags; + ULONG Esp; + ULONG SegSs; + UCHAR ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; +} CONTEXT; + // // Types to use to contain PFNs and their counts. // Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Dec 6 12:31:33 2008 @@ -2229,7 +2229,7 @@ DWORD64 LastBranchFromRip; DWORD64 LastExceptionToRip; DWORD64 LastExceptionFromRip; -} CONTEXT, *PCONTEXT; +} CONTEXT; typedef struct _KNONVOLATILE_CONTEXT_POINTERS { @@ -2299,7 +2299,7 @@ NTSYSAPI VOID __cdecl -RtlRestoreContext(PCONTEXT ContextRecord, +RtlRestoreContext(struct _CONTEXT *ContextRecord, struct _EXCEPTION_RECORD *ExceptionRecord); NTSYSAPI @@ -4796,29 +4796,8 @@ #endif } -static __inline__ BOOLEAN -BitScanReverse(OUT ULONG *Index, - IN ULONG Mask) -{ - BOOLEAN BitPosition = 0; -#if defined(_M_IX86) - __asm__ __volatile__("bsrl %2,%0\n\t" - "setnz %1\n\t" - :"=&r" (*Index), "=q" (BitPosition) - :"rm" (Mask) - :"memory"); - return BitPosition; -#else - /* Slow implementation for now */ - for( *Index = 31; *Index; (*Index)-- ) { - if( (1<<*Index) & Mask ) { - return TRUE; - } - } - - return FALSE; -#endif -} +#define BitScanForward _BitScanForward +#define BitScanReverse _BitScanReverse #endif Modified: trunk/reactos/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk… ============================================================================== --- trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] Sat Dec 6 12:31:33 2008 @@ -57,6 +57,53 @@ { ULONG Reserved; } KFLOATING_SAVE, *PKFLOATING_SAVE; + +/* The following flags control the contents of the CONTEXT structure. */ +#define CONTEXT_ARM 0x0000040 +#define CONTEXT_CONTROL (CONTEXT_ARM | 0x00000001L) +#define CONTEXT_INTEGER (CONTEXT_ARM | 0x00000002L) +#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) + +typedef struct _CONTEXT { + /* The flags values within this flag control the contents of + a CONTEXT record. + + If the context record is used as an input parameter, then + for each portion of the context record controlled by a flag + whose value is set, it is assumed that that portion of the + context record contains valid context. If the context record + is being used to modify a thread's context, then only that + portion of the threads context will be modified. + + If the context record is used as an IN OUT parameter to capture + the context of a thread, then only those portions of the thread's + context corresponding to set flags will be returned. + + The context record is never used as an OUT only parameter. */ + + ULONG ContextFlags; + + /* This section is specified/returned if the ContextFlags word contains + the flag CONTEXT_INTEGER. */ + ULONG R0; + ULONG R1; + ULONG R2; + ULONG R3; + ULONG R4; + ULONG R5; + ULONG R6; + ULONG R7; + ULONG R8; + ULONG R9; + ULONG R10; + ULONG R11; + ULONG R12; + + ULONG Sp; + ULONG Lr; + ULONG Pc; + ULONG Psr; +} CONTEXT; // // Processor Control Region

1 0

[tkreuzer] 37901: rename section "init" to "INIT", so that pefixup will actually recognize it
by tkreuzer＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: tkreuzer Date: Sat Dec 6 12:25:06 2008 New Revision: 37901 URL: http://svn.reactos.org/svn/reactos?rev=37901&view=rev Log: rename section "init" to "INIT", so that pefixup will actually recognize it Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Sat Dec 6 12:25:06 2008 @@ -6,7 +6,7 @@ */ #define PLACE_IN_SECTION(s) __attribute__((section (s))) #ifdef __GNUC__ -#define INIT_FUNCTION PLACE_IN_SECTION("init") +#define INIT_FUNCTION PLACE_IN_SECTION("INIT") #define PAGE_LOCKED_FUNCTION PLACE_IN_SECTION("pagelk") #define PAGE_UNLOCKED_FUNCTION PLACE_IN_SECTION("pagepo") #else

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs