Ros-diffs September 2011

ros-diffs@reactos.org

20 participants
399 discussions

[cmihail] 53700: [shell32.dll] - Fix subpoint 3 of http://reactos.org/bugzilla/show_bug.cgi?id=6481 - Add some TRACE calls for better debugging. - Format the code a bit better (it was unavoidable).

by cmihail＠svn.reactos.org

Author: cmihail Date: Tue Sep 13 12:55:46 2011 New Revision: 53700 URL: http://svn.reactos.org/svn/reactos?rev=53700&view=rev Log: [shell32.dll] - Fix subpoint 3 of http://reactos.org/bugzilla/show_bug.cgi?id=6481 - Add some TRACE calls for better debugging. - Format the code a bit better (it was unavoidable). Modified: branches/shell32_new-bringup/dll/win32/shell32/control.cpp Modified: branches/shell32_new-bringup/dll/win32/shell32/control.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/control.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/control.cpp [iso-8859-1] Tue Sep 13 12:55:46 2011 @@ -27,11 +27,15 @@ unsigned i; CPlApplet* next; - for (i = 0; i < applet->count; i++) { - if (!applet->info[i].dwSize) continue; + for (i = 0; i < applet->count; i++) + { + if (!applet->info[i].dwSize) + continue; applet->proc(applet->hWnd, CPL_STOP, i, applet->info[i].lData); } - if (applet->proc) applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L); + if (applet->proc) + applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L); + FreeLibrary(applet->hModule); next = applet->next; HeapFree(GetProcessHeap(), 0, applet); @@ -50,66 +54,75 @@ applet->hWnd = hWnd; - if (!(applet->hModule = LoadLibraryW(cmd))) { + if (!(applet->hModule = LoadLibraryW(cmd))) + { WARN("Cannot load control panel applet %s\n", debugstr_w(cmd)); - goto theError; - } - if (!(applet->proc = (APPLET_PROC)GetProcAddress(applet->hModule, "CPlApplet"))) { + goto theError; + } + if (!(applet->proc = (APPLET_PROC)GetProcAddress(applet->hModule, "CPlApplet"))) + { WARN("Not a valid control panel applet %s\n", debugstr_w(cmd)); - goto theError; - } - if (!applet->proc(hWnd, CPL_INIT, 0L, 0L)) { + goto theError; + } + if (!applet->proc(hWnd, CPL_INIT, 0L, 0L)) + { WARN("Init of applet has failed\n"); - goto theError; - } - if ((applet->count = applet->proc(hWnd, CPL_GETCOUNT, 0L, 0L)) == 0) { + goto theError; + } + if ((applet->count = applet->proc(hWnd, CPL_GETCOUNT, 0L, 0L)) == 0) + { WARN("No subprogram in applet\n"); - goto theError; + goto theError; } applet = (CPlApplet *)HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, applet, sizeof(*applet) + (applet->count - 1) * sizeof(NEWCPLINFOW)); - for (i = 0; i < applet->count; i++) { - ZeroMemory(&newinfo, sizeof(newinfo)); - newinfo.dwSize = sizeof(NEWCPLINFOW); - applet->info[i].dwSize = sizeof(NEWCPLINFOW); + for (i = 0; i < applet->count; i++) + { + ZeroMemory(&newinfo, sizeof(newinfo)); + newinfo.dwSize = sizeof(NEWCPLINFOW); + applet->info[i].dwSize = sizeof(NEWCPLINFOW); /* proc is supposed to return a null value upon success for * CPL_INQUIRE and CPL_NEWINQUIRE * However, real drivers don't seem to behave like this * So, use introspection rather than return value */ - applet->proc(hWnd, CPL_NEWINQUIRE, i, (LPARAM)&newinfo); - if (newinfo.hIcon == 0) { - applet->proc(hWnd, CPL_INQUIRE, i, (LPARAM)&info); - if (info.idIcon == 0 || info.idName == 0) { - WARN("Couldn't get info from sp %u\n", i); - applet->info[i].dwSize = 0; - } else { - /* convert the old data into the new structure */ - applet->info[i].dwFlags = 0; - applet->info[i].dwHelpContext = 0; - applet->info[i].lData = info.lData; - applet->info[i].hIcon = LoadIconW(applet->hModule, - MAKEINTRESOURCEW(info.idIcon)); - LoadStringW(applet->hModule, info.idName, - applet->info[i].szName, sizeof(applet->info[i].szName) / sizeof(WCHAR)); - LoadStringW(applet->hModule, info.idInfo, - applet->info[i].szInfo, sizeof(applet->info[i].szInfo) / sizeof(WCHAR)); - applet->info[i].szHelpFile[0] = '\0'; - } - } - else - { - CopyMemory(&applet->info[i], &newinfo, newinfo.dwSize); - if (newinfo.dwSize != sizeof(NEWCPLINFOW)) - { + applet->proc(hWnd, CPL_NEWINQUIRE, i, (LPARAM)&newinfo); + if (newinfo.hIcon == 0) + { + applet->proc(hWnd, CPL_INQUIRE, i, (LPARAM)&info); + if (info.idIcon == 0 || info.idName == 0) + { + WARN("Couldn't get info from sp %u\n", i); + applet->info[i].dwSize = 0; + } + else + { + /* convert the old data into the new structure */ + applet->info[i].dwFlags = 0; + applet->info[i].dwHelpContext = 0; + applet->info[i].lData = info.lData; + applet->info[i].hIcon = LoadIconW(applet->hModule, + MAKEINTRESOURCEW(info.idIcon)); + LoadStringW(applet->hModule, info.idName, + applet->info[i].szName, sizeof(applet->info[i].szName) / sizeof(WCHAR)); + LoadStringW(applet->hModule, info.idInfo, + applet->info[i].szInfo, sizeof(applet->info[i].szInfo) / sizeof(WCHAR)); + applet->info[i].szHelpFile[0] = '\0'; + } + } + else + { + CopyMemory(&applet->info[i], &newinfo, newinfo.dwSize); + if (newinfo.dwSize != sizeof(NEWCPLINFOW)) + { applet->info[i].dwSize = sizeof(NEWCPLINFOW); lstrcpyW(applet->info[i].szName, newinfo.szName); lstrcpyW(applet->info[i].szInfo, newinfo.szInfo); lstrcpyW(applet->info[i].szHelpFile, newinfo.szHelpFile); - } - } + } + } } applet->next = panel->first; @@ -145,20 +158,25 @@ RECT rc; GetClientRect(panel->hWnd, &rc); - for (applet = panel->first; applet; applet = applet->next) { - for (i = 0; i < applet->count; i++) { - if (!applet->info[i].dwSize) continue; - if (x + XSTEP >= rc.right - rc.left) { - x = (XSTEP-XICON)/2; - y += YSTEP; - } - if (cx >= x && cx < x + XICON && cy >= y && cy < y + YSTEP) { - *papplet = applet; - *psp = i; - return TRUE; - } - x += XSTEP; - } + for (applet = panel->first; applet; applet = applet->next) + { + for (i = 0; i < applet->count; i++) + { + if (!applet->info[i].dwSize) + continue; + if (x + XSTEP >= rc.right - rc.left) + { + x = (XSTEP-XICON)/2; + y += YSTEP; + } + if (cx >= x && cx < x + XICON && cy >= y && cy < y + YSTEP) + { + *papplet = applet; + *psp = i; + return TRUE; + } + x += XSTEP; + } } return FALSE; } @@ -176,25 +194,33 @@ hdc = (wParam) ? (HDC)wParam : BeginPaint(panel->hWnd, &ps); hOldFont = SelectObject(hdc, GetStockObject(ANSI_VAR_FONT)); GetClientRect(panel->hWnd, &rc); - for (applet = panel->first; applet; applet = applet->next) { - for (i = 0; i < applet->count; i++) { - if (x + XSTEP >= rc.right - rc.left) { - x = 0; - y += YSTEP; - } - if (!applet->info[i].dwSize) continue; - DrawIcon(hdc, x + (XSTEP-XICON)/2, y, applet->info[i].hIcon); - txtRect.left = x; - txtRect.right = x + XSTEP; - txtRect.top = y + YICON; - txtRect.bottom = y + YSTEP; - DrawTextW(hdc, applet->info[i].szName, -1, &txtRect, - DT_CENTER | DT_VCENTER); - x += XSTEP; - } - } + + for (applet = panel->first; applet; applet = applet->next) + { + for (i = 0; i < applet->count; i++) + { + if (x + XSTEP >= rc.right - rc.left) + { + x = 0; + y += YSTEP; + } + if (!applet->info[i].dwSize) + continue; + DrawIcon(hdc, x + (XSTEP-XICON)/2, y, applet->info[i].hIcon); + txtRect.left = x; + txtRect.right = x + XSTEP; + txtRect.top = y + YICON; + txtRect.bottom = y + YSTEP; + DrawTextW(hdc, applet->info[i].szName, -1, &txtRect, + DT_CENTER | DT_VCENTER); + x += XSTEP; + } + } + SelectObject(hdc, hOldFont); - if (!wParam) EndPaint(panel->hWnd, &ps); + if (!wParam) + EndPaint(panel->hWnd, &ps); + return 0; } @@ -203,15 +229,20 @@ unsigned i; CPlApplet* applet; - if (Control_Localize(panel, (short)LOWORD(lParam), (short)HIWORD(lParam), &applet, &i)) { - if (up) { - if (panel->clkApplet == applet && panel->clkSP == i) { - applet->proc(applet->hWnd, CPL_DBLCLK, i, applet->info[i].lData); - } - } else { - panel->clkApplet = applet; - panel->clkSP = i; - } + if (Control_Localize(panel, (short)LOWORD(lParam), (short)HIWORD(lParam), &applet, &i)) + { + if (up) + { + if (panel->clkApplet == applet && panel->clkSP == i) + { + applet->proc(applet->hWnd, CPL_DBLCLK, i, applet->info[i].lData); + } + } + else + { + panel->clkApplet = applet; + panel->clkSP = i; + } } return 0; } @@ -219,31 +250,35 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, WPARAM lParam1, LPARAM lParam2) { - CPanel* panel = (CPanel*)GetWindowLongPtrW(hWnd, 0); - - if (panel || wMsg == WM_CREATE) { - switch (wMsg) { - case WM_CREATE: - Control_WndProc_Create(hWnd, (CREATESTRUCTW*)lParam2); - return 0; - case WM_DESTROY: - { - CPlApplet* applet = panel->first; - while (applet) - applet = Control_UnloadApplet(applet); - } - PostQuitMessage(0); - break; - case WM_PAINT: - return Control_WndProc_Paint(panel, lParam1); - case WM_LBUTTONUP: - return Control_WndProc_LButton(panel, lParam2, TRUE); - case WM_LBUTTONDOWN: - return Control_WndProc_LButton(panel, lParam2, FALSE); -/* EPP case WM_COMMAND: */ -/* EPP return Control_WndProc_Command(mwi, lParam1, lParam2); */ - } - } + CPanel* panel = (CPanel*)GetWindowLongPtrW(hWnd, 0); + + if (panel || wMsg == WM_CREATE) + { + switch (wMsg) + { + case WM_CREATE: + Control_WndProc_Create(hWnd, (CREATESTRUCTW*)lParam2); + return 0; + + case WM_DESTROY: + { + CPlApplet* applet = panel->first; + while (applet) + applet = Control_UnloadApplet(applet); + + PostQuitMessage(0); + }; break; + + case WM_PAINT: + return Control_WndProc_Paint(panel, lParam1); + case WM_LBUTTONUP: + return Control_WndProc_LButton(panel, lParam2, TRUE); + case WM_LBUTTONDOWN: + return Control_WndProc_LButton(panel, lParam2, FALSE); + /* EPP case WM_COMMAND: */ + /* EPP return Control_WndProc_Command(mwi, lParam1, lParam2); */ + } + } return DefWindowProcW(hWnd, wMsg, lParam1, lParam2); } @@ -271,15 +306,19 @@ CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hWnd, NULL, hInst, panel); - if (!panel->hWnd) return; - - if (!panel->first) { - /* FIXME appName & message should be localized */ - MessageBoxW(panel->hWnd, L"Cannot load any applets", appName, MB_OK); - return; - } - - while (GetMessageW(&msg, panel->hWnd, 0, 0)) { + + if (!panel->hWnd) + return; + + if (!panel->first) + { + /* FIXME appName & message should be localized */ + MessageBoxW(panel->hWnd, L"Cannot load any applets", appName, MB_OK); + return; + } + + while (GetMessageW(&msg, panel->hWnd, 0, 0)) + { TranslateMessage(&msg); DispatchMessageW(&msg); } @@ -298,12 +337,14 @@ *p++ = '\\'; wcscpy(p, wszAllCpl); - if ((h = FindFirstFileW(buffer, &fd)) != INVALID_HANDLE_VALUE) { - do { - wcscpy(p, fd.cFileName); - Control_LoadApplet(hWnd, buffer, panel); - } while (FindNextFileW(h, &fd)); - FindClose(h); + if ((h = FindFirstFileW(buffer, &fd)) != INVALID_HANDLE_VALUE) + { + do + { + wcscpy(p, fd.cFileName); + Control_LoadApplet(hWnd, buffer, panel); + } while (FindNextFileW(h, &fd)); + FindClose(h); } Control_DoInterface(panel, hWnd, hInst); @@ -360,68 +401,92 @@ CloseHandle(hMutex); return; } + + TRACE("[shell32, Control_DoLaunch] wszCmd = %ws\n", wszCmd); + end = wcscpy(buffer, wszCmd); - for (;;) { - ch = *end; - if (ch == '"') quoted = !quoted; - if (!quoted && (ch == ' ' || ch == ',' || ch == '\0')) { - *end = '\0'; - if (beg) { - if (*beg == '@') { - sp = atoiW(beg + 1); - spSet = TRUE; - } else if (*beg == '\0') { + for (;;) + { + ch = *end; + if (ch == '"') + quoted = !quoted; + + if (!quoted && (ch == ',' || ch == '\0')) + { + *end = '\0'; + if (beg) + { + if (*beg == '@') + { + sp = atoiW(beg + 1); + spSet = TRUE; + } + else if (*beg == '\0') + { + sp = 0; + spSet = TRUE; + } + else + { + extraPmts = beg; + } + } + + if (ch == '\0') break; + beg = end + 1; + if (ch == ' ') + while (end[1] == ' ') + end++; + } + end++; + } + while ((ptr = StrChrW(buffer, '"'))) + memmove((LPVOID)ptr, ptr+1, wcslen(ptr)*sizeof(WCHAR)); + + while ((ptr = StrChrW(extraPmts, '"'))) + memmove((LPVOID)ptr, ptr+1, wcslen(ptr)*sizeof(WCHAR)); + + TRACE("[shell32, Control_DoLaunch] cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp); + + Control_LoadApplet(hWnd, buffer, panel); + + if (panel->first) + { + CPlApplet* applet = panel->first; + + TRACE("[shell32, Control_DoLaunch] applet->count %d, applet->info[sp].szName %ws\n", applet->count, applet->info[sp].szName); + + assert(applet && applet->next == NULL); + if (sp >= applet->count) + { + WARN("Out of bounds (%u >= %u), setting to 0\n", sp, applet->count); sp = 0; - spSet = TRUE; - } else { - extraPmts = beg; - } - } - if (ch == '\0') break; - beg = end + 1; - if (ch == ' ') while (end[1] == ' ') end++; - } - end++; - } - while ((ptr = StrChrW(buffer, '"'))) - memmove((LPVOID)ptr, ptr+1, wcslen(ptr)*sizeof(WCHAR)); - - while ((ptr = StrChrW(extraPmts, '"'))) - memmove((LPVOID)ptr, ptr+1, wcslen(ptr)*sizeof(WCHAR)); - - TRACE("cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp); - - Control_LoadApplet(hWnd, buffer, panel); - - if (panel->first) { - CPlApplet* applet = panel->first; - - assert(applet && applet->next == NULL); - if (sp >= applet->count) { - WARN("Out of bounds (%u >= %u), setting to 0\n", sp, applet->count); - sp = 0; - } - - if ((extraPmts) && extraPmts[0] &&(!spSet)) - { - while ((lstrcmpiW(extraPmts, applet->info[sp].szName)) && (sp < applet->count)) - sp++; - - if (sp >= applet->count) - { - ReleaseMutex(hMutex); - CloseHandle(hMutex); - Control_UnloadApplet(applet); - HeapFree(GetProcessHeap(), 0, buffer); - return; - } - } - if (applet->info[sp].dwSize) { - if (!applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData)) - applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts); - } - Control_UnloadApplet(applet); - } + } + + if ((extraPmts) && extraPmts[0] && (!spSet)) + { + while ((lstrcmpiW(extraPmts, applet->info[sp].szName)) && (sp < applet->count)) + sp++; + + if (sp >= applet->count) + { + ReleaseMutex(hMutex); + CloseHandle(hMutex); + Control_UnloadApplet(applet); + HeapFree(GetProcessHeap(), 0, buffer); + return; + } + } + + if (applet->info[sp].dwSize) + { + if (!applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData)) + applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts); + } + + Control_UnloadApplet(applet); + } + ReleaseMutex(hMutex); CloseHandle(hMutex); HeapFree(GetProcessHeap(), 0, buffer); @@ -440,9 +505,14 @@ memset(&panel, 0, sizeof(panel)); - if (!cmd || !*cmd) { + if (!cmd || !*cmd) + { + TRACE("[shell32, Control_RunDLLW] Calling Control_DoWindow\n"); Control_DoWindow(&panel, hWnd, hInst); - } else { + } + else + { + TRACE("[shell32, Control_RunDLLW] Calling Control_DoLaunch\n"); Control_DoLaunch(&panel, hWnd, cmd); } } @@ -455,10 +525,12 @@ { DWORD len = MultiByteToWideChar(CP_ACP, 0, cmd, -1, NULL, 0 ); LPWSTR wszCmd = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (wszCmd && MultiByteToWideChar(CP_ACP, 0, cmd, -1, wszCmd, len )) { Control_RunDLLW(hWnd, hInst, wszCmd, nCmdShow); } + HeapFree(GetProcessHeap(), 0, wszCmd); }

13 years

[tkreuzer] 53699: [NTOSKRNL] Move x86 specific file trap_x.h into include/internal/i386

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Sep 13 12:53:50 2011 New Revision: 53699 URL: http://svn.reactos.org/svn/reactos?rev=53699&view=rev Log: [NTOSKRNL] Move x86 specific file trap_x.h into include/internal/i386 Added: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h - copied, changed from r53696, trunk/reactos/ntoskrnl/include/internal/trap_x.h Removed: trunk/reactos/ntoskrnl/include/internal/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Tue Sep 13 12:53:50 2011 @@ -493,7 +493,7 @@ // // Trap Macros // -#include "../trap_x.h" +#include "trap_x.h" // // Returns a thread's FPU save area Copied: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h (from r53696, trunk/reactos/ntoskrnl/include/internal/trap_x.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] Tue Sep 13 12:53:50 2011 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: ntoskrnl/include/trap_x.h + * FILE: ntoskrnl/include/i386/trap_x.h * PURPOSE: Internal Inlined Functions for the Trap Handling Code * PROGRAMMERS: ReactOS Portable Systems Group */ @@ -91,7 +91,7 @@ TrapFrame->DbgArgPointer = TrapFrame->Edx; TrapFrame->DbgArgMark = 0xBADB0D00; TrapFrame->DbgEip = TrapFrame->Eip; - TrapFrame->DbgEbp = TrapFrame->Ebp; + TrapFrame->DbgEbp = TrapFrame->Ebp; TrapFrame->PreviousPreviousMode = -1; } Removed: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h (removed) @@ -1,321 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: ntoskrnl/include/trap_x.h - * PURPOSE: Internal Inlined Functions for the Trap Handling Code - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -#pragma once - -#define TRAP_DEBUG 0 - -// -// Unreachable code hint for GCC 4.5.x, older GCC versions, and MSVC -// -#ifdef __GNUC__ -#if __GNUC__ * 100 + __GNUC_MINOR__ >= 405 -#define UNREACHABLE __builtin_unreachable() -#else -#define UNREACHABLE __builtin_trap() -#endif -#elif _MSC_VER -#define UNREACHABLE __assume(0) -#define __builtin_expect(a,b) (a) -#else -#define UNREACHABLE -#endif - -// -// Helper Code -// -BOOLEAN -FORCEINLINE -KiUserTrap(IN PKTRAP_FRAME TrapFrame) -{ - /* Anything else but Ring 0 is Ring 3 */ - return !!(TrapFrame->SegCs & MODE_MASK); -} - -// -// Debug Macros -// -VOID -FORCEINLINE -KiDumpTrapFrame(IN PKTRAP_FRAME TrapFrame) -{ - /* Dump the whole thing */ - DbgPrint("DbgEbp: %x\n", TrapFrame->DbgEbp); - DbgPrint("DbgEip: %x\n", TrapFrame->DbgEip); - DbgPrint("DbgArgMark: %x\n", TrapFrame->DbgArgMark); - DbgPrint("DbgArgPointer: %x\n", TrapFrame->DbgArgPointer); - DbgPrint("TempSegCs: %x\n", TrapFrame->TempSegCs); - DbgPrint("TempEsp: %x\n", TrapFrame->TempEsp); - DbgPrint("Dr0: %x\n", TrapFrame->Dr0); - DbgPrint("Dr1: %x\n", TrapFrame->Dr1); - DbgPrint("Dr2: %x\n", TrapFrame->Dr2); - DbgPrint("Dr3: %x\n", TrapFrame->Dr3); - DbgPrint("Dr6: %x\n", TrapFrame->Dr6); - DbgPrint("Dr7: %x\n", TrapFrame->Dr7); - DbgPrint("SegGs: %x\n", TrapFrame->SegGs); - DbgPrint("SegEs: %x\n", TrapFrame->SegEs); - DbgPrint("SegDs: %x\n", TrapFrame->SegDs); - DbgPrint("Edx: %x\n", TrapFrame->Edx); - DbgPrint("Ecx: %x\n", TrapFrame->Ecx); - DbgPrint("Eax: %x\n", TrapFrame->Eax); - DbgPrint("PreviousPreviousMode: %x\n", TrapFrame->PreviousPreviousMode); - DbgPrint("ExceptionList: %x\n", TrapFrame->ExceptionList); - DbgPrint("SegFs: %x\n", TrapFrame->SegFs); - DbgPrint("Edi: %x\n", TrapFrame->Edi); - DbgPrint("Esi: %x\n", TrapFrame->Esi); - DbgPrint("Ebx: %x\n", TrapFrame->Ebx); - DbgPrint("Ebp: %x\n", TrapFrame->Ebp); - DbgPrint("ErrCode: %x\n", TrapFrame->ErrCode); - DbgPrint("Eip: %x\n", TrapFrame->Eip); - DbgPrint("SegCs: %x\n", TrapFrame->SegCs); - DbgPrint("EFlags: %x\n", TrapFrame->EFlags); - DbgPrint("HardwareEsp: %x\n", TrapFrame->HardwareEsp); - DbgPrint("HardwareSegSs: %x\n", TrapFrame->HardwareSegSs); - DbgPrint("V86Es: %x\n", TrapFrame->V86Es); - DbgPrint("V86Ds: %x\n", TrapFrame->V86Ds); - DbgPrint("V86Fs: %x\n", TrapFrame->V86Fs); - DbgPrint("V86Gs: %x\n", TrapFrame->V86Gs); -} - -#if TRAP_DEBUG -VOID -FORCEINLINE -KiFillTrapFrameDebug(IN PKTRAP_FRAME TrapFrame) -{ - /* Set the debug information */ - TrapFrame->DbgArgPointer = TrapFrame->Edx; - TrapFrame->DbgArgMark = 0xBADB0D00; - TrapFrame->DbgEip = TrapFrame->Eip; - TrapFrame->DbgEbp = TrapFrame->Ebp; - TrapFrame->PreviousPreviousMode = -1; -} - -VOID -FORCEINLINE -KiExitTrapDebugChecks(IN PKTRAP_FRAME TrapFrame, - IN KTRAP_EXIT_SKIP_BITS SkipBits) -{ - /* Make sure interrupts are disabled */ - if (__readeflags() & EFLAGS_INTERRUPT_MASK) - { - DbgPrint("Exiting with interrupts enabled: %lx\n", __readeflags()); - __debugbreak(); - } - - /* Make sure this is a real trap frame */ - if (TrapFrame->DbgArgMark != 0xBADB0D00) - { - DbgPrint("Exiting with an invalid trap frame? (No MAGIC in trap frame)\n"); - KiDumpTrapFrame(TrapFrame); - __debugbreak(); - } - - /* Make sure we're not in user-mode or something */ - if (Ke386GetFs() != KGDT_R0_PCR) - { - DbgPrint("Exiting with an invalid FS: %lx\n", Ke386GetFs()); - __debugbreak(); - } - - /* Make sure we have a valid SEH chain */ - if (KeGetPcr()->NtTib.ExceptionList == 0) - { - DbgPrint("Exiting with NULL exception chain: %p\n", KeGetPcr()->NtTib.ExceptionList); - __debugbreak(); - } - - /* Make sure we're restoring a valid SEH chain */ - if (TrapFrame->ExceptionList == 0) - { - DbgPrint("Entered a trap with a NULL exception chain: %p\n", TrapFrame->ExceptionList); - __debugbreak(); - } - - /* If we're ignoring previous mode, make sure caller doesn't actually want it */ - if ((SkipBits.SkipPreviousMode) && (TrapFrame->PreviousPreviousMode != -1)) - { - DbgPrint("Exiting a trap witout restoring previous mode, yet previous mode seems valid: %lx\n", TrapFrame->PreviousPreviousMode); - __debugbreak(); - } -} - -VOID -FORCEINLINE -KiExitSystemCallDebugChecks(IN ULONG SystemCall, - IN PKTRAP_FRAME TrapFrame) -{ - KIRQL OldIrql; - - /* Check if this was a user call */ - if (KiUserTrap(TrapFrame)) - { - /* Make sure we are not returning with elevated IRQL */ - OldIrql = KeGetCurrentIrql(); - if (OldIrql != PASSIVE_LEVEL) - { - /* Forcibly put us in a sane state */ - KeGetPcr()->Irql = PASSIVE_LEVEL; - _disable(); - - /* Fail */ - KeBugCheckEx(IRQL_GT_ZERO_AT_SYSTEM_SERVICE, - SystemCall, - OldIrql, - 0, - 0); - } - - /* Make sure we're not attached and that APCs are not disabled */ - if ((KeGetCurrentThread()->ApcStateIndex != CurrentApcEnvironment) || - (KeGetCurrentThread()->CombinedApcDisable != 0)) - { - /* Fail */ - KeBugCheckEx(APC_INDEX_MISMATCH, - SystemCall, - KeGetCurrentThread()->ApcStateIndex, - KeGetCurrentThread()->CombinedApcDisable, - 0); - } - } -} -#else -#define KiExitTrapDebugChecks(x, y) -#define KiFillTrapFrameDebug(x) -#define KiExitSystemCallDebugChecks(x, y) -#endif - -// -// Generic Exit Routine -// -DECLSPEC_NORETURN VOID FASTCALL KiSystemCallReturn(IN PKTRAP_FRAME TrapFrame); -DECLSPEC_NORETURN VOID FASTCALL KiSystemCallSysExitReturn(IN PKTRAP_FRAME TrapFrame); -DECLSPEC_NORETURN VOID FASTCALL KiSystemCallTrapReturn(IN PKTRAP_FRAME TrapFrame); -DECLSPEC_NORETURN VOID FASTCALL KiEditedTrapReturn(IN PKTRAP_FRAME TrapFrame); -DECLSPEC_NORETURN VOID FASTCALL KiTrapReturn(IN PKTRAP_FRAME TrapFrame); -DECLSPEC_NORETURN VOID FASTCALL KiTrapReturnNoSegments(IN PKTRAP_FRAME TrapFrame); - -typedef -ATTRIB_NORETURN -VOID -(FASTCALL *PFAST_SYSTEM_CALL_EXIT)( - IN PKTRAP_FRAME TrapFrame -); - -extern PFAST_SYSTEM_CALL_EXIT KiFastCallExitHandler; - -// -// Virtual 8086 Mode Optimized Trap Exit -// -VOID -FORCEINLINE -DECLSPEC_NORETURN -KiExitV86Trap(IN PKTRAP_FRAME TrapFrame) -{ - PKTHREAD Thread; - KIRQL OldIrql; - - /* Get the thread */ - Thread = KeGetCurrentThread(); - while (TRUE) - { - /* Return if this isn't V86 mode anymore */ - if (!(TrapFrame->EFlags & EFLAGS_V86_MASK)) KiEoiHelper(TrapFrame); - - /* Turn off the alerted state for kernel mode */ - Thread->Alerted[KernelMode] = FALSE; - - /* Are there pending user APCs? */ - if (__builtin_expect(!Thread->ApcState.UserApcPending, 1)) break; - - /* Raise to APC level and enable interrupts */ - OldIrql = KfRaiseIrql(APC_LEVEL); - _enable(); - - /* Deliver APCs */ - KiDeliverApc(UserMode, NULL, TrapFrame); - - /* Restore IRQL and disable interrupts once again */ - KfLowerIrql(OldIrql); - _disable(); - } - - /* If we got here, we're still in a valid V8086 context, so quit it */ - if (__builtin_expect(TrapFrame->Dr7 & ~DR7_RESERVED_MASK, 0)) - { - /* Not handled yet */ - DbgPrint("Need Hardware Breakpoint Support!\n"); - while (TRUE); - } - - /* Return from interrupt */ - KiTrapReturnNoSegments(TrapFrame); -} - -// -// Virtual 8086 Mode Optimized Trap Entry -// -VOID -FORCEINLINE -KiEnterV86Trap(IN PKTRAP_FRAME TrapFrame) -{ - /* Save exception list */ - TrapFrame->ExceptionList = KeGetPcr()->NtTib.ExceptionList; - - /* Save DR7 and check for debugging */ - TrapFrame->Dr7 = __readdr(7); - if (__builtin_expect(TrapFrame->Dr7 & ~DR7_RESERVED_MASK, 0)) - { - DbgPrint("Need Hardware Breakpoint Support!\n"); - while (TRUE); - } -} - -// -// Interrupt Trap Entry -// -VOID -FORCEINLINE -KiEnterInterruptTrap(IN PKTRAP_FRAME TrapFrame) -{ - /* Save exception list and terminate it */ - TrapFrame->ExceptionList = KeGetPcr()->NtTib.ExceptionList; - KeGetPcr()->NtTib.ExceptionList = EXCEPTION_CHAIN_END; - - /* Flush DR7 and check for debugging */ - TrapFrame->Dr7 = 0; - if (__builtin_expect(KeGetCurrentThread()->DispatcherHeader.DebugActive & 0xFF, 0)) - { - DbgPrint("Need Hardware Breakpoint Support!\n"); - while (TRUE); - } - - /* Set debug header */ - KiFillTrapFrameDebug(TrapFrame); -} - -// -// Generic Trap Entry -// -VOID -FORCEINLINE -KiEnterTrap(IN PKTRAP_FRAME TrapFrame) -{ - /* Save exception list */ - TrapFrame->ExceptionList = KeGetPcr()->NtTib.ExceptionList; - - /* Flush DR7 and check for debugging */ - TrapFrame->Dr7 = 0; - if (__builtin_expect(KeGetCurrentThread()->DispatcherHeader.DebugActive & 0xFF, 0)) - { - DbgPrint("Need Hardware Breakpoint Support!\n"); - while (TRUE); - } - - /* Set debug header */ - KiFillTrapFrameDebug(TrapFrame); -} 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Tue Sep 13 12:53:50 2011 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> -#include "internal/trap_x.h" +#include "internal/i386/trap_x.h" /* GLOBALS *******************************************************************/

13 years

[ekohl] 53698: [MSGINA] - Call NotifyBootConfigStatus after a user has been logged-on successfully. - Implement WlxIsLogoffOk.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 13 09:42:25 2011 New Revision: 53698 URL: http://svn.reactos.org/svn/reactos?rev=53698&view=rev Log: [MSGINA] - Call NotifyBootConfigStatus after a user has been logged-on successfully. - Implement WlxIsLogoffOk. Modified: trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/stubs.c Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Tue Sep 13 09:42:25 2011 @@ -572,6 +572,9 @@ goto cleanup; result = DoLoginTasks(pgContext, UserName, DomainName, Password); + + if (result == TRUE) + NotifyBootConfigStatus(TRUE); } cleanup: @@ -679,6 +682,18 @@ return pGinaUI->LockedSAS(pgContext); } +/* + * @implemented + */ +BOOL WINAPI +WlxIsLogoffOk( + PVOID pWlxContext) +{ + TRACE("WlxIsLogoffOk()\n"); + UNREFERENCED_PARAMETER(pWlxContext); + return TRUE; +} + BOOL WINAPI DllMain( IN HINSTANCE hinstDLL, Modified: trunk/reactos/dll/win32/msgina/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] Tue Sep 13 09:42:25 2011 @@ -58,20 +58,6 @@ */ BOOL WINAPI WlxIsLockOk( - PVOID pWlxContext) -{ - UNREFERENCED_PARAMETER(pWlxContext); - - UNIMPLEMENTED; - return TRUE; -} - - -/* - * @unimplemented - */ -BOOL WINAPI -WlxIsLogoffOk( PVOID pWlxContext) { UNREFERENCED_PARAMETER(pWlxContext);

13 years

[ekohl] 53697: [MSPORTS] Implement device removal.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 13 09:30:22 2011 New Revision: 53697 URL: http://svn.reactos.org/svn/reactos?rev=53697&view=rev Log: [MSPORTS] Implement device removal. Modified: trunk/reactos/dll/win32/msports/classinst.c Modified: trunk/reactos/dll/win32/msports/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/classins… ============================================================================== --- trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] Tue Sep 13 09:30:22 2011 @@ -666,6 +666,70 @@ } +static DWORD +RemovePort(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + PORT_TYPE PortType; + HCOMDB hComDB = HCOMDB_INVALID_HANDLE_VALUE; + HKEY hKey; + LONG lError; + DWORD dwPortNumber; + DWORD dwPortNameSize; + WCHAR szPortName[8]; + + /* If we are removing a serial port ... */ + PortType = GetPortType(DeviceInfoSet, DeviceInfoData); + if (PortType == SerialPort) + { + /* Open the port database */ + if (ComDBOpen(&hComDB) == ERROR_SUCCESS) + { + /* Open the device key */ + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DEV, + KEY_READ); + if (hKey != INVALID_HANDLE_VALUE) + { + /* Query the port name */ + dwPortNameSize = sizeof(szPortName); + lError = RegQueryValueEx(hKey, + L"PortName", + NULL, + NULL, + (PBYTE)szPortName, + &dwPortNameSize); + + /* Close the device key */ + RegCloseKey(hKey); + + /* If we got a valid port name ...*/ + if (lError == ERROR_SUCCESS) + { + /* Get the port number */ + dwPortNumber = _wtoi(szPortName + wcslen(pszCom)); + + /* Release the port */ + ComDBReleasePort(hComDB, dwPortNumber); + } + } + + /* Close the port database */ + ComDBClose(hComDB); + } + } + + /* Remove the device */ + if (!SetupDiRemoveDevice(DeviceInfoSet, DeviceInfoData)) + return GetLastError(); + + return ERROR_SUCCESS; +} + + DWORD WINAPI PortsClassInstaller(IN DI_FUNCTION InstallFunction, @@ -680,6 +744,9 @@ case DIF_INSTALLDEVICE: return InstallPort(DeviceInfoSet, DeviceInfoData); + case DIF_REMOVE: + return RemovePort(DeviceInfoSet, DeviceInfoData); + default: TRACE("Install function %u ignored\n", InstallFunction); return ERROR_DI_DO_DEFAULT;

13 years

[ekohl] 53696: [MSPORTS] Implement ComDBResizeDatabase.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Sep 12 14:24:24 2011 New Revision: 53696 URL: http://svn.reactos.org/svn/reactos?rev=53696&view=rev Log: [MSPORTS] Implement ComDBResizeDatabase. Modified: trunk/reactos/dll/win32/msports/comdb.c Modified: trunk/reactos/dll/win32/msports/comdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/comdb.c?… ============================================================================== --- trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] Mon Sep 12 14:24:24 2011 @@ -11,6 +11,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msports); #define BITS_PER_BYTE 8 +#define BITMAP_SIZE_INCREMENT 0x400 +#define BITMAP_SIZE_INVALID_BITS 0x3FF typedef struct _COMDB { @@ -275,6 +277,9 @@ PBYTE pBitmap = NULL; BYTE cMask; LONG lError = ERROR_SUCCESS; + + TRACE("ComDBGetCurrentPortUsage(%p %p %lu %lu %p)\n", + hComDB, Buffer, BufferSize, ReportType, MaxPortsReported); if (hComDB == INVALID_HANDLE_VALUE || hComDB == NULL || @@ -581,8 +586,83 @@ ComDBResizeDatabase(IN HCOMDB hComDB, IN DWORD NewSize) { - FIXME("ComDBResizeDatabase(%p %lu)\n", hComDB, NewSize); - return ERROR_CALL_NOT_IMPLEMENTED; + PCOMDB pComDB; + PBYTE pBitmap = NULL; + DWORD dwSize; + DWORD dwNewSize; + DWORD dwType; + LONG lError; + + TRACE("ComDBResizeDatabase(%p %lu)\n", hComDB, NewSize); + + if (hComDB == INVALID_HANDLE_VALUE || + hComDB == NULL || + (NewSize & BITMAP_SIZE_INVALID_BITS)) + return ERROR_INVALID_PARAMETER; + + pComDB = (PCOMDB)hComDB; + + /* Wait for the mutex */ + WaitForSingleObject(pComDB->hMutex, INFINITE); + + /* Get the required bitmap size */ + lError = RegQueryValueExW(pComDB->hKey, + L"ComDB", + NULL, + &dwType, + NULL, + &dwSize); + if (lError != ERROR_SUCCESS) + goto done; + + /* Check the size limits */ + if (NewSize > COMDB_MAX_PORTS_ARBITRATED || + NewSize <= dwSize * BITS_PER_BYTE) + { + lError = ERROR_BAD_LENGTH; + goto done; + } + + /* Calculate the new bitmap size */ + dwNewSize = NewSize / BITS_PER_BYTE; + + /* Allocate the new bitmap */ + pBitmap = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwSize); + if (pBitmap == NULL) + { + ERR("Failed to allocate the bitmap!\n"); + lError = ERROR_ACCESS_DENIED; + goto done; + } + + /* Read the current bitmap */ + lError = RegQueryValueExW(pComDB->hKey, + L"ComDB", + NULL, + &dwType, + pBitmap, + &dwSize); + if (lError != ERROR_SUCCESS) + goto done; + + /* Write the new bitmap */ + lError = RegSetValueExW(pComDB->hKey, + L"ComDB", + 0, + REG_BINARY, + pBitmap, + dwNewSize); + +done:; + /* Release the mutex */ + ReleaseMutex(pComDB->hMutex); + + if (pBitmap != NULL) + HeapFree(GetProcessHeap(), 0, pBitmap); + + return lError; } /* EOF */

13 years

[tkreuzer] 53695: [HAL] Implement lazy irql for APIC. This is useful for VMs, since APIC usually has high overhead due to the need of invoking the hypervisor on every irql raise and lower. With laz...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Sep 12 09:46:20 2011 New Revision: 53695 URL: http://svn.reactos.org/svn/reactos?rev=53695&view=rev Log: [HAL] Implement lazy irql for APIC. This is useful for VMs, since APIC usually has high overhead due to the need of invoking the hypervisor on every irql raise and lower. With lazy irql we avoid that until absolutely neccessary. Note that we misuse the PCR's IRR field to save the current hardware irql. Its a huge performance boost (some parts take half the time), making APIC performance close to PIC performance on VBox. This is something that Windows doesn't have :) Modified: trunk/reactos/hal/halx86/apic/apic.c trunk/reactos/hal/halx86/apic/rtctimer.c Modified: trunk/reactos/hal/halx86/apic/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apic.c?rev… ============================================================================== --- trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] Mon Sep 12 09:46:20 2011 @@ -17,6 +17,8 @@ #include "apic.h" void HackEoi(void); + +#define APIC_LAZY_IRQL /* GLOBALS ********************************************************************/ @@ -105,6 +107,46 @@ VOID FORCEINLINE +ApicWriteIORedirectionEntry( + UCHAR Index, + IOAPIC_REDIRECTION_REGISTER ReDirReg) +{ + IOApicWrite(IOAPIC_REDTBL + 2 * Index, ReDirReg.Long0); + IOApicWrite(IOAPIC_REDTBL + 2 * Index + 1, ReDirReg.Long1); +} + +IOAPIC_REDIRECTION_REGISTER +FORCEINLINE +ApicReadIORedirectionEntry( + UCHAR Index) +{ + IOAPIC_REDIRECTION_REGISTER ReDirReg; + + ReDirReg.Long0 = IOApicRead(IOAPIC_REDTBL + 2 * Index); + ReDirReg.Long1 = IOApicRead(IOAPIC_REDTBL + 2 * Index + 1); + + return ReDirReg; +} + +VOID +FORCEINLINE +ApicRequestInterrupt(IN UCHAR Vector) +{ + APIC_COMMAND_REGISTER CommandRegister; + + /* Setup the command register */ + CommandRegister.Long0 = 0; + CommandRegister.Vector = Vector; + CommandRegister.MessageType = APIC_MT_Fixed; + CommandRegister.TriggerMode = APIC_TGM_Edge; + CommandRegister.DestinationShortHand = APIC_DSH_Self; + + /* Write the low dword to send the interrupt */ + ApicWrite(APIC_ICR0, CommandRegister.Long0); +} + +VOID +FORCEINLINE ApicSendEOI(void) { //ApicWrite(APIC_EOI, 0); @@ -125,6 +167,12 @@ { #ifdef _M_AMD64 return (KIRQL)__readcr8(); +#elif defined(APIC_LAZY_IRQL) + // HACK: some magic to Sync VBox's APIC registers + ApicRead(APIC_VER); + + /* Return the field in the PCR */ + return (KIRQL)__readfsbyte(FIELD_OFFSET(KPCR, Irql)); #else // HACK: some magic to Sync VBox's APIC registers ApicRead(APIC_VER); @@ -136,16 +184,42 @@ VOID FORCEINLINE -ApicSetCurrentIrql(KIRQL Irql) +ApicRaiseIrql(KIRQL Irql) { #ifdef _M_AMD64 __writecr8(Irql); +#elif defined(APIC_LAZY_IRQL) + __writefsbyte(FIELD_OFFSET(KPCR, Irql), Irql); #else /* Convert IRQL and write the TPR */ ApicWrite(APIC_TPR, IrqlToTpr(Irql)); #endif } +VOID +FORCEINLINE +ApicLowerIrql(KIRQL Irql) +{ +#ifdef _M_AMD64 + __writecr8(Irql); +#elif defined(APIC_LAZY_IRQL) + __writefsbyte(FIELD_OFFSET(KPCR, Irql), Irql); + + /* Is the new Irql lower than set in the TPR? */ + if (Irql < KeGetPcr()->IRR) + { + /* Save the new hard IRQL in the IRR field */ + KeGetPcr()->IRR = Irql; + + /* Need to lower it back */ + ApicWrite(APIC_TPR, IrqlToTpr(Irql)); + } +#else + /* Convert IRQL and write the TPR */ + ApicWrite(APIC_TPR, IrqlToTpr(Irql)); +#endif +} + UCHAR FASTCALL HalpIrqToVector(UCHAR Irq) @@ -171,6 +245,13 @@ HalpVectorToIrq(UCHAR Vector) { return HalpVectorToIndex[Vector]; +} + +VOID +NTAPI +HalpSendEOI(VOID) +{ + ApicSendEOI(); } VOID @@ -311,31 +392,10 @@ ApicWrite(APIC_ERRLVTR, LvtEntry.Long); /* Set the IRQL from the PCR */ - ApicSetCurrentIrql(KeGetPcr()->Irql); -} - - -VOID -FORCEINLINE -ApicWriteIORedirectionEntry( - UCHAR Index, - IOAPIC_REDIRECTION_REGISTER ReDirReg) -{ - IOApicWrite(IOAPIC_REDTBL + 2 * Index, ReDirReg.Long0); - IOApicWrite(IOAPIC_REDTBL + 2 * Index + 1, ReDirReg.Long1); -} - -IOAPIC_REDIRECTION_REGISTER -FORCEINLINE -ApicReadIORedirectionEntry( - UCHAR Index) -{ - IOAPIC_REDIRECTION_REGISTER ReDirReg; - - ReDirReg.Long0 = IOApicRead(IOAPIC_REDTBL + 2 * Index); - ReDirReg.Long1 = IOApicRead(IOAPIC_REDTBL + 2 * Index + 1); - - return ReDirReg; + ApicWrite(APIC_TPR, IrqlToTpr(KeGetPcr()->Irql)); + + /* Save the new hard IRQL in the IRR field */ + KeGetPcr()->IRR = KeGetPcr()->Irql; } UCHAR @@ -486,6 +546,9 @@ __writeeflags(EFlags); } + +/* SOFTWARE INTERRUPT TRAPS ***************************************************/ + VOID DECLSPEC_NORETURN FASTCALL @@ -493,17 +556,25 @@ { KPROCESSOR_MODE ProcessorMode; KIRQL OldIrql; - ASSERT(ApicGetCurrentIrql() < APC_LEVEL); ASSERT(ApicGetProcessorIrql() == APC_LEVEL); /* Enter trap */ KiEnterInterruptTrap(TrapFrame); +#ifdef APIC_LAZY_IRQL + if (!HalBeginSystemInterrupt(APC_LEVEL, APC_VECTOR, &OldIrql)) + { + /* "Spurious" interrupt, exit the interrupt */ + KiEoiHelper(TrapFrame); + } +#else /* Save the old IRQL */ OldIrql = ApicGetCurrentIrql(); + ASSERT(OldIrql < APC_LEVEL); +#endif /* Raise to APC_LEVEL */ - ApicSetCurrentIrql(APC_LEVEL); + ApicRaiseIrql(APC_LEVEL); /* End the interrupt */ ApicSendEOI(); @@ -521,7 +592,7 @@ _disable(); /* Restore the old IRQL */ - ApicSetCurrentIrql(OldIrql); + ApicLowerIrql(OldIrql); /* Exit the interrupt */ KiEoiHelper(TrapFrame); @@ -534,17 +605,25 @@ HalpDispatchInterruptHandler(IN PKTRAP_FRAME TrapFrame) { KIRQL OldIrql; - ASSERT(ApicGetCurrentIrql() < DISPATCH_LEVEL); ASSERT(ApicGetProcessorIrql() == DISPATCH_LEVEL); /* Enter trap */ KiEnterInterruptTrap(TrapFrame); - /* Save the old IRQL */ +#ifdef APIC_LAZY_IRQL + if (!HalBeginSystemInterrupt(DISPATCH_LEVEL, DISPATCH_VECTOR, &OldIrql)) + { + /* "Spurious" interrupt, exit the interrupt */ + KiEoiHelper(TrapFrame); + } +#else + /* Get the current IRQL */ OldIrql = ApicGetCurrentIrql(); + ASSERT(OldIrql < DISPATCH_LEVEL); +#endif /* Raise to DISPATCH_LEVEL */ - ApicSetCurrentIrql(DISPATCH_LEVEL); + ApicRaiseIrql(DISPATCH_LEVEL); /* End the interrupt */ ApicSendEOI(); @@ -555,37 +634,23 @@ _disable(); /* Restore the old IRQL */ - ApicSetCurrentIrql(OldIrql); + ApicLowerIrql(OldIrql); /* Exit the interrupt */ KiEoiHelper(TrapFrame); } #endif -VOID -NTAPI -HalpSendEOI(VOID) -{ - ApicSendEOI(); -} - -/* PUBLIC FUNCTIONS ***********************************************************/ + +/* SOFTWARE INTERRUPTS ********************************************************/ + VOID FASTCALL HalRequestSoftwareInterrupt(IN KIRQL Irql) { - APIC_COMMAND_REGISTER CommandRegister; - - /* Setup the command register */ - CommandRegister.Long0 = 0; - CommandRegister.Vector = IrqlToTpr(Irql); - CommandRegister.MessageType = APIC_MT_Fixed; - CommandRegister.TriggerMode = APIC_TGM_Edge; - CommandRegister.DestinationShortHand = APIC_DSH_Self; - - /* Write the low dword to send the interrupt */ - ApicWrite(APIC_ICR0, CommandRegister.Long0); + /* Convert irql to vector and request an interrupt */ + ApicRequestInterrupt(IrqlToTpr(Irql)); } VOID @@ -595,6 +660,9 @@ { /* Nothing to do */ } + + +/* SYSTEM INTERRUPTS **********************************************************/ BOOLEAN NTAPI @@ -678,11 +746,37 @@ IN UCHAR Vector, OUT PKIRQL OldIrql) { + KIRQL CurrentIrql; + /* Get the current IRQL */ - *OldIrql = ApicGetCurrentIrql(); + CurrentIrql = ApicGetCurrentIrql(); + +#ifdef APIC_LAZY_IRQL + /* Check if this interrupt is allowed */ + if (CurrentIrql >= Irql) + { + /* It is not, set the real Irql in the TPR! */ + ApicWrite(APIC_TPR, IrqlToTpr(CurrentIrql)); + + /* Save the new hard IRQL in the IRR field */ + KeGetPcr()->IRR = CurrentIrql; + + /* End this interrupt */ + ApicSendEOI(); + + // FIXME: level interrupts + /* Re-request the interrupt to be handled later */ + ApicRequestInterrupt(Vector); + + /* Pretend it was a spurious interrupt */ + return FALSE; + } +#endif + /* Save the current IRQL */ + *OldIrql = CurrentIrql; /* Set the new IRQL */ - ApicSetCurrentIrql(Irql); + ApicRaiseIrql(Irql); /* Turn on interrupts */ _enable(); @@ -701,9 +795,11 @@ ApicSendEOI(); /* Restore the old IRQL */ - ApicSetCurrentIrql(OldIrql); -} - + ApicLowerIrql(OldIrql); +} + + +/* IRQL MANAGEMENT ************************************************************/ KIRQL NTAPI @@ -726,8 +822,8 @@ KeBugCheck(IRQL_NOT_LESS_OR_EQUAL); } #endif - /* Convert the new IRQL to a TPR value and write the register */ - ApicSetCurrentIrql(OldIrql); + /* Set the new IRQL */ + ApicLowerIrql(OldIrql); } KIRQL @@ -748,7 +844,7 @@ } #endif /* Convert the new IRQL to a TPR value and write the register */ - ApicSetCurrentIrql(NewIrql); + ApicRaiseIrql(NewIrql); /* Return old IRQL */ return OldIrql; Modified: trunk/reactos/hal/halx86/apic/rtctimer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/rtctimer.c… ============================================================================== --- trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] Mon Sep 12 09:46:20 2011 @@ -111,7 +111,7 @@ KiEnterInterruptTrap(TrapFrame); /* Start the interrupt */ - if (HalBeginSystemInterrupt(CLOCK_LEVEL, PRIMARY_VECTOR_BASE, &Irql)) + if (HalBeginSystemInterrupt(CLOCK_LEVEL, HalpClockVector, &Irql)) { /* Read register C, so that the next interrupt can happen */ HalpReadCmos(RTC_REGISTER_C);;

13 years

[cgutman] 53694: [NTOSKRNL] - Create a volatile device tree during 1st stage so the new HAL that's loaded in 2nd stage can do proper enumeration without phantom devices from the old HAL

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Sep 11 17:26:01 2011 New Revision: 53694 URL: http://svn.reactos.org/svn/reactos?rev=53694&view=rev Log: [NTOSKRNL] - Create a volatile device tree during 1st stage so the new HAL that's loaded in 2nd stage can do proper enumeration without phantom devices from the old HAL Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Sep 11 17:26:01 2011 @@ -22,6 +22,7 @@ RTL_AVL_TABLE PpDeviceReferenceTable; extern ULONG ExpInitializationPhase; +extern BOOLEAN ExpInTextModeSetup; extern BOOLEAN PnpSystemInit; /* DATA **********************************************************************/ @@ -1049,6 +1050,10 @@ /* Assume failure */ *Handle = NULL; + /* Create a volatile device tree in 1st stage so we have a clean slate + * for enumeration using the correct HAL (chosen in 1st stage setup) */ + if (ExpInTextModeSetup) CreateOptions |= REG_OPTION_VOLATILE; + /* Open root key for device instances */ Status = IopOpenRegistryKeyEx(&hParent, NULL, &EnumU, KEY_CREATE_SUB_KEY); if (!NT_SUCCESS(Status)) @@ -1143,7 +1148,7 @@ &ObjectAttributes, 0, NULL, - 0, + REG_OPTION_VOLATILE, NULL); if (NT_SUCCESS(Status)) { @@ -2638,7 +2643,7 @@ &ObjectAttributes, 0, NULL, - REG_OPTION_NON_VOLATILE, + ExpInTextModeSetup ? REG_OPTION_VOLATILE : 0, NULL); if (!NT_SUCCESS(Status)) { @@ -2654,7 +2659,7 @@ &ObjectAttributes, 0, NULL, - REG_OPTION_NON_VOLATILE, + ExpInTextModeSetup ? REG_OPTION_VOLATILE : 0, NULL); ZwClose(hLevel1Key); if (!NT_SUCCESS(Status)) @@ -3898,7 +3903,7 @@ InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, *DevInstRegKey, NULL); Status = ZwCreateKey(DevInstRegKey, DesiredAccess, &ObjectAttributes, - 0, NULL, REG_OPTION_NON_VOLATILE, NULL); + 0, NULL, ExpInTextModeSetup ? REG_OPTION_VOLATILE : 0, NULL); ZwClose(ObjectAttributes.RootDirectory); return Status;

13 years

[akhaldi] 53693: * Comment out some unused but set variables, remove some others. * Allow warnings for some 3rd party code.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 11 16:56:56 2011 New Revision: 53693 URL: http://svn.reactos.org/svn/reactos?rev=53693&view=rev Log: * Comment out some unused but set variables, remove some others. * Allow warnings for some 3rd party code. Modified: trunk/reactos/base/shell/cmd/cmdinput.c trunk/reactos/base/shell/cmd/filecomp.c trunk/reactos/base/shell/explorer-new/traywnd.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/cpl/usrmgr/groups.c trunk/reactos/dll/cpl/usrmgr/users.c trunk/reactos/dll/directx/ksproxy/datatype.cpp trunk/reactos/dll/ntdll/ldr/ldrutils.c trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/dbghelp/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/authport.c trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/windows/cursoricon.c trunk/reactos/dll/win32/user32/windows/nonclient.c trunk/reactos/dll/win32/winmm/CMakeLists.txt trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/ex/hdlsterm.c trunk/reactos/ntoskrnl/io/iomgr/volume.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c trunk/reactos/subsystems/win32/csrss/win32csr/alias.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c trunk/reactos/subsystems/win32/win32k/eng/alphablend.c trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c trunk/reactos/subsystems/win32/win32k/objects/gdipool.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -138,15 +138,17 @@ INT current = 0; /*the position of the cursor in the string (str)*/ INT charcount = 0;/*chars in the string (str)*/ INPUT_RECORD ir; +#ifdef FEATURE_UNIX_FILENAME_COMPLETION WORD wLastKey = 0; +#endif TCHAR ch; - BOOL bContinue=FALSE;/*is TRUE the second case will not be executed*/ BOOL bReturn = FALSE; BOOL bCharInput; #ifdef FEATURE_4NT_FILENAME_COMPLETION TCHAR szPath[MAX_PATH]; #endif #ifdef FEATURE_HISTORY + //BOOL bContinue=FALSE;/*is TRUE the second case will not be executed*/ TCHAR PreviousChar; #endif @@ -209,7 +211,7 @@ current = charcount = 0; curx = orgx; cury = orgy; - bContinue=TRUE; + //bContinue=TRUE; break; } @@ -223,7 +225,7 @@ current = charcount = _tcslen (str); ConOutPrintf (_T("%s"), str); GetCursorXY (&curx, &cury); - bContinue=TRUE; + //bContinue=TRUE; break; } @@ -599,7 +601,7 @@ } } - wLastKey = ir.Event.KeyEvent.wVirtualKeyCode; + //wLastKey = ir.Event.KeyEvent.wVirtualKeyCode; } while (!bReturn); Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -511,9 +511,9 @@ /* Length of string before we complete it */ INT StartLength; /* Length of string after completed */ - INT EndLength; + //INT EndLength; /* The number of chars added too it */ - static INT DiffLength = 0; + //static INT DiffLength = 0; /* Used to find and assemble the string that is returned */ TCHAR szBaseWord[MAX_PATH]; TCHAR szPrefix[MAX_PATH]; @@ -751,8 +751,8 @@ _tcscat(strOut,_T("\"")); _tcscpy(LastReturned,strOut); - EndLength = _tcslen(strOut); - DiffLength = EndLength - StartLength; + //EndLength = _tcslen(strOut); + //DiffLength = EndLength - StartLength; if(FileList != NULL) cmd_free(FileList); Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -321,11 +321,11 @@ IN OUT RECT *pRect) { RECT rcScreen; - BOOL Horizontal; + //BOOL Horizontal; HMONITOR hMon; SIZE szMax, szWnd; - Horizontal = ITrayWindowImpl_IsPosHorizontal(This); + //Horizontal = ITrayWindowImpl_IsPosHorizontal(This); szWnd.cx = pRect->right - pRect->left; szWnd.cy = pRect->bottom - pRect->top; Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -4409,9 +4409,9 @@ if (InfoW.dwInfoLevel == SERVICE_CONFIG_DESCRIPTION) { LPSERVICE_DESCRIPTIONW lpServiceDescriptonW; - LPSERVICE_DESCRIPTIONA lpServiceDescriptonA; - - lpServiceDescriptonA = Info.psd; + //LPSERVICE_DESCRIPTIONA lpServiceDescriptonA; + + //lpServiceDescriptonA = Info.psd; ///if (lpServiceDescriptonA && ///lpServiceDescriptonA->lpDescription) Modified: trunk/reactos/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groups.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -346,7 +346,7 @@ { TCHAR szOldGroupName[UNLEN]; TCHAR szNewGroupName[UNLEN]; - LOCALGROUP_INFO_0 lgrpi0; + //LOCALGROUP_INFO_0 lgrpi0; NET_API_STATUS status; /* Leave, if there is no valid listview item */ @@ -375,7 +375,7 @@ return FALSE; /* Change the user name */ - lgrpi0.lgrpi0_name = szNewGroupName; + //lgrpi0.lgrpi0_name = szNewGroupName; #if 0 status = NetLocalGroupSetInfo(NULL, szOldGroupName, 0, (LPBYTE)&lgrpi0, NULL); Modified: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -498,7 +498,7 @@ { TCHAR szOldUserName[UNLEN]; TCHAR szNewUserName[UNLEN]; - USER_INFO_0 useri0; + //USER_INFO_0 useri0; NET_API_STATUS status; /* Leave, if there is no valid listview item */ @@ -527,7 +527,7 @@ return FALSE; /* Change the user name */ - useri0.usri0_name = szNewUserName; + //useri0.usri0_name = szNewUserName; #if 0 status = NetUserSetInfo(NULL, szOldUserName, 0, (LPBYTE)&useri0, NULL); Modified: trunk/reactos/dll/directx/ksproxy/datatype.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/dataty… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/datatype.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/datatype.cpp [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -101,7 +101,7 @@ PKSMULTIPLE_ITEM DataList; PKSDATARANGE DataRange; ULONG Index; - HRESULT hr = S_FALSE; + //HRESULT hr = S_FALSE; #ifdef KSPROXY_TRACE OutputDebugStringW(L"CKsDataTypeHandler::KsIsMediaTypeInRanges\n"); @@ -135,7 +135,7 @@ if (!IsEqualGUID(m_Type->formattype, FORMAT_WaveFormatEx) && !IsEqualGUID(DataRange->Specifier, FORMAT_WaveFormatEx)) { //found match - hr = S_OK; + //hr = S_OK; break; } @@ -151,7 +151,7 @@ Format->nChannels <= AudioRange->MaximumChannels) { // found match - hr = S_OK; + //hr = S_OK; break; } } Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -1591,7 +1591,7 @@ PWCHAR Buffer, BufEnd = NULL; ULONG Length = 0; WCHAR p; - PWCHAR pp; + //PWCHAR pp; /* Check if we don't have a search path */ if (!ActualSearchPath) *SearchPath = LdrpDefaultPath.Buffer; @@ -1716,7 +1716,7 @@ BufEnd = Buffer; /* Update string position */ - pp = ActualSearchPath++; + //pp = ActualSearchPath++; } else { Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -903,7 +903,6 @@ IN ULONG CountOfRights) { LSAPR_USER_RIGHT_SET UserRightSet; - NTSTATUS Status; TRACE("(%p,%p,%d,%p,0x%08x) stub\n", PolicyHandle, AccountSid, AllRights, UserRights, CountOfRights); @@ -912,14 +911,14 @@ RpcTryExcept { - Status = LsarRemoveAccountRights((LSAPR_HANDLE)PolicyHandle, - (PRPC_SID)AccountSid, - AllRights, - &UserRightSet); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); + LsarRemoveAccountRights((LSAPR_HANDLE)PolicyHandle, + (PRPC_SID)AccountSid, + AllRights, + &UserRightSet); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + I_RpcMapWin32Status(RpcExceptionCode()); } RpcEndExcept; Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -45,6 +45,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def) add_library(dbghelp SHARED ${SOURCE}) +allow_warnings(dbghelp) set_module_type(dbghelp win32dll) target_link_libraries(dbghelp wine ${PSEH_LIB} oldnames) add_delay_importlibs(dbghelp version) Modified: trunk/reactos/dll/win32/lsasrv/authport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authport.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -27,8 +27,6 @@ PPORT_MESSAGE Reply = NULL; NTSTATUS Status; - NTSTATUS Status2; - HANDLE ConnectionHandle = NULL; PVOID Context = NULL; BOOLEAN Accept; @@ -56,15 +54,15 @@ TRACE("Port connection request\n"); Accept = TRUE; - Status2 = NtAcceptConnectPort(&ConnectionHandle, - &Context, - &Request.Header, - Accept, - NULL, - NULL); + NtAcceptConnectPort(&ConnectionHandle, + &Context, + &Request.Header, + Accept, + NULL, + NULL); - Status2 = NtCompleteConnectPort(ConnectionHandle); + NtCompleteConnectPort(ConnectionHandle); } else if (Request.Header.u2.s2.Type == LPC_PORT_CLOSED || Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -3972,7 +3972,6 @@ REGDISPOSITION Disposition, PHKEY phkClass, ULONG ulFlags, HMACHINE hMachine) { - CONFIGRET rc = CR_SUCCESS; LPWSTR pszClassNameW = NULL; TRACE("%p %s %lx %lx %p %lx %lx\n", @@ -3985,8 +3984,8 @@ return CR_INVALID_DATA; } - rc = CM_Open_Class_Key_ExW(pClassGuid, pszClassNameW, samDesired, - Disposition, phkClass, ulFlags, hMachine); + CM_Open_Class_Key_ExW(pClassGuid, pszClassNameW, samDesired, + Disposition, phkClass, ulFlags, hMachine); if (pszClassNameW != NULL) MyFree(pszClassNameW); Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -134,12 +134,13 @@ OUT PDWORD ScoreSuiteMask) { LPWSTR Section = NULL; - LPCWSTR pExtensionPlatform, pExtensionArchitecture; + //LPCWSTR pExtensionPlatform; + LPCWSTR pExtensionArchitecture; LPWSTR Fields[6]; DWORD i; BOOL ret = FALSE; - static const WCHAR ExtensionPlatformNone[] = {'.',0}; + //static const WCHAR ExtensionPlatformNone[] = {'.',0}; static const WCHAR ExtensionPlatformNT[] = {'.','N','T',0}; static const WCHAR ExtensionPlatformWindows[] = {'.','W','i','n',0}; @@ -167,14 +168,14 @@ switch (PlatformInfo->Platform) { case VER_PLATFORM_WIN32_WINDOWS: - pExtensionPlatform = ExtensionPlatformWindows; + //pExtensionPlatform = ExtensionPlatformWindows; break; case VER_PLATFORM_WIN32_NT: - pExtensionPlatform = ExtensionPlatformNT; + //pExtensionPlatform = ExtensionPlatformNT; break; default: ERR("Unknown platform 0x%lx\n", PlatformInfo->Platform); - pExtensionPlatform = ExtensionPlatformNone; + //pExtensionPlatform = ExtensionPlatformNone; break; } switch (PlatformInfo->ProcessorArchitecture) Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -1090,7 +1090,7 @@ if (!es->text) { CHAR *textA = NULL; // ReactOS Hacked! - UINT countA = 0; + //UINT countA = 0; if(es->hloc32W) { @@ -1098,7 +1098,7 @@ { TRACE("Synchronizing with 32-bit ANSI buffer\n"); textA = LocalLock(es->hloc32A); - countA = strlen(textA) + 1; + //countA = strlen(textA) + 1; } } else { Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -310,7 +310,7 @@ void IntDrawScrollBar(HWND Wnd, HDC DC, INT Bar) { - INT ThumbSize; + //INT ThumbSize; SCROLLBARINFO Info; BOOL Vertical; @@ -344,7 +344,7 @@ return; } - ThumbSize = Info.xyThumbBottom - Info.xyThumbTop; + //ThumbSize = Info.xyThumbBottom - Info.xyThumbTop; /* * Draw the arrows. Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -883,7 +883,8 @@ { HANDLE handle = 0; HICON hIcon = 0; - HRSRC hRsrc, hGroupRsrc; + HRSRC hRsrc; + //HRSRC hGroupRsrc; CURSORICONDIR *dir; CURSORICONDIRENTRY *dirEntry; LPBYTE bits; @@ -906,7 +907,7 @@ if (!(hRsrc = FindResourceW( hInstance, name, (LPWSTR)(fCursor ? RT_GROUP_CURSOR : RT_GROUP_ICON) ))) return 0; - hGroupRsrc = hRsrc; + //hGroupRsrc = hRsrc; /* Find the best entry in the directory */ Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -1045,19 +1045,19 @@ VOID DefWndTrackScrollBar(HWND hWnd, WPARAM wParam, POINT Point) { - INT ScrollBar; + //INT ScrollBar; if ((wParam & 0xfff0) == SC_HSCROLL) { if ((wParam & 0x0f) != HTHSCROLL) return; - ScrollBar = SB_HORZ; + //ScrollBar = SB_HORZ; } else { if ((wParam & 0x0f) != HTVSCROLL) return; - ScrollBar = SB_VERT; + //ScrollBar = SB_VERT; } /* FIXME */ Modified: trunk/reactos/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -21,15 +21,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/winmm.def) add_library(winmm SHARED ${SOURCE}) - +allow_warnings(winmm) set_module_type(winmm win32dll) - -target_link_libraries(winmm - wine - ${PSEH_LIB}) +target_link_libraries(winmm wine ${PSEH_LIB}) add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) - add_subdirectory(midimap) add_cd_file(TARGET winmm DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/C… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -22,10 +22,9 @@ src/shutdown.c) add_library(ext2fs SHARED ${SOURCE}) - +allow_warnings(ext2fs) target_link_libraries(ext2fs ${PSEH_LIB}) add_pch(ext2fs inc/ext2fsd.h) set_module_type(ext2fs kernelmodedriver) add_importlibs(ext2fs ntoskrnl hal) - add_cd_file(TARGET ext2fs DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -119,7 +119,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PCLASS_DEVICE_EXTENSION DeviceExtension; + //PCLASS_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status = STATUS_NOT_SUPPORTED; TRACE_(CLASS_NAME, "IRP_MJ_DEVICE_CONTROL\n"); @@ -127,7 +127,7 @@ if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); - DeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + //DeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; switch (IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlCode) { Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -613,7 +613,7 @@ IN KSDISPATCH_TABLE* Table) { PIO_STACK_LOCATION IoStack; - PDEVICE_EXTENSION DeviceExtension; + //PDEVICE_EXTENSION DeviceExtension; //PKSIDEVICE_HEADER DeviceHeader; PKSIOBJECT_HEADER ObjectHeader; //PKSOBJECT_CREATE_ITEM CreateItem; @@ -631,7 +631,7 @@ /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); /* get device extension */ - DeviceExtension = (PDEVICE_EXTENSION)IoStack->DeviceObject->DeviceExtension; + //DeviceExtension = (PDEVICE_EXTENSION)IoStack->DeviceObject->DeviceExtension; /* get device header */ //DeviceHeader = DeviceExtension->DeviceHeader; Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -652,7 +652,7 @@ PKSSTREAM_HEADER StreamHeader; PIO_STACK_LOCATION IoStack; ULONG Length; - BOOLEAN AllocateMdl = FALSE; + //BOOLEAN AllocateMdl = FALSE; /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -1024,7 +1024,7 @@ } /* break out to probe for the irp */ - AllocateMdl = TRUE; + //AllocateMdl = TRUE; break; } } @@ -1903,9 +1903,9 @@ IN PIRP Irp) { PIO_STACK_LOCATION IoStack; - PDEVICE_EXTENSION DeviceExtension; + //PDEVICE_EXTENSION DeviceExtension; PKSIOBJECT_HEADER ObjectHeader; - PKSIDEVICE_HEADER DeviceHeader; + //PKSIDEVICE_HEADER DeviceHeader; PDRIVER_DISPATCH Dispatch; NTSTATUS Status; @@ -1913,9 +1913,9 @@ IoStack = IoGetCurrentIrpStackLocation(Irp); /* get device extension */ - DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + //DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; /* get device header */ - DeviceHeader = DeviceExtension->DeviceHeader; + //DeviceHeader = DeviceExtension->DeviceHeader; ASSERT(IoStack->FileObject); Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -731,7 +731,7 @@ case TDI_QUERY_CONNECTION_INFO: { PTDI_CONNECTION_INFO ConnectionInfo; - PCONNECTION_ENDPOINT Endpoint; + //PCONNECTION_ENDPOINT Endpoint; if (MmGetMdlByteCount(Irp->MdlAddress) < sizeof(*ConnectionInfo)) { TI_DbgPrint(MID_TRACE, ("MDL buffer too small.\n")); @@ -743,8 +743,7 @@ switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { case TDI_CONNECTION_FILE: - Endpoint = - (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; + //Endpoint = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; RtlZeroMemory(ConnectionInfo, sizeof(*ConnectionInfo)); return STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -818,14 +818,13 @@ CPortPinWaveCyclic::RequestService() { ULONG Position; - NTSTATUS Status; ULONGLONG OldOffset, NewOffset; PC_ASSERT_IRQL(DISPATCH_LEVEL); if (m_State == KSSTATE_RUN && m_ResetState == KSRESET_END) { - Status = m_Stream->GetPosition(&Position); + m_Stream->GetPosition(&Position); OldOffset = m_Position.PlayOffset; @@ -1161,7 +1160,7 @@ { NTSTATUS Status; PKSDATAFORMAT DataFormat; - PDEVICE_OBJECT DeviceObject; + //PDEVICE_OBJECT DeviceObject; BOOLEAN Capture; PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor = NULL; //IDrmAudioStream * DrmAudio = NULL; @@ -1170,7 +1169,7 @@ m_ConnectDetails = ConnectDetails; m_Miniport = GetWaveCyclicMiniport(Port); - DeviceObject = GetDeviceObject(Port); + //DeviceObject = GetDeviceObject(Port); DataFormat = (PKSDATAFORMAT)(ConnectDetails + 1); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -496,7 +496,7 @@ CPortPinWavePci::HandleKsProperty( IN PIRP Irp) { - PKSPROPERTY Property; + //PKSPROPERTY Property; NTSTATUS Status; //UNICODE_STRING GuidString; PIO_STACK_LOCATION IoStack; @@ -521,7 +521,7 @@ if (Status == STATUS_NOT_FOUND) { - Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + //Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; #if 0 RtlStringFromGUID(Property->Set, &GuidString); //DPRINT("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -152,7 +152,7 @@ { PKSP_PIN Pin; PLIST_ENTRY Entry; - PKSPIN_PHYSICALCONNECTION Connection; + //PKSPIN_PHYSICALCONNECTION Connection; PPHYSICAL_CONNECTION_ENTRY ConEntry; // get pin @@ -180,7 +180,7 @@ if (ConEntry->FromPin == Pin->PinId) { - Connection = (PKSPIN_PHYSICALCONNECTION)Data; + //Connection = (PKSPIN_PHYSICALCONNECTION)Data; DPRINT("FoundEntry %S Size %u\n", ConEntry->Connection.SymbolicLinkName, ConEntry->Connection.Size); IoStatus->Information = ConEntry->Connection.Size; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -45,9 +45,9 @@ { ULONG Result = 0; NTSTATUS Status = STATUS_SUCCESS; - PWDMAUD_DEVICE_EXTENSION DeviceExtension; - - DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + //PWDMAUD_DEVICE_EXTENSION DeviceExtension; + + //DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; if (DeviceInfo->DeviceType == MIXER_DEVICE_TYPE) { @@ -227,13 +227,13 @@ IN PIRP Irp, IN PWDMAUD_DEVICE_INFO DeviceInfo) { - PWDMAUD_DEVICE_EXTENSION DeviceExtension; + //PWDMAUD_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; LPWSTR Device; ULONG Size, Length; /* get device extension */ - DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + //DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* get device interface string input length */ Size = DeviceInfo->u.Interface.DeviceInterfaceStringSize; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -126,10 +126,10 @@ NTSTATUS Status; PIO_STACK_LOCATION IoStack; PWDMAUD_CLIENT pClient; - PWDMAUD_DEVICE_EXTENSION DeviceExtension; + //PWDMAUD_DEVICE_EXTENSION DeviceExtension; /* get device extension */ - DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + //DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; #if KS_IMPLEMENTED Status = KsReferenceSoftwareBusObject((KSDEVICE_HEADER)DeviceObject->DeviceExtension); Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -406,13 +406,13 @@ { HANDLE hMixer; PWDMAUD_HANDLE Handles; - PWDMAUD_DEVICE_EXTENSION DeviceExtension; + //PWDMAUD_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; PKEVENT EventObject = NULL; DPRINT("WdmAudControlOpenMixer\n"); - DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + //DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; if (DeviceInfo->u.hNotifyEvent) { Modified: trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -18,5 +18,5 @@ ff_time.c) add_library(fullfat ${SOURCE}) - +allow_warnings(fullfat) add_dependencies(fullfat bugcodes) 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -1078,7 +1078,8 @@ { WCHAR FileBuffer[MAX_PATH], RegBuffer[MAX_PATH], ConfigPath[MAX_PATH]; UNICODE_STRING TempName, FileName, RegName; - ULONG FileStart, RegStart, i, ErrorResponse, WorkerCount, Length; + ULONG FileStart, i, ErrorResponse, WorkerCount, Length; + //ULONG RegStart; ULONG PrimaryDisposition, SecondaryDisposition, ClusterSize; PCMHIVE CmHive; HANDLE PrimaryHandle, LogHandle; @@ -1106,7 +1107,7 @@ /* And build the registry root path */ RtlInitUnicodeString(&TempName, L"\\REGISTRY\\"); RtlAppendStringToString((PSTRING)&RegName, (PSTRING)&TempName); - RegStart = RegName.Length; + //RegStart = RegName.Length; /* Build the base name */ RtlInitUnicodeString(&TempName, CmpMachineHiveList[i].BaseName); Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/hdlsterm.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -205,7 +205,7 @@ OUT PSIZE_T OutputBufferSize ) { - NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + //NTSTATUS Status = STATUS_NOT_IMPLEMENTED; ASSERT(HeadlessGlobals != NULL); // ASSERT(HeadlessGlobals->PageLockHandle != NULL); @@ -236,7 +236,7 @@ /* Validate the existence of an input buffer */ if (!InputBuffer) { - Status = STATUS_INVALID_PARAMETER; + //Status = STATUS_INVALID_PARAMETER; goto Reset; } @@ -249,7 +249,7 @@ } /* Return success either way */ - Status = STATUS_SUCCESS; + //Status = STATUS_SUCCESS; break; case HeadlessCmdClearDisplay: break; Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -881,7 +881,7 @@ NTSTATUS Status, VpbStatus; PDEVICE_OBJECT FileSystemDeviceObject; PVPB Vpb, NewVpb; - BOOLEAN WasNotMounted = TRUE; + //BOOLEAN WasNotMounted = TRUE; /* Wait on the device lock */ Status = KeWaitForSingleObject(&DeviceObject->DeviceLock, @@ -898,7 +898,7 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); /* Find the actual File System DO */ - WasNotMounted = FALSE; + //WasNotMounted = FALSE; FileSystemDeviceObject = DeviceObject->Vpb->DeviceObject; while (FileSystemDeviceObject->AttachedDevice) { Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -116,7 +116,8 @@ { PFN_NUMBER ActualPages = 0; PETHREAD CurrentThread = PsGetCurrentThread(); - PMMPFN Pfn1, Pfn2; + PMMPFN Pfn1; + //PMMPFN Pfn2; PFN_NUMBER PageFrameIndex, PageTableIndex; KIRQL OldIrql; ASSERT(KeGetCurrentIrql() <= APC_LEVEL); @@ -149,7 +150,7 @@ /* Get the page table entry */ PageTableIndex = Pfn1->u4.PteFrame; - Pfn2 = MiGetPfnEntry(PageTableIndex); + //Pfn2 = MiGetPfnEntry(PageTableIndex); /* Lock the PFN database */ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Modified: trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/zeropage.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -29,7 +29,6 @@ PKTHREAD Thread = KeGetCurrentThread(); //PVOID StartAddress, EndAddress; PVOID WaitObjects[2]; - NTSTATUS Status; KIRQL OldIrql; PVOID ZeroAddress; PFN_NUMBER PageIndex, FreePage; @@ -50,14 +49,14 @@ while (TRUE) { - Status = KeWaitForMultipleObjects(1, // 2 - WaitObjects, - WaitAny, - WrFreePage, - KernelMode, - FALSE, - NULL, - NULL); + KeWaitForMultipleObjects(1, // 2 + WaitObjects, + WaitAny, + WrFreePage, + KernelMode, + FALSE, + NULL, + NULL); OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); while (TRUE) { Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -207,7 +207,6 @@ CSR_API(CsrCreateProcess) { PCSRSS_PROCESS_DATA NewProcessData; - NTSTATUS Status; Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -224,7 +223,7 @@ NewProcessData->bInheritHandles = Request->Data.CreateProcessRequest.bInheritHandles; if (Request->Data.CreateProcessRequest.bInheritHandles) { - Status = CallProcessInherit(ProcessData, NewProcessData); + CallProcessInherit(ProcessData, NewProcessData); } } Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -214,17 +214,16 @@ IN HANDLE hThread, IN PCLIENT_ID ClientId) { - NTSTATUS Status; PCSR_THREAD CsrThread; //PCSRSS_PROCESS_DATA CurrentProcess; - PCSR_THREAD CurrentThread = NtCurrentTeb()->CsrClientThread; - CLIENT_ID CurrentCid; + //PCSR_THREAD CurrentThread = NtCurrentTeb()->CsrClientThread; + //CLIENT_ID CurrentCid; KERNEL_USER_TIMES KernelTimes; // DPRINT1("CSRSRV: %s called\n", __FUNCTION__); /* Get the current thread and CID */ - CurrentCid = CurrentThread->ClientId; + //CurrentCid = CurrentThread->ClientId; // DPRINT1("CALLER PID/TID: %lx/%lx\n", CurrentCid.UniqueProcess, CurrentCid.UniqueThread); /* Acquire the Process Lock */ @@ -243,11 +242,11 @@ } #endif /* Get the Thread Create Time */ - Status = NtQueryInformationThread(hThread, - ThreadTimes, - (PVOID)&KernelTimes, - sizeof(KernelTimes), - NULL); + NtQueryInformationThread(hThread, + ThreadTimes, + (PVOID)&KernelTimes, + sizeof(KernelTimes), + NULL); /* Allocate a CSR Thread Structure */ if (!(CsrThread = CsrAllocateThread(CsrProcess))) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/alias.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/alias.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -285,11 +285,11 @@ WCHAR * lpExeName; WCHAR * lpSource; WCHAR * lpTarget; - ULONG TotalLength; - WCHAR * Ptr; - - TotalLength = Request->Data.AddConsoleAlias.SourceLength + Request->Data.AddConsoleAlias.ExeLength + Request->Data.AddConsoleAlias.TargetLength; - Ptr = (WCHAR*)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE)); + //ULONG TotalLength; + //WCHAR * Ptr; + + //TotalLength = Request->Data.AddConsoleAlias.SourceLength + Request->Data.AddConsoleAlias.ExeLength + Request->Data.AddConsoleAlias.TargetLength; + //Ptr = (WCHAR*)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE)); lpSource = (WCHAR*)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE)); lpExeName = (WCHAR*)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE) + Request->Data.AddConsoleAlias.SourceLength * sizeof(WCHAR)); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -184,11 +184,10 @@ PCSRSS_EXPORTED_FUNCS Exports, HANDLE CsrssApiHeap) { - NTSTATUS Status; CsrExports = *Exports; Win32CsrApiHeap = CsrssApiHeap; - Status = NtUserInitialize(0, NULL, NULL); + NtUserInitialize(0, NULL, NULL); PrivateCsrssManualGuiCheck(0); CsrInitConsoleSupport(); @@ -199,7 +198,7 @@ ServerProcs->ProcessInheritProc = Win32CsrDuplicateHandleTable; ServerProcs->ProcessDeletedProc = Win32CsrReleaseConsole; - Status = RtlInitializeCriticalSection(&Win32CsrDefineDosDeviceCritSec); + RtlInitializeCriticalSection(&Win32CsrDefineDosDeviceCritSec); InitializeListHead(&DosDeviceHistory); return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -468,7 +468,8 @@ register PUCHAR Dst; BLENDFUNCTION BlendFunc; register NICEPIXEL32 DstPixel, SrcPixel; - UCHAR Alpha, SrcBpp; + UCHAR Alpha; + //UCHAR SrcBpp; DPRINT("DIB_24BPP_AlphaBlend: srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, @@ -499,7 +500,7 @@ Dst = (PUCHAR)((ULONG_PTR)Dest->pvScan0 + (DestRect->top * Dest->lDelta) + (DestRect->left * 3)); - SrcBpp = BitsPerFormat(Source->iBitmapFormat); + //SrcBpp = BitsPerFormat(Source->iBitmapFormat); Rows = 0; SrcY = SourceRect->top; Modified: trunk/reactos/subsystems/win32/win32k/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -201,13 +201,13 @@ { BOOL ret = FALSE; SURFACE *psurfDest; - SURFACE *psurfSource; + //SURFACE *psurfSource; ASSERT(psoDest); psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); ASSERT(psoSource); - psurfSource = CONTAINING_RECORD(psoSource, SURFACE, SurfObj); + //psurfSource = CONTAINING_RECORD(psoSource, SURFACE, SurfObj); ASSERT(DestRect); ASSERT(SourceRect); Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -958,7 +958,7 @@ BOOLEAN ret; RECTL OutputRect; POINTL InputPoint; - SURFACE *psurfDest; + //SURFACE *psurfDest; ASSERT(psoMask); @@ -986,7 +986,7 @@ /* No success yet */ ret = FALSE; ASSERT(psoDest); - psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); + //psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); /* Dummy BitBlt to let driver know that it should flush its changes. This should really be done using a call to DrvSynchronizeSurface, Modified: trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -392,7 +392,7 @@ COLORADJUSTMENT ca; POINTL MaskOrigin = {0, 0}; SURFACE *psurfDest; - SURFACE *psurfSource = NULL; + //SURFACE *psurfSource = NULL; RECTL InputClippedRect; RECTL InputRect; RECTL OutputRect; @@ -469,7 +469,7 @@ if (UsesSource) { - psurfSource = CONTAINING_RECORD(psoSource, SURFACE, SurfObj); + //psurfSource = CONTAINING_RECORD(psoSource, SURFACE, SurfObj); } /* Prepare color adjustment */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -648,7 +648,7 @@ HKEY hkey; NTSTATUS Status; PPDEVOBJ ppdev; - PDESKTOP pdesk; + //PDESKTOP pdesk; /* If no DEVMODE is given, use registry settings */ if (!pdm) @@ -769,7 +769,7 @@ /* Remove all cursor clipping */ UserClipCursor(NULL); - pdesk = IntGetActiveDesktop(); + //pdesk = IntGetActiveDesktop(); //IntHideDesktop(pdesk); /* Send WM_DISPLAYCHANGE to all toplevel windows */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -1741,7 +1741,7 @@ DWORD resolution) { MOUSEMOVEPOINT Safeppt; - BOOL Hit; + //BOOL Hit; INT Count = -1; DECLARE_RETURN(DWORD); @@ -1775,7 +1775,7 @@ // http://msdn.microsoft.com/en-us/library/ms646259(v=vs.85).aspx // This explains the math issues in transforming points. Count = gcur_count; // FIFO is forward so retrieve backward. - Hit = FALSE; + //Hit = FALSE; do { if (Safeppt.x == 0 && Safeppt.y == 0) @@ -1787,7 +1787,7 @@ { if (Safeppt.time == MouseHistoryOfMoves[Count].time) { - Hit = TRUE; + //Hit = TRUE; break; } else @@ -1796,7 +1796,7 @@ continue; } } - Hit = TRUE; + //Hit = TRUE; break; } if (--Count < 0) Count = 63; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -684,7 +684,7 @@ BOOL bGMSG ) { PTHREADINFO pti; - PCLIENTINFO pci; + //PCLIENTINFO pci; LARGE_INTEGER LargeTickCount; PUSER_MESSAGE_QUEUE ThreadQueue; BOOL RemoveMessages; @@ -693,7 +693,7 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - pci = pti->pClientInfo; + //pci = pti->pClientInfo; RemoveMessages = RemoveMsg & PM_REMOVE; ProcessMask = HIWORD(RemoveMsg); @@ -1557,7 +1557,7 @@ LPARAM lParam, PDOSENDMESSAGE dsm) { - PTHREADINFO pti; + //PTHREADINFO pti; LRESULT Result = TRUE; NTSTATUS Status; PWND Window = NULL; @@ -1581,7 +1581,7 @@ } /* See if the current thread can handle the message */ - pti = PsGetCurrentThreadWin32Thread(); + //pti = PsGetCurrentThreadWin32Thread(); UserModeMsg.hwnd = hWnd; UserModeMsg.message = Msg; @@ -1677,11 +1677,11 @@ IntGetQueueStatus(DWORD Changes) { PTHREADINFO pti; - PUSER_MESSAGE_QUEUE Queue; + //PUSER_MESSAGE_QUEUE Queue; DWORD Result; pti = PsGetCurrentThreadWin32Thread(); - Queue = pti->MessageQueue; + //Queue = pti->MessageQueue; // wine: Changes &= (QS_ALLINPUT|QS_ALLPOSTMESSAGE|QS_SMRESULT); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -3846,7 +3846,7 @@ if ((DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()))) { - PTHREADINFO pti; + //PTHREADINFO pti; pt.x = X; pt.y = Y; @@ -3855,7 +3855,7 @@ //its possible this referencing is useless, thou it shouldnt hurt... UserRefObjectCo(DesktopWindow, &Ref); - pti = PsGetCurrentThreadWin32Thread(); + //pti = PsGetCurrentThreadWin32Thread(); Window = co_WinPosWindowFromPoint(DesktopWindow, &pt, &hittest); if(Window) Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -196,7 +196,7 @@ int YEndArc) { BOOL Ret; - PDC_ATTR pdcattr; + //PDC_ATTR pdcattr; DPRINT("StartX: %d, StartY: %d, EndX: %d, EndY: %d\n", XStartArc,YStartArc,XEndArc,YEndArc); @@ -219,7 +219,7 @@ arctype); } - pdcattr = dc->pdcattr; + //pdcattr = dc->pdcattr; if (arctype == GdiTypeArcTo) { Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -26,14 +26,14 @@ CLIPPING_UpdateGCRegion(DC* Dc) { PROSRGNDATA CombinedRegion; - HRGN hRgnVis; + //HRGN hRgnVis; PREGION prgnClip, prgnGCClip; // would prefer this, but the rest of the code sucks // ASSERT(Dc->rosdc.hGCClipRgn); // ASSERT(Dc->rosdc.hClipRgn); ASSERT(Dc->prgnVis); - hRgnVis = Dc->prgnVis->BaseObject.hHmgr; + //hRgnVis = Dc->prgnVis->BaseObject.hHmgr; if (Dc->rosdc.hGCClipRgn == NULL) Dc->rosdc.hGCClipRgn = IntSysCreateRectRgn(0, 0, 0, 0); Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -350,7 +350,7 @@ SURFACE *pSurf; RECTL rcDest; POINTL ptSource; - INT DIBWidth; + //INT DIBWidth; SIZEL SourceSize; EXLATEOBJ exlo; PPALETTE ppalDIB = NULL; @@ -410,7 +410,7 @@ SourceSize.cx = bmi->bmiHeader.biWidth; SourceSize.cy = ScanLines; - DIBWidth = WIDTH_BYTES_ALIGN32(SourceSize.cx, bmi->bmiHeader.biBitCount); + //DIBWidth = WIDTH_BYTES_ALIGN32(SourceSize.cx, bmi->bmiHeader.biBitCount); hSourceBitmap = GreCreateBitmapEx(bmi->bmiHeader.biWidth, ScanLines, @@ -1390,7 +1390,7 @@ INT effHeight; ULONG totalSize; BITMAP bm; - SIZEL Size; + //SIZEL Size; HANDLE hSecure; DPRINT("format (%ld,%ld), planes %d, bpp %d, size %ld, colors %ld (%s)\n", @@ -1507,8 +1507,8 @@ } // Create Device Dependent Bitmap and add DIB pointer - Size.cx = bm.bmWidth; - Size.cy = abs(bm.bmHeight); + //Size.cx = bm.bmWidth; + //Size.cy = abs(bm.bmHeight); res = GreCreateBitmapEx(bm.bmWidth, abs(bm.bmHeight), bm.bmWidthBytes, Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -43,14 +43,14 @@ SynchonizeDriver(FLONG Flags) { SURFOBJ *SurfObj; - PPDEVOBJ Device; + //PPDEVOBJ Device; if (Flags & GCAPS2_SYNCFLUSH) Flags = DSS_FLUSH_EVENT; if (Flags & GCAPS2_SYNCTIMER) Flags = DSS_TIMER_EVENT; - Device = IntEnumHDev(); + //Device = IntEnumHDev(); // UNIMPLEMENTED; //ASSERT(FALSE); SurfObj = 0;// EngLockSurface( Device->pSurface ); Modified: trunk/reactos/subsystems/win32/win32k/objects/gdipool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdipool.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdipool.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -127,7 +127,6 @@ PLIST_ENTRY ple; PVOID pvAlloc, pvBaseAddress; SIZE_T cjSize; - NTSTATUS status; /* Disable APCs and acquire the pool lock */ KeEnterCriticalRegion(); @@ -192,12 +191,12 @@ /* Commit the pages */ pvBaseAddress = PAGE_ALIGN(pvAlloc); cjSize = ADDRESS_AND_SIZE_TO_SPAN_PAGES(pvAlloc, pPool->cjAllocSize) * PAGE_SIZE; - status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &pvBaseAddress, - 0, - &cjSize, - MEM_COMMIT, - PAGE_READWRITE); + ZwAllocateVirtualMemory(NtCurrentProcess(), + &pvBaseAddress, + 0, + &cjSize, + MEM_COMMIT, + PAGE_READWRITE); pSection->ulCommitBitmap |= ulPageBit; } Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Sun Sep 11 16:56:56 2011 @@ -2029,7 +2029,7 @@ FASTCALL REGION_AllocRgnWithHandle(INT nReg) { - HRGN hReg; + //HRGN hReg; PROSRGNDATA pReg; pReg = (PROSRGNDATA)GDIOBJ_AllocateObject(GDIObjType_RGN_TYPE, @@ -2048,7 +2048,7 @@ return NULL; } - hReg = pReg->BaseObject.hHmgr; + //hReg = pReg->BaseObject.hHmgr; if (nReg == 0 || nReg == 1) {

13 years

[cgutman] 53692: [SCSIPORT] - Remove a duplicate assignment

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Sep 11 15:40:01 2011 New Revision: 53692 URL: http://svn.reactos.org/svn/reactos?rev=53692&view=rev Log: [SCSIPORT] - Remove a duplicate assignment Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Sun Sep 11 15:40:01 2011 @@ -1055,7 +1055,6 @@ DriverObject->MajorFunction[IRP_MJ_CREATE] = ScsiPortCreateClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = ScsiPortCreateClose; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ScsiPortDeviceControl; - DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = ScsiPortDeviceControl; DriverObject->MajorFunction[IRP_MJ_SCSI] = ScsiPortDispatchScsi; /* Obtain configuration information */

13 years

[akhaldi] 53691: * Comment out some unused but set variables, remove some others. * Allow warnings for some 3rd party code.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 11 15:39:19 2011 New Revision: 53691 URL: http://svn.reactos.org/svn/reactos?rev=53691&view=rev Log: * Comment out some unused but set variables, remove some others. * Allow warnings for some 3rd party code. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/dll/win32/kernel32/client/except.c trunk/reactos/dll/win32/kernel32/client/file/console.c trunk/reactos/dll/win32/kernel32/client/loader.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/drivers/bus/acpi/CMakeLists.txt trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/dirctl.c trunk/reactos/drivers/filesystems/npfs/finfo.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/rw.c trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/input/mouclass/mouclass.c trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/hal/halx86/legacy/halpnpdd.c trunk/reactos/lib/3rdparty/cardlib/CMakeLists.txt trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c trunk/reactos/lib/fslib/vfatlib/check/check.c trunk/reactos/lib/pseh/CMakeLists.txt trunk/reactos/lib/sdk/crt/wine/undname.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -2266,12 +2266,12 @@ FormatPartitionPage(PINPUT_RECORD Ir) { WCHAR PathBuffer[MAX_PATH]; - PDISKENTRY DiskEntry; PPARTENTRY PartEntry; UCHAR PartNum; NTSTATUS Status; #ifndef NDEBUG + PDISKENTRY DiskEntry; ULONG Line; ULONG i; PLIST_ENTRY Entry; @@ -2287,7 +2287,9 @@ return QUIT_PAGE; } +#ifndef NDEBUG DiskEntry = PartitionList->CurrentDisk; +#endif PartEntry = PartitionList->CurrentPartition; PartNum = PartitionList->CurrentPartitionNumber; Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -444,7 +444,7 @@ IsBadReadPtr(IN LPCVOID lp, IN UINT_PTR ucb) { - ULONG PageSize; + //ULONG PageSize; BOOLEAN Result = FALSE; volatile CHAR *Current; PCHAR Last; @@ -454,7 +454,7 @@ if (!lp) return TRUE; /* Get the page size */ - PageSize = BaseStaticServerData->SysInfo.PageSize; + //PageSize = BaseStaticServerData->SysInfo.PageSize; /* Calculate the last page */ Last = (PCHAR)((ULONG_PTR)lp + ucb - 1); @@ -516,7 +516,7 @@ IsBadWritePtr(LPVOID lp, UINT_PTR ucb) { - ULONG PageSize; + //ULONG PageSize; BOOLEAN Result = FALSE; volatile CHAR *Current; PCHAR Last; @@ -526,7 +526,7 @@ if (!lp) return TRUE; /* Get the page size */ - PageSize = BaseStaticServerData->SysInfo.PageSize; + //PageSize = BaseStaticServerData->SysInfo.PageSize; /* Calculate the last page */ Last = (PCHAR)((ULONG_PTR)lp + ucb - 1); Modified: trunk/reactos/dll/win32/kernel32/client/file/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -2045,7 +2045,6 @@ CSR_API_MESSAGE Request; ULONG CsrRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - NTSTATUS Status; ULONG Size; if (lpBuffer == NULL) @@ -2079,10 +2078,10 @@ Request.Data.PeekConsoleInputRequest.Length = nLength; /* Call the server */ - Status = CsrClientCallServer(&Request, - CaptureBuffer, - CsrRequest, - sizeof(CSR_API_MESSAGE)); + CsrClientCallServer(&Request, + CaptureBuffer, + CsrRequest, + sizeof(CSR_API_MESSAGE)); DPRINT("Server returned: %x\n", Request.Status); /* Check for success*/ @@ -2280,7 +2279,6 @@ CSR_API_MESSAGE Request; ULONG CsrRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - NTSTATUS Status; DWORD Size; if (lpBuffer == NULL) @@ -2314,10 +2312,10 @@ Request.Data.WriteConsoleInputRequest.Length = nLength; /* Call the server */ - Status = CsrClientCallServer(&Request, - CaptureBuffer, - CsrRequest, - sizeof(CSR_API_MESSAGE)); + CsrClientCallServer(&Request, + CaptureBuffer, + CsrRequest, + sizeof(CSR_API_MESSAGE)); DPRINT("Server returned: %x\n", Request.Status); /* Check for success*/ @@ -2394,7 +2392,6 @@ CSR_API_MESSAGE Request; ULONG CsrRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - NTSTATUS Status; DWORD Size, SizeX, SizeY; if (lpBuffer == NULL) @@ -2430,10 +2427,10 @@ Request.Data.ReadConsoleOutputRequest.ReadRegion = *lpReadRegion; /* Call the server */ - Status = CsrClientCallServer(&Request, - CaptureBuffer, - CsrRequest, - sizeof(CSR_API_MESSAGE)); + CsrClientCallServer(&Request, + CaptureBuffer, + CsrRequest, + sizeof(CSR_API_MESSAGE)); DPRINT("Server returned: %x\n", Request.Status); /* Check for success*/ @@ -2522,7 +2519,6 @@ CSR_API_MESSAGE Request; ULONG CsrRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - NTSTATUS Status; ULONG Size; Size = dwBufferSize.Y * dwBufferSize.X * sizeof(CHAR_INFO); @@ -2555,10 +2551,10 @@ Request.Data.WriteConsoleOutputRequest.WriteRegion = *lpWriteRegion; /* Call the server */ - Status = CsrClientCallServer(&Request, - CaptureBuffer, - CsrRequest, - sizeof(CSR_API_MESSAGE)); + CsrClientCallServer(&Request, + CaptureBuffer, + CsrRequest, + sizeof(CSR_API_MESSAGE)); DPRINT("Server returned: %x\n", Request.Status); /* Check for success*/ @@ -2823,13 +2819,14 @@ PCSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; - ULONG SizeBytes, CharSize, nChars; + ULONG CharSize, nChars; + //ULONG SizeBytes; DWORD Written = 0; CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); nChars = min(nLength, CSRSS_MAX_WRITE_CONSOLE_OUTPUT_CHAR / CharSize); - SizeBytes = nChars * CharSize; + //SizeBytes = nChars * CharSize; Request = RtlAllocateHeap(RtlGetProcessHeap(), 0, max(sizeof(CSR_API_MESSAGE), Modified: trunk/reactos/dll/win32/kernel32/client/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -593,7 +593,6 @@ FreeLibraryAndExitThread(HMODULE hLibModule, DWORD dwExitCode) { - NTSTATUS Status; if (LDR_IS_DATAFILE(hLibModule)) { @@ -601,7 +600,7 @@ if (RtlImageNtHeader((PVOID)((ULONG_PTR)hLibModule & ~1))) { /* Unmap view */ - Status = NtUnmapViewOfSection(NtCurrentProcess(), (PVOID)((ULONG_PTR)hLibModule & ~1)); + NtUnmapViewOfSection(NtCurrentProcess(), (PVOID)((ULONG_PTR)hLibModule & ~1)); /* Unload alternate resource module */ LdrUnloadAlternateResourceModule(hLibModule); @@ -610,7 +609,7 @@ else { /* Just unload it */ - Status = LdrUnloadDll((PVOID)hLibModule); + LdrUnloadDll((PVOID)hLibModule); } /* Exit thread */ Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -642,7 +642,6 @@ PRTL_USER_PROCESS_PARAMETERS ProcessParameters; PRTL_USER_PROCESS_PARAMETERS RemoteParameters = NULL; UNICODE_STRING DllPath, ImageName, CommandLine, CurrentDirectory; - UINT RetVal; NTSTATUS Status; PWCHAR ScanChar; ULONG EnviroSize; @@ -654,10 +653,10 @@ DPRINT("BasepInitializeEnvironment\n"); /* Get the full path name */ - RetVal = GetFullPathNameW(ApplicationPathName, - MAX_PATH, - FullPath, - &Remaining); + GetFullPathNameW(ApplicationPathName, + MAX_PATH, + FullPath, + &Remaining); DPRINT("ApplicationPathName: %S, FullPath: %S\n", ApplicationPathName, FullPath); Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… ============================================================================== --- trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -125,6 +125,7 @@ acpica/utilities/uttrack.c acpica/utilities/utxface.c) +allow_warnings(acpica) add_dependencies(acpica bugcodes) add_library(acpi SHARED Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -748,7 +748,7 @@ NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PNPFS_VCB Vcb; + //PNPFS_VCB Vcb; PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; PNPFS_CCB Ccb, OtherSide; @@ -758,7 +758,7 @@ DPRINT("NpfsCleanup(DeviceObject %p Irp %p)\n", DeviceObject, Irp); IoStack = IoGetCurrentIrpStackLocation(Irp); - Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; + //Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; FileObject = IoStack->FileObject; Ccb = FileObject->FsContext2; @@ -909,7 +909,7 @@ { PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; - PNPFS_VCB Vcb; + //PNPFS_VCB Vcb; PNPFS_FCB Fcb; PNPFS_CCB Ccb; BOOLEAN Server; @@ -917,7 +917,7 @@ DPRINT("NpfsClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp); IoStack = IoGetCurrentIrpStackLocation(Irp); - Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; + //Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; FileObject = IoStack->FileObject; Ccb = FileObject->FsContext2; Modified: trunk/reactos/drivers/filesystems/npfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -286,7 +286,7 @@ PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; PNPFS_CCB Ccb; - PNPFS_FCB Fcb; + //PNPFS_FCB Fcb; NTSTATUS Status; ULONG Size = 0; @@ -308,7 +308,7 @@ return Status; } - Fcb = Ccb->Fcb; + //Fcb = Ccb->Fcb; switch (IoStack->MinorFunction) { Modified: trunk/reactos/drivers/filesystems/npfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/finfo.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -214,7 +214,7 @@ PIO_STACK_LOCATION IoStack; FILE_INFORMATION_CLASS FileInformationClass; PFILE_OBJECT FileObject; - PNPFS_VCB Vcb; + //PNPFS_VCB Vcb; PNPFS_FCB Fcb; PNPFS_CCB Ccb; PVOID SystemBuffer; @@ -225,7 +225,7 @@ IoStack = IoGetCurrentIrpStackLocation (Irp); FileInformationClass = IoStack->Parameters.QueryFile.FileInformationClass; - Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; + //Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; FileObject = IoStack->FileObject; Ccb = (PNPFS_CCB)FileObject->FsContext2; Fcb = Ccb->Fcb; Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -557,7 +557,7 @@ ULONG OutputBufferLength; ULONG ReturnLength = 0; PFILE_PIPE_PEEK_BUFFER Reply; - PNPFS_FCB Fcb; + //PNPFS_FCB Fcb; PNPFS_CCB Ccb; NTSTATUS Status; ULONG MessageCount = 0; @@ -579,7 +579,7 @@ Ccb = IoStack->FileObject->FsContext2; Reply = (PFILE_PIPE_PEEK_BUFFER)Irp->AssociatedIrp.SystemBuffer; - Fcb = Ccb->Fcb; + //Fcb = Ccb->Fcb; Reply->NamedPipeState = Ccb->PipeState; @@ -667,13 +667,13 @@ PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; NTSTATUS Status; - PNPFS_VCB Vcb; + //PNPFS_VCB Vcb; PNPFS_FCB Fcb; PNPFS_CCB Ccb; DPRINT("NpfsFileSystemContol(DeviceObject %p Irp %p)\n", DeviceObject, Irp); - Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; + //Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; IoStack = IoGetCurrentIrpStackLocation(Irp); DPRINT("IoStack: %p\n", IoStack); FileObject = IoStack->FileObject; Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -818,8 +818,9 @@ ExAcquireFastMutex(&ReaderCcb->DataListLock); + DPRINT("Length %d Buffer %x Offset %x\n",Length,Buffer,Offset); + #ifndef NDEBUG - DPRINT("Length %d Buffer %x Offset %x\n",Length,Buffer,Offset); HexDump(Buffer, Length); #endif Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -481,40 +481,39 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) { PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PDEVICE_EXTENSION DeviceExtension; - LONG BufferLength = 0; + //PDEVICE_OBJECT DeviceObject; + //PDEVICE_EXTENSION DeviceExtension; + //LONG BufferLength = 0; PUNICODE_STRING SearchPattern = NULL; - FILE_INFORMATION_CLASS FileInformationClass; + //FILE_INFORMATION_CLASS FileInformationClass; ULONG FileIndex = 0; PUCHAR Buffer = NULL; PFILE_NAMES_INFORMATION Buffer0 = NULL; - PNTFS_FCB Fcb; + //PNTFS_FCB Fcb; PNTFS_CCB Ccb; // FCB TempFcb; BOOLEAN First = FALSE; PIO_STACK_LOCATION Stack; PFILE_OBJECT FileObject; - NTSTATUS Status = STATUS_SUCCESS; + //NTSTATUS Status = STATUS_SUCCESS; DPRINT1("NtfsQueryDirectory() called\n"); ASSERT(IrpContext); Irp = IrpContext->Irp; - DeviceObject = IrpContext->DeviceObject; - - DeviceExtension = DeviceObject->DeviceExtension; + //DeviceObject = IrpContext->DeviceObject; + + //DeviceExtension = DeviceObject->DeviceExtension; Stack = IoGetCurrentIrpStackLocation(Irp); FileObject = Stack->FileObject; Ccb = (PNTFS_CCB)FileObject->FsContext2; - Fcb = (PNTFS_FCB)FileObject->FsContext; + //Fcb = (PNTFS_FCB)FileObject->FsContext; /* Obtain the callers parameters */ - BufferLength = Stack->Parameters.QueryDirectory.Length; + //BufferLength = Stack->Parameters.QueryDirectory.Length; SearchPattern = Stack->Parameters.QueryDirectory.FileName; - FileInformationClass = - Stack->Parameters.QueryDirectory.FileInformationClass; + //FileInformationClass = Stack->Parameters.QueryDirectory.FileInformationClass; FileIndex = Stack->Parameters.QueryDirectory.FileIndex; @@ -664,7 +663,7 @@ if (FileIndex > 0) { - Status = STATUS_SUCCESS; + //Status = STATUS_SUCCESS; } // return(Status); Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -119,7 +119,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PCLASS_DEVICE_EXTENSION DeviceExtension; + //PCLASS_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status = STATUS_NOT_SUPPORTED; TRACE_(CLASS_NAME, "IRP_MJ_DEVICE_CONTROL\n"); @@ -127,7 +127,7 @@ if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); - DeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + //DeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; switch (IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlCode) { Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -68,18 +68,17 @@ IN KSDEVICE_HEADER DevHeader, IN BOOLEAN Exclusive) { - NTSTATUS Status; PKSIDEVICE_HEADER Header = (PKSIDEVICE_HEADER)DevHeader; KeEnterCriticalRegion(); if (Exclusive) { - Status = ExAcquireResourceExclusiveLite(&Header->SecurityLock, TRUE); + ExAcquireResourceExclusiveLite(&Header->SecurityLock, TRUE); } else { - Status = ExAcquireResourceSharedLite(&Header->SecurityLock, TRUE); + ExAcquireResourceSharedLite(&Header->SecurityLock, TRUE); } } @@ -169,12 +168,12 @@ PDEVICE_EXTENSION DeviceExtension; PKSIDEVICE_HEADER DeviceHeader; PKSIOBJECT_HEADER ObjectHeader; - PIO_STACK_LOCATION IoStack; + //PIO_STACK_LOCATION IoStack; PLIST_ENTRY ListEntry; NTSTATUS Status; /* get current irp stack */ - IoStack = IoGetCurrentIrpStackLocation(Irp); + //IoStack = IoGetCurrentIrpStackLocation(Irp); /* caller wants to add the target device */ DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -229,11 +228,11 @@ { PDEVICE_EXTENSION DeviceExtension; PKSIDEVICE_HEADER DeviceHeader; - PIO_STACK_LOCATION IoStack; + //PIO_STACK_LOCATION IoStack; NTSTATUS Status; /* get current irp stack */ - IoStack = IoGetCurrentIrpStackLocation(Irp); + //IoStack = IoGetCurrentIrpStackLocation(Irp); /* caller wants to add the target device */ DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -615,9 +614,9 @@ { PIO_STACK_LOCATION IoStack; PDEVICE_EXTENSION DeviceExtension; - PKSIDEVICE_HEADER DeviceHeader; + //PKSIDEVICE_HEADER DeviceHeader; PKSIOBJECT_HEADER ObjectHeader; - PKSOBJECT_CREATE_ITEM CreateItem; + //PKSOBJECT_CREATE_ITEM CreateItem; NTSTATUS Status; if (!Header) @@ -634,7 +633,7 @@ /* get device extension */ DeviceExtension = (PDEVICE_EXTENSION)IoStack->DeviceObject->DeviceExtension; /* get device header */ - DeviceHeader = DeviceExtension->DeviceHeader; + //DeviceHeader = DeviceExtension->DeviceHeader; /* sanity check */ ASSERT(IoStack->FileObject); @@ -652,7 +651,7 @@ InitializeListHead(&ObjectHeader->ItemList); /* get create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + //CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); /* do we have a name */ if (IoStack->FileObject->FileName.Buffer) Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -272,9 +272,10 @@ PAFD_DEVICE_EXTENSION DeviceExt; PFILE_FULL_EA_INFORMATION EaInfo; PAFD_CREATE_PACKET ConnectInfo = NULL; - ULONG EaLength; + //ULONG EaLength; PWCHAR EaInfoValue = NULL; - UINT Disposition, i; + //UINT Disposition; + UINT i; NTSTATUS Status = STATUS_SUCCESS; AFD_DbgPrint(MID_TRACE, @@ -282,7 +283,7 @@ DeviceExt = DeviceObject->DeviceExtension; FileObject = IrpSp->FileObject; - Disposition = (IrpSp->Parameters.Create.Options >> 24) & 0xff; + //Disposition = (IrpSp->Parameters.Create.Options >> 24) & 0xff; Irp->IoStatus.Information = 0; @@ -292,9 +293,7 @@ ConnectInfo = (PAFD_CREATE_PACKET)(EaInfo->EaName + EaInfo->EaNameLength + 1); EaInfoValue = (PWCHAR)(((PCHAR)ConnectInfo) + sizeof(AFD_CREATE_PACKET)); - EaLength = sizeof(FILE_FULL_EA_INFORMATION) + - EaInfo->EaNameLength + - EaInfo->EaValueLength; + //EaLength = sizeof(FILE_FULL_EA_INFORMATION) + EaInfo->EaNameLength + EaInfo->EaValueLength; AFD_DbgPrint(MID_TRACE,("EaInfo: %x, EaInfoValue: %x\n", EaInfo, EaInfoValue)); Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -371,7 +371,7 @@ USHORT EType; UINT PacketType, BytesTransferred; UINT temp; - IP_PACKET IPPacket; + //IP_PACKET IPPacket; PCHAR BufferData; NDIS_STATUS NdisStatus; PNDIS_PACKET NdisPacket; @@ -426,8 +426,8 @@ GetDataPtr( NdisPacket, 0, &BufferData, &temp ); - IPPacket.NdisPacket = NdisPacket; - IPPacket.Position = 0; + //IPPacket.NdisPacket = NdisPacket; + //IPPacket.Position = 0; TransferDataCalled++; Modified: trunk/reactos/hal/halx86/legacy/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/halpnpdd… ============================================================================== --- trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -284,12 +284,12 @@ HalpQueryCapabilities(IN PDEVICE_OBJECT DeviceObject, OUT PDEVICE_CAPABILITIES Capabilities) { - PPDO_EXTENSION PdoExtension; + //PPDO_EXTENSION PdoExtension; NTSTATUS Status; PAGED_CODE(); /* Get the extension and check for valid version */ - PdoExtension = DeviceObject->DeviceExtension; + //PdoExtension = DeviceObject->DeviceExtension; ASSERT(Capabilities->Version == 1); if (Capabilities->Version == 1) { @@ -346,7 +346,7 @@ PCM_RESOURCE_LIST ResourceList; // PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; // PIO_RESOURCE_DESCRIPTOR Descriptor; - PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDesc; +// PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDesc; // ULONG i; PAGED_CODE(); @@ -385,7 +385,7 @@ ResourceList->List[0].PartialResourceList.Count = 0; /* Setup the first descriptor */ - PartialDesc = ResourceList->List[0].PartialResourceList.PartialDescriptors; + //PartialDesc = ResourceList->List[0].PartialResourceList.PartialDescriptors; /* Find the requirement descriptor for the SCI */ #if 0 @@ -627,7 +627,7 @@ IN PIRP Irp) { PIO_STACK_LOCATION IoStackLocation; - PPDO_EXTENSION PdoExtension; + //PPDO_EXTENSION PdoExtension; PFDO_EXTENSION FdoExtension; NTSTATUS Status; UCHAR Minor; @@ -698,7 +698,7 @@ { /* This is a PDO instead */ ASSERT(FdoExtension->ExtensionType == PdoExtensionType); - PdoExtension = (PPDO_EXTENSION)FdoExtension; + //PdoExtension = (PPDO_EXTENSION)FdoExtension; /* Query the IRP type */ Status = STATUS_SUCCESS; Modified: trunk/reactos/lib/3rdparty/cardlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -15,4 +15,5 @@ dropzone.cpp) add_library(cardlib ${SOURCE}) +allow_warnings(cardlib) add_dependencies(cardlib psdk) Modified: trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/d… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -193,6 +193,9 @@ DataBuffer, NULL); + if (STATUS_SUCCESS != Status) + TI_DbgPrint(MAX_TRACE, ("receive handler signaled failure with Status 0x%x\n", Status)); + DereferenceObject(AddrFile); } else Modified: trunk/reactos/lib/fslib/vfatlib/check/check.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ch… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -280,16 +280,17 @@ static void truncate_file(DOS_FS *fs,DOS_FILE *file,unsigned long clusters) { int deleting; - unsigned long walk,next,prev; + unsigned long walk,next; + //unsigned long prev; walk = FSTART(file,fs); - prev = 0; + //prev = 0; if ((deleting = !clusters)) MODIFY_START(file,0,fs); while (walk > 0 && walk != -1) { next = next_cluster(fs,walk); if (deleting) set_fat(fs,walk,0); else if ((deleting = !--clusters)) set_fat(fs,walk,-1); - prev = walk; + //prev = walk; walk = next; } } Modified: trunk/reactos/lib/pseh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -14,6 +14,7 @@ endif() add_library(pseh ${SOURCE}) + allow_warnings(pseh) target_link_libraries(pseh chkstk) add_dependencies(pseh psdk) Modified: trunk/reactos/lib/sdk/crt/wine/undname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/undname.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] Sun Sep 11 15:39:19 2011 @@ -216,7 +216,8 @@ c = '>'; if (i < a->start) c = '-'; else if (i >= a->num) c = '}'; - TRACE("%p\t%d%c %s\n", a, i, c, a->elts[i]); + /* This check is as useless as the unused-but-set gcc warning that we want to silence here */ + if (c != 0) TRACE("%p\t%d%c %s\n", a, i, c, a->elts[i]); } }

13 years

← Newer
1
...
19
20
21
22
23
24
25
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2011