Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 61861: [NTVDM]: Remove erroneous comments.
by hbelusca＠svn.reactos.org 28 Jan '14

28 Jan '14

Author: hbelusca Date: Tue Jan 28 17:26:26 2014 New Revision: 61861 URL: http://svn.reactos.org/svn/reactos?rev=61861&view=rev Log: [NTVDM]: Remove erroneous comments. Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] Tue Jan 28 17:26:26 2014 @@ -289,19 +289,16 @@ IOWriteB(PIT_COMMAND_PORT, 0x34); IOWriteB(PIT_DATA_PORT(0), 0x00); IOWriteB(PIT_DATA_PORT(0), 0x00); - // PitSetGate(0, TRUE); /* Initialize PIT Counter 1 */ IOWriteB(PIT_COMMAND_PORT, 0x74); IOWriteB(PIT_DATA_PORT(1), 0x00); IOWriteB(PIT_DATA_PORT(1), 0x00); - // PitSetGate(1, TRUE); /* Initialize PIT Counter 2 */ IOWriteB(PIT_COMMAND_PORT, 0xB4); IOWriteB(PIT_DATA_PORT(2), 0x00); IOWriteB(PIT_DATA_PORT(2), 0x00); - // PitSetGate(2, FALSE); // PitSetGate(2, TRUE); EnableHwIRQ(0, BiosTimerIrq); }

1 0

[bfreisen] 61860: [MSPAINT] Apply patches from CORE-7551 (Drag and Drop between Paint and the shell) and CORE-7561 (insert from file)
by bfreisen＠svn.reactos.org 28 Jan '14

28 Jan '14

Author: bfreisen Date: Tue Jan 28 15:46:28 2014 New Revision: 61860 URL: http://svn.reactos.org/svn/reactos?rev=61860&view=rev Log: [MSPAINT] Apply patches from CORE-7551 (Drag and Drop between Paint and the shell) and CORE-7561 (insert from file) Modified: trunk/reactos/base/applications/mspaint/dib.c trunk/reactos/base/applications/mspaint/dib.h trunk/reactos/base/applications/mspaint/main.c trunk/reactos/base/applications/mspaint/precomp.h trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/dib.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/dib.c [iso-8859-1] Tue Jan 28 15:46:28 2014 @@ -95,6 +95,17 @@ HeapFree(GetProcessHeap(), 0, buffer); } +void ShowFileLoadError(LPTSTR name) +{ + TCHAR programname[20]; + TCHAR loaderrortext[100]; + TCHAR temptext[500]; + LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname)); + LoadString(hProgInstance, IDS_LOADERRORTEXT, loaderrortext, SIZEOF(loaderrortext)); + _stprintf(temptext, loaderrortext, name); + MessageBox(hMainWnd, temptext, programname, MB_OK | MB_ICONEXCLAMATION); +} + void LoadDIBFromFile(HBITMAP * hBitmap, LPTSTR name, LPSYSTEMTIME time, int *size, int *hRes, int *vRes) { @@ -105,18 +116,25 @@ HANDLE hFile; if (!hBitmap) + { + ShowFileLoadError(name); return; + } hFile = CreateFile(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL); if (hFile == INVALID_HANDLE_VALUE) + { + ShowFileLoadError(name); return; + } /* read header and check for 'BM' magic */ ReadFile(hFile, &bfh, sizeof(BITMAPFILEHEADER), &dwBytesRead, NULL); if (bfh.bfType != 0x4d42) { CloseHandle(hFile); + ShowFileLoadError(name); return; } @@ -133,6 +151,7 @@ if (!bi) { CloseHandle(hFile); + ShowFileLoadError(name); return; } Modified: trunk/reactos/base/applications/mspaint/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/dib.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/dib.h [iso-8859-1] Tue Jan 28 15:46:28 2014 @@ -16,3 +16,5 @@ int vRes); void LoadDIBFromFile(HBITMAP *hBitmap, LPTSTR name, LPSYSTEMTIME time, int *size, int *hRes, int *vRes); + +void ShowFileLoadError(LPTSTR name); Modified: trunk/reactos/base/applications/mspaint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] Tue Jan 28 15:46:28 2014 @@ -409,6 +409,10 @@ clearHistory(); isAFile = TRUE; } + else + { + exit(0); + } } /* initializing the CHOOSECOLOR structure for use with ChooseColor */ @@ -489,6 +493,9 @@ /* Make the window visible on the screen */ ShowWindow (hwnd, nFunsterStil); + /* inform the system, that the main window accepts dropped files */ + DragAcceptFiles(hwnd, TRUE); + /* Run the message loop. It will run until GetMessage() returns 0 */ while (GetMessage(&messages, NULL, 0, 0)) { Modified: trunk/reactos/base/applications/mspaint/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/precomp.h [iso-8859-1] Tue Jan 28 15:46:28 2014 @@ -9,6 +9,7 @@ #include <commctrl.h> #include <tchar.h> #include <stdlib.h> +#include <shellapi.h> #include "definitions.h" #include "drawing.h" Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Tue Jan 28 15:46:28 2014 @@ -10,8 +10,6 @@ /* INCLUDES *********************************************************/ #include "precomp.h" - -#include <shellapi.h> #include "dialogs.h" #include "registry.h" @@ -162,6 +160,43 @@ } } +void +UpdateApplicationProperties(HBITMAP bitmap, LPTSTR newfilename, LPTSTR newfilepathname) +{ + TCHAR tempstr[1000]; + TCHAR resstr[100]; + insertReversible(bitmap); + updateCanvasAndScrollbars(); + CopyMemory(filename, newfilename, sizeof(filename)); + CopyMemory(filepathname, newfilepathname, sizeof(filepathname)); + LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); + _stprintf(tempstr, resstr, filename); + SetWindowText(hMainWnd, tempstr); + clearHistory(); + isAFile = TRUE; +} + +void +InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) +{ + HWND hToolbar = FindWindowEx(hToolBoxContainer, NULL, TOOLBARCLASSNAME, NULL); + SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELONG(TRUE, 0)); + SendMessage(window, WM_COMMAND, ID_RECTSEL, 0); + + DeleteObject(SelectObject(hSelDC, hSelBm = CopyImage(bitmap, + IMAGE_BITMAP, 0, 0, + LR_COPYRETURNORG))); + newReversible(); + rectSel_src[0] = rectSel_src[1] = rectSel_src[2] = rectSel_src[3] = 0; + rectSel_dest[0] = rectSel_dest[1] = 0; + rectSel_dest[2] = GetDIBWidth(hSelBm); + rectSel_dest[3] = GetDIBHeight(hSelBm); + BitBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], + hSelDC, 0, 0, SRCCOPY); + placeSelWin(); + ShowWindow(hSelection, SW_SHOW); +} + BOOL drawing; LRESULT CALLBACK @@ -169,6 +204,25 @@ { switch (message) /* handle the messages */ { + case WM_DROPFILES: + { + HDROP drophandle; + TCHAR droppedfile[MAX_PATH]; + drophandle = (HDROP)wParam; + DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile)); + DragFinish(drophandle); + HBITMAP bmNew = NULL; + LoadDIBFromFile(&bmNew, droppedfile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); + if (bmNew != NULL) + { + TCHAR *pathend; + pathend = _tcsrchr(droppedfile, '\\'); + pathend++; + UpdateApplicationProperties(bmNew, pathend, pathend); + } + break; + } + case WM_CREATE: ptStack = NULL; ptSP = 0; @@ -785,27 +839,7 @@ LoadDIBFromFile(&bmNew, ofn.lpstrFile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); if (bmNew != NULL) { - TCHAR tempstr[1000]; - TCHAR resstr[100]; - insertReversible(bmNew); - updateCanvasAndScrollbars(); - CopyMemory(filename, ofn.lpstrFileTitle, sizeof(filename)); - CopyMemory(filepathname, ofn.lpstrFileTitle, sizeof(filepathname)); - LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); - _stprintf(tempstr, resstr, filename); - SetWindowText(hMainWnd, tempstr); - clearHistory(); - isAFile = TRUE; - } - else - { - TCHAR programname[20]; - TCHAR loaderrortext[100]; - TCHAR temptext[500]; - LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname)); - LoadString(hProgInstance, IDS_LOADERRORTEXT, loaderrortext, SIZEOF(loaderrortext)); - _stprintf(temptext, loaderrortext, ofn.lpstrFile); - MessageBox(hwnd, temptext, programname, MB_OK | MB_ICONEXCLAMATION); + UpdateApplicationProperties(bmNew, ofn.lpstrFileTitle, ofn.lpstrFileTitle); } } break; @@ -848,22 +882,7 @@ OpenClipboard(hMainWnd); if (GetClipboardData(CF_BITMAP) != NULL) { - HWND hToolbar = FindWindowEx(hToolBoxContainer, NULL, TOOLBARCLASSNAME, NULL); - SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELONG(TRUE, 0)); - SendMessage(hwnd, WM_COMMAND, ID_RECTSEL, 0); - - DeleteObject(SelectObject(hSelDC, hSelBm = CopyImage(GetClipboardData(CF_BITMAP), - IMAGE_BITMAP, 0, 0, - LR_COPYRETURNORG))); - newReversible(); - rectSel_src[0] = rectSel_src[1] = rectSel_src[2] = rectSel_src[3] = 0; - rectSel_dest[0] = rectSel_dest[1] = 0; - rectSel_dest[2] = GetDIBWidth(hSelBm); - rectSel_dest[3] = GetDIBHeight(hSelBm); - BitBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], - hSelDC, 0, 0, SRCCOPY); - placeSelWin(); - ShowWindow(hSelection, SW_SHOW); + InsertSelectionFromHBITMAP(GetClipboardData(CF_BITMAP), hwnd); } CloseClipboard(); break; @@ -898,6 +917,18 @@ case IDM_EDITCOPYTO: if (GetSaveFileName(&ofn) != 0) SaveDIBToFile(hSelBm, ofn.lpstrFile, hDrawingDC, NULL, NULL, fileHPPM, fileVPPM); + break; + case IDM_EDITPASTEFROM: + if (GetOpenFileName(&ofn) != 0) + { + HBITMAP bmNew = NULL; + LoadDIBFromFile(&bmNew, ofn.lpstrFile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); + if (bmNew != NULL) + { + InsertSelectionFromHBITMAP(bmNew, hwnd); + DeleteObject(bmNew); + } + } break; case IDM_COLORSEDITPALETTE: if (ChooseColor(&choosecolor))

1 0

[akhaldi] 61859: [PCIX] * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 28 Jan '14

28 Jan '14

Author: akhaldi Date: Tue Jan 28 11:17:12 2014 New Revision: 61859 URL: http://svn.reactos.org/svn/reactos?rev=61859&view=rev Log: [PCIX] * Improve the GUIDs situation. CORE-7716 Modified: trunk/reactos/drivers/bus/pcix/guid.c Modified: trunk/reactos/drivers/bus/pcix/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/guid.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/guid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/guid.c [iso-8859-1] Tue Jan 28 11:17:12 2014 @@ -1,5 +1,6 @@ /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ +#include <wdm.h> #include <initguid.h> #include <ntddk.h> #include <wdmguid.h>

1 0

[akhaldi] 61858: [ACPI] * Create a main header and move some inclusions to it. CORE-7716
by akhaldi＠svn.reactos.org 28 Jan '14

28 Jan '14

Author: akhaldi Date: Tue Jan 28 11:11:36 2014 New Revision: 61858 URL: http://svn.reactos.org/svn/reactos?rev=61858&view=rev Log: [ACPI] * Create a main header and move some inclusions to it. CORE-7716 Added: trunk/reactos/drivers/bus/acpi/precomp.h (with props) Modified: trunk/reactos/drivers/bus/acpi/acpienum.c trunk/reactos/drivers/bus/acpi/busmgr/bus.c trunk/reactos/drivers/bus/acpi/busmgr/button.c trunk/reactos/drivers/bus/acpi/busmgr/power.c trunk/reactos/drivers/bus/acpi/busmgr/system.c trunk/reactos/drivers/bus/acpi/busmgr/utils.c trunk/reactos/drivers/bus/acpi/buspdo.c trunk/reactos/drivers/bus/acpi/eval.c trunk/reactos/drivers/bus/acpi/interface.c trunk/reactos/drivers/bus/acpi/main.c trunk/reactos/drivers/bus/acpi/osl.c trunk/reactos/drivers/bus/acpi/pnp.c trunk/reactos/drivers/bus/acpi/power.c Modified: trunk/reactos/drivers/bus/acpi/acpienum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpienum.… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -6,11 +6,8 @@ * UPDATE HISTORY: * 01-05-2001 CSH Created */ -#include <acpi.h> -#include <acpisys.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> -#include <list.h> + +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -27,12 +27,7 @@ * Copyright (C)2009 Samuel Serapion */ -#include <ntddk.h> - -#include <acpi.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> -#include <glue.h> +#include <precomp.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/busmgr/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -22,17 +22,11 @@ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#include <ntddk.h> - -#include <acpi.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> -#include <glue.h> + +#include <precomp.h> #define NDEBUG #include <debug.h> - - #define _COMPONENT ACPI_BUTTON_COMPONENT ACPI_MODULE_NAME ("acpi_button") Modified: trunk/reactos/drivers/bus/acpi/busmgr/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/po… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -40,15 +40,10 @@ * Copyright (C)2009 Samuel Serapion */ -#include <ntddk.h> -#include <acpi.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> -#include <glue.h> +#include <precomp.h> #define NDEBUG #include <debug.h> - #define _COMPONENT ACPI_POWER_COMPONENT ACPI_MODULE_NAME ("acpi_power") Modified: trunk/reactos/drivers/bus/acpi/busmgr/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/sy… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -26,11 +26,8 @@ /* Modified for ReactOS and latest ACPICA * Copyright (C)2009 Samuel Serapion */ -#include <ntddk.h> -#include <acpi.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> -#include "list.h" + +#include <precomp.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/busmgr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/ut… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/utils.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -23,12 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#include <ntddk.h> - -#include <acpi.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> -#include <glue.h> +#include <precomp.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -1,12 +1,4 @@ -#include <ntddk.h> - -#include <acpi.h> -#include <acpisys.h> -#include <wdmguid.h> -#include <stdio.h> - -#include <acpi_bus.h> -#include <acpi_drivers.h> +#include "precomp.h" #include <initguid.h> #include <poclass.h> Modified: trunk/reactos/drivers/bus/acpi/eval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/eval.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/eval.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/eval.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -1,18 +1,5 @@ -#include <ntddk.h> +#include "precomp.h" -#include <acpi.h> - -#include <acpisys.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> -#include <acpiioct.h> - -#include <glue.h> -#include <accommon.h> -#include <acobject.h> -#include <actypes.h> - -#include <wdmguid.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/interface… ============================================================================== --- trunk/reactos/drivers/bus/acpi/interface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/interface.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -1,12 +1,5 @@ -#include <ntddk.h> +#include "precomp.h" -#include <acpi.h> - -#include <acpisys.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> - -#include <wdmguid.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -1,12 +1,5 @@ -#include <ntddk.h> - -#include <acpi.h> -#include <acpisys.h> - -#include <acpi_bus.h> -#include <acpi_drivers.h> - -#include <acpiioct.h> +#include "precomp.h" + #include <poclass.h> #define NDEBUG Modified: trunk/reactos/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/osl.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -3,11 +3,11 @@ * ACPI Component Architecture Operating System Layer (OSL) for ReactOS * * * *******************************************************************************/ -#include <ntddk.h> - -#include <acpi.h> + +#include "precomp.h" #include <pseh/pseh2.h> + #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/pnp.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -1,12 +1,5 @@ -#include <ntddk.h> - -#include <acpi.h> - -#include <acpisys.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> - -#include <wdmguid.h> +#include "precomp.h" + #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/power.c?r… ============================================================================== --- trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -1,10 +1,4 @@ -#include <ntddk.h> - -#include <acpi.h> -#include <acpisys.h> - -#include <acpi_bus.h> -#include <acpi_drivers.h> +#include "precomp.h" #define NDEBUG #include <debug.h> Added: trunk/reactos/drivers/bus/acpi/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/precomp.h… ============================================================================== --- trunk/reactos/drivers/bus/acpi/precomp.h (added) +++ trunk/reactos/drivers/bus/acpi/precomp.h [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -0,0 +1,12 @@ +#ifndef _ACPI_PCH_ +#define _ACPI_PCH_ + +#include <acpi.h> +#include <acpisys.h> +#include <acpi_bus.h> +#include <acpi_drivers.h> +#include <glue.h> +#include <wdmguid.h> +#include <acpiioct.h> + +#endif /* _ACPI_PCH_ */ Propchange: trunk/reactos/drivers/bus/acpi/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 61857: [SPELLING] - Fix some typos that say "lastest." Patch by Sergei Antonov
by tfaber＠svn.reactos.org 28 Jan '14

28 Jan '14

Author: tfaber Date: Tue Jan 28 06:07:56 2014 New Revision: 61857 URL: http://svn.reactos.org/svn/reactos?rev=61857&view=rev Log: [SPELLING] - Fix some typos that say "lastest." Patch by Sergei Antonov Modified: trunk/reactos/base/system/format/format.c trunk/reactos/dll/win32/fmifs/query.c trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/drivers/input/i8042prt/mouse.c trunk/reactos/include/reactos/libs/fmifs/fmifs.h Modified: trunk/reactos/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/format/format.c [iso-8859-1] Tue Jan 28 06:07:56 2014 @@ -276,7 +276,7 @@ WCHAR szFormatW[MAX_PATH]; DWORD Index = 0; BYTE dummy; - BOOLEAN lastestVersion; + BOOLEAN latestVersion; LoadStringAndOem( GetModuleHandle(NULL), STRING_HELP, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); if (!LoadFMIFSEntryPoints()) @@ -286,9 +286,9 @@ } szFormats[0] = 0; - while (QueryAvailableFileSystemFormat(Index++, szFormatW, &dummy, &dummy, &lastestVersion)) + while (QueryAvailableFileSystemFormat(Index++, szFormatW, &dummy, &dummy, &latestVersion)) { - if (!lastestVersion) + if (!latestVersion) continue; if (szFormats[0]) _tcscat(szFormats, _T(", ")); Modified: trunk/reactos/dll/win32/fmifs/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/query.c?re… ============================================================================== --- trunk/reactos/dll/win32/fmifs/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/query.c [iso-8859-1] Tue Jan 28 06:07:56 2014 @@ -15,12 +15,12 @@ IN OUT PWCHAR FileSystem, /* FIXME: Probably one minimal size is mandatory, but which one? */ OUT UCHAR* Major, OUT UCHAR* Minor, - OUT BOOLEAN* LastestVersion) + OUT BOOLEAN* LatestVersion) { PLIST_ENTRY ListEntry; PIFS_PROVIDER Provider; - if (!FileSystem || !Major ||!Minor ||!LastestVersion) + if (!FileSystem || !Major ||!Minor ||!LatestVersion) return FALSE; ListEntry = ProviderListHead.Flink; @@ -38,7 +38,7 @@ wcscpy(FileSystem, Provider->Name); *Major = 0; /* FIXME */ *Minor = 0; /* FIXME */ - *LastestVersion = TRUE; /* FIXME */ + *LatestVersion = TRUE; /* FIXME */ return TRUE; } 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] Tue Jan 28 06:07:56 2014 @@ -211,7 +211,7 @@ * Field[3] Minor version * Field[4] Product type * Field[5] Suite mask - * Remark: lastests fields may be NULL if the information is not provided + * Remark: these fields may be NULL if the information is not provided */ Fields[0] = Section; if (Fields[0] == NULL) Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] Tue Jan 28 06:07:56 2014 @@ -214,7 +214,7 @@ (DeviceExtension->MouseButtonState & ~Mask) | (NewButtonData & Mask); } -/* Does lastest initializations for the mouse. This method +/* Does final initializations for the mouse. This method * is called just before connecting the interrupt. */ NTSTATUS Modified: trunk/reactos/include/reactos/libs/fmifs/fmifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fmifs… ============================================================================== --- trunk/reactos/include/reactos/libs/fmifs/fmifs.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fmifs/fmifs.h [iso-8859-1] Tue Jan 28 06:07:56 2014 @@ -148,7 +148,7 @@ IN OUT PWCHAR FileSystem, /* FIXME: Probably one minimal size is mandatory, but which one? */ OUT UCHAR* Major, OUT UCHAR* Minor, - OUT BOOLEAN* LastestVersion); + OUT BOOLEAN* LatestVersion); BOOL NTAPI QueryDeviceInformation(

1 0

[tfaber] 61856: [PEFIXUP] - Use correct struct member for section count. Patch by Sergei Antonov (saproj at gmail dot com)
by tfaber＠svn.reactos.org 28 Jan '14

28 Jan '14

Author: tfaber Date: Tue Jan 28 05:49:19 2014 New Revision: 61856 URL: http://svn.reactos.org/svn/reactos?rev=61856&view=rev Log: [PEFIXUP] - Use correct struct member for section count. Patch by Sergei Antonov (saproj at gmail dot com) Modified: trunk/reactos/tools/pefixup.c Modified: trunk/reactos/tools/pefixup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pefixup.c?rev=61856&… ============================================================================== --- trunk/reactos/tools/pefixup.c [iso-8859-1] (original) +++ trunk/reactos/tools/pefixup.c [iso-8859-1] Tue Jan 28 05:49:19 2014 @@ -378,7 +378,7 @@ { /* Update section flags */ for (i = 0, section_header = IMAGE_FIRST_SECTION(nt_header); - i < dtohl(nt_header->OptionalHeader.NumberOfRvaAndSizes); + i < dtohl(nt_header->FileHeader.NumberOfSections); i++, section_header++) { if (!strcmp((char*)section_header->Name, ".text") ||

1 0

[akhaldi] 61855: [COMPBATT] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belon...
by akhaldi＠svn.reactos.org 27 Jan '14

27 Jan '14

Author: akhaldi Date: Mon Jan 27 23:11:48 2014 New Revision: 61855 URL: http://svn.reactos.org/svn/reactos?rev=61855&view=rev Log: [COMPBATT] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Added: trunk/reactos/drivers/bus/acpi/compbatt/guid.c (with props) Modified: trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c Modified: trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt [iso-8859-1] Mon Jan 27 23:11:48 2014 @@ -3,6 +3,7 @@ compbatt.c compmisc.c comppnp.c + guid.c compbatt.rc) add_library(compbatt SHARED ${SOURCE}) Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c [iso-8859-1] Mon Jan 27 23:11:48 2014 @@ -9,6 +9,8 @@ /* INCLUDES *******************************************************************/ #include "compbatt.h" + +#include <debug.h> /* GLOBALS ********************************************************************/ Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h [iso-8859-1] Mon Jan 27 23:11:48 2014 @@ -6,11 +6,8 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -#include <ntddk.h> -#include <initguid.h> +#include <wdm.h> #include <batclass.h> -#include <debug.h> -#include <wdmguid.h> #define COMPBATT_BATTERY_INFORMATION_PRESENT 0x04 #define COMPBATT_TAG_ASSIGNED 0x80 Modified: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] Mon Jan 27 23:11:48 2014 @@ -9,6 +9,8 @@ /* INCLUDES *******************************************************************/ #include "compbatt.h" + +#include <wdmguid.h> /* FUNCTIONS ******************************************************************/ Added: trunk/reactos/drivers/bus/acpi/compbatt/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/guid.c (added) +++ trunk/reactos/drivers/bus/acpi/compbatt/guid.c [iso-8859-1] Mon Jan 27 23:11:48 2014 @@ -0,0 +1,8 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <wdm.h> +#include <initguid.h> +#include <wdmguid.h> +#include <batclass.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/bus/acpi/compbatt/guid.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 61854: [CMBATT] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belong....
by akhaldi＠svn.reactos.org 27 Jan '14

27 Jan '14

Author: akhaldi Date: Mon Jan 27 22:55:47 2014 New Revision: 61854 URL: http://svn.reactos.org/svn/reactos?rev=61854&view=rev Log: [CMBATT] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Added: trunk/reactos/drivers/bus/acpi/cmbatt/guid.c (with props) Modified: trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.c trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.h trunk/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c trunk/reactos/drivers/bus/acpi/cmbatt/cmexec.c Modified: trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/CM… ============================================================================== --- trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt [iso-8859-1] Mon Jan 27 22:55:47 2014 @@ -4,6 +4,7 @@ cmexec.c cmbpnp.c cmbwmi.c + guid.c cmbatt.rc) add_library(cmbatt SHARED ${SOURCE}) Modified: trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/cm… ============================================================================== --- trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.c [iso-8859-1] Mon Jan 27 22:55:47 2014 @@ -9,6 +9,8 @@ /* INCLUDES *******************************************************************/ #include "cmbatt.h" + +#include <debug.h> /* GLOBALS ********************************************************************/ Modified: trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/cm… ============================================================================== --- trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.h [iso-8859-1] Mon Jan 27 22:55:47 2014 @@ -6,13 +6,10 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -#include <ntddk.h> -#include <initguid.h> +#include <wdm.h> #include <batclass.h> -#include <acpiioct.h> #include <wmilib.h> #include <wdmguid.h> -#include <debug.h> #define IOCTL_BATTERY_QUERY_UNIQUE_ID \ CTL_CODE(FILE_DEVICE_BATTERY, 0x101, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x294404 Modified: trunk/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/cm… ============================================================================== --- trunk/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c [iso-8859-1] Mon Jan 27 22:55:47 2014 @@ -9,6 +9,8 @@ /* INCLUDES *******************************************************************/ #include "cmbatt.h" + +#include <debug.h> /* GLOBALS ********************************************************************/ Modified: trunk/reactos/drivers/bus/acpi/cmbatt/cmexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/cm… ============================================================================== --- trunk/reactos/drivers/bus/acpi/cmbatt/cmexec.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/cmbatt/cmexec.c [iso-8859-1] Mon Jan 27 22:55:47 2014 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "cmbatt.h" + +#include <acpiioct.h> +#include <debug.h> /* FUNCTIONS ******************************************************************/ Added: trunk/reactos/drivers/bus/acpi/cmbatt/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/gu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/cmbatt/guid.c (added) +++ trunk/reactos/drivers/bus/acpi/cmbatt/guid.c [iso-8859-1] Mon Jan 27 22:55:47 2014 @@ -0,0 +1,6 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <initguid.h> +#include <wdmguid.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/bus/acpi/cmbatt/guid.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 61853: [KDCOM] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 27 Jan '14

27 Jan '14

Author: akhaldi Date: Mon Jan 27 22:23:24 2014 New Revision: 61853 URL: http://svn.reactos.org/svn/reactos?rev=61853&view=rev Log: [KDCOM] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/drivers/base/kdcom/kdcom.c trunk/reactos/drivers/base/kdcom/kddll.h Modified: trunk/reactos/drivers/base/kdcom/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.c [iso-8859-1] Mon Jan 27 22:23:24 2014 @@ -7,8 +7,11 @@ */ #include "kddll.h" + #include <cportlib/cportlib.h> +#include <arc/arc.h> #include <stdlib.h> +#include <ndk/halfuncs.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/base/kdcom/kddll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kddll.h… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kddll.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kddll.h [iso-8859-1] Mon Jan 27 22:23:24 2014 @@ -6,15 +6,9 @@ * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)ewactos.org) */ -#pragma once - #define NOEXTAPI #include <ntifs.h> -#include <arc/arc.h> -#include <halfuncs.h> #include <windbgkd.h> -#include <wdbgexts.h> -#include <ioaccess.h> /* port intrinsics */ //#define KDDEBUG /* uncomment to enable debugging this dll */

1 0

[akhaldi] 61852: [CONDRV] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 27 Jan '14

27 Jan '14

Author: akhaldi Date: Mon Jan 27 12:29:29 2014 New Revision: 61852 URL: http://svn.reactos.org/svn/reactos?rev=61852&view=rev Log: [CONDRV] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/drivers/base/condrv/condrv.c trunk/reactos/drivers/base/condrv/condrv.h trunk/reactos/drivers/base/condrv/control.c Modified: trunk/reactos/drivers/base/condrv/condrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/condrv/condrv… ============================================================================== --- trunk/reactos/drivers/base/condrv/condrv.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/condrv/condrv.c [iso-8859-1] Mon Jan 27 12:29:29 2014 @@ -12,7 +12,6 @@ #define NDEBUG #include <debug.h> - /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/drivers/base/condrv/condrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/condrv/condrv… ============================================================================== --- trunk/reactos/drivers/base/condrv/condrv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/condrv/condrv.h [iso-8859-1] Mon Jan 27 12:29:29 2014 @@ -17,26 +17,18 @@ #include "VisualDDKHelpers.h" #endif - -#include <ntddk.h> -#include <condrv/ntddcon.h> - +#include <wdm.h> #define CONDRV_TAG ' noC' #define DD_CONDRV_TAG '1noC' #define CONDRV_CONS_TAG '2noC' - -// -// Console Driver object extension -// +/* Console Driver object extension */ typedef struct _CONDRV_DRIVER { UNICODE_STRING RegistryPath; PDEVICE_OBJECT Controller; // The unique Controller device for the driver. } CONDRV_DRIVER, *PCONDRV_DRIVER; - - NTSTATUS NTAPI ConDrvCreateController(IN PDRIVER_OBJECT DriverObject, @@ -44,7 +36,4 @@ NTSTATUS NTAPI ConDrvDeleteController(IN PDRIVER_OBJECT DriverObject); - #endif // __CONDRV_H__ - -/* EOF */ Modified: trunk/reactos/drivers/base/condrv/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/condrv/contro… ============================================================================== --- trunk/reactos/drivers/base/condrv/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/condrv/control.c [iso-8859-1] Mon Jan 27 12:29:29 2014 @@ -10,9 +10,10 @@ #include "condrv.h" +#include <condrv/ntddcon.h> + #define NDEBUG #include <debug.h> - /* FUNCTIONS ******************************************************************/

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs