Author: fireball Date: Tue Dec 1 22:36:23 2009 New Revision: 44350
URL: http://svn.reactos.org/svn/reactos?rev=44350&view=rev Log: - Merge 44348 and 44349 to 0.3.11 branch.
Modified: branches/ros-branch-0_3_11/reactos/ (props changed) branches/ros-branch-0_3_11/reactos/dll/directx/d3d8/d3d8.spec (props changed) branches/ros-branch-0_3_11/reactos/dll/directx/dsound_new/classfactory.c (props changed) branches/ros-branch-0_3_11/reactos/dll/directx/dsound_new/dsound.spec (props changed) branches/ros-branch-0_3_11/reactos/dll/directx/dsound_new/regsvr.c (props changed) branches/ros-branch-0_3_11/reactos/dll/shellext/devcpux/devcpux.spec (props changed) branches/ros-branch-0_3_11/reactos/dll/shellext/slayer/slayer.spec (props changed) branches/ros-branch-0_3_11/reactos/include/ndk/amd64/ (props changed) branches/ros-branch-0_3_11/reactos/include/ndk/amd64/asmmacro.S (props changed) branches/ros-branch-0_3_11/reactos/lib/sdk/crt/time/ (props changed) branches/ros-branch-0_3_11/reactos/ntoskrnl/cc/fs.c branches/ros-branch-0_3_11/reactos/ntoskrnl/se/semgr.c branches/ros-branch-0_3_11/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) branches/ros-branch-0_3_11/reactos/tools/rsym/log2lines.c (props changed) branches/ros-branch-0_3_11/reactos/tools/rsym/log2lines.mak (props changed) branches/ros-branch-0_3_11/reactos/tools/rsym/rsym.c (props changed) branches/ros-branch-0_3_11/reactos/tools/rsym/rsym.h (props changed) branches/ros-branch-0_3_11/reactos/tools/rsym/rsym.mak (props changed) branches/ros-branch-0_3_11/reactos/tools/rsym/rsym_common.c (props changed)
Propchange: branches/ros-branch-0_3_11/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/trunk/reactos:44301 +/trunk/reactos:44301,44348-44349
Propchange: branches/ros-branch-0_3_11/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec:36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/directx/d3d8/d3d8.spec:44301 +/trunk/reactos/dll/directx/d3d8/d3d8.spec:44301,44348-44349
Propchange: branches/ros-branch-0_3_11/reactos/dll/directx/dsound_new/classfactory.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/win32/netshell/classfactory.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/trunk/reactos/dll/directx/dsound_new/classfactory.c:44301 +/trunk/reactos/dll/directx/dsound_new/classfactory.c:44301,44348-44349
Propchange: branches/ros-branch-0_3_11/reactos/dll/directx/dsound_new/dsound.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound.spec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/trunk/reactos/dll/directx/dsound_new/dsound.spec:44301 +/trunk/reactos/dll/directx/dsound_new/dsound.spec:44301,44348-44349
Propchange: branches/ros-branch-0_3_11/reactos/dll/directx/dsound_new/regsvr.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound/regsvr.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/trunk/reactos/dll/directx/dsound_new/regsvr.c:44301 +/trunk/reactos/dll/directx/dsound_new/regsvr.c:44301,44348-44349
Propchange: branches/ros-branch-0_3_11/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec:38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/shellext/devcpux/devcpux.spec:44301 +/trunk/reactos/dll/shellext/devcpux/devcpux.spec:44301,44348-44349
Propchange: branches/ros-branch-0_3_11/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec:38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/shellext/slayer/slayer.spec:44301 +/trunk/reactos/dll/shellext/slayer/slayer.spec:44301,44348-44349
Propchange: branches/ros-branch-0_3_11/reactos/include/ndk/amd64/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/ndk/amd64:34925,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35739,35823,35952,35966,36360,37323,37434,37472,37475,37536,37820-37821,37869,37990,38013-38014,43426,43454 -/trunk/reactos/include/ndk/amd64:44301 +/trunk/reactos/include/ndk/amd64:44301,44348-44349
Propchange: branches/ros-branch-0_3_11/reactos/include/ndk/amd64/asmmacro.S ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S:37475,37536,37820-37821,37869,37990,38013-38014,43426,43454 -/trunk/reactos/include/ndk/amd64/asmmacro.S:44301 +/trunk/reactos/include/ndk/amd64/asmmacro.S:44301,44348-44349
Propchange: branches/ros-branch-0_3_11/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,4 +1,4 @@ /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:38268,41028 /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414 -/trunk/reactos/lib/sdk/crt/time:44301 +/trunk/reactos/lib/sdk/crt/time:44301,44348-44349 /trunk/reactos/lib/sdk/crt/time_new:39350-42241
Modified: branches/ros-branch-0_3_11/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/ntoskr... ============================================================================== --- branches/ros-branch-0_3_11/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Tue Dec 1 22:36:23 2009 @@ -166,7 +166,8 @@ { current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); current_entry = current_entry->Flink; - if (current->FileOffset > FileSizes->AllocationSize.QuadPart) + if (current->FileOffset > FileSizes->AllocationSize.QuadPart || + (current->FileOffset == 0 && FileSizes->AllocationSize.QuadPart == 0)) { if (current->ReferenceCount == 0 || (current->ReferenceCount == 1 && current->Dirty)) {
Modified: branches/ros-branch-0_3_11/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/ntoskr... ============================================================================== --- branches/ros-branch-0_3_11/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Tue Dec 1 22:36:23 2009 @@ -608,10 +608,12 @@ } else { - DPRINT1("Denying access for caller: granted 0x%lx, desired 0x%lx (generic mapping %p)\n", + DPRINT1("HACK: Should deny access for caller: granted 0x%lx, desired 0x%lx (generic mapping %p).\n", *GrantedAccess, DesiredAccess, GenericMapping); - *AccessStatus = STATUS_ACCESS_DENIED; - return FALSE; + //*AccessStatus = STATUS_ACCESS_DENIED; + //return FALSE; + *AccessStatus = STATUS_SUCCESS; + return TRUE; } }
Propchange: branches/ros-branch-0_3_11/reactos/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:38268,40095,41028 -/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:44301 +/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:44301,44348-44349
Propchange: branches/ros-branch-0_3_11/reactos/tools/rsym/log2lines.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.c:38268,41028 -/trunk/reactos/tools/rsym/log2lines.c:44301 +/trunk/reactos/tools/rsym/log2lines.c:44301,44348-44349
Propchange: branches/ros-branch-0_3_11/reactos/tools/rsym/log2lines.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.mak:38268,41028 -/trunk/reactos/tools/rsym/log2lines.mak:44301 +/trunk/reactos/tools/rsym/log2lines.mak:44301,44348-44349
Propchange: branches/ros-branch-0_3_11/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028 -/trunk/reactos/tools/rsym/rsym.c:44301 +/trunk/reactos/tools/rsym/rsym.c:44301,44348-44349
Propchange: branches/ros-branch-0_3_11/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028 -/trunk/reactos/tools/rsym/rsym.h:44301 +/trunk/reactos/tools/rsym/rsym.h:44301,44348-44349
Propchange: branches/ros-branch-0_3_11/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028 -/trunk/reactos/tools/rsym/rsym.mak:44301 +/trunk/reactos/tools/rsym/rsym.mak:44301,44348-44349
Propchange: branches/ros-branch-0_3_11/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 22:36:23 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028 -/trunk/reactos/tools/rsym/rsym_common.c:44301 +/trunk/reactos/tools/rsym/rsym_common.c:44301,44348-44349