Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[hbelusca] 61459: [NTVDM]: Don't display an error message if the VDD registry key (or value) just doesn't exist: it significates we just don't have any VDD to load... Thanks to Lee Schroeder and ol...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 28 22:22:12 2013 New Revision: 61459 URL: http://svn.reactos.org/svn/reactos?rev=61459&view=rev Log: [NTVDM]: Don't display an error message if the VDD registry key (or value) just doesn't exist: it significates we just don't have any VDD to load... Thanks to Lee Schroeder and oldman on the forum for having detected this :) Modified: branches/ntvdm/subsystems/ntvdm/vddsup.c Modified: branches/ntvdm/subsystems/ntvdm/vddsup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vddsup.c… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vddsup.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vddsup.c [iso-8859-1] Sat Dec 28 22:22:12 2013 @@ -251,13 +251,20 @@ HANDLE hVDD; - /* Open the VDD registry key */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - VDDKeyName, - 0, - KEY_QUERY_VALUE, - &hVDDKey) != ERROR_SUCCESS) - { + /* Try to open the VDD registry key */ + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + VDDKeyName, + 0, + KEY_QUERY_VALUE, + &hVDDKey); + if (Error == ERROR_FILE_NOT_FOUND) + { + /* If the key just doesn't exist, don't do anything else */ + return TRUE; + } + else if (Error != ERROR_SUCCESS) + { + /* The key exists but there was an access error: display an error and quit */ DisplayMessage(ERROR_REGVDD); return FALSE; } @@ -272,8 +279,18 @@ &Type, NULL, &BufSize); - if (Error != ERROR_SUCCESS || Type != REG_MULTI_SZ) - { + if (Error == ERROR_FILE_NOT_FOUND) + { + /* If the value just doesn't exist, don't do anything else */ + Success = TRUE; + goto Quit; + } + else if (Error != ERROR_SUCCESS || Type != REG_MULTI_SZ) + { + /* + * The value exists but there was an access error or + * is of the wrong type: display an error and quit. + */ DisplayMessage(ERROR_REGVDD); Success = FALSE; goto Quit;

10 years, 12 months

[jimtabor] 61458: - Fix TC edit control NULL pointer. See CORE-7695.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Dec 28 06:52:28 2013 New Revision: 61458 URL: http://svn.reactos.org/svn/reactos?rev=61458&view=rev Log: - Fix TC edit control NULL pointer. See CORE-7695. Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Sat Dec 28 06:52:28 2013 @@ -1328,6 +1328,8 @@ else { lParamBufferSize = MsgMemorySize(MsgMemoryEntry, wParam, lParam); + // If zero, do not allow callback on client side to allocate a buffer!!!!! See CORE-7695. + if (!lParamBufferSize) lParamBufferSize = -1; } if (! NT_SUCCESS(PackParam(&lParamPacked, Msg, wParam, lParam, FALSE))) @@ -1569,6 +1571,7 @@ else { lParamBufferSize = MsgMemorySize(MsgMemoryEntry, wParam, lParam); + if (!lParamBufferSize) lParamBufferSize = -1; } if (! NT_SUCCESS(PackParam(&lParamPacked, Msg, wParam, lParam, !!ptiSendTo)))

10 years, 12 months

[ekohl] 61457: [LSASRV][MSV1_0] - Add default group SIDs to the token groups list (WorldSID aka Everyone and the logon type SID). - Remove these SIDs from the hard-coded list.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 28 01:45:36 2013 New Revision: 61457 URL: http://svn.reactos.org/svn/reactos?rev=61457&view=rev Log: [LSASRV][MSV1_0] - Add default group SIDs to the token groups list (WorldSID aka Everyone and the logon type SID). - Remove these SIDs from the hard-coded list. 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] Sat Dec 28 01:45:36 2013 @@ -726,6 +726,128 @@ return STATUS_SUCCESS; } +static +NTSTATUS +LsapAddDefaultGroups( + IN PVOID TokenInformation, + IN LSA_TOKEN_INFORMATION_TYPE TokenInformationType, + IN SECURITY_LOGON_TYPE LogonType) +{ + PLSA_TOKEN_INFORMATION_V1 TokenInfo1; + PTOKEN_GROUPS Groups; + ULONG i, Length; + PSID SrcSid; + + if (TokenInformationType == LsaTokenInformationV1) + { + TokenInfo1 = (PLSA_TOKEN_INFORMATION_V1)TokenInformation; + + if (TokenInfo1->Groups != NULL) + { + Length = sizeof(TOKEN_GROUPS) + + (TokenInfo1->Groups->GroupCount + 2 - ANYSIZE_ARRAY) * sizeof(SID_AND_ATTRIBUTES); + + Groups = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Length); + if (Groups == NULL) + { + ERR("Group buffer allocation failed!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Groups->GroupCount = TokenInfo1->Groups->GroupCount; + + for (i = 0; i < TokenInfo1->Groups->GroupCount; i++) + { + Groups->Groups[i].Sid = TokenInfo1->Groups->Groups[i].Sid; + Groups->Groups[i].Attributes = TokenInfo1->Groups->Groups[i].Attributes; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, TokenInfo1->Groups); + + TokenInfo1->Groups = Groups; + + } + else + { + Length = sizeof(TOKEN_GROUPS) + + (2 - ANYSIZE_ARRAY) * sizeof(SID_AND_ATTRIBUTES); + + Groups = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Length); + if (Groups == NULL) + { + ERR("Group buffer allocation failed!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + TokenInfo1->Groups = Groups; + } + + /* Append the World SID (aka Everyone) */ + Length = RtlLengthSid(LsapWorldSid); + Groups->Groups[Groups->GroupCount].Sid = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + Length); + if (Groups->Groups[Groups->GroupCount].Sid == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCopyMemory(Groups->Groups[Groups->GroupCount].Sid, + LsapWorldSid, + Length); + + Groups->Groups[Groups->GroupCount].Attributes = + SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; + + Groups->GroupCount++; + + /* Append the logon type SID */ + switch (LogonType) + { + case Interactive: + SrcSid = LsapInteractiveSid; + break; + + case Network: + SrcSid = LsapNetworkSid; + break; + + case Batch: + SrcSid = LsapBatchSid; + break; + + case Service: + SrcSid = LsapServiceSid; + break; + + default: + FIXME("LogonType %d is not supported!\n", LogonType); + return STATUS_NOT_IMPLEMENTED; + } + + Length = RtlLengthSid(SrcSid); + Groups->Groups[Groups->GroupCount].Sid = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + Length); + if (Groups->Groups[Groups->GroupCount].Sid == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCopyMemory(Groups->Groups[Groups->GroupCount].Sid, + SrcSid, + Length); + + Groups->Groups[Groups->GroupCount].Attributes = + SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; + + Groups->GroupCount++; + } + else + { + FIXME("TokenInformationType %d is not supported!\n", TokenInformationType); + return STATUS_NOT_IMPLEMENTED; + } + + return STATUS_SUCCESS; +} + static NTSTATUS @@ -832,11 +954,13 @@ HANDLE TokenHandle = NULL; ULONG i; ULONG PackageId; + SECURITY_LOGON_TYPE LogonType; NTSTATUS Status; TRACE("(%p %p)\n", RequestMsg, LogonContext); PackageId = RequestMsg->LogonUser.Request.AuthenticationPackage; + LogonType = RequestMsg->LogonUser.Request.LogonType; /* Get the right authentication package */ Package = LsapGetAuthenticationPackage(PackageId); @@ -959,6 +1083,15 @@ } } + Status = LsapAddDefaultGroups(TokenInformation, + TokenInformationType, + LogonType); + if (!NT_SUCCESS(Status)) + { + ERR("LsapAddDefaultGroups() failed (Status 0x%08lx)\n", Status); + goto done; + } + Status = LsapSetTokenOwner(TokenInformation, TokenInformationType); if (!NT_SUCCESS(Status)) 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] Sat Dec 28 01:45:36 2013 @@ -80,6 +80,11 @@ LIST_ENTRY WellKnownSidListHead; +PSID LsapWorldSid = NULL; +PSID LsapNetworkSid = NULL; +PSID LsapBatchSid = NULL; +PSID LsapInteractiveSid = NULL; +PSID LsapServiceSid = NULL; PSID LsapLocalSystemSid = NULL; PSID LsapAdministratorsSid = NULL; @@ -215,7 +220,7 @@ szAccountName, L"", SidTypeWellKnownGroup, - NULL); + &LsapWorldSid); /* Local Sid */ LsapLoadString(hInstance, IDS_LOCAL_RID, szAccountName, 80); @@ -300,7 +305,7 @@ szAccountName, szDomainName, SidTypeWellKnownGroup, - NULL); + &LsapNetworkSid); /* Batch Sid*/ LsapLoadString(hInstance, IDS_BATCH_RID, szAccountName, 80); @@ -312,7 +317,7 @@ szAccountName, szDomainName, SidTypeWellKnownGroup, - NULL); + &LsapBatchSid); /* Interactive Sid */ LsapLoadString(hInstance, IDS_INTERACTIVE_RID, szAccountName, 80); @@ -324,7 +329,7 @@ szAccountName, szDomainName, SidTypeWellKnownGroup, - NULL); + &LsapInteractiveSid); /* Service Sid */ LsapLoadString(hInstance, IDS_SERVICE_RID, szAccountName, 80); @@ -336,7 +341,7 @@ szAccountName, szDomainName, SidTypeWellKnownGroup, - NULL); + &LsapServiceSid); /* Anonymous Logon Sid */ LsapLoadString(hInstance, IDS_ANONYMOUS_LOGON_RID, szAccountName, 80); 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] Sat Dec 28 01:45:36 2013 @@ -91,6 +91,11 @@ extern PSID AccountDomainSid; extern UNICODE_STRING AccountDomainName; +extern PSID LsapWorldSid; +extern PSID LsapNetworkSid; +extern PSID LsapBatchSid; +extern PSID LsapInteractiveSid; +extern PSID LsapServiceSid; extern PSID LsapLocalSystemSid; extern PSID LsapAdministratorsSid; 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] Sat Dec 28 01:45:36 2013 @@ -273,10 +273,9 @@ OUT PTOKEN_GROUPS *Groups, OUT PSID *PrimaryGroupSid) { - SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; PTOKEN_GROUPS TokenGroups; -#define MAX_GROUPS 6 +#define MAX_GROUPS 4 DWORD GroupCount = 0; PSID Sid; NTSTATUS Status = STATUS_SUCCESS; @@ -301,22 +300,6 @@ *PrimaryGroupSid = Sid; GroupCount++; - /* Member of 'Everyone' */ - RtlAllocateAndInitializeSid(&WorldAuthority, - 1, - SECURITY_WORLD_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &Sid); - TokenGroups->Groups[GroupCount].Sid = Sid; - TokenGroups->Groups[GroupCount].Attributes = - SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; - GroupCount++; #if 1 /* Member of 'Administrators' */ @@ -356,22 +339,6 @@ SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; GroupCount++; - /* Member of 'Interactive users' */ - RtlAllocateAndInitializeSid(&SystemAuthority, - 1, - SECURITY_INTERACTIVE_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &Sid); - TokenGroups->Groups[GroupCount].Sid = Sid; - TokenGroups->Groups[GroupCount].Attributes = - SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; - GroupCount++; /* Member of 'Authenticated users' */ RtlAllocateAndInitializeSid(&SystemAuthority,

10 years, 12 months

[akhaldi] 61456: [UXTHEME] * Set the default debugging channel globally through the main header. * 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: Sat Dec 28 00:19:58 2013 New Revision: 61456 URL: http://svn.reactos.org/svn/reactos?rev=61456&view=rev Log: [UXTHEME] * Set the default debugging channel globally through the main header. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/dll/win32/uxtheme/buffer.c trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/main.c trunk/reactos/dll/win32/uxtheme/metric.c trunk/reactos/dll/win32/uxtheme/msstyles.c trunk/reactos/dll/win32/uxtheme/ncscrollbar.c trunk/reactos/dll/win32/uxtheme/nonclient.c trunk/reactos/dll/win32/uxtheme/property.c trunk/reactos/dll/win32/uxtheme/stylemap.c trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/themehooks.c trunk/reactos/dll/win32/uxtheme/uxini.c trunk/reactos/dll/win32/uxtheme/uxthemep.h Modified: trunk/reactos/dll/win32/uxtheme/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/buffer.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/buffer.c [iso-8859-1] Sat Dec 28 00:19:58 2013 @@ -19,9 +19,6 @@ */ #include "uxthemep.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); /*********************************************************************** * BufferedPaintInit (UXTHEME.@) Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Sat Dec 28 00:19:58 2013 @@ -19,9 +19,8 @@ */ #include "uxthemep.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); + +#include <stdlib.h> /*********************************************************************** * Defines and global variables Modified: trunk/reactos/dll/win32/uxtheme/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/main.c [iso-8859-1] Sat Dec 28 00:19:58 2013 @@ -19,9 +19,6 @@ */ #include "uxthemep.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); /***********************************************************************/ Modified: trunk/reactos/dll/win32/uxtheme/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/metric.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] Sat Dec 28 00:19:58 2013 @@ -19,9 +19,6 @@ */ #include "uxthemep.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); /*********************************************************************** * GetThemeSysBool (UXTHEME.@) Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] Sat Dec 28 00:19:58 2013 @@ -19,10 +19,8 @@ */ #include "uxthemep.h" -#include <wine/debug.h> + #include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); /*********************************************************************** * Defines and global variables Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/ncscroll… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] Sat Dec 28 00:19:58 2013 @@ -10,9 +10,8 @@ */ #include "uxthemep.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); + +#include <assert.h> static BOOL SCROLL_trackVertical; static enum SCROLL_HITTEST SCROLL_trackHitTest; Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Sat Dec 28 00:19:58 2013 @@ -7,9 +7,6 @@ */ #include "uxthemep.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); HFONT hMenuFont = NULL; HFONT hMenuFontBold = NULL; Modified: trunk/reactos/dll/win32/uxtheme/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/property… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/property.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/property.c [iso-8859-1] Sat Dec 28 00:19:58 2013 @@ -19,9 +19,6 @@ */ #include "uxthemep.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); /*********************************************************************** * GetThemeBool (UXTHEME.@) Modified: trunk/reactos/dll/win32/uxtheme/stylemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/stylemap… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/stylemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/stylemap.c [iso-8859-1] Sat Dec 28 00:19:58 2013 @@ -19,7 +19,6 @@ */ #include "uxthemep.h" -#include <wine/debug.h> typedef struct _MSSTYLES_PROPERTY_MAP { WORD dwPrimitiveType; Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Sat Dec 28 00:19:58 2013 @@ -19,9 +19,9 @@ */ #include "uxthemep.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); + +#include <winreg.h> +#include <uxundoc.h> /*********************************************************************** * Defines and global variables Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Sat Dec 28 00:19:58 2013 @@ -7,9 +7,6 @@ */ #include "uxthemep.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); USERAPIHOOK user32ApiHook; BYTE gabDWPmessages[UAHOWP_MAX_SIZE]; Modified: trunk/reactos/dll/win32/uxtheme/uxini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxini.c?… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] Sat Dec 28 00:19:58 2013 @@ -19,10 +19,7 @@ */ #include "uxthemep.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); - +#include <winnls.h> /*********************************************************************** * Defines and global variables */ Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Sat Dec 28 00:19:58 2013 @@ -1,20 +1,18 @@ #include <stdio.h> -#include <assert.h> -#include <stdlib.h> #define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <wingdi.h> -#include <winreg.h> -#include <winnls.h> #include <winuser.h> #include <windowsx.h> #include <undocuser.h> #include <uxtheme.h> -#include <uxundoc.h> #include <vfwmsgs.h> #include <tmschema.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); #define TMT_ENUM 200

10 years, 12 months

[akhaldi] 61455: [USP10] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 27 23:54:47 2013 New Revision: 61455 URL: http://svn.reactos.org/svn/reactos?rev=61455&view=rev Log: [USP10] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/usp10/bidi.c trunk/reactos/dll/win32/usp10/breaking.c trunk/reactos/dll/win32/usp10/indic.c trunk/reactos/dll/win32/usp10/mirror.c trunk/reactos/dll/win32/usp10/opentype.c trunk/reactos/dll/win32/usp10/shape.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10_internal.h Modified: trunk/reactos/dll/win32/usp10/bidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bidi.c?rev… ============================================================================== --- trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -41,17 +41,6 @@ * has been modified. */ -#include <config.h> - -//#include <stdarg.h> -#include <windef.h> -//#include "winbase.h" -#include <wingdi.h> -//#include "winnls.h" -#include <usp10.h> -#include <wine/unicode.h> -#include <wine/debug.h> - #include "usp10_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(bidi); Modified: trunk/reactos/dll/win32/usp10/breaking.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/breaking.c… ============================================================================== --- trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -18,20 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include <config.h> -#include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <wingdi.h> -//#include "winnls.h" -#include <usp10.h> -//#include "winternl.h" - -#include <wine/debug.h> + #include "usp10_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); Modified: trunk/reactos/dll/win32/usp10/indic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/indic.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/indic.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/indic.c [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -18,20 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include <config.h> -#include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <wingdi.h> -//#include "winnls.h" -#include <usp10.h> -//#include "winternl.h" - -#include <wine/debug.h> + #include "usp10_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); Modified: trunk/reactos/dll/win32/usp10/mirror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/mirror.c?r… ============================================================================== --- trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -2,7 +2,8 @@ /* generated from http://www.unicode.org/Public/6.2.0/ucd/BidiMirroring.txt */ /* DO NOT EDIT!! */ -#include <wine/unicode.h> +#include <windef.h> +#include <winnt.h> const WCHAR wine_mirror_map[3292] = { Modified: trunk/reactos/dll/win32/usp10/opentype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/opentype.c… ============================================================================== --- trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -18,20 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include <stdarg.h> -#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -//#include "winnls.h" -#include <usp10.h> + +#include "usp10_internal.h" + #include <winternl.h> - -#include "usp10_internal.h" - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); Modified: trunk/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -18,20 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include <stdarg.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -//#include "winnls.h" -#include <usp10.h> -//#include "winternl.h" #include "usp10_internal.h" - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -24,21 +24,10 @@ * and filtering characters and bi-directional text with custom line breaks. */ -#include <stdarg.h> -//#include <stdlib.h> - -#include <windef.h> -//#include "winbase.h" -#include <wingdi.h> +#include "usp10_internal.h" + #include <winuser.h> -//#include "winnls.h" #include <winreg.h> -#include <usp10.h> - -#include "usp10_internal.h" - -#include <wine/debug.h> -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); Modified: trunk/reactos/dll/win32/usp10/usp10_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_inte… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -18,6 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ + +#include <config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <usp10.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + #define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ ( ( (ULONG)_x4 << 24 ) | \ ( (ULONG)_x3 << 16 ) | \

10 years, 12 months

[akhaldi] 61454: [INCLUDE/CRT] * Don't use __MINGW32__ because of some stupid 3rd party code setup of ours (I'm looking at you, libxml2). * Fixes MSVC build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 27 23:35:30 2013 New Revision: 61454 URL: http://svn.reactos.org/svn/reactos?rev=61454&view=rev Log: [INCLUDE/CRT] * Don't use __MINGW32__ because of some stupid 3rd party code setup of ours (I'm looking at you, libxml2). * Fixes MSVC build. Modified: trunk/reactos/include/crt/intrin.h Modified: trunk/reactos/include/crt/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/intrin.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/intrin.h [iso-8859-1] Fri Dec 27 23:35:30 2013 @@ -2,7 +2,7 @@ #pragma once #ifndef RC_INVOKED -#ifdef __MINGW32__ +#if defined(__GNUC__) && defined(_WIN32) // We can't use __MINGW32__ here # include "mingw32/intrin.h" #elif defined(_MSC_VER) # include "msc/intrin.h"

10 years, 12 months

[akhaldi] 61453: [URLMON] * 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 ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 27 23:11:32 2013 New Revision: 61453 URL: http://svn.reactos.org/svn/reactos?rev=61453&view=rev Log: [URLMON] * 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/resource file. * Improve the GUIDs situation. * Dedicated to the newborn Olivia ! CORE-7716 Modified: trunk/reactos/dll/win32/urlmon/axinstall.c trunk/reactos/dll/win32/urlmon/bindctx.c trunk/reactos/dll/win32/urlmon/binding.c trunk/reactos/dll/win32/urlmon/bindprot.c trunk/reactos/dll/win32/urlmon/download.c trunk/reactos/dll/win32/urlmon/file.c trunk/reactos/dll/win32/urlmon/format.c trunk/reactos/dll/win32/urlmon/ftp.c trunk/reactos/dll/win32/urlmon/gopher.c trunk/reactos/dll/win32/urlmon/http.c trunk/reactos/dll/win32/urlmon/internet.c trunk/reactos/dll/win32/urlmon/mimefilter.c trunk/reactos/dll/win32/urlmon/mk.c trunk/reactos/dll/win32/urlmon/protocol.c trunk/reactos/dll/win32/urlmon/resource.h trunk/reactos/dll/win32/urlmon/sec_mgr.c trunk/reactos/dll/win32/urlmon/session.c trunk/reactos/dll/win32/urlmon/umon.c trunk/reactos/dll/win32/urlmon/umstream.c trunk/reactos/dll/win32/urlmon/uri.c trunk/reactos/dll/win32/urlmon/urlmon.rc trunk/reactos/dll/win32/urlmon/urlmon_main.c trunk/reactos/dll/win32/urlmon/urlmon_main.h trunk/reactos/dll/win32/urlmon/usrmarshal.c Modified: trunk/reactos/dll/win32/urlmon/axinstall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/axinstall… ============================================================================== --- trunk/reactos/dll/win32/urlmon/axinstall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/axinstall.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -16,19 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define OEMRESOURCE +#include "urlmon_main.h" #include <assert.h> -#include "urlmon_main.h" #include "resource.h" - -#include "advpub.h" -#include "fdi.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static const WCHAR ctxW[] = {'c','t','x',0}; static const WCHAR cab_extW[] = {'.','c','a','b',0}; Modified: trunk/reactos/dll/win32/urlmon/bindctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindctx.c… ============================================================================== --- trunk/reactos/dll/win32/urlmon/bindctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/bindctx.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -16,12 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdio.h> - #include "urlmon_main.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static WCHAR bscb_holderW[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; Modified: trunk/reactos/dll/win32/urlmon/binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/binding.c… ============================================================================== --- trunk/reactos/dll/win32/urlmon/binding.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/binding.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -17,12 +17,6 @@ */ #include "urlmon_main.h" -//#include "winreg.h" -#include <shlwapi.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static WCHAR cbinding_contextW[] = {'C','B','i','n','d','i','n','g',' ','C','o','n','t','e','x','t',0}; static WCHAR bscb_holderW[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; Modified: trunk/reactos/dll/win32/urlmon/bindprot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindprot.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/bindprot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/bindprot.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -17,9 +17,6 @@ */ #include "urlmon_main.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef void (*task_proc_t)(BindProtocol*,task_header_t*); Modified: trunk/reactos/dll/win32/urlmon/download.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/download.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/download.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/download.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -17,9 +17,6 @@ */ #include "urlmon_main.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { IBindStatusCallback IBindStatusCallback_iface; Modified: trunk/reactos/dll/win32/urlmon/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/file.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/file.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -17,12 +17,6 @@ */ #include "urlmon_main.h" -//#include "winreg.h" -#include <shlwapi.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { IInternetProtocolEx IInternetProtocolEx_iface; Modified: trunk/reactos/dll/win32/urlmon/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/format.c?… ============================================================================== --- trunk/reactos/dll/win32/urlmon/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/format.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -17,9 +17,6 @@ */ #include "urlmon_main.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static WCHAR wszEnumFORMATETC[] = {'_','E','n','u','m','F','O','R','M','A','T','E','T','C','_',0}; Modified: trunk/reactos/dll/win32/urlmon/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/ftp.c?rev… ============================================================================== --- trunk/reactos/dll/win32/urlmon/ftp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/ftp.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -17,13 +17,6 @@ */ #include "urlmon_main.h" - -#define NO_SHLWAPI_REG -#include <shlwapi.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { Protocol base; Modified: trunk/reactos/dll/win32/urlmon/gopher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/gopher.c?… ============================================================================== --- trunk/reactos/dll/win32/urlmon/gopher.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/gopher.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -17,9 +17,6 @@ */ #include "urlmon_main.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { Protocol base; Modified: trunk/reactos/dll/win32/urlmon/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/http.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/http.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -18,14 +18,6 @@ */ #include "urlmon_main.h" -//#include "wininet.h" - -#define NO_SHLWAPI_REG -#include <shlwapi.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { Protocol base; Modified: trunk/reactos/dll/win32/urlmon/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/internet.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/internet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/internet.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -18,12 +18,6 @@ */ #include "urlmon_main.h" -//#include "winreg.h" -#include <shlwapi.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static const WCHAR feature_control_keyW[] = {'S','o','f','t','w','a','r','e','\\', Modified: trunk/reactos/dll/win32/urlmon/mimefilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mimefilte… ============================================================================== --- trunk/reactos/dll/win32/urlmon/mimefilter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/mimefilter.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -17,9 +17,6 @@ */ #include "urlmon_main.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { IInternetProtocol IInternetProtocol_iface; Modified: trunk/reactos/dll/win32/urlmon/mk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mk.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/urlmon/mk.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/mk.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -17,12 +17,6 @@ */ #include "urlmon_main.h" -#include <wine/debug.h> - -#define NO_SHLWAPI_REG -#include <shlwapi.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { IInternetProtocolEx IInternetProtocolEx_iface; Modified: trunk/reactos/dll/win32/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/protocol.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/protocol.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -18,10 +18,6 @@ */ #include "urlmon_main.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static inline HRESULT report_progress(Protocol *protocol, ULONG status_code, LPCWSTR status_text) { Modified: trunk/reactos/dll/win32/urlmon/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/resource.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/resource.h [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + #define ID_AXINSTALL_WARNING_DLG 1000 #define ID_AXINSTALL_LOCATION 1001 #define ID_AXINSTALL_INSTALL_BTN 1002 Modified: trunk/reactos/dll/win32/urlmon/sec_mgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/sec_mgr.c… ============================================================================== --- trunk/reactos/dll/win32/urlmon/sec_mgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/sec_mgr.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -21,18 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdio.h> - #include "urlmon_main.h" -//#include "winreg.h" -//#include "wininet.h" - -#define NO_SHLWAPI_REG -#include <shlwapi.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static const WCHAR currentlevelW[] = {'C','u','r','r','e','n','t','L','e','v','e','l',0}; static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; Modified: trunk/reactos/dll/win32/urlmon/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/session.c… ============================================================================== --- trunk/reactos/dll/win32/urlmon/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/session.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -17,11 +17,6 @@ */ #include "urlmon_main.h" -//#include "winreg.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { LPWSTR protocol; Modified: trunk/reactos/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -22,14 +22,7 @@ #include "urlmon_main.h" -//#include "winreg.h" -#include <shlwapi.h> #include <hlink.h> -//#include "shellapi.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { IMoniker IMoniker_iface; Modified: trunk/reactos/dll/win32/urlmon/umstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umstream.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/umstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/umstream.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -21,15 +21,6 @@ #include "urlmon_main.h" -//#include "winreg.h" -//#include "winternl.h" -//#include "wininet.h" -//#include "shlwapi.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); - typedef struct ProxyBindStatusCallback { IBindStatusCallback IBindStatusCallback_iface; Modified: trunk/reactos/dll/win32/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/uri.c?rev… ============================================================================== --- trunk/reactos/dll/win32/urlmon/uri.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/uri.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -17,13 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <limits.h> - #include "urlmon_main.h" -#include <wine/debug.h> - -#define NO_SHLWAPI_REG -#include <shlwapi.h> #include <strsafe.h> @@ -41,8 +35,6 @@ #define RAW_URI_CONVERT_TO_DOS_PATH 0x2 #define COMBINE_URI_FORCE_FLAG_USE 0x1 - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static const IID IID_IUriObj = {0x4b364760,0x9f51,0x11df,{0x98,0x1c,0x08,0x00,0x20,0x0c,0x9a,0x66}}; Modified: trunk/reactos/dll/win32/urlmon/urlmon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.rc… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon.rc [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -18,7 +18,6 @@ #include <windef.h> #include <winuser.h> -#include <commctrl.h> #include "resource.h" Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -18,23 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> - #include "urlmon_main.h" -//#include "winreg.h" - -#define NO_SHLWAPI_REG -//#include "shlwapi.h" -#include <advpub.h> #include <initguid.h> - -#include <wine/debug.h> - -#include "urlmon.h" - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); - DEFINE_GUID(CLSID_CUri, 0xDF2FCE13, 0x25EC, 0x45BB, 0x9D,0x4C, 0xCE,0xCD,0x47,0xC2,0x43,0x0C); LONG URLMON_refCount = 0; Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -20,12 +20,12 @@ #ifndef __WINE_URLMON_MAIN_H #define __WINE_URLMON_MAIN_H +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> - #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -33,14 +33,19 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> -//#include "winuser.h" #include <ole2.h> #include <urlmon.h> #include <wininet.h> #include <shellapi.h> - +#include <advpub.h> +#define NO_SHLWAPI_REG +#include <shlwapi.h> + +#include <wine/list.h> #include <wine/unicode.h> -#include <wine/list.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(urlmon); extern HINSTANCE hProxyDll DECLSPEC_HIDDEN; extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/urlmon/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/usrmarsha… ============================================================================== --- trunk/reactos/dll/win32/urlmon/usrmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/usrmarshal.c [iso-8859-1] Fri Dec 27 23:11:32 2013 @@ -17,10 +17,6 @@ */ #include "urlmon_main.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); HRESULT CALLBACK IWinInetHttpInfo_QueryInfo_Proxy(IWinInetHttpInfo* This, DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf, DWORD *pdwFlags,

10 years, 12 months

[akhaldi] 61452: * Fix MSVC build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 27 22:58:57 2013 New Revision: 61452 URL: http://svn.reactos.org/svn/reactos?rev=61452&view=rev Log: * Fix MSVC build. Modified: trunk/reactos/include/crt/intrin.h Modified: trunk/reactos/include/crt/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/intrin.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/intrin.h [iso-8859-1] Fri Dec 27 22:58:57 2013 @@ -1,6 +1,7 @@ #pragma once +#ifndef RC_INVOKED #ifdef __MINGW32__ # include "mingw32/intrin.h" #elif defined(_MSC_VER) @@ -8,3 +9,4 @@ #else # error Please implement intrinsics for your target compiler #endif +#endif

10 years, 12 months

[hbelusca] 61451: [NTVDM] Shut up few DPRINT1s, and demote some DPRINT1s to DPRINTs but disable NDEBUG for now (enable it and you'll shut up the DPRINTs).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Dec 27 19:51:43 2013 New Revision: 61451 URL: http://svn.reactos.org/svn/reactos?rev=61451&view=rev Log: [NTVDM] Shut up few DPRINT1s, and demote some DPRINT1s to DPRINTs but disable NDEBUG for now (enable it and you'll shut up the DPRINTs). Modified: branches/ntvdm/subsystems/ntvdm/bop.c branches/ntvdm/subsystems/ntvdm/int32.c branches/ntvdm/subsystems/ntvdm/io.c branches/ntvdm/subsystems/ntvdm/vddsup.c Modified: branches/ntvdm/subsystems/ntvdm/bop.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bop.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bop.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bop.c [iso-8859-1] Fri Dec 27 19:51:43 2013 @@ -9,7 +9,7 @@ /* INCLUDES *******************************************************************/ -#define NDEBUG +// #define NDEBUG #include "emulator.h" #include "bop.h" @@ -44,7 +44,7 @@ if (BopProc[BopCode] != NULL) BopProc[BopCode](Stack); else - DPRINT1("Invalid BOP code: 0x%02X\n", BopCode); + DPRINT("Invalid BOP code: 0x%02X\n", BopCode); } /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/int32.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] Fri Dec 27 19:51:43 2013 @@ -9,7 +9,7 @@ /* INCLUDES *******************************************************************/ -#define NDEBUG +// #define NDEBUG #include "emulator.h" #include "int32.h" @@ -131,7 +131,7 @@ if (Int32Proc[IntNum] != NULL) Int32Proc[IntNum](Stack); else - DPRINT1("Unhandled 32-bit interrupt: 0x%02X, AX = 0x%04X\n", IntNum, getAX()); + DPRINT("Unhandled 32-bit interrupt: 0x%02X, AX = 0x%04X\n", IntNum, getAX()); } VOID WINAPI ControlBop(LPWORD Stack) @@ -143,7 +143,7 @@ if (FuncNum == BOP_CONTROL_INT32) Int32Dispatch(Stack); else - DPRINT1("Unassigned Control BOP Function: 0x%02X\n", FuncNum); + DPRINT("Unassigned Control BOP Function: 0x%02X\n", FuncNum); } VOID InitializeInt32(WORD BiosSegment) Modified: branches/ntvdm/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/io.c?rev… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/io.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/io.c [iso-8859-1] Fri Dec 27 19:51:43 2013 @@ -9,7 +9,7 @@ /* INCLUDES *******************************************************************/ -#define NDEBUG +// #define NDEBUG #include "emulator.h" #include "io.h" @@ -75,7 +75,7 @@ else { /* Return an empty port byte value */ - DPRINT1("Read from unknown port: 0x%X\n", Port); + DPRINT("Read from unknown port: 0x%X\n", Port); *Buffer = 0xFF; } } @@ -121,7 +121,7 @@ else { /* Do nothing */ - DPRINT1("Write to unknown port: 0x%X\n", Port); + DPRINT("Write to unknown port: 0x%X\n", Port); } } Modified: branches/ntvdm/subsystems/ntvdm/vddsup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vddsup.c… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vddsup.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vddsup.c [iso-8859-1] Fri Dec 27 19:51:43 2013 @@ -71,7 +71,7 @@ VDD_PROC InitRoutine = NULL, DispatchRoutine = NULL; - DPRINT1("RegisterModule() called\n"); + DPRINT("RegisterModule() called\n"); /* Clear the Carry Flag (no error happened so far) */ setCF(0); @@ -182,7 +182,7 @@ WORD Handle = getAX(); WORD Entry = HANDLE_TO_ENTRY(Handle); // Convert the handle to a valid entry - DPRINT1("UnRegisterModule() called\n"); + DPRINT("UnRegisterModule() called\n"); /* Sanity checks */ if (!IS_VALID_HANDLE(Handle) || VDDList[Entry].hDll == NULL) @@ -206,7 +206,7 @@ WORD Handle = getAX(); WORD Entry = HANDLE_TO_ENTRY(Handle); // Convert the handle to a valid entry - DPRINT1("DispatchCall() called\n"); + DPRINT("DispatchCall() called\n"); /* Sanity checks */ if (!IS_VALID_HANDLE(Handle) ||

10 years, 12 months

[jgardou] 61450: [INCLUDE/CRT] - add intrin.h which redirects to compiler specific version - Do not add a global include directory for two headers - Update float.h accordingly

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Dec 27 16:25:52 2013 New Revision: 61450 URL: http://svn.reactos.org/svn/reactos?rev=61450&view=rev Log: [INCLUDE/CRT] - add intrin.h which redirects to compiler specific version - Do not add a global include directory for two headers - Update float.h accordingly Added: trunk/reactos/include/crt/intrin.h (with props) Modified: trunk/reactos/CMakeLists.txt trunk/reactos/include/crt/float.h Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=61450&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Fri Dec 27 16:25:52 2013 @@ -199,12 +199,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/arm) endif() - if(MSVC) - include_directories(include/crt/msc) - else() - include_directories(include/crt/mingw32) - endif() - add_dependency_header() add_subdirectory(include/psdk) Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=61… ============================================================================== --- trunk/reactos/include/crt/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/float.h [iso-8859-1] Fri Dec 27 16:25:52 2013 @@ -16,16 +16,16 @@ * */ +#ifndef _MINGW_FLOAT_H_ +#define _MINGW_FLOAT_H_ + #if defined(__GNUC__) -#include <gcc_float.h> +#include "mingw32/gcc_float.h" #elif defined(_MSC_VER) -#include <msc_float.h> +#include "msc/msc_float.h" #else #error #endif - -#ifndef _MINGW_FLOAT_H_ -#define _MINGW_FLOAT_H_ #include <crtdefs.h> Added: trunk/reactos/include/crt/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/intrin.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/intrin.h (added) +++ trunk/reactos/include/crt/intrin.h [iso-8859-1] Fri Dec 27 16:25:52 2013 @@ -0,0 +1,10 @@ + +#pragma once + +#ifdef __MINGW32__ +# include "mingw32/intrin.h" +#elif defined(_MSC_VER) +# include "msc/intrin.h" +#else +# error Please implement intrinsics for your target compiler +#endif Propchange: trunk/reactos/include/crt/intrin.h ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 12 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 December 2013