Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 49901: [CMAKE] Cleanup old comment

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 2 19:18:25 2010 New Revision: 49901 URL: http://svn.reactos.org/svn/reactos?rev=49901&view=rev Log: [CMAKE] Cleanup old comment Modified: branches/cmake-bringup/include/dxsdk/CMakeLists.txt Modified: branches/cmake-bringup/include/dxsdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/dxsdk/CMa… ============================================================================== --- branches/cmake-bringup/include/dxsdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/dxsdk/CMakeLists.txt [iso-8859-1] Thu Dec 2 19:18:25 2010 @@ -24,6 +24,4 @@ #vmrender.idl ) -# HACK: dxsdk is broken - ADD_INTERFACE_DEFINITIONS(dxsdk ${SOURCE}) - +ADD_INTERFACE_DEFINITIONS(dxsdk ${SOURCE})

14 years, 11 months

[tkreuzer] 49900: [CMAKE] - Add importlib for dplayx, ksuser, wined3d - link dplay to dplayx

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 2 19:13:47 2010 New Revision: 49900 URL: http://svn.reactos.org/svn/reactos?rev=49900&view=rev Log: [CMAKE] - Add importlib for dplayx, ksuser, wined3d - link dplay to dplayx Modified: branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dplay… ============================================================================== --- branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt [iso-8859-1] Thu Dec 2 19:13:47 2010 @@ -5,7 +5,10 @@ spec2def(dplay.dll dplay.spec) -add_library(dplay SHARED dplay_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/dplay.def) +add_library(dplay SHARED + dplay_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/dplay.def) set_entrypoint(dplay 0) @@ -19,8 +22,10 @@ ole32 winmm dinput + dplayx ntdll) add_dependencies(dplay psdk buildno_header) -add_cab_target(dplay 1) +add_cab_target(dplay 1) +add_importlib_target(dplay.spec libdplayx) Modified: branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dplay… ============================================================================== --- branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt [iso-8859-1] Thu Dec 2 19:13:47 2010 @@ -14,7 +14,7 @@ name_server.c regsvr.c version.rc - dplayx.def) + ${CMAKE_CURRENT_BINARY_DIR}/dplayx.def) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -22,7 +22,6 @@ set_module_type(dplayx win32dll) target_link_libraries(dplayx - ${CMAKE_CURRENT_BINARY_DIR}/dplayx.def wine uuid dxguid) @@ -36,4 +35,5 @@ kernel32 ntdll) -add_cab_target(dplayx 1) +add_cab_target(dplayx 1) +add_importlib_target(dplayx.spec) Modified: branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/ksuse… ============================================================================== --- branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt [iso-8859-1] Thu Dec 2 19:13:47 2010 @@ -8,3 +8,4 @@ add_importlibs(ksuser advapi32 msvcrt kernel32 ntdll) add_dependencies(ksuser psdk bugcodes) add_cab_target(ksuser 1) +add_importlib_target(ksuser.spec) Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Thu Dec 2 19:13:47 2010 @@ -68,4 +68,4 @@ add_dependencies(wined3d wineheaders) add_cab_target(wined3d 1) -add_importlib_target(wined3d.spec) +add_importlib_target(wined3d.spec)

14 years, 11 months

[spetreolle] 49899: [CMAKE] Fix shlwapi.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Thu Dec 2 14:57:32 2010 New Revision: 49899 URL: http://svn.reactos.org/svn/reactos?rev=49899&view=rev Log: [CMAKE] Fix shlwapi. Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi.spec Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Thu Dec 2 14:57:32 2010 @@ -417,7 +417,7 @@ 417 stub -noname SHWinHelpOnDemandA 418 stdcall -noname MLFreeLibrary(long) 419 stdcall -noname SHFlushSFCacheWrap() -420 stub @ # CMemStream::Commit +420 stub SHLWAPI_420 # CMemStream::Commit 421 stub -noname SHLoadPersistedDataObject 422 stdcall -noname SHGlobalCounterCreateNamedA(str long) 423 stdcall -noname SHGlobalCounterCreateNamedW(wstr long)

14 years, 11 months

[tkreuzer] 49898: [NTOSKRNL] patch by Samuel Serapion: Implement MemorySectionName case for NtQueryVirtualMemory. Protect buffer access with SEH. See issue #5753 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 2 14:37:16 2010 New Revision: 49898 URL: http://svn.reactos.org/svn/reactos?rev=49898&view=rev Log: [NTOSKRNL] patch by Samuel Serapion: Implement MemorySectionName case for NtQueryVirtualMemory. Protect buffer access with SEH. See issue #5753 for more details. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Thu Dec 2 14:37:16 2010 @@ -2339,35 +2339,21 @@ NTSTATUS NTAPI -NtQueryVirtualMemory(IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN MEMORY_INFORMATION_CLASS MemoryInformationClass, - OUT PVOID MemoryInformation, - IN SIZE_T MemoryInformationLength, - OUT PSIZE_T ReturnLength) +MiQueryMemoryBasicInformation(IN HANDLE ProcessHandle, + IN PVOID BaseAddress, + OUT PVOID MemoryInformation, + IN SIZE_T MemoryInformationLength, + OUT PSIZE_T ReturnLength) { PEPROCESS TargetProcess; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PMMVAD Vad = NULL; PVOID Address, NextAddress; BOOLEAN Found = FALSE; ULONG NewProtect, NewState, BaseVpn; MEMORY_BASIC_INFORMATION MemoryInfo; KAPC_STATE ApcState; - DPRINT("Querying class %d about address: %p\n", MemoryInformationClass, BaseAddress); - - /* Only this class is supported for now */ - ASSERT(MemoryInformationClass == MemoryBasicInformation); - - /* Validate the size information of the class */ - if (MemoryInformationLength < sizeof(MEMORY_BASIC_INFORMATION)) - { - /* The size is invalid */ - return STATUS_INFO_LENGTH_MISMATCH; - } - - /* Bail out if the address is invalid */ - if (BaseAddress > MM_HIGHEST_USER_ADDRESS) return STATUS_INVALID_PARAMETER; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); /* Check for illegal addresses in user-space, or the shared memory area */ if ((BaseAddress > MM_HIGHEST_VAD_ADDRESS) || @@ -2396,11 +2382,27 @@ MemoryInfo.RegionSize = (ULONG_PTR)MemoryInfo.AllocationBase - (ULONG_PTR)Address; } - /* Return the data (FIXME: Use SEH) */ - *(PMEMORY_BASIC_INFORMATION)MemoryInformation = MemoryInfo; - if (ReturnLength) *ReturnLength = sizeof(MEMORY_BASIC_INFORMATION); - - return STATUS_SUCCESS; + /* Return the data, NtQueryInformation already probed it*/ + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + *(PMEMORY_BASIC_INFORMATION)MemoryInformation = MemoryInfo; + if (ReturnLength) *ReturnLength = sizeof(MEMORY_BASIC_INFORMATION); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + else + { + *(PMEMORY_BASIC_INFORMATION)MemoryInformation = MemoryInfo; + if (ReturnLength) *ReturnLength = sizeof(MEMORY_BASIC_INFORMATION); + } + + return Status; } /* Check if this is for a local or remote process */ @@ -2507,11 +2509,27 @@ MemoryInfo.Protect = PAGE_NOACCESS; MemoryInfo.Type = 0; - /* Return the data (FIXME: Use SEH) */ - *(PMEMORY_BASIC_INFORMATION)MemoryInformation = MemoryInfo; - if (ReturnLength) *ReturnLength = sizeof(MEMORY_BASIC_INFORMATION); - - return STATUS_SUCCESS; + /* Return the data, NtQueryInformation already probed it*/ + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + *(PMEMORY_BASIC_INFORMATION)MemoryInformation = MemoryInfo; + if (ReturnLength) *ReturnLength = sizeof(MEMORY_BASIC_INFORMATION); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + else + { + *(PMEMORY_BASIC_INFORMATION)MemoryInformation = MemoryInfo; + if (ReturnLength) *ReturnLength = sizeof(MEMORY_BASIC_INFORMATION); + } + + return Status; } /* This must be a VM VAD */ @@ -2539,7 +2557,7 @@ Address = NextAddress; } - /* Now that we know the last VA address, calculate hte region size */ + /* Now that we know the last VA address, calculate the region size */ MemoryInfo.RegionSize = ((ULONG_PTR)Address - (ULONG_PTR)MemoryInfo.BaseAddress); /* Check if we were attached */ @@ -2550,17 +2568,179 @@ ObDereferenceObject(TargetProcess); } - /* Return the data (FIXME: Use SEH) */ - *(PMEMORY_BASIC_INFORMATION)MemoryInformation = MemoryInfo; - if (ReturnLength) *ReturnLength = sizeof(MEMORY_BASIC_INFORMATION); - + /* Return the data, NtQueryInformation already probed it*/ + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + *(PMEMORY_BASIC_INFORMATION)MemoryInformation = MemoryInfo; + if (ReturnLength) *ReturnLength = sizeof(MEMORY_BASIC_INFORMATION); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + else + { + *(PMEMORY_BASIC_INFORMATION)MemoryInformation = MemoryInfo; + if (ReturnLength) *ReturnLength = sizeof(MEMORY_BASIC_INFORMATION); + } + /* All went well */ DPRINT("Base: %p AllocBase: %p Protect: %lx AllocProtect: %lx " "State: %lx Type: %lx Size: %lx\n", MemoryInfo.BaseAddress, MemoryInfo.AllocationBase, MemoryInfo.AllocationProtect, MemoryInfo.Protect, MemoryInfo.State, MemoryInfo.Type, MemoryInfo.RegionSize); - return STATUS_SUCCESS; + + return Status; } +NTSTATUS +NTAPI +MiQueryMemorySectionName(IN HANDLE ProcessHandle, + IN PVOID BaseAddress, + OUT PVOID MemoryInformation, + IN SIZE_T MemoryInformationLength, + OUT PSIZE_T ReturnLength) +{ + PEPROCESS Process; + NTSTATUS Status; + WCHAR ModuleFileNameBuffer[MAX_PATH] = {0}; + UNICODE_STRING ModuleFileName; + PMEMORY_SECTION_NAME SectionName = NULL; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_QUERY_INFORMATION, + NULL, + PreviousMode, + (PVOID*)(&Process), + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT("MiQueryMemorySectionName: ObReferenceObjectByHandle returned %x\n",Status); + return Status; + } + + RtlInitEmptyUnicodeString(&ModuleFileName, ModuleFileNameBuffer, sizeof(ModuleFileNameBuffer)); + Status = MmGetFileNameForAddress(BaseAddress, &ModuleFileName); + + if (NT_SUCCESS(Status)) + { + SectionName = MemoryInformation; + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + RtlInitUnicodeString(&SectionName->SectionFileName, SectionName->NameBuffer); + SectionName->SectionFileName.MaximumLength = MemoryInformationLength; + RtlCopyUnicodeString(&SectionName->SectionFileName, &ModuleFileName); + + if (ReturnLength) *ReturnLength = ModuleFileName.Length; + + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + else + { + RtlInitUnicodeString(&SectionName->SectionFileName, SectionName->NameBuffer); + SectionName->SectionFileName.MaximumLength = MemoryInformationLength; + RtlCopyUnicodeString(&SectionName->SectionFileName, &ModuleFileName); + + if (ReturnLength) *ReturnLength = ModuleFileName.Length; + + } + } + ObDereferenceObject(Process); + return Status; +} + +NTSTATUS +NTAPI +NtQueryVirtualMemory(IN HANDLE ProcessHandle, + IN PVOID BaseAddress, + IN MEMORY_INFORMATION_CLASS MemoryInformationClass, + OUT PVOID MemoryInformation, + IN SIZE_T MemoryInformationLength, + OUT PSIZE_T ReturnLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + KPROCESSOR_MODE PreviousMode; + + DPRINT("Querying class %d about address: %p\n", MemoryInformationClass, BaseAddress); + + /* Bail out if the address is invalid */ + if (BaseAddress > MM_HIGHEST_USER_ADDRESS) return STATUS_INVALID_PARAMETER; + + /* Probe return buffer */ + PreviousMode = ExGetPreviousMode(); + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + ProbeForWrite(MemoryInformation, + MemoryInformationLength, + sizeof(ULONG_PTR)); + + if (ReturnLength) ProbeForWriteSize_t(ReturnLength); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + + switch(MemoryInformationClass) + { + case MemoryBasicInformation: + /* Validate the size information of the class */ + if (MemoryInformationLength < sizeof(MEMORY_BASIC_INFORMATION)) + { + /* The size is invalid */ + return STATUS_INFO_LENGTH_MISMATCH; + } + Status = MiQueryMemoryBasicInformation(ProcessHandle, + BaseAddress, + MemoryInformation, + MemoryInformationLength, + ReturnLength); + break; + + case MemorySectionName: + /* Validate the size information of the class */ + if (MemoryInformationLength < sizeof(MEMORY_SECTION_NAME)) + { + /* The size is invalid */ + return STATUS_INFO_LENGTH_MISMATCH; + } + Status = MiQueryMemorySectionName(ProcessHandle, + BaseAddress, + MemoryInformation, + MemoryInformationLength, + ReturnLength); + break; + case MemoryWorkingSetList: + case MemoryBasicVlmInformation: + default: + DPRINT1("Unhandled memory information class %d\n", MemoryInformationClass); + break; + } + + return Status; +} + /* EOF */

14 years, 11 months

[tkreuzer] 49897: [MSVC] Fix typeof(WineDirect3DCreateClipper) definition for MSVC.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 2 13:37:59 2010 New Revision: 49897 URL: http://svn.reactos.org/svn/reactos?rev=49897&view=rev Log: [MSVC] Fix typeof(WineDirect3DCreateClipper) definition for MSVC. Modified: branches/cmake-bringup/include/reactos/wine/typeof.h Modified: branches/cmake-bringup/include/reactos/wine/typeof.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/typeof.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/typeof.h [iso-8859-1] Thu Dec 2 13:37:59 2010 @@ -25,7 +25,7 @@ struct jpeg_decompress_struct; typedef struct IWineD3D * (__stdcall typeof(WineDirect3DCreate))(unsigned int, struct IUnknown *); -typedef struct IWineD3DClipper * (__stdcall typeof(WineDirect3DCreateClipper))(struct IUnknown *); +typedef struct IWineD3DClipper * (__stdcall typeof(WineDirect3DCreateClipper))(void); typedef int (__stdcall typeof(ImeInquire))(struct _tagIMEINFO *, __typeof_wchar *, const __typeof_wchar *); typedef int (__stdcall typeof(ImeConfigure))(void *, void *, unsigned int, void *); typedef int (__stdcall typeof(ImeDestroy))(unsigned int);

14 years, 11 months

[spetreolle] 49896: [CMAKE] Update msvcrt stubs.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Thu Dec 2 13:32:01 2010 New Revision: 49896 URL: http://svn.reactos.org/svn/reactos?rev=49896&view=rev Log: [CMAKE] Update msvcrt stubs. Modified: branches/cmake-bringup/dll/win32/msvcrt/stubs.c Modified: branches/cmake-bringup/dll/win32/msvcrt/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/stubs.c [iso-8859-1] Thu Dec 2 13:32:01 2010 @@ -1,11 +1,6 @@ -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wine/config.h" -#include "wine/exception.h" +#include <stubs.h> -void __wine_spec_unimplemented_stub( const char *module, const char *function ); #define UNIMPLEMENTED __wine_spec_unimplemented_stub("msvcrt.dll", __FUNCTION__) int __get_app_type()

14 years, 11 months

[spetreolle] 49895: [CMAKE] Fix build for winmm and syssetup.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Thu Dec 2 12:58:59 2010 New Revision: 49895 URL: http://svn.reactos.org/svn/reactos?rev=49895&view=rev Log: [CMAKE] Fix build for winmm and syssetup. Modified: branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt branches/cmake-bringup/dll/win32/winmm/winmm.spec Modified: branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/syssetu… ============================================================================== --- branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt [iso-8859-1] Thu Dec 2 12:58:59 2010 @@ -1,11 +1,11 @@ - set_unicode() add_definitions(-D_DLL -D__USE_CRTIMP) +set_rc_compiler() spec2def(syssetup.dll syssetup.spec) -add_library(syssetup SHARED +list(APPEND SOURCE classinst.c dllmain.c install.c @@ -13,6 +13,8 @@ wizard.c syssetup.rc ${CMAKE_CURRENT_BINARY_DIR}/syssetup.def) + +add_library(syssetup SHARED ${SOURCE}) set_module_type(syssetup win32dll) Modified: branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/C… ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Thu Dec 2 12:58:59 2010 @@ -6,7 +6,7 @@ set_rc_compiler() -add_library(winmm SHARED +list(APPEND SOURCE driver.c joystick.c lolvldrv.c @@ -18,6 +18,8 @@ winmm.c winmm_res.rc ${CMAKE_CURRENT_BINARY_DIR}/winmm.def) + +add_library(winmm SHARED ${SOURCE}) set_module_type(winmm win32dll) Modified: branches/cmake-bringup/dll/win32/winmm/winmm.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/w… ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/winmm.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winmm/winmm.spec [iso-8859-1] Thu Dec 2 12:58:59 2010 @@ -1,7 +1,7 @@ # ordinal exports 1 stdcall @(ptr long long) PlaySoundA -3 stub @ -4 stub @ +3 stub WINMM_3 +4 stub WINMM_4 @ stdcall CloseDriver(long long long) @ stdcall DefDriverProc(long long long long long)

14 years, 11 months

[spetreolle] 49894: [CMAKE] Disable msnet32.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Thu Dec 2 12:38:16 2010 New Revision: 49894 URL: http://svn.reactos.org/svn/reactos?rev=49894&view=rev Log: [CMAKE] Disable msnet32. Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Thu Dec 2 12:38:16 2010 @@ -96,7 +96,7 @@ add_subdirectory(msimtf) add_subdirectory(msisip) add_subdirectory(msisys.ocx) -add_subdirectory(msnet32) +#add_subdirectory(msnet32) #to be deleted in trunk. add_subdirectory(msrle32) add_subdirectory(mssign32) add_subdirectory(mssip32)

14 years, 11 months

[spetreolle] 49893: [CMAKE] Add stubs file to source automatically. Gcc: fix set_rc_compiler() so that it doesn't conflict with custom_incdefs().

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Thu Dec 2 12:36:16 2010 New Revision: 49893 URL: http://svn.reactos.org/svn/reactos?rev=49893&view=rev Log: [CMAKE] Add stubs file to source automatically. Gcc: fix set_rc_compiler() so that it doesn't conflict with custom_incdefs(). Modified: branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Thu Dec 2 12:36:16 2010 @@ -13,6 +13,9 @@ add_definitions(-mrtd -fno-builtin -w) endif() +spec2def(classpnp.sys class.spec) + +list(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_BINARY_DIR}/class_stubs.c) list(APPEND SOURCE autorun.c class.c @@ -31,8 +34,6 @@ class.rc ${CMAKE_CURRENT_BINARY_DIR}/class.def) -spec2def(classpnp.sys class.spec) - add_library(classpnp SHARED ${SOURCE}) target_link_libraries(classpnp ${PSEH_LIB} libcntpr) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Thu Dec 2 12:36:16 2010 @@ -173,14 +173,14 @@ get_directory_property(includes INCLUDE_DIRECTORIES) foreach(arg ${defines}) - set(result_defs "${result_defs} -D${arg}") + set(rc_result_defs "${rc_result_defs} -D${arg}") endforeach(arg ${defines}) foreach(arg ${includes}) - set(result_incs "-I${arg} ${result_incs}") + set(rc_result_incs "-I${arg} ${rc_result_incs}") endforeach(arg ${includes}) - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${result_defs} ${result_incs} -i <SOURCE> -O coff -o <OBJECT>") + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} ${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>") endmacro() #idl files support @@ -206,6 +206,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE) + list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c) endmacro() # Optional 3rd parameter: dllname Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Thu Dec 2 12:36:16 2010 @@ -200,6 +200,7 @@ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE) + list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c) endmacro() # Optional 3rd parameter: dllname

14 years, 11 months

[tkreuzer] 49892: [CMAKE] D3DXCreateTexture is already implemented, not a stub

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 2 12:14:35 2010 New Revision: 49892 URL: http://svn.reactos.org/svn/reactos?rev=49892&view=rev Log: [CMAKE] D3DXCreateTexture is already implemented, not a stub Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36.spec Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36.spec [iso-8859-1] Thu Dec 2 12:14:35 2010 @@ -92,7 +92,7 @@ @ stdcall -stub D3DXCreateTeapot(ptr ptr ptr) @ stdcall -stub D3DXCreateTextA(ptr long ptr long long ptr ptr ptr) @ stdcall -stub D3DXCreateTextW(ptr long ptr long long ptr ptr ptr) -@ stdcall -stub D3DXCreateTexture(ptr long long long long long long ptr) +@ stdcall D3DXCreateTexture(ptr long long long long long long ptr) @ stdcall -stub D3DXCreateTextureFromFileA(ptr ptr ptr) @ stdcall -stub D3DXCreateTextureFromFileExA(ptr ptr long long long long long long long long long ptr ptr ptr) @ stdcall -stub D3DXCreateTextureFromFileExW(ptr ptr long long long long long long long long long ptr ptr ptr)

14 years, 11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs