Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 61401: [LSASRV][MSV1_0] - Move the creation of the default DACL from msv1_0 to lsasrv. Create the default DACL only if the selected authentication package does not provide one.
by ekohl＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: ekohl Date: Wed Dec 25 13:24:42 2013 New Revision: 61401 URL: http://svn.reactos.org/svn/reactos?rev=61401&view=rev Log: [LSASRV][MSV1_0] - Move the creation of the default DACL from msv1_0 to lsasrv. Create the default DACL only if the selected authentication package does not provide one. Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/lookup.c trunk/reactos/dll/win32/lsasrv/lsasrv.h 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] Wed Dec 25 13:24:42 2013 @@ -547,9 +547,9 @@ PTOKEN_GROUPS LocalGroups = NULL; ULONG SidHeaderLength = 0; PSID SidHeader = NULL; - PSID Sid; + PSID SrcSid, DstSid; ULONG SidLength; - ULONG CopiedSids = 0; + ULONG AllocatedSids = 0; ULONG i; NTSTATUS Status; @@ -585,8 +585,10 @@ for (i = 0; i < ClientGroupsCount; i++) { + SrcSid = LocalGroups->Groups[i].Sid; + Status = NtReadVirtualMemory(LogonContext->ClientProcessHandle, - LocalGroups->Groups[i].Sid, + SrcSid, SidHeader, SidHeaderLength, NULL); @@ -596,28 +598,28 @@ SidLength = RtlLengthSid(SidHeader); TRACE("Sid %lu: Length %lu\n", i, SidLength); - Sid = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - SidLength); - if (SidHeader == NULL) + DstSid = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + SidLength); + if (DstSid == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; goto done; } Status = NtReadVirtualMemory(LogonContext->ClientProcessHandle, - LocalGroups->Groups[i].Sid, - Sid, + SrcSid, + DstSid, SidLength, NULL); if (!NT_SUCCESS(Status)) { - RtlFreeHeap(RtlGetProcessHeap(), 0, Sid); + RtlFreeHeap(RtlGetProcessHeap(), 0, DstSid); goto done; } - LocalGroups->Groups[i].Sid = Sid; - CopiedSids++; + LocalGroups->Groups[i].Sid = DstSid; + AllocatedSids++; } *TokenGroups = LocalGroups; @@ -630,7 +632,7 @@ { if (LocalGroups != NULL) { - for (i = 0; i < CopiedSids; i++) + for (i = 0; i < AllocatedSids; i++) RtlFreeHeap(RtlGetProcessHeap(), 0, LocalGroups->Groups[i].Sid); RtlFreeHeap(RtlGetProcessHeap(), 0, LocalGroups); @@ -638,6 +640,52 @@ } return Status; +} + + +static +NTSTATUS +LsapAddTokenDefaultDacl( + IN PVOID TokenInformation, + IN LSA_TOKEN_INFORMATION_TYPE TokenInformationType) +{ + PLSA_TOKEN_INFORMATION_V1 TokenInfo1; + PACL Dacl = NULL; + ULONG Length; + + if (TokenInformationType == LsaTokenInformationV1) + { + TokenInfo1 = (PLSA_TOKEN_INFORMATION_V1)TokenInformation; + + if (TokenInfo1->DefaultDacl.DefaultDacl != NULL) + return STATUS_SUCCESS; + + Length = sizeof(ACL) + + (2 * sizeof(ACCESS_ALLOWED_ACE)) + + RtlLengthSid(TokenInfo1->Owner.Owner) + + RtlLengthSid(LsapLocalSystemSid); + + Dacl = DispatchTable.AllocateLsaHeap(Length); + if (Dacl == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCreateAcl(Dacl, Length, ACL_REVISION); + + RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + TokenInfo1->Owner.Owner); + + /* SID: S-1-5-18 */ + RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + LsapLocalSystemSid); + + TokenInfo1->DefaultDacl.DefaultDacl = Dacl; + } + + return STATUS_SUCCESS; } @@ -669,7 +717,7 @@ Package = LsapGetAuthenticationPackage(PackageId); if (Package == NULL) { - TRACE("LsapGetAuthenticationPackage() failed to find a package\n"); + ERR("LsapGetAuthenticationPackage() failed to find a package\n"); return STATUS_NO_SUCH_PACKAGE; } @@ -681,7 +729,7 @@ RequestMsg->LogonUser.Request.AuthenticationInformationLength); if (LocalAuthInfo == NULL) { - TRACE("RtlAllocateHeap() failed\n"); + ERR("RtlAllocateHeap() failed\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -693,7 +741,7 @@ NULL); if (!NT_SUCCESS(Status)) { - TRACE("NtReadVirtualMemory() failed (Status 0x%08lx)\n", Status); + ERR("NtReadVirtualMemory() failed (Status 0x%08lx)\n", Status); RtlFreeHeap(RtlGetProcessHeap(), 0, LocalAuthInfo); return Status; } @@ -706,7 +754,10 @@ RequestMsg->LogonUser.Request.LocalGroupsCount, &LocalGroups); if (!NT_SUCCESS(Status)) + { + ERR("LsapCopyLocalGroups failed (Status 0x%08lx)\n", Status); goto done; + } TRACE("GroupCount: %lu\n", LocalGroups->GroupCount); } @@ -766,7 +817,16 @@ if (!NT_SUCCESS(Status)) { - TRACE("LsaApLogonUser/Ex/2 failed (Status 0x%08lx)\n", Status); + ERR("LsaApLogonUser/Ex/2 failed (Status 0x%08lx)\n", Status); + goto done; + } + + + Status = LsapAddTokenDefaultDacl(TokenInformation, + TokenInformationType); + if (!NT_SUCCESS(Status)) + { + ERR("LsapAddTokenDefaultDacl() failed (Status 0x%08lx)\n", Status); goto done; } @@ -802,7 +862,7 @@ &RequestMsg->LogonUser.Request.SourceContext); if (!NT_SUCCESS(Status)) { - TRACE("NtCreateToken failed (Status 0x%08lx)\n", Status); + ERR("NtCreateToken failed (Status 0x%08lx)\n", Status); goto done; } } @@ -823,7 +883,7 @@ DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES | DUPLICATE_CLOSE_SOURCE); if (!NT_SUCCESS(Status)) { - TRACE("NtDuplicateObject failed (Status 0x%08lx)\n", Status); + ERR("NtDuplicateObject failed (Status 0x%08lx)\n", Status); goto done; } @@ -832,7 +892,7 @@ Status = LsapSetLogonSessionData(&RequestMsg->LogonUser.Reply.LogonId); if (!NT_SUCCESS(Status)) { - TRACE("LsapSetLogonSessionData failed (Status 0x%08lx)\n", Status); + ERR("LsapSetLogonSessionData failed (Status 0x%08lx)\n", Status); goto done; } @@ -847,7 +907,10 @@ if (LocalGroups != NULL) { for (i = 0; i < LocalGroups->GroupCount; i++) - RtlFreeHeap(RtlGetProcessHeap(), 0, LocalGroups->Groups[i].Sid); + { + if (LocalGroups->Groups[i].Sid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, LocalGroups->Groups[i].Sid); + } RtlFreeHeap(RtlGetProcessHeap(), 0, LocalGroups); } Modified: trunk/reactos/dll/win32/lsasrv/lookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lookup.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] Wed Dec 25 13:24:42 2013 @@ -80,6 +80,7 @@ LIST_ENTRY WellKnownSidListHead; +PSID LsapLocalSystemSid = NULL; /* FUNCTIONS ***************************************************************/ @@ -90,7 +91,8 @@ PULONG SubAuthorities, PWSTR AccountName, PWSTR DomainName, - SID_NAME_USE Use) + SID_NAME_USE Use, + PSID *SidPtr) { PWELL_KNOWN_SID SidEntry; PULONG p; @@ -159,6 +161,9 @@ InsertTailList(&WellKnownSidListHead, &SidEntry->ListEntry); + if (SidPtr != NULL) + *SidPtr = SidEntry->Sid; + return TRUE; } @@ -184,7 +189,8 @@ NULL, szAccountName, szDomainName, - SidTypeDomain); + SidTypeDomain, + NULL); /* Null Sid */ LsapLoadString(hInstance, IDS_NULL_RID, szAccountName, 80); @@ -195,7 +201,8 @@ SubAuthorities, szAccountName, L"", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* World Sid */ LsapLoadString(hInstance, IDS_WORLD_RID, szAccountName, 80); @@ -206,7 +213,8 @@ SubAuthorities, szAccountName, L"", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Local Sid */ LsapLoadString(hInstance, IDS_LOCAL_RID, szAccountName, 80); @@ -217,7 +225,8 @@ SubAuthorities, szAccountName, L"", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Creator Owner Sid */ LsapLoadString(hInstance, IDS_CREATOR_OWNER_RID, szAccountName, 80); @@ -228,7 +237,8 @@ SubAuthorities, szAccountName, L"", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Creator Group Sid */ LsapLoadString(hInstance, IDS_CREATOR_GROUP_RID, szAccountName, 80); @@ -239,7 +249,8 @@ SubAuthorities, szAccountName, L"", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Creator Owner Server Sid */ LsapLoadString(hInstance, IDS_CREATOR_OWNER_SERVER_RID, szAccountName, 80); @@ -250,7 +261,8 @@ SubAuthorities, szAccountName, L"", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Creator Group Server Sid */ LsapLoadString(hInstance, IDS_CREATOR_GROUP_SERVER_RID, szAccountName, 80); @@ -261,7 +273,8 @@ SubAuthorities, szAccountName, L"", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Dialup Sid */ LsapLoadString(hInstance, IDS_DIALUP_RID, szAccountName, 80); @@ -273,7 +286,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Network Sid */ LsapLoadString(hInstance, IDS_DIALUP_RID, szAccountName, 80); @@ -284,7 +298,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Batch Sid*/ LsapLoadString(hInstance, IDS_BATCH_RID, szAccountName, 80); @@ -295,7 +310,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Interactive Sid */ LsapLoadString(hInstance, IDS_INTERACTIVE_RID, szAccountName, 80); @@ -306,7 +322,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Service Sid */ LsapLoadString(hInstance, IDS_SERVICE_RID, szAccountName, 80); @@ -317,7 +334,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Anonymous Logon Sid */ LsapLoadString(hInstance, IDS_ANONYMOUS_LOGON_RID, szAccountName, 80); @@ -328,7 +346,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Proxy Sid */ LsapLoadString(hInstance, IDS_PROXY_RID, szAccountName, 80); @@ -339,7 +358,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Enterprise Controllers Sid */ LsapLoadString(hInstance, IDS_ENTERPRISE_CONTROLLERS_RID, szAccountName, 80); @@ -350,7 +370,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Principal Self Sid */ LsapLoadString(hInstance, IDS_PRINCIPAL_SELF_RID, szAccountName, 80); @@ -361,7 +382,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Authenticated Users Sid */ LsapLoadString(hInstance, IDS_AUTHENTICATED_USER_RID, szAccountName, 80); @@ -372,7 +394,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Restricted Code Sid */ LsapLoadString(hInstance, IDS_RESTRICTED_CODE_RID, szAccountName, 80); @@ -383,7 +406,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Terminal Server Sid */ LsapLoadString(hInstance, IDS_TERMINAL_SERVER_RID, szAccountName, 80); @@ -394,7 +418,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Remote Logon Sid */ LsapLoadString(hInstance, IDS_REMOTE_LOGON_RID, szAccountName, 80); @@ -405,7 +430,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* This Organization Sid */ LsapLoadString(hInstance, IDS_THIS_ORGANIZATION_RID, szAccountName, 80); @@ -416,7 +442,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Local System Sid */ LsapLoadString(hInstance, IDS_LOCAL_SYSTEM_RID, szAccountName, 80); @@ -427,7 +454,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + &LsapLocalSystemSid); /* Local Service Sid */ LsapLoadString(hInstance, IDS_LOCAL_SERVICE_RID, szAccountName, 80); @@ -438,14 +466,16 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); LsapCreateSid(&NtAuthority, 1, SubAuthorities, L"LOCALSERVICE", L"NT AUTHORITY", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Network Service Sid */ LsapLoadString(hInstance, IDS_NETWORK_SERVICE_RID, szAccountName, 80); @@ -456,14 +486,16 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); LsapCreateSid(&NtAuthority, 1, SubAuthorities, L"NETWORKSERVICE", L"NT AUTHORITY", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Builtin Domain Sid */ LsapLoadString(hInstance, IDS_BUILTIN_DOMAIN_RID, szAccountName, 80); @@ -475,7 +507,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeDomain); + SidTypeDomain, + NULL); /* Administrators Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_ADMINS, szAccountName, 80); @@ -487,7 +520,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Users Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_USERS, szAccountName, 80); @@ -499,7 +533,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Guests Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_GUESTS, szAccountName, 80); @@ -511,7 +546,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Power User Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_POWER_USERS, szAccountName, 80); @@ -523,7 +559,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Account Operators Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_ACCOUNT_OPS, szAccountName, 80); @@ -535,7 +572,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* System Operators Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_SYSTEM_OPS, szAccountName, 80); @@ -547,7 +585,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Print Operators Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_PRINT_OPS, szAccountName, 80); @@ -559,7 +598,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Backup Operators Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_BACKUP_OPS, szAccountName, 80); @@ -571,7 +611,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Replicators Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_REPLICATOR, szAccountName, 80); @@ -583,7 +624,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* RAS Servers Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_RAS_SERVERS, szAccountName, 80); @@ -595,7 +637,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Pre-Windows 2000 Compatible Access Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_PREW2KCOMPACCESS, szAccountName, 80); @@ -607,7 +650,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Remote Desktop Users Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_REMOTE_DESKTOP_USERS, szAccountName, 80); @@ -619,7 +663,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Network Configuration Operators Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS, szAccountName, 80); @@ -631,7 +676,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* FIXME: Add more well known sids */ Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Wed Dec 25 13:24:42 2013 @@ -91,6 +91,9 @@ extern PSID AccountDomainSid; extern UNICODE_STRING AccountDomainName; +extern PSID LsapLocalSystemSid; + + /* authpackage.c */ NTSTATUS LsapInitAuthPackages(VOID); 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] Wed Dec 25 13:24:42 2013 @@ -573,66 +573,6 @@ static NTSTATUS -BuildTokenDefaultDacl(PTOKEN_DEFAULT_DACL DefaultDacl, - PSID OwnerSid) -{ - SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; - PSID LocalSystemSid = NULL; - PACL Dacl = NULL; - NTSTATUS Status = STATUS_SUCCESS; - - RtlAllocateAndInitializeSid(&SystemAuthority, - 1, - SECURITY_LOCAL_SYSTEM_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &LocalSystemSid); - - Dacl = DispatchTable.AllocateLsaHeap(1024); - if (Dacl == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - Status = RtlCreateAcl(Dacl, 1024, ACL_REVISION); - if (!NT_SUCCESS(Status)) - goto done; - - RtlAddAccessAllowedAce(Dacl, - ACL_REVISION, - GENERIC_ALL, - OwnerSid); - - /* SID: S-1-5-18 */ - RtlAddAccessAllowedAce(Dacl, - ACL_REVISION, - GENERIC_ALL, - LocalSystemSid); - - DefaultDacl->DefaultDacl = Dacl; - -done: - if (!NT_SUCCESS(Status)) - { - if (Dacl != NULL) - DispatchTable.FreeLsaHeap(Dacl); - } - - if (LocalSystemSid != NULL) - RtlFreeSid(LocalSystemSid); - - return Status; -} - - -static -NTSTATUS BuildTokenInformationBuffer(PLSA_TOKEN_INFORMATION_V1 *TokenInformation, PRPC_SID AccountDomainSid, ULONG RelativeId, @@ -680,11 +620,6 @@ Status = BuildTokenOwner(&Buffer->Owner, OwnerSid); - if (!NT_SUCCESS(Status)) - goto done; - - Status = BuildTokenDefaultDacl(&Buffer->DefaultDacl, - OwnerSid); if (!NT_SUCCESS(Status)) goto done;

1 0

[akhaldi] 61400: [MSACM32] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions that already exist in the main header...
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 11:46:57 2013 New Revision: 61400 URL: http://svn.reactos.org/svn/reactos?rev=61400&view=rev Log: [MSACM32] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions that already exist in the main header/resource file. CORE-7716 Modified: trunk/reactos/dll/win32/msacm32/driver.c trunk/reactos/dll/win32/msacm32/filter.c trunk/reactos/dll/win32/msacm32/format.c trunk/reactos/dll/win32/msacm32/internal.c trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc trunk/reactos/dll/win32/msacm32/msacm32_main.c trunk/reactos/dll/win32/msacm32/msacm_main.c trunk/reactos/dll/win32/msacm32/pcmconverter.c trunk/reactos/dll/win32/msacm32/stream.c trunk/reactos/dll/win32/msacm32/wineacm.h Modified: trunk/reactos/dll/win32/msacm32/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/driver.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/driver.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -21,28 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -//#include <stdio.h> - -#include <windef.h> -//#include "winbase.h" -#include <wingdi.h> -//#include "winuser.h" -//#include "winnls.h" -//#include "mmsystem.h" -//#include "mmreg.h" -//#include "msacm.h" -#include <msacmdrv.h> #include "wineacm.h" -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); /*********************************************************************** * acmDriverAddA (MSACM32.@) Modified: trunk/reactos/dll/win32/msacm32/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/filter.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/filter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/filter.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -20,23 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> -//#include <string.h> -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -//#include "winerror.h" -//#include "mmsystem.h" -#define NOBITMAP -//#include "mmreg.h" -//#include "msacm.h" -#include <msacmdrv.h> #include "wineacm.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); /*********************************************************************** * acmFilterChooseA (MSACM32.@) Modified: trunk/reactos/dll/win32/msacm32/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/format.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/format.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -19,25 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> -//#include <string.h> -#include <windef.h> -//#include "winbase.h" -//#include "winnls.h" -//#include "winerror.h" -#include <wingdi.h> -#include <winuser.h> -#include <wine/unicode.h> -#include <wine/debug.h> -//#include "mmsystem.h" -//#include "mmreg.h" -//#include "msacm.h" -#include <msacmdrv.h> #include "wineacm.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); struct MSACM_FillFormatData { HWND hWnd; Modified: trunk/reactos/dll/win32/msacm32/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/internal… ============================================================================== --- trunk/reactos/dll/win32/msacm32/internal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/internal.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -21,26 +21,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> -//#include <string.h> - -#include <windef.h> -//#include "winbase.h" -#include <wingdi.h> -#include <winuser.h> -//#include "winerror.h" +#include "wineacm.h" + #include <winreg.h> -//#include "mmsystem.h" -//#include "mmreg.h" -//#include "msacm.h" -#include <msacmdrv.h> -#include "wineacm.h" -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); /**********************************************************************/ Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -16,8 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "wineacm.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/msacm32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32_… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32_main.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -21,21 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -#include <wine/debug.h> -//#include "mmsystem.h" -#define NOBITMAP -//#include "mmreg.h" -//#include "msacm.h" -#include <msacmdrv.h> #include "wineacm.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); /**********************************************************************/ Modified: trunk/reactos/dll/win32/msacm32/msacm_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_ma… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_main.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -18,19 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "mmsystem.h" -#include "mmreg.h" -#include "msacm.h" -#include "msacmdrv.h" #include "wineacm.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); /************************************************************************** * DllEntryPoint (MSACM.255) Modified: trunk/reactos/dll/win32/msacm32/pcmconverter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/pcmconve… ============================================================================== --- trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -26,30 +26,9 @@ * embedded driver handling scheme in msacm32.dll which isn't done yet */ -#define WIN32_NO_STATUS - -#include <config.h> +#include "wineacm.h" #include <assert.h> -#include <stdarg.h> -//#include <string.h> - -#include <windef.h> -#include <winbase.h> -//#include "mmsystem.h" -#define NOBITMAP -//#include "mmreg.h" -//#include "msacm.h" -//#include "wingdi.h" -#include <winnls.h> -#include <winuser.h> - -#include <msacmdrv.h> -//#include "wineacm.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); /*********************************************************************** * PCM_drvOpen Modified: trunk/reactos/dll/win32/msacm32/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/stream.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/stream.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -28,22 +28,7 @@ * + properly close ACM streams */ -#define WIN32_NO_STATUS - -//#include <stdarg.h> -//#include <string.h> -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -//#include "mmsystem.h" -#define NOBITMAP -//#include "mmreg.h" -//#include "msacm.h" -#include <msacmdrv.h> #include "wineacm.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); static PWINE_ACMSTREAM ACM_GetStream(HACMSTREAM has) { Modified: trunk/reactos/dll/win32/msacm32/wineacm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/wineacm.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/wineacm.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/wineacm.h [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -20,8 +20,20 @@ #ifndef __WINE_WINEACM_H #define __WINE_WINEACM_H -//#include <windef.h> -//#include <winuser.h> +#include <config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define NOBITMAP + +#include <wine/msacmdrv.h> +#include <wine/unicode.h> + +#include <winuser.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(msacm); /*********************************************************************** * Wine specific - Win32

1 0

[ekohl] 61399: [LSASRV] Set session data after the logon token has been created. Still WIP.
by ekohl＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: ekohl Date: Wed Dec 25 11:36:17 2013 New Revision: 61399 URL: http://svn.reactos.org/svn/reactos?rev=61399&view=rev Log: [LSASRV] Set session data after the logon token has been created. Still WIP. Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/session.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] Wed Dec 25 11:36:17 2013 @@ -829,14 +829,12 @@ TokenHandle = NULL; -#if 0 Status = LsapSetLogonSessionData(&RequestMsg->LogonUser.Reply.LogonId); if (!NT_SUCCESS(Status)) { TRACE("LsapSetLogonSessionData failed (Status 0x%08lx)\n", Status); goto done; } -#endif done: if (!NT_SUCCESS(Status)) Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Wed Dec 25 11:36:17 2013 @@ -396,6 +396,9 @@ NTAPI LsapDeleteLogonSession(IN PLUID LogonId); +NTSTATUS +LsapSetLogonSessionData(IN PLUID LogonId); + /* utils.c */ INT LsapLoadString(HINSTANCE hInstance, Modified: trunk/reactos/dll/win32/lsasrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/session.c… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] Wed Dec 25 11:36:17 2013 @@ -50,6 +50,22 @@ } return NULL; +} + + +NTSTATUS +LsapSetLogonSessionData(IN PLUID LogonId) +{ + PLSAP_LOGON_SESSION Session; + + TRACE("()\n"); + + Session = LsapGetLogonSession(LogonId); + if (Session == NULL) + return STATUS_NO_SUCH_LOGON_SESSION; + + + return STATUS_SUCCESS; }

1 0

[akhaldi] 61398: [MPR] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already ...
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 11:26:57 2013 New Revision: 61398 URL: http://svn.reactos.org/svn/reactos?rev=61398&view=rev Log: [MPR] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716 Added: trunk/reactos/dll/win32/mpr/precomp.h (with props) Modified: trunk/reactos/dll/win32/mpr/auth.c trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc trunk/reactos/dll/win32/mpr/lang/mpr_De.rc trunk/reactos/dll/win32/mpr/lang/mpr_En.rc trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc trunk/reactos/dll/win32/mpr/lang/mpr_He.rc trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc trunk/reactos/dll/win32/mpr/lang/mpr_It.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc trunk/reactos/dll/win32/mpr/lang/mpr_No.rc trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc trunk/reactos/dll/win32/mpr/mpr.rc trunk/reactos/dll/win32/mpr/mpr_main.c trunk/reactos/dll/win32/mpr/mprres.h trunk/reactos/dll/win32/mpr/multinet.c trunk/reactos/dll/win32/mpr/netspi.h trunk/reactos/dll/win32/mpr/nps.c trunk/reactos/dll/win32/mpr/pwcache.c trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/auth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/auth.c?rev=6… ============================================================================== --- trunk/reactos/dll/win32/mpr/auth.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/auth.c [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,17 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winnetwk.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mpr); - +#include "precomp.h" /***************************************************************** * WNetLogoffA [MPR.@] Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Bg.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Cs.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Da.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_De.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_De.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_En.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_En.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Es.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Fr.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_He.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_He.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Hu.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_It.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_It.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ja.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ko.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Lt.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Nl.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mpr/lang/mpr_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_No.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_No.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Pl.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Pt.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ro.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -16,8 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ru.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Si.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Sv.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Tr.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Uk.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Zh.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "mprres.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/mpr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rc?rev=6… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,10 +17,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "mprres.h" + +#include <winuser.h> + +#include "mprres.h" #include "version.rc" Modified: trunk/reactos/dll/win32/mpr/mpr_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_main.c [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,18 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "objbase.h" -//#include "winnetwk.h" -#include <wine/debug.h> +#include "precomp.h" #include "wnetpriv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mpr); /* * FIXME: The following routines should use a private heap ... Modified: trunk/reactos/dll/win32/mpr/mprres.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mprres.h?rev… ============================================================================== --- trunk/reactos/dll/win32/mpr/mprres.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mprres.h [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,9 +18,6 @@ #ifndef __WINE_MPRRES_H__ #define __WINE_MPRRES_H__ -//#include <windef.h> -#include <winuser.h> - #define IDS_ENTIRENETWORK 1 #define IDD_PROXYDLG 0x400 Modified: trunk/reactos/dll/win32/mpr/multinet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/multinet.c?r… ============================================================================== --- trunk/reactos/dll/win32/mpr/multinet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/multinet.c [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,17 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winnetwk.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mpr); - +#include "precomp.h" /***************************************************************** * MultinetGetConnectionPerformanceA [MPR.@] Modified: trunk/reactos/dll/win32/mpr/netspi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/netspi.h?rev… ============================================================================== --- trunk/reactos/dll/win32/mpr/netspi.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/netspi.h [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -23,9 +23,6 @@ #ifndef _NETSPI_H_ #define _NETSPI_H_ - -//#include "windef.h" -#include <winnetwk.h> /* * Note: The Unicode variants of all these routines/structures Modified: trunk/reactos/dll/win32/mpr/nps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/nps.c?rev=61… ============================================================================== --- trunk/reactos/dll/win32/mpr/nps.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/nps.c [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -19,23 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <config.h> - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <netspi.h> -#include <wine/debug.h> -//#include "winerror.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mpr); - -//#include "wine/unicode.h" - +#include "precomp.h" + +#include "netspi.h" #include "mprres.h" /*********************************************************************** Added: trunk/reactos/dll/win32/mpr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/precomp.h?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/precomp.h (added) +++ trunk/reactos/dll/win32/mpr/precomp.h [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -0,0 +1,18 @@ +#ifndef _MPR_PCH_ +#define _MPR_PCH_ + +#include <config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <winreg.h> +#include <winnetwk.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(mpr); + +#endif /* _MPR_PCH_ */ Propchange: trunk/reactos/dll/win32/mpr/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mpr/pwcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/pwcache.c?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/pwcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/pwcache.c [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -19,18 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -//#include <stdarg.h> +#include "precomp.h" + #include <stdio.h> - -#include <windef.h> -#include <winbase.h> -#include <winnetwk.h> -#include <winreg.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mpr); static const char mpr_key[] = "Software\\Wine\\Wine\\Mpr\\"; Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=6… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -20,25 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -//#include <stdarg.h> -#include <windef.h> -//#include "winbase.h" -//#include "winnls.h" +#include "precomp.h" + #include <winioctl.h> -#include <winnetwk.h> #include <npapi.h> -#include <winreg.h> -//#include "winuser.h" #define WINE_MOUNTMGR_EXTENSIONS #include <ddk/mountmgr.h> -#include <wine/debug.h> #include <wine/unicode.h> + #include "mprres.h" -//#include "wnetpriv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mpr); /* Data structures representing network service providers. Assumes only one * thread creates them, and that they are constant for the life of the process

1 0

[akhaldi] 61397: [MMDEVAPI] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist i...
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 11:10:09 2013 New Revision: 61397 URL: http://svn.reactos.org/svn/reactos?rev=61397&view=rev Log: [MMDEVAPI] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/mmdevapi/audiovolume.c trunk/reactos/dll/win32/mmdevapi/devenum.c trunk/reactos/dll/win32/mmdevapi/main.c trunk/reactos/dll/win32/mmdevapi/mmdevapi.h Modified: trunk/reactos/dll/win32/mmdevapi/audiovolume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/audiovo… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/audiovolume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/audiovolume.c [iso-8859-1] Wed Dec 25 11:10:09 2013 @@ -16,31 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#define NONAMELESSUNION -#define COBJMACROS -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -#include "ole2.h" -#include "mmdeviceapi.h" -#include "mmsystem.h" -#include "dsound.h" -#include "audioclient.h" -#include "endpointvolume.h" -#include "audiopolicy.h" - #include "mmdevapi.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); static const IAudioEndpointVolumeExVtbl AEVImpl_Vtbl; Modified: trunk/reactos/dll/win32/mmdevapi/devenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/devenum… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/devenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/devenum.c [iso-8859-1] Wed Dec 25 11:10:09 2013 @@ -16,33 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#define NONAMELESSUNION -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "wine/debug.h" -#include "wine/list.h" -#include "wine/unicode.h" - -#include "initguid.h" -#include "ole2.h" -#include "mmdeviceapi.h" -#include "dshow.h" -#include "dsound.h" -#include "audioclient.h" -#include "endpointvolume.h" -#include "audiopolicy.h" - #include "mmdevapi.h" -#include "devpkey.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); + +#define _WINDOWS_H +#include <ole2.h> +#include <dshow.h> +#include <devpkey.h> + +#include <wine/list.h> static const WCHAR software_mmdevapi[] = { 'S','o','f','t','w','a','r','e','\\', Modified: trunk/reactos/dll/win32/mmdevapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/main.c?… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/main.c [iso-8859-1] Wed Dec 25 11:10:09 2013 @@ -17,36 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> - -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "wine/library.h" - -#include "ole2.h" -#include "olectl.h" -#include "rpcproxy.h" -#include "propsys.h" -#include "propkeydef.h" -#include "mmdeviceapi.h" -#include "mmsystem.h" -#include "dsound.h" -#include "audioclient.h" -#include "endpointvolume.h" -#include "audiopolicy.h" -#include "devpkey.h" -#include "winreg.h" - #include "mmdevapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); + +#include <rpcproxy.h> static HINSTANCE instance; Modified: trunk/reactos/dll/win32/mmdevapi/mmdevapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/mmdevap… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/mmdevapi.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/mmdevapi.h [iso-8859-1] Wed Dec 25 11:10:09 2013 @@ -16,9 +16,32 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif +#include <wine/config.h> +#include <wine/port.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define NONAMELESSUNION +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winreg.h> +#include <initguid.h> +#include <objbase.h> +#include <audiopolicy.h> +#include <endpointvolume.h> +#include <mmdeviceapi.h> + +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN;

1 0

[akhaldi] 61396: * The infamous "Forgot this file"...
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 10:42:48 2013 New Revision: 61396 URL: http://svn.reactos.org/svn/reactos?rev=61396&view=rev Log: * The infamous "Forgot this file"... Modified: trunk/reactos/dll/win32/mmdrv/CMakeLists.txt Modified: trunk/reactos/dll/win32/mmdrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/CMakeLists.txt [iso-8859-1] Wed Dec 25 10:42:48 2013 @@ -1,6 +1,5 @@ -add_definitions(-DNDEBUG) spec2def(mmdrv.dll mmdrv.spec)

1 0

[akhaldi] 61395: [MMDRV] * Move some inclusions to the main header. * Do not include debug.h into the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 10:39:58 2013 New Revision: 61395 URL: http://svn.reactos.org/svn/reactos?rev=61395&view=rev Log: [MMDRV] * Move some inclusions to the main header. * Do not include debug.h into the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/mmdrv/common.c trunk/reactos/dll/win32/mmdrv/entry.c trunk/reactos/dll/win32/mmdrv/kernel.c trunk/reactos/dll/win32/mmdrv/mmddk.h trunk/reactos/dll/win32/mmdrv/mmdef.h trunk/reactos/dll/win32/mmdrv/mmdrv.h trunk/reactos/dll/win32/mmdrv/mme.c trunk/reactos/dll/win32/mmdrv/mmioctl.h trunk/reactos/dll/win32/mmdrv/session.c trunk/reactos/dll/win32/mmdrv/utils.c trunk/reactos/dll/win32/mmdrv/wave.c trunk/reactos/dll/win32/mmdrv/wave.h trunk/reactos/dll/win32/mmdrv/wave_io.c Modified: trunk/reactos/dll/win32/mmdrv/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/common.c?r… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/common.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/common.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -11,6 +11,9 @@ #include "mmdrv.h" +#define NDEBUG +#include <debug.h> + /* Translates errors to MMRESULT codes. */ Modified: trunk/reactos/dll/win32/mmdrv/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/entry.c?re… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/entry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/entry.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -11,6 +11,8 @@ #include "mmdrv.h" +#define NDEBUG +#include <debug.h> /* Nothing particularly special happens here. Modified: trunk/reactos/dll/win32/mmdrv/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/kernel.c?r… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/kernel.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/kernel.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -10,6 +10,11 @@ */ #include "mmdrv.h" + +#include <winuser.h> + +#define NDEBUG +#include <debug.h> /* Devices that we provide access to follow a standard naming convention. Modified: trunk/reactos/dll/win32/mmdrv/mmddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmddk.h?re… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmddk.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmddk.h [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -27,7 +27,6 @@ #define __MMDDK_H #include <mmsystem.h> -//#include <winbase.h> typedef VOID (TASKCALLBACK) (DWORD dwInst); Modified: trunk/reactos/dll/win32/mmdrv/mmdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdef.h?re… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmdef.h [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -16,17 +16,8 @@ #define EXPORT __declspec(dllexport) -//#include <stdio.h> -//#include <windows.h> -//#include <mmsystem.h> -//#include <mmddk.h> - // This needs to be done to get winioctl.h to work: //typedef unsigned __int64 DWORD64, *PDWORD64; - -//#include <winioctl.h> -//#include "mmddk.h" - #define SOUND_MAX_DEVICE_NAME 1024 // GUESSWORK #define SOUND_MAX_DEVICES 256 // GUESSWORK Modified: trunk/reactos/dll/win32/mmdrv/mmdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdrv.h?re… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmdrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmdrv.h [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -14,14 +14,16 @@ #ifndef MMDRV_H #define MMDRV_H +#include <stdarg.h> + #define WIN32_NO_STATUS -#define WIN32_LEAN_AND_MEAN + +#include <windef.h> +#include <winbase.h> +#include <winioctl.h> #include "mmioctl.h" #include "mmddk.h" - -//#include <stdio.h> -#include <debug.h> /* Need to check these */ #define MAX_DEVICES 256 Modified: trunk/reactos/dll/win32/mmdrv/mme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mme.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mme.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mme.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -11,6 +11,9 @@ */ #include "mmdrv.h" + +#define NDEBUG +#include <debug.h> /* Sends a message to the client (application), such as WOM_DONE. This Modified: trunk/reactos/dll/win32/mmdrv/mmioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmioctl.h?… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmioctl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmioctl.h [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -11,12 +11,6 @@ #ifndef MMDRV_IOCTLS #define MMDRV_IOCTLS - -#include <windows.h> -//#include <mmsystem.h> -//#include <mmddk.h> -#include <winioctl.h> - /* Base names of the supported devices, as provided by drivers running in Modified: trunk/reactos/dll/win32/mmdrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/session.c?… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/session.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -11,6 +11,9 @@ #include "mmdrv.h" +#define NDEBUG +#include <debug.h> + /* Each session is tracked, but the list must be locked when in use */ SessionInfo* session_list = NULL; Modified: trunk/reactos/dll/win32/mmdrv/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/utils.c?re… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/utils.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -9,7 +9,7 @@ * Jan 30, 2004: Imported into ReactOS tree */ -//#include "mmdrv.h" +#include "mmdrv.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/mmdrv/wave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/wave.c?rev… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/wave.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/wave.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -12,6 +12,8 @@ #include "mmdrv.h" +#define NDEBUG +#include <debug.h> #define MAX_WAVE_BUFFER_SIZE 65536 Modified: trunk/reactos/dll/win32/mmdrv/wave.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/wave.h?rev… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/wave.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/wave.h [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -1,3 +1,4 @@ +#pragma once // FIXME: Should be moved somewhere else? typedef struct _WAVE_DD_VOLUME { Modified: trunk/reactos/dll/win32/mmdrv/wave_io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/wave_io.c?… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/wave_io.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/wave_io.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -3,6 +3,9 @@ */ #include "mmdrv.h" + +#define NDEBUG +#include <debug.h> /* Complete a partial wave buffer transaction

1 0

[akhaldi] 61394: [I8042PRT] * A better way of handling GUIDs thanks to Timo. CORE-7716
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 10:25:08 2013 New Revision: 61394 URL: http://svn.reactos.org/svn/reactos?rev=61394&view=rev Log: [I8042PRT] * A better way of handling GUIDs thanks to Timo. CORE-7716 Added: trunk/reactos/drivers/input/i8042prt/guid.c (with props) Modified: trunk/reactos/drivers/input/i8042prt/CMakeLists.txt trunk/reactos/drivers/input/i8042prt/i8042prt.h Modified: trunk/reactos/drivers/input/i8042prt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/CMa… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] Wed Dec 25 10:25:08 2013 @@ -9,6 +9,7 @@ ps2pp.c readwrite.c registry.c + guid.c i8042prt.rc) set_module_type(i8042prt kernelmodedriver) Added: trunk/reactos/drivers/input/i8042prt/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/gui… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/guid.c (added) +++ trunk/reactos/drivers/input/i8042prt/guid.c [iso-8859-1] Wed Dec 25 10:25:08 2013 @@ -0,0 +1,7 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <wdm.h> +#include <initguid.h> +#include <poclass.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/input/i8042prt/guid.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Wed Dec 25 10:25:08 2013 @@ -1,5 +1,3 @@ - -#define INITGUID #include <ntifs.h> #include <kbdmou.h>

1 0

[akhaldi] 61393: [USBSTOR] * A better way of handling GUIDs thanks to Timo. CORE-7716
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 10:21:22 2013 New Revision: 61393 URL: http://svn.reactos.org/svn/reactos?rev=61393&view=rev Log: [USBSTOR] * A better way of handling GUIDs thanks to Timo. CORE-7716 Added: trunk/reactos/drivers/usb/usbstor/guid.c (with props) Modified: trunk/reactos/drivers/usb/usbstor/CMakeLists.txt trunk/reactos/drivers/usb/usbstor/usbstor.h Modified: trunk/reactos/drivers/usb/usbstor/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] Wed Dec 25 10:21:22 2013 @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -add_library(usbstor SHARED descriptor.c disk.c fdo.c misc.c pdo.c queue.c error.c scsi.c usbstor.c usbstor.rc) +add_library(usbstor SHARED descriptor.c disk.c fdo.c misc.c pdo.c queue.c error.c scsi.c usbstor.c guid.c usbstor.rc) set_module_type(usbstor kernelmodedriver) add_importlibs(usbstor ntoskrnl hal usbd) Added: trunk/reactos/drivers/usb/usbstor/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/guid.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/guid.c (added) +++ trunk/reactos/drivers/usb/usbstor/guid.c [iso-8859-1] Wed Dec 25 10:21:22 2013 @@ -0,0 +1,9 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <ntdef.h> +#include <miniport.h> +#include <usb.h> +#include <initguid.h> +#include <usbbusif.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/usb/usbstor/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] Wed Dec 25 10:21:22 2013 @@ -1,7 +1,5 @@ #pragma once - -#define INITGUID #include <ntddk.h> #include <usbdi.h>

1 0

[akhaldi] 61392: [MCIAVI32] * Set the default debugging channel globally through the main header. CORE-7716
by akhaldi＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: akhaldi Date: Tue Dec 24 22:56:27 2013 New Revision: 61392 URL: http://svn.reactos.org/svn/reactos?rev=61392&view=rev Log: [MCIAVI32] * Set the default debugging channel globally through the main header. CORE-7716 Modified: trunk/reactos/dll/win32/mciavi32/info.c trunk/reactos/dll/win32/mciavi32/mciavi.c trunk/reactos/dll/win32/mciavi32/mmoutput.c trunk/reactos/dll/win32/mciavi32/private_mciavi.h trunk/reactos/dll/win32/mciavi32/wnd.c Modified: trunk/reactos/dll/win32/mciavi32/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/info.c?… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/info.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/info.c [iso-8859-1] Tue Dec 24 22:56:27 2013 @@ -18,12 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <string.h> #include "private_mciavi.h" -#include <wine/debug.h> -//#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mciavi); /************************************************************************** * MCIAVI_ConvertFrameToTimeFormat [internal] Modified: trunk/reactos/dll/win32/mciavi32/mciavi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mciavi.… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/mciavi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/mciavi.c [iso-8859-1] Tue Dec 24 22:56:27 2013 @@ -37,12 +37,9 @@ * audio is played... still should be stopped ASAP */ -//#include <string.h> #include "private_mciavi.h" -#include <wine/debug.h> + #include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mciavi); static DWORD MCIAVI_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); Modified: trunk/reactos/dll/win32/mciavi32/mmoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mmoutpu… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] Tue Dec 24 22:56:27 2013 @@ -20,9 +20,6 @@ */ #include "private_mciavi.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mciavi); static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCKINFO *mmckStream) { Modified: trunk/reactos/dll/win32/mciavi32/private_mciavi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/private… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/private_mciavi.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/private_mciavi.h [iso-8859-1] Tue Dec 24 22:56:27 2013 @@ -27,14 +27,15 @@ #include <stdarg.h> #include <windef.h> -//#include "winbase.h" #include <wingdi.h> -//#include "winuser.h" #include <mmddk.h> #include <digitalv.h> #include <vfw.h> #include <wownt32.h> #include <mciavi.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(mciavi); struct MMIOPos { DWORD dwOffset; Modified: trunk/reactos/dll/win32/mciavi32/wnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/wnd.c?r… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/wnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/wnd.c [iso-8859-1] Tue Dec 24 22:56:27 2013 @@ -19,11 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <string.h> #include "private_mciavi.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mciavi); static const WCHAR mciaviW[] = {'M','C','I','A','V','I',0};

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