Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 40943: - Add definition of NDIS_DEVICE_PNP_EVENT
by cgutman＠svn.reactos.org 16 May '09

16 May '09

Author: cgutman Date: Sun May 17 02:28:33 2009 New Revision: 40943 URL: http://svn.reactos.org/svn/reactos?rev=40943&view=rev Log: - Add definition of NDIS_DEVICE_PNP_EVENT Modified: trunk/reactos/include/ddk/netpnp.h Modified: trunk/reactos/include/ddk/netpnp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/netpnp.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/netpnp.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/netpnp.h [iso-8859-1] Sun May 17 02:28:33 2009 @@ -35,5 +35,12 @@ ULONG_PTR TdiClientReserved[4]; } NET_PNP_EVENT, *PNET_PNP_EVENT; +typedef enum _NDIS_DEVICE_PNP_EVENT +{ + NdisDevicePnPEventSurpriseRemoved, + NdisDevicePnPEventPowerProfileChanged, + NdisDevicePnPEventMaximum +} NDIS_DEVICE_PNP_EVENT, *PNDIS_DEVICE_PNP_EVENT; + #endif

1 0

[mjmartin] 40942: - Remove skipping kernel32 virtual tests as r40833 fixed the problem.
by mjmartin＠svn.reactos.org 16 May '09

16 May '09

Author: mjmartin Date: Sat May 16 23:07:54 2009 New Revision: 40942 URL: http://svn.reactos.org/svn/reactos?rev=40942&view=rev Log: - Remove skipping kernel32 virtual tests as r40833 fixed the problem. Modified: trunk/rostests/winetests/kernel32/virtual.c Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua… ============================================================================== --- trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] Sat May 16 23:07:54 2009 @@ -304,9 +304,6 @@ MEMORY_BASIC_INFORMATION info; BOOL ret; - skip("ROS-HACK: Skipping MapViewOfFile tests\n"); - return; - SetLastError(0xdeadbeef); file = CreateFileA( testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); @@ -780,9 +777,6 @@ win_skip( "GetWriteWatch not supported\n" ); return; } - - skip("ROS-HACK: Skipping WriteWatch tests\n"); - return; size = 0x10000; base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT | MEM_WRITE_WATCH, PAGE_READWRITE );

1 0

[janderwald] 40941: - Output type when module is a program
by janderwald＠svn.reactos.org 16 May '09

16 May '09

Author: janderwald Date: Sat May 16 21:34:52 2009 New Revision: 40941 URL: http://svn.reactos.org/svn/reactos?rev=40941&view=rev Log: - Output type when module is a program Modified: trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp Modified: trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msbui… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp [iso-8859-1] Sat May 16 21:34:52 2009 @@ -141,8 +141,13 @@ if (module_type == ".sys") fprintf ( OUT, "TARGETTYPE=DRIVER\r\n" ); - if (module_type == ".dll") + else if (module_type == ".dll") + { fprintf ( OUT, "TARGETTYPE=LIBRARY\r\n" ); + + } + else if (module_type == ".exe") + fprintf ( OUT, "TARGETTYPE=PROGRAM\r\n" ); fprintf ( OUT, "\r\nMSC_WARNING_LEVEL=/W3 /WX\r\n\r\n" );

1 0

[spetreolle] 40940: first attempt at fixing log2lines build
by spetreolle＠svn.reactos.org 16 May '09

16 May '09

Author: spetreolle Date: Sat May 16 21:32:11 2009 New Revision: 40940 URL: http://svn.reactos.org/svn/reactos?rev=40940&view=rev Log: first attempt at fixing log2lines build Modified: trunk/reactos/tools/rsym/log2lines.mak Modified: trunk/reactos/tools/rsym/log2lines.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/log2lines.mak?r… ============================================================================== --- trunk/reactos/tools/rsym/log2lines.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/log2lines.mak [iso-8859-1] Sat May 16 21:32:11 2009 @@ -1,4 +1,4 @@ -LOG2LINES_BASE = $(TOOLS_BASE) +LOG2LINES_BASE = $(TOOLS_BASE)$(SEP)rsym LOG2LINES_BASE_ = $(LOG2LINES_BASE)$(SEP) LOG2LINES_INT = $(INTERMEDIATE_)$(LOG2LINES_BASE)

1 0

[cgutman] 40939: - Fix a bad typo
by cgutman＠svn.reactos.org 16 May '09

16 May '09

Author: cgutman Date: Sat May 16 18:12:09 2009 New Revision: 40939 URL: http://svn.reactos.org/svn/reactos?rev=40939&view=rev Log: - Fix a bad typo Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sat May 16 18:12:09 2009 @@ -1980,7 +1980,7 @@ NULL, NULL, &IOSB, - IOCTL_AFD_GET_INFO, + IOCTL_AFD_SET_INFO, &InfoData, sizeof(InfoData), NULL,

1 0

[khornicek] 40938: - correct number of parameters for IDirect3DTexture methods
by khornicek＠svn.reactos.org 16 May '09

16 May '09

Author: khornicek Date: Sat May 16 14:20:22 2009 New Revision: 40938 URL: http://svn.reactos.org/svn/reactos?rev=40938&view=rev Log: - correct number of parameters for IDirect3DTexture methods Modified: trunk/reactos/include/psdk/d3d.h Modified: trunk/reactos/include/psdk/d3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d.h?rev=409… ============================================================================== --- trunk/reactos/include/psdk/d3d.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3d.h [iso-8859-1] Sat May 16 14:20:22 2009 @@ -585,22 +585,22 @@ #define IDirect3DTexture_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DTexture_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DTexture methods ***/ -#define IDirect3DTexture_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c) -#define IDirect3DTexture_GetHandle(p,a,b,c) (p)->lpVtbl->GetHandle(p,a,b,c) -#define IDirect3DTexture_PaletteChanged(p,a,b,c) (p)->lpVtbl->PaletteChanged(p,a,b,c) -#define IDirect3DTexture_Load(p,a,b,c) (p)->lpVtbl->Load(p,a,b,c) -#define IDirect3DTexture_Unload(p,a,b,c) (p)->lpVtbl->Unload(p,a,b,c) +#define IDirect3DTexture_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b) +#define IDirect3DTexture_GetHandle(p,a,b) (p)->lpVtbl->GetHandle(p,a,b) +#define IDirect3DTexture_PaletteChanged(p,a,b) (p)->lpVtbl->PaletteChanged(p,a,b) +#define IDirect3DTexture_Load(p,a) (p)->lpVtbl->Load(p,a) +#define IDirect3DTexture_Unload(p) (p)->lpVtbl->Unload(p) #else /*** IUnknown methods ***/ #define IDirect3DTexture_QueryInterface(p,a,b) (p)->QueryInterface(a,b) #define IDirect3DTexture_AddRef(p) (p)->AddRef() #define IDirect3DTexture_Release(p) (p)->Release() /*** IDirect3DTexture methods ***/ -#define IDirect3DTexture_Initialize(p,a,b,c) (p)->Initialize(a,b,c) -#define IDirect3DTexture_GetHandle(p,a,b,c) (p)->GetHandle(a,b,c) -#define IDirect3DTexture_PaletteChanged(p,a,b,c) (p)->PaletteChanged(a,b,c) -#define IDirect3DTexture_Load(p,a,b,c) (p)->Load(a,b,c) -#define IDirect3DTexture_Unload(p,a,b,c) (p)->Unload(a,b,c) +#define IDirect3DTexture_Initialize(p,a,b) (p)->Initialize(a,b) +#define IDirect3DTexture_GetHandle(p,a,b) (p)->GetHandle(a,b) +#define IDirect3DTexture_PaletteChanged(p,a,b) (p)->PaletteChanged(a,b) +#define IDirect3DTexture_Load(p,a) (p)->Load(a) +#define IDirect3DTexture_Unload(p) (p)->Unload() #endif @@ -840,8 +840,8 @@ #define IDirect3DViewport3_DeleteLight(p,a) (p)->lpVtbl->DeleteLight(p,a) #define IDirect3DViewport3_NextLight(p,a,b,c) (p)->lpVtbl->NextLight(p,a,b,c) /*** IDirect3DViewport2 methods ***/ -#define IDirect3DViewport3_GetViewport3(p,a) (p)->lpVtbl->GetViewport2(p,a) -#define IDirect3DViewport3_SetViewport3(p,a) (p)->lpVtbl->SetViewport2(p,a) +#define IDirect3DViewport3_GetViewport2(p,a) (p)->lpVtbl->GetViewport2(p,a) +#define IDirect3DViewport3_SetViewport2(p,a) (p)->lpVtbl->SetViewport2(p,a) /*** IDirect3DViewport3 methods ***/ #define IDirect3DViewport3_SetBackgroundDepth2(p,a) (p)->lpVtbl->SetBackgroundDepth2(p,a) #define IDirect3DViewport3_GetBackgroundDepth2(p,a,b) (p)->lpVtbl->GetBackgroundDepth2(p,a,b) @@ -866,8 +866,8 @@ #define IDirect3DViewport3_DeleteLight(p,a) (p)->DeleteLight(a) #define IDirect3DViewport3_NextLight(p,a,b,c) (p)->NextLight(a,b,c) /*** IDirect3DViewport2 methods ***/ -#define IDirect3DViewport3_GetViewport3(p,a) (p)->GetViewport2(a) -#define IDirect3DViewport3_SetViewport3(p,a) (p)->SetViewport2(a) +#define IDirect3DViewport3_GetViewport2(p,a) (p)->GetViewport2(a) +#define IDirect3DViewport3_SetViewport2(p,a) (p)->SetViewport2(a) /*** IDirect3DViewport3 methods ***/ #define IDirect3DViewport3_SetBackgroundDepth2(p,a) (p)->SetBackgroundDepth2(a) #define IDirect3DViewport3_GetBackgroundDepth2(p,a,b) (p)->GetBackgroundDepth2(a,b)

1 0

[fireball] 40937: - Fix handle / memory leak in failure branch, spotted by Dmitry Chapyshev.
by fireball＠svn.reactos.org 16 May '09

16 May '09

Author: fireball Date: Sat May 16 12:49:34 2009 New Revision: 40937 URL: http://svn.reactos.org/svn/reactos?rev=40937&view=rev Log: - Fix handle / memory leak in failure branch, spotted by Dmitry Chapyshev. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Sat May 16 12:49:34 2009 @@ -239,7 +239,11 @@ &ResultSize); if (!NT_SUCCESS(Status)) + { + NtClose(KeyHandle); + RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); return NULL; + } RtlCopyMemory(SearchPathBuffer, &KeyInfo->Data,

1 0

[fireball] 40936: - Fix obvious bugs in the code (e.g. freeing a stack-allocated pointer). - Rewrite the code to be more readable. - Enlarge static buffer for SearchPathBuffer to be at least 5*MAX_PATH to prevent possible overflowing for now. In the meanwhile, Dmitry is rewriting this part of code to dynamically allocate the memory without the need for a temporary static storage.
by fireball＠svn.reactos.org 16 May '09

16 May '09

Author: fireball Date: Sat May 16 12:41:26 2009 New Revision: 40936 URL: http://svn.reactos.org/svn/reactos?rev=40936&view=rev Log: - Fix obvious bugs in the code (e.g. freeing a stack-allocated pointer). - Rewrite the code to be more readable. - Enlarge static buffer for SearchPathBuffer to be at least 5*MAX_PATH to prevent possible overflowing for now. In the meanwhile, Dmitry is rewriting this part of code to dynamically allocate the memory without the need for a temporary static storage. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Sat May 16 12:41:26 2009 @@ -185,19 +185,21 @@ { PKEY_VALUE_PARTIAL_INFORMATION KeyInfo; OBJECT_ATTRIBUTES ObjectAttributes; - WCHAR SearchPathBuffer[MAX_PATH]; + WCHAR SearchPathBuffer[5*MAX_PATH]; UNICODE_STRING ValueNameString; UNICODE_STRING KeyName; - WCHAR NameBuffer[256]; + WCHAR NameBuffer[MAX_PATH]; ULONG KeyInfoSize; ULONG ResultSize; - ULONG len; + PWCHAR Backslash; HANDLE KeyHandle; NTSTATUS Status; PWSTR Path = NULL; - swprintf(NameBuffer, - L"\\Registry\\Machine\\Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\%s", ImageName); + _snwprintf(NameBuffer, + sizeof(NameBuffer) / sizeof(WCHAR), + L"\\Registry\\Machine\\Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\%s", + ImageName); RtlInitUnicodeString(&KeyName, NameBuffer); @@ -236,48 +238,46 @@ KeyInfoSize, &ResultSize); - if (NT_SUCCESS(Status)) - { - RtlCopyMemory(SearchPathBuffer, - &KeyInfo->Data, - KeyInfo->DataLength); - - /* get application running path */ - wcscat(SearchPathBuffer, L";"); - wcscat (SearchPathBuffer, NtCurrentPeb()->ProcessParameters->ImagePathName.Buffer); - - len = wcslen (SearchPathBuffer); - - while (len && SearchPathBuffer[len - 1] != L'\\') - len--; - - if (len) SearchPathBuffer[len-1] = L'\0'; - - wcscat (SearchPathBuffer, L";"); - - wcscat (SearchPathBuffer, SharedUserData->NtSystemRoot); - wcscat (SearchPathBuffer, L"\\system32;"); - wcscat (SearchPathBuffer, SharedUserData->NtSystemRoot); - wcscat (SearchPathBuffer, L";."); - - Path = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - wcslen(SearchPathBuffer) * sizeof(WCHAR)); - - if (Path == NULL) - { - DPRINT("RtlAllocateHeap() failed\n"); - RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); - NtClose(KeyHandle); - return NULL; - } - - Path = SearchPathBuffer; - } - + if (!NT_SUCCESS(Status)) + return NULL; + + RtlCopyMemory(SearchPathBuffer, + &KeyInfo->Data, + KeyInfo->DataLength); + + /* Free KeyInfo memory, we won't need it anymore */ RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); + /* Close the key handle */ NtClose(KeyHandle); + + /* get application running path */ + wcscat(SearchPathBuffer, L";"); + wcscat(SearchPathBuffer, NtCurrentPeb()->ProcessParameters->ImagePathName.Buffer); // FIXME: Don't rely on it being NULL-terminated!!! + + /* Remove trailing backslash */ + Backslash = wcsrchr(SearchPathBuffer, L'\\'); + if (Backslash) Backslash = L'\0'; + + wcscat(SearchPathBuffer, L";"); + + wcscat(SearchPathBuffer, SharedUserData->NtSystemRoot); + wcscat(SearchPathBuffer, L"\\system32;"); + wcscat(SearchPathBuffer, SharedUserData->NtSystemRoot); + wcscat(SearchPathBuffer, L";."); + + /* Copy it to the heap allocd memory */ + Path = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + wcslen(SearchPathBuffer) * sizeof(WCHAR)); + + if (!Path) + { + DPRINT1("RtlAllocateHeap() failed\n"); + return NULL; + } + + wcscpy(Path, SearchPathBuffer); return Path; }

1 0

[tkreuzer] 40935: Implement ceilf, floorf and sqrtf for x64 in assembly. Based on public domain code from netbsd.
by tkreuzer＠svn.reactos.org 16 May '09

16 May '09

Author: tkreuzer Date: Sat May 16 06:10:16 2009 New Revision: 40935 URL: http://svn.reactos.org/svn/reactos?rev=40935&view=rev Log: Implement ceilf, floorf and sqrtf for x64 in assembly. Based on public domain code from netbsd. Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/ceilf.S (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/floorf.S (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/sqrtf.S (with props) Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Sat May 16 06:10:16 2009 @@ -166,10 +166,12 @@ <file>atan.S</file> <file>atan2.S</file> <file>ceil.S</file> + <file>ceilf.S</file> <file>cos.S</file> <file>exp.S</file> <file>fabs.S</file> <file>floor.S</file> + <file>floorf.S</file> <file>fmod.S</file> <file>ldexp.S</file> <file>log.S</file> @@ -177,6 +179,7 @@ <file>pow.S</file> <file>sin.S</file> <file>sqrt.S</file> + <file>sqrtf.S</file> <file>tan.S</file> </directory> </if> Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/ceilf.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/ceilf.S (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/ceilf.S [iso-8859-1] Sat May 16 06:10:16 2009 @@ -1,0 +1,40 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Implementation of tan + * FILE: lib/sdk/crt/math/amd64/ceilf.S + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ndk/amd64/asm.h> +#include <ndk/amd64/asmmacro.S> + +.intel_syntax noprefix + + +.proc ceilf + /* Put parameter on the stack */ + movss [rsp - 0x10], xmm0 + fld dword ptr [rsp] + + /* Change fpu control word to round up */ + fstcw [rsp - 0x10] + mov eax, [rsp - 0x10] + or eax, 0x00800 + and eax, 0x0fbff + mov [rsp - 0x08], eax + fldcw [rsp - 0x08] + + /* Round to integer */ + frndint + + /* Restore fpu control word */ + fldcw [rsp - 0x10] + + fstp dword ptr [rsp - 0x10] + movss xmm0, [rsp - 0x10] + ret + +.endproc Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/ceilf.S ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/floorf.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/floorf.S (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] Sat May 16 06:10:16 2009 @@ -1,0 +1,40 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Implementation of tan + * FILE: lib/sdk/crt/math/amd64/floorf.S + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ndk/amd64/asm.h> +#include <ndk/amd64/asmmacro.S> + +.intel_syntax noprefix + + +.proc floorf + /* Put parameter on the stack */ + movss [rsp - 0x10], xmm0 + fld dword ptr [rsp] + + /* Change fpu control word to round down */ + fstcw [rsp - 0x10] + mov eax, [rsp - 0x10] + or eax, 0x00400 + and eax, 0x0f7ff + mov [rsp - 0x08], eax + fldcw [rsp - 0x08] + + /* Round to integer */ + frndint + + /* Restore fpu control word */ + fldcw [rsp - 0x10] + + fstp dword ptr [rsp - 0x10] + movss xmm0, [rsp - 0x10] + ret + +.endproc Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/floorf.S ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/sqrtf.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/sqrtf.S (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/sqrtf.S [iso-8859-1] Sat May 16 06:10:16 2009 @@ -1,0 +1,20 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Implementation of tan + * FILE: lib/sdk/crt/math/amd64/sqrtf.S + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ndk/amd64/asm.h> +#include <ndk/amd64/asmmacro.S> + +.intel_syntax noprefix + + +.proc sqrtf + sqrtss xmm0, xmm0 + ret +.endproc Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/sqrtf.S ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 40934: - Restore the old loopback implementation - Should fix the buildbot test hang
by cgutman＠svn.reactos.org 16 May '09

16 May '09

Author: cgutman Date: Sat May 16 05:44:20 2009 New Revision: 40934 URL: http://svn.reactos.org/svn/reactos?rev=40934&view=rev Log: - Restore the old loopback implementation - Should fix the buildbot test hang Modified: trunk/reactos/lib/drivers/ip/network/loopback.c Modified: trunk/reactos/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/loo… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] Sat May 16 05:44:20 2009 @@ -1,14 +1,128 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS TCP/IP protocol driver - * FILE: lib/drivers/ip/network/loopback.c + * FILE: datalink/loopback.c * PURPOSE: Loopback adapter - * PROGRAMMERS: Cameron Gutman (cgutman(a)reactos.org) + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * REVISIONS: + * CSH 01/08-2000 Created */ #include "precomp.h" PIP_INTERFACE Loopback = NULL; +typedef struct _LAN_WQ_ITEM { + LIST_ENTRY ListEntry; + PNDIS_PACKET Packet; + PLAN_ADAPTER Adapter; + UINT BytesTransferred; +} LAN_WQ_ITEM, *PLAN_WQ_ITEM; + +/* Work around being called back into afd at Dpc level */ +KSPIN_LOCK LoopWorkLock; +LIST_ENTRY LoopWorkList; +WORK_QUEUE_ITEM LoopWorkItem; +BOOLEAN LoopReceiveWorkerBusy = FALSE; + +VOID NTAPI LoopReceiveWorker( PVOID Context ) { + PLIST_ENTRY ListEntry; + PLAN_WQ_ITEM WorkItem; + PNDIS_PACKET Packet; + PLAN_ADAPTER Adapter; + UINT BytesTransferred; + PNDIS_BUFFER NdisBuffer; + IP_PACKET IPPacket; + KIRQL OldIrql; + + TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); + + TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); + while( !IsListEmpty(&LoopWorkList) ) + { + ListEntry = RemoveHeadList( &LoopWorkList ); + TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); + + WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); + + TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem)); + + Packet = WorkItem->Packet; + Adapter = WorkItem->Adapter; + BytesTransferred = WorkItem->BytesTransferred; + + exFreePool( WorkItem ); + + IPInitializePacket(&IPPacket, 0); + + IPPacket.NdisPacket = Packet; + + TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x Trans %x\n", + Packet, Adapter, BytesTransferred)); + + NdisGetFirstBufferFromPacket(Packet, + &NdisBuffer, + &IPPacket.Header, + &IPPacket.ContigSize, + &IPPacket.TotalSize); + + IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; + /* Determine which upper layer protocol that should receive + this packet and pass it to the correct receive handler */ + + TI_DbgPrint + (MID_TRACE, + ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", + IPPacket.ContigSize, IPPacket.TotalSize, + BytesTransferred)); + + IPPacket.Position = 0; + + IPReceive(Loopback, &IPPacket); + + FreeNdisPacket( Packet ); + TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); + } + TI_DbgPrint(DEBUG_DATALINK, ("Leaving\n")); + LoopReceiveWorkerBusy = FALSE; + TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); +} + +VOID LoopSubmitReceiveWork( + NDIS_HANDLE BindingContext, + PNDIS_PACKET Packet, + NDIS_STATUS Status, + UINT BytesTransferred) { + PLAN_WQ_ITEM WQItem; + PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; + KIRQL OldIrql; + + TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); + + WQItem = exAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) ); + if( !WQItem ) { + TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); + return; + } + + WQItem->Packet = Packet; + WQItem->Adapter = Adapter; + WQItem->BytesTransferred = BytesTransferred; + InsertTailList( &LoopWorkList, &WQItem->ListEntry ); + + TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x BytesTrans %x\n", + Packet, Adapter, BytesTransferred)); + + if( !LoopReceiveWorkerBusy ) { + LoopReceiveWorkerBusy = TRUE; + ExQueueWorkItem( &LoopWorkItem, CriticalWorkQueue ); + TI_DbgPrint(DEBUG_DATALINK, + ("Work item inserted %x %x\n", &LoopWorkItem, WQItem)); + } else { + TI_DbgPrint(DEBUG_DATALINK, + ("LOOP WORKER BUSY %x %x\n", &LoopWorkItem, WQItem)); + } + TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); +} VOID LoopTransmit( PVOID Context, @@ -26,46 +140,31 @@ * Type = LAN protocol type (unused) */ { - IP_PACKET IPPacket; - PNDIS_PACKET XmitPacket; - PNDIS_BUFFER NdisBuffer; - NDIS_STATUS NdisStatus; PCHAR PacketBuffer; UINT PacketLength; - - ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); - - GetDataPtr( NdisPacket, Offset, &PacketBuffer, &PacketLength ); + PNDIS_PACKET XmitPacket; + NDIS_STATUS NdisStatus; + + ASSERT_KM_POINTER(NdisPacket); + ASSERT_KM_POINTER(PC(NdisPacket)); + ASSERT_KM_POINTER(PC(NdisPacket)->DLComplete); + + TI_DbgPrint(MAX_TRACE, ("Called (NdisPacket = %x)\n", NdisPacket)); + + GetDataPtr( NdisPacket, MaxLLHeaderSize, &PacketBuffer, &PacketLength ); NdisStatus = AllocatePacketWithBuffer ( &XmitPacket, PacketBuffer, PacketLength ); - if (NdisStatus != NDIS_STATUS_SUCCESS) - { - (PC(NdisPacket)->DLComplete)( PC(NdisPacket)->Context, NdisPacket, NdisStatus ); - return; - } - - IPInitializePacket(&IPPacket, 0); - - NdisGetFirstBufferFromPacket(XmitPacket, - &NdisBuffer, - &IPPacket.Header, - &IPPacket.ContigSize, - &IPPacket.TotalSize); - - IPPacket.NdisPacket = XmitPacket; - IPPacket.Position = 0; - - TI_DbgPrint(MID_TRACE, - ("ContigSize: %d, TotalSize: %d\n", - IPPacket.ContigSize, IPPacket.TotalSize)); - - IPReceive(Loopback, &IPPacket); - - FreeNdisPacket(XmitPacket); - - (PC(NdisPacket)->DLComplete)( PC(NdisPacket)->Context, NdisPacket, NDIS_STATUS_SUCCESS ); + if( NT_SUCCESS(NdisStatus) ) { + LoopSubmitReceiveWork + ( NULL, XmitPacket, STATUS_SUCCESS, PacketLength ); + } + + (PC(NdisPacket)->DLComplete) + ( PC(NdisPacket)->Context, NdisPacket, STATUS_SUCCESS ); + + TI_DbgPrint(MAX_TRACE, ("Done\n")); } NDIS_STATUS LoopRegisterAdapter( @@ -80,9 +179,15 @@ * Status of operation */ { + NDIS_STATUS Status; LLIP_BIND_INFO BindInfo; + Status = NDIS_STATUS_SUCCESS; + TI_DbgPrint(MID_TRACE, ("Called.\n")); + + InitializeListHead( &LoopWorkList ); + ExInitializeWorkItem( &LoopWorkItem, LoopReceiveWorker, NULL ); /* Bind the adapter to network (IP) layer */ BindInfo.Context = NULL; @@ -108,7 +213,7 @@ TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - return NDIS_STATUS_SUCCESS; + return Status; }

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