Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[akhaldi] 61495: [HIDPARSER] * Do not include debug.h into the main header. * Do not define NDEBUG globally. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jan 3 10:28:56 2014 New Revision: 61495 URL: http://svn.reactos.org/svn/reactos?rev=61495&view=rev Log: [HIDPARSER] * Do not include debug.h into the main header. * Do not define NDEBUG globally. CORE-7716 Modified: trunk/reactos/lib/drivers/hidparser/CMakeLists.txt trunk/reactos/lib/drivers/hidparser/api.c trunk/reactos/lib/drivers/hidparser/context.c trunk/reactos/lib/drivers/hidparser/hidparser.c trunk/reactos/lib/drivers/hidparser/hidparser.h trunk/reactos/lib/drivers/hidparser/parser.c Modified: trunk/reactos/lib/drivers/hidparser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/CMak… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/CMakeLists.txt [iso-8859-1] Fri Jan 3 10:28:56 2014 @@ -1,7 +1,5 @@ -add_definitions( - -DUNICODE -D_UNICODE - -DNDEBUG) +add_definitions(-DUNICODE -D_UNICODE) list(APPEND SOURCE context.c Modified: trunk/reactos/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/api.… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] Fri Jan 3 10:28:56 2014 @@ -8,8 +8,10 @@ * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ - #include "parser.h" + +#define NDEBUG +#include <debug.h> static ULONG KeyboardScanCodes[256] = { /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ Modified: trunk/reactos/lib/drivers/hidparser/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/cont… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/context.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/context.c [iso-8859-1] Fri Jan 3 10:28:56 2014 @@ -8,8 +8,10 @@ * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ - #include "parser.h" + +#define NDEBUG +#include <debug.h> typedef struct { Modified: trunk/reactos/lib/drivers/hidparser/hidparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/hidp… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/hidparser.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/hidparser.c [iso-8859-1] Fri Jan 3 10:28:56 2014 @@ -9,6 +9,9 @@ */ #include "parser.h" + +#define NDEBUG +#include <debug.h> NTSTATUS TranslateHidParserStatus( Modified: trunk/reactos/lib/drivers/hidparser/hidparser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/hidp… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/hidparser.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/hidparser.h [iso-8859-1] Fri Jan 3 10:28:56 2014 @@ -15,10 +15,6 @@ #include <ntddk.h> #include <hidpddi.h> #include <hidpi.h> -#ifndef NDEBUG -#define NDEBUG -#endif -#include <debug.h> // // function prototypes Modified: trunk/reactos/lib/drivers/hidparser/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/pars… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/parser.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/parser.c [iso-8859-1] Fri Jan 3 10:28:56 2014 @@ -8,8 +8,10 @@ * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ - #include "parser.h" + +#define NDEBUG +#include <debug.h> static UCHAR ItemSize[4] = { 0, 1, 2, 4 };

10 years, 11 months

[akhaldi] 61494: [HIDPARSE] * Do not include debug.h into the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jan 3 10:22:05 2014 New Revision: 61494 URL: http://svn.reactos.org/svn/reactos?rev=61494&view=rev Log: [HIDPARSE] * Do not include debug.h into the main header. CORE-7716 Modified: trunk/reactos/drivers/hid/hidparse/hidparse.c trunk/reactos/drivers/hid/hidparse/hidparse.h Modified: trunk/reactos/drivers/hid/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidparse/hidpa… ============================================================================== --- trunk/reactos/drivers/hid/hidparse/hidparse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidparse/hidparse.c [iso-8859-1] Fri Jan 3 10:22:05 2014 @@ -10,6 +10,9 @@ #include "hidparse.h" +#define NDEBUG +#include <debug.h> + PVOID NTAPI AllocFunction( Modified: trunk/reactos/drivers/hid/hidparse/hidparse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidparse/hidpa… ============================================================================== --- trunk/reactos/drivers/hid/hidparse/hidparse.h [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidparse/hidparse.h [iso-8859-1] Fri Jan 3 10:22:05 2014 @@ -5,8 +5,6 @@ #include <ntddk.h> #include <hidpddi.h> #include <hidpi.h> -#define NDEBUG -//#include <debug.h> #include "hidparser.h" #include <stdio.h>

10 years, 11 months

[ekohl] 61493: [LSASRV][MSV1_0] - Create the privilege set for the logon token based on the users group membrships. - Remove the hard-coded privilege set.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Jan 2 20:02:33 2014 New Revision: 61493 URL: http://svn.reactos.org/svn/reactos?rev=61493&view=rev Log: [LSASRV][MSV1_0] - Create the privilege set for the logon token based on the users group membrships. - Remove the hard-coded privilege set. Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/msv1_0/msv1_0.c Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Thu Jan 2 20:02:33 2014 @@ -94,12 +94,20 @@ PLSA_AP_LOGON_USER_INTERNAL LsaApLogonUser; } AUTH_PACKAGE, *PAUTH_PACKAGE; +VOID +NTAPI +LsaIFree_LSAPR_PRIVILEGE_SET(IN PLSAPR_PRIVILEGE_SET Ptr); /* GLOBALS *****************************************************************/ static LIST_ENTRY PackageListHead; static ULONG PackageId; static LSA_DISPATCH_TABLE DispatchTable; + +#define CONST_LUID(x1, x2) {x1, x2} +static const LUID SeChangeNotifyPrivilege = CONST_LUID(SE_CHANGE_NOTIFY_PRIVILEGE, 0); +static const LUID SeCreateGlobalPrivilege = CONST_LUID(SE_CREATE_GLOBAL_PRIVILEGE, 0); +static const LUID SeImpersonatePrivilege = CONST_LUID(SE_IMPERSONATE_PRIVILEGE, 0); /* FUNCTIONS ***************************************************************/ @@ -930,6 +938,137 @@ LsapLocalSystemSid); TokenInfo1->DefaultDacl.DefaultDacl = Dacl; + } + + return STATUS_SUCCESS; +} + + +static +NTSTATUS +LsapAddPrivilegeToTokenPrivileges(PTOKEN_PRIVILEGES *TokenPrivileges, + PLSAPR_LUID_AND_ATTRIBUTES Privilege) +{ + PTOKEN_PRIVILEGES LocalPrivileges; + ULONG Length, TokenPrivilegeCount, i; + NTSTATUS Status = STATUS_SUCCESS; + + if (*TokenPrivileges == NULL) + { + Length = sizeof(TOKEN_PRIVILEGES) + + (1 - ANYSIZE_ARRAY) * sizeof(LUID_AND_ATTRIBUTES); + LocalPrivileges = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + Length); + if (LocalPrivileges == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + LocalPrivileges->PrivilegeCount = 1; + LocalPrivileges->Privileges[0].Luid = Privilege->Luid; + LocalPrivileges->Privileges[0].Attributes = Privilege->Attributes; + } + else + { + TokenPrivilegeCount = (*TokenPrivileges)->PrivilegeCount; + + for (i = 0; i < TokenPrivilegeCount; i++) + { + if (RtlEqualLuid(&(*TokenPrivileges)->Privileges[i].Luid, &Privilege->Luid)) + return STATUS_SUCCESS; + } + + Length = sizeof(TOKEN_PRIVILEGES) + + (TokenPrivilegeCount + 1 - ANYSIZE_ARRAY) * sizeof(LUID_AND_ATTRIBUTES); + LocalPrivileges = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + Length); + if (LocalPrivileges == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + LocalPrivileges->PrivilegeCount = TokenPrivilegeCount + 1; + for (i = 0; i < TokenPrivilegeCount; i++) + { + LocalPrivileges->Privileges[i].Luid = (*TokenPrivileges)->Privileges[i].Luid; + LocalPrivileges->Privileges[i].Attributes = (*TokenPrivileges)->Privileges[i].Attributes; + } + + LocalPrivileges->Privileges[TokenPrivilegeCount].Luid = Privilege->Luid; + LocalPrivileges->Privileges[TokenPrivilegeCount].Attributes = Privilege->Attributes; + + RtlFreeHeap(RtlGetProcessHeap(), 0, *TokenPrivileges); + } + + *TokenPrivileges = LocalPrivileges; + + return Status; +} + +static +NTSTATUS +LsapSetPrivileges( + IN PVOID TokenInformation, + IN LSA_TOKEN_INFORMATION_TYPE TokenInformationType) +{ + PLSA_TOKEN_INFORMATION_V1 TokenInfo1; + LSAPR_HANDLE PolicyHandle = NULL; + LSAPR_HANDLE AccountHandle = NULL; + PLSAPR_PRIVILEGE_SET Privileges = NULL; + ULONG i, j; + NTSTATUS Status; + + if (TokenInformationType == LsaTokenInformationV1) + { + TokenInfo1 = (PLSA_TOKEN_INFORMATION_V1)TokenInformation; + + Status = LsarOpenPolicy(NULL, + NULL, + 0, + &PolicyHandle); + if (!NT_SUCCESS(Status)) + return Status; + + for (i = 0; i < TokenInfo1->Groups->GroupCount; i++) + { + Status = LsarOpenAccount(PolicyHandle, + TokenInfo1->Groups->Groups[i].Sid, + ACCOUNT_VIEW, + &AccountHandle); + if (NT_SUCCESS(Status)) + { + Status = LsarEnumeratePrivilegesAccount(AccountHandle, + &Privileges); + if (NT_SUCCESS(Status)) + { + for (j = 0; j < Privileges->PrivilegeCount; j++) + { + Status = LsapAddPrivilegeToTokenPrivileges(&TokenInfo1->Privileges, + &(Privileges->Privilege[j])); + if (!NT_SUCCESS(Status)) + return Status; + } + + LsaIFree_LSAPR_PRIVILEGE_SET(Privileges); + Privileges = NULL; + } + } + + LsarClose(&AccountHandle); + } + + LsarClose(&PolicyHandle); + + if (TokenInfo1->Privileges != NULL) + { + for (i = 0; i < TokenInfo1->Privileges->PrivilegeCount; i++) + { + if (RtlEqualLuid(&TokenInfo1->Privileges->Privileges[i].Luid, &SeChangeNotifyPrivilege) || + RtlEqualLuid(&TokenInfo1->Privileges->Privileges[i].Luid, &SeCreateGlobalPrivilege) || + RtlEqualLuid(&TokenInfo1->Privileges->Privileges[i].Luid, &SeImpersonatePrivilege)) + { + TokenInfo1->Privileges->Privileges[i].Attributes |= SE_PRIVILEGE_ENABLED | SE_PRIVILEGE_ENABLED_BY_DEFAULT; + } + } + } } return STATUS_SUCCESS; @@ -1108,6 +1247,14 @@ goto done; } + Status = LsapSetPrivileges(TokenInformation, + TokenInformationType); + if (!NT_SUCCESS(Status)) + { + ERR("LsapSetPrivileges() failed (Status 0x%08lx)\n", Status); + goto done; + } + if (TokenInformationType == LsaTokenInformationV1) { TokenInfo1 = (PLSA_TOKEN_INFORMATION_V1)TokenInformation; Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Thu Jan 2 20:02:33 2014 @@ -383,92 +383,6 @@ static NTSTATUS -BuildTokenPrivileges(PTOKEN_PRIVILEGES *TokenPrivileges) -{ - /* FIXME shouldn't use hard-coded list of privileges */ - static struct - { - LPCWSTR PrivName; - DWORD Attributes; - } - DefaultPrivs[] = - { - { L"SeMachineAccountPrivilege", 0 }, - { L"SeSecurityPrivilege", 0 }, - { L"SeTakeOwnershipPrivilege", 0 }, - { L"SeLoadDriverPrivilege", 0 }, - { L"SeSystemProfilePrivilege", 0 }, - { L"SeSystemtimePrivilege", 0 }, - { L"SeProfileSingleProcessPrivilege", 0 }, - { L"SeIncreaseBasePriorityPrivilege", 0 }, - { L"SeCreatePagefilePrivilege", 0 }, - { L"SeBackupPrivilege", 0 }, - { L"SeRestorePrivilege", 0 }, - { L"SeShutdownPrivilege", 0 }, - { L"SeDebugPrivilege", 0 }, - { L"SeSystemEnvironmentPrivilege", 0 }, - { L"SeChangeNotifyPrivilege", SE_PRIVILEGE_ENABLED | SE_PRIVILEGE_ENABLED_BY_DEFAULT }, - { L"SeRemoteShutdownPrivilege", 0 }, - { L"SeUndockPrivilege", 0 }, - { L"SeEnableDelegationPrivilege", 0 }, - { L"SeImpersonatePrivilege", SE_PRIVILEGE_ENABLED | SE_PRIVILEGE_ENABLED_BY_DEFAULT }, - { L"SeCreateGlobalPrivilege", SE_PRIVILEGE_ENABLED | SE_PRIVILEGE_ENABLED_BY_DEFAULT } - }; - PTOKEN_PRIVILEGES Privileges = NULL; - ULONG i; - RPC_UNICODE_STRING PrivilegeName; - LSAPR_HANDLE PolicyHandle = NULL; - NTSTATUS Status = STATUS_SUCCESS; - - Status = LsaIOpenPolicyTrusted(&PolicyHandle); - if (!NT_SUCCESS(Status)) - { - goto done; - } - - /* Allocate and initialize token privileges */ - Privileges = DispatchTable.AllocateLsaHeap(sizeof(TOKEN_PRIVILEGES) + - sizeof(DefaultPrivs) / sizeof(DefaultPrivs[0]) * - sizeof(LUID_AND_ATTRIBUTES)); - if (Privileges == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - Privileges->PrivilegeCount = 0; - for (i = 0; i < sizeof(DefaultPrivs) / sizeof(DefaultPrivs[0]); i++) - { - PrivilegeName.Length = wcslen(DefaultPrivs[i].PrivName) * sizeof(WCHAR); - PrivilegeName.MaximumLength = PrivilegeName.Length + sizeof(WCHAR); - PrivilegeName.Buffer = (LPWSTR)DefaultPrivs[i].PrivName; - - Status = LsarLookupPrivilegeValue(PolicyHandle, - &PrivilegeName, - &Privileges->Privileges[Privileges->PrivilegeCount].Luid); - if (!NT_SUCCESS(Status)) - { - WARN("Can't set privilege %S\n", DefaultPrivs[i].PrivName); - } - else - { - Privileges->Privileges[Privileges->PrivilegeCount].Attributes = DefaultPrivs[i].Attributes; - Privileges->PrivilegeCount++; - } - } - - *TokenPrivileges = Privileges; - -done: - if (PolicyHandle != NULL) - LsarClose(&PolicyHandle); - - return Status; -} - - -static -NTSTATUS BuildTokenInformationBuffer(PLSA_TOKEN_INFORMATION_V1 *TokenInformation, PRPC_SID AccountDomainSid, PSAMPR_USER_INFO_BUFFER UserInfo) @@ -502,10 +416,6 @@ Status = BuildTokenGroups(&Buffer->Groups, (PSID)AccountDomainSid); - if (!NT_SUCCESS(Status)) - goto done; - - Status = BuildTokenPrivileges(&Buffer->Privileges); if (!NT_SUCCESS(Status)) goto done; @@ -532,9 +442,6 @@ if (Buffer->PrimaryGroup.PrimaryGroup != NULL) DispatchTable.FreeLsaHeap(Buffer->PrimaryGroup.PrimaryGroup); - - if (Buffer->Privileges != NULL) - DispatchTable.FreeLsaHeap(Buffer->Privileges); if (Buffer->DefaultDacl.DefaultDacl != NULL) DispatchTable.FreeLsaHeap(Buffer->DefaultDacl.DefaultDacl);

10 years, 11 months

[akhaldi] 61492: [USBCCGP] * Remove some inclusions from the main header. * Improve the GUIDs situation. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 2 14:25:01 2014 New Revision: 61492 URL: http://svn.reactos.org/svn/reactos?rev=61492&view=rev Log: [USBCCGP] * Remove some inclusions from the main header. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/drivers/usb/usbccgp/guid.c (with props) Modified: trunk/reactos/drivers/usb/usbccgp/CMakeLists.txt trunk/reactos/drivers/usb/usbccgp/usbccgp.h Modified: trunk/reactos/drivers/usb/usbccgp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/CMakeLists.txt [iso-8859-1] Thu Jan 2 14:25:01 2014 @@ -6,7 +6,7 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -add_library(usbccgp SHARED descriptor.c fdo.c function.c misc.c pdo.c usbccgp.c usbccgp.rc) +add_library(usbccgp SHARED descriptor.c fdo.c function.c misc.c pdo.c usbccgp.c guid.c usbccgp.rc) target_link_libraries(usbccgp ${PSEH_LIB}) Added: trunk/reactos/drivers/usb/usbccgp/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/guid.c… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/guid.c (added) +++ trunk/reactos/drivers/usb/usbccgp/guid.c [iso-8859-1] Thu Jan 2 14:25:01 2014 @@ -0,0 +1,8 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <wdm.h> +#include <hubbusif.h> +#include <initguid.h> +#include <usbbusif.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/usb/usbccgp/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/usb/usbccgp/usbccgp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/usbccg… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] Thu Jan 2 14:25:01 2014 @@ -2,18 +2,14 @@ #define USBEHCI_H__ #include <ntddk.h> -#include <initguid.h> #include <hubbusif.h> #include <usbbusif.h> -#include <usbioctl.h> #include <usbdlib.h> /* FIXME: #include <usbprotocoldefs.h> */ -#include <usb.h> #include <stdio.h> -#include <wdmguid.h> typedef struct {

10 years, 11 months

[akhaldi] 61491: [USBCCGP] * Do not include debug.h into the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 2 14:14:39 2014 New Revision: 61491 URL: http://svn.reactos.org/svn/reactos?rev=61491&view=rev Log: [USBCCGP] * Do not include debug.h into the main header. CORE-7716 Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c trunk/reactos/drivers/usb/usbccgp/fdo.c trunk/reactos/drivers/usb/usbccgp/function.c trunk/reactos/drivers/usb/usbccgp/misc.c trunk/reactos/drivers/usb/usbccgp/pdo.c trunk/reactos/drivers/usb/usbccgp/usbccgp.c trunk/reactos/drivers/usb/usbccgp/usbccgp.h Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/descri… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] Thu Jan 2 14:14:39 2014 @@ -10,6 +10,9 @@ */ #include "usbccgp.h" + +#define NDEBUG +#include <debug.h> NTSTATUS NTAPI Modified: trunk/reactos/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/fdo.c [iso-8859-1] Thu Jan 2 14:14:39 2014 @@ -10,6 +10,9 @@ */ #include "usbccgp.h" + +#define NDEBUG +#include <debug.h> NTSTATUS NTAPI Modified: trunk/reactos/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/functi… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] Thu Jan 2 14:14:39 2014 @@ -11,6 +11,9 @@ #include "usbccgp.h" +#define NDEBUG +#include <debug.h> + NTSTATUS USBCCGP_QueryInterface( IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/usb/usbccgp/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/misc.c [iso-8859-1] Thu Jan 2 14:14:39 2014 @@ -10,6 +10,9 @@ */ #include "usbccgp.h" + +#define NDEBUG +#include <debug.h> /* Driver verifier */ IO_COMPLETION_ROUTINE SyncForwardIrpCompletionRoutine; Modified: trunk/reactos/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] Thu Jan 2 14:14:39 2014 @@ -10,6 +10,9 @@ */ #include "usbccgp.h" + +#define NDEBUG +#include <debug.h> NTSTATUS USBCCGP_PdoHandleQueryDeviceText( Modified: trunk/reactos/drivers/usb/usbccgp/usbccgp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/usbccg… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/usbccgp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/usbccgp.c [iso-8859-1] Thu Jan 2 14:14:39 2014 @@ -10,6 +10,9 @@ */ #include "usbccgp.h" + +#define NDEBUG +#include <debug.h> /* Driver verifier */ DRIVER_ADD_DEVICE USBCCGP_AddDevice; Modified: trunk/reactos/drivers/usb/usbccgp/usbccgp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/usbccg… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] Thu Jan 2 14:14:39 2014 @@ -2,8 +2,6 @@ #define USBEHCI_H__ #include <ntddk.h> -#define NDEBUG -#include <debug.h> #include <initguid.h> #include <hubbusif.h> #include <usbbusif.h>

10 years, 11 months

[akhaldi] 61490: [TCPIP] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 2 13:53:18 2014 New Revision: 61490 URL: http://svn.reactos.org/svn/reactos?rev=61490&view=rev Log: [TCPIP] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/network/tcpip/include/precomp.h trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c trunk/reactos/drivers/network/tcpip/tcpip/main.c 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] Thu Jan 2 13:53:18 2014 @@ -9,6 +9,10 @@ */ #include "precomp.h" + +#include <ntifs.h> +#include <receive.h> +#include <wait.h> UINT TransferDataCalled = 0; UINT TransferDataCompleteCalled = 0; Modified: trunk/reactos/drivers/network/tcpip/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/precomp.h [iso-8859-1] Thu Jan 2 13:53:18 2014 @@ -1,36 +1,15 @@ -#include <limits.h> -#include <ntddk.h> -#include <ntifs.h> #include <tags.h> -#include <tdi.h> -#include <tdistat.h> #include <tcpip.h> #include <loopback.h> -#include <ip.h> -#include <lan.h> -#include <datagram.h> -#include <checksum.h> -#include <address.h> #include <routines.h> #include <info.h> -#include <neighbor.h> #include <route.h> -#include <receive.h> #include <transmit.h> -#include <router.h> -#include <pool.h> #include <rawip.h> #include <icmp.h> #include <udp.h> #include <tcp.h> -#include <arp.h> #include <tilists.h> -#include <dispatch.h> -#include <fileobjs.h> #include <lock.h> -#include <wait.h> #include <interface.h> -#include <ports.h> -#include <ipifcons.h> #include <chew/chew.h> -#include <pseh/pseh2.h> 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] Thu Jan 2 13:53:18 2014 @@ -10,6 +10,9 @@ */ #include "precomp.h" + +#include <datagram.h> +#include <pseh/pseh2.h> NTSTATUS IRPFinish( PIRP Irp, NTSTATUS Status ) { KIRQL OldIrql; Modified: trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] Thu Jan 2 13:53:18 2014 @@ -9,6 +9,8 @@ */ #include "precomp.h" + +#include <ipifcons.h> TDI_STATUS InfoTdiQueryGetInterfaceMIB(TDIEntityID ID, PIP_INTERFACE Interface, Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Thu Jan 2 13:53:18 2014 @@ -7,7 +7,11 @@ * REVISIONS: * CSH 01/08-2000 Created */ + #include "precomp.h" + +#include <dispatch.h> +#include <fileobjs.h> PDEVICE_OBJECT TCPDeviceObject = NULL; PDEVICE_OBJECT UDPDeviceObject = NULL;

10 years, 11 months

[akhaldi] 61489: [KS] * Do not include debug.h into the main header. * Remove one time inclusions from the main header and put them back where they belong. * Move some inclusions to the main header...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 2 11:34:12 2014 New Revision: 61489 URL: http://svn.reactos.org/svn/reactos?rev=61489&view=rev Log: [KS] * Do not include debug.h into the main header. * Remove one time inclusions from the main header and put them back where they belong. * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/bag.c trunk/reactos/drivers/ksfilter/ks/clocks.c trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/ksfilter/ks/deviceinterface.c trunk/reactos/drivers/ksfilter/ks/driver.c trunk/reactos/drivers/ksfilter/ks/event.c trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/filterfactory.c trunk/reactos/drivers/ksfilter/ks/image.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/kcom.c trunk/reactos/drivers/ksfilter/ks/ksfunc.h trunk/reactos/drivers/ksfilter/ks/ksiface.h trunk/reactos/drivers/ksfilter/ks/kstypes.h trunk/reactos/drivers/ksfilter/ks/methods.c trunk/reactos/drivers/ksfilter/ks/misc.c trunk/reactos/drivers/ksfilter/ks/pin.c trunk/reactos/drivers/ksfilter/ks/priv.h trunk/reactos/drivers/ksfilter/ks/property.c trunk/reactos/drivers/ksfilter/ks/swenum.c trunk/reactos/drivers/ksfilter/ks/topology.c trunk/reactos/drivers/ksfilter/ks/unknown.c trunk/reactos/drivers/ksfilter/ks/worker.c Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/alloca… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */ - #include "priv.h" + +#define NDEBUG +#include <debug.h> typedef enum { 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] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */ - #include "priv.h" + +#define NDEBUG +#include <debug.h> const GUID GUID_NULL = {0x00000000L, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; const GUID KSMEDIUMSETID_Standard = {0x4747B320L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; Modified: trunk/reactos/drivers/ksfilter/ks/bag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/bag.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */ - #include "priv.h" + +#define NDEBUG +#include <debug.h> typedef struct { Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/clocks… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */ - #include "priv.h" + +#define NDEBUG +#include <debug.h> typedef struct { Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */ - #include "priv.h" + +#define NDEBUG +#include <debug.h> KSPIN_INTERFACE StandardPinInterface = { Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */ - #include "priv.h" + +#define NDEBUG +#include <debug.h> NTSTATUS NTAPI Modified: trunk/reactos/drivers/ksfilter/ks/deviceinterface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/deviceinterface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/deviceinterface.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -1,4 +1,7 @@ #include "priv.h" + +#define NDEBUG +#include <debug.h> NTSTATUS KspSetDeviceInterfacesState( Modified: trunk/reactos/drivers/ksfilter/ks/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/driver… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -7,6 +7,9 @@ */ #include "priv.h" + +#define NDEBUG +#include <debug.h> /* @implemented Modified: trunk/reactos/drivers/ksfilter/ks/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/event.… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -7,6 +7,9 @@ */ #include "priv.h" + +#define NDEBUG +#include <debug.h> BOOLEAN KspSynchronizedEventRoutine( Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */ - #include "priv.h" + +#define NDEBUG +#include <debug.h> typedef struct { Modified: trunk/reactos/drivers/ksfilter/ks/filterfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */ - #include "priv.h" + +#define NDEBUG +#include <debug.h> typedef struct { Modified: trunk/reactos/drivers/ksfilter/ks/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/image.… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -7,6 +7,12 @@ */ #include "priv.h" + +#include <ntimage.h> +#include <ndk/ldrfuncs.h> + +#define NDEBUG +#include <debug.h> /* @implemented 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] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */ - #include "priv.h" + +#define NDEBUG +#include <debug.h> /* @implemented Modified: trunk/reactos/drivers/ksfilter/ks/kcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kcom.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -8,6 +8,9 @@ */ #include "priv.h" + +#define NDEBUG +#include <debug.h> const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46}}; Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -1,7 +1,4 @@ #pragma once - -#include "ksiface.h" -#include "kstypes.h" #define TAG_KSDEVICE 'DESK' #define TAG_KSOBJECT_TAG 'HOSK' Modified: trunk/reactos/drivers/ksfilter/ks/ksiface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksifac… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksiface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksiface.h [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -1,7 +1,4 @@ #pragma once - -#include <ntddk.h> -#include <ks.h> #if !defined(DEFINE_ABSTRACT_UNKNOWN) Modified: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstype… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -1,7 +1,4 @@ #pragma once - -#include <ntddk.h> -#include <ks.h> typedef struct { Modified: trunk/reactos/drivers/ksfilter/ks/methods.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/method… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -7,6 +7,9 @@ */ #include "priv.h" + +#define NDEBUG +#include <debug.h> NTSTATUS FindMethodHandler( Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */ - #include "priv.h" + +#define NDEBUG +#include <debug.h> VOID CompleteRequest( Modified: trunk/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,12 @@ * PROGRAMMER: Johannes Anderwald */ - #include "priv.h" + +#include <bdamedia.h> + +#define NDEBUG +#include <debug.h> typedef struct _KSISTREAM_POINTER { Modified: trunk/reactos/drivers/ksfilter/ks/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/priv.h… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -1,21 +1,13 @@ #define _KSDDK_ -#include <stdio.h> - #include <ntifs.h> -#define NDEBUG -//#define YDEBUG -#include <debug.h> #include <portcls.h> #include <kcom.h> #include <pseh/pseh2.h> -#include <ntimage.h> -#include <ndk/ldrfuncs.h> - +#include "ksiface.h" +#include "kstypes.h" #include "ksfunc.h" -#include "bdamedia.h" -#include <swenum.h> #define TAG_DEVICE_HEADER 'KSDH' #define REG_PINFLAG_B_MANY 0x4 /* strmif.h */ Modified: trunk/reactos/drivers/ksfilter/ks/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -7,6 +7,9 @@ */ #include "priv.h" + +#define NDEBUG +#include <debug.h> const GUID KSPROPTYPESETID_General = {0x97E99BA0L, 0xBDEA, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/swenum… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,13 @@ * PROGRAMMER: Johannes Anderwald */ - #include "priv.h" + +#include <stdio.h> +#include <swenum.h> + +#define NDEBUG +#include <debug.h> LONG KsDeviceCount = 0; Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -6,9 +6,10 @@ * PROGRAMMER: Johannes Anderwald */ - #include "priv.h" +#define NDEBUG +#include <debug.h> NTSTATUS NTAPI Modified: trunk/reactos/drivers/ksfilter/ks/unknown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/unknow… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/unknown.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/unknown.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -7,8 +7,10 @@ * KJK::Hyperion */ - #include "priv.h" + +#define NDEBUG +#include <debug.h> #ifdef _X86_ #define KS_DECL_CXX(RET_) extern RET_ __fastcall Modified: trunk/reactos/drivers/ksfilter/ks/worker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/worker… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */ - #include "priv.h" + +#define NDEBUG +#include <debug.h> /* =============================================================== Worker Management Functions

10 years, 11 months

[akhaldi] 61488: [I8042PRT] * Do not include debug.h into the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 2 11:11:12 2014 New Revision: 61488 URL: http://svn.reactos.org/svn/reactos?rev=61488&view=rev Log: [I8042PRT] * Do not include debug.h into the main header. CORE-7716 Modified: trunk/reactos/drivers/input/i8042prt/createclose.c trunk/reactos/drivers/input/i8042prt/i8042prt.c trunk/reactos/drivers/input/i8042prt/i8042prt.h trunk/reactos/drivers/input/i8042prt/keyboard.c trunk/reactos/drivers/input/i8042prt/misc.c trunk/reactos/drivers/input/i8042prt/mouse.c trunk/reactos/drivers/input/i8042prt/pnp.c trunk/reactos/drivers/input/i8042prt/ps2pp.c trunk/reactos/drivers/input/i8042prt/readwrite.c trunk/reactos/drivers/input/i8042prt/registry.c Modified: trunk/reactos/drivers/input/i8042prt/createclose.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/cre… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/createclose.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/createclose.c [iso-8859-1] Thu Jan 2 11:11:12 2014 @@ -9,6 +9,8 @@ /* INCLUDES ******************************************************************/ #include "i8042prt.h" + +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c [iso-8859-1] Thu Jan 2 11:11:12 2014 @@ -12,6 +12,8 @@ /* INCLUDES ******************************************************************/ #include "i8042prt.h" + +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] Thu Jan 2 11:11:12 2014 @@ -1,3 +1,5 @@ +#ifndef _I8042PRT_PCH_ +#define _I8042PRT_PCH_ #include <ntifs.h> #include <kbdmou.h> @@ -6,7 +8,6 @@ #include <bugcodes.h> #include <poclass.h> #include <kdfuncs.h> -#include <debug.h> /*----------------------------------------------------- * Structures @@ -439,3 +440,5 @@ ReadRegistryEntries( IN PUNICODE_STRING RegistryPath, OUT PI8042_SETTINGS Settings); + +#endif /* _I8042PRT_PCH_ */ Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] Thu Jan 2 11:11:12 2014 @@ -12,6 +12,8 @@ /* INCLUDES ****************************************************************/ #include "i8042prt.h" + +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/drivers/input/i8042prt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mis… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/misc.c [iso-8859-1] Thu Jan 2 11:11:12 2014 @@ -9,6 +9,8 @@ /* INCLUDES ******************************************************************/ #include "i8042prt.h" + +#include <debug.h> /* FUNCTIONS *****************************************************************/ static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; 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] Thu Jan 2 11:11:12 2014 @@ -13,6 +13,8 @@ /* INCLUDES ****************************************************************/ #include "i8042prt.h" + +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] Thu Jan 2 11:11:12 2014 @@ -10,6 +10,8 @@ /* INCLUDES ******************************************************************/ #include "i8042prt.h" + +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/input/i8042prt/ps2pp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/ps2… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/ps2pp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/ps2pp.c [iso-8859-1] Thu Jan 2 11:11:12 2014 @@ -10,6 +10,8 @@ /* INCLUDES ****************************************************************/ #include "i8042prt.h" + +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/input/i8042prt/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/rea… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/readwrite.c [iso-8859-1] Thu Jan 2 11:11:12 2014 @@ -12,6 +12,8 @@ /* INCLUDES ******************************************************************/ #include "i8042prt.h" + +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/input/i8042prt/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/reg… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/registry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/registry.c [iso-8859-1] Thu Jan 2 11:11:12 2014 @@ -12,6 +12,8 @@ /* INCLUDES ******************************************************************/ #include "i8042prt.h" + +#include <debug.h> /* FUNCTIONS *****************************************************************/

10 years, 11 months

[jgardou] 61487: [OPENGL32] - Add a debug print. CORE-7727 #comment Please retest with debugging turned on on r61487

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Jan 2 08:46:51 2014 New Revision: 61487 URL: http://svn.reactos.org/svn/reactos?rev=61487&view=rev Log: [OPENGL32] - Add a debug print. CORE-7727 #comment Please retest with debugging turned on on r61487 Modified: trunk/reactos/dll/opengl/opengl32/wgl.c Modified: trunk/reactos/dll/opengl/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/wgl.c?… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/wgl.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/wgl.c [iso-8859-1] Thu Jan 2 08:46:51 2014 @@ -78,6 +78,7 @@ data->nb_icd_formats = data->icd_data->DrvDescribePixelFormat(hdc, 0, 0, NULL); else data->nb_icd_formats = 0; + TRACE("ICD %S has %u formats for HDC %x.\n", data->icd_data->DriverName, data->nb_icd_formats, hdc); data->nb_sw_formats = sw_DescribePixelFormat(hdc, 0, 0, NULL); data->next = dc_data_list; dc_data_list = data; @@ -191,10 +192,31 @@ continue; } - /* only use bitmap capable for formats for bitmap rendering */ - if( (ppfd->dwFlags & PFD_DRAW_TO_BITMAP) != (format.dwFlags & PFD_DRAW_TO_BITMAP)) + /* only use bitmap capable formats for bitmap rendering */ + if ((ppfd->dwFlags & PFD_DRAW_TO_BITMAP) != (format.dwFlags & PFD_DRAW_TO_BITMAP)) { TRACE( "PFD_DRAW_TO_BITMAP mismatch for iPixelFormat=%d\n", i ); + continue; + } + + /* only use window capable formats for window rendering */ + if ((ppfd->dwFlags & PFD_DRAW_TO_WINDOW) != (format.dwFlags & PFD_DRAW_TO_WINDOW)) + { + TRACE( "PFD_DRAW_TO_WINDOW mismatch for iPixelFormat=%d\n", i ); + continue; + } + + /* only use opengl capable formats for opengl rendering */ + if ((ppfd->dwFlags & PFD_SUPPORT_OPENGL) != (format.dwFlags & PFD_SUPPORT_OPENGL)) + { + TRACE( "PFD_SUPPORT_OPENGL mismatch for iPixelFormat=%d\n", i ); + continue; + } + + /* only use GDI capable formats for GDI rendering */ + if ((ppfd->dwFlags & PFD_SUPPORT_GDI) != (format.dwFlags & PFD_SUPPORT_GDI)) + { + TRACE( "PFD_SUPPORT_GDI mismatch for iPixelFormat=%d\n", i ); continue; }

10 years, 11 months

[ekohl] 61486: [LSASRV] Implement LsaIFree_LSAPR_PRIVILEGE_SET.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Jan 1 23:25:26 2014 New Revision: 61486 URL: http://svn.reactos.org/svn/reactos?rev=61486&view=rev Log: [LSASRV] Implement LsaIFree_LSAPR_PRIVILEGE_SET. Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/lsasrv/lsasrv.spec Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Wed Jan 1 23:25:26 2014 @@ -113,6 +113,17 @@ } midl_user_free(PolicyInformation); + } +} + + +VOID +NTAPI +LsaIFree_LSAPR_PRIVILEGE_SET(IN PLSAPR_PRIVILEGE_SET Ptr) +{ + if (Ptr != NULL) + { + midl_user_free(Ptr); } } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.sp… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Wed Jan 1 23:25:26 2014 @@ -7,7 +7,7 @@ @ stub LsaIFree_LSAPR_CR_CIPHER_VALUE @ stdcall LsaIFree_LSAPR_POLICY_INFORMATION(long ptr) @ stub LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER - @ stub LsaIFree_LSAPR_PRIVILEGE_SET + @ stdcall LsaIFree_LSAPR_PRIVILEGE_SET(ptr) @ stub LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST @ stub LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR @ stub LsaIFree_LSAPR_TRANSLATED_NAMES

10 years, 11 months

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 January 2014