Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 42379: - Connect a new Win32 process to the window station, as it's supposed to be done. However, desktop inheritance still needs to be checked. There is some testing code in connect_process_winstation left #if0ed out.
by fireball＠svn.reactos.org 04 Aug '09

04 Aug '09

Author: fireball Date: Tue Aug 4 14:13:26 2009 New Revision: 42379 URL: http://svn.reactos.org/svn/reactos?rev=42379&view=rev Log: - Connect a new Win32 process to the window station, as it's supposed to be done. However, desktop inheritance still needs to be checked. There is some testing code in connect_process_winstation left #if0ed out. Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/user.h branches/arwinss/reactos/subsystems/win32/win32k/main/init.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/user.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/user.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/user.h [iso-8859-1] Tue Aug 4 14:13:26 2009 @@ -156,7 +156,7 @@ extern struct desktop *get_desktop_obj( PPROCESSINFO process, obj_handle_t handle, unsigned int access ); extern struct winstation *get_process_winstation( PPROCESSINFO process, unsigned int access ); extern struct desktop *get_thread_desktop( PTHREADINFO thread, unsigned int access ); -extern void connect_process_winstation( PPROCESSINFO process, PTHREADINFO parent ); +extern void connect_process_winstation( PPROCESSINFO process ); extern void set_process_default_desktop( PPROCESSINFO process, struct desktop *desktop, obj_handle_t handle ); extern void close_process_desktop( PPROCESSINFO process ); Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Tue Aug 4 14:13:26 2009 @@ -13,7 +13,9 @@ /* System service call table */ #include <include/napi.h> +#include "object.h" #include <handle.h> +#include <user.h> #define NDEBUG #include <debug.h> @@ -90,6 +92,7 @@ InitializeListHead(&Win32Process->Classes); Win32Process->handles = alloc_handle_table(Win32Process, 0); + connect_process_winstation(Win32Process); } else { Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] Tue Aug 4 14:13:26 2009 @@ -376,20 +376,52 @@ } /* connect a process to its window station */ -void connect_process_winstation( PPROCESSINFO process, PTHREADINFO parent ) +void connect_process_winstation( PPROCESSINFO process ) { struct winstation *winstation = NULL; struct desktop *desktop = NULL; obj_handle_t handle; + PPROCESSINFO parent = NULL; + PEPROCESS eparent; + HANDLE parent_handle; + NTSTATUS status; + +#if 0 + PRTL_USER_PROCESS_PARAMETERS ProcessParams = (process->peProcess->Peb ? process->peProcess->Peb->ProcessParameters : NULL); + PUNICODE_STRING DesktopPath; + + DesktopPath = (ProcessParams ? ((ProcessParams->DesktopInfo.Length > 0) ? &ProcessParams->DesktopInfo : NULL) : NULL); + if (DesktopPath) + { + DPRINT1("DesktopPath %wZ\n", DesktopPath); + } + /*Status = IntParseDesktopPath(Process, + DesktopPath, + &hWinSta, + &hDesk);*/ +#endif + + /* get parent process */ + parent_handle = PsGetProcessInheritedFromUniqueProcessId(process->peProcess); + if (parent_handle) + { + /* Lookup the process */ + status = PsLookupProcessByProcessId(parent_handle, &eparent); + if (NT_SUCCESS(status)) + { + /* get win32 process out of it */ + parent = PsGetProcessWin32Process(eparent); + } + } /* check for an inherited winstation handle (don't ask...) */ if ((handle = find_inherited_handle( process, &winstation_ops ))) { winstation = (struct winstation *)get_handle_obj( process, handle, 0, &winstation_ops ); } - else if (parent && parent->process->winstation) - { - handle = duplicate_handle( parent->process, parent->process->winstation, + else if (parent && parent->winstation) + { + handle = duplicate_handle( parent, parent->winstation, process, 0, 0, DUP_HANDLE_SAME_ACCESS ); winstation = (struct winstation *)get_handle_obj( process, handle, 0, &winstation_ops ); } @@ -403,17 +435,39 @@ } else if (parent && parent->desktop) { - desktop = get_desktop_obj( parent->process, parent->desktop, 0 ); + desktop = get_desktop_obj( parent, parent->desktop, 0 ); if (!desktop || desktop->winstation != winstation) goto done; - handle = duplicate_handle( parent->process, parent->desktop, + handle = duplicate_handle( parent, parent->desktop, process, 0, 0, DUP_HANDLE_SAME_ACCESS ); } if (handle) set_process_default_desktop( process, desktop, handle ); + +#if 0 + { + // set default desktop differently. Just always assign a "default" desktop + WCHAR deskbuf[8]; + struct unicode_str full_str, desktop_name; + WCHAR *full_name; + + desktop_name.str = deskbuf; + desktop_name.len = sizeof(deskbuf); + wcscpy(deskbuf, L"Default"); + + if ((full_name = build_desktop_name( &desktop_name, winstation, &full_str ))) + { + handle = open_object( winstation_namespace, &full_str, &desktop_ops, GENERIC_ALL, + OBJ_CASE_INSENSITIVE ); + ExFreePool( full_name ); + DPRINT1("handle %x\n", handle); + } + } +#endif done: if (desktop) release_object( desktop ); if (winstation) release_object( winstation ); + if (eparent) ObDereferenceObject(eparent); clear_error(); }

1 0

[sginsberg] 42378: - Remove asm-optimized versions of RtlRandom and RtlUniform -- there is *no* reason to use hand-optimized assembly for simple routines like these -- let the compiler do its job, please. Also, we compiled random.c *and* random_asm.S, meaning we duplicated the functions -- the compiler didn't detect this and silently used the C versions. - Don't forward RtlRandomEx to RtlRandom in ntdll -- RtlRandomEx should use a different algorithm (but is simply a copy of RtlRandom right now)
by sginsberg＠svn.reactos.org 04 Aug '09

04 Aug '09

Author: sginsberg Date: Tue Aug 4 13:22:50 2009 New Revision: 42378 URL: http://svn.reactos.org/svn/reactos?rev=42378&view=rev Log: - Remove asm-optimized versions of RtlRandom and RtlUniform -- there is *no* reason to use hand-optimized assembly for simple routines like these -- let the compiler do its job, please. Also, we compiled random.c *and* random_asm.S, meaning we duplicated the functions -- the compiler didn't detect this and silently used the C versions. - Don't forward RtlRandomEx to RtlRandom in ntdll -- RtlRandomEx should use a different algorithm (but is simply a copy of RtlRandom right now). - Revert RtlUniform back to the "slow" version -- let the compiler do its job instead of obfuscating code for a miniscule speed gain. Removed: trunk/reactos/lib/rtl/i386/random_asm.S Modified: trunk/reactos/dll/ntdll/def/ntdll_arm.def trunk/reactos/dll/ntdll/def/ntdll_i386.def trunk/reactos/lib/rtl/random.c trunk/reactos/lib/rtl/rtl.rbuild Modified: trunk/reactos/dll/ntdll/def/ntdll_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll_arm.de… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll_arm.def [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll_arm.def [iso-8859-1] Tue Aug 4 13:22:50 2009 @@ -621,7 +621,7 @@ RtlRaiseException RtlRaiseStatus RtlRandom -RtlRandomEx=RtlRandom +RtlRandomEx RtlReAllocateHeap RtlRealPredecessor RtlRealSuccessor Modified: trunk/reactos/dll/ntdll/def/ntdll_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll_i386.d… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll_i386.def [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll_i386.def [iso-8859-1] Tue Aug 4 13:22:50 2009 @@ -827,7 +827,7 @@ RtlRaiseException@4 RtlRaiseStatus@4 RtlRandom@4 -RtlRandomEx=RtlRandom@4 +RtlRandomEx@4 RtlReAllocateHeap@16 ;RtlReadMemoryStream ;RtlReadOutOfProcessMemoryStream Removed: trunk/reactos/lib/rtl/i386/random_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/random_asm.S?… ============================================================================== --- trunk/reactos/lib/rtl/i386/random_asm.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/random_asm.S (removed) @@ -1,245 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ranom.asm - * PURPOSE: Random number generator functions - * PROGRAMMER: Magnus Olsen (magnusolsen(a)greatlord.com) - * UPDATE HISTORY: - * Created 27/07/2005 - */ - -.intel_syntax noprefix - -/* GLOBALS ****************************************************************/ - -.globl _RtlRandom@4 // [1] (no bug) (max optimze code) -.globl _RtlUniform@4 // [2] (no bug) (max optimze code) -.globl _SavedValue // [3] (no bug) (max optimze code) - -/* FUNCTIONS ***************************************************************/ - -_RtlRandom@4: - // load pointer - mov ecx,[esp+4] - mov eax,[ecx] - - // Result = *Seed * 0xffffffed + 0x7fffffc3 // take now 3 cycles - lea edx,[eax + eax * 8] - - lea eax,[eax + edx * 2 + 2147483709 ] // + 2147483709 - neg eax - - cmp eax,-1 - je .RtlRandom_Rand1 - cmp eax, 2147483646 - je .RtlRandom_Rand1 - - cmp eax, 2147483647 - je .RtlRandom_Rand2 - - test eax,eax - jns .RtlRandom_Rand3 - - // else { - mov edx,eax - and edx,1 - add eax,edx - and eax,2147483647 - mov [ecx],eax - jmp .RtlRandom_Seed - -.RtlRandom_Rand1: - // if (Result == 0xffffffff || Result == 0x7ffffffe) - add eax, 2 - and eax, 2147483647 - mov [ecx],eax - jmp .RtlRandom_Seed - -.RtlRandom_Rand2: - // else if (Result == 0x7fffffff) - xor eax,eax - mov [ecx],eax - jmp .RtlRandom_Seed - -.RtlRandom_Rand3: - // else if ((Result & 0x80000000) == 0) - mov edx,eax - xor edx,-1 // not edx lock all clock until it finsish, but xor does not do that - and edx,1 - add eax,edx - mov [ecx],eax - -.RtlRandom_Seed: - mov eax,[ecx] - - // Result = *Seed * 0xffffffed + 0x7fffffc3 // take now 3 cycles - lea edx,[eax + eax * 8] - - lea eax,[eax + edx * 2 + 2147483709 ] // + 2147483709 09-18 - neg eax - - cmp eax,-1 - je .RtlRandom_Seed1 - cmp eax, 2147483646 - je .RtlRandom_Seed1 - - cmp eax, 2147483647 - je .RtlRandom_Seed2 - - test eax,eax - jns .RtlRandom_Seed3 - - // else { - mov edx,eax - and edx,1 - add eax,edx - and eax,2147483647 - - // end - mov edx,[ecx] - mov [ecx],eax - - mov ecx,eax // pos - and ecx, 0x7f // pos = seed & 0x7f - mov eax,ecx// - mov eax, [_SavedValue + ecx*4] - mov [_SavedValue + ecx*4], edx - ret 4 - -.RtlRandom_Seed1: - // if (Result == 0xffffffff || Result == 0x7ffffffe) - add eax, 2 - and eax, 2147483647 - - // end - mov edx,[ecx] - mov [ecx],eax - - mov ecx,eax // pos - and ecx, 0x7f // pos = seed & 0x7f - mov eax,ecx// - mov eax, [_SavedValue + ecx*4] - mov [_SavedValue + ecx*4], edx - ret 4 - -.RtlRandom_Seed2: - // else if (Result == 0x7fffffff) - xor eax,eax - - // end - mov edx,[ecx] - mov [ecx],eax - - mov ecx,eax // pos - and ecx, 0x7f // pos = seed & 0x7f - mov eax,ecx// - mov eax, [_SavedValue + ecx*4] - mov [_SavedValue + ecx*4], edx - ret 4 - -.RtlRandom_Seed3: - // else if ((Result & 0x80000000) == 0) - mov edx,eax - xor edx,-1 // not edx lock all clock until it finsish, but xor does not do that - and edx,1 - add eax,edx - - // end - mov edx,[ecx] - mov [ecx],eax - - mov ecx,eax // pos - and ecx, 0x7f // pos = seed & 0x7f - mov eax,ecx// - mov eax, [_SavedValue + ecx*4] - mov [_SavedValue + ecx*4], edx - ret 4 - -// prototype: ULONG STDCALL RtlUniform (PULONG Seed) -_RtlUniform@4: - // load pointer - mov ecx,[esp+4] - mov eax,[ecx] - - // Result = *Seed * 0xffffffed + 0x7fffffc3 // take now 3 cycles - lea edx,[eax + eax * 8] - - lea eax,[eax + edx * 2 + 2147483709 ] // + 2147483709 09-18 - neg eax - - cmp eax,-1 - je .RtlUniform_jump1 - cmp eax, 2147483646 - je .RtlUniform_jump1 - - cmp eax, 2147483647 - je .RtlUniform_jump2 - - test eax,eax - jns .RtlUniform_jump3 - - // else { - mov edx,eax - and edx,1 - add eax,edx - and eax,2147483647 - mov [ecx],eax - ret 4 - -.RtlUniform_jump1: - // if (Result == 0xffffffff || Result == 0x7ffffffe) - add eax, 2 - and eax, 2147483647 - mov [ecx],eax - ret 4 - -.RtlUniform_jump2: - // else if (Result == 0x7fffffff) - xor eax,eax - mov [ecx],eax - ret 4 - -.RtlUniform_jump3: - // else if ((Result & 0x80000000) == 0) - mov edx,eax - xor edx,-1 // not edx lock all clock until it finsish, but xor does not do that - and edx,1 - add eax,edx - mov [ecx],eax - ret 4 - -.data -// SavedValue[128] -_SavedValue: - .long 0x4c8bc0aa, 0x4c022957, 0x2232827a, 0x2f1e7626 - .long 0x7f8bdafb, 0x5c37d02a, 0x0ab48f72, 0x2f0c4ffa - .long 0x290e1954, 0x6b635f23, 0x5d3885c0, 0x74b49ff8 - .long 0x5155fa54, 0x6214ad3f, 0x111e9c29, 0x242a3a09 - .long 0x75932ae1, 0x40ac432e, 0x54f7ba7a, 0x585ccbd5 - .long 0x6df5c727, 0x0374dad1, 0x7112b3f1, 0x735fc311 - .long 0x404331a9, 0x74d97781, 0x64495118, 0x323e04be - .long 0x5974b425, 0x4862e393, 0x62389c1d, 0x28a68b82 - .long 0x0f95da37, 0x7a50bbc6, 0x09b0091c, 0x22cdb7b4 - .long 0x4faaed26, 0x66417ccd, 0x189e4bfa, 0x1ce4e8dd - .long 0x5274c742, 0x3bdcf4dc, 0x2d94e907, 0x32eac016 - .long 0x26d33ca3, 0x60415a8a, 0x31f57880, 0x68c8aa52 - .long 0x23eb16da, 0x6204f4a1, 0x373927c1, 0x0d24eb7c - .long 0x06dd7379, 0x2b3be507, 0x0f9c55b1, 0x2c7925eb - .long 0x36d67c9a, 0x42f831d9, 0x5e3961cb, 0x65d637a8 - .long 0x24bb3820, 0x4d08e33d, 0x2188754f, 0x147e409e - .long 0x6a9620a0, 0x62e26657, 0x7bd8ce81, 0x11da0abb - .long 0x5f9e7b50, 0x23e444b6, 0x25920c78, 0x5fc894f0 - .long 0x5e338cbb, 0x404237fd, 0x1d60f80f, 0x320a1743 - .long 0x76013d2b, 0x070294ee, 0x695e243b, 0x56b177fd - .long 0x752492e1, 0x6decd52f, 0x125f5219, 0x139d2e78 - .long 0x1898d11e, 0x2f7ee785, 0x4db405d8, 0x1a028a35 - .long 0x63f6f323, 0x1f6d0078, 0x307cfd67, 0x3f32a78a - .long 0x6980796c, 0x462b3d83, 0x34b639f2, 0x53fce379 - .long 0x74ba50f4, 0x1abc2c4b, 0x5eeaeb8d, 0x335a7a0d - .long 0x3973dd20, 0x0462d66b, 0x159813ff, 0x1e4643fd - .long 0x06bc5c62, 0x3115e3fc, 0x09101613, 0x47af2515 - .long 0x4f11ec54, 0x78b99911, 0x3db8dd44, 0x1ec10b9b - .long 0x5b5506ca, 0x773ce092, 0x567be81a, 0x5475b975 - .long 0x7a2cde1a, 0x494536f5, 0x34737bb4, 0x76d9750b - .long 0x2a1f6232, 0x2e49644d, 0x7dddcbe7, 0x500cebdb - .long 0x619dab9e, 0x48c626fe, 0x1cda3193, 0x52dabe9d Modified: trunk/reactos/lib/rtl/random.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/random.c?rev=42378… ============================================================================== --- trunk/reactos/lib/rtl/random.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/random.c [iso-8859-1] Tue Aug 4 13:22:50 2009 @@ -132,37 +132,16 @@ * function and our function return a random number uniformly * distributed over [0..MAXLONG-1]. */ -ULONG NTAPI -RtlUniform (PULONG Seed) +ULONG +NTAPI +RtlUniform(IN PULONG Seed) { - ULONG Result; + ULONG Result; - /* - * Instead of the algorithm stated above, we use the algorithm - * below, which is totally equivalent (see the tests), but does - * not use a division and therefore is faster. - */ - Result = *Seed * 0xffffffed + 0x7fffffc3; + /* Generate the random number */ + Result = (*Seed * 0x7fffffed + 0x7fffffc3) % MAXLONG; - if (Result == 0xffffffff || Result == 0x7ffffffe) - { - Result = (Result + 2) & MAXLONG; - } - else if (Result == 0x7fffffff) - { - Result = 0; - } - else if ((Result & 0x80000000) == 0) - { - Result = Result + (~Result & 1); - } - else - { - Result = (Result + (Result & 1)) & MAXLONG; - } - - *Seed = Result; - - return Result; + /* Return it */ + *Seed = Result; + return Result; } -/* EOF */ Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=423… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Tue Aug 4 13:22:50 2009 @@ -13,7 +13,6 @@ <file>except_asm.s</file> <file>except.c</file> <file>interlck.S</file> - <file>random_asm.S</file> <file>rtlswap.S</file> <file>rtlmem.s</file> <file>res_asm.s</file>

1 0

[fireball] 42377: - Merge 42376 (along with committing a merge history leftover from a previous merge).
by fireball＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: fireball Date: Mon Aug 3 23:06:49 2009 New Revision: 42377 URL: http://svn.reactos.org/svn/reactos?rev=42377&view=rev Log: - Merge 42376 (along with committing a merge history leftover from a previous merge). Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/include/ndk/psfuncs.h Propchange: branches/arwinss/reactos/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk/reactos:42202,42376 Modified: branches/arwinss/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ndk/psf… ============================================================================== --- branches/arwinss/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/ndk/psfuncs.h [iso-8859-1] Mon Aug 3 23:06:49 2009 @@ -155,6 +155,12 @@ PsSetProcessPriorityByClass( IN PEPROCESS Process, IN PSPROCESSPRIORITYMODE Type +); + +HANDLE +NTAPI +PsGetProcessInheritedFromUniqueProcessId( + IN PEPROCESS Process ); //

1 0

[fireball] 42376: - Add PsGetProcessInheritedFromUniqueProcessId declaration to NDK.
by fireball＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: fireball Date: Mon Aug 3 23:01:48 2009 New Revision: 42376 URL: http://svn.reactos.org/svn/reactos?rev=42376&view=rev Log: - Add PsGetProcessInheritedFromUniqueProcessId declaration to NDK. Modified: trunk/reactos/include/ndk/psfuncs.h Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Mon Aug 3 23:01:48 2009 @@ -155,6 +155,12 @@ PsSetProcessPriorityByClass( IN PEPROCESS Process, IN PSPROCESSPRIORITYMODE Type +); + +HANDLE +NTAPI +PsGetProcessInheritedFromUniqueProcessId( + IN PEPROCESS Process ); //

1 0

[cgutman] 42375: Broadcast fixes - Treat 255.255.255.255 as an undefined address - Choose the first interface when sending a broadcast packet (fixes failing with STATUS_NETWORK_UNREACHABLE when trying to send a broadcast packet) - Fix a broadcast address check so 255.255.255.255 will also pass (fixes sending queued broadcast packets) - Now a broadcast packet can be successfully sent from an interface with a valid IP address (previously they could only be sent when the interface didn't have an NC
by cgutman＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: cgutman Date: Mon Aug 3 22:10:47 2009 New Revision: 42375 URL: http://svn.reactos.org/svn/reactos?rev=42375&view=rev Log: Broadcast fixes - Treat 255.255.255.255 as an undefined address - Choose the first interface when sending a broadcast packet (fixes failing with STATUS_NETWORK_UNREACHABLE when trying to send a broadcast packet) - Fix a broadcast address check so 255.255.255.255 will also pass (fixes sending queued broadcast packets) - Now a broadcast packet can be successfully sent from an interface with a valid IP address (previously they could only be sent when the interface didn't have an NCE entry) Modified: trunk/reactos/lib/drivers/ip/network/address.c trunk/reactos/lib/drivers/ip/network/interface.c trunk/reactos/lib/drivers/ip/network/neighbor.c Modified: trunk/reactos/lib/drivers/ip/network/address.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/add… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/address.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/address.c [iso-8859-1] Mon Aug 3 22:10:47 2009 @@ -122,7 +122,8 @@ { switch (Address->Type) { case IP_ADDRESS_V4: - return (Address->Address.IPv4Address == 0); + return (Address->Address.IPv4Address == 0 || + Address->Address.IPv4Address == 0xFFFFFFFF); case IP_ADDRESS_V6: /* FIXME: IPv6 is not supported */ Modified: trunk/reactos/lib/drivers/ip/network/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/int… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] Mon Aug 3 22:10:47 2009 @@ -152,6 +152,26 @@ return TRUE; } +static PIP_INTERFACE GetDefaultInterface(VOID) +{ + KIRQL OldIrql; + IF_LIST_ITER(CurrentIF); + + TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); + ForEachInterface(CurrentIF) { + if (CurrentIF->Context) { + TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); + return CurrentIF; + } + } EndFor(CurrentIF); + TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); + + /* There are no physical interfaces on the system + * so we must pick the loopback interface */ + + return Loopback; +} + PIP_INTERFACE FindOnLinkInterface(PIP_ADDRESS Address) /* * FUNCTION: Checks all on-link prefixes to find out if an address is on-link @@ -166,6 +186,9 @@ TI_DbgPrint(DEBUG_ROUTER, ("Called. Address (0x%X)\n", Address)); TI_DbgPrint(DEBUG_ROUTER, ("Address (%s)\n", A2S(Address))); + + if (AddrIsUnspecified(Address)) + return GetDefaultInterface(); TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Mon Aug 3 22:10:47 2009 @@ -421,7 +421,8 @@ if (NCE == NULL) { TI_DbgPrint(MID_TRACE,("BCAST: %s\n", A2S(&Interface->Broadcast))); - if( AddrIsEqual(Address, &Interface->Broadcast) ) { + if( AddrIsEqual(Address, &Interface->Broadcast) || + AddrIsUnspecified(Address) ) { TI_DbgPrint(MID_TRACE,("Packet targeted at broadcast addr\n")); NCE = NBAddNeighbor(Interface, Address, NULL, Interface->AddressLength, NUD_CONNECTED);

1 0

[sginsberg] 42374: - Cleanup from 42219 -- remove superfluous return statement
by sginsberg＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: sginsberg Date: Mon Aug 3 22:00:58 2009 New Revision: 42374 URL: http://svn.reactos.org/svn/reactos?rev=42374&view=rev Log: - Cleanup from 42219 -- remove superfluous return statement Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Mon Aug 3 22:00:58 2009 @@ -1022,7 +1022,6 @@ Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return; } NTSTATUS

1 0

[janderwald] 42373: - Add swenum.h (written from scratch)
by janderwald＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: janderwald Date: Mon Aug 3 21:41:56 2009 New Revision: 42373 URL: http://svn.reactos.org/svn/reactos?rev=42373&view=rev Log: - Add swenum.h (written from scratch) Added: trunk/reactos/include/ddk/swenum.h (with props) Added: trunk/reactos/include/ddk/swenum.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/swenum.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/swenum.h (added) +++ trunk/reactos/include/ddk/swenum.h [iso-8859-1] Mon Aug 3 21:41:56 2009 @@ -1,0 +1,153 @@ +#ifndef _SWENUM_ +#define _SWENUM_ + +#define IOCTL_SWENUM_INSTALL_INTERFACE CTL_CODE(FILE_DEVICE_BUS_EXTENDER, 0x000, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_SWENUM_REMOVE_INTERFACE CTL_CODE(FILE_DEVICE_BUS_EXTENDER, 0x001, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_SWENUM_GET_BUS_ID CTL_CODE(FILE_DEVICE_BUS_EXTENDER, 0x002, METHOD_NEITHER, FILE_READ_ACCESS) + +typedef struct _SWENUM_INSTALL_INTERFACE { + GUID DeviceId; + GUID InterfaceId; + WCHAR ReferenceString[1]; + +} SWENUM_INSTALL_INTERFACE, *PSWENUM_INSTALL_INTERFACE; + +#if defined(_KS_) +#define STATIC_BUSID_SoftwareDeviceEnumerator STATIC_KSMEDIUMSETID_Standard +#define BUSID_SoftwareDeviceEnumerator KSMEDIUMSETID_Standard +#else +#define STATIC_BUSID_SoftwareDeviceEnumerator \ + 0x4747B320L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +#endif + +#if defined(_NTDDK_) + + +#if !defined(_KS_) + +typedef VOID (NTAPI *PFNREFERENCEDEVICEOBJECT)(PVOID Context); +typedef VOID (NTAPI *PFNDEREFERENCEDEVICEOBJECT)(PVOID Context); +typedef NTSTATUS (NTAPI *PFNQUERYREFERENCESTRING)(PVOID Context, PWCHAR *String); + +#endif + +#define BUS_INTERFACE_SWENUM_VERSION 0x100 + +typedef struct _BUS_INTERFACE_SWENUM +{ + INTERFACE Interface; + PFNREFERENCEDEVICEOBJECT ReferenceDeviceObject; + PFNDEREFERENCEDEVICEOBJECT DereferenceDeviceObject; + PFNQUERYREFERENCESTRING QueryReferenceString; +} BUS_INTERFACE_SWENUM, *PBUS_INTERFACE_SWENUM; + +#if defined(__cplusplus) +extern "C" { +#endif + +#if defined(_KS_) + +KSDDKAPI +NTSTATUS +NTAPI +KsQuerySoftwareBusInterface( + IN PDEVICE_OBJECT PnpDeviceObject, + OUT PBUS_INTERFACE_SWENUM BusInterface +); + +KSDDKAPI +NTSTATUS +NTAPI +KsReferenceSoftwareBusObject( + IN KSDEVICE_HEADER Header +); + +KSDDKAPI +VOID +NTAPI +KsDereferenceSoftwareBusObject( + IN KSDEVICE_HEADER Header +); + +KSDDKAPI +NTSTATUS +NTAPI +KsCreateBusEnumObject( + IN PWSTR BusIdentifier, + IN PDEVICE_OBJECT BusDeviceObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PDEVICE_OBJECT PnpDeviceObject, + IN REFGUID InterfaceGuid, + IN PWSTR ServiceRelativePath +); + +KSDDKAPI +NTSTATUS +NTAPI +KsGetBusEnumIdentifier( + IN OUT PIRP Irp +); + +KSDDKAPI +NTSTATUS +NTAPI +KsGetBusEnumPnpDeviceObject( + IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_OBJECT *PnpDeviceObject +); + +KSDDKAPI +NTSTATUS +NTAPI +KsInstallBusEnumInterface( + IN PIRP Irp +); + +KSDDKAPI +NTSTATUS +NTAPI +KsIsBusEnumChildDevice( + IN PDEVICE_OBJECT DeviceObject, + OUT PBOOLEAN ChildDevice +); + + +KSDDKAPI +NTSTATUS +NTAPI +KsRemoveBusEnumInterface( + IN PIRP Irp +); + +KSDDKAPI +NTSTATUS +NTAPI +KsServiceBusEnumPnpRequest( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp +); + +KSDDKAPI +NTSTATUS +NTAPI +KsServiceBusEnumCreateRequest( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp +); + +KSDDKAPI +NTSTATUS +NTAPI +KsGetBusEnumParentFDOFromChildPDO( + IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_OBJECT *FunctionalDeviceObject +); + +#endif + +#if defined(__cplusplus) +} +#endif +#endif +#endif + Propchange: trunk/reactos/include/ddk/swenum.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 42372: - Fix some cleanup vs. close confusion - Check if the search context address is unspecified
by cgutman＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: cgutman Date: Mon Aug 3 21:34:51 2009 New Revision: 42372 URL: http://svn.reactos.org/svn/reactos?rev=42372&view=rev Log: - Fix some cleanup vs. close confusion - Check if the search context address is unspecified Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Mon Aug 3 21:34:51 2009 @@ -98,7 +98,8 @@ (Current->Protocol == SearchContext->Protocol) && (AddrIsEqual(IPAddress, SearchContext->Address) || AddrIsBroadcast(IPAddress, SearchContext->Address) || - AddrIsUnspecified(IPAddress))) { + AddrIsUnspecified(IPAddress) || + AddrIsUnspecified(SearchContext->Address))) { /* We've found a match */ Found = TRUE; break; @@ -139,25 +140,161 @@ } -VOID DeleteAddress(PADDRESS_FILE AddrFile) -/* - * FUNCTION: Deletes an address file object - * ARGUMENTS: - * AddrFile = Pointer to address file object to delete - */ +/* + * FUNCTION: Open an address file object + * ARGUMENTS: + * Request = Pointer to TDI request structure for this request + * Address = Pointer to address to be opened + * Protocol = Protocol on which to open the address + * Options = Pointer to option buffer + * RETURNS: + * Status of operation + */ +NTSTATUS FileOpenAddress( + PTDI_REQUEST Request, + PTA_IP_ADDRESS Address, + USHORT Protocol, + PVOID Options) +{ + IPv4_RAW_ADDRESS IPv4Address; + PADDRESS_FILE AddrFile; + + TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); + + AddrFile = exAllocatePool(NonPagedPool, sizeof(ADDRESS_FILE)); + if (!AddrFile) { + TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + return STATUS_INSUFFICIENT_RESOURCES; + } + + TI_DbgPrint(DEBUG_ADDRFILE, ("Address file object allocated at (0x%X).\n", AddrFile)); + + RtlZeroMemory(AddrFile, sizeof(ADDRESS_FILE)); + + AddrFile->Free = AddrFileFree; + + /* Make sure address is a local unicast address or 0 */ + /* FIXME: IPv4 only */ + AddrFile->Family = Address->Address[0].AddressType; + IPv4Address = Address->Address[0].Address[0].in_addr; + if (IPv4Address != 0 && + !AddrLocateADEv4(IPv4Address, &AddrFile->Address)) { + exFreePool(AddrFile); + TI_DbgPrint(MIN_TRACE, ("Non-local address given (0x%X).\n", DN2H(IPv4Address))); + return STATUS_INVALID_PARAMETER; + } + else + { + /* Bound to the default address ... Copy the address type */ + AddrFile->Address.Type = IP_ADDRESS_V4; + } + + TI_DbgPrint(MID_TRACE, ("Opening address %s for communication (P=%d U=%d).\n", + A2S(&AddrFile->Address), Protocol, IPPROTO_UDP)); + + /* Protocol specific handling */ + switch (Protocol) { + case IPPROTO_TCP: + AddrFile->Port = + TCPAllocatePort(Address->Address[0].Address[0].sin_port); + + if ((Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) || + AddrFile->Port == 0xffff) + { + exFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + + AddrFile->Send = NULL; /* TCPSendData */ + break; + + case IPPROTO_UDP: + TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); + AddrFile->Port = + UDPAllocatePort(Address->Address[0].Address[0].sin_port); + + if ((Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) || + AddrFile->Port == 0xffff) + { + exFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + + TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", + AddrFile->Port, + Address->Address[0].Address[0].sin_port)); + AddrFile->Send = UDPSendDatagram; + break; + + case IPPROTO_ICMP: + AddrFile->Port = 0; + AddrFile->Send = ICMPSendDatagram; + break; + + default: + /* Use raw IP for all other protocols */ + AddrFile->Port = 0; + AddrFile->Send = RawIPSendDatagram; + break; + } + + TI_DbgPrint(MID_TRACE, ("IP protocol number for address file object is %d.\n", + Protocol)); + + TI_DbgPrint(MID_TRACE, ("Port number for address file object is %d.\n", + WN2H(AddrFile->Port))); + + /* Set protocol */ + AddrFile->Protocol = Protocol; + + /* Initialize receive and transmit queues */ + InitializeListHead(&AddrFile->ReceiveQueue); + InitializeListHead(&AddrFile->TransmitQueue); + + /* Initialize spin lock that protects the address file object */ + KeInitializeSpinLock(&AddrFile->Lock); + + /* Set valid flag so the address can be used */ + AF_SET_VALID(AddrFile); + + /* Return address file object */ + Request->Handle.AddressHandle = AddrFile; + + /* Add address file to global list */ + ExInterlockedInsertTailList( + &AddressFileListHead, + &AddrFile->ListEntry, + &AddressFileListLock); + + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + + return STATUS_SUCCESS; +} + + +/* + * FUNCTION: Closes an address file object + * ARGUMENTS: + * Request = Pointer to TDI request structure for this request + * RETURNS: + * Status of operation + */ +NTSTATUS FileCloseAddress( + PTDI_REQUEST Request) { KIRQL OldIrql; + PADDRESS_FILE AddrFile; + NTSTATUS Status = STATUS_SUCCESS; + PDATAGRAM_SEND_REQUEST SendRequest; + PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; PLIST_ENTRY CurrentEntry; PLIST_ENTRY NextEntry; - PDATAGRAM_SEND_REQUEST SendRequest; - PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; TI_DbgPrint(MID_TRACE, ("Called.\n")); - /* Remove address file from the global list */ - TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); - RemoveEntryList(&AddrFile->ListEntry); - TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); + AddrFile = Request->Handle.AddressHandle; TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); @@ -197,143 +334,9 @@ TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - (*AddrFile->Free)(AddrFile); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); -} - - -/* - * FUNCTION: Open an address file object - * ARGUMENTS: - * Request = Pointer to TDI request structure for this request - * Address = Pointer to address to be opened - * Protocol = Protocol on which to open the address - * Options = Pointer to option buffer - * RETURNS: - * Status of operation - */ -NTSTATUS FileOpenAddress( - PTDI_REQUEST Request, - PTA_IP_ADDRESS Address, - USHORT Protocol, - PVOID Options) -{ - IPv4_RAW_ADDRESS IPv4Address; - PADDRESS_FILE AddrFile; - - TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); - - AddrFile = exAllocatePool(NonPagedPool, sizeof(ADDRESS_FILE)); - if (!AddrFile) { - TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - return STATUS_INSUFFICIENT_RESOURCES; - } - - TI_DbgPrint(DEBUG_ADDRFILE, ("Address file object allocated at (0x%X).\n", AddrFile)); - - RtlZeroMemory(AddrFile, sizeof(ADDRESS_FILE)); - - AddrFile->Free = AddrFileFree; - - /* Make sure address is a local unicast address or 0 */ - /* FIXME: IPv4 only */ - AddrFile->Family = Address->Address[0].AddressType; - IPv4Address = Address->Address[0].Address[0].in_addr; - if (IPv4Address != 0 && - !AddrLocateADEv4(IPv4Address, &AddrFile->Address)) { - exFreePool(AddrFile); - TI_DbgPrint(MIN_TRACE, ("Non-local address given (0x%X).\n", DN2H(IPv4Address))); - return STATUS_INVALID_PARAMETER; - } - else - { - /* Bound to the default address ... Copy the address type */ - AddrFile->Address.Type = IP_ADDRESS_V4; - } - - TI_DbgPrint(MID_TRACE, ("Opening address %s for communication (P=%d U=%d).\n", - A2S(&AddrFile->Address), Protocol, IPPROTO_UDP)); - - /* Protocol specific handling */ - switch (Protocol) { - case IPPROTO_TCP: - AddrFile->Port = - TCPAllocatePort(Address->Address[0].Address[0].sin_port); - - if ((Address->Address[0].Address[0].sin_port && - AddrFile->Port != Address->Address[0].Address[0].sin_port) || - AddrFile->Port == 0xffff) - { - exFreePool(AddrFile); - return STATUS_INVALID_PARAMETER; - } - - AddrFile->Send = NULL; /* TCPSendData */ - break; - - case IPPROTO_UDP: - TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); - AddrFile->Port = - UDPAllocatePort(Address->Address[0].Address[0].sin_port); - - if ((Address->Address[0].Address[0].sin_port && - AddrFile->Port != Address->Address[0].Address[0].sin_port) || - AddrFile->Port == 0xffff) - { - exFreePool(AddrFile); - return STATUS_INVALID_PARAMETER; - } - - TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", - AddrFile->Port, - Address->Address[0].Address[0].sin_port)); - AddrFile->Send = UDPSendDatagram; - break; - - case IPPROTO_ICMP: - AddrFile->Port = 0; - AddrFile->Send = ICMPSendDatagram; - break; - - default: - /* Use raw IP for all other protocols */ - AddrFile->Port = 0; - AddrFile->Send = RawIPSendDatagram; - break; - } - - TI_DbgPrint(MID_TRACE, ("IP protocol number for address file object is %d.\n", - Protocol)); - - TI_DbgPrint(MID_TRACE, ("Port number for address file object is %d.\n", - WN2H(AddrFile->Port))); - - /* Set protocol */ - AddrFile->Protocol = Protocol; - - /* Initialize receive and transmit queues */ - InitializeListHead(&AddrFile->ReceiveQueue); - InitializeListHead(&AddrFile->TransmitQueue); - - /* Initialize spin lock that protects the address file object */ - KeInitializeSpinLock(&AddrFile->Lock); - - /* Set valid flag so the address can be used */ - AF_SET_VALID(AddrFile); - - /* Return address file object */ - Request->Handle.AddressHandle = AddrFile; - - /* Add address file to global list */ - ExInterlockedInsertTailList( - &AddressFileListHead, - &AddrFile->ListEntry, - &AddressFileListLock); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return STATUS_SUCCESS; + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + + return Status; } @@ -344,24 +347,21 @@ * RETURNS: * Status of operation */ -NTSTATUS FileCloseAddress( +NTSTATUS FileFreeAddress( PTDI_REQUEST Request) { - KIRQL OldIrql; PADDRESS_FILE AddrFile; NTSTATUS Status = STATUS_SUCCESS; + KIRQL OldIrql; + + AddrFile = Request->Handle.AddressHandle; TI_DbgPrint(MID_TRACE, ("Called.\n")); - AddrFile = Request->Handle.AddressHandle; - - TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); - - /* Set address file object exclusive to us */ - AF_SET_BUSY(AddrFile); - AF_CLR_VALID(AddrFile); - - TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); + /* Remove address file from the global list */ + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + RemoveEntryList(&AddrFile->ListEntry); + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); /* Protocol specific handling */ switch (AddrFile->Protocol) { @@ -380,30 +380,7 @@ break; } - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return Status; -} - - -/* - * FUNCTION: Closes an address file object - * ARGUMENTS: - * Request = Pointer to TDI request structure for this request - * RETURNS: - * Status of operation - */ -NTSTATUS FileFreeAddress( - PTDI_REQUEST Request) -{ - PADDRESS_FILE AddrFile; - NTSTATUS Status = STATUS_SUCCESS; - - AddrFile = Request->Handle.AddressHandle; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - DeleteAddress(AddrFile); + (*AddrFile->Free)(AddrFile); TI_DbgPrint(MAX_TRACE, ("Leaving.\n"));

1 0

[sginsberg] 42371: - Minisync of gdiplus to fix a C4717 warning
by sginsberg＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: sginsberg Date: Mon Aug 3 21:27:41 2009 New Revision: 42371 URL: http://svn.reactos.org/svn/reactos?rev=42371&view=rev Log: - Minisync of gdiplus to fix a C4717 warning Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Mon Aug 3 21:27:41 2009 @@ -775,7 +775,7 @@ TRACE("(%p, %d, %d, %d, %d, %.2f, %.2f)\n", path, x, y, width, height, startAngle, sweepAngle); - return GdipAddPathPieI(path, (REAL)x, (REAL)y, (REAL)width, (REAL)height, startAngle, sweepAngle); + return GdipAddPathPie(path, (REAL)x, (REAL)y, (REAL)width, (REAL)height, startAngle, sweepAngle); } GpStatus WINGDIPAPI GdipAddPathPolygon(GpPath *path, GDIPCONST GpPointF *points, INT count)

1 0

[fireball] 42370: - Stick missing winternl.h include to fix compiling until a better solution is found.
by fireball＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: fireball Date: Mon Aug 3 20:42:23 2009 New Revision: 42370 URL: http://svn.reactos.org/svn/reactos?rev=42370&view=rev Log: - Stick missing winternl.h include to fix compiling until a better solution is found. Modified: branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c branches/arwinss/reactos/dll/win32/winex11.drv/event.c branches/arwinss/reactos/dll/win32/winex11.drv/keyboard.c branches/arwinss/reactos/dll/win32/winex11.drv/mouse.c branches/arwinss/reactos/dll/win32/winex11.drv/window.c branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c Modified: branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c [iso-8859-1] Mon Aug 3 20:42:23 2009 @@ -78,6 +78,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/wingdi16.h" #include "x11drv.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winex11.drv/event.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] Mon Aug 3 20:42:23 2009 @@ -51,6 +51,7 @@ #include "shlobj.h" /* DROPFILES */ #include "shellapi.h" +#include "winternl.h" #include "wine/server.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winex11.drv/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/keyboard.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/keyboard.c [iso-8859-1] Mon Aug 3 20:42:23 2009 @@ -47,6 +47,7 @@ #include "winreg.h" #include "winnls.h" #include "x11drv.h" +#include "winternl.h" #include "wine/server.h" #include "wine/unicode.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winex11.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/mouse.c [iso-8859-1] Mon Aug 3 20:42:23 2009 @@ -42,6 +42,7 @@ #include "wine/winuser16.h" #include "x11drv.h" +#include "winternl.h" #include "wine/server.h" #include "wine/library.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winex11.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] Mon Aug 3 20:42:23 2009 @@ -45,6 +45,7 @@ #include "x11drv.h" #include "xcomposite.h" #include "wine/debug.h" +#include "winternl.h" #include "wine/server.h" #include "mwm.h" Modified: branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c [iso-8859-1] Mon Aug 3 20:42:23 2009 @@ -50,6 +50,7 @@ #include "xvidmode.h" //#include "xrandr.h" #include "xcomposite.h" +#include "winternl.h" #include "wine/server.h" #include "wine/debug.h" #include "wine/library.h"

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