Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 28160: - implement quick 'n dirty HTML api status output - change test function return type to INT - add ASSERT macro - include some more headers
by tkreuzer＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: tkreuzer Date: Sat Aug 4 20:45:12 2007 New Revision: 28160 URL: http://svn.reactos.org/svn/reactos?rev=28160&view=rev Log: - implement quick 'n dirty HTML api status output - change test function return type to INT - add ASSERT macro - include some more headers Modified: trunk/rostests/apitests/apitest.c trunk/rostests/apitests/apitest.h trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c trunk/rostests/apitests/w32knapi/testlist.c trunk/rostests/apitests/w32knapi/w32knapi.c trunk/rostests/apitests/w32knapi/w32knapi.h Modified: trunk/rostests/apitests/apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.c?rev=28… ============================================================================== --- trunk/rostests/apitests/apitest.c (original) +++ trunk/rostests/apitests/apitest.c Sat Aug 4 20:45:12 2007 @@ -1,24 +1,74 @@ #include "apitest.h" +const char szFileHeader[] = "<html><head><style>\ntd.red {color:red}\ntd.green{color:green}\n</style>\n</head>\n<body>\n<head>\n"; +const char szTableHeader[] = "<table width = '800'><tr><th align='left'>Function</th><th align='left'>Status</th><th align='left'>Tests (all/passed/failed)</th><th align='left'>Regressions</th></tr>"; +const char szFileFooter[] = "</table></body></html>"; + void -OutputUsage(LPWSTR pszExe) +OutputUsage(LPWSTR pszName) { printf("\nUsage:\n\n"); - printf("%ls <TestName> - perform individual test\n", pszExe); - printf("%ls all - perform all tests\n", pszExe); - printf("%ls status - create api status file\n", pszExe); - printf("%ls -r ... - perform regression testing\n", pszExe); + printf("%ls.exe <TestName> - perform individual test\n", pszName); + printf("%ls.exe all - perform all tests\n", pszName); + printf("%ls.exe status - create api status file\n", pszName); + printf("%ls.exe -r ... - perform regression testing\n", pszName); printf("\n"); } +BOOL +WriteFileHeader(UINT hFile, LPWSTR pszModule) +{ + char szHeader[100]; + + write(hFile, szFileHeader, strlen(szFileHeader)); + sprintf(szHeader, "<H1>Test results for %ls</H1>", pszModule); + write(hFile, szHeader, strlen(szHeader)); + write(hFile, szTableHeader, strlen(szTableHeader)); + return TRUE; +} + +BOOL +WriteRow(UINT hFile, LPWSTR pszFunction, PTESTINFO pti) +{ + char szLine[500]; + + sprintf(szLine, "<tr><td>%ls</td>", pszFunction); + + switch(pti->nApiStatus) + { + case APISTATUS_NOT_FOUND: + strcat(szLine, "<td class='red'>not found</td>"); + break; + case APISTATUS_UNIMPLEMENTED: + strcat(szLine, "<td class='red'>unimplemented</td>"); + break; + case APISTATUS_ASSERTION_FAILED: + strcat(szLine, "<td class='red'>assertion failed</td>"); + break; + case APISTATUS_REGRESSION: + strcat(szLine, "<td class='red'>Regression!</td>"); + break; + case APISTATUS_NORMAL: + strcat(szLine, "<td class='green'>Implemented</td>"); + break; + } + + sprintf(szLine + strlen(szLine), "<td>%d / %d / %d</td><td>%d</td></tr>\n", + pti->passed+pti->failed, pti->passed, pti->failed, pti->rfailed); + + write(hFile, szLine, strlen(szLine)); + return TRUE; +} + int -TestMain(LPWSTR pszExe) +TestMain(LPWSTR pszName, LPWSTR pszModule) { INT argc, i, j; LPWSTR *argv; TESTINFO ti; INT opassed, ofailed, orfailed; BOOL bAll, bStatus; + UINT hFile = 0; ti.bRegress = FALSE; bAll = FALSE; @@ -29,7 +79,7 @@ if (argc < 2) { - OutputUsage(pszExe); + OutputUsage(pszName); return 0; } @@ -53,8 +103,16 @@ if (bStatus) { - printf("Output of API status is unimplemented.\n"); - return 0; + ti.bRegress = TRUE; + char szOutputFile[MAX_PATH]; + wsprintf(szOutputFile, "%ls.html", pszName); + hFile = open(szOutputFile, O_CREAT | O_TRUNC | O_RDWR, 00700); + if (hFile == -1) + { + printf("Could not create output file.\n"); + return 0; + } + WriteFileHeader(hFile, pszModule); } for (i = 0; i < NumTests(); i++) @@ -69,15 +127,22 @@ if (!IsFunctionPresent(TestList[i].Test)) { printf("Function %ls was not found!\n", TestList[i].Test); + ti.nApiStatus = APISTATUS_NOT_FOUND; } else { printf("Executing test: %ls\n", TestList[i].Test); - TestList[i].Proc(&ti); + ti.nApiStatus = TestList[i].Proc(&ti); opassed += ti.passed; ofailed += ti.failed; orfailed += ti.rfailed; printf(" tests: %d, passed: %d, failed: %d\n\n", ti.passed+ti.failed, ti.passed, ti.failed); + } + if (bStatus) + { + if (ti.rfailed > 0) + ti.nApiStatus = APISTATUS_REGRESSION; + WriteRow(hFile, TestList[i].Test, &ti); } break; } @@ -94,5 +159,11 @@ if (ti.bRegress) return ti.rfailed; + if (bStatus) + { + write(hFile, szFileFooter, strlen(szFileFooter)); + close(hFile); + } + return ti.failed; } Modified: trunk/rostests/apitests/apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.h?rev=28… ============================================================================== --- trunk/rostests/apitests/apitest.h (original) +++ trunk/rostests/apitests/apitest.h Sat Aug 4 20:45:12 2007 @@ -4,11 +4,16 @@ #define WINVER 0x501 #include <stdlib.h> - #include <stdarg.h> #include <stdio.h> +#include <fcntl.h> #include <windows.h> +#define APISTATUS_NORMAL 0 +#define APISTATUS_NOT_FOUND 1 +#define APISTATUS_UNIMPLEMENTED 2 +#define APISTATUS_ASSERTION_FAILED 3 +#define APISTATUS_REGRESSION 4 /* type definitions */ @@ -18,9 +23,10 @@ INT failed; INT rfailed; BOOL bRegress; + INT nApiStatus; } TESTINFO, *PTESTINFO; -typedef BOOL (*TESTPROC)(PTESTINFO); +typedef INT (*TESTPROC)(PTESTINFO); typedef struct tagTEST { @@ -77,7 +83,14 @@ } -int TestMain(LPWSTR pszExe); +#define ASSERT(x) \ + if (!(x)) \ + { \ + printf("Assertion failed in %s:%d (%s)\n", __FILE__, __LINE__, #x);\ + return APISTATUS_ASSERTION_FAILED; \ + } + +int TestMain(LPWSTR pszExe, LPWSTR pszModule); extern TESTENTRY TestList[]; INT NumTests(void); BOOL IsFunctionPresent(LPWSTR lpszFunction); Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c Sat Aug 4 20:45:12 2007 @@ -10,7 +10,7 @@ return (HANDLE)Syscall(L"NtGdiDdCreateDirectDrawObject", 1, &hdc); } -BOOL +INT Test_NtGdiDdCreateDirectDrawObject(PTESTINFO pti) { HDC hdc=CreateDCW(L"Display",NULL,NULL,NULL); @@ -21,5 +21,5 @@ DeleteDC(hdc); - return TRUE; + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c Sat Aug 4 20:45:12 2007 @@ -10,10 +10,10 @@ return (BOOL)Syscall(L"NtGdiDdDeleteDirectDrawObject", 1, &hDirectDrawLocal); } -BOOL +INT Test_NtGdiDdDeleteDirectDrawObject(PTESTINFO pti) { TEST(NtGdiDdDeleteDirectDrawObject(NULL) == 0); - return TRUE; + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Sat Aug 4 20:45:12 2007 @@ -19,9 +19,9 @@ return (HANDLE)Syscall("NtGdiDdQueryDirectDrawObject", 11, &hDirectDrawLocal); } #endif -BOOL +INT Test_NtGdiDdQueryDirectDrawObject(PTESTINFO pti) { - return TRUE; + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c Sat Aug 4 20:45:12 2007 @@ -1,6 +1,4 @@ #include "../w32knapi.h" - -typedef int ARCTYPE; BOOL STDCALL @@ -19,7 +17,7 @@ return (BOOL)Syscall(L"NtGdiArcInternal", 10, &arctype); } -BOOL +INT Test_NtGdiArcInternal(PTESTINFO pti) { HDC hDC = CreateDCW(L"Display",NULL,NULL,NULL); @@ -53,5 +51,5 @@ DeleteDC(hDC); - return TRUE; + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c Sat Aug 4 20:45:12 2007 @@ -10,7 +10,7 @@ } -BOOL +INT Test_NtGdiGetBitmapBits(PTESTINFO pti) { BYTE Bits[50] = {0,1,2,3,4,5,6,7,8,9}; @@ -70,5 +70,5 @@ DeleteObject(hBitmap); - return TRUE; + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c Sat Aug 4 20:45:12 2007 @@ -10,7 +10,7 @@ } -BOOL +INT Test_NtGdiSetBitmapBits(PTESTINFO pti) { BYTE Bits[50] = {0,1,2,3,4,5,6,7,8,9}; @@ -70,5 +70,5 @@ DeleteObject(hBitmap); - return TRUE; + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c Sat Aug 4 20:45:12 2007 @@ -8,11 +8,10 @@ return Syscall(L"NtUserCountClipboardFormats", 0, &p); } -BOOL +INT Test_NtUserCountClipboardFormats(PTESTINFO pti) { - TEST(NtUserCountClipboardFormats() < 1000); - TEST(TRUE); - return TRUE; + RTEST(NtUserCountClipboardFormats() < 1000); + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Sat Aug 4 20:45:12 2007 @@ -7,25 +7,29 @@ #include "ntdd/NtGdiDdQueryDirectDrawObject.c" #include "ntgdi/NtGdiArcInternal.c" +//#include "ntgdi/NtGdiDoPalette.c" +#include "ntgdi/NtGdiGetBitmapBits.c" #include "ntgdi/NtGdiSetBitmapBits.c" -#include "ntgdi/NtGdiGetBitmapBits.c" +//#include "ntgdi/NtGdiSTROBJ_vEnumStart.c" #include "ntuser/NtUserCountClipboardFormats.c" /* The List of tests */ TESTENTRY TestList[] = { - /* DirectDraw */ + /* DirectDraw */ { L"NtGdiDdCreateDirectDrawObject", Test_NtGdiDdCreateDirectDrawObject }, { L"NtGdiDdDeleteDirectDrawObject", Test_NtGdiDdDeleteDirectDrawObject }, { L"NtGdiDdQueryDirectDrawObject", Test_NtGdiDdQueryDirectDrawObject }, - /* ntgdi */ + /* ntgdi */ { L"NtGdiArcInternal", Test_NtGdiArcInternal }, +// { L"NtGdiDoPalette", Test_NtGdiDoPalette }, { L"NtGdiGetBitmapBits", Test_NtGdiGetBitmapBits }, { L"NtGdiSetBitmapBits", Test_NtGdiSetBitmapBits }, +// { L"NtGdiSTROBJ_vEnumStart", Test_NtGdiSTROBJ_vEnumStart }, - /* ntuser */ + /* ntuser */ { L"NtUserCountClipboardFormats", Test_NtUserCountClipboardFormats } }; Modified: trunk/rostests/apitests/w32knapi/w32knapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.c (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.c Sat Aug 4 20:45:12 2007 @@ -155,7 +155,7 @@ printf("\n"); - TestMain(L"w32knapi.exe"); + TestMain(L"w32knapi", L"win32k.sys Nt-Api"); return 0; } Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h Sat Aug 4 20:45:12 2007 @@ -2,7 +2,14 @@ #define _W32KNAPI_H #include "../apitest.h" + #include <ddk/winddi.h> +#include <ddk/ntddk.h> + +/* Public Win32K Headers */ +#include <win32k/callback.h> +#include <win32k/ntusrtyp.h> +#include <win32k/ntgdityp.h> #define OS_UNSUPPORTED 0 #define OS_REACTOS 1

1 0

[ekohl] 28159: Add remaining sticky keys options.
by ekohl＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: ekohl Date: Sat Aug 4 20:41:30 2007 New Revision: 28159 URL: http://svn.reactos.org/svn/reactos?rev=28159&view=rev Log: Add remaining sticky keys options. Modified: trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/hu-HU.rc trunk/reactos/dll/cpl/access/lang/id-ID.rc trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/access/resource.h Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Sat Aug 4 20:41:30 2007 @@ -21,6 +21,7 @@ STICKYKEYS oldStickyKeys; FILTERKEYS filterKeys; TOGGLEKEYS toggleKeys; + BOOL bKeyboardPref; } GLOBAL_DATA, *PGLOBAL_DATA; @@ -57,6 +58,13 @@ IDC_STICKY_UNLOCK_CHECK, pGlobalData->stickyKeys.dwFlags & SKF_TWOKEYSOFF ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, + IDC_STICKY_SOUND_CHECK, + pGlobalData->stickyKeys.dwFlags & SKF_AUDIBLEFEEDBACK ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, + IDC_STICKY_STATUS_CHECK, + pGlobalData->stickyKeys.dwFlags & SKF_INDICATOR ? BST_CHECKED : BST_UNCHECKED); break; case WM_COMMAND: @@ -72,6 +80,14 @@ case IDC_STICKY_UNLOCK_CHECK: pGlobalData->stickyKeys.dwFlags ^= SKF_TWOKEYSOFF; + break; + + case IDC_STICKY_SOUND_CHECK: + pGlobalData->stickyKeys.dwFlags ^= SKF_AUDIBLEFEEDBACK; + break; + + case IDC_STICKY_STATUS_CHECK: + pGlobalData->stickyKeys.dwFlags ^= SKF_INDICATOR; break; case IDOK: @@ -206,6 +222,15 @@ return; } + /* Get keyboard preference information */ + if (!SystemParametersInfo(SPI_GETKEYBOARDPREF, + 0, + &pGlobalData->bKeyboardPref, + 0)) + { + return; + } + CheckDlgButton(hwndDlg, IDC_STICKY_BOX, pGlobalData->stickyKeys.dwFlags & SKF_STICKYKEYSON ? BST_CHECKED : BST_UNCHECKED); @@ -217,6 +242,10 @@ CheckDlgButton(hwndDlg, IDC_TOGGLE_BOX, pGlobalData->toggleKeys.dwFlags & TKF_TOGGLEKEYSON ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, + IDC_KEYBOARD_EXTRA, + pGlobalData->bKeyboardPref ? BST_CHECKED : BST_UNCHECKED); } @@ -288,6 +317,11 @@ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; + case IDC_KEYBOARD_EXTRA: + pGlobalData->bKeyboardPref = !pGlobalData->bKeyboardPref; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + default: break; } @@ -312,6 +346,11 @@ &pGlobalData->toggleKeys, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE /*0*/); + SystemParametersInfo(SPI_SETKEYBOARDPREF, + pGlobalData->bKeyboardPref, + NULL, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE /*0*/); + return TRUE; } break; Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/access/lang/cs-CZ.rc Sat Aug 4 20:41:30 2007 @@ -18,7 +18,7 @@ LTEXT "Pouijte funkci Ozvuèení kláves, chcete-li být upozornìni na stisk kláves Caps Lock, Num Lock a Scroll Lock zvukovým signálem.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)+6 AUTOCHECKBOX "Pouívat funkci O&zvuèení kláves",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+4,PROPSHEETPADDING(20),14 PUSHBUTTON "Na&stavení",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+4,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "&V programech zobrazovat dodateènou nápovìdu ke klávesám.",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "&V programech zobrazovat dodateènou nápovìdu ke klávesám.",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -104,6 +104,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc Sat Aug 4 20:41:30 2007 @@ -20,7 +20,7 @@ LTEXT "Benutzen Sie die Signalfunktion, wenn Sie einen Signalton hören wollen, wenn Sie Caps-, Num-, oder Scroll-Lock drücken.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) AUTOCHECKBOX "&Signalfunktion benutzen",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETPADDING(15),14 PUSHBUTTON "Ei&nstellungen",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "Extra Tastaturhilfe in den P&rogrammen anzeigen ",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Extra Tastaturhilfe in &Programmen anzeigen ",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -106,6 +106,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/access/lang/en-US.rc Sat Aug 4 20:41:30 2007 @@ -18,7 +18,7 @@ LTEXT "Use ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) AUTOCHECKBOX "Use &ToggleKeys",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Setti&ngs",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -103,6 +103,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/access/lang/es-ES.rc Sat Aug 4 20:41:30 2007 @@ -21,7 +21,7 @@ LTEXT "Use &Teclas Activas si desea escuchar tonos al presionar Caps Lock, Num Lock, y Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) AUTOCHECKBOX "Usar Teclas Activas",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Opcio&nes",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -107,6 +107,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc Sat Aug 4 20:41:30 2007 @@ -19,7 +19,7 @@ LTEXT "Utilisez les touches &bascules si vous voulez entendre un son émis à chaques fois que vous appuyez sur Verr. maj, Verr. num, et Arrêt défil.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) AUTOCHECKBOX "Utiliser les touches bascules",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Para&mètres",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "&Afficher l'aide supplémentaire sur le clavier dans les programmes",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "&Afficher l'aide supplémentaire sur le clavier dans les programmes",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -105,6 +105,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/hu-HU.rc Sat Aug 4 20:41:30 2007 @@ -19,7 +19,7 @@ LTEXT "Ha a Caps Lock, Num Lock, és Scroll Lock billentyûk lenyomásakor hangot szeretne hallani, használja az Állásjelzõ hangok lehetõséget.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) AUTOCHECKBOX "Állásjelzõ hangok használata",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Beállítá&sok",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(8),14 -// AUTOCHECKBOX "Kibõvített billentyûzet segítség megjelenítése a programokban",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Kibõvített billentyûzet segítség megjelenítése a programokban",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -105,6 +105,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/access/lang/id-ID.rc Sat Aug 4 20:41:30 2007 @@ -20,7 +20,7 @@ LTEXT "Gunakan ToggleKeys jika anda ingin mendengan nada ketika menekan Caps Lock, Num Lock, dan Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) AUTOCHECKBOX "Gunakan &ToggleKeys",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Setelan&n",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -106,6 +106,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/access/lang/it-IT.rc Sat Aug 4 20:41:30 2007 @@ -18,7 +18,7 @@ LTEXT "Se vuoi un segnale acustico quando viene premuto Blocco Maiuscole, Num o Scr.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) AUTOCHECKBOX "Use &Bistabili",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Im&postazioni",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -104,6 +104,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ja-JP.rc Sat Aug 4 20:41:30 2007 @@ -18,7 +18,7 @@ LTEXT "ØèÖ¦L[@\\ðg¤ÆACapsLockANumLockAScrollLock L[ðµ½Æ«É¹ðÂçµÜ·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) AUTOCHECKBOX "ØèÖ¦L[@\\ðg¤(&T)",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Ýè(&N)",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "vOÅÇÁÌL[{[h wvð\\¦·é(&W)",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "vOÅÇÁÌL[{[h wvð\\¦·é(&W)",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -104,6 +104,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/nl-NL.rc Sat Aug 4 20:41:30 2007 @@ -20,7 +20,7 @@ LTEXT "U kunt schakeltoetsen gebruiken als u wilt dat er een geluid wordt weergegeven als u CapsLock, NumLock of ScrollLock indrukt.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) AUTOCHECKBOX "Schakeltoetsen gebruiken",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Inst&ellingen...",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "Extra hulp voor toetsenborden weergeven in programma's",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Extra hulp voor toetsenborden weergeven in programma's",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -106,6 +106,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Sat Aug 4 20:41:30 2007 @@ -21,7 +21,7 @@ LTEXT "U¿yj funkcji &Klawisze Prze³¹czaj¹ce, jeli chcesz s³yszeæ dwiêk przy naciskaniu klawiszy Caps Lock, Num Lock albo Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) AUTOCHECKBOX "U¿yj Klawiszy Prze³¹czaj¹cych",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Ustawie&nia",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -107,6 +107,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc Sat Aug 4 20:41:30 2007 @@ -18,7 +18,7 @@ LTEXT "Îçâó÷èâàíèå íàæàòèÿ êëàâèø ïåðåêëþ÷åíèÿ ðåæèìîâ Caps Lock, Num Lock è Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) AUTOCHECKBOX "&Îçâó÷èâàíèå",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Íà&ñòðîéêà",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(20)+6,PROPSHEETPADDING(15)-5,14 -// AUTOCHECKBOX "&Äîïîëíèòåëüíûå ñâåäåíèÿ î ðàáîòå ñ êëàâèàòóðîé",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "&Äîïîëíèòåëüíûå ñâåäåíèÿ î ðàáîòå ñ êëàâèàòóðîé",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -104,6 +104,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Îòìåíà", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/access/resource.h (original) +++ trunk/reactos/dll/cpl/access/resource.h Sat Aug 4 20:41:30 2007 @@ -40,11 +40,12 @@ #define IDC_FILTER_BUTTON 203 #define IDC_TOGGLE_BOX 204 #define IDC_TOGGLE_BUTTON 205 +#define IDC_KEYBOARD_EXTRA 206 -#define IDC_SENTRY_BOX 206 -#define IDC_SENTRY_TEXT 207 -#define IDC_SENTRY_COMBO 208 -#define IDC_SSHOW_BOX 209 +#define IDC_SENTRY_BOX 207 +#define IDC_SENTRY_TEXT 208 +#define IDC_SENTRY_COMBO 209 +#define IDC_SSHOW_BOX 210 #define IDC_CONTRAST_BOX 211 #define IDC_CONTRAST_BUTTON 212 @@ -62,7 +63,7 @@ #define IDC_STICKY_ACTIVATE_CHECK 221 #define IDC_STICKY_LOCK_CHECK 222 #define IDC_STICKY_UNLOCK_CHECK 223 -#define IDC_STICKY_SIGNAL_CHECK 224 +#define IDC_STICKY_SOUND_CHECK 224 #define IDC_STICKY_STATUS_CHECK 225 #endif /* __CPL_RESOURCE_H */

1 0

[cwittich] 28158: Fix scanning affinity in IoConnectInterrupt (patch by w3seek)
by cwittich＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: cwittich Date: Sat Aug 4 19:52:17 2007 New Revision: 28158 URL: http://svn.reactos.org/svn/reactos?rev=28158&view=rev Log: Fix scanning affinity in IoConnectInterrupt (patch by w3seek) Modified: trunk/reactos/ntoskrnl/io/iomgr/irq.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irq.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irq.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irq.c Sat Aug 4 19:52:17 2007 @@ -74,6 +74,7 @@ RtlZeroMemory(IoInterrupt, sizeof(IO_INTERRUPT)); /* Now create all the interrupts */ + Affinity = ProcessorEnableMask & KeActiveProcessors; for (Count = 0; Affinity; Count++, Affinity >>= 1) { /* Check if it's enabled for this CPU */

1 0

[spetreolle] 28157: C uses / as dir separator, not \
by spetreolle＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: spetreolle Date: Sat Aug 4 17:22:48 2007 New Revision: 28157 URL: http://svn.reactos.org/svn/reactos?rev=28157&view=rev Log: C uses / as dir separator, not \ Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c trunk/rostests/apitests/w32knapi/testlist.c trunk/rostests/apitests/w32knapi/w32knapi.h Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c Sat Aug 4 17:22:48 2007 @@ -1,4 +1,4 @@ -#include "..\w32knapi.h" +#include "../w32knapi.h" W32KAPI HANDLE Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c Sat Aug 4 17:22:48 2007 @@ -1,4 +1,4 @@ -#include "..\w32knapi.h" +#include "../w32knapi.h" W32KAPI BOOL Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Sat Aug 4 17:22:48 2007 @@ -1,4 +1,4 @@ -#include "..\w32knapi.h" +#include "../w32knapi.h" #if 0 W32KAPI BOOL STDCALL Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Sat Aug 4 17:22:48 2007 @@ -1,4 +1,4 @@ -#include "..\apitest.h" +#include "../apitest.h" /* include the tests */ Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h Sat Aug 4 17:22:48 2007 @@ -1,7 +1,7 @@ #ifndef _W32KNAPI_H #define _W32KNAPI_H -#include "..\apitest.h" +#include "../apitest.h" #include <ddk/winddi.h> #define OS_UNSUPPORTED 0

1 0

[gedmurphy] 28156: revert the unicode build for now as it causes a problem with our gcc build
by gedmurphy＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: gedmurphy Date: Sat Aug 4 15:19:51 2007 New Revision: 28156 URL: http://svn.reactos.org/svn/reactos?rev=28156&view=rev Log: revert the unicode build for now as it causes a problem with our gcc build Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.rbuild (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Sat Aug 4 15:19:51 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="yes" allowwarnings="yes" stdlib="host"> +<module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="no" allowwarnings="yes" stdlib="host"> <include base="sol">.</include> <include base="sol">cardlib</include> <linkerflag>-lstdc++</linkerflag>

1 0

[fireball] 28155: - Fix kernel32 compile.
by fireball＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: fireball Date: Sat Aug 4 14:59:01 2007 New Revision: 28155 URL: http://svn.reactos.org/svn/reactos?rev=28155&view=rev Log: - Fix kernel32 compile. Modified: trunk/reactos/dll/win32/kernel32/k32.h Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?r… ============================================================================== --- trunk/reactos/dll/win32/kernel32/k32.h (original) +++ trunk/reactos/dll/win32/kernel32/k32.h Sat Aug 4 14:59:01 2007 @@ -16,6 +16,11 @@ #define _KERNEL32_ #include <windows.h> #include <tlhelp32.h> + +#ifdef __GNUC__ +#include "intrin.h" +#endif + #include <ndk/ntndk.h> /* CSRSS Header */

1 0

[ekohl] 28154: - Ask the user when he closes the window only if the game is still running.
by ekohl＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: ekohl Date: Sat Aug 4 14:22:44 2007 New Revision: 28154 URL: http://svn.reactos.org/svn/reactos?rev=28154&view=rev Log: - Ask the user when he closes the window only if the game is still running. Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/solitaire/solitaire.h 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 (original) +++ trunk/reactos/base/applications/games/solitaire/solgame.cpp Sat Aug 4 14:22:44 2007 @@ -121,6 +121,8 @@ } } + fGameStarted = true; + TRACE("EXIT RowStackDropProc(true)\n"); return true; } @@ -248,6 +250,7 @@ { pSuitStack[i]->Flash(11, 100); } + fGameStarted = false; } TRACE("EXIT SuitStackAddProc()\n"); } @@ -273,6 +276,8 @@ if(pDest != 0) { + fGameStarted = true; + //stackobj.MoveCards(pDest, 1, true); //use the SimulateDrag funcion, because we get the //AddProc callbacks called for us on the destination stacks... 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 (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Sat Aug 4 14:22:44 2007 @@ -415,6 +415,7 @@ static int nWidth, nHeight; int nStatusHeight = 0;//20; int parts[] = { 100, -1 }; + int ret; MINMAXINFO *mmi; @@ -492,7 +493,20 @@ return 0; case WM_CLOSE: - DestroyWindow(hwnd); + if (fGameStarted == false) + { + DestroyWindow(hwnd); + return 0; + } + else + { + ret = MessageBox(hwnd, MsgQuit, szAppName, MB_OKCANCEL|MB_ICONQUESTION); + if (ret == IDOK) + { + WinHelp(hwnd, szHelpPath, HELP_QUIT, 0); + DestroyWindow(hwnd); + } + } return 0; } Modified: trunk/reactos/base/applications/games/solitaire/solitaire.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.h (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.h Sat Aug 4 14:22:44 2007 @@ -3,7 +3,7 @@ extern CardWindow SolWnd; extern TCHAR szAppName[]; -extern bool fGameStarted; +extern bool fGameStarted; #define OPTION_THREE_CARDS 8 #define CARDBACK_START IDC_CARDBACK1

1 0

[fireball] 28153: - Fix NtSetInformationThread(ThreadBasePriority) - Fix buffer overflow in KeRosDumpStackFrames - Fix usage of garbage/uninitialized handle entry local variable in ObpCreateHandle - Fix buffer overflow and logic bug in IoConnectInterrupt - Fix MSVC warnings
by fireball＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: fireball Date: Sat Aug 4 12:49:47 2007 New Revision: 28153 URL: http://svn.reactos.org/svn/reactos?rev=28153&view=rev Log: - Fix NtSetInformationThread(ThreadBasePriority) - Fix buffer overflow in KeRosDumpStackFrames - Fix usage of garbage/uninitialized handle entry local variable in ObpCreateHandle - Fix buffer overflow and logic bug in IoConnectInterrupt - Fix MSVC warnings Modified: trunk/reactos/include/ndk/ntndk.h trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/config/cmname.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/ex/fmutex.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/io/iomgr/controller.c trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/deviface.c trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c trunk/reactos/ntoskrnl/io/iomgr/error.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c trunk/reactos/ntoskrnl/io/iomgr/irq.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/procobj.c trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/lpc/complete.c trunk/reactos/ntoskrnl/lpc/connect.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/lpc/send.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/include/ndk/ntndk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ntndk.h?rev=28… ============================================================================== --- trunk/reactos/include/ndk/ntndk.h (original) +++ trunk/reactos/include/ndk/ntndk.h Sat Aug 4 12:49:47 2007 @@ -38,7 +38,6 @@ #include <excpt.h> // C Standard Header #include <stdarg.h> // C Standard Header #include <umtypes.h> // General Definitions -#include <intrin.h> // Use Inlined Intrinsics // // Type Headers Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=28153… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c (original) +++ trunk/reactos/ntoskrnl/cc/fs.c Sat Aug 4 12:49:47 2007 @@ -239,6 +239,6 @@ UNIMPLEMENTED; return FALSE; #else - return CcRosReleaseFileCache(FileObject); + return NT_SUCCESS(CcRosReleaseFileCache(FileObject)); #endif } Modified: trunk/reactos/ntoskrnl/config/cmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmname.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmname.c (original) +++ trunk/reactos/ntoskrnl/config/cmname.c Sat Aug 4 12:49:47 2007 @@ -102,7 +102,7 @@ * that it will remain that way forever, so -never- assume this code * below internally! */ - return Length * sizeof(WCHAR); + return (USHORT)Length * sizeof(WCHAR); } LONG Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Sat Aug 4 12:49:47 2007 @@ -455,7 +455,7 @@ } /* Setup the unicode string */ - RtlInitEmptyUnicodeString(&CmpLoadOptions, Buffer, Length); + RtlInitEmptyUnicodeString(&CmpLoadOptions, Buffer, (USHORT)Length); /* Add the load options and null-terminate */ RtlAnsiStringToUnicodeString(&CmpLoadOptions, &LoadString, FALSE); Modified: trunk/reactos/ntoskrnl/ex/fmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fmutex.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fmutex.c (original) +++ trunk/reactos/ntoskrnl/ex/fmutex.c Sat Aug 4 12:49:47 2007 @@ -135,7 +135,7 @@ /* Erase the owner */ FastMutex->Owner = NULL; - OldIrql = FastMutex->OldIrql; + OldIrql = (KIRQL)FastMutex->OldIrql; /* Increase the count */ if (InterlockedIncrement(&FastMutex->Count) <= 0) Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=281… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sat Aug 4 12:49:47 2007 @@ -1094,7 +1094,7 @@ } /* Update length */ - CmCSDVersionString.MaximumLength = sizeof(Buffer) - Remaining; + CmCSDVersionString.MaximumLength = (USHORT)sizeof(Buffer) - Remaining; } /* Check if we have an RC number */ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Sat Aug 4 12:49:47 2007 @@ -65,7 +65,7 @@ ModuleInfo->ImageSize = LdrEntry->SizeOfImage; ModuleInfo->Flags = LdrEntry->Flags; ModuleInfo->LoadCount = LdrEntry->LoadCount; - ModuleInfo->LoadOrderIndex = ModuleCount; + ModuleInfo->LoadOrderIndex = (USHORT)ModuleCount; ModuleInfo->InitOrderIndex = 0; /* Setup name */ @@ -231,7 +231,7 @@ { ANSI_STRING AName; UNICODE_STRING WName; - BOOLEAN Result; + ARC_STATUS Result; PCH Value; ANSI_STRING AValue; UNICODE_STRING WValue; @@ -417,7 +417,7 @@ TRUE); if(NT_SUCCESS(Status)) { - BOOLEAN Result = HalSetEnvironmentVariable(AName.Buffer, + ARC_STATUS Result = HalSetEnvironmentVariable(AName.Buffer, AValue.Buffer); Status = (Result ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); @@ -766,7 +766,7 @@ SpiCur->UserTime.QuadPart = pr->Pcb.UserTime * 100000LL; SpiCur->KernelTime.QuadPart = pr->Pcb.KernelTime * 100000LL; SpiCur->ImageName.Length = strlen(pr->ImageFileName) * sizeof(WCHAR); - SpiCur->ImageName.MaximumLength = inLen; + SpiCur->ImageName.MaximumLength = (USHORT)inLen; SpiCur->ImageName.Buffer = (void*)(pCur+curSize); // copy name to the end of the struct @@ -1058,7 +1058,7 @@ for (Count = 0; HandleCount > 0 ; HandleCount--) { - Shi->Handles[i].UniqueProcessId = (ULONG)pr->UniqueProcessId; + Shi->Handles[i].UniqueProcessId = (USHORT)(ULONG)pr->UniqueProcessId; Count++; i++; } Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c Sat Aug 4 12:49:47 2007 @@ -372,7 +372,7 @@ if (InbvBootDriverInstalled) { /* Call bootvid */ - VidSolidColorFill(Left, Top, Width, Height, Color); + VidSolidColorFill(Left, Top, Width, Height, (UCHAR)Color); } /* FIXME: Headless */ Modified: trunk/reactos/ntoskrnl/io/iomgr/controller.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/controll… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/controller.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/controller.c Sat Aug 4 12:49:47 2007 @@ -92,7 +92,7 @@ /* Zero the Object and set its data */ RtlZeroMemory(Controller, sizeof(CONTROLLER_OBJECT) + Size); Controller->Type = IO_TYPE_CONTROLLER; - Controller->Size = sizeof(CONTROLLER_OBJECT) + Size; + Controller->Size = (CSHORT)sizeof(CONTROLLER_OBJECT) + Size; Controller->ControllerExtension = (Controller + 1); /* Initialize its Queue */ Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c Sat Aug 4 12:49:47 2007 @@ -765,7 +765,7 @@ * because that's only padding for the DevObjExt and not part of the Object. */ CreatedDeviceObject->Type = IO_TYPE_DEVICE; - CreatedDeviceObject->Size = sizeof(DEVICE_OBJECT) + DeviceExtensionSize; + CreatedDeviceObject->Size = (USHORT)sizeof(DEVICE_OBJECT) + DeviceExtensionSize; /* The kernel extension is after the driver internal extension */ DeviceObjectExtension = (PDEVOBJ_EXTENSION) @@ -1402,7 +1402,7 @@ IopStartNextPacketByKeyEx(DeviceObject, Key, DOE_SIO_WITH_KEY | - (Cancelable) ? DOE_SIO_CANCELABLE : 0); + (Cancelable ? DOE_SIO_CANCELABLE : 0)); } else { @@ -1431,7 +1431,7 @@ IopStartNextPacketByKeyEx(DeviceObject, 0, DOE_SIO_NO_KEY | - (Cancelable) ? DOE_SIO_CANCELABLE : 0); + (Cancelable ? DOE_SIO_CANCELABLE : 0)); } else { Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c Sat Aug 4 12:49:47 2007 @@ -300,7 +300,7 @@ } /* Open device key */ - KeyName.Length = KeyName.MaximumLength = DeviceBi->NameLength; + KeyName.Length = KeyName.MaximumLength = (USHORT)DeviceBi->NameLength; KeyName.Buffer = DeviceBi->Name; InitializeObjectAttributes( &ObjectAttributes, @@ -370,7 +370,7 @@ goto cleanup; } - KeyName.Length = KeyName.MaximumLength = ReferenceBi->NameLength; + KeyName.Length = KeyName.MaximumLength = (USHORT)ReferenceBi->NameLength; KeyName.Buffer = ReferenceBi->Name; if (RtlEqualUnicodeString(&KeyName, &Control, TRUE)) { @@ -475,7 +475,7 @@ Status = STATUS_UNSUCCESSFUL; goto cleanup; } - KeyName.Length = KeyName.MaximumLength = bip->DataLength - 4 * sizeof(WCHAR); + KeyName.Length = KeyName.MaximumLength = (USHORT)bip->DataLength - 4 * sizeof(WCHAR); KeyName.Buffer = &((PWSTR)bip->Data)[4]; if (KeyName.Length && KeyName.Buffer[KeyName.Length / sizeof(WCHAR)] == UNICODE_NULL) { @@ -976,7 +976,7 @@ return STATUS_INVALID_PARAMETER_1; } GuidString.Buffer = StartPosition; - GuidString.MaximumLength = GuidString.Length = (ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)StartPosition; + GuidString.MaximumLength = GuidString.Length = (USHORT)((ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)StartPosition); /* Get pointer to the PDO */ Status = IoGetDeviceObjectPointer( Modified: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/drvrlist… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c Sat Aug 4 12:49:47 2007 @@ -323,8 +323,8 @@ if (KeyInfo->NameLength < MAX_PATH * sizeof(WCHAR)) { - SubKeyName.Length = KeyInfo->NameLength; - SubKeyName.MaximumLength = KeyInfo->NameLength + sizeof(WCHAR); + SubKeyName.Length = (USHORT)KeyInfo->NameLength; + SubKeyName.MaximumLength = (USHORT)KeyInfo->NameLength + sizeof(WCHAR); SubKeyName.Buffer = KeyInfo->Name; SubKeyName.Buffer[SubKeyName.Length / sizeof(WCHAR)] = 0; Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c Sat Aug 4 12:49:47 2007 @@ -338,8 +338,8 @@ if (NT_SUCCESS(Status)) { /* Success, update the information */ - ObjectNameInfo->Name.Length = 100 - - DriverNameLength; + ObjectNameInfo->Name.Length = (USHORT)100 - + DriverNameLength; } } } @@ -434,7 +434,8 @@ /* Update size */ InterlockedExchangeAdd(&IopTotalLogSize, - -(LogEntry->Size - sizeof(ERROR_LOG_ENTRY))); + -(LONG)(LogEntry->Size - + sizeof(ERROR_LOG_ENTRY))); } /* Free the LPC Message */ @@ -557,7 +558,7 @@ /* Decrease total allocation size and free the entry */ InterlockedExchangeAdd(&IopTotalLogSize, - -(LogEntry->Size - sizeof(ERROR_LOG_ENTRY))); + -(LONG)(LogEntry->Size - sizeof(ERROR_LOG_ENTRY))); ExFreePool(LogEntry); } Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Aug 4 12:49:47 2007 @@ -512,7 +512,7 @@ StackLoc->Parameters.Create.EaLength = OpenPacket->EaLength; /* Set the flags */ - StackLoc->Flags = OpenPacket->Options; + StackLoc->Flags = (UCHAR)OpenPacket->Options; StackLoc->Flags |= !(Attributes & OBJ_CASE_INSENSITIVE) ? SL_CASE_SENSITIVE: 0; break; @@ -764,7 +764,8 @@ FileObject->DeviceObject = NULL; /* Save this now because the FO might go away */ - OpenCancelled = FileObject->Flags & FO_FILE_OPEN_CANCELLED; + OpenCancelled = FileObject->Flags & FO_FILE_OPEN_CANCELLED ? + TRUE : FALSE; /* Clear the file object in the open packet */ OpenPacket->FileObject = NULL; @@ -1370,9 +1371,10 @@ /* Setup the length and maximum length */ FileLength = (ULONG_PTR)p - (ULONG_PTR)ObjectNameInfo; - ObjectNameInfo->Name.Length = FileLength - sizeof(OBJECT_NAME_INFORMATION); - ObjectNameInfo->Name.MaximumLength = ObjectNameInfo->Name.Length + - sizeof(UNICODE_NULL); + ObjectNameInfo->Name.Length = (USHORT)FileLength - + sizeof(OBJECT_NAME_INFORMATION); + ObjectNameInfo->Name.MaximumLength = (USHORT)ObjectNameInfo->Name.Length + + sizeof(UNICODE_NULL); /* Free buffer and return */ ExFreePool(LocalInfo); @@ -1745,8 +1747,8 @@ OpenPacket.OriginalAttributes = *ObjectAttributes; OpenPacket.AllocationSize = SafeAllocationSize; OpenPacket.CreateOptions = CreateOptions; - OpenPacket.FileAttributes = FileAttributes; - OpenPacket.ShareAccess = ShareAccess; + OpenPacket.FileAttributes = (USHORT)FileAttributes; + OpenPacket.ShareAccess = (USHORT)ShareAccess; OpenPacket.EaBuffer = SystemEaBuffer; OpenPacket.EaLength = EaLength; OpenPacket.Options = Options; @@ -2078,7 +2080,7 @@ IoIsFileOriginRemote(IN PFILE_OBJECT FileObject) { /* Return the flag status */ - return (FileObject->Flags & FO_REMOTE_ORIGIN); + return FileObject->Flags & FO_REMOTE_ORIGIN ? TRUE : FALSE; } /* Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c Sat Aug 4 12:49:47 2007 @@ -533,8 +533,8 @@ /* Enumerate the Bus. */ BusString.Buffer = BasicInformation->Name; - BusString.Length = BasicInformation->NameLength; - BusString.MaximumLength = BasicInformation->NameLength; + BusString.Length = (USHORT)BasicInformation->NameLength; + BusString.MaximumLength = (USHORT)BasicInformation->NameLength; /* Open a handle to the Root Registry Key */ InitializeObjectAttributes( Modified: trunk/reactos/ntoskrnl/io/iomgr/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irq.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irq.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irq.c Sat Aug 4 12:49:47 2007 @@ -36,28 +36,28 @@ PIO_INTERRUPT IoInterrupt; PKSPIN_LOCK SpinLockUsed; BOOLEAN FirstRun = TRUE; - ULONG count; - LONG i; + CCHAR Count = 0; + KAFFINITY Affinity; PAGED_CODE(); /* Assume failure */ *InterruptObject = NULL; - /* Convert the Mask */ - ProcessorEnableMask &= ((1 << KeNumberProcessors) - 1); + /* Get the affinity */ + Affinity = ProcessorEnableMask & KeActiveProcessors; + while (Affinity) + { + /* Increase count */ + if (Affinity & 1) Count++; + Affinity >>= 1; + } - /* Make sure at least one CPU is on it */ - if (!ProcessorEnableMask) return STATUS_INVALID_PARAMETER; - - /* Determine the allocation */ - for (i = 0, count = 0; i < KeNumberProcessors; i++) - { - if (ProcessorEnableMask & (1 << i)) count++; - } + /* Make sure we have a valid CPU count */ + if (!Count) return STATUS_INVALID_PARAMETER; /* Allocate the array of I/O Interrupts */ IoInterrupt = ExAllocatePoolWithTag(NonPagedPool, - (count - 1)* sizeof(KINTERRUPT) + + (Count - 1) * sizeof(KINTERRUPT) + sizeof(IO_INTERRUPT), TAG_KINTERRUPT); if (!IoInterrupt) return STATUS_INSUFFICIENT_RESOURCES; @@ -74,10 +74,10 @@ RtlZeroMemory(IoInterrupt, sizeof(IO_INTERRUPT)); /* Now create all the interrupts */ - for (i = 0; i < KeNumberProcessors; i++) + for (Count = 0; Affinity; Count++, Affinity >>= 1) { /* Check if it's enabled for this CPU */ - if (ProcessorEnableMask & (1 << i)) + if (Affinity & 1) { /* Check which one we will use */ InterruptUsed = FirstRun ? &IoInterrupt->FirstInterrupt : Interrupt; @@ -92,7 +92,7 @@ SynchronizeIrql, InterruptMode, ShareVector, - i, + Count, FloatingSave); /* Connect it */ @@ -122,7 +122,7 @@ else { /* Move on to the next one */ - IoInterrupt->Interrupt[i] = Interrupt++; + IoInterrupt->Interrupt[(UCHAR)Count] = Interrupt++; } } } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpnoti… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c Sat Aug 4 12:49:47 2007 @@ -10,9 +10,9 @@ /* INCLUDES ******************************************************************/ +#include <ntoskrnl.h> #define NDEBUG -#include <ntoskrnl.h> -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, IopInitPnpNotificationImplementation) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Sat Aug 4 12:49:47 2007 @@ -10,9 +10,9 @@ /* INCLUDES ******************************************************************/ +#include <ntoskrnl.h> #define NDEBUG -#include <ntoskrnl.h> -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Sat Aug 4 12:49:47 2007 @@ -287,7 +287,7 @@ String->Buffer = ExAllocatePoolWithTag(PagedPool, ValueLength, TAG_PNP_ROOT); if (String->Buffer == NULL) return STATUS_NO_MEMORY; - String->Length = String->MaximumLength = ValueLength; + String->Length = String->MaximumLength = (USHORT)ValueLength; RtlCopyMemory(String->Buffer, ValueData, ValueLength); if (ValueLength > 0 && String->Buffer[ValueLength / sizeof(WCHAR) - 1] == L'\0') String->Length -= sizeof(WCHAR); Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2815… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Sat Aug 4 12:49:47 2007 @@ -143,7 +143,7 @@ PLDR_DATA_TABLE_ENTRY LdrEntry; /* If the caller didn't ask, assume 32 frames */ - if (!FrameCount) FrameCount = 32; + if (!FrameCount || FrameCount > 32) FrameCount = 32; /* Get the current frames */ FrameCount = RtlCaptureStackBackTrace(2, FrameCount, (PVOID*)Frames, NULL); Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Sat Aug 4 12:49:47 2007 @@ -10,7 +10,7 @@ /* INCLUDES ******************************************************************/ -#include <roscfg.h> +//#include <roscfg.h> #include <ndk/asm.h> .intel_syntax noprefix Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Sat Aug 4 12:49:47 2007 @@ -170,7 +170,8 @@ if (Mask != NewMask) { /* Update it */ - KeGetCurrentThread()->DispatcherHeader.DebugActive = NewMask; + KeGetCurrentThread()->DispatcherHeader.DebugActive = + (BOOLEAN)NewMask; } } Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sat Aug 4 12:49:47 2007 @@ -216,10 +216,11 @@ CurrentSample->TSCStart; /* Compute CPU Speed */ - CurrentSample->MHz = ((CurrentSample->TSCDelta * - CurrentSample->PerfFreq.QuadPart + - 500000) / - (CurrentSample->PerfDelta * 1000000)); + CurrentSample->MHz = (ULONG)((CurrentSample->TSCDelta * + CurrentSample-> + PerfFreq.QuadPart + 500000) / + (CurrentSample->PerfDelta * + 1000000)); /* Check if this isn't the first sample */ if (Sample) Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c Sat Aug 4 12:49:47 2007 @@ -308,7 +308,7 @@ /* Save the current base priority and update it */ OldPriority = Process->BasePriority; - Process->BasePriority = Priority; + Process->BasePriority = (SCHAR)Priority; /* Calculate the priority delta */ Delta = Priority - OldPriority; @@ -364,7 +364,7 @@ } /* Update priority and quantum */ - Thread->BasePriority = NewPriority; + Thread->BasePriority = (SCHAR)NewPriority; Thread->Quantum = Thread->QuantumReset; /* Disable decrements and update priority */ @@ -426,7 +426,7 @@ } /* Update priority and quantum */ - Thread->BasePriority = NewPriority; + Thread->BasePriority = (SCHAR)NewPriority; Thread->Quantum = Thread->QuantumReset; /* Disable decrements and update priority */ Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=28… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c (original) +++ trunk/reactos/ntoskrnl/ke/queue.c Sat Aug 4 12:49:47 2007 @@ -358,7 +358,7 @@ { /* Check if the timer expired */ InterruptTime.QuadPart = KeQueryInterruptTime(); - if (InterruptTime.QuadPart >= Timer->DueTime.QuadPart) + if ((ULONG64)InterruptTime.QuadPart >= Timer->DueTime.QuadPart) { /* It did, so we don't need to wait */ QueueEntry = (PLIST_ENTRY)STATUS_TIMEOUT; Modified: trunk/reactos/ntoskrnl/lpc/complete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/complete.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/complete.c (original) +++ trunk/reactos/ntoskrnl/lpc/complete.c Sat Aug 4 12:49:47 2007 @@ -134,8 +134,8 @@ } /* Set the sizes of our reply message */ - Message->Request.u1.s1.DataLength = sizeof(LPCP_CONNECTION_MESSAGE) + - ConnectionInfoLength; + Message->Request.u1.s1.DataLength = (CSHORT)ConnectionInfoLength + + sizeof(LPCP_CONNECTION_MESSAGE); Message->Request.u1.s1.TotalLength = sizeof(LPCP_MESSAGE) + Message->Request.u1.s1.DataLength; Modified: trunk/reactos/ntoskrnl/lpc/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/connect.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/connect.c (original) +++ trunk/reactos/ntoskrnl/lpc/connect.c Sat Aug 4 12:49:47 2007 @@ -352,8 +352,8 @@ ConnectMessage->SectionToMap = SectionToMap; /* Set the data for the connection request message */ - Message->Request.u1.s1.DataLength = sizeof(LPCP_CONNECTION_MESSAGE) + - ConnectionInfoLength; + Message->Request.u1.s1.DataLength = (CSHORT)ConnectionInfoLength + + sizeof(LPCP_CONNECTION_MESSAGE); Message->Request.u1.s1.TotalLength = sizeof(LPCP_MESSAGE) + Message->Request.u1.s1.DataLength; Message->Request.u2.s2.Type = LPC_CONNECTION_REQUEST; Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c Sat Aug 4 12:49:47 2007 @@ -180,8 +180,8 @@ if (ReplyMessage) { /* Validate its length */ - if ((ReplyMessage->u1.s1.DataLength + sizeof(PORT_MESSAGE)) > - ReplyMessage->u1.s1.TotalLength) + if (((ULONG)ReplyMessage->u1.s1.DataLength + sizeof(PORT_MESSAGE)) > + (ULONG)ReplyMessage->u1.s1.TotalLength) { /* Fail */ return STATUS_INVALID_PARAMETER; @@ -204,8 +204,9 @@ if (ReplyMessage) { /* Validate its length in respect to the port object */ - if ((ReplyMessage->u1.s1.TotalLength > Port->MaxMessageLength) || - (ReplyMessage->u1.s1.TotalLength <= ReplyMessage->u1.s1.DataLength)) + if (((ULONG)ReplyMessage->u1.s1.TotalLength > Port->MaxMessageLength) || + ((ULONG)ReplyMessage->u1.s1.TotalLength <= + (ULONG)ReplyMessage->u1.s1.DataLength)) { /* Too large, fail */ ObDereferenceObject(Port); @@ -408,9 +409,9 @@ Message = NULL; /* Setup the receive message */ - ReceiveMessage->u1.s1.TotalLength = sizeof(LPCP_MESSAGE) + - ConnectionInfoLength; - ReceiveMessage->u1.s1.DataLength = ConnectionInfoLength; + ReceiveMessage->u1.s1.TotalLength = (CSHORT)(sizeof(LPCP_MESSAGE) + + ConnectionInfoLength); + ReceiveMessage->u1.s1.DataLength = (CSHORT)ConnectionInfoLength; RtlCopyMemory(ReceiveMessage + 1, ConnectMessage + 1, ConnectionInfoLength); Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=28… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c (original) +++ trunk/reactos/ntoskrnl/lpc/send.c Sat Aug 4 12:49:47 2007 @@ -60,8 +60,8 @@ if (LpcMessage->u2.s2.DataInfoOffset) return STATUS_INVALID_PARAMETER; /* Validate message sizes */ - if ((LpcMessage->u1.s1.TotalLength > Port->MaxMessageLength) || - (LpcMessage->u1.s1.TotalLength <= LpcMessage->u1.s1.DataLength)) + if (((ULONG)LpcMessage->u1.s1.TotalLength > Port->MaxMessageLength) || + ((ULONG)LpcMessage->u1.s1.TotalLength <= (ULONG)LpcMessage->u1.s1.DataLength)) { /* Fail */ return STATUS_PORT_MESSAGE_TOO_LONG; @@ -241,8 +241,8 @@ MessageType = LpcRequest->u2.s2.Type; /* Validate the length */ - if ((LpcRequest->u1.s1.DataLength + sizeof(PORT_MESSAGE)) > - LpcRequest->u1.s1.TotalLength) + if (((ULONG)LpcRequest->u1.s1.DataLength + sizeof(PORT_MESSAGE)) > + (ULONG)LpcRequest->u1.s1.TotalLength) { /* Fail */ return STATUS_INVALID_PARAMETER; @@ -258,8 +258,8 @@ if (!NT_SUCCESS(Status)) return Status; /* Validate the message length */ - if ((LpcRequest->u1.s1.TotalLength > Port->MaxMessageLength) || - (LpcRequest->u1.s1.TotalLength <= LpcRequest->u1.s1.DataLength)) + if (((ULONG)LpcRequest->u1.s1.TotalLength > Port->MaxMessageLength) || + ((ULONG)LpcRequest->u1.s1.TotalLength <= (ULONG)LpcRequest->u1.s1.DataLength)) { /* Fail */ ObDereferenceObject(Port); Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c Sat Aug 4 12:49:47 2007 @@ -40,7 +40,7 @@ } /* Save the old priority and update it */ - OldPriority = Process->Vm.Flags.MemoryPriority; + OldPriority = (UCHAR)Process->Vm.Flags.MemoryPriority; Process->Vm.Flags.MemoryPriority = MemoryPriority; /* Return the old priority */ @@ -331,7 +331,7 @@ Peb->OSMinorVersion = NtMinorVersion; Peb->OSBuildNumber = (USHORT)(NtBuildNumber & 0x3FFF); Peb->OSPlatformId = 2; /* VER_PLATFORM_WIN32_NT */ - Peb->OSCSDVersion = CmNtCSDVersion; + Peb->OSCSDVersion = (USHORT)CmNtCSDVersion; /* Heap and Debug Data */ Peb->NumberOfProcessors = KeNumberProcessors; Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Sat Aug 4 12:49:47 2007 @@ -1362,7 +1362,7 @@ { /* Dereference it as many times as required */ InterlockedExchangeAdd(&ObjectHeader->PointerCount, - -AdditionalReferences); + -(LONG)AdditionalReferences); } /* Decrement the handle count and detach */ @@ -1457,6 +1457,9 @@ return STATUS_OBJECT_TYPE_MISMATCH; } + /* Save the object header */ + NewEntry.Object = ObjectHeader; + /* Check if this is a kernel handle */ if (HandleAttributes & OBJ_KERNEL_HANDLE) { @@ -1529,9 +1532,6 @@ /* Now we can release the object */ if (Context) ObpCleanupDirectoryLookup(Context); - - /* Save the object header */ - NewEntry.Object = ObjectHeader; /* Save the access mask */ NewEntry.GrantedAccess = GrantedAccess; @@ -1617,7 +1617,7 @@ { /* Dereference it many times */ InterlockedExchangeAdd(&ObjectHeader->PointerCount, - -(AdditionalReferences - 1)); + -(LONG)(AdditionalReferences - 1)); } /* Dereference the object one last time */ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=28… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Sat Aug 4 12:49:47 2007 @@ -58,7 +58,7 @@ /* PRIVATE FUNCTIONS *********************************************************/ -ULONG +USHORT NTAPI NameToOrdinal(IN PCHAR Name, IN PVOID DllBase, Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=28… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Sat Aug 4 12:49:47 2007 @@ -815,7 +815,7 @@ (Priority < THREAD_BASE_PRIORITY_MIN)) { /* These ones are OK */ - if ((Priority != THREAD_BASE_PRIORITY_LOWRT + 1) || + if ((Priority != THREAD_BASE_PRIORITY_LOWRT + 1) && (Priority != THREAD_BASE_PRIORITY_IDLE - 1)) { /* Check if the process is real time */ Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Sat Aug 4 12:49:47 2007 @@ -703,7 +703,7 @@ NTAPI PsGetThreadHardErrorsAreDisabled(IN PETHREAD Thread) { - return Thread->HardErrorsAreDisabled; + return Thread->HardErrorsAreDisabled ? TRUE : FALSE; } /* @@ -823,7 +823,7 @@ NTAPI PsIsThreadImpersonating(IN PETHREAD Thread) { - return Thread->ActiveImpersonationInfo; + return Thread->ActiveImpersonationInfo ? TRUE : FALSE; } /*

1 0

[fireball] 28152: - Appropriate changes to kmtest
by fireball＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: fireball Date: Sat Aug 4 12:47:52 2007 New Revision: 28152 URL: http://svn.reactos.org/svn/reactos?rev=28152&view=rev Log: - Appropriate changes to kmtest Modified: trunk/rostests/drivers/kmtest/ntos_ob.c Modified: trunk/rostests/drivers/kmtest/ntos_ob.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_ob.c?… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_ob.c (original) +++ trunk/rostests/drivers/kmtest/ntos_ob.c Sat Aug 4 12:47:52 2007 @@ -23,6 +23,7 @@ /* INCLUDES *******************************************************************/ #include <ddk/ntddk.h> +#include <ddk/ntifs.h> #include "kmtest.h" //#define NDEBUG

1 0

[fireball] 28151: - WDK and MSVC compatibility fixes.
by fireball＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: fireball Date: Sat Aug 4 12:26:58 2007 New Revision: 28151 URL: http://svn.reactos.org/svn/reactos?rev=28151&view=rev Log: - WDK and MSVC compatibility fixes. Modified: trunk/reactos/dll/win32/kernel32/misc/handle.c trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/haltypes.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/include/ndk/obtypes.h trunk/reactos/include/ndk/psfuncs.h trunk/reactos/include/ndk/pstypes.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/ntoskrnl/config/cmindex.c trunk/reactos/ntoskrnl/config/cmvalche.c trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/po/events.c Modified: trunk/reactos/dll/win32/kernel32/misc/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ha… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/handle.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/handle.c Sat Aug 4 12:26:58 2007 @@ -54,7 +54,7 @@ } Status = NtQueryObject (hObject, - ObjectHandleInformation, + ObjectHandleFlagInformation, &HandleInfo, sizeof(OBJECT_HANDLE_ATTRIBUTE_INFORMATION), &BytesWritten); @@ -106,7 +106,7 @@ } Status = NtQueryObject (hObject, - ObjectHandleInformation, + ObjectHandleFlagInformation, &HandleInfo, sizeof(OBJECT_HANDLE_ATTRIBUTE_INFORMATION), &BytesWritten); @@ -118,7 +118,7 @@ HandleInfo.ProtectFromClose = (dwFlags & HANDLE_FLAG_PROTECT_FROM_CLOSE) != 0; Status = NtSetInformationObject (hObject, - ObjectHandleInformation, + ObjectHandleFlagInformation, &HandleInfo, sizeof(OBJECT_HANDLE_ATTRIBUTE_INFORMATION)); if(!NT_SUCCESS(Status)) Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c Sat Aug 4 12:26:58 2007 @@ -1903,7 +1903,7 @@ HandleFlags.ProtectFromClose = TRUE; HandleFlags.Inherit = FALSE; Status = NtSetInformationObject(SockAsyncCompletionPort, - ObjectHandleInformation, + ObjectHandleFlagInformation, &HandleFlags, sizeof(HandleFlags)); } @@ -2014,7 +2014,7 @@ HandleFlags.ProtectFromClose = TRUE; HandleFlags.Inherit = FALSE; Status = NtSetInformationObject(SockAsyncCompletionPort, - ObjectHandleInformation, + ObjectHandleFlagInformation, &HandleFlags, sizeof(HandleFlags)); Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=28… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Sat Aug 4 12:26:58 2007 @@ -609,13 +609,31 @@ StorageTypeStream } FILE_STORAGE_TYPE; -typedef enum _OBJECT_INFO_CLASS { - ObjectBasicInfo, - ObjectNameInfo, - ObjectTypeInfo, - ObjectAllTypesInfo, - ObjectProtectionInfo -} OBJECT_INFO_CLASS; +typedef enum _OBJECT_INFORMATION_CLASS +{ + ObjectBasicInformation, + ObjectNameInformation, + ObjectTypeInformation, + ObjectTypesInformation, + ObjectHandleFlagInformation, + ObjectSessionInformation, + MaxObjectInfoClass +} OBJECT_INFORMATION_CLASS; + +typedef struct _OBJECT_BASIC_INFORMATION +{ + ULONG Attributes; + ACCESS_MASK GrantedAccess; + ULONG HandleCount; + ULONG PointerCount; + ULONG PagedPoolCharge; + ULONG NonPagedPoolCharge; + ULONG Reserved[ 3 ]; + ULONG NameInfoSize; + ULONG TypeInfoSize; + ULONG SecurityDescriptorSize; + LARGE_INTEGER CreationTime; +} OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; typedef struct _KAPC_STATE { LIST_ENTRY ApcListHead[2]; Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Sat Aug 4 12:26:58 2007 @@ -9942,6 +9942,11 @@ VOID); NTKERNELAPI +HANDLE +NTAPI +PsGetProcessId(PEPROCESS Process); + +NTKERNELAPI BOOLEAN NTAPI PsGetVersion( Modified: trunk/reactos/include/ndk/haltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/haltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/haltypes.h (original) +++ trunk/reactos/include/ndk/haltypes.h Sat Aug 4 12:26:58 2007 @@ -224,10 +224,11 @@ // HAL Exports // #ifndef _NTHAL_ -extern DECL_IMPORT PUCHAR *KdComPortInUse; -#endif - -#endif -#endif - - +extern NTHALAPI PUCHAR *KdComPortInUse; +#endif + +#endif +#endif + + + Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h (original) +++ trunk/reactos/include/ndk/ketypes.h Sat Aug 4 12:26:58 2007 @@ -936,7 +936,7 @@ #if (NTDDI_VERSION >= NTDDI_LONGHORN) PVOID MdlForLockedteb; #endif -} KTHREAD; +} KTHREAD, *PKTHREAD; #define ASSERT_THREAD(object) \ ASSERT((((object)->DispatcherHeader.Type & KOBJECT_TYPE_MASK) == ThreadObject)) Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h (original) +++ trunk/reactos/include/ndk/mmtypes.h Sat Aug 4 12:26:58 2007 @@ -58,6 +58,7 @@ #define MEM_PHYSICAL 0x400000 #define MEM_ROTATE 0x800000 #define MEM_IMAGE SEC_IMAGE +#define MEM_DOS_LIM 0x40000000 // // Section Flags for NtCreateSection Modified: trunk/reactos/include/ndk/obtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/obtypes.h (original) +++ trunk/reactos/include/ndk/obtypes.h Sat Aug 4 12:26:58 2007 @@ -72,6 +72,20 @@ // #define OBJ_NAME_PATH_SEPARATOR L'\\' +// +// Object Information Classes for NtQueryInformationObject +// +typedef enum _OBJECT_INFORMATION_CLASS +{ + ObjectBasicInformation, + ObjectNameInformation, + ObjectTypeInformation, + ObjectTypesInformation, + ObjectHandleFlagInformation, + ObjectSessionInformation, + MaxObjectInfoClass +} OBJECT_INFORMATION_CLASS; + #else // @@ -145,18 +159,6 @@ #define DOSDEVICE_DRIVE_REMOTE 4 #define DOSDEVICE_DRIVE_CDROM 5 #define DOSDEVICE_DRIVE_RAMDISK 6 - -// -// Object Information Classes for NtQueryInformationObject -// -typedef enum _OBJECT_INFORMATION_CLASS -{ - ObjectBasicInformation, - ObjectNameInformation, - ObjectTypeInformation, - ObjectAllTypesInformation, - ObjectHandleInformation -} OBJECT_INFORMATION_CLASS; // // Dump Control Structure for Object Debugging @@ -297,7 +299,7 @@ ULONG DefaultNonPagedPoolCharge; } OBJECT_TYPE_INFORMATION, *POBJECT_TYPE_INFORMATION; -#ifndef NTOS_MODE_USER +#ifdef NTOS_MODE_USER typedef struct _OBJECT_BASIC_INFORMATION { @@ -313,6 +315,8 @@ ULONG SecurityDescriptorLength; LARGE_INTEGER CreateTime; } OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; + +#else typedef struct _OBJECT_CREATE_INFORMATION { Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h (original) +++ trunk/reactos/include/ndk/psfuncs.h Sat Aug 4 12:26:58 2007 @@ -117,11 +117,6 @@ // // Misc. Functions // -NTKERNELAPI -HANDLE -NTAPI -PsGetProcessId(PEPROCESS Process); - NTKERNELAPI NTSTATUS NTAPI Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Sat Aug 4 12:26:58 2007 @@ -35,16 +35,6 @@ // KUSER_SHARED_DATA location in User Mode // #define USER_SHARED_DATA (0x7FFE0000) - -// -// Kernel Exports -// -#ifndef NTOS_MODE_USER - -//extern NTSYSAPI struct _EPROCESS* PsInitialSystemProcess; -//extern NTSYSAPI POBJECT_TYPE PsProcessType; - -#endif // // Global Flags @@ -423,7 +413,7 @@ // struct _W32THREAD; struct _W32PROCESS; -struct _ETHREAD; +//struct _ETHREAD; struct _WIN32_POWEREVENT_PARAMETERS; struct _WIN32_POWERSTATE_PARAMETERS; struct _WIN32_JOBCALLOUT_PARAMETERS; @@ -1148,7 +1138,7 @@ KSEMAPHORE AlpcWaitSemaphore; ULONG CacheManagerCount; #endif -} ETHREAD; +} ETHREAD, *PETHREAD; // // Executive Process (EPROCESS) @@ -1344,7 +1334,7 @@ UCHAR PriorityClass; MM_AVL_TABLE VadRoot; ULONG Cookie; -} EPROCESS; +} EPROCESS, *PEPROCESS; // // Job Token Filter Data Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h (original) +++ trunk/reactos/include/psdk/ntdef.h Sat Aug 4 12:26:58 2007 @@ -3,7 +3,11 @@ #if __GNUC__ >=3 #pragma GCC system_header #endif - + +#include <stdarg.h> +#include <windef.h> +#include <excpt.h> + /* TODO: some compilers support this */ #define RESTRICTED_POINTER Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c Sat Aug 4 12:26:58 2007 @@ -722,7 +722,7 @@ HvReleaseCell(Hive, CellToRelease); /* Make sure we found something valid */ - if (Found < 0) break; + if (Found & 0x80000000) break; /* Get the new Index Root and set the new cell to be released */ if (SubKey == HCELL_NIL) continue; @@ -749,7 +749,7 @@ HvReleaseCell(Hive, CellToRelease); /* Make sure we found a valid index */ - if (Found < 0) break; + if (Found & 0x80000000) break; } else { Modified: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalche.c (original) +++ trunk/reactos/ntoskrnl/config/cmvalche.c Sat Aug 4 12:26:58 2007 @@ -512,7 +512,8 @@ Info->KeyValueFullInformation.DataOffset = AlignedData; /* Only the data remains to be copied */ - SizeLeft = max(0, Length - AlignedData); + SizeLeft = (((LONG)Length - (LONG)AlignedData) < 0) ? + 0 : (Length - AlignedData); Size = KeySize; /* Check if the caller has no space for it */ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Sat Aug 4 12:26:58 2007 @@ -358,7 +358,6 @@ extern LIST_ENTRY PspReaperListHead; extern WORK_QUEUE_ITEM PspReaperWorkItem; extern BOOLEAN PspReaping; -extern PEPROCESS PsInitialSystemProcess; extern PEPROCESS PsIdleProcess; extern LIST_ENTRY PsActiveProcessHead; extern KGUARDED_MUTEX PspActiveProcessMutex; Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Sat Aug 4 12:26:58 2007 @@ -328,7 +328,7 @@ PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; OBJECT_ATTRIBUTES ObjectAttributes; PKEY_BASIC_INFORMATION KeyInfo = NULL, SubKeyInfo = NULL; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\" REGSTR_PATH_SYSTEMENUM "\\" REGSTR_KEY_ROOTENUM); + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\" REGSTR_PATH_SYSTEMENUM L"\\" REGSTR_KEY_ROOTENUM); UNICODE_STRING SubKeyName; WCHAR DevicePath[MAX_PATH + 1]; RTL_QUERY_REGISTRY_TABLE QueryTable[5]; Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Sat Aug 4 12:26:58 2007 @@ -1411,7 +1411,7 @@ * Make sure this isn't a generic type query, since the caller doesn't * have to give a handle for it */ - if (ObjectInformationClass != ObjectAllTypesInformation) + if (ObjectInformationClass != ObjectTypesInformation) { /* Reference the object */ Status = ObReferenceObjectByHandle(ObjectHandle, @@ -1463,27 +1463,27 @@ } /* Copy quota information */ - BasicInfo->PagedPoolUsage = 0; /* FIXME*/ - BasicInfo->NonPagedPoolUsage = 0; /* FIXME*/ + BasicInfo->PagedPoolCharge = 0; /* FIXME*/ + BasicInfo->NonPagedPoolCharge = 0; /* FIXME*/ /* Copy name information */ - BasicInfo->NameInformationLength = 0; /* FIXME*/ - BasicInfo->TypeInformationLength = 0; /* FIXME*/ + BasicInfo->NameInfoSize = 0; /* FIXME*/ + BasicInfo->TypeInfoSize = 0; /* FIXME*/ /* Copy security information */ - BasicInfo->SecurityDescriptorLength = 0; /* FIXME*/ + BasicInfo->SecurityDescriptorSize = 0; /* FIXME*/ /* Check if this is a symlink */ if (ObjectHeader->Type == ObSymbolicLinkType) { /* Return the creation time */ - BasicInfo->CreateTime.QuadPart = + BasicInfo->CreationTime.QuadPart = ((POBJECT_SYMBOLIC_LINK)Object)->CreationTime.QuadPart; } else { /* Otherwise return 0 */ - BasicInfo->CreateTime.QuadPart = (ULONGLONG)0; + BasicInfo->CreationTime.QuadPart = (ULONGLONG)0; } /* Break out with success */ @@ -1513,13 +1513,13 @@ break; /* Information about all types */ - case ObjectAllTypesInformation: + case ObjectTypesInformation: DPRINT1("NOT IMPLEMENTED!\n"); Status = STATUS_NOT_IMPLEMENTED; break; /* Information about the handle flags */ - case ObjectHandleInformation: + case ObjectHandleFlagInformation: /* Validate length */ InfoLength = sizeof (OBJECT_HANDLE_ATTRIBUTE_INFORMATION); @@ -1609,7 +1609,7 @@ PAGED_CODE(); /* Validate the information class */ - if (ObjectInformationClass != ObjectHandleInformation) + if (ObjectInformationClass != ObjectHandleFlagInformation) { /* Invalid class */ return STATUS_INVALID_INFO_CLASS; Modified: trunk/reactos/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/events.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/po/events.c (original) +++ trunk/reactos/ntoskrnl/po/events.c Sat Aug 4 12:26:58 2007 @@ -100,7 +100,7 @@ IN PVOID Context) { PSYS_BUTTON_CONTEXT SysButtonContext = Context; - PIO_WORKITEM CurrentWorkItem = SysButtonContext->WorkItem;; + PIO_WORKITEM CurrentWorkItem = SysButtonContext->WorkItem; PIRP Irp; /* Get button pressed (IOCTL_GET_SYS_BUTTON_EVENT) */

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