Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 36833: - SVN maintenance
by sginsberg＠svn.reactos.org 19 Oct '08

19 Oct '08

Author: sginsberg Date: Sun Oct 19 14:17:01 2008 New Revision: 36833 URL: http://svn.reactos.org/svn/reactos?rev=36833&view=rev Log: - SVN maintenance Modified: trunk/rostests/win32/kernel32/tests/CreateFile.c (props changed) trunk/rostests/win32/kernel32/tests/setup.c (props changed) Propchange: trunk/rostests/win32/kernel32/tests/CreateFile.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/rostests/win32/kernel32/tests/setup.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[sginsberg] 36832: - SVN maintenance
by sginsberg＠svn.reactos.org 19 Oct '08

19 Oct '08

Author: sginsberg Date: Sun Oct 19 14:11:18 2008 New Revision: 36832 URL: http://svn.reactos.org/svn/reactos?rev=36832&view=rev Log: - SVN maintenance Modified: trunk/rosapps/drivers/ramdrv/ramdrv.c (props changed) trunk/rosapps/drivers/ramdrv/ramdrv.h (props changed) trunk/rosapps/drivers/ramdrv/ramdrv.rc (props changed) Propchange: trunk/rosapps/drivers/ramdrv/ramdrv.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/rosapps/drivers/ramdrv/ramdrv.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/rosapps/drivers/ramdrv/ramdrv.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[tkreuzer] 36831: Win32 structure cleanup (WIP): - remove DesktopHeapBase and DesktopHeapLimit from W32THREADINFO, use DESKTOPINFO members instead
by tkreuzer＠svn.reactos.org 19 Oct '08

19 Oct '08

Author: tkreuzer Date: Sun Oct 19 12:35:22 2008 New Revision: 36831 URL: http://svn.reactos.org/svn/reactos?rev=36831&view=rev Log: Win32 structure cleanup (WIP): - remove DesktopHeapBase and DesktopHeapLimit from W32THREADINFO, use DESKTOPINFO members instead Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Sun Oct 19 12:35:22 2008 @@ -64,13 +64,14 @@ static __inline PVOID DesktopPtrToUser(PVOID Ptr) { - PW32THREADINFO ti = GetW32ThreadInfo(); + GetW32ThreadInfo(); PCLIENTINFO pci = GetWin32ClientInfo(); + PDESKTOPINFO pdi = pci->pDeskInfo; ASSERT(Ptr != NULL); - ASSERT(ti != NULL); - if ((ULONG_PTR)Ptr >= (ULONG_PTR)ti->DesktopHeapBase && - (ULONG_PTR)Ptr < (ULONG_PTR)ti->DesktopHeapBase + ti->DesktopHeapLimit) + ASSERT(pdi != NULL); + if ((ULONG_PTR)Ptr >= (ULONG_PTR)pdi->pvDesktopBase && + (ULONG_PTR)Ptr < (ULONG_PTR)pdi->pvDesktopLimit) { return (PVOID)((ULONG_PTR)Ptr - pci->ulClientDelta); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Oct 19 12:35:22 2008 @@ -40,6 +40,8 @@ PVOID pvDesktopBase; PVOID pvDesktopLimit; + HANDLE hKernelHeap; + ULONG_PTR HeapLimit; HWND hTaskManWindow; HWND hProgmanWindow; HWND hShellWindow; @@ -312,8 +314,8 @@ PW32PROCESSINFO pi; /* [USER] */ PW32PROCESSINFO kpi; /* [KERNEL] */ PDESKTOPINFO Desktop; - PVOID DesktopHeapBase; - ULONG_PTR DesktopHeapLimit; +// PVOID DesktopHeapBase; +// ULONG_PTR DesktopHeapLimit; /* A mask of what hooks are currently active */ ULONG Hooks; CLIENTTHREADINFO ClientThreadInfo; @@ -351,7 +353,7 @@ DWORD dwCompatFlags; DWORD dwCompatFlags2; DWORD dwTIFlags; - PVOID pDeskInfo; + PDESKTOPINFO pDeskInfo; ULONG_PTR ulClientDelta; PHOOK phkCurrent; ULONG fsHooks; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sun Oct 19 12:35:22 2008 @@ -895,7 +895,7 @@ SIZE_T DesktopInfoSize; UNICODE_STRING SafeDesktopName; ULONG DummyContext; - ULONG_PTR HeapLimit = 4 * 1024 * 1024; /* FIXME */ + ULONG_PTR HeapSize = 4 * 1024 * 1024; /* FIXME */ DECLARE_RETURN(HDESK); @@ -983,7 +983,7 @@ DesktopObject->DesktopHeapSection = NULL; DesktopObject->pheapDesktop = UserCreateHeap(&DesktopObject->DesktopHeapSection, &DesktopHeapSystemBase, - HeapLimit); + HeapSize); if (DesktopObject->pheapDesktop == NULL) { ObDereferenceObject(DesktopObject); @@ -1009,7 +1009,7 @@ DesktopInfoSize); DesktopObject->DesktopInfo->pvDesktopBase = DesktopHeapSystemBase; - DesktopObject->DesktopInfo->pvDesktopLimit = (PVOID)HeapLimit; + DesktopObject->DesktopInfo->pvDesktopLimit = (PVOID)((ULONG_PTR)DesktopHeapSystemBase + HeapSize); RtlCopyMemory(DesktopObject->DesktopInfo->szDesktopName, lpszDesktopName->Buffer, lpszDesktopName->Length); @@ -1771,8 +1771,6 @@ if (ti->Desktop == DesktopObject->DesktopInfo) { ti->Desktop = NULL; - ti->DesktopHeapBase = NULL; - ti->DesktopHeapLimit = 0; } } GetWin32ClientInfo()->ulClientDelta = 0; @@ -1853,8 +1851,6 @@ if (ti->Desktop == NULL) { ti->Desktop = DesktopObject->DesktopInfo; - ti->DesktopHeapBase = DesktopObject->pheapDesktop; - ti->DesktopHeapLimit = ViewSize; } } GetWin32ClientInfo()->ulClientDelta = DesktopHeapGetUserDelta(); @@ -1910,7 +1906,12 @@ /* Hack for system threads */ if (NtCurrentTeb()) { - GetWin32ClientInfo()->ulClientDelta = DesktopHeapGetUserDelta(); + PCLIENTINFO pci = GetWin32ClientInfo(); + pci->ulClientDelta = DesktopHeapGetUserDelta(); + if (DesktopObject) + { + pci->pDeskInfo = (PVOID)((ULONG_PTR)DesktopObject->DesktopInfo - pci->ulClientDelta); + } } if (OldDesktop != NULL && Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Sun Oct 19 12:35:22 2008 @@ -462,14 +462,10 @@ if (W32Thread->Desktop != NULL) { ti->Desktop = W32Thread->Desktop->DesktopInfo; - ti->DesktopHeapBase = W32Thread->Desktop->DesktopInfo->pvDesktopBase; - ti->DesktopHeapLimit = (ULONG_PTR)W32Thread->Desktop->DesktopInfo->pvDesktopLimit; } else { ti->Desktop = NULL; - ti->DesktopHeapBase = NULL; - ti->DesktopHeapLimit = 0; } W32Thread->ThreadInfo = ti;

1 0

[fireball] 36830: - VFAT fixes: Actually perform a mandatory call to CcPurgeCacheSection during file deletion (fixes real NT5 cache manager attempts to write section of a deleted file). - VFAT fixes: When querying FileStandardInformation, NT's fastfat driver sets NumberOfLinks to 1, ours sets it to 0 somewhy. Change to 1 for compatibility. - A couple of debug prints improvements in VFAT. - Comment out UNIMPLEMENTED in CcPurgeCacheSection to prevent debug messages flood.
by fireball＠svn.reactos.org 19 Oct '08

19 Oct '08

Author: fireball Date: Sun Oct 19 08:23:00 2008 New Revision: 36830 URL: http://svn.reactos.org/svn/reactos?rev=36830&view=rev Log: - VFAT fixes: Actually perform a mandatory call to CcPurgeCacheSection during file deletion (fixes real NT5 cache manager attempts to write section of a deleted file). - VFAT fixes: When querying FileStandardInformation, NT's fastfat driver sets NumberOfLinks to 1, ours sets it to 0 somewhy. Change to 1 for compatibility. - A couple of debug prints improvements in VFAT. - Comment out UNIMPLEMENTED in CcPurgeCacheSection to prevent debug messages flood. Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/ntoskrnl/cc/fs.c Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] Sun Oct 19 08:23:00 2008 @@ -82,12 +82,7 @@ ObDereferenceObject(tmpFileObject); } -#if 0 - /* FIXME: - * CcPurgeCacheSection is unimplemented. - */ CcPurgeCacheSection(FileObject->SectionObjectPointer, NULL, 0, FALSE); -#endif } /* Uninitialize file cache if. */ if (FileObject->SectionObjectPointer->SharedCacheMap) Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sun Oct 19 08:23:00 2008 @@ -91,7 +91,7 @@ StandardInfo->EndOfFile = FCB->RFCB.FileSize; StandardInfo->Directory = FALSE; } - StandardInfo->NumberOfLinks = 0; + StandardInfo->NumberOfLinks = 1; StandardInfo->DeletePending = FCB->Flags & FCB_DELETE_PENDING ? TRUE : FALSE; *BufferLength -= sizeof(FILE_STANDARD_INFORMATION); @@ -271,7 +271,7 @@ PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; #endif - DPRINT ("FsdSetDispositionInformation()\n"); + DPRINT ("FsdSetDispositionInformation(<%wZ>, Delete %d)\n", &FCB->PathNameU, DispositionInfo->DeleteFile); ASSERT(DeviceExt != NULL); ASSERT(DeviceExt->FatInfo.BytesPerCluster != 0); @@ -551,7 +551,8 @@ ULONG NCluster; BOOLEAN AllocSizeChanged = FALSE; - DPRINT("VfatSetAllocationSizeInformation()\n"); + DPRINT("VfatSetAllocationSizeInformation(File <%wZ>, AllocationSize %d %d)\n", &Fcb->PathNameU, + AllocationSize->HighPart, AllocationSize->LowPart); if (Fcb->Flags & FCB_IS_FATX_ENTRY) OldSize = Fcb->entry.FatX.FileSize; Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=36830… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Sun Oct 19 08:23:00 2008 @@ -120,7 +120,7 @@ IN BOOLEAN UninitializeCacheMaps ) { - UNIMPLEMENTED; + //UNIMPLEMENTED; return FALSE; }

1 0

[ekohl] 36829: Sync to wine-0.9.60: - Rob Shearman <rob@codeweavers.com> Wed, 26 Mar 2008 widl: Support using context handles as the binding handle in client functions. - Rob Shearman <rob@codeweavers.com> Thu, 27 Mar 2008 widl: Use is_string_type for detecting strings in write_typeformatstring_var to make it consistent with write_remoting_arg. - Rob Shearman <rob@codeweavers.com> Thu, 27 Mar 2008 widl: Add support for generic binding handles. - Rob Shearman <rob@codeweavers.com> Thu, 27 Mar 200
by ekohl＠svn.reactos.org 19 Oct '08

19 Oct '08

Author: ekohl Date: Sun Oct 19 07:30:41 2008 New Revision: 36829 URL: http://svn.reactos.org/svn/reactos?rev=36829&view=rev Log: Sync to wine-0.9.60: - Rob Shearman <rob(a)codeweavers.com> Wed, 26 Mar 2008 widl: Support using context handles as the binding handle in client functions. - Rob Shearman <rob(a)codeweavers.com> Thu, 27 Mar 2008 widl: Use is_string_type for detecting strings in write_typeformatstring_var to make it consistent with write_remoting_arg. - Rob Shearman <rob(a)codeweavers.com> Thu, 27 Mar 2008 widl: Add support for generic binding handles. - Rob Shearman <rob(a)codeweavers.com> Thu, 27 Mar 2008 widl: Fix detection of non-pointer context handles. - Rob Shearman <rob(a)codeweavers.com> Thu, 27 Mar 2008 widl: Make sure that string types are always written out by write_string_tfs and not write_simple_pointer. - Rob Shearman <rob(a)codeweavers.com> Mon, 31 Mar 2008 widl: Parse typedefs of function pointers. - Rob Shearman <rob(a)codeweavers.com> Tue, 1 Apr 2008 widl: Be more strict about where semicolons can appear in IDL files. - Rob Shearman <rob(a)codeweavers.com> Wed, 2 Apr 2008 widl: Add a function to get the return type of a parsed function. - Rob Shearman <rob(a)codeweavers.com> Wed, 2 Apr 2008 widl: Store function and function pointer types completely within type_t type. - Rob Shearman <rob(a)codeweavers.com> Wed, 2 Apr 2008 widl: Support parsing calling conventions for function identifiers. - Rob Shearman <rob(a)codeweavers.com> Wed, 2 Apr 2008 widl: Support __fastcall and __pascal calling conventions. - Rob Shearman <rob(a)codeweavers.com> Wed, 2 Apr 2008 widl: Add a newline between function prototypes for non-object interfaces. - Rob Shearman <rob(a)codeweavers.com> Wed, 2 Apr 2008 widl: Fix the writing out of function pointers with more than one level of indirection. - Rob Shearman <rob(a)codeweavers.com> Wed, 2 Apr 2008 widl: Turn on verbose errors, which gives a little more information in the case of a syntax error. - Dan Hipschman <dsh(a)linux.ucla.edu> Thu, 3 Apr 2008 widl: Fix a mistake in an ordered list (keywords). Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/header.h trunk/reactos/tools/widl/parser.h trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typegen.h trunk/reactos/tools/widl/widl.c trunk/reactos/tools/widl/widl_ros.diff trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=36… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=36… Modified: trunk/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.h?rev=36… Modified: trunk/reactos/tools/widl/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.h?rev=36… Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=36… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=36… Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=368… Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=36… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… Modified: trunk/reactos/tools/widl/typegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.h?rev=3… Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=3682… Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re…

1 0

[sginsberg] 36828: - Revert 36827
by sginsberg＠svn.reactos.org 19 Oct '08

19 Oct '08

Author: sginsberg Date: Sun Oct 19 06:47:27 2008 New Revision: 36828 URL: http://svn.reactos.org/svn/reactos?rev=36828&view=rev Log: - Revert 36827 Modified: trunk/rostests/winetests/advapi32/security.c Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Sun Oct 19 06:47:27 2008 @@ -2558,9 +2558,6 @@ init(); if (!hmod) return; - /* temp temp -- will be removed in next commit */ - return; - if (myARGC >= 3) { test_process_security_child();

1 0

[sginsberg] 36827: - Temporarily (for one revision) disable Winetest's advapi32 security test to see how far build server survives -- will be reverted in next commit
by sginsberg＠svn.reactos.org 19 Oct '08

19 Oct '08

Author: sginsberg Date: Sun Oct 19 06:40:48 2008 New Revision: 36827 URL: http://svn.reactos.org/svn/reactos?rev=36827&view=rev Log: - Temporarily (for one revision) disable Winetest's advapi32 security test to see how far build server survives -- will be reverted in next commit Modified: trunk/rostests/winetests/advapi32/security.c Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Sun Oct 19 06:40:48 2008 @@ -2558,6 +2558,9 @@ init(); if (!hmod) return; + /* temp temp -- will be removed in next commit */ + return; + if (myARGC >= 3) { test_process_security_child();

1 0

[jimtabor] 36826: - Thanks Tommy! Cleanup millimeter conversion.
by jimtabor＠svn.reactos.org 19 Oct '08

19 Oct '08

Author: jimtabor Date: Sat Oct 18 23:52:48 2008 New Revision: 36826 URL: http://svn.reactos.org/svn/reactos?rev=36826&view=rev Log: - Thanks Tommy! Cleanup millimeter conversion. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Sat Oct 18 23:52:48 2008 @@ -1821,8 +1821,8 @@ pDevCaps->ulVersion = pGdiInfo->ulVersion; pDevCaps->ulTechnology = pGdiInfo->ulTechnology; - pDevCaps->ulHorzSizeM = (pGdiInfo->ulHorzSize + 500) / 0x3E8u; - pDevCaps->ulVertSizeM = (pGdiInfo->ulVertSize + 500) / 0x3E8u; + pDevCaps->ulHorzSizeM = (pGdiInfo->ulHorzSize + 500) / 1000; + pDevCaps->ulVertSizeM = (pGdiInfo->ulVertSize + 500) / 1000; pDevCaps->ulHorzSize = pGdiInfo->ulHorzSize; pDevCaps->ulVertSize = pGdiInfo->ulVertSize; pDevCaps->ulHorzRes = pGdiInfo->ulHorzRes;

1 0

[jimtabor] 36825: - Add missing CAPS to psdk. - Implemented NtGdiGetDeviceCapsAll. - Now support primary display device capabilities in shared gdi handle table.
by jimtabor＠svn.reactos.org 19 Oct '08

19 Oct '08

Author: jimtabor Date: Sat Oct 18 23:47:04 2008 New Revision: 36825 URL: http://svn.reactos.org/svn/reactos?rev=36825&view=rev Log: - Add missing CAPS to psdk. - Implemented NtGdiGetDeviceCapsAll. - Now support primary display device capabilities in shared gdi handle table. Modified: trunk/reactos/include/psdk/wingdi.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sat Oct 18 23:47:04 2008 @@ -744,6 +744,10 @@ #define TC_VA_ABLE 16384 #define TC_RESERVED 32768 #define TC_SCROLLBLT 65536 +/* CLIPCAPS */ +#define CP_NONE 0 +#define CP_RECTANGLE 1 +#define CP_REGION 2 #define GCP_DBCS 1 #define GCP_ERROR 0x8000 #define GCP_CLASSIN 0x80000 @@ -863,6 +867,20 @@ #define TCI_SRCCHARSET 1 #define TCI_SRCCODEPAGE 2 #define TCI_SRCFONTSIG 3 +#if (_WIN32_WINNT >= 0x0500) +/* SHADEBLENDCAPS */ +#define SB_NONE 0x00000000 +#define SB_CONST_ALPHA 0x00000001 +#define SB_PIXEL_ALPHA 0x00000002 +#define SB_PREMULT_ALPHA 0x00000004 +#define SB_GRAD_RECT 0x00000010 +#define SB_GRAD_TRI 0x00000020 +/* Color Management caps */ +#define CM_NONE 0x00000000 +#define CM_DEVICE_ICM 0x00000001 +#define CM_GAMMA_RAMP 0x00000002 +#define CM_CMYK_COLOR 0x00000004 +#endif #define ICM_ON 2 #define ICM_OFF 1 #define ICM_QUERY 3 Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Sat Oct 18 23:47:04 2008 @@ -267,6 +267,7 @@ VOID FASTCALL IntGdiUnreferencePdev(PGDIDEVICE pPDev, DWORD CleanUpType); HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC); +VOID FASTCALL IntvGetDeviceCaps(PGDIDEVICE, PDEVCAPS); extern PGDIDEVICE pPrimarySurface; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Sat Oct 18 23:47:04 2008 @@ -686,6 +686,9 @@ EngUnlockSurface(SurfObj); co_IntShowDesktop(IntGetActiveDesktop(), SurfSize.cx, SurfSize.cy); + + // Init Primary Displays Device Capabilities. + IntvGetDeviceCaps(&PrimarySurface, &GdiHandleTable->DevCaps); if (!calledFromUser){ UserLeave(); @@ -1769,6 +1772,162 @@ return ret; } +INT +FASTCALL +IntcFonts(PGDIDEVICE pDevObj) +{ + ULONG_PTR Junk; +// Msdn DrvQueryFont: +// If the number of fonts in DEVINFO is -1 and iFace is zero, the driver +// should return the number of fonts it supports. + if ( pDevObj->DevInfo.cFonts == -1) + { + if (pDevObj->DriverFunctions.QueryFont) + pDevObj->DevInfo.cFonts = + (ULONG)pDevObj->DriverFunctions.QueryFont(pDevObj->hPDev, 0, 0, &Junk); + else + pDevObj->DevInfo.cFonts = 0; + } + return pDevObj->DevInfo.cFonts; +} + +INT +FASTCALL +IntGetColorManagementCaps(PGDIDEVICE pDevObj) +{ + INT ret = CM_NONE; + + if ( pDevObj->flFlags & PDEV_DISPLAY) + { + if ( pDevObj->DevInfo.iDitherFormat == BMF_8BPP || + pDevObj->DevInfo.flGraphicsCaps2 & GCAPS2_CHANGEGAMMARAMP) + ret = CM_GAMMA_RAMP; + } + if (pDevObj->DevInfo.flGraphicsCaps & GCAPS_CMYKCOLOR) + ret |= CM_CMYK_COLOR; + if (pDevObj->DevInfo.flGraphicsCaps & GCAPS_ICM) + ret |= CM_DEVICE_ICM; + return ret; +} + +VOID +FASTCALL +IntvGetDeviceCaps( + PGDIDEVICE pDevObj, + PDEVCAPS pDevCaps) +{ + ULONG Tmp = 0; + PGDIINFO pGdiInfo = &pDevObj->GDIInfo; + + pDevCaps->ulVersion = pGdiInfo->ulVersion; + pDevCaps->ulTechnology = pGdiInfo->ulTechnology; + pDevCaps->ulHorzSizeM = (pGdiInfo->ulHorzSize + 500) / 0x3E8u; + pDevCaps->ulVertSizeM = (pGdiInfo->ulVertSize + 500) / 0x3E8u; + pDevCaps->ulHorzSize = pGdiInfo->ulHorzSize; + pDevCaps->ulVertSize = pGdiInfo->ulVertSize; + pDevCaps->ulHorzRes = pGdiInfo->ulHorzRes; + pDevCaps->ulVertRes = pGdiInfo->ulVertRes; + pDevCaps->ulVRefresh = pGdiInfo->ulVRefresh; + pDevCaps->ulDesktopHorzRes = pGdiInfo->ulHorzRes; + pDevCaps->ulDesktopVertRes = pGdiInfo->ulVertRes; + pDevCaps->ulBltAlignment = pGdiInfo->ulBltAlignment; + pDevCaps->ulPlanes = pGdiInfo->cPlanes; + + pDevCaps->ulBitsPixel = pGdiInfo->cBitsPixel; + if (pGdiInfo->cBitsPixel == 15) pDevCaps->ulBitsPixel = 16; + + Tmp = pGdiInfo->ulNumColors; + if ( Tmp != -1 ) Tmp *= 5; + pDevCaps->ulNumPens = Tmp; + pDevCaps->ulNumColors = pGdiInfo->ulNumColors; + + pDevCaps->ulNumFonts = IntcFonts(pDevObj); + + pDevCaps->ulRasterCaps = pGdiInfo->flRaster; + pDevCaps->ulShadeBlend = pGdiInfo->flShadeBlend; + pDevCaps->ulAspectX = pGdiInfo->ulAspectX; + pDevCaps->ulAspectY = pGdiInfo->ulAspectY; + pDevCaps->ulAspectXY = pGdiInfo->ulAspectXY; + pDevCaps->ulLogPixelsX = pGdiInfo->ulLogPixelsX; + pDevCaps->ulLogPixelsY = pGdiInfo->ulLogPixelsY; + pDevCaps->ulSizePalette = pGdiInfo->ulNumPalReg; + pDevCaps->ulColorRes = pGdiInfo->ulDACRed + pGdiInfo->ulDACGreen + pGdiInfo->ulDACBlue; + pDevCaps->ulPhysicalWidth = pGdiInfo->szlPhysSize.cx; + pDevCaps->ulPhysicalHeight = pGdiInfo->szlPhysSize.cy; + pDevCaps->ulPhysicalOffsetX = pGdiInfo->ptlPhysOffset.x; + pDevCaps->ulPhysicalOffsetY = pGdiInfo->ptlPhysOffset.y; + + Tmp = 0; + Tmp = pGdiInfo->flTextCaps | (TC_SO_ABLE|TC_UA_ABLE|TC_CP_STROKE|TC_OP_STROKE|TC_OP_CHARACTER); + + pDevCaps->ulTextCaps = pGdiInfo->flTextCaps | (TC_SO_ABLE|TC_UA_ABLE|TC_CP_STROKE|TC_OP_STROKE|TC_OP_CHARACTER); + + if (pGdiInfo->ulTechnology) + pDevCaps->ulTextCaps = Tmp | TC_VA_ABLE; + + pDevCaps->ulColorMgmtCaps = IntGetColorManagementCaps(pDevObj); + + return; +} + + /* + * @implemented + */ +BOOL +APIENTRY +NtGdiGetDeviceCapsAll ( + IN HDC hDC, + OUT PDEVCAPS pDevCaps) +{ + PDC dc; + PDEVCAPS pSafeDevCaps; + NTSTATUS Status = STATUS_SUCCESS; + + dc = DC_LockDc(hDC); + if (dc == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + pSafeDevCaps = ExAllocatePoolWithTag(PagedPool, sizeof(DEVCAPS), TAG_DC); + + if (!pSafeDevCaps) + { + DC_UnlockDc(dc); + return FALSE; + } + + IntvGetDeviceCaps(dc->pPDev, pSafeDevCaps); + + _SEH_TRY + { + ProbeForWrite(pDevCaps, + sizeof(DEVCAPS), + 1); + RtlCopyMemory(pDevCaps, pSafeDevCaps, sizeof(DEVCAPS)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + ExFreePoolWithTag(pSafeDevCaps, TAG_DC); + DC_UnlockDc(dc); + return FALSE; + } + + ExFreePoolWithTag(pSafeDevCaps, TAG_DC); + DC_UnlockDc( dc ); + return TRUE; +} + + + BOOL APIENTRY NtGdiResetDC( Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sat Oct 18 23:47:04 2008 @@ -1972,19 +1972,6 @@ */ BOOL APIENTRY -NtGdiGetDeviceCapsAll ( - IN HDC hdc, - OUT PDEVCAPS pDevCaps) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY NtGdiGetETM( IN HDC hdc, OUT EXTTEXTMETRIC *petm)

1 0

[tkreuzer] 36824: Win32 structure cleanup (WIP): - replace hKernelHeap and HeapLimit from DESKTOPINFO with pvDesktopBase and pvDesktopLimit- replace hDesktopHeap with pheapDesktop in DESKTOP - use PWIN32HEAP for the heap handle and use this and only this as the handle. - Use the real base address for pvDesktopBase, instead of a copy of the heap handle
by tkreuzer＠svn.reactos.org 19 Oct '08

19 Oct '08

Author: tkreuzer Date: Sat Oct 18 21:05:41 2008 New Revision: 36824 URL: http://svn.reactos.org/svn/reactos?rev=36824&view=rev Log: Win32 structure cleanup (WIP): - replace hKernelHeap and HeapLimit from DESKTOPINFO with pvDesktopBase and pvDesktopLimit- replace hDesktopHeap with pheapDesktop in DESKTOP - use PWIN32HEAP for the heap handle and use this and only this as the handle. - Use the real base address for pvDesktopBase, instead of a copy of the heap handle Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/misc/usrheap.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/w32k.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Oct 18 21:05:41 2008 @@ -40,8 +40,6 @@ PVOID pvDesktopBase; PVOID pvDesktopLimit; - HANDLE hKernelHeap; - ULONG_PTR HeapLimit; HWND hTaskManWindow; HWND hProgmanWindow; HWND hShellWindow; Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Sat Oct 18 21:05:41 2008 @@ -25,7 +25,7 @@ LIST_ENTRY ShellHookWindows; - HANDLE hDesktopHeap; + PWIN32HEAP pheapDesktop; PSECTION_OBJECT DesktopHeapSection; PDESKTOPINFO DesktopInfo; } DESKTOP, *PDESKTOP; @@ -139,7 +139,7 @@ DesktopHeapAlloc(IN PDESKTOP Desktop, IN SIZE_T Bytes) { - return RtlAllocateHeap(Desktop->DesktopInfo->hKernelHeap, + return RtlAllocateHeap(Desktop->pheapDesktop, HEAP_NO_SERIALIZE, Bytes); } @@ -148,7 +148,7 @@ DesktopHeapFree(IN PDESKTOP Desktop, IN PVOID lpMem) { - return RtlFreeHeap(Desktop->DesktopInfo->hKernelHeap, + return RtlFreeHeap(Desktop->pheapDesktop, HEAP_NO_SERIALIZE, lpMem); } @@ -160,7 +160,7 @@ { #if 0 /* NOTE: ntoskrnl doesn't export RtlReAllocateHeap... */ - return RtlReAllocateHeap(Desktop->DesktopInfo->hKernelHeap, + return RtlReAllocateHeap(Desktop->pheapDesktop, HEAP_NO_SERIALIZE, lpMem, Bytes); @@ -168,14 +168,14 @@ SIZE_T PrevSize; PVOID pNew; - PrevSize = RtlSizeHeap(Desktop->DesktopInfo->hKernelHeap, + PrevSize = RtlSizeHeap(Desktop->pheapDesktop, HEAP_NO_SERIALIZE, lpMem); if (PrevSize == Bytes) return lpMem; - pNew = RtlAllocateHeap(Desktop->DesktopInfo->hKernelHeap, + pNew = RtlAllocateHeap(Desktop->pheapDesktop, HEAP_NO_SERIALIZE, Bytes); if (pNew != NULL) @@ -187,7 +187,7 @@ lpMem, Bytes); - RtlFreeHeap(Desktop->DesktopInfo->hKernelHeap, + RtlFreeHeap(Desktop->pheapDesktop, HEAP_NO_SERIALIZE, lpMem); } @@ -202,20 +202,20 @@ PW32HEAP_USER_MAPPING Mapping; PTHREADINFO pti; PW32PROCESS W32Process; - HANDLE hDesktopHeap; + PWIN32HEAP pheapDesktop; ULONG_PTR Delta = 0; pti = PsGetCurrentThreadWin32Thread(); if (!pti->Desktop) return 0; - hDesktopHeap = pti->Desktop->hDesktopHeap; + pheapDesktop = pti->Desktop->pheapDesktop; W32Process = PsGetCurrentProcessWin32Process(); Mapping = W32Process->HeapMappings.Next; while (Mapping != NULL) { - if (Mapping->KernelMapping == (PVOID)hDesktopHeap) + if (Mapping->KernelMapping == (PVOID)pheapDesktop) { Delta = (ULONG_PTR)Mapping->KernelMapping - (ULONG_PTR)Mapping->UserMapping; break; Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sat Oct 18 21:05:41 2008 @@ -1,5 +1,7 @@ #ifndef __INCLUDE_NAPI_WIN32_H #define __INCLUDE_NAPI_WIN32_H + +typedef struct _WIN32HEAP WIN32HEAP, *PWIN32HEAP; #include <pshpack1.h> Modified: trunk/reactos/subsystems/win32/win32k/misc/usrheap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/usrheap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/usrheap.c [iso-8859-1] Sat Oct 18 21:05:41 2008 @@ -102,7 +102,7 @@ return Status; } -static HANDLE +static PWIN32HEAP IntUserHeapCreate(IN PSECTION_OBJECT SectionObject, IN PVOID *SystemMappedBase, IN ULONG HeapSize) @@ -111,7 +111,7 @@ LARGE_INTEGER Offset; SIZE_T ViewSize = PAGE_SIZE; RTL_HEAP_PARAMETERS Parameters = {0}; - HANDLE hHeap; + PVOID pHeap; NTSTATUS Status; Offset.QuadPart = 0; @@ -150,23 +150,23 @@ Parameters.InitialReserve = (SIZE_T)HeapSize; Parameters.CommitRoutine = IntUserHeapCommitRoutine; - hHeap = RtlCreateHeap(HEAP_ZERO_MEMORY | HEAP_NO_SERIALIZE, + pHeap = RtlCreateHeap(HEAP_ZERO_MEMORY | HEAP_NO_SERIALIZE, *SystemMappedBase, (SIZE_T)HeapSize, ViewSize, NULL, &Parameters); - return hHeap; + return pHeap; } -HANDLE +PWIN32HEAP UserCreateHeap(OUT PSECTION_OBJECT *SectionObject, IN OUT PVOID *SystemBase, IN SIZE_T HeapSize) { LARGE_INTEGER SizeHeap; - HANDLE hHeap = NULL; + PWIN32HEAP pHeap = NULL; NTSTATUS Status; SizeHeap.QuadPart = HeapSize; @@ -200,11 +200,11 @@ } /* create the heap */ - hHeap = IntUserHeapCreate(*SectionObject, + pHeap = IntUserHeapCreate(*SectionObject, SystemBase, HeapSize); - if (hHeap == NULL) + if (pHeap == NULL) { ObDereferenceObject(*SectionObject); *SectionObject = NULL; @@ -212,5 +212,5 @@ SetLastNtError(STATUS_UNSUCCESSFUL); } - return hHeap; + return pHeap; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sat Oct 18 21:05:41 2008 @@ -981,10 +981,10 @@ if (!NT_SUCCESS(Status)) RETURN(NULL); DesktopObject->DesktopHeapSection = NULL; - DesktopObject->hDesktopHeap = UserCreateHeap(&DesktopObject->DesktopHeapSection, + DesktopObject->pheapDesktop = UserCreateHeap(&DesktopObject->DesktopHeapSection, &DesktopHeapSystemBase, HeapLimit); - if (DesktopObject->hDesktopHeap == NULL) + if (DesktopObject->pheapDesktop == NULL) { ObDereferenceObject(DesktopObject); DPRINT1("Failed to create desktop heap!\n"); @@ -994,7 +994,7 @@ DesktopInfoSize = FIELD_OFFSET(DESKTOPINFO, szDesktopName[(lpszDesktopName->Length / sizeof(WCHAR)) + 1]); - DesktopObject->DesktopInfo = RtlAllocateHeap(DesktopObject->hDesktopHeap, + DesktopObject->DesktopInfo = RtlAllocateHeap(DesktopObject->pheapDesktop, HEAP_NO_SERIALIZE, DesktopInfoSize); @@ -1008,8 +1008,8 @@ RtlZeroMemory(DesktopObject->DesktopInfo, DesktopInfoSize); - DesktopObject->DesktopInfo->hKernelHeap = DesktopObject->hDesktopHeap; - DesktopObject->DesktopInfo->HeapLimit = HeapLimit; + DesktopObject->DesktopInfo->pvDesktopBase = DesktopHeapSystemBase; + DesktopObject->DesktopInfo->pvDesktopLimit = (PVOID)HeapLimit; RtlCopyMemory(DesktopObject->DesktopInfo->szDesktopName, lpszDesktopName->Buffer, lpszDesktopName->Length); @@ -1745,7 +1745,7 @@ HeapMapping = *PrevLink; while (HeapMapping != NULL) { - if (HeapMapping->KernelMapping == (PVOID)DesktopObject->hDesktopHeap) + if (HeapMapping->KernelMapping == (PVOID)DesktopObject->pheapDesktop) { if (--HeapMapping->Count == 0) { @@ -1798,7 +1798,7 @@ HeapMapping = *PrevLink; while (HeapMapping != NULL) { - if (HeapMapping->KernelMapping == (PVOID)DesktopObject->hDesktopHeap) + if (HeapMapping->KernelMapping == (PVOID)DesktopObject->pheapDesktop) { HeapMapping->Count++; return STATUS_SUCCESS; @@ -1809,7 +1809,7 @@ } /* we're the first, map the heap */ - DPRINT("Noone mapped the desktop heap %p yet, so - map it!\n", DesktopObject->hDesktopHeap); + DPRINT("Noone mapped the desktop heap %p yet, so - map it!\n", DesktopObject->pheapDesktop); Offset.QuadPart = 0; Status = MmMapViewOfSection(DesktopObject->DesktopHeapSection, PsGetCurrentProcess(), @@ -1838,7 +1838,7 @@ } HeapMapping->Next = NULL; - HeapMapping->KernelMapping = (PVOID)DesktopObject->hDesktopHeap; + HeapMapping->KernelMapping = (PVOID)DesktopObject->pheapDesktop; HeapMapping->UserMapping = UserBase; HeapMapping->Limit = ViewSize; HeapMapping->Count = 1; @@ -1853,7 +1853,7 @@ if (ti->Desktop == NULL) { ti->Desktop = DesktopObject->DesktopInfo; - ti->DesktopHeapBase = DesktopObject->hDesktopHeap; + ti->DesktopHeapBase = DesktopObject->pheapDesktop; ti->DesktopHeapLimit = ViewSize; } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Sat Oct 18 21:05:41 2008 @@ -462,8 +462,8 @@ if (W32Thread->Desktop != NULL) { ti->Desktop = W32Thread->Desktop->DesktopInfo; - ti->DesktopHeapBase = W32Thread->Desktop->DesktopInfo->hKernelHeap; - ti->DesktopHeapLimit = W32Thread->Desktop->DesktopInfo->HeapLimit; + ti->DesktopHeapBase = W32Thread->Desktop->DesktopInfo->pvDesktopBase; + ti->DesktopHeapLimit = (ULONG_PTR)W32Thread->Desktop->DesktopInfo->pvDesktopLimit; } else { Modified: trunk/reactos/subsystems/win32/win32k/w32k.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32k.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32k.h [iso-8859-1] Sat Oct 18 21:05:41 2008 @@ -71,7 +71,7 @@ /* User heap */ extern HANDLE GlobalUserHeap; -HANDLE +PWIN32HEAP UserCreateHeap(OUT PSECTION_OBJECT *SectionObject, IN OUT PVOID *SystemBase, IN SIZE_T HeapSize);

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