Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 62093: [MSVCRT] * We don't need a PCH here. CORE-7716
by akhaldi＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: akhaldi Date: Mon Feb 10 11:15:22 2014 New Revision: 62093 URL: http://svn.reactos.org/svn/reactos?rev=62093&view=rev Log: [MSVCRT] * We don't need a PCH here. CORE-7716 Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Mon Feb 10 11:15:22 2014 @@ -31,5 +31,4 @@ endif() add_importlibs(msvcrt kernel32 ntdll) -add_pch(msvcrt precomp.h) add_cd_file(TARGET msvcrt DESTINATION reactos/system32 FOR all)

1 0

[akhaldi] 62092: [MSV1_0] * We don't need a PCH for one source file modules. CORE-7716
by akhaldi＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: akhaldi Date: Mon Feb 10 10:36:15 2014 New Revision: 62092 URL: http://svn.reactos.org/svn/reactos?rev=62092&view=rev Log: [MSV1_0] * We don't need a PCH for one source file modules. CORE-7716 Modified: trunk/reactos/dll/win32/msv1_0/CMakeLists.txt Modified: trunk/reactos/dll/win32/msv1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/CMakeLists.txt [iso-8859-1] Mon Feb 10 10:36:15 2014 @@ -15,6 +15,5 @@ target_link_libraries(msv1_0 wine ${PSEH_LIB}) add_delay_importlibs(msv1_0 samsrv lsasrv) add_importlibs(msv1_0 advapi32 kernel32 ntdll) -add_pch(msv1_0 msv1_0.h) add_dependencies(msv1_0 psdk) add_cd_file(TARGET msv1_0 DESTINATION reactos/system32 FOR all)

1 0

[aandrejevic] 62091: [BASESRV] Implement BaseSrvSetVDMCurDirs.
by aandrejevic＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: aandrejevic Date: Mon Feb 10 00:37:06 2014 New Revision: 62091 URL: http://svn.reactos.org/svn/reactos?rev=62091&view=rev Log: [BASESRV] Implement BaseSrvSetVDMCurDirs. Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Mon Feb 10 00:37:06 2014 @@ -136,8 +136,64 @@ CSR_API(BaseSrvSetVDMCurDirs) { - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PBASE_GETSET_VDM_CURDIRS VDMCurrentDirsRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.VDMCurrentDirsRequest; + PVDM_CONSOLE_RECORD ConsoleRecord; + PCHAR Buffer = NULL; + + /* Validate the input buffer */ + if (!CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&VDMCurrentDirsRequest->lpszzCurDirs, + VDMCurrentDirsRequest->cchCurDirs, + sizeof(*VDMCurrentDirsRequest->lpszzCurDirs))) + { + return STATUS_INVALID_PARAMETER; + } + + /* Enter the critical section */ + RtlEnterCriticalSection(&DosCriticalSection); + + /* Find the console record */ + Status = BaseSrvGetConsoleRecord(VDMCurrentDirsRequest->ConsoleHandle, &ConsoleRecord); + if (!NT_SUCCESS(Status)) goto Cleanup; + + if (ConsoleRecord->CurrentDirs == NULL) + { + /* Allocate memory for the current directory information */ + Buffer = RtlAllocateHeap(BaseSrvHeap, + HEAP_ZERO_MEMORY, + VDMCurrentDirsRequest->cchCurDirs); + } + else + { + /* Resize the amount of allocated memory */ + Buffer = RtlReAllocateHeap(BaseSrvHeap, + HEAP_ZERO_MEMORY, + ConsoleRecord->CurrentDirs, + VDMCurrentDirsRequest->cchCurDirs); + } + + if (Buffer == NULL) + { + /* Allocation failed */ + Status = STATUS_NO_MEMORY; + goto Cleanup; + } + + /* Update the console record */ + ConsoleRecord->CurrentDirs = Buffer; + ConsoleRecord->CurDirsLength = VDMCurrentDirsRequest->cchCurDirs; + + /* Copy the data */ + RtlMoveMemory(ConsoleRecord->CurrentDirs, + VDMCurrentDirsRequest->lpszzCurDirs, + VDMCurrentDirsRequest->cchCurDirs); + +Cleanup: + /* Leave the critical section */ + RtlLeaveCriticalSection(&DosCriticalSection); + + return Status; } CSR_API(BaseSrvGetVDMCurDirs)

1 0

[akhaldi] 62090: [ACLEDIT] * Add header guards to the main header. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: akhaldi Date: Sun Feb 9 23:40:47 2014 New Revision: 62090 URL: http://svn.reactos.org/svn/reactos?rev=62090&view=rev Log: [ACLEDIT] * Add header guards to the main header. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/acledit/acleditint.h Modified: trunk/reactos/dll/win32/acledit/acleditint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/aclediti… ============================================================================== --- trunk/reactos/dll/win32/acledit/acleditint.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/acleditint.h [iso-8859-1] Sun Feb 9 23:40:47 2014 @@ -1,6 +1,7 @@ +#ifndef _ACLEDIT_H +#define _ACLEDIT_H + #include <windef.h> - -#include "resource.h" extern HINSTANCE hDllInstance; @@ -56,4 +57,4 @@ BOOL bApplyToSubObjects, LPDWORD lpdwChangeContextStatus); -/* EOF */ +#endif /* _ACLEDIT_H */

1 0

[akhaldi] 62089: [DIRECTX] * Prepare the CMake scripts for PCH. CORE-7716
by akhaldi＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: akhaldi Date: Sun Feb 9 23:29:31 2014 New Revision: 62089 URL: http://svn.reactos.org/svn/reactos?rev=62089&view=rev Log: [DIRECTX] * Prepare the CMake scripts for PCH. CORE-7716 Modified: trunk/reactos/dll/directx/wine/amstream/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dxof/CMakeLists.txt trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt trunk/reactos/dll/directx/wine/dinput/CMakeLists.txt trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt trunk/reactos/dll/directx/wine/dplayx/CMakeLists.txt trunk/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt trunk/reactos/dll/directx/wine/msdmo/CMakeLists.txt trunk/reactos/dll/directx/wine/qedit/CMakeLists.txt trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt Modified: trunk/reactos/dll/directx/wine/amstream/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/… ============================================================================== --- trunk/reactos/dll/directx/wine/amstream/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -12,10 +12,15 @@ main.c mediastream.c mediastreamfilter.c + amstream_private.h) + +add_library(amstream SHARED + ${SOURCE} + version.rc ${CMAKE_CURRENT_BINARY_DIR}/amstream.def) -add_library(amstream SHARED ${SOURCE} version.rc) set_module_type(amstream win32dll) target_link_libraries(amstream strmbase strmiids uuid wine) add_importlibs(amstream ole32 msvcrt kernel32 ntdll) +add_pch(amstream amstream_private.h SOURCE) add_cd_file(TARGET amstream DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -18,13 +18,16 @@ texture.c vertexdeclaration.c volume.c + d3d8_private.h) + +add_library(d3d8 SHARED + ${SOURCE} guid.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def) -add_library(d3d8 SHARED ${SOURCE}) set_module_type(d3d8 win32dll UNICODE) target_link_libraries(d3d8 uuid wine) add_importlibs(d3d8 wined3d msvcrt kernel32 ntdll) -add_pch(d3d8 d3d8_private.h) +add_pch(d3d8 d3d8_private.h SOURCE) add_cd_file(TARGET d3d8 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -20,14 +20,17 @@ texture.c vertexdeclaration.c volume.c + d3d9_private.h) + +add_library(d3d9 SHARED + ${SOURCE} guid.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3d9_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def) -add_library(d3d9 SHARED ${SOURCE}) set_module_type(d3d9 win32dll UNICODE) target_link_libraries(d3d9 wine) add_importlibs(d3d9 wined3d msvcrt kernel32 ntdll) -add_pch(d3d9 d3d9_private.h) +add_pch(d3d9 d3d9_private.h SOURCE) add_cd_file(TARGET d3d9 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -19,12 +19,17 @@ hlsl.yy.c reflection.c utils.c - ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43_stubs.c + d3dcompiler_private.h + ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43_stubs.c) + +add_library(d3dcompiler_43 SHARED + ${SOURCE} + version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43.def) -add_library(d3dcompiler_43 SHARED ${SOURCE} version.rc) set_module_type(d3dcompiler_43 win32dll) target_link_libraries(d3dcompiler_43 dx10guid uuid wine wpp) add_importlibs(d3dcompiler_43 msvcrt kernel32 ntdll) add_dependencies(d3dcompiler_43 d3d_idl_headers) +add_pch(d3dcompiler_43 d3dcompiler_private.h SOURCE) add_cd_file(TARGET d3dcompiler_43 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -21,13 +21,18 @@ util.c volume.c xfile.c + d3dx9_36_private.h) + +add_library(d3dx9_36 SHARED + ${SOURCE} guid.c + version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36.def) -add_library(d3dx9_36 SHARED ${SOURCE} version.rc) set_module_type(d3dx9_36 win32dll) add_dependencies(d3dx9_36 d3d_idl_headers) target_link_libraries(d3dx9_36 dxguid wine) add_importlibs(d3dx9_36 d3dcompiler_43 d3dxof user32 ole32 gdi32 msvcrt kernel32 ntdll) +add_pch(d3dx9_36 d3dx9_36_private.h SOURCE) add_cd_file(TARGET d3dx9_36 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/d3dxof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dxof/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dxof/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -7,12 +7,17 @@ list(APPEND SOURCE d3dxof.c main.c + parsing.c + d3dxof_private.h) + +add_library(d3dxof SHARED + ${SOURCE} mszip.c - parsing.c + version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3dxof.def) -add_library(d3dxof SHARED ${SOURCE} version.rc) set_module_type(d3dxof win32dll) target_link_libraries(d3dxof dxguid uuid wine) add_importlibs(d3dxof msvcrt kernel32 ntdll) +add_pch(d3dxof d3dxof_private.h SOURCE) add_cd_file(TARGET d3dxof DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/CMa… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -20,8 +20,8 @@ utils.c vertexbuffer.c viewport.c - ${CMAKE_CURRENT_BINARY_DIR}/ddraw_stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def) + ddraw_private.h + ${CMAKE_CURRENT_BINARY_DIR}/ddraw_stubs.c) if(MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 @@ -29,10 +29,14 @@ set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h") endif() -add_library(ddraw SHARED ${SOURCE} ddraw.rc) +add_library(ddraw SHARED + ${SOURCE} + ddraw.rc + ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def) + set_module_type(ddraw win32dll) target_link_libraries(ddraw wine uuid dxguid ${PSEH_LIB}) add_importlibs(ddraw advapi32 gdi32 user32 wined3d msvcrt kernel32 ntdll) add_dependencies(ddraw wineheaders) -add_pch(ddraw ddraw_private.h) +add_pch(ddraw ddraw_private.h SOURCE) add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/C… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -12,12 +12,16 @@ factory.c mediacatenum.c parsedisplayname.c + devenum_private.h) + +add_library(devenum SHARED + ${SOURCE} + devenum.rc ${CMAKE_CURRENT_BINARY_DIR}/devenum.def) -add_library(devenum SHARED ${SOURCE} devenum.rc) set_source_files_properties(devenum.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/devenum_classes.rgs) set_module_type(devenum win32dll UNICODE) target_link_libraries(devenum strmiids uuid wine) add_importlibs(devenum advapi32 ole32 oleaut32 winmm user32 avicap32 msvcrt kernel32 ntdll) -add_pch(devenum devenum_private.h) +add_pch(devenum devenum_private.h SOURCE) add_cd_file(TARGET devenum DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -5,7 +5,6 @@ list(APPEND SOURCE config.c - data_formats.c device.c dinput_main.c effect_linuxinput.c @@ -15,12 +14,18 @@ joystick_osx.c keyboard.c mouse.c + dinput_private.h) + +add_library(dinput SHARED + ${SOURCE} + data_formats.c + dinput.rc ${CMAKE_CURRENT_BINARY_DIR}/dinput.def) -add_library(dinput SHARED ${SOURCE} dinput.rc) add_library(dinput_data_formats data_formats.c) add_dependencies(dinput_data_formats psdk) set_module_type(dinput win32dll) target_link_libraries(dinput dxguid uuid wine) add_importlibs(dinput comctl32 ole32 user32 advapi32 msvcrt kernel32 ntdll) +add_pch(dinput dinput_private.h SOURCE) add_cd_file(TARGET dinput DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -12,11 +12,15 @@ download.c instrument.c port.c + dmusic_private.h) + +add_library(dmusic SHARED + ${SOURCE} + version.rc ${CMAKE_CURRENT_BINARY_DIR}/dmusic.def) -add_library(dmusic SHARED ${SOURCE} version.rc) set_module_type(dmusic win32dll) target_link_libraries(dmusic dxguid uuid wine) add_importlibs(dmusic ole32 advapi32 winmm msvcrt kernel32 ntdll) -add_pch(dmusic dmusic_private.h) +add_pch(dmusic dmusic_private.h SOURCE) add_cd_file(TARGET dmusic DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/dplayx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -17,10 +17,15 @@ dplobby.c lobbysp.c name_server.c + dplayx_global.h) + +add_library(dplayx SHARED + ${SOURCE} + version.rc ${CMAKE_CURRENT_BINARY_DIR}/dplayx.def) -add_library(dplayx SHARED ${SOURCE} version.rc) set_module_type(dplayx win32dll) target_link_libraries(dplayx dxguid uuid wine) add_importlibs(dplayx winmm ole32 user32 advapi32 msvcrt kernel32 ntdll) +add_pch(dplayx dplayx_global.h SOURCE) add_cd_file(TARGET dplayx DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/C… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -2,19 +2,23 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(dxdiagn.dll dxdiagn.spec) +add_idl_headers(dxdiagn_idlheader fil_data.idl) list(APPEND SOURCE container.c dxdiag_main.c provider.c + dxdiag_private.h) + +add_library(dxdiagn SHARED + ${SOURCE} guid.c + dxdiagn.rc ${CMAKE_CURRENT_BINARY_DIR}/dxdiagn.def) -add_idl_headers(dxdiagn_idlheader fil_data.idl) -add_library(dxdiagn SHARED ${SOURCE} dxdiagn.rc) set_module_type(dxdiagn win32dll) target_link_libraries(dxdiagn strmiids dxguid uuid wine) add_dependencies(dxdiagn dxdiagn_idlheader) add_importlibs(dxdiagn d3d9 ddraw version ole32 oleaut32 psapi user32 msvcrt kernel32 ntdll) -add_pch(dxdiagn dxdiag_private.h) +add_pch(dxdiagn dxdiag_private.h SOURCE) add_cd_file(TARGET dxdiagn DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -13,12 +13,17 @@ surface.c swapchain.c utils.c + dxgi_private.h) + +add_library(dxgi SHARED + ${SOURCE} guid.c + version.rc ${CMAKE_CURRENT_BINARY_DIR}/dxgi.def) -add_library(dxgi SHARED ${SOURCE} version.rc) set_module_type(dxgi win32dll) target_link_libraries(dxgi uuid dxgi_uuids wine) add_importlibs(dxgi wined3d msvcrt kernel32 ntdll) add_dependencies(dxgi wineheaders) +add_pch(dxgi dxgi_private.h SOURCE) add_cd_file(TARGET dxgi DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/msdmo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/msdmo/CMa… ============================================================================== --- trunk/reactos/dll/directx/wine/msdmo/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/msdmo/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -6,11 +6,16 @@ list(APPEND SOURCE dmoreg.c dmort.c + precomp.h) + +add_library(msdmo SHARED + ${SOURCE} stubs.c + rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msdmo.def) -add_library(msdmo SHARED ${SOURCE} rsrc.rc) set_module_type(msdmo win32dll) target_link_libraries(msdmo uuid wine mediaobj_guid) add_importlibs(msdmo user32 advapi32 ole32 msvcrt kernel32 ntdll) +add_pch(msdmo precomp.h SOURCE) add_cd_file(TARGET msdmo DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/qedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/CMa… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -7,11 +7,15 @@ main.c mediadet.c samplegrabber.c + qedit_private.h) + +add_library(qedit SHARED + ${SOURCE} + qedit.rc ${CMAKE_CURRENT_BINARY_DIR}/qedit.def) -add_library(qedit SHARED ${SOURCE} qedit.rc) set_module_type(qedit win32dll) target_link_libraries(qedit strmiids uuid wine) add_importlibs(qedit ole32 oleaut32 msvcrt kernel32 ntdll) -add_pch(qedit qedit_private.h) +add_pch(qedit qedit_private.h SOURCE) add_cd_file(TARGET qedit DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -35,11 +35,14 @@ videorenderer.c vmr9.c waveparser.c + quartz_private.h) + +add_library(quartz SHARED + ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/quartz_strmif_p.c - ${CMAKE_CURRENT_BINARY_DIR}/quartz.def) - -add_library(quartz SHARED ${SOURCE} version.rc) + ${CMAKE_CURRENT_BINARY_DIR}/quartz.def + version.rc) add_idl_headers(quartz_idlheader fil_data.idl) @@ -56,5 +59,5 @@ target_link_libraries(quartz strmbase strmiids uuid dxguid wine ${PSEH_LIB}) add_importlibs(quartz dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_dependencies(quartz dxsdk quartz_idlheader stdole2) -add_pch(quartz quartz_private.h) +add_pch(quartz quartz_private.h SOURCE) add_cd_file(TARGET quartz DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:29:31 2014 @@ -37,11 +37,15 @@ view.c volume.c wined3d_main.c + wined3d_private.h) + +add_library(wined3d SHARED + ${SOURCE} + version.rc ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def) -add_library(wined3d SHARED ${SOURCE} version.rc) set_module_type(wined3d win32dll) target_link_libraries(wined3d wine) add_importlibs(wined3d user32 opengl32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_pch(wined3d wined3d_private.h) +add_pch(wined3d wined3d_private.h SOURCE) add_cd_file(TARGET wined3d DESTINATION reactos/system32 FOR all)

1 0

[akhaldi] 62088: [BASESRV][CSRSRV] * Prepare the CMake scripts for PCH. CORE-7716
by akhaldi＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: akhaldi Date: Sun Feb 9 23:03:24 2014 New Revision: 62088 URL: http://svn.reactos.org/svn/reactos?rev=62088&view=rev Log: [BASESRV][CSRSRV] * Prepare the CMake scripts for PCH. CORE-7716 Modified: trunk/reactos/subsystems/win/basesrv/CMakeLists.txt trunk/reactos/subsystems/win32/csrsrv/CMakeLists.txt Modified: trunk/reactos/subsystems/win/basesrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/CMa… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:03:24 2014 @@ -10,10 +10,13 @@ sndsntry.c vdm.c nls.c + basesrv.h) + +add_library(basesrv SHARED + ${SOURCE} basesrv.rc ${CMAKE_CURRENT_BINARY_DIR}/basesrv.def) -add_library(basesrv SHARED ${SOURCE}) set_module_type(basesrv win32dll UNICODE ENTRYPOINT DllMain 12) ############################################# ## HACK FOR MSVC COMPILATION WITH win32dll ## @@ -23,6 +26,6 @@ target_link_libraries(basesrv ${PSEH_LIB}) add_importlibs(basesrv csrsrv ntdll) - +add_pch(basesrv basesrv.h SOURCE) add_dependencies(basesrv bugcodes) add_cd_file(TARGET basesrv DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/subsystems/win32/csrsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/CM… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/CMakeLists.txt [iso-8859-1] Sun Feb 9 23:03:24 2014 @@ -12,17 +12,20 @@ session.c thredsup.c wait.c + srv.h) + +add_library(csrsrv SHARED + ${SOURCE} csrsrv.rc ${CMAKE_CURRENT_BINARY_DIR}/csrsrv.def) -add_library(csrsrv SHARED ${SOURCE}) set_module_type(csrsrv nativedll) target_link_libraries(csrsrv ${PSEH_LIB} smlib) add_importlibs(csrsrv ntdll smdll) -add_pch(csrsrv srv.h) +add_pch(csrsrv srv.h SOURCE) add_dependencies(csrsrv psdk bugcodes) add_cd_file(TARGET csrsrv DESTINATION reactos/system32 FOR all)

1 0

[akhaldi] 62087: [WIN32SS] * Prepare the CMake scripts for PCH. CORE-7716
by akhaldi＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: akhaldi Date: Sun Feb 9 22:52:01 2014 New Revision: 62087 URL: http://svn.reactos.org/svn/reactos?rev=62087&view=rev Log: [WIN32SS] * Prepare the CMake scripts for PCH. CORE-7716 Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt trunk/reactos/win32ss/drivers/font/bmfd/CMakeLists.txt trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt trunk/reactos/win32ss/reactx/dxg/CMakeLists.txt trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/consrv.cmake trunk/reactos/win32ss/user/winsrv/usersrv.cmake Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -179,8 +179,7 @@ gdi/ntgdi/xformobj.c gdi/eng/stubs.c gdi/eng/umpdstubs.c - win32k.rc - ${CMAKE_CURRENT_BINARY_DIR}/win32k.def) + pch.h) if(USE_DIBLIB) add_definitions(-D_USE_DIBLIB_) @@ -218,7 +217,12 @@ endif() add_asm_files(win32k_asm ${ASM_SOURCE}) -add_library(win32k SHARED ${SOURCE} ${win32k_asm}) + +add_library(win32k SHARED + ${SOURCE} + ${win32k_asm} + win32k.rc + ${CMAKE_CURRENT_BINARY_DIR}/win32k.def) set_module_type(win32k kernelmodedriver) @@ -232,7 +236,7 @@ endif() add_importlibs(win32k ntoskrnl hal ftfd) -add_pch(win32k pch.h) +add_pch(win32k pch.h SOURCE) add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all) set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h) Modified: trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -1,16 +1,20 @@ spec2def(framebuf.dll framebuf.spec) -add_library(framebuf SHARED +list(APPEND SOURCE enable.c palette.c pointer.c screen.c surface.c + framebuf.h) + +add_library(framebuf SHARED + ${SOURCE} framebuf.rc ${CMAKE_CURRENT_BINARY_DIR}/framebuf.def) -add_pch(framebuf framebuf.h) +add_pch(framebuf framebuf.h SOURCE) set_entrypoint(framebuf DrvEnableDriver 12) set_subsystem(framebuf native) set_image_base(framebuf 0x00010000) Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -7,16 +7,17 @@ palette.c pointer.c screen.c - ${CMAKE_CURRENT_BINARY_DIR}/framebuf_new.def) + driver.h) add_library(framebuf_new SHARED ${SOURCE} - framebuf_new.rc) + framebuf_new.rc + ${CMAKE_CURRENT_BINARY_DIR}/framebuf_new.def) set_entrypoint(framebuf_new DrvEnableDriver 12) set_subsystem(framebuf_new native) set_image_base(framebuf_new 0x00010000) target_link_libraries(framebuf_new libcntpr) add_importlibs(framebuf_new win32k) -add_pch(framebuf_new driver.h) +add_pch(framebuf_new driver.h SOURCE) add_dependencies(framebuf_new psdk bugcodes) Modified: trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -1,7 +1,7 @@ spec2def(vgaddi.dll vgaddi.spec) -add_library(vgaddi SHARED +list(APPEND SOURCE main/enable.c objects/screen.c objects/pointer.c @@ -12,13 +12,17 @@ objects/offscreen.c objects/copybits.c vgavideo/vgavideo.c + vgaddi.h) + +add_library(vgaddi SHARED + ${SOURCE} vgaddi.rc ${CMAKE_CURRENT_BINARY_DIR}/vgaddi.def) set_entrypoint(vgaddi DrvEnableDriver 12) set_subsystem(vgaddi native) set_image_base(vgaddi 0x00010000) -add_pch(vgaddi vgaddi.h) +add_pch(vgaddi vgaddi.h SOURCE) add_importlibs(vgaddi win32k) target_link_libraries(vgaddi libcntpr) add_dependencies(vgaddi psdk bugcodes) Modified: trunk/reactos/win32ss/drivers/font/bmfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/bmfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/bmfd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/bmfd/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -1,13 +1,15 @@ -add_library(bmfd SHARED +list(APPEND SOURCE enable.c font.c - glyph.c) + glyph.c + bmfd.h) -add_pch(bmfd bmfd.h) +add_library(bmfd SHARED ${SOURCE}) set_entrypoint(bmfd BmfdEnableDriver 12) set_subsystem(bmfd native) set_image_base(bmfd 0x00010000) target_link_libraries(bmfd libcntpr) add_importlibs(bmfd win32k) +add_pch(bmfd bmfd.h SOURCE) add_dependencies(bmfd psdk bugcodes) Modified: trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/ftfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -3,11 +3,15 @@ spec2def(ftfd.dll ftfd.spec ADD_IMPORTLIB) -add_library(ftfd SHARED +list(APPEND SOURCE enable.c font.c glyph.c rosglue.c + ftfd.h) + +add_library(ftfd SHARED + ${SOURCE} sprintf.c freetype.rc ${CMAKE_CURRENT_BINARY_DIR}/ftfd.def) @@ -20,7 +24,7 @@ freetype libcntpr) -add_pch(ftfd ftfd.h) +add_pch(ftfd ftfd.h SOURCE) add_importlibs(ftfd win32k) add_dependencies(ftfd psdk) add_cd_file(TARGET ftfd DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -1,11 +1,12 @@ -add_library(vbemp SHARED +list(APPEND SOURCE edid.c vbemp.c - vbemp.rc) + vbemp.h) +add_library(vbemp SHARED ${SOURCE} vbemp.rc) set_module_type(vbemp kernelmodedriver) add_importlibs(vbemp videoprt) -add_pch(vbemp vbemp.h) +add_pch(vbemp vbemp.h SOURCE) target_link_libraries(vbemp libcntpr) add_cd_file(TARGET vbemp DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -2,12 +2,12 @@ list(APPEND SOURCE initvga.c vgamp.c - vgamp.rc) + vgamp.h) -add_library(vgamp SHARED ${SOURCE}) +add_library(vgamp SHARED ${SOURCE} vgamp.rc) set_module_type(vgamp kernelmodedriver) add_importlibs(vgamp videoprt) -add_pch(vgamp vgamp.h) +add_pch(vgamp vgamp.h SOURCE) add_cd_file(TARGET vgamp DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -4,7 +4,8 @@ vgadata.c vga.c vbemodes.c - vbe.c) + vbe.c + vga.h) add_library(vga SHARED ${SOURCE} @@ -21,6 +22,6 @@ set_module_type(vga kernelmodedriver) add_importlibs(vga videoprt) -add_pch(vga vga.h) +add_pch(vga vga.h SOURCE) add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/C… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -22,15 +22,17 @@ stubs.c timer.c videoprt.c + videoprt.h) + +add_library(videoprt SHARED + ${SOURCE} guid.c videoprt.rc ${CMAKE_CURRENT_BINARY_DIR}/videoprt.def) -add_library(videoprt SHARED ${SOURCE}) - set_module_type(videoprt kernelmodedriver) add_importlibs(videoprt ntoskrnl hal) -add_pch(videoprt videoprt.h) +add_pch(videoprt videoprt.h SOURCE) add_cd_file(TARGET videoprt DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/CMakeLis… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -43,10 +43,12 @@ objects/text.c objects/utils.c objects/path.c + include/precomp.h) + +add_library(gdi32 SHARED + ${SOURCE} gdi32.rc ${CMAKE_CURRENT_BINARY_DIR}/gdi32.def) - -add_library(gdi32 SHARED ${SOURCE}) set_module_type(gdi32 win32dll @@ -59,6 +61,6 @@ ${PSEH_LIB}) add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) -add_pch(gdi32 include/precomp.h) +add_pch(gdi32 include/precomp.h SOURCE) add_cd_file(TARGET gdi32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/reactx/dxg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/CMakeLi… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -1,15 +1,19 @@ spec2def(dxg.sys dxg.spec) -add_library(dxg SHARED +list(APPEND SOURCE main.c ddhmg.c eng.c historic.c + dxg_int.h) + +add_library(dxg SHARED + ${SOURCE} dxg.rc ${CMAKE_CURRENT_BINARY_DIR}/dxg.def) set_module_type(dxg kernelmodedriver) add_importlibs(dxg dxgthk ntoskrnl) -add_pch(dxg dxg_int.h) +add_pch(dxg dxg_int.h SOURCE) add_cd_file(TARGET dxg DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -58,8 +58,7 @@ windows/text.c windows/window.c windows/winpos.c - user32.rc - ${CMAKE_CURRENT_BINARY_DIR}/user32.def) + include/user32.h) if(USE_NEW_CURSORICON) list(APPEND SOURCE windows/cursoricon_new.c) @@ -67,7 +66,11 @@ list(APPEND SOURCE windows/cursoricon.c) endif() -add_library(user32 SHARED ${SOURCE}) +add_library(user32 SHARED + ${SOURCE} + user32.rc + ${CMAKE_CURRENT_BINARY_DIR}/user32.def) + set_module_type(user32 win32dll ENTRYPOINT DllMain 12 UNICODE) target_link_libraries(user32 user32_wsprintf wine win32ksys ${PSEH_LIB}) @@ -78,5 +81,5 @@ add_delay_importlibs(user32 imm32 usp10) add_importlibs(user32 gdi32 advapi32 kernel32 ntdll) -add_pch(user32 include/user32.h) +add_pch(user32 include/user32.h SOURCE) add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -29,6 +29,7 @@ consrv/frontends/gui/text.c consrv/frontends/tui/tuiterm.c # consrv/consrv.rc + consrv/consrv.h ) # @@ -45,6 +46,7 @@ endif() add_library(consrv ${CONSRV_SOURCE}) +add_pch(consrv consrv/consrv.h CONSRV_SOURCE) #add_object_library(consrv ${CONSRV_SOURCE}) list(APPEND CONSRV_IMPORT_LIBS psapi) Modified: trunk/reactos/win32ss/user/winsrv/usersrv.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv.cmake [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv.cmake [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -7,9 +7,11 @@ usersrv/register.c usersrv/shutdown.c # usersrv/usersrv.rc + usersrv/usersrv.h ) add_library(usersrv ${USERSRV_SOURCE}) +add_pch(usersrv usersrv/usersrv.h USERSRV_SOURCE) #add_object_library(usersrv ${USERSRV_SOURCE}) set_module_type(usersrv module UNICODE)

1 0

[aandrejevic] 62086: [BASESRV] Implement BaseSrvGetVDMCurDirs. The current directory information is stored in the console record, and it applies to all DOS records within it.
by aandrejevic＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: aandrejevic Date: Sun Feb 9 22:26:13 2014 New Revision: 62086 URL: http://svn.reactos.org/svn/reactos?rev=62086&view=rev Log: [BASESRV] Implement BaseSrvGetVDMCurDirs. The current directory information is stored in the console record, and it applies to all DOS records within it. Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c branches/ntvdm/subsystems/win/basesrv/vdm.h Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Sun Feb 9 22:26:13 2014 @@ -115,7 +115,7 @@ /* Return the result */ IsFirstVDMRequest->FirstVDM = FirstVDM; - + /* Clear the first VDM flag */ FirstVDM = FALSE; @@ -142,8 +142,43 @@ CSR_API(BaseSrvGetVDMCurDirs) { - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PBASE_GETSET_VDM_CURDIRS VDMCurrentDirsRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.VDMCurrentDirsRequest; + PVDM_CONSOLE_RECORD ConsoleRecord; + + /* Validate the output buffer */ + if (!CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&VDMCurrentDirsRequest->lpszzCurDirs, + VDMCurrentDirsRequest->cchCurDirs, + sizeof(*VDMCurrentDirsRequest->lpszzCurDirs))) + { + return STATUS_INVALID_PARAMETER; + } + + /* Enter the critical section */ + RtlEnterCriticalSection(&DosCriticalSection); + + /* Find the console record */ + Status = BaseSrvGetConsoleRecord(VDMCurrentDirsRequest->ConsoleHandle, &ConsoleRecord); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Check if the buffer is large enough */ + if (VDMCurrentDirsRequest->cchCurDirs < ConsoleRecord->CurDirsLength) + { + Status = STATUS_BUFFER_TOO_SMALL; + goto Cleanup; + } + + /* Copy the data */ + RtlMoveMemory(VDMCurrentDirsRequest->lpszzCurDirs, + ConsoleRecord->CurrentDirs, + ConsoleRecord->CurDirsLength); + +Cleanup: + /* Leave the critical section */ + RtlLeaveCriticalSection(&DosCriticalSection); + + return Status; } CSR_API(BaseSrvBatNotification) Modified: branches/ntvdm/subsystems/win/basesrv/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] Sun Feb 9 22:26:13 2014 @@ -15,6 +15,8 @@ { LIST_ENTRY Entry; HANDLE ConsoleHandle; + PCHAR CurrentDirs; + ULONG CurDirsLength; LIST_ENTRY DosListHead; // TODO: Structure incomplete!!! } VDM_CONSOLE_RECORD, *PVDM_CONSOLE_RECORD;

1 0

[akhaldi] 62085: [VMX_SVGA] * We don't need a PCH for one source file modules. CORE-7716
by akhaldi＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: akhaldi Date: Sun Feb 9 22:14:09 2014 New Revision: 62085 URL: http://svn.reactos.org/svn/reactos?rev=62085&view=rev Log: [VMX_SVGA] * We don't need a PCH for one source file modules. CORE-7716 Modified: trunk/reactos/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt Modified: trunk/reactos/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:14:09 2014 @@ -5,5 +5,3 @@ set_module_type(vmx_svga kernelmodedriver) add_importlibs(vmx_svga ntoskrnl videoprt) - -add_pch(vmx_svga precomp.h)

1 0

[akhaldi] 62084: [FRAMEBUF_NEW] * Add header guards to the main header. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 09 Feb '14

09 Feb '14

Author: akhaldi Date: Sun Feb 9 22:07:47 2014 New Revision: 62084 URL: http://svn.reactos.org/svn/reactos?rev=62084&view=rev Log: [FRAMEBUF_NEW] * Add header guards to the main header. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/driver.h Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/driver.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/driver.h [iso-8859-1] Sun Feb 9 22:07:47 2014 @@ -6,16 +6,17 @@ * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation * ReactOS Portable Systems Group */ - + +#ifndef _FRAMEBUF_NEW_PCH_ +#define _FRAMEBUF_NEW_PCH_ + //#define DBG 1 -#include "stddef.h" #include <stdarg.h> -#include <string.h> -#include "windef.h" -#include "wingdi.h" -#include "winddi.h" -#include "devioctl.h" -#include "ntddvdeo.h" +#include <windef.h> +#include <wingdi.h> +#include <winddi.h> +#include <devioctl.h> +#include <ntddvdeo.h> #include "debug.h" typedef struct _PDEV @@ -74,3 +75,5 @@ #define ALLOC_TAG 'bfDD' // Four byte tag (characters in // reverse order) used for memory // allocations + +#endif /* _FRAMEBUF_NEW_PCH_ */

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