Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[hbelusca] 61785: [NTVDM]: Improve the icon, and add 16x16 format.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jan 23 23:46:10 2014 New Revision: 61785 URL: http://svn.reactos.org/svn/reactos?rev=61785&view=rev Log: [NTVDM]: Improve the icon, and add 16x16 format. Modified: branches/ntvdm/subsystems/ntvdm/res/ntvdm.ico Modified: branches/ntvdm/subsystems/ntvdm/res/ntvdm.ico URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/res/ntvd… ============================================================================== Binary files - no diff available.

10 years, 11 months

[ekohl] 61784: [MSGINA] - Add the ability for administrators to unlock a computer that was locked by another user. - Remove outdated code.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Jan 23 22:05:03 2014 New Revision: 61784 URL: http://svn.reactos.org/svn/reactos?rev=61784&view=rev Log: [MSGINA] - Add the ability for administrators to unlock a computer that was locked by another user. - Remove outdated code. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Thu Jan 23 22:05:03 2014 @@ -639,10 +639,18 @@ else { /* Wrong user name */ - LoadStringW(pgContext->hDllInstance, IDS_LOCKEDWRONGUSER, Buffer1, 256); - wsprintfW(Buffer2, Buffer1, pgContext->Domain, pgContext->UserName); - LoadStringW(pgContext->hDllInstance, IDS_COMPUTERLOCKED, Buffer1, 256); - MessageBoxW(hwndDlg, Buffer2, Buffer1, MB_OK | MB_ICONERROR); + if (DoAdminUnlock(UserName, NULL, Password)) + { + *Action = WLX_SAS_ACTION_UNLOCK_WKSTA; + res = TRUE; + } + else + { + LoadStringW(pgContext->hDllInstance, IDS_LOCKEDWRONGUSER, Buffer1, 256); + wsprintfW(Buffer2, Buffer1, pgContext->Domain, pgContext->UserName); + LoadStringW(pgContext->hDllInstance, IDS_COMPUTERLOCKED, Buffer1, 256); + MessageBoxW(hwndDlg, Buffer2, Buffer1, MB_OK | MB_ICONERROR); + } } } Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Thu Jan 23 22:05:03 2014 @@ -31,6 +31,8 @@ extern GINA_UI GinaGraphicalUI; extern GINA_UI GinaTextUI; static PGINA_UI pGinaUI; +static SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; +static PSID AdminSid; /* * @implemented @@ -589,6 +591,83 @@ return NewStr; } + +BOOL +DoAdminUnlock( + IN PWSTR UserName, + IN PWSTR Domain, + IN PWSTR Password) +{ + HANDLE hToken = NULL; + PTOKEN_GROUPS Groups = NULL; + BOOL bIsAdmin = FALSE; + ULONG Size; + ULONG i; + NTSTATUS Status; + + TRACE("(%S %S %S)\n", UserName, Domain, Password); + + if (!LogonUserW(UserName, + Domain, + Password, + LOGON32_LOGON_INTERACTIVE, + LOGON32_PROVIDER_DEFAULT, + &hToken)) + { + WARN("LogonUserW() failed\n"); + return FALSE; + } + + Status = NtQueryInformationToken(hToken, + TokenGroups, + NULL, + 0, + &Size); + if ((Status != STATUS_SUCCESS) && (Status != STATUS_BUFFER_TOO_SMALL)) + { + TRACE("NtQueryInformationToken() failed (Status 0x%08lx)\n", Status); + goto done; + } + + Groups = HeapAlloc(GetProcessHeap(), 0, Size); + if (Groups == NULL) + { + TRACE("HeapAlloc() failed\n"); + goto done; + } + + Status = NtQueryInformationToken(hToken, + TokenGroups, + Groups, + Size, + &Size); + if (!NT_SUCCESS(Status)) + { + TRACE("NtQueryInformationToken() failed (Status 0x%08lx)\n", Status); + goto done; + } + + for (i = 0; i < Groups->GroupCount; i++) + { + if (RtlEqualSid(Groups->Groups[i].Sid, AdminSid)) + { + TRACE("Member of Admins group\n"); + bIsAdmin = TRUE; + break; + } + } + +done: + if (Groups != NULL) + HeapFree(GetProcessHeap(), 0, Groups); + + if (hToken != NULL) + CloseHandle(hToken); + + return bIsAdmin; +} + + BOOL DoLoginTasks( IN OUT PGINA_CONTEXT pgContext, @@ -698,46 +777,6 @@ return FALSE; } -#if 0 -static -BOOL -CheckAutoAdminLogon( - IN PGINA_CONTEXT pgContext) -{ - HKEY WinLogonKey = NULL; - LPWSTR AutoLogon = NULL; - BOOL result = FALSE; - LONG rc; - - if (pgContext->AutoLogonState == AUTOLOGON_DISABLED) - return FALSE; - - rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\WinLogon", - 0, - KEY_QUERY_VALUE, - &WinLogonKey); - if (rc != ERROR_SUCCESS) - goto cleanup; - - rc = ReadRegSzKey(WinLogonKey, - L"AutoAdminLogon", - &AutoLogon); - - if (rc != ERROR_SUCCESS) - goto cleanup; - - if (wcscmp(AutoLogon, L"1") == 0) - result = TRUE; - -cleanup: - if (WinLogonKey != NULL) - RegCloseKey(WinLogonKey); - HeapFree(GetProcessHeap(), 0, AutoLogon); - - return result; -} -#endif static BOOL DoAutoLogon( @@ -982,7 +1021,27 @@ UNREFERENCED_PARAMETER(lpvReserved); if (dwReason == DLL_PROCESS_ATTACH) + { hDllInstance = hinstDLL; + RtlAllocateAndInitializeSid(&SystemAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + &AdminSid); + + } + else if (dwReason == DLL_PROCESS_DETACH) + { + if (AdminSid != NULL) + RtlFreeSid(AdminSid); + } + return TRUE; } Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Thu Jan 23 22:05:03 2014 @@ -15,6 +15,8 @@ #include <winuser.h> #include <userenv.h> #include <winwlx.h> +#include <ndk/rtlfuncs.h> +#include <ndk/sefuncs.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(msgina); @@ -80,6 +82,12 @@ /* msgina.c */ BOOL +DoAdminUnlock( + IN PWSTR UserName, + IN PWSTR Domain, + IN PWSTR Password); + +BOOL DoLoginTasks( IN OUT PGINA_CONTEXT pgContext, IN PWSTR UserName,

10 years, 11 months

[jgardou] 61783: [CMLIB] - Increase Hive dirty counter when marking cells as dirty - Clear the counter accordingly when flushing the hive [NTOSKRNL] - Lazy flush the registry when unlocking it - Co...

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Jan 23 21:06:48 2014 New Revision: 61783 URL: http://svn.reactos.org/svn/reactos?rev=61783&view=rev Log: [CMLIB] - Increase Hive dirty counter when marking cells as dirty - Clear the counter accordingly when flushing the hive [NTOSKRNL] - Lazy flush the registry when unlocking it - Correctly update hive lazy flush count when actully flushing it - Respect the force flush parameter CORE-6762 #comment Should be fixed with r61783, let's see what testbot says. Modified: trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hivewrt.c trunk/reactos/ntoskrnl/config/cmlazy.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=6… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Thu Jan 23 21:06:48 2014 @@ -120,6 +120,7 @@ RtlSetBits(&RegistryHive->DirtyVector, CellBlock, CellLastBlock - CellBlock); + RegistryHive->DirtyCount++; return TRUE; } Modified: trunk/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=61… ============================================================================== --- trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] Thu Jan 23 21:06:48 2014 @@ -265,6 +265,7 @@ /* Clear dirty bitmap. */ RtlClearAllBits(&RegistryHive->DirtyVector); + RegistryHive->DirtyCount = 0; return TRUE; } Modified: trunk/reactos/ntoskrnl/config/cmlazy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmlazy.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmlazy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmlazy.c [iso-8859-1] Thu Jan 23 21:06:48 2014 @@ -23,7 +23,7 @@ BOOLEAN CmpForceForceFlush; BOOLEAN CmpHoldLazyFlush = TRUE; ULONG CmpLazyFlushIntervalInSeconds = 5; -ULONG CmpLazyFlushHiveCount = 7; +static ULONG CmpLazyFlushHiveCount = 7; ULONG CmpLazyFlushCount = 1; LONG CmpFlushStarveWriters; @@ -31,9 +31,9 @@ BOOLEAN NTAPI -CmpDoFlushNextHive(IN BOOLEAN ForceFlush, - OUT PBOOLEAN Error, - OUT PULONG DirtyCount) +CmpDoFlushNextHive(_In_ BOOLEAN ForceFlush, + _Out_ PBOOLEAN Error, + _Out_ PULONG DirtyCount) { NTSTATUS Status; PLIST_ENTRY NextEntry; @@ -51,13 +51,10 @@ /* Make sure we have to flush at least one hive */ if (!HiveCount) HiveCount = 1; - /* Don't force flush */ - CmpForceForceFlush = FALSE; - /* Acquire the list lock and loop */ ExAcquirePushLockShared(&CmpHiveListHeadLock); NextEntry = CmpHiveListHead.Flink; - while (NextEntry != &CmpHiveListHead) + while ((NextEntry != &CmpHiveListHead) && HiveCount) { /* Get the hive and check if we should flush it */ CmHive = CONTAINING_RECORD(NextEntry, CMHIVE, HiveList); @@ -67,17 +64,21 @@ /* Great sucess! */ Result = TRUE; - /* Ignore clean or volatile hves */ - if (!(CmHive->Hive.DirtyCount) || + /* One less to flush */ + HiveCount--; + + /* Ignore clean or volatile hives */ + if ((!CmHive->Hive.DirtyCount && !ForceFlush) || (CmHive->Hive.HiveFlags & HIVE_VOLATILE)) { /* Don't do anything but do update the count */ CmHive->FlushCount = CmpLazyFlushCount; + DPRINT("Hive %wZ is clean.\n", &CmHive->FileFullPath); } else { /* Do the sync */ - DPRINT1("Flushing: %wZ\n", CmHive->FileFullPath); + DPRINT1("Flushing: %wZ\n", &CmHive->FileFullPath); DPRINT1("Handle: %p\n", CmHive->FileHandles[HFILE_TYPE_PRIMARY]); Status = HvSyncHive(&CmHive->Hive); if(!NT_SUCCESS(Status)) @@ -85,7 +86,9 @@ /* Let them know we failed */ *Error = TRUE; Result = FALSE; + break; } + CmHive->FlushCount = CmpLazyFlushCount; } } else if ((CmHive->Hive.DirtyCount) && @@ -95,6 +98,7 @@ /* Use another lazy flusher for this hive */ ASSERT(CmHive->FlushCount == CmpLazyFlushCount); *DirtyCount += CmHive->Hive.DirtyCount; + DPRINT("CmHive %wZ already uptodate.\n", &CmHive->FileFullPath); } /* Try the next one */ @@ -139,6 +143,7 @@ IN PVOID SystemArgument2) { /* Check if we should queue the lazy flush worker */ + DPRINT("Flush pending: %s, Holding lazy flush: %s.\n", CmpLazyFlushPending ? "yes" : "no", CmpHoldLazyFlush ? "yes" : "no"); if ((!CmpLazyFlushPending) && (!CmpHoldLazyFlush)) { CmpLazyFlushPending = TRUE; @@ -173,20 +178,27 @@ PAGED_CODE(); /* Don't do anything if lazy flushing isn't enabled yet */ - if (CmpHoldLazyFlush) return; + if (CmpHoldLazyFlush) + { + DPRINT1("Lazy flush held. Bye bye.\n"); + CmpLazyFlushPending = FALSE; + return; + } /* Check if we are forcing a flush */ ForceFlush = CmpForceForceFlush; if (ForceFlush) { + DPRINT("Forcing flush.\n"); /* Lock the registry exclusively */ CmpLockRegistryExclusive(); } else { - /* Do a normal lock */ + DPRINT("Not forcing flush.\n"); + /* Starve writers before locking */ + InterlockedIncrement(&CmpFlushStarveWriters); CmpLockRegistry(); - InterlockedIncrement(&CmpFlushStarveWriters); } /* Flush the next hive */ @@ -198,14 +210,21 @@ } /* Check if we have starved writers */ - if (!ForceFlush) InterlockedDecrement(&CmpFlushStarveWriters); + if (!ForceFlush) + InterlockedDecrement(&CmpFlushStarveWriters); /* Not pending anymore, release the registry lock */ CmpLazyFlushPending = FALSE; CmpUnlockRegistry(); - /* Check if we need to flush another hive */ - if ((MoreWork) || (DirtyCount)) CmpLazyFlush(); + DPRINT("Lazy flush done. More work to be done: %s. Entries still dirty: %u.\n", + MoreWork ? "Yes" : "No", DirtyCount); + + if (MoreWork) + { + /* Relaunch the flush timer, so the remaining hives get flushed */ + CmpLazyFlush(); + } } VOID Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Thu Jan 23 21:06:48 2014 @@ -1949,6 +1949,11 @@ CmpDoFlushAll(TRUE); CmpFlushOnLockRelease = FALSE; } + else + { + /* Lazy flush the registry */ + CmpLazyFlush(); + } /* Release the lock and leave the critical region */ ExReleaseResourceLite(&CmpRegistryLock);

10 years, 11 months

[akhaldi] 61782: [MSCOREE] * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 23 18:01:59 2014 New Revision: 61782 URL: http://svn.reactos.org/svn/reactos?rev=61782&view=rev Log: [MSCOREE] * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/mscoree/mscoree_private.h Modified: trunk/reactos/dll/win32/mscoree/mscoree_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree_… ============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree_private.h [iso-8859-1] Thu Jan 23 18:01:59 2014 @@ -33,7 +33,6 @@ #include <winreg.h> #include <objbase.h> #include <cor.h> -#include <corhdr.h> #include <cordebug.h> #include <metahost.h>

10 years, 11 months

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

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 23 18:01:03 2014 New Revision: 61781 URL: http://svn.reactos.org/svn/reactos?rev=61781&view=rev Log: [MSAFD] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/helpers.c trunk/reactos/dll/win32/msafd/misc/stubs.c trunk/reactos/dll/win32/msafd/msafd.h Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Thu Jan 23 18:01:03 2014 @@ -11,6 +11,8 @@ */ #include <msafd.h> + +#include <winuser.h> #if DBG //DWORD DebugTraceLevel = DEBUG_ULTRA; Modified: trunk/reactos/dll/win32/msafd/misc/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/helpe… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] Thu Jan 23 18:01:03 2014 @@ -9,7 +9,10 @@ * CSH 01/09-2000 Created * Alex 16/07/2004 - Complete Rewrite */ + #include <msafd.h> + +#include <winreg.h> CRITICAL_SECTION HelperDLLDatabaseLock; LIST_ENTRY HelperDLLDatabaseListHead; Modified: trunk/reactos/dll/win32/msafd/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/stubs.c [iso-8859-1] Thu Jan 23 18:01:03 2014 @@ -7,6 +7,7 @@ * REVISIONS: * CSH 01/09-2000 Created */ + #include <msafd.h> INT Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] Thu Jan 23 18:01:03 2014 @@ -4,17 +4,18 @@ * FILE: include/msafd.h * PURPOSE: Ancillary Function Driver DLL header */ + #ifndef __MSAFD_H #define __MSAFD_H + +#include <stdarg.h> #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> + #include <windef.h> #include <winbase.h> -#include <winuser.h> -#include <winreg.h> #include <ws2spi.h> #define NTOS_MODE_USER #include <ndk/exfuncs.h> @@ -507,5 +508,3 @@ } #endif /* __MSAFD_H */ - -/* EOF */

10 years, 11 months

[akhaldi] 61780: [MSACM32] * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 23 17:59:52 2014 New Revision: 61780 URL: http://svn.reactos.org/svn/reactos?rev=61780&view=rev Log: [MSACM32] * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/msacm32/wineacm.h 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] Thu Jan 23 17:59:52 2014 @@ -20,19 +20,20 @@ #ifndef __WINE_WINEACM_H #define __WINE_WINEACM_H -#include <config.h> +#include <wine/config.h> #include <stdarg.h> #define WIN32_NO_STATUS #define NOBITMAP +#include <windef.h> +#include <winuser.h> + +#include <wine/debug.h> #include <wine/msacmdrv.h> #include <wine/unicode.h> -#include <winuser.h> - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(msacm); /***********************************************************************

10 years, 11 months

[akhaldi] 61779: [MPR] * Move mprres.h inclusion to the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 23 17:57:47 2014 New Revision: 61779 URL: http://svn.reactos.org/svn/reactos?rev=61779&view=rev Log: [MPR] * Move mprres.h inclusion to the main header. CORE-7716 Modified: trunk/reactos/dll/win32/mpr/mpr_main.c trunk/reactos/dll/win32/mpr/mprres.h trunk/reactos/dll/win32/mpr/nps.c trunk/reactos/dll/win32/mpr/precomp.h trunk/reactos/dll/win32/mpr/wnet.c 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] Thu Jan 23 17:57:47 2014 @@ -19,6 +19,7 @@ */ #include "precomp.h" + #include "wnetpriv.h" /* 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] Thu Jan 23 17:57:47 2014 @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef __WINE_MPRRES_H__ #define __WINE_MPRRES_H__ 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] Thu Jan 23 17:57:47 2014 @@ -22,7 +22,6 @@ #include "precomp.h" #include "netspi.h" -#include "mprres.h" /*********************************************************************** * NPS_ProxyPasswordDialog Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/precomp.h [iso-8859-1] Thu Jan 23 17:57:47 2014 @@ -13,6 +13,9 @@ #include <winnetwk.h> #include <wine/debug.h> + +#include "mprres.h" + WINE_DEFAULT_DEBUG_CHANNEL(mpr); #endif /* _MPR_PCH_ */ 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] Thu Jan 23 17:57:47 2014 @@ -27,8 +27,6 @@ #define WINE_MOUNTMGR_EXTENSIONS #include <ddk/mountmgr.h> #include <wine/unicode.h> - -#include "mprres.h" /* Data structures representing network service providers. Assumes only one * thread creates them, and that they are constant for the life of the process

10 years, 11 months

[akhaldi] 61778: [MMDEVAPI] * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 23 17:55:56 2014 New Revision: 61778 URL: http://svn.reactos.org/svn/reactos?rev=61778&view=rev Log: [MMDEVAPI] * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/mmdevapi/devenum.c trunk/reactos/dll/win32/mmdevapi/mmdevapi.h 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] Thu Jan 23 17:55:56 2014 @@ -20,7 +20,7 @@ #include <wine/list.h> -#include <ole2.h> +#include <oleauto.h> #include <initguid.h> #define _WINDOWS_H #include <dshow.h> 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] Thu Jan 23 17:55:56 2014 @@ -25,8 +25,8 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#define COBJMACROS #define NONAMELESSUNION -#define COBJMACROS #include <windef.h> #include <winbase.h> @@ -37,9 +37,9 @@ #include <endpointvolume.h> #include <mmdeviceapi.h> +#include <wine/debug.h> #include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN;

10 years, 11 months

[akhaldi] 61777: [MCIAVI32] * Remove one time mciavi.h inclusion from the main header and put it back where it belongs. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 23 17:53:38 2014 New Revision: 61777 URL: http://svn.reactos.org/svn/reactos?rev=61777&view=rev Log: [MCIAVI32] * Remove one time mciavi.h inclusion from the main header and put it back where it belongs. CORE-7716 Modified: trunk/reactos/dll/win32/mciavi32/mciavi.c trunk/reactos/dll/win32/mciavi32/private_mciavi.h 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] Thu Jan 23 17:53:38 2014 @@ -39,6 +39,7 @@ #include "private_mciavi.h" +#include <mciavi.h> #include <wine/unicode.h> static DWORD MCIAVI_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); 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] Thu Jan 23 17:53:38 2014 @@ -21,18 +21,18 @@ #ifndef __WINE_PRIVATE_MCIAVI_H #define __WINE_PRIVATE_MCIAVI_H +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> #include <windef.h> #include <wingdi.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);

10 years, 11 months

[akhaldi] 61776: [MAPI32] * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 23 17:52:54 2014 New Revision: 61776 URL: http://svn.reactos.org/svn/reactos?rev=61776&view=rev Log: [MAPI32] * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c trunk/reactos/dll/win32/mapi32/precomp.h trunk/reactos/dll/win32/mapi32/prop.c trunk/reactos/dll/win32/mapi32/stubs.c trunk/reactos/dll/win32/mapi32/util.c trunk/reactos/dll/win32/mapi32/util.h Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_ma… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] Thu Jan 23 17:52:54 2014 @@ -19,8 +19,6 @@ */ #include "precomp.h" - -#include <mapix.h> DECLSPEC_HIDDEN LONG MAPI_ObjectCount = 0; DECLSPEC_HIDDEN HINSTANCE hInstMAPI32; Modified: trunk/reactos/dll/win32/mapi32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/mapi32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/precomp.h [iso-8859-1] Thu Jan 23 17:52:54 2014 @@ -1,7 +1,7 @@ #ifndef _MAPI32_PCH_ #define _MAPI32_PCH_ -#include <config.h> +#include <wine/config.h> #include <stdarg.h> @@ -16,14 +16,15 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> +#include <mapi.h> #include <mapival.h> -#include <mapiutil.h> - -#include <wine/unicode.h> +#include <shlwapi.h> #include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(mapi); +#include <wine/unicode.h> #include "util.h" +WINE_DEFAULT_DEBUG_CHANNEL(mapi); + #endif /* _MAPI32_PCH_ */ Modified: trunk/reactos/dll/win32/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] Thu Jan 23 17:52:54 2014 @@ -20,7 +20,6 @@ #include "precomp.h" -#include <shlwapi.h> #include <wine/list.h> BOOL WINAPI FBadRglpszA(LPSTR*,ULONG); Modified: trunk/reactos/dll/win32/mapi32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/stubs.c [iso-8859-1] Thu Jan 23 17:52:54 2014 @@ -1,13 +1,4 @@ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <mapix.h> - -#include <reactos/debug.h> +#include "precomp.h" typedef PVOID LPMAPIFORMMGR, LPADDRESSBOOK; @@ -109,4 +100,3 @@ UNIMPLEMENTED; return E_NOTIMPL; } - Modified: trunk/reactos/dll/win32/mapi32/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/util.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] Thu Jan 23 17:52:54 2014 @@ -22,9 +22,7 @@ #include "precomp.h" #include <stdio.h> - #include <winternl.h> -#include <shlwapi.h> #include <xcmc.h> #include <msi.h> Modified: trunk/reactos/dll/win32/mapi32/util.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/util.h?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/util.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/util.h [iso-8859-1] Thu Jan 23 17:52:54 2014 @@ -19,11 +19,7 @@ */ #ifndef _MAPI_UTIL_H - #define _MAPI_UTIL_H - -#include <mapi.h> -//#include <mapix.h> extern void load_mapi_providers(void) DECLSPEC_HIDDEN; extern void unload_mapi_providers(void) DECLSPEC_HIDDEN; @@ -65,4 +61,4 @@ extern MAPI_FUNCTIONS mapiFunctions DECLSPEC_HIDDEN; extern HINSTANCE hInstMAPI32 DECLSPEC_HIDDEN; -#endif +#endif /* _MAPI_UTIL_H */

10 years, 11 months

← Newer
1
...
9
10
11
12
13
14
15
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2014