Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[jgardou] 61845: [WINED3D] - Try fixing MSVC build

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Jan 26 21:26:56 2014 New Revision: 61845 URL: http://svn.reactos.org/svn/reactos?rev=61845&view=rev Log: [WINED3D] - Try fixing MSVC build Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/utils.c [iso-8859-1] Sun Jan 26 21:26:56 2014 @@ -25,6 +25,7 @@ */ #include "wined3d_private.h" +#include <wine/port.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d);

10 years, 7 months

[jgardou] 61844: [DDRAW] - Comment out usage of GET_MODULE_HANDLE_EX_FLAG_PIN because it doesn't work.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Jan 26 20:55:38 2014 New Revision: 61844 URL: http://svn.reactos.org/svn/reactos?rev=61844&view=rev Log: [DDRAW] - Comment out usage of GET_MODULE_HANDLE_EX_FLAG_PIN because it doesn't work. Modified: trunk/reactos/dll/directx/wine/ddraw/main.c Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/main.c [iso-8859-1] Sun Jan 26 20:55:38 2014 @@ -879,7 +879,7 @@ * an application would unload ddraw from the WM_DESTROY handler for * that window, it would return to unmapped memory and die. Apparently * this is supposed to work on Windows. */ - if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_PIN, + if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS /*| GET_MODULE_HANDLE_EX_FLAG_PIN*/, (const WCHAR *)&ddraw_self, &ddraw_self)) ERR("Failed to get own module handle.\n");

10 years, 7 months

[jgardou] 61843: [DIRECT3D] - Update d3d9, d3d8, ddraw and wined3d to wine 1.7.11 CORE-7796 CORE-7803 #resolve #comment Fixed with wine sync. Thanks.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Jan 26 20:53:31 2014 New Revision: 61843 URL: http://svn.reactos.org/svn/reactos?rev=61843&view=rev Log: [DIRECT3D] - Update d3d9, d3d8, ddraw and wined3d to wine 1.7.11 CORE-7796 CORE-7803 #resolve #comment Fixed with wine sync. Thanks. Added: trunk/reactos/dll/directx/wine/wined3d/cs.c (with props) Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/shader.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw_classes.idl trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/palette.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/psdk/d3d9.h trunk/reactos/include/psdk/d3d9types.h trunk/reactos/include/reactos/wine/wgl.h trunk/reactos/include/reactos/wine/wined3d.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/shad… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/CMa… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/pal… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Added: trunk/reactos/dll/directx/wine/wined3d/cs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9.h?rev=61… Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9types.h?r… Modified: trunk/reactos/include/reactos/wine/wgl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wgl.h… Modified: trunk/reactos/include/reactos/wine/wined3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

10 years, 7 months

[tkreuzer] 61842: [KSECDD] - Fix a typo in KsecQueryVolumeInformation, noticed by Michael Fritscher - Implement KsecGatherEntropyData, which will be used in generation of cryptographically secure r...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 26 20:30:06 2014 New Revision: 61842 URL: http://svn.reactos.org/svn/reactos?rev=61842&view=rev Log: [KSECDD] - Fix a typo in KsecQueryVolumeInformation, noticed by Michael Fritscher - Implement KsecGatherEntropyData, which will be used in generation of cryptographically secure random numbers according to FIPS 186-2. Based on information from http://blogs.msdn.com/b/michael_howard/archive/2005/01/14/353379.aspx Modified: trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt trunk/reactos/drivers/crypto/ksecdd/dispatch.c trunk/reactos/drivers/crypto/ksecdd/ksecdd.h trunk/reactos/drivers/crypto/ksecdd/random.c Modified: trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/CMak… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt [iso-8859-1] Sun Jan 26 20:30:06 2014 @@ -1,5 +1,9 @@ spec2def(ksecdd.sys ksecdd.spec) + + +include_directories( + ${REACTOS_SOURCE_DIR}/lib/cryptlib) list(APPEND SOURCE ksecdd.c @@ -9,6 +13,7 @@ ksecdd.rc) add_library(ksecdd SHARED ${SOURCE}) +target_link_libraries(ksecdd cryptlib pseh) set_module_type(ksecdd kernelmodedriver) add_importlibs(ksecdd ntoskrnl hal) add_cd_file(TARGET ksecdd DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/crypto/ksecdd/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/disp… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/dispatch.c [iso-8859-1] Sun Jan 26 20:30:06 2014 @@ -60,7 +60,7 @@ PFILE_FS_DEVICE_INFORMATION DeviceInformation; /* Only FileFsDeviceInformation is supported */ - if (FsInformationClass == FileFsDeviceInformation) + if (FsInformationClass != FileFsDeviceInformation) { return STATUS_INVALID_INFO_CLASS; } Modified: trunk/reactos/drivers/crypto/ksecdd/ksecdd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/ksec… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/ksecdd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/ksecdd.h [iso-8859-1] Sun Jan 26 20:30:06 2014 @@ -8,10 +8,42 @@ #define _NO_KSECDD_IMPORT_ #include <ntifs.h> +#include <ndk/extypes.h> // 0x390004 #define IOCTL_KSEC_GEN_RANDOM \ CTL_CODE(FILE_DEVICE_KSEC, 0x01, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#if defined(_M_IX86) || defined(_M_AMD64) +typedef struct _KSEC_MACHINE_SPECIFIC_COUNTERS +{ + ULONG64 Tsc; + ULONG64 Pmc0; + ULONG64 Pmc1; + ULONG64 Ctr0; + ULONG64 Ctr1; +} KSEC_MACHINE_SPECIFIC_COUNTERS, *PKSEC_MACHINE_SPECIFIC_COUNTERS; +#else +typedef ULONG KSEC_MACHINE_SPECIFIC_COUNTERS; +#endif + +typedef struct _KSEC_ENTROPY_DATA +{ + HANDLE CurrentProcessId; + HANDLE CurrentThreadId; + LARGE_INTEGER TickCount; + LARGE_INTEGER SystemTime; + LARGE_INTEGER PerformanceCounter; + LARGE_INTEGER PerformanceFrequency; + UCHAR EnvironmentHash[16]; + KSEC_MACHINE_SPECIFIC_COUNTERS MachineSpecificCounters; + SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SystemProcessorPerformanceInformation; + SYSTEM_PERFORMANCE_INFORMATION SystemPerformanceInformation; + SYSTEM_EXCEPTION_INFORMATION SystemExceptionInformation; + SYSTEM_LOOKASIDE_INFORMATION SystemLookasideInformation; + SYSTEM_INTERRUPT_INFORMATION SystemInterruptInformation; + SYSTEM_PROCESS_INFORMATION SystemProcessInformation; +} KSEC_ENTROPY_DATA, *PKSEC_ENTROPY_DATA; NTSTATUS NTAPI Modified: trunk/reactos/drivers/crypto/ksecdd/random.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/rand… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/random.c [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/random.c [iso-8859-1] Sun Jan 26 20:30:06 2014 @@ -9,6 +9,10 @@ /* INCLUDES *******************************************************************/ #include "ksecdd.h" +#include <ndk/exfuncs.h> +#include <ndk/kefuncs.h> +#include <pseh/pseh2.h> +#include <md4.h> #define NDEBUG #include <debug.h> @@ -48,3 +52,154 @@ return STATUS_SUCCESS; } + +VOID +NTAPI +KsecReadMachineSpecificCounters( + _Out_ PKSEC_MACHINE_SPECIFIC_COUNTERS MachineSpecificCounters) +{ +#if defined(_M_IX86) || defined(_M_AMD64) + /* Check if RDTSC is available */ + if (ExIsProcessorFeaturePresent(PF_RDTSC_INSTRUCTION_AVAILABLE)) + { + /* Read the TSC value */ + MachineSpecificCounters->Tsc = __rdtsc(); + } + + /* Read the CPU event counter MSRs */ + MachineSpecificCounters->Ctr0 = __readmsr(0x12); + MachineSpecificCounters->Ctr1 = __readmsr(0x13); + + /* Check if this is an MMX capable CPU */ + if (ExIsProcessorFeaturePresent(PF_MMX_INSTRUCTIONS_AVAILABLE)) + { + /* Read the CPU performance counters 0 and 1 */ + MachineSpecificCounters->Pmc0 = __readpmc(0); + MachineSpecificCounters->Pmc1 = __readpmc(1); + } +#else + #error Implement me! +#endif +} + +/*! + * \see http://blogs.msdn.com/b/michael_howard/archive/2005/01/14/353379.aspx + */ +NTSTATUS +NTAPI +KsecGatherEntropyData( + PKSEC_ENTROPY_DATA EntropyData) +{ + MD4_CTX Md4Context; + PTEB Teb; + PPEB Peb; + PWSTR String; + ULONG ReturnLength; + NTSTATUS Status; + + /* Query some generic values */ + EntropyData->CurrentProcessId = PsGetCurrentProcessId(); + EntropyData->CurrentThreadId = PsGetCurrentThreadId(); + KeQueryTickCount(&EntropyData->TickCount); + KeQuerySystemTime(&EntropyData->SystemTime); + EntropyData->PerformanceCounter = KeQueryPerformanceCounter( + &EntropyData->PerformanceFrequency); + + /* Check if we have a TEB/PEB for the process environment */ + Teb = PsGetCurrentThread()->Tcb.Teb; + if (Teb != NULL) + { + Peb = Teb->ProcessEnvironmentBlock; + + /* Initialize the MD4 context */ + MD4Init(&Md4Context); + _SEH2_TRY + { + /* Get the end of the environment */ + String = Peb->ProcessParameters->Environment; + while (*String) + { + String += wcslen(String) + 1; + } + + /* Update the MD4 context from the environment data */ + MD4Update(&Md4Context, + (PUCHAR)Peb->ProcessParameters->Environment, + (PUCHAR)String - (PUCHAR)Peb->ProcessParameters->Environment); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Simply ignore the exception */ + } + _SEH2_END; + + /* Finalize and copy the MD4 hash */ + MD4Final(&Md4Context); + RtlCopyMemory(&EntropyData->EnvironmentHash, Md4Context.digest, 16); + } + + /* Read some machine specific hardware counters */ + KsecReadMachineSpecificCounters(&EntropyData->MachineSpecificCounters); + + /* Query processor performance information */ + Status = ZwQuerySystemInformation(SystemProcessorPerformanceInformation, + &EntropyData->SystemProcessorPerformanceInformation, + sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION), + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Query system performance information */ + Status = ZwQuerySystemInformation(SystemPerformanceInformation, + &EntropyData->SystemPerformanceInformation, + sizeof(SYSTEM_PERFORMANCE_INFORMATION), + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Query exception information */ + Status = ZwQuerySystemInformation(SystemExceptionInformation, + &EntropyData->SystemExceptionInformation, + sizeof(SYSTEM_EXCEPTION_INFORMATION), + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Query lookaside information */ + Status = ZwQuerySystemInformation(SystemLookasideInformation, + &EntropyData->SystemLookasideInformation, + sizeof(SYSTEM_LOOKASIDE_INFORMATION), + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Query interrupt information */ + Status = ZwQuerySystemInformation(SystemInterruptInformation, + &EntropyData->SystemInterruptInformation, + sizeof(SYSTEM_INTERRUPT_INFORMATION), + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Query process information */ + Status = ZwQuerySystemInformation(SystemProcessInformation, + &EntropyData->SystemProcessInformation, + sizeof(SYSTEM_PROCESS_INFORMATION), + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + return STATUS_SUCCESS; +}

10 years, 7 months

[akhaldi] 61841: [BOOTVID] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 26 20:24:59 2014 New Revision: 61841 URL: http://svn.reactos.org/svn/reactos?rev=61841&view=rev Log: [BOOTVID] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/drivers/base/bootvid/arm/bootvid.c trunk/reactos/drivers/base/bootvid/i386/bootvid.c trunk/reactos/drivers/base/bootvid/i386/vga.c trunk/reactos/drivers/base/bootvid/precomp.h Modified: trunk/reactos/drivers/base/bootvid/arm/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/arm/b… ============================================================================== --- trunk/reactos/drivers/base/bootvid/arm/bootvid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/arm/bootvid.c [iso-8859-1] Sun Jan 26 20:24:59 2014 @@ -1,6 +1,7 @@ #include "precomp.h" + #define NDEBUG -#include "debug.h" +#include <debug.h> #define LCDTIMING0_PPL(x) ((((x) / 16 - 1) & 0x3f) << 2) #define LCDTIMING1_LPP(x) (((x) & 0x3ff) - 1) Modified: trunk/reactos/drivers/base/bootvid/i386/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] Sun Jan 26 20:24:59 2014 @@ -1,4 +1,7 @@ #include "precomp.h" + +#include <ntifs.h> +#include <ndk/halfuncs.h> /* PRIVATE FUNCTIONS *********************************************************/ @@ -472,4 +475,3 @@ InitializePalette(); VidSolidColorFill(0, 0, 639, 479, 0); } - Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] Sun Jan 26 20:24:59 2014 @@ -1152,4 +1152,3 @@ } } } - Modified: trunk/reactos/drivers/base/bootvid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/preco… ============================================================================== --- trunk/reactos/drivers/base/bootvid/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/precomp.h [iso-8859-1] Sun Jan 26 20:24:59 2014 @@ -1,26 +1,18 @@ -#include "ntddk.h" -#include "ntifs.h" -#include "arc/arc.h" -#include "halfuncs.h" -#include "drivers/bootvid/bootvid.h" -#include "ioaccess.h" +#include <wdm.h> +#include <drivers/bootvid/bootvid.h> /* Define if FontData has upside down characters */ #undef CHAR_GEN_UPSIDE_DOWN #define BOOTCHAR_HEIGHT 13 -// -// Command Stream Definitions -// +/* Command Stream Definitions */ #define CMD_STREAM_WRITE 0x0 #define CMD_STREAM_WRITE_ARRAY 0x2 #define CMD_STREAM_USHORT 0x4 #define CMD_STREAM_READ 0x8 -// -// Bitmap Header -// +/* Bitmap Header */ typedef struct tagBITMAPINFOHEADER { ULONG biSize; @@ -42,9 +34,7 @@ VOID ); -// -// Globals -// +/* Globals */ extern USHORT AT_Initialization[]; extern ULONG curr_x; extern ULONG curr_y;

10 years, 7 months

[akhaldi] 61840: [WS2HELP] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 26 19:57:03 2014 New Revision: 61840 URL: http://svn.reactos.org/svn/reactos?rev=61840&view=rev Log: [WS2HELP] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/dll/win32/ws2help/context.c trunk/reactos/dll/win32/ws2help/handle.c trunk/reactos/dll/win32/ws2help/precomp.h trunk/reactos/dll/win32/ws2help/wshdrv.h Modified: trunk/reactos/dll/win32/ws2help/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/context.… ============================================================================== --- trunk/reactos/dll/win32/ws2help/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/context.c [iso-8859-1] Sun Jan 26 19:57:03 2014 @@ -8,6 +8,8 @@ /* INCLUDES ******************************************************************/ #include "precomp.h" + +#include <ws2help.h> /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/ws2help/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/handle.c… ============================================================================== --- trunk/reactos/dll/win32/ws2help/handle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/handle.c [iso-8859-1] Sun Jan 26 19:57:03 2014 @@ -8,6 +8,10 @@ /* INCLUDES ******************************************************************/ #include "precomp.h" + +#include <ndk/iofuncs.h> + +#include "wshdrv.h" /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/ws2help/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/precomp.… ============================================================================== --- trunk/reactos/dll/win32/ws2help/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/precomp.h [iso-8859-1] Sun Jan 26 19:57:03 2014 @@ -4,6 +4,7 @@ * FILE: lib/ws2help/precomp.h * PURPOSE: WinSock 2 Helper DLL */ + #ifndef __PRECOMP_H #define __PRECOMP_H @@ -16,6 +17,7 @@ #define INCL_WINSOCK_API_TYPEDEFS 1 #include <stdarg.h> + #include <windef.h> #include <winbase.h> #include <winreg.h> @@ -23,12 +25,7 @@ #include <ws2spi.h> /* NDK Headers */ -#include <rtlfuncs.h> -#include <iofuncs.h> - -/* Shared Winsock Helper headers */ -#include <ws2help.h> -#include "wshdrv.h" +#include <ndk/rtlfuncs.h> /* Missing definition */ #define SO_OPENTYPE 0x20 @@ -50,6 +47,4 @@ #define WS2HELP_PROLOG() \ (Ws2helpInitialized? ERROR_SUCCESS : Ws2helpInitialize()) -#endif /* __WS2HELP_H */ - -/* EOF */ +#endif /* __PRECOMP_H */ Modified: trunk/reactos/dll/win32/ws2help/wshdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/wshdrv.h… ============================================================================== --- trunk/reactos/dll/win32/ws2help/wshdrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/wshdrv.h [iso-8859-1] Sun Jan 26 19:57:03 2014 @@ -25,4 +25,4 @@ #define IOCTL_WS2IFSL_SET_HANDLE 0x12B00 -#endif +#endif /* __WSHDRV_H */

10 years, 7 months

[akhaldi] 61839: [WS2_32_NEW] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 26 19:40:58 2014 New Revision: 61839 URL: http://svn.reactos.org/svn/reactos?rev=61839&view=rev Log: [WS2_32_NEW] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h trunk/reactos/dll/win32/ws2_32_new/src/addrconv.c trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c trunk/reactos/dll/win32/ws2_32_new/src/async.c trunk/reactos/dll/win32/ws2_32_new/src/bhook.c trunk/reactos/dll/win32/ws2_32_new/src/dcatalog.c trunk/reactos/dll/win32/ws2_32_new/src/dcatitem.c trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c trunk/reactos/dll/win32/ws2_32_new/src/dprocess.c trunk/reactos/dll/win32/ws2_32_new/src/dprovide.c trunk/reactos/dll/win32/ws2_32_new/src/dsocket.c trunk/reactos/dll/win32/ws2_32_new/src/dthread.c trunk/reactos/dll/win32/ws2_32_new/src/dupsock.c trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c trunk/reactos/dll/win32/ws2_32_new/src/event.c trunk/reactos/dll/win32/ws2_32_new/src/getproto.c trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c trunk/reactos/dll/win32/ws2_32_new/src/ioctl.c trunk/reactos/dll/win32/ws2_32_new/src/nscatalo.c trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c trunk/reactos/dll/win32/ws2_32_new/src/nspinstl.c trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c trunk/reactos/dll/win32/ws2_32_new/src/nsquery.c trunk/reactos/dll/win32/ws2_32_new/src/qos.c trunk/reactos/dll/win32/ws2_32_new/src/qshelpr.c trunk/reactos/dll/win32/ws2_32_new/src/rasdial.c trunk/reactos/dll/win32/ws2_32_new/src/recv.c trunk/reactos/dll/win32/ws2_32_new/src/rnr.c trunk/reactos/dll/win32/ws2_32_new/src/scihlpr.c trunk/reactos/dll/win32/ws2_32_new/src/select.c trunk/reactos/dll/win32/ws2_32_new/src/send.c trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c trunk/reactos/dll/win32/ws2_32_new/src/socklife.c trunk/reactos/dll/win32/ws2_32_new/src/spinstal.c trunk/reactos/dll/win32/ws2_32_new/src/sputil.c trunk/reactos/dll/win32/ws2_32_new/src/startup.c trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -23,11 +23,8 @@ #include <winreg.h> #include <winnls.h> #include <winuser.h> -#include <ws2tcpip.h> #include <ws2spi.h> -//#include <ndk/umtypes.h> #include <ndk/rtlfuncs.h> -//#include <svcguid.h> /* Winsock Helper Header */ #include <ws2help.h> Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrconv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/addrconv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/addrconv.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,11 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - + /* DEFINES *******************************************************************/ #ifndef BE Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,7 +7,10 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> + +#include <ws2tcpip.h> //#define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/ws2_32_new/src/async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/async.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/async.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,9 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* DATA **********************************************************************/ + BOOLEAN WsAsyncThreadInitialized; LONG WsAsyncTaskHandle; PLIST_ENTRY WsAsyncQueue; Modified: trunk/reactos/dll/win32/ws2_32_new/src/bhook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/b… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/bhook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/bhook.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dcatalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dcatalog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dcatalog.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dcatitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dcatitem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dcatitem.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,9 +7,8 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -13,6 +13,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dprocess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dprocess.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dprocess.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,9 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* DATA **********************************************************************/ + PWSPROCESS CurrentWsProcess; #define WsProcLock() EnterCriticalSection((LPCRITICAL_SECTION)&Process->ThreadLock); Modified: trunk/reactos/dll/win32/ws2_32_new/src/dprovide.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dprovide.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dprovide.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dsocket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dsocket.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dsocket.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dthread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dthread.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dupsock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dupsock.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dupsock.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/e… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/e… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/event.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,11 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - + /* FUNCTIONS *****************************************************************/ /* Modified: trunk/reactos/dll/win32/ws2_32_new/src/getproto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/g… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/getproto.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/getproto.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/g… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG Modified: trunk/reactos/dll/win32/ws2_32_new/src/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/i… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/ioctl.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nscatalo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nscatalo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nscatalo.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,9 +7,8 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nspinstl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nspinstl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nspinstl.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nsquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nsquery.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nsquery.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/qos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/q… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/qos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/qos.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/qshelpr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/q… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/qshelpr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/qshelpr.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/rasdial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/r… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/rasdial.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/rasdial.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG Modified: trunk/reactos/dll/win32/ws2_32_new/src/recv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/r… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/recv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/recv.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/rnr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/r… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/rnr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/rnr.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/scihlpr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/scihlpr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/scihlpr.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG Modified: trunk/reactos/dll/win32/ws2_32_new/src/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/send.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/send.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/socklife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/socklife.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/socklife.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/spinstal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/spinstal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/spinstal.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/sputil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/sputil.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/sputil.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/startup.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG Modified: trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,9 +7,8 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/

10 years, 7 months

[hbelusca] 61838: [NTVDM] - Start to refactor the DOS sources: Introduce the DEM (DOS Emulation) support library that is used by our built-in DOS, and that is used (via BOPs) by windows NT DOS (fil...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 26 18:25:59 2014 New Revision: 61838 URL: http://svn.reactos.org/svn/reactos?rev=61838&view=rev Log: [NTVDM] - Start to refactor the DOS sources: Introduce the DEM (DOS Emulation) support library that is used by our built-in DOS, and that is used (via BOPs) by windows NT DOS (files: ntio.sys and ntdos.sys). - Export some of DEM functions; stub most of them and implement the remaining ones (with existing code that we had in dos.c before). Added: branches/ntvdm/subsystems/ntvdm/dos/dem.c (with props) branches/ntvdm/subsystems/ntvdm/dos/dem.h (with props) branches/ntvdm/subsystems/ntvdm/dos/dos32/ (with props) branches/ntvdm/subsystems/ntvdm/dos/dos32/dos.c - copied, changed from r61829, branches/ntvdm/subsystems/ntvdm/dos/dos.c branches/ntvdm/subsystems/ntvdm/dos/dos32/dos.h - copied, changed from r61829, branches/ntvdm/subsystems/ntvdm/dos/dos.h Removed: branches/ntvdm/subsystems/ntvdm/dos/dos.c branches/ntvdm/subsystems/ntvdm/dos/dos.h Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/bios/bios.c branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.spec [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… Added: branches/ntvdm/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dem.… Added: branches/ntvdm/subsystems/ntvdm/dos/dem.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dem.… Removed: branches/ntvdm/subsystems/ntvdm/dos/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos.… Removed: branches/ntvdm/subsystems/ntvdm/dos/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos.… Copied: branches/ntvdm/subsystems/ntvdm/dos/dos32/dos.c (from r61829, branches/ntvdm/subsystems/ntvdm/dos/dos.c) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… Copied: branches/ntvdm/subsystems/ntvdm/dos/dos32/dos.h (from r61829, branches/ntvdm/subsystems/ntvdm/dos/dos.h) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.sp…

10 years, 7 months

[akhaldi] 61837: [WS2_32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 26 17:48:17 2014 New Revision: 61837 URL: http://svn.reactos.org/svn/reactos?rev=61837&view=rev Log: [WS2_32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/ws2_32/include/catalog.h trunk/reactos/dll/win32/ws2_32/include/debug.h trunk/reactos/dll/win32/ws2_32/include/handle.h trunk/reactos/dll/win32/ws2_32/include/upcall.h trunk/reactos/dll/win32/ws2_32/include/ws2_32.h trunk/reactos/dll/win32/ws2_32/misc/async.c trunk/reactos/dll/win32/ws2_32/misc/ns.c trunk/reactos/dll/win32/ws2_32/misc/stubs.c Modified: trunk/reactos/dll/win32/ws2_32/include/catalog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/catalog.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/catalog.h [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -4,6 +4,7 @@ * FILE: include/catalog.h * PURPOSE: Service Provider Catalog definitions */ + #ifndef __CATALOG_H #define __CATALOG_H @@ -54,5 +55,3 @@ VOID DestroyCatalog(VOID); #endif /* __CATALOG_H */ - -/* EOF */ Modified: trunk/reactos/dll/win32/ws2_32/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/debug.h [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -6,6 +6,7 @@ * DEFINES: DBG - Enable debug output * NASSERT - Disable assertions */ + #ifndef __DEBUG_H #define __DEBUG_H @@ -62,5 +63,3 @@ #define CP CHECKPOINT #endif /* __DEBUG_H */ - -/* EOF */ Modified: trunk/reactos/dll/win32/ws2_32/include/handle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/h… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/handle.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/handle.h [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -4,10 +4,9 @@ * FILE: include/handle.h * PURPOSE: Provider handle definitions */ + #ifndef __HANDLE_H #define __HANDLE_H - -//#include <catalog.h> typedef struct _PROVIDER_HANDLE { @@ -44,5 +43,3 @@ FreeProviderHandleTable(VOID); #endif /* __HANDLE_H */ - -/* EOF */ Modified: trunk/reactos/dll/win32/ws2_32/include/upcall.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/u… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/upcall.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/upcall.h [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -4,6 +4,7 @@ * FILE: include/upcall.h * PURPOSE: Upcall function defintions */ + #ifndef __UPCALL_H #define __UPCALL_H @@ -100,5 +101,3 @@ OUT LPINT lpErrno); #endif /* __UPCALL_H */ - -/* EOF */ Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/ws2_32.h [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -4,22 +4,20 @@ * FILE: include/ws2_32.h * PURPOSE: WinSock 2 DLL header */ + #ifndef __WS2_32_H #define __WS2_32_H -#include <stdlib.h> -#include <stdio.h> +#include <stdarg.h> #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> + #include <windef.h> #include <winbase.h> -#include <winnls.h> #include <winuser.h> #include <ws2spi.h> -#include <ws2tcpip.h> #define NTOS_MODE_USER #include <ndk/rtlfuncs.h> @@ -31,7 +29,6 @@ #include "catalog.h" #include "handle.h" -//#include "upcall.h" #define EXPORT WINAPI @@ -129,5 +126,3 @@ #endif /* LE */ #endif /* __WS2_32_H */ - -/* EOF */ Modified: trunk/reactos/dll/win32/ws2_32/misc/async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/asyn… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/async.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/async.c [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -39,15 +39,12 @@ #define COM_NO_WINDOWS_H #include <wine/config.h> -//#include "wine/port.h" #include <stdarg.h> #include <windef.h> #include <winbase.h> -//#include "wingdi.h" #include <winuser.h> #include <winsock2.h> -//#include "ws2spi.h" #include <wine/debug.h> Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -9,6 +9,10 @@ */ #include "ws2_32.h" + +#include <stdio.h> +#include <stdlib.h> +#include <winnls.h> #ifndef BUFSIZ #define BUFSIZ 1024 Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -9,6 +9,8 @@ */ #include "ws2_32.h" + +#include <ws2tcpip.h> /* * @implemented

10 years, 7 months

[akhaldi] 61836: [WINTRUST] * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 26 17:46:23 2014 New Revision: 61836 URL: http://svn.reactos.org/svn/reactos?rev=61836&view=rev Log: [WINTRUST] * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/wintrust/wintrust_priv.h Modified: trunk/reactos/dll/win32/wintrust/wintrust_priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_priv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust_priv.h [iso-8859-1] Sun Jan 26 17:46:23 2014 @@ -15,12 +15,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef __WINTRUST_PRIV_H__ #define __WINTRUST_PRIV_H__ -#include <config.h> +#include <wine/config.h> -#include <stdarg.h> #include <stdio.h> #define _INC_WINDOWS @@ -33,10 +33,8 @@ #include <winuser.h> #include <winreg.h> #include <winternl.h> -#include <wintrust.h> #include <softpub.h> #include <mscat.h> -#include <mssip.h> #include <wine/debug.h> #include <wine/unicode.h> @@ -51,4 +49,4 @@ BOOL WINAPI WINTRUST_AddPrivData(CRYPT_PROVIDER_DATA *data, CRYPT_PROVIDER_PRIVDATA *pPrivData2Add) DECLSPEC_HIDDEN; -#endif /* ndef __WINTRUST_PRIV_H__ */ +#endif /* __WINTRUST_PRIV_H__ */

10 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2014