Ros-diffs August 2012

ros-diffs@reactos.org

14 participants
198 discussions

[ion] 57148: [NTOSKRNL]: Fix broken way we were creating prototype PTEs, which was only supporting 256MB worth of prototype PTE area instead of 1GB. [NTOSKRNL]: Add support (macros) for subsection ...
by ion＠svn.reactos.org 24 Aug '12

24 Aug '12

Author: ion Date: Fri Aug 24 06:08:20 2012 New Revision: 57148 URL: http://svn.reactos.org/svn/reactos?rev=57148&view=rev Log: [NTOSKRNL]: Fix broken way we were creating prototype PTEs, which was only supporting 256MB worth of prototype PTE area instead of 1GB. [NTOSKRNL]: Add support (macros) for subsection PTEs. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Fri Aug 24 06:08:20 2012 @@ -266,7 +266,19 @@ // #define MiProtoPteToPte(x) \ (PMMPTE)((ULONG_PTR)MmPagedPoolStart + \ - (((x)->u.Proto.ProtoAddressHigh << 7) | (x)->u.Proto.ProtoAddressLow)) + (((x)->u.Proto.ProtoAddressHigh << 9) | (x)->u.Proto.ProtoAddressLow << 2)) + +// +// Decodes a Prototype PTE into the underlying PTE +// +#define MiSubsectionPteToSubsection(x) \ + ((x)->u.Subsect.WhichPool == PagedPool) ? \ + (PMMPTE)((ULONG_PTR)MmSubsectionBase + \ + (((x)->u.Subsect.SubsectionAddressHigh << 7) | \ + (x)->u.Subsect.SubsectionAddressLow << 3)) : \ + (PMMPTE)((ULONG_PTR)MmNonPagedPoolEnd - \ + (((x)->u.Subsect.SubsectionAddressHigh << 7) | \ + (x)->u.Subsect.SubsectionAddressLow << 3)) #endif // @@ -631,7 +643,6 @@ extern PVOID MmSystemCacheEnd; extern MMSUPPORT MmSystemCacheWs; extern SIZE_T MmAllocatedNonPagedPool; -extern ULONG_PTR MmSubsectionBase; extern ULONG MmSpecialPoolTag; extern PVOID MmHyperSpaceEnd; extern PMMWSL MmSystemCacheWorkingSetList; @@ -694,6 +705,7 @@ extern KGUARDED_MUTEX MmSectionBasedMutex; extern PVOID MmHighSectionBase; extern SIZE_T MmSystemLockPagesCount; +extern ULONG_PTR MmSubsectionBase; BOOLEAN FORCEINLINE @@ -875,15 +887,58 @@ /* * Prototype PTEs are only valid in paged pool by design, this little trick - * lets us only use 28 bits for the adress of the PTE + * lets us only use 30 bits for the adress of the PTE, as long as the area + * stays 1024MB At most. */ Offset = (ULONG_PTR)PointerPte - (ULONG_PTR)MmPagedPoolStart; - /* 7 bits go in the "low", and the other 21 bits go in the "high" */ - NewPte->u.Proto.ProtoAddressLow = Offset & 0x7F; - NewPte->u.Proto.ProtoAddressHigh = (Offset & 0xFFFFFF80) >> 7; - ASSERT(MiProtoPteToPte(NewPte) == PointerPte); -} + /* + * 7 bits go in the "low" (but we assume the bottom 2 are zero) + * and the other 21 bits go in the "high" + */ + NewPte->u.Proto.ProtoAddressLow = (Offset & 0x1FC) >> 2; + NewPte->u.Proto.ProtoAddressHigh = (Offset & 0x3FFFFE00) >> 9; +} + +// +// Builds a Subsection PTE for the address of the Segment +// +FORCEINLINE +VOID +MI_MAKE_SUBSECTION_PTE(IN PMMPTE NewPte, + IN PVOID Segment) +{ + ULONG_PTR Offset; + + /* Mark this as a prototype */ + NewPte->u.Long = 0; + NewPte->u.Subsect.Prototype = 1; + + /* + * Segments are only valid either in nonpaged pool. We store the 20 bit + * difference either from the top or bottom of nonpaged pool, giving a + * maximum of 128MB to each delta, meaning nonpaged pool cannot exceed + * 256MB. + */ + if ((ULONG_PTR)Segment < ((ULONG_PTR)MmSubsectionBase + (128 * _1MB))) + { + Offset = (ULONG_PTR)Segment - (ULONG_PTR)MmSubsectionBase; + NewPte->u.Subsect.WhichPool = PagedPool; + } + else + { + Offset = (ULONG_PTR)MmNonPagedPoolEnd - (ULONG_PTR)Segment; + NewPte->u.Subsect.WhichPool = NonPagedPool; + } + + /* + * 4 bits go in the "low" (but we assume the bottom 3 are zero) + * and the other 20 bits go in the "high" + */ + NewPte->u.Subsect.SubsectionAddressLow = (Offset & 0x78) >> 3; + NewPte->u.Subsect.SubsectionAddressHigh = (Offset & 0xFFFFF80) >> 7; +} + #endif // Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Fri Aug 24 06:08:20 2012 @@ -2004,6 +2004,11 @@ PVOID Bitmap; PPHYSICAL_MEMORY_RUN Run; PFN_NUMBER PageCount; +#if DBG + ULONG j; + PMMPTE PointerPte, TestPte; + MMPTE TempPte; +#endif /* Dump memory descriptors */ if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); @@ -2063,9 +2068,43 @@ /* Initialize session space address layout */ MiInitializeSessionSpaceLayout(); - + /* Set the based section highest address */ MmHighSectionBase = (PVOID)((ULONG_PTR)MmHighestUserAddress - 0x800000); + +#if DBG + /* The subection PTE format depends on things being 8-byte aligned */ + ASSERT((sizeof(CONTROL_AREA) % 8) == 0); + ASSERT((sizeof(SUBSECTION) % 8) == 0); + + /* Prototype PTEs are assumed to be in paged pool, so check if the math works */ + PointerPte = (PMMPTE)MmPagedPoolStart; + MI_MAKE_PROTOTYPE_PTE(&TempPte, PointerPte); + TestPte = MiProtoPteToPte(&TempPte); + ASSERT(PointerPte == TestPte); + + /* Try the last nonpaged pool address */ + PointerPte = (PMMPTE)MI_NONPAGED_POOL_END; + MI_MAKE_PROTOTYPE_PTE(&TempPte, PointerPte); + TestPte = MiProtoPteToPte(&TempPte); + ASSERT(PointerPte == TestPte); + + /* Try a bunch of random addresses near the end of the address space */ + PointerPte = (PMMPTE)0xFFFC8000; + for (j = 0; j < 20; j += 1) + { + MI_MAKE_PROTOTYPE_PTE(&TempPte, PointerPte); + TestPte = MiProtoPteToPte(&TempPte); + ASSERT(PointerPte == TestPte); + PointerPte++; + } + + /* Subsection PTEs are always in nonpaged pool, pick a random address to try */ + PointerPte = (PMMPTE)0xFFAACBB8; + MI_MAKE_SUBSECTION_PTE(&TempPte, PointerPte); + TestPte = MiSubsectionPteToSubsection(&TempPte); + ASSERT(PointerPte == TestPte); +#endif /* Loop all 8 standby lists */ for (i = 0; i < 8; i++) Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Fri Aug 24 06:08:20 2012 @@ -1742,18 +1742,15 @@ { /* Get the protection code and check if this is a proto PTE */ ProtectionCode = TempPte.u.Soft.Protection; - DPRINT1("Code: %lx\n", ProtectionCode); if (TempPte.u.Soft.Prototype) { /* Do we need to go find the real PTE? */ - DPRINT1("Soft: %lx\n", TempPte.u.Soft.PageFileHigh); if (TempPte.u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED) { /* Get the prototype pte and VAD for it */ ProtoPte = MiCheckVirtualAddress(Address, &ProtectionCode, &Vad); - DPRINT1("Address: %p ProtoP %p Code: %lx Vad: %p\n", Address, ProtoPte, ProtectionCode, Vad); if (!ProtoPte) { ASSERT(KeGetCurrentIrql() <= APC_LEVEL);

1 0

[cgutman] 57147: [AFD] - Fix a bug causing FIONREAD to return an incorrect value after a datagram receive completes when only returning a subset of the data (returns WSAEMSGSIZE)
by cgutman＠svn.reactos.org 24 Aug '12

24 Aug '12

Author: cgutman Date: Fri Aug 24 06:03:25 2012 New Revision: 57147 URL: http://svn.reactos.org/svn/reactos?rev=57147&view=rev Log: [AFD] - Fix a bug causing FIONREAD to return an incorrect value after a datagram receive completes when only returning a subset of the data (returns WSAEMSGSIZE) Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Fri Aug 24 06:03:25 2012 @@ -401,7 +401,7 @@ if (!(RecvReq->TdiFlags & TDI_RECEIVE_PEEK)) { - FCB->Recv.Content -= *TotalBytesCopied; + FCB->Recv.Content -= DatagramRecv->Len; ExFreePool( DatagramRecv->Address ); ExFreePool( DatagramRecv ); }

1 0

[ekohl] 57146: [ADVAPI32/SERVICES] Little improvements to advapi32.dll / services.exe. Patch by Hermes Belusca. See issue #7239 for more details.
by ekohl＠svn.reactos.org 23 Aug '12

23 Aug '12

Author: ekohl Date: Thu Aug 23 20:24:00 2012 New Revision: 57146 URL: http://svn.reactos.org/svn/reactos?rev=57146&view=rev Log: [ADVAPI32/SERVICES] Little improvements to advapi32.dll / services.exe. Patch by Hermes Belusca. See issue #7239 for more details. Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Thu Aug 23 20:24:00 2012 @@ -1955,7 +1955,7 @@ if (lpPassword != NULL) { - /* FIXME: Write password */ + /* FIXME: Decrypt and write password */ } done: @@ -2293,7 +2293,7 @@ if (lpPassword != NULL) { - /* FIXME: Write password */ + /* FIXME: Decrypt and write password */ } dwError = ScmCreateServiceHandle(lpService, @@ -3118,7 +3118,7 @@ LPSTR lpBinaryPathName, LPSTR lpLoadOrderGroup, LPDWORD lpdwTagId, - LPSTR lpDependencies, + LPBYTE lpDependencies, DWORD dwDependSize, LPSTR lpServiceStartName, LPBYTE lpPassword, @@ -3134,7 +3134,6 @@ LPWSTR lpCanonicalImagePathW = NULL; LPWSTR lpLoadOrderGroupW = NULL; LPWSTR lpDependenciesW = NULL; - // LPWSTR lpPasswordW = NULL; DPRINT("RChangeServiceConfigA() called\n"); DPRINT("dwServiceType = %lu\n", dwServiceType); @@ -3374,7 +3373,7 @@ { lpDependenciesW = HeapAlloc(GetProcessHeap(), 0, - (strlen(lpDependencies) + 1) * sizeof(WCHAR)); + (strlen((LPSTR)lpDependencies) + 1) * sizeof(WCHAR)); if (lpDependenciesW == NULL) { dwError = ERROR_NOT_ENOUGH_MEMORY; @@ -3383,10 +3382,10 @@ MultiByteToWideChar(CP_ACP, 0, - lpDependencies, + (LPSTR)lpDependencies, dwDependSize, lpDependenciesW, - (int)(strlen(lpDependencies) + 1)); + (int)(strlen((LPSTR)lpDependencies) + 1)); dwError = ScmWriteDependencies(hServiceKey, (LPWSTR)lpDependenciesW, @@ -3397,7 +3396,7 @@ if (lpPassword != NULL) { - /* FIXME: Write password */ + /* FIXME: Decrypt and write password */ } done: Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Thu Aug 23 20:24:00 2012 @@ -289,6 +289,8 @@ DWORD dwDependenciesLength = 0; DWORD dwLength; LPCSTR lpStr; + DWORD dwPasswordLength = 0; + LPBYTE lpEncryptedPassword = NULL; TRACE("ChangeServiceConfigA() called\n"); @@ -306,6 +308,8 @@ } /* FIXME: Encrypt the password */ + lpEncryptedPassword = (LPBYTE)lpPassword; + dwPasswordLength = (strlen(lpPassword) + 1) * sizeof(CHAR); RpcTryExcept { @@ -317,11 +321,11 @@ (LPSTR)lpBinaryPathName, (LPSTR)lpLoadOrderGroup, lpdwTagId, - (LPSTR)lpDependencies, + (LPBYTE)lpDependencies, dwDependenciesLength, (LPSTR)lpServiceStartName, - NULL, /* FIXME: lpPassword */ - 0, /* FIXME: dwPasswordLength */ + lpEncryptedPassword, + dwPasswordLength, (LPSTR)lpDisplayName); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -363,6 +367,8 @@ DWORD dwDependenciesLength = 0; DWORD dwLength; LPCWSTR lpStr; + DWORD dwPasswordLength = 0; + LPBYTE lpEncryptedPassword = NULL; TRACE("ChangeServiceConfigW() called\n"); @@ -380,6 +386,8 @@ } /* FIXME: Encrypt the password */ + lpEncryptedPassword = (LPBYTE)lpPassword; + dwPasswordLength = (wcslen(lpPassword) + 1) * sizeof(WCHAR); RpcTryExcept { @@ -394,8 +402,8 @@ (LPBYTE)lpDependencies, dwDependenciesLength, (LPWSTR)lpServiceStartName, - NULL, /* FIXME: lpPassword */ - 0, /* FIXME: dwPasswordLength */ + lpEncryptedPassword, + dwPasswordLength, (LPWSTR)lpDisplayName); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -541,6 +549,8 @@ DWORD dwError; DWORD dwLength; LPCSTR lpStr; + DWORD dwPasswordLength = 0; + LPBYTE lpEncryptedPassword = NULL; TRACE("CreateServiceA() called\n"); TRACE("%p %s %s\n", hSCManager, @@ -566,6 +576,8 @@ } /* FIXME: Encrypt the password */ + lpEncryptedPassword = (LPBYTE)lpPassword; + dwPasswordLength = (strlen(lpPassword) + 1) * sizeof(CHAR); RpcTryExcept { @@ -583,8 +595,8 @@ (LPBYTE)lpDependencies, dwDependenciesLength, (LPSTR)lpServiceStartName, - NULL, /* FIXME: lpPassword */ - 0, /* FIXME: dwPasswordLength */ + lpEncryptedPassword, + dwPasswordLength, (SC_RPC_HANDLE *)&hService); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -629,6 +641,8 @@ DWORD dwError; DWORD dwLength; LPCWSTR lpStr; + DWORD dwPasswordLength = 0; + LPBYTE lpEncryptedPassword = NULL; TRACE("CreateServiceW() called\n"); TRACE("%p %S %S\n", hSCManager, @@ -656,6 +670,8 @@ } /* FIXME: Encrypt the password */ + lpEncryptedPassword = (LPBYTE)lpPassword; + dwPasswordLength = (wcslen(lpPassword) + 1) * sizeof(WCHAR); RpcTryExcept { @@ -673,8 +689,8 @@ (LPBYTE)lpDependencies, dwDependenciesLength, lpServiceStartName, - NULL, /* FIXME: lpPassword */ - 0, /* FIXME: dwPasswordLength */ + lpEncryptedPassword, + dwPasswordLength, (SC_RPC_HANDLE *)&hService); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Thu Aug 23 20:24:00 2012 @@ -4,7 +4,7 @@ #include <ms-dtyp.idl> -const unsigned int MAX_SERVICE_NAME_LENGTH = 255; +const unsigned int MAX_SERVICE_NAME_LENGTH = 256; const unsigned short SC_MAX_DEPEND_SIZE = 4 * 1024; const unsigned short SC_MAX_NAME_LENGTH = MAX_SERVICE_NAME_LENGTH + 1; const unsigned short SC_MAX_PATH_LENGTH = 32 * 1024; @@ -485,7 +485,7 @@ [in, string, unique] LPSTR lpBinaryPathName, [in, string, unique] LPSTR lpLoadOrderGroup, [in, out, unique] LPDWORD lpdwTagId, - [in, unique, size_is(dwDependSize)] LPSTR lpDependencies, + [in, unique, size_is(dwDependSize)] LPBYTE lpDependencies, [in, range(0, SC_MAX_DEPEND_SIZE)] DWORD dwDependSize, [in, string, unique] LPSTR lpServiceStartName, [in, unique, size_is(dwPwSize)] LPBYTE lpPassword,

1 0

[jgardou] 57145: [GLU32] - Use up-to-date mesa3d version
by jgardou＠svn.reactos.org 23 Aug '12

23 Aug '12

Author: jgardou Date: Thu Aug 23 19:45:25 2012 New Revision: 57145 URL: http://svn.reactos.org/svn/reactos?rev=57145&view=rev Log: [GLU32] - Use up-to-date mesa3d version Added: trunk/reactos/dll/opengl/mesa/src/glu/sgi/CMakeLists.txt (with props) trunk/reactos/dll/opengl/mesa/src/glu/sgi/glu32.spec (with props) Removed: trunk/reactos/dll/win32/glu32/ Modified: trunk/reactos/dll/opengl/mesa/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/gallium/auxiliary/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CMakeLists.txt trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/CMakeLists… ============================================================================== --- trunk/reactos/dll/opengl/mesa/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -23,7 +23,6 @@ -DWIN32 -D_WINDOWS -DPIPE_SUBSYSTEM_WINDOWS_USER - -DWIN32_LEAN_AND_MEAN -D_DLL # -DDEBUG ) Modified: trunk/reactos/dll/opengl/mesa/src/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/CMakeL… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -1,5 +1,6 @@ add_subdirectory(gallium) add_subdirectory(glsl) +add_subdirectory(glu/sgi) add_subdirectory(mapi/glapi) add_subdirectory(mesa) Modified: trunk/reactos/dll/opengl/mesa/src/gallium/auxiliary/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/galliu… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/auxiliary/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/auxiliary/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -2,6 +2,8 @@ include_directories( indices util) + +add_definitions(-DWIN32_LEAN_AND_MEAN) list(APPEND SOURCE #generated files Modified: trunk/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/galliu… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -3,6 +3,7 @@ -D_GDI32_ # prevent gl* being declared __declspec(dllimport) in MS headers -DBUILD_GL32 # declare gl* as __declspec(dllexport) in Mesa headers -D_GLAPI_NO_EXPORTS # prevent _glapi_* from being declared __declspec(dllimport) + -DWIN32_LEAN_AND_MEAN ) if(NOT MSVC) add_compile_flags("-Wno-implicit-function-declaration") Modified: trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/galliu… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -6,6 +6,8 @@ ../../state_trackers/wgl ../../winsys/sw ) + +add_definitions(-DWIN32_LEAN_AND_MEAN) list(APPEND SOURCE libgl_gdi.c) Modified: trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/galliu… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -1,2 +1,4 @@ + +add_definitions(-DWIN32_LEAN_AND_MEAN) add_library(gallium_ws_gdi STATIC EXCLUDE_FROM_ALL gdi_sw_winsys.c) Added: trunk/reactos/dll/opengl/mesa/src/glu/sgi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glu/sg… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glu/sgi/CMakeLists.txt (added) +++ trunk/reactos/dll/opengl/mesa/src/glu/sgi/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -1,0 +1,125 @@ + +include_directories(#BEFORE + include + libnurbs/internals + libnurbs/interface + libnurbs/nurbtess +) + +add_definitions( + -DBUILD_GLU32 + -DNDEBUG + -DLIBRARYBUILD + -DRESOLVE_3D_TEXTURE_SUPPORT +) + +#this library uses C++ +set_cpp() + +# we must ue our own spec file +spec2def(glu32.dll glu32.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + libutil/error.c + libutil/glue.c + libutil/mipmap.c + libutil/project.c + libutil/quad.c + libutil/registry.c + libtess/dict.c + libtess/geom.c + libtess/memalloc.c + libtess/mesh.c + libtess/normal.c + libtess/priorityq.c + libtess/render.c + libtess/sweep.c + libtess/tess.c + libtess/tessmono.c + libnurbs/interface/bezierEval.cc + libnurbs/interface/bezierPatch.cc + libnurbs/interface/bezierPatchMesh.cc + libnurbs/interface/glcurveval.cc + libnurbs/interface/glinterface.cc + libnurbs/interface/glrenderer.cc + libnurbs/interface/glsurfeval.cc + libnurbs/interface/incurveeval.cc + libnurbs/interface/insurfeval.cc + libnurbs/internals/arc.cc + libnurbs/internals/arcsorter.cc + libnurbs/internals/arctess.cc + libnurbs/internals/backend.cc + libnurbs/internals/basiccrveval.cc + libnurbs/internals/basicsurfeval.cc + libnurbs/internals/bin.cc + libnurbs/internals/bufpool.cc + libnurbs/internals/cachingeval.cc + libnurbs/internals/ccw.cc + libnurbs/internals/coveandtiler.cc + libnurbs/internals/curve.cc + libnurbs/internals/curvelist.cc + libnurbs/internals/curvesub.cc + libnurbs/internals/dataTransform.cc + libnurbs/internals/displaylist.cc + libnurbs/internals/flist.cc + libnurbs/internals/flistsorter.cc + libnurbs/internals/hull.cc + libnurbs/internals/intersect.cc + libnurbs/internals/knotvector.cc + libnurbs/internals/mapdesc.cc + libnurbs/internals/mapdescv.cc + libnurbs/internals/maplist.cc + libnurbs/internals/mesher.cc + libnurbs/internals/monoTriangulationBackend.cc + libnurbs/internals/monotonizer.cc + libnurbs/internals/mycode.cc + libnurbs/internals/nurbsinterfac.cc + libnurbs/internals/nurbstess.cc + libnurbs/internals/patch.cc + libnurbs/internals/patchlist.cc + libnurbs/internals/quilt.cc + libnurbs/internals/reader.cc + libnurbs/internals/renderhints.cc + libnurbs/internals/slicer.cc + libnurbs/internals/sorter.cc + libnurbs/internals/splitarcs.cc + libnurbs/internals/subdivider.cc + libnurbs/internals/tobezier.cc + libnurbs/internals/trimline.cc + libnurbs/internals/trimregion.cc + libnurbs/internals/trimvertpool.cc + libnurbs/internals/uarray.cc + libnurbs/internals/varray.cc + libnurbs/nurbtess/directedLine.cc + libnurbs/nurbtess/gridWrap.cc + libnurbs/nurbtess/monoChain.cc + libnurbs/nurbtess/monoPolyPart.cc + libnurbs/nurbtess/monoTriangulation.cc + libnurbs/nurbtess/partitionX.cc + libnurbs/nurbtess/partitionY.cc + libnurbs/nurbtess/polyDBG.cc + libnurbs/nurbtess/polyUtil.cc + libnurbs/nurbtess/primitiveStream.cc + libnurbs/nurbtess/quicksort.cc + libnurbs/nurbtess/rectBlock.cc + libnurbs/nurbtess/sampleComp.cc + libnurbs/nurbtess/sampleCompBot.cc + libnurbs/nurbtess/sampleCompRight.cc + libnurbs/nurbtess/sampleCompTop.cc + libnurbs/nurbtess/sampleMonoPoly.cc + libnurbs/nurbtess/sampledLine.cc + libnurbs/nurbtess/searchTree.cc + ${CMAKE_CURRENT_BINARY_DIR}/glu32.def +) + +add_library(glu32 SHARED ${SOURCE}) +set_module_type(glu32 win32dll ENTRYPOINT 0) + +add_importlibs(glu32 + opengl32 + gdi32 + msvcrt + kernel32 + ntdll) + +add_cd_file(TARGET glu32 DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/opengl/mesa/src/glu/sgi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/opengl/mesa/src/glu/sgi/glu32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glu/sg… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glu/sgi/glu32.spec (added) +++ trunk/reactos/dll/opengl/mesa/src/glu/sgi/glu32.spec [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -1,0 +1,59 @@ +@ stdcall gluBeginCurve(ptr) +@ stdcall gluBeginPolygon(ptr) +@ stdcall gluBeginSurface(ptr) +@ stdcall gluBeginTrim(ptr) +@ stdcall gluBuild1DMipmapLevels(long long long long long long long long ptr) +@ stdcall gluBuild1DMipmaps(long long long long long ptr) +@ stdcall gluBuild2DMipmapLevels(long long long long long long long long long ptr) +@ stdcall gluBuild2DMipmaps(long long long long long long ptr) +@ stdcall gluBuild3DMipmapLevels(long long long long long long long long long long ptr) +@ stdcall gluBuild3DMipmaps(long long long long long long long ptr) +@ stdcall gluCheckExtension(str ptr) +@ stdcall gluCylinder(ptr double double double long long) +@ stdcall gluDeleteNurbsRenderer(ptr) +@ stdcall gluDeleteQuadric(ptr) +@ stdcall gluDeleteTess(ptr) +@ stdcall gluDisk(ptr double double long long) +@ stdcall gluEndCurve(ptr) +@ stdcall gluEndPolygon(ptr) +@ stdcall gluEndSurface(ptr) +@ stdcall gluEndTrim(ptr) +@ stdcall gluErrorString(long) +@ stdcall gluGetNurbsProperty(ptr long ptr) +@ stdcall gluGetString(long) +@ stdcall gluGetTessProperty(ptr long ptr) +@ stdcall gluLoadSamplingMatrices(ptr ptr ptr ptr) +@ stdcall gluLookAt(double double double double double double double double double) +@ stdcall gluNewNurbsRenderer() +@ stdcall gluNewQuadric() +@ stdcall gluNewTess() +@ stdcall gluNextContour(ptr long) +@ stdcall gluNurbsCallback(ptr long ptr) +@ stdcall gluNurbsCallbackData(ptr ptr) +@ stdcall gluNurbsCallbackDataEXT(ptr ptr) +@ stdcall gluNurbsCurve(ptr long ptr long ptr long long) +@ stdcall gluNurbsProperty(ptr long long) +@ stdcall gluNurbsSurface(ptr long ptr long ptr long long ptr long long long) +@ stdcall gluOrtho2D(double double double double) +@ stdcall gluPartialDisk(ptr double double long long double double) +@ stdcall gluPerspective(double double double double) +@ stdcall gluPickMatrix(double double double double ptr) +@ stdcall gluProject(double double double ptr ptr ptr ptr ptr ptr) +@ stdcall gluPwlCurve(ptr long ptr long long) +@ stdcall gluQuadricCallback(ptr long ptr) +@ stdcall gluQuadricDrawStyle(ptr long) +@ stdcall gluQuadricNormals(ptr long) +@ stdcall gluQuadricOrientation(ptr long) +@ stdcall gluQuadricTexture(ptr long) +@ stdcall gluScaleImage(long long long long ptr long long long ptr) +@ stdcall gluSphere(ptr double long long) +@ stdcall gluTessBeginContour(ptr) +@ stdcall gluTessBeginPolygon(ptr ptr) +@ stdcall gluTessCallback(ptr long ptr) +@ stdcall gluTessEndContour(ptr) +@ stdcall gluTessEndPolygon(ptr) +@ stdcall gluTessNormal(ptr double double double) +@ stdcall gluTessProperty(ptr long double) +@ stdcall gluTessVertex(ptr ptr ptr) +@ stdcall gluUnProject(double double double ptr ptr ptr ptr ptr ptr) +@ stdcall gluUnProject4(double double double double ptr ptr ptr double double ptr ptr ptr ptr) Propchange: trunk/reactos/dll/opengl/mesa/src/glu/sgi/glu32.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -41,7 +41,6 @@ add_subdirectory(fusion) add_subdirectory(gdiplus) add_subdirectory(getuname) -add_subdirectory(glu32) add_subdirectory(hhctrl.ocx) add_subdirectory(hid) add_subdirectory(hlink)

1 0

[jgardou] 57144: [WINGDI.H] - Take the NOGDI define into account
by jgardou＠svn.reactos.org 23 Aug '12

23 Aug '12

Author: jgardou Date: Thu Aug 23 19:41:19 2012 New Revision: 57144 URL: http://svn.reactos.org/svn/reactos?rev=57144&view=rev Log: [WINGDI.H] - Take the NOGDI define into account Modified: trunk/reactos/include/psdk/wingdi.h 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] Thu Aug 23 19:41:19 2012 @@ -1,6 +1,8 @@ #ifndef _WINGDI_H #define _WINGDI_H #define _WINGDI_ + +#ifndef NOGDI #ifdef __cplusplus extern "C" { @@ -3460,4 +3462,6 @@ #ifdef __cplusplus } #endif -#endif + +#endif //!NOGDI +#endif // _WINGDI_H

1 0

[akhaldi] 57143: [TCPIP] * Fix a read-after-free. CID 716802.
by akhaldi＠svn.reactos.org 23 Aug '12

23 Aug '12

Author: akhaldi Date: Thu Aug 23 16:21:28 2012 New Revision: 57143 URL: http://svn.reactos.org/svn/reactos?rev=57143&view=rev Log: [TCPIP] * Fix a read-after-free. CID 716802. Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Thu Aug 23 16:21:28 2012 @@ -342,8 +342,8 @@ if (!AddrIsUnspecified(&AddrFile->Address) && !AddrLocateInterface(&AddrFile->Address)) { + TI_DbgPrint(MIN_TRACE, ("Non-local address given (0x%X).\n", A2S(&AddrFile->Address))); ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG); - TI_DbgPrint(MIN_TRACE, ("Non-local address given (0x%X).\n", A2S(&AddrFile->Address))); return STATUS_INVALID_ADDRESS; }

1 0

[tfaber] 57142: [FREELDR] - Add missing bugcodes dependency in the object library case
by tfaber＠svn.reactos.org 23 Aug '12

23 Aug '12

Author: tfaber Date: Thu Aug 23 12:14:48 2012 New Revision: 57142 URL: http://svn.reactos.org/svn/reactos?rev=57142&view=rev Log: [FREELDR] - Add missing bugcodes dependency in the object library case Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Thu Aug 23 12:14:48 2012 @@ -173,7 +173,9 @@ if(NOT MSVC AND CMAKE_VERSION VERSION_GREATER 2.8.7) add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) + add_dependencies(freeldr_pe bugcodes) add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) + add_dependencies(freeldr_pe_dbg bugcodes) else() add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE}) add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) @@ -220,7 +222,7 @@ add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) -# rename freeldr on livecd to setupldr.sys because isoboot.bin search for setupldr.sys +# rename freeldr on livecd to setupldr.sys because isoboot.bin looks for setupldr.sys add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR livecd NAME_ON_CD setupldr.sys) @@ -233,7 +235,9 @@ if(NOT MSVC AND CMAKE_VERSION VERSION_GREATER 2.8.7) add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) + add_dependencies(setupldr_pe bugcodes) add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) + add_dependencies(setupldr_pe_dbg bugcodes) else() add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})

1 0

[tkreuzer] 57141: [FREELDR] Improve readability of sector calculation
by tkreuzer＠svn.reactos.org 23 Aug '12

23 Aug '12

Author: tkreuzer Date: Thu Aug 23 12:02:30 2012 New Revision: 57141 URL: http://svn.reactos.org/svn/reactos?rev=57141&view=rev Log: [FREELDR] Improve readability of sector calculation Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Thu Aug 23 12:02:30 2012 @@ -1338,8 +1338,7 @@ // // Seek to right position // - Position.HighPart = SectorNumber >> 23; - Position.LowPart = SectorNumber << 9; + Position.QuadPart = (ULONGLONG)SectorNumber * 512; ret = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); if (ret != ESUCCESS) {

1 0

[jgardou] 57140: [CMAKE] - Get rid of __ROS_CMAKE__ definition
by jgardou＠svn.reactos.org 23 Aug '12

23 Aug '12

Author: jgardou Date: Thu Aug 23 11:30:26 2012 New Revision: 57140 URL: http://svn.reactos.org/svn/reactos?rev=57140&view=rev Log: [CMAKE] - Get rid of __ROS_CMAKE__ definition Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=57140&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Thu Aug 23 11:30:26 2012 @@ -43,7 +43,7 @@ # Compiler flags handling include(cmake/compilerflags.cmake) -add_definitions(-D__REACTOS__ -D__ROS_CMAKE__) +add_definitions(-D__REACTOS__) if(NOT CMAKE_CROSSCOMPILING)

1 0

[jgardou] 57139: [MESA] - Add a small "how to upgrade" guide
by jgardou＠svn.reactos.org 22 Aug '12

22 Aug '12

Author: jgardou Date: Wed Aug 22 20:55:42 2012 New Revision: 57139 URL: http://svn.reactos.org/svn/reactos?rev=57139&view=rev Log: [MESA] - Add a small "how to upgrade" guide Added: trunk/reactos/dll/opengl/Mesa_for_ReactOS.txt (with props) Added: trunk/reactos/dll/opengl/Mesa_for_ReactOS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/Mesa_for_ReactO… ============================================================================== --- trunk/reactos/dll/opengl/Mesa_for_ReactOS.txt (added) +++ trunk/reactos/dll/opengl/Mesa_for_ReactOS.txt [iso-8859-1] Wed Aug 22 20:55:42 2012 @@ -1,0 +1,42 @@ +Here is a brief explanation on how to sync Mesa in trunk base. + +Current version is 8.0.4 + +- SOURCE FILES : +________________ + +All unnecessary files and directories where removed from the tree, as it's already a huge piece of code. + + - build tools (bin, configs, scons, src/gallium/tools) were removed, as we don't use it. + - documentation (docs, src/gallium/docs, doxygen) were removed. If you want to contribute to libMesa, you'd better use their build system, not our adapted one + - tests and testing tools were removed (test, src/gallium/tests, src/gallium/tools) + - egl functionality (src/egl) is useless to us and were removed. + - gbm functionality (src/gbm) is useless to us and were removed. + - getopt implementation (src/getopt, for MSVC compatibility) is useless to us, we already have one + - glx (src/glx) functionality is useless to us and were removed. + - src/gallium + - All gallium drivers (src/gallium/driver) where deleted, except for the softpipe one. + - All gallium state trackers (src/gallium/state_trackers) were removed, except for the wgl one + - All gallium targets (src/gallium/targets) were removed, except for the libgl-gdi one. + - All gallium window system backends (src/gallium/winsys) were removed, except for the gdi one (sw/gdi) + - src/mapi + - only mapi and glapi directories were relevant and kept + - src/mesa + - All MESA drivers where deleted (src/mesa/drivers), except for the "common" part and osmesa (off-screen mesa) library. + - Architecture specifics were removed. x86 and x86_64 might be restored in future + - src/glu where kept and will be used for the glu32 dll implementation + + +- GENERATED FILES: +__________________ + +libMesa build system generates source files (using scons). +They were taken from an out-of-source build an put in the "generated" directory, using the same +directory structure for the sake of ease of maintainability. + + +- CMAKELISTS FILES: +___________________ + +Those files were written using the Sconscript and source list files as reference. I think that diff-ing them between two +versions would permit to easily update the cmake configuration files. Propchange: trunk/reactos/dll/opengl/Mesa_for_ReactOS.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
20
Older →

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 August 2012