Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[ion] 16348: Fix win32k warnings, get rid of windowsx.h dependency

by ion＠svn.reactos.com

Fix win32k warnings, get rid of windowsx.h dependency Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c Modified: trunk/reactos/subsys/win32k/w32k.h _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-06-30 16:04:08 UTC (rev 16347) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-06-30 16:17:45 UTC (rev 16348) @@ -526,8 +526,8 @@ { MSLLHOOKSTRUCT MouseHookData; - MouseHookData.pt.x = GET_X_LPARAM(Msg.lParam); - MouseHookData.pt.y = GET_Y_LPARAM(Msg.lParam); + MouseHookData.pt.x = LOWORD(Msg.lParam); + MouseHookData.pt.y = HIWORD(Msg.lParam); switch(Msg.message) { case WM_MOUSEWHEEL: _____ Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c --- trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-06-30 16:04:08 UTC (rev 16347) +++ trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-06-30 16:17:45 UTC (rev 16348) @@ -776,10 +776,10 @@ } else { - InterlockedIncrement(&GdiHdr->Locks); + InterlockedIncrement((PLONG)&GdiHdr->Locks); if (GdiHdr->LockingThread != Thread) { - InterlockedDecrement(&GdiHdr->Locks); + InterlockedDecrement((PLONG)&GdiHdr->Locks); /* Unlock the handle table entry. */ InterlockedExchangePointer(&HandleEntry->ProcessId, PrevProcId); @@ -917,13 +917,13 @@ PGDIOBJHDR GdiHdr = GDIBdyToHdr(HandleEntry->KernelData); #ifdef GDI_DEBUG - if (InterlockedIncrement(&GdiHdr->Locks) == 1) + if (InterlockedIncrement((PLONG)&GdiHdr->Locks) == 1) { GdiHdr->lockfile = file; GdiHdr->lockline = line; } #else - InterlockedIncrement(&GdiHdr->Locks); + InterlockedIncrement((PLONG)&GdiHdr->Locks); #endif Object = HandleEntry->KernelData; } @@ -987,13 +987,13 @@ { PGDIOBJHDR GdiHdr = GDIBdyToHdr(Object); #ifdef GDI_DEBUG - if (InterlockedDecrement(&GdiHdr->Locks) == 0) + if (InterlockedDecrement((PLONG)&GdiHdr->Locks) == 0) { GdiHdr->lockfile = NULL; GdiHdr->lockline = 0; } #else - InterlockedDecrement(&GdiHdr->Locks); + InterlockedDecrement((PLONG)&GdiHdr->Locks); #endif } _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-06-30 16:04:08 UTC (rev 16347) +++ trunk/reactos/subsys/win32k/w32k.h 2005-06-30 16:17:45 UTC (rev 16348) @@ -17,12 +17,10 @@ /* DDK/NDK/SDK Headers */ #include <ddk/ntddk.h> #include <ddk/ntifs.h> -#include <ddk/ddrawint.h> -#include <ddk/d3dnthal.h> #include <ddk/winddi.h> #include <ddk/ntddmou.h> #include <windows.h> /* FIXME ? */ -#include <windowsx.h> /* FIXME ? */ +//#include <windowsx.h> /* FIXME ? */ #include <ndk/ntndk.h> /* FIXME: ReactOS will be R-Rated if I really write what I'm about to */

19 years, 5 months

[ion] 16347: Kill rosrtl

by ion＠svn.reactos.com

Kill rosrtl Modified: trunk/reactos/subsys/win32k/ntuser/caret.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/w32k.h _____ Modified: trunk/reactos/subsys/win32k/ntuser/caret.c --- trunk/reactos/subsys/win32k/ntuser/caret.c 2005-06-30 14:38:53 UTC (rev 16346) +++ trunk/reactos/subsys/win32k/ntuser/caret.c 2005-06-30 16:04:08 UTC (rev 16347) @@ -72,7 +72,8 @@ UINT FASTCALL IntQueryCaretBlinkRate(VOID) { - UNICODE_STRING KeyName, ValueName; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(CARET_REGKEY); + UNICODE_STRING ValueName = RTL_CONSTANT_STRING(CARET_VALUENAME); NTSTATUS Status; HANDLE KeyHandle = NULL; OBJECT_ATTRIBUTES KeyAttributes; @@ -81,9 +82,6 @@ ULONG ResLength = 0; ULONG Val = 0; - RtlRosInitUnicodeStringFromLiteral(&KeyName, CARET_REGKEY); - RtlRosInitUnicodeStringFromLiteral(&ValueName, CARET_VALUENAME); - InitializeObjectAttributes(&KeyAttributes, &KeyName, OBJ_CASE_INSENSITIVE, NULL, NULL); _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-06-30 14:38:53 UTC (rev 16346) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-06-30 16:04:08 UTC (rev 16347) @@ -149,12 +149,11 @@ VOID STDCALL MouseThreadMain(PVOID StartContext) { - UNICODE_STRING MouseDeviceName; + UNICODE_STRING MouseDeviceName = RTL_CONSTANT_STRING(L"\\??\\Mouse"); OBJECT_ATTRIBUTES MouseObjectAttributes; IO_STATUS_BLOCK Iosb; NTSTATUS Status; - RtlRosInitUnicodeStringFromLiteral(&MouseDeviceName, L"\\??\\Mouse"); /* FIXME - does win use the same? */ InitializeObjectAttributes(&MouseObjectAttributes, &MouseDeviceName, 0, @@ -404,7 +403,7 @@ STATIC VOID STDCALL KeyboardThreadMain(PVOID StartContext) { - UNICODE_STRING KeyboardDeviceName; + UNICODE_STRING KeyboardDeviceName = RTL_CONSTANT_STRING(L"\\??\\Keyboard"); OBJECT_ATTRIBUTES KeyboardObjectAttributes; IO_STATUS_BLOCK Iosb; NTSTATUS Status; @@ -420,7 +419,6 @@ USHORT LastFlags = 0; UINT RepeatCount = 0; - RtlRosInitUnicodeStringFromLiteral(&KeyboardDeviceName, L"\\??\\Keyboard"); InitializeObjectAttributes(&KeyboardObjectAttributes, &KeyboardDeviceName, 0, _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-06-30 14:38:53 UTC (rev 16346) +++ trunk/reactos/subsys/win32k/w32k.h 2005-06-30 16:04:08 UTC (rev 16347) @@ -39,9 +39,6 @@ /* CSRSS Header */ #include <csrss/csrss.h> -/* FIXME: ROSRTL */ -#include <rosrtl/string.h> - /* Helper Header */ #include <reactos/helper.h>

19 years, 5 months

[navaraf] 16346: Don't use ROSRTL.

by navaraf＠svn.reactos.com

Don't use ROSRTL. Modified: trunk/reactos/drivers/fs/np/rw.c _____ Modified: trunk/reactos/drivers/fs/np/rw.c --- trunk/reactos/drivers/fs/np/rw.c 2005-06-30 13:50:21 UTC (rev 16345) +++ trunk/reactos/drivers/fs/np/rw.c 2005-06-30 14:38:53 UTC (rev 16346) @@ -10,7 +10,6 @@ /* INCLUDES ******************************************************************/ #include <ntifs.h> -#include <rosrtl/minmax.h> #include "npfs.h" #define NDEBUG @@ -450,7 +449,7 @@ /* Byte stream mode */ while (Length > 0 && Fcb->ReadDataAvailable > 0) { - CopyLength = RtlRosMin(Fcb->ReadDataAvailable, Length); + CopyLength = min(Fcb->ReadDataAvailable, Length); if (Fcb->ReadPtr + CopyLength <= Fcb->Data + Fcb->MaxDataLength) { memcpy(Buffer, Fcb->ReadPtr, CopyLength); @@ -494,7 +493,7 @@ if (Fcb->ReadDataAvailable) { /* Truncate the message if the receive buffer is too small */ - CopyLength = RtlRosMin(Fcb->ReadDataAvailable, Length); + CopyLength = min(Fcb->ReadDataAvailable, Length); memcpy(Buffer, Fcb->Data, CopyLength); #ifndef NDEBUG @@ -694,7 +693,7 @@ DPRINT("Byte stream mode\n"); while (Length > 0 && ReaderFcb->WriteQuotaAvailable > 0) { - CopyLength = RtlRosMin(Length, ReaderFcb->WriteQuotaAvailable); + CopyLength = min(Length, ReaderFcb->WriteQuotaAvailable); if (ReaderFcb->WritePtr + CopyLength <= ReaderFcb->Data + ReaderFcb->MaxDataLength) { memcpy(ReaderFcb->WritePtr, Buffer, CopyLength); @@ -732,7 +731,7 @@ DPRINT("Message mode\n"); if (Length > 0) { - CopyLength = RtlRosMin(Length, ReaderFcb->WriteQuotaAvailable); + CopyLength = min(Length, ReaderFcb->WriteQuotaAvailable); memcpy(ReaderFcb->Data, Buffer, CopyLength); Information = CopyLength;

19 years, 5 months

[navaraf] 16345: Use RtlQueryRegistryValues instead of RosReadRegistryValue.

by navaraf＠svn.reactos.com

Use RtlQueryRegistryValues instead of RosReadRegistryValue. Modified: trunk/reactos/lib/kernel32/misc/computername.c _____ Modified: trunk/reactos/lib/kernel32/misc/computername.c --- trunk/reactos/lib/kernel32/misc/computername.c 2005-06-30 12:42:57 UTC (rev 16344) +++ trunk/reactos/lib/kernel32/misc/computername.c 2005-06-30 13:50:21 UTC (rev 16345) @@ -29,9 +29,6 @@ #include <k32.h> -/* FIXME */ -#include <rosrtl/registry.h> - #define NDEBUG #include "../include/debug.h" @@ -125,8 +122,9 @@ ) { UNICODE_STRING ResultString; - UNICODE_STRING DomainPart, Dot; - UNICODE_STRING RegKey, RegValue; + UNICODE_STRING DomainPart; + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + NTSTATUS Status; switch( NameType ) { case ComputerNameNetBIOS: @@ -146,30 +144,45 @@ nSize ); case ComputerNameDnsFullyQualified: - RtlInitUnicodeString(&Dot,L"."); - RtlInitUnicodeString(&ResultString, NULL); - ResultString.Length = *nSize * sizeof(WCHAR); - ResultString.MaximumLength = *nSize * sizeof(WCHAR); - RtlInitUnicodeString(&RegKey, - L"\\Registry\\Machine\\System" - L"\\CurrentControlSet\\Services\\Tcpip" - L"\\Parameters"); - RtlInitUnicodeString(&RegValue,L"HostName"); - RtlInitUnicodeString(&DomainPart,L""); - if( NT_SUCCESS(RosReadRegistryValue(&RegKey,&RegValue,&DomainPart)) ) { - RtlAppendUnicodeStringToString(&ResultString,&DomainPart); - RtlAppendUnicodeStringToString(&ResultString,&Dot); - RtlFreeUnicodeString(&DomainPart); - RtlInitUnicodeString(&RegValue,L"Domain"); - RtlInitUnicodeString(&DomainPart,L""); - if( NT_SUCCESS(RosReadRegistryValue - (&RegKey,&RegValue,&DomainPart)) ) { - RtlAppendUnicodeStringToString(&ResultString,&DomainPart); - RtlFreeUnicodeString(&DomainPart); - *nSize = ResultString.Length / sizeof(WCHAR); - return TRUE; - } - } + ResultString.Length = 0; + ResultString.MaximumLength = *nSize * sizeof(WCHAR); + ResultString.Buffer = lpBuffer; + + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + RtlInitUnicodeString(&DomainPart, NULL); + QueryTable[0].Name = L"HostName"; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[0].EntryContext = &DomainPart; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + L"\\Registry\\Machine\\System" + L"\\CurrentControlSet\\Services\\Tcpip" + L"\\Parameters", + QueryTable, NULL, NULL); + + if( NT_SUCCESS(Status) ) { + RtlAppendUnicodeStringToString(&ResultString, &DomainPart); + RtlAppendUnicodeToString(&ResultString, L"."); + RtlFreeUnicodeString(&DomainPart); + + RtlInitUnicodeString(&DomainPart, NULL); + QueryTable[0].Name = L"Domain"; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[0].EntryContext = &DomainPart; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + L"\\Registry\\Machine\\System" + L"\\CurrentControlSet\\Services\\Tcpip" + L"\\Parameters", + QueryTable, NULL, NULL); + + if( NT_SUCCESS(Status) ) { + RtlAppendUnicodeStringToString(&ResultString, &DomainPart); + RtlFreeUnicodeString(&DomainPart); + *nSize = ResultString.Length / sizeof(WCHAR); + return TRUE; + } + } return FALSE; case ComputerNameDnsHostname:

19 years, 5 months

[ion] 16344: Manually define undocumented MS GLU constants

by ion＠svn.reactos.com

Manually define undocumented MS GLU constants Modified: trunk/reactos/lib/glu32/include/gluos.h _____ Modified: trunk/reactos/lib/glu32/include/gluos.h --- trunk/reactos/lib/glu32/include/gluos.h 2005-06-30 12:33:12 UTC (rev 16343) +++ trunk/reactos/lib/glu32/include/gluos.h 2005-06-30 12:42:57 UTC (rev 16344) @@ -47,6 +47,60 @@ #include <windows.h> +/* Non documented stuff in MS Headers */ +/* NurbsCallback */ +#define GLU_NURBS_ERROR 100103 +#define GLU_ERROR 100103 +#define GLU_NURBS_BEGIN 100164 +#define GLU_NURBS_BEGIN_EXT 100164 +#define GLU_NURBS_VERTEX 100165 +#define GLU_NURBS_VERTEX_EXT 100165 +#define GLU_NURBS_NORMAL 100166 +#define GLU_NURBS_NORMAL_EXT 100166 +#define GLU_NURBS_COLOR 100167 +#define GLU_NURBS_COLOR_EXT 100167 +#define GLU_NURBS_TEXTURE_COORD 100168 +#define GLU_NURBS_TEX_COORD_EXT 100168 +#define GLU_NURBS_END 100169 +#define GLU_NURBS_END_EXT 100169 +#define GLU_NURBS_BEGIN_DATA 100170 +#define GLU_NURBS_BEGIN_DATA_EXT 100170 +#define GLU_NURBS_VERTEX_DATA 100171 +#define GLU_NURBS_VERTEX_DATA_EXT 100171 +#define GLU_NURBS_NORMAL_DATA 100172 +#define GLU_NURBS_NORMAL_DATA_EXT 100172 +#define GLU_NURBS_COLOR_DATA 100173 +#define GLU_NURBS_COLOR_DATA_EXT 100173 +#define GLU_NURBS_TEXTURE_COORD_DATA 100174 +#define GLU_NURBS_TEX_COORD_DATA_EXT 100174 +#define GLU_NURBS_END_DATA 100175 +#define GLU_NURBS_END_DATA_EXT 100175 + +/* NurbsProperty */ +#define GLU_AUTO_LOAD_MATRIX 100200 +#define GLU_CULLING 100201 +#define GLU_SAMPLING_TOLERANCE 100203 +#define GLU_DISPLAY_MODE 100204 +#define GLU_PARAMETRIC_TOLERANCE 100202 +#define GLU_SAMPLING_METHOD 100205 +#define GLU_U_STEP 100206 +#define GLU_V_STEP 100207 +#define GLU_NURBS_MODE 100160 +#define GLU_NURBS_MODE_EXT 100160 +#define GLU_NURBS_TESSELLATOR 100161 +#define GLU_NURBS_TESSELLATOR_EXT 100161 +#define GLU_NURBS_RENDERER 100162 +#define GLU_NURBS_RENDERER_EXT 100162 + +/* NurbsSampling */ +#define GLU_OBJECT_PARAMETRIC_ERROR 100208 +#define GLU_OBJECT_PARAMETRIC_ERROR_EXT 100208 +#define GLU_OBJECT_PATH_LENGTH 100209 +#define GLU_OBJECT_PATH_LENGTH_EXT 100209 +#define GLU_PATH_LENGTH 100215 +#define GLU_PARAMETRIC_ERROR 100216 +#define GLU_DOMAIN_DISTANCE 100217 + /* Disable warnings */ #ifdef _MSC_VER #pragma warning(disable : 4101)

19 years, 5 months

[weiden] 16343: implemented NeedCurrentDirectoryForExePathA/W

by weiden＠svn.reactos.com

implemented NeedCurrentDirectoryForExePathA/W Modified: trunk/reactos/lib/kernel32/file/dir.c _____ Modified: trunk/reactos/lib/kernel32/file/dir.c --- trunk/reactos/lib/kernel32/file/dir.c 2005-06-30 12:31:36 UTC (rev 16342) +++ trunk/reactos/lib/kernel32/file/dir.c 2005-06-30 12:33:12 UTC (rev 16343) @@ -1087,14 +1087,13 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL NeedCurrentDirectoryForExePathW(LPCWSTR ExeName) { - DPRINT1("NeedCurrentDirectoryForExePathW(0x%x) not implemented!\n", ExeName); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return (wcschr(ExeName, + L'\\') != NULL); } @@ -1104,12 +1103,8 @@ BOOL STDCALL NeedCurrentDirectoryForExePathA(LPCSTR ExeName) { - PWCHAR ExeNameW; - - if (!(ExeNameW = FilenameA2W(ExeName, FALSE))) - return FALSE; - - return NeedCurrentDirectoryForExePathW(ExeNameW); + return (strchr(ExeName, + '\\') != NULL); }

19 years, 5 months

[ion] 16342: Delete ddentry.h and create official ddrawgdi.h header instead, delete duplicate GL include folder, move internal headers to internal libs, delete tcpmisc.h and move its defines to official tcpioctl.h, fix up winddi.h and cleanup gdi32 header.

by ion＠svn.reactos.com

Delete ddentry.h and create official ddrawgdi.h header instead, delete duplicate GL include folder, move internal headers to internal libs, delete tcpmisc.h and move its defines to official tcpioctl.h, fix up winddi.h and cleanup gdi32 header. Deleted: trunk/reactos/include/GL/ Deleted: trunk/reactos/include/ddentry.h Deleted: trunk/reactos/include/expat/ Deleted: trunk/reactos/include/tcpmisc.h Deleted: trunk/reactos/include/tgetopt.h Modified: trunk/reactos/include/win32k/gdiobj.h Modified: trunk/reactos/lib/gdi32/include/precomp.h Modified: trunk/reactos/lib/iphlpapi/iphlpapi_private.h Added: trunk/reactos/lib/tgetopt/tgetopt.h Modified: trunk/reactos/w32api/include/ddk/winddi.h Added: trunk/reactos/w32api/include/ddrawgdi.h Modified: trunk/reactos/w32api/include/tcpioctl.h _____ Deleted: trunk/reactos/include/ddentry.h --- trunk/reactos/include/ddentry.h 2005-06-30 12:22:27 UTC (rev 16341) +++ trunk/reactos/include/ddentry.h 2005-06-30 12:31:36 UTC (rev 16342) @@ -1,95 +0,0 @@ -/* - * DirectDraw GDI32.dll interface definitions - * Copyright (C) 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -#include <ddk/ddrawi.h> -#include <ddk/d3dhal.h> -#include <ddk/winddi.h> -BOOL STDCALL DdCreateDirectDrawObject( -LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, -HDC hdc -); -BOOL STDCALL DdQueryDirectDrawObject( -LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, -LPDDHALINFO pHalInfo, -LPDDHAL_DDCALLBACKS pDDCallbacks, -LPDDHAL_DDSURFACECALLBACKS pDDSurfaceCallbacks, -LPDDHAL_DDPALETTECALLBACKS pDDPaletteCallbacks, -LPD3DHAL_CALLBACKS pD3dCallbacks, -LPD3DHAL_GLOBALDRIVERDATA pD3dDriverData, -LPDDHAL_DDEXEBUFCALLBACKS pD3dBufferCallbacks, -LPDDSURFACEDESC pD3dTextureFormats, -LPDWORD pdwFourCC, -LPVIDMEM pvmList -); -BOOL STDCALL DdDeleteDirectDrawObject( -LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal -); -BOOL STDCALL DdCreateSurfaceObject( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, -BOOL bPrimarySurface -); -BOOL STDCALL DdDeleteSurfaceObject( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal -); -BOOL STDCALL DdResetVisrgn( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, -HWND hWnd -); -BOOL STDCALL DdGetDC( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, -LPPALETTEENTRY pColorTable -); -BOOL STDCALL DdReleaseDC( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal -); -HBITMAP STDCALL DdCreateDIBSection( -HDC hdc, -CONST BITMAPINFO *pbmi, -UINT iUsage, -VOID **ppvBits, -HANDLE hSectionApp, -DWORD dwOffset -); -BOOL STDCALL DdReenableDirectDrawObject( -LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, -BOOL *pbNewMode -); -BOOL STDCALL DdAttachSurface( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom, -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo -); -VOID STDCALL DdUnattachSurface( -LPDDRAWI_DDRAWSURFACE_LCL pSurface, -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached -); -ULONG STDCALL DdQueryDisplaySettingsUniqueness(VOID); -HANDLE STDCALL DdGetDxHandle( -LPDDRAWI_DIRECTDRAW_LCL pDDraw, -LPDDRAWI_DDRAWSURFACE_LCL pSurface, -BOOL bRelease -); -BOOL STDCALL DdSetGammaRamp( -LPDDRAWI_DIRECTDRAW_LCL pDDraw, -HDC hdc, -LPVOID lpGammaRamp -); -DWORD STDCALL DdSwapTextureHandles( -LPDDRAWI_DIRECTDRAW_LCL pDDraw, -LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, -LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2 -); _____ Deleted: trunk/reactos/include/tcpmisc.h --- trunk/reactos/include/tcpmisc.h 2005-06-30 12:22:27 UTC (rev 16341) +++ trunk/reactos/include/tcpmisc.h 2005-06-30 12:31:36 UTC (rev 16342) @@ -1,98 +0,0 @@ -#ifndef TCPMISC_H -#define TCPMISC_H - -#define IF_MIB_STATS_ID 1 -#define MAX_PHYSADDR_SIZE 8 -#define MAX_IFDESCR_LEN 256 - -/* ID to use for requesting an IFEntry for an interface */ -#define IF_MIB_STATS_ID 1 - -/* ID to use for requesting an IPSNMPInfo for an interface */ -#define IP_MIB_STATS_ID 1 - -/* ID to use for requesting the route table */ -#define IP_MIB_ROUTETABLE_ENTRY_ID 0x101 -#define IP_MIB_ADDRTABLE_ENTRY_ID 0x102 - -typedef struct IFEntry { - ULONG if_index; - ULONG if_type; - ULONG if_mtu; - ULONG if_speed; - ULONG if_physaddrlen; - UCHAR if_physaddr[MAX_PHYSADDR_SIZE]; - ULONG if_adminstatus; - ULONG if_operstatus; - ULONG if_lastchange; - ULONG if_inoctets; - ULONG if_inucastpkts; - ULONG if_innucastpkts; - ULONG if_indiscards; - ULONG if_inerrors; - ULONG if_inunknownprotos; - ULONG if_outoctets; - ULONG if_outucastpkts; - ULONG if_outnucastpkts; - ULONG if_outdiscards; - ULONG if_outerrors; - ULONG if_outqlen; - ULONG if_descrlen; - UCHAR if_descr[1]; -} IFEntry; - -// As in the mib from RFC 1213 - -typedef struct _IPRouteEntry { - ULONG ire_dest; - ULONG ire_index; //matches if_index in IFEntry and iae_index in IPAddrEntry - ULONG ire_metric1; - ULONG ire_metric2; - ULONG ire_metric3; - ULONG ire_metric4; - ULONG ire_gw; - ULONG ire_type; - ULONG ire_proto; - ULONG ire_age; - ULONG ire_mask; - ULONG ire_metric5; - ULONG ire_info; -} IPRouteEntry; - -typedef struct _IPAddrEntry { - ULONG iae_addr; - ULONG iae_index; - ULONG iae_mask; - ULONG iae_bcastaddr; - ULONG iae_reasmsize; - ULONG iae_context; - ULONG iae_pad; -} IPAddrEntry; - -typedef struct _IPSNMPInfo { - ULONG ipsi_index; - ULONG ipsi_forwarding; - ULONG ipsi_defaultttl; - ULONG ipsi_inreceives; - ULONG ipsi_inhdrerrors; - ULONG ipsi_inaddrerrors; - ULONG ipsi_inunknownprotos; - ULONG ipsi_indiscards; - ULONG ipsi_indelivers; - ULONG ipsi_outrequests; - ULONG ipsi_routingdiscards; - ULONG ipsi_outdiscards; - ULONG ipsi_outnoroutes; - ULONG ipsi_reasmtimeout; - ULONG ipsi_reasmreqds; - ULONG ipsi_reasmoks; - ULONG ipsi_reasmfails; - ULONG ipsi_fragoks; - ULONG ipsi_fragfails; - ULONG ipsi_fragcreates; - ULONG ipsi_numif; - ULONG ipsi_numaddr; - ULONG ipsi_numroutes; -} IPSNMPInfo; - -#endif /* TCPMISC_H */ _____ Deleted: trunk/reactos/include/tgetopt.h --- trunk/reactos/include/tgetopt.h 2005-06-30 12:22:27 UTC (rev 16341) +++ trunk/reactos/include/tgetopt.h 2005-06-30 12:31:36 UTC (rev 16342) @@ -1,90 +0,0 @@ -#ifndef _GETOPT_H -#define _GETOPT_H 1 - -#include <tchar.h> - -#ifdef _UNICODE -#define _toption _woption -#define _toptarg _woptarg -#define _toptind _woptind -#define _topterr _wopterr -#define _toptopt _woptopt -#define _tgetopt _wgetopt -#define _tgetopt_long _wgetopt_long -#define _tgetopt_long_only _wgetopt_long_only -#define _tgetopt_internal _wgetopt_internal -#else -#define _toption option -#define _toptarg optarg -#define _toptind optind -#define _topterr opterr -#define _toptopt optopt -#define _tgetopt getopt -#define _tgetopt_long getopt_long -#define _tgetopt_long_only getopt_long_only -#define _tgetopt_internal _getopt_internal -#endif - -#ifdef __cplusplus -extern "C" -{ -#endif - -extern char *optarg; -extern int optind; -extern int opterr; -extern int optopt; - -extern wchar_t *_woptarg; -extern int _woptind; -extern int _wopterr; -extern int _woptopt; - -struct option -{ - const char *name; - int has_arg; - int *flag; - int val; -}; - -struct _woption -{ - const wchar_t *name; - int has_arg; - int *flag; - int val; -}; - -#define no_argument 0 -#define required_argument 1 -#define optional_argument 2 - -extern int getopt (int argc, char *const *argv, const char *shortopts); -extern int getopt_long (int argc, char *const *argv, const char *shortopts, - const struct option *longopts, int *longind); -extern int getopt_long_only (int argc, char *const *argv, - const char *shortopts, const struct option *longopts, int *longind); - -extern int _wgetopt (int argc, wchar_t *const *argv, const wchar_t *shortopts); -extern int _wgetopt_long (int argc, wchar_t *const *argv, const wchar_t *shortopts, - const struct _woption *longopts, int *longind); -extern int _wgetopt_long_only (int argc, wchar_t *const *argv, - const wchar_t *shortopts, - const struct _woption *longopts, int *longind); - -extern int _getopt_internal (int argc, char *const *argv, - const char *shortopts, const struct option *longopts, int *longind, - int long_only); - -extern int _wgetopt_internal (int argc, wchar_t *const *argv, - const wchar_t *shortopts, - const struct _woption *longopts, int *longind, - int long_only); - -#ifdef __cplusplus -} -#endif - -#endif /* _GETOPT_H */ - _____ Modified: trunk/reactos/include/win32k/gdiobj.h --- trunk/reactos/include/win32k/gdiobj.h 2005-06-30 12:22:27 UTC (rev 16341) +++ trunk/reactos/include/win32k/gdiobj.h 2005-06-30 12:31:36 UTC (rev 16342) @@ -58,7 +58,9 @@ typedef PVOID PGDIOBJ; +#ifndef NTOS_MODE_USER typedef BOOL (INTERNAL_CALL *GDICLEANUPPROC)(PVOID ObjectBody); +#endif /*! * GDI object header. This is a part of any GDI object _____ Modified: trunk/reactos/lib/gdi32/include/precomp.h --- trunk/reactos/lib/gdi32/include/precomp.h 2005-06-30 12:22:27 UTC (rev 16341) +++ trunk/reactos/lib/gdi32/include/precomp.h 2005-06-30 12:31:36 UTC (rev 16342) @@ -1,11 +1,26 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/gdi32/include/precomp.h + * PURPOSE: User-Mode Win32 GDI Library Header + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +/* SDK/DDK/NDK Headers. */ #include <windows.h> +#include <ddraw.h> +#include <ddk/winddi.h> +#include <ddk/prntfont.h> +#include <ddrawgdi.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include <ddentry.h> -#include <ddraw.h> -#include <ddk/prntfont.h> -#include <string.h> + +/* Win32K External Headers */ #include <win32k/kapi.h> + +/* FIXME: ROSRTL */ #include <rosrtl/logfont.h> #include <rosrtl/devmode.h> @@ -21,7 +36,6 @@ #define NtUserSetDCPenColor(hbr, crColor) \ (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUTINE_SETDCPENCOLOR) -#ifdef __USE_W32API typedef int (CALLBACK* EMFPLAYPROC)( HDC, INT, HANDLE ); typedef DWORD FULLSCREENCONTROL; typedef DWORD UNIVERSAL_FONT_ID; @@ -30,7 +44,6 @@ typedef REALIZATION_INFO *PREALIZATION_INFO; typedef DWORD CHWIDTHINFO; typedef CHWIDTHINFO *PCHWIDTHINFO; -#endif /* == GLOBAL VARIABLES ====================================================== */ _____ Modified: trunk/reactos/lib/iphlpapi/iphlpapi_private.h --- trunk/reactos/lib/iphlpapi/iphlpapi_private.h 2005-06-30 12:22:27 UTC (rev 16341) +++ trunk/reactos/lib/iphlpapi/iphlpapi_private.h 2005-06-30 12:31:36 UTC (rev 16342) @@ -25,7 +25,6 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> #include <rosrtl/string.h> -#include <tcpmisc.h> #include <winsock2.h> #include <nspapi.h> #include <iptypes.h> @@ -59,6 +58,26 @@ #define TCP_REQUEST_QUERY_INFORMATION_INIT { { { 0 } } } #define TCP_REQUEST_SET_INFORMATION_INIT { { 0 } } +#define IP_MIB_ROUTETABLE_ENTRY_ID 0x101 + +// As in the mib from RFC 1213 + +typedef struct _IPRouteEntry { + ULONG ire_dest; + ULONG ire_index; //matches if_index in IFEntry and iae_index in IPAddrEntry + ULONG ire_metric1; + ULONG ire_metric2; + ULONG ire_metric3; + ULONG ire_metric4; + ULONG ire_gw; + ULONG ire_type; + ULONG ire_proto; + ULONG ire_age; + ULONG ire_mask; + ULONG ire_metric5; + ULONG ire_info; +} IPRouteEntry; + /* No caddr_t in reactos headers */ typedef char *caddr_t; _____ Copied: trunk/reactos/lib/tgetopt/tgetopt.h (from rev 16333, trunk/reactos/include/tgetopt.h) _____ Modified: trunk/reactos/w32api/include/ddk/winddi.h --- trunk/reactos/w32api/include/ddk/winddi.h 2005-06-30 12:22:27 UTC (rev 16341) +++ trunk/reactos/w32api/include/ddk/winddi.h 2005-06-30 12:31:36 UTC (rev 16342) @@ -31,43 +31,13 @@ #error video.h cannot be included with winddi.h #else -#include <wingdi.h> +#include <ddrawint.h> +#include <d3dnthal.h> #ifdef __cplusplus extern "C" { #endif -#ifndef __DD_INCLUDED__ -/* FIXME: Some DirectDraw structures not added yet */ -typedef ULONG_PTR FLATPTR; -typedef struct _DD_SURFACECALLBACKS { -} DD_SURFACECALLBACKS, *PDD_SURFACECALLBACKS; -typedef struct _DD_PALETTECALLBACKS { -} DD_PALETTECALLBACKS, *PDD_PALETTECALLBACKS; -typedef struct _DD_CALLBACKS { -} DD_CALLBACKS, *PDD_CALLBACKS; -typedef struct _DD_HALINFO { -} DD_HALINFO, *PDD_HALINFO; -typedef struct _VIDEOMEMORY { -} VIDEOMEMORY, *LPVIDEOMEMORY; -typedef struct _DD_DIRECTDRAW_GLOBAL { -} DD_DIRECTDRAW_GLOBAL, *LPDD_DIRECTDRAW_GLOBAL; -typedef struct _DD_SURFACE_LOCAL { -} DD_SURFACE_LOCAL, *PDD_SURFACE_LOCAL, *LPDD_SURFACE_LOCAL; -#endif - -#ifndef __DDRAWI_INCLUDED__ -typedef PVOID LPVIDMEM; -#endif - -#if !defined(__DD_INCLUDED__) && !defined(__DDRAWI_INCLUDED__) -typedef struct _DDSCAPS { -} DDSCAPS, *PDDSCAPS; -typedef struct _DDSCAPSEX { -} DDSCAPSEX, *PDDSCAPSEX; -typedef PVOID LPVMEMHEAP; -#endif - #ifndef DECL_IMPORT #define DECL_IMPORT __attribute__((dllimport)) #endif @@ -120,9 +90,6 @@ DECLARE_HANDLE(DHPDEV); DECLARE_HANDLE(HDRVOBJ); - -#define GDI_DRIVER_VERSION 0x4000 - typedef struct _ENG_EVENT *PEVENT; #define OPENGL_CMD 4352 _____ Copied: trunk/reactos/w32api/include/ddrawgdi.h (from rev 16333, trunk/reactos/include/ddentry.h) --- trunk/reactos/include/ddentry.h 2005-06-29 20:13:51 UTC (rev 16333) +++ trunk/reactos/w32api/include/ddrawgdi.h 2005-06-30 12:31:36 UTC (rev 16342) @@ -0,0 +1,163 @@ +/* + * DirectDraw GDI32.dll interface definitions + * Copyright (C) 2003 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* Define the real export names */ +#if 0 /* FIXME */ +#define DdCreateDirectDrawObject GdiEntry1 +#define DdQueryDirectDrawObject GdiEntry2 +#define DdDeleteDirectDrawObject GdiEntry3 +#define DdCreateSurfaceObject GdiEntry4 +#define DdDeleteSurfaceObject GdiEntry5 +#define DdResetVisrgn GdiEntry6 +#define DdGetDC GdiEntry7 +#define DdReleaseDC GdiEntry8 +#define DdCreateDIBSection GdiEntry9 +#define DdReenableDirectDrawObject GdiEntry10 +#define DdAttachSurface GdiEntry11 +#define DdUnattachSurface GdiEntry12 +#define DdQueryDisplaySettingsUniqueness GdiEntry13 +#define DdGetDxHandle GdiEntry14 +#define DdSetGammaRamp GdiEntry15 +#define DdSwapTextureHandles GdiEntry16 +#endif + +typedef struct _D3DHAL_CALLBACKS FAR *LPD3DHAL_CALLBACKS; +typedef struct _D3DHAL_GLOBALDRIVERDATA FAR *LPD3DHAL_GLOBALDRIVERDATA; + +BOOL +STDCALL +DdCreateDirectDrawObject( + LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, + HDC hdc +); + +BOOL +STDCALL +DdQueryDirectDrawObject( + LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, + LPDDHALINFO pHalInfo, + LPDDHAL_DDCALLBACKS pDDCallbacks, + LPDDHAL_DDSURFACECALLBACKS pDDSurfaceCallbacks, + LPDDHAL_DDPALETTECALLBACKS pDDPaletteCallbacks, + LPD3DHAL_CALLBACKS pD3dCallbacks, + LPD3DHAL_GLOBALDRIVERDATA pD3dDriverData, + LPDDHAL_DDEXEBUFCALLBACKS pD3dBufferCallbacks, + LPDDSURFACEDESC pD3dTextureFormats, + LPDWORD pdwFourCC, + LPVIDMEM pvmList +); + +BOOL +STDCALL +DdDeleteDirectDrawObject( + LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal +); + +BOOL +STDCALL +DdCreateSurfaceObject( + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + BOOL bPrimarySurface +); + +BOOL +STDCALL +DdDeleteSurfaceObject( + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal +); + +BOOL +STDCALL +DdResetVisrgn( + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + HWND hWnd +); + +BOOL +STDCALL +DdGetDC( + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + LPPALETTEENTRY pColorTable +); + +BOOL +STDCALL +DdReleaseDC( + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal +); + +HBITMAP +STDCALL +DdCreateDIBSection( + HDC hdc, + CONST BITMAPINFO *pbmi, + UINT iUsage, + VOID **ppvBits, + HANDLE hSectionApp, + DWORD dwOffset +); + +BOOL +STDCALL +DdReenableDirectDrawObject( + LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, + BOOL *pbNewMode +); + +BOOL +STDCALL +DdAttachSurface( + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom, + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo +); + +VOID +STDCALL +DdUnattachSurface( + LPDDRAWI_DDRAWSURFACE_LCL pSurface, + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached +); + +ULONG +STDCALL +DdQueryDisplaySettingsUniqueness(VOID); + +HANDLE +STDCALL +DdGetDxHandle( + LPDDRAWI_DIRECTDRAW_LCL pDDraw, + LPDDRAWI_DDRAWSURFACE_LCL pSurface, + BOOL bRelease +); + +BOOL +STDCALL +DdSetGammaRamp( + LPDDRAWI_DIRECTDRAW_LCL pDDraw, + HDC hdc, + LPVOID lpGammaRamp +); + +DWORD +STDCALL +DdSwapTextureHandles( + LPDDRAWI_DIRECTDRAW_LCL pDDraw, + LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, + LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2 +); _____ Modified: trunk/reactos/w32api/include/tcpioctl.h --- trunk/reactos/w32api/include/tcpioctl.h 2005-06-30 12:22:27 UTC (rev 16341) +++ trunk/reactos/w32api/include/tcpioctl.h 2005-06-30 12:31:36 UTC (rev 16342) @@ -43,4 +43,84 @@ #define IOCTL_DELETE_IP_ADDRESS \ _TCP_CTL_CODE(16, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IF_MIB_STATS_ID 1 +#define IP_MIB_STATS_ID 1 +#define IP_MIB_ADDRTABLE_ENTRY_ID 0x102 +#define IP_INTFC_INFO_ID 0x103 +#define MAX_PHYSADDR_SIZE 8 + +typedef struct IFEntry +{ + ULONG if_index; + ULONG if_type; + ULONG if_mtu; + ULONG if_speed; + ULONG if_physaddrlen; + UCHAR if_physaddr[MAX_PHYSADDR_SIZE]; + ULONG if_adminstatus; + ULONG if_operstatus; + ULONG if_lastchange; + ULONG if_inoctets; + ULONG if_inucastpkts; + ULONG if_innucastpkts; + ULONG if_indiscards; + ULONG if_inerrors; + ULONG if_inunknownprotos; + ULONG if_outoctets; + ULONG if_outucastpkts; + ULONG if_outnucastpkts; + ULONG if_outdiscards; + ULONG if_outerrors; + ULONG if_outqlen; + ULONG if_descrlen; + UCHAR if_descr[1]; +} IFEntry; + +typedef struct IPSNMPInfo +{ + ULONG ipsi_forwarding; + ULONG ipsi_defaultttl; + ULONG ipsi_inreceives; + ULONG ipsi_inhdrerrors; + ULONG ipsi_inaddrerrors; + ULONG ipsi_forwdatagrams; + ULONG ipsi_inunknownprotos; + ULONG ipsi_indiscards; + ULONG ipsi_indelivers; + ULONG ipsi_outrequests; + ULONG ipsi_routingdiscards; + ULONG ipsi_outdiscards; + ULONG ipsi_outnoroutes; + ULONG ipsi_reasmtimeout; + ULONG ipsi_reasmreqds; + ULONG ipsi_reasmoks; + ULONG ipsi_reasmfails; + ULONG ipsi_fragoks; + ULONG ipsi_fragfails; + ULONG ipsi_fragcreates; + ULONG ipsi_numif; + ULONG ipsi_numaddr; + ULONG ipsi_numroutes; +} IPSNMPInfo; + +typedef struct IPAddrEntry +{ + ULONG iae_addr; + ULONG iae_index; + ULONG iae_mask; + ULONG iae_bcastaddr; + ULONG iae_reasmsize; + USHORT iae_context; + USHORT iae_pad; +} IPAddrEntry; + +typedef struct IPInterfaceInfo +{ + ULONG iii_flags; + ULONG iii_mtu; + ULONG iii_speed; + ULONG iii_addrlength; + UCHAR iii_addr[1]; +} IPInterfaceInfo; + #endif/*_TCPIOCTL_H*/

19 years, 5 months

[navaraf] 16341: Move ROSKY to a separate SVN module.

by navaraf＠svn.reactos.com

Move ROSKY to a separate SVN module. Deleted: trunk/reactos/lib/rosky/

19 years, 5 months

[navaraf] 16340: Move ROSKY to a separate SVN module.

by navaraf＠svn.reactos.com

Move ROSKY to a separate SVN module. Deleted: trunk/reactos/include/rosky/

19 years, 5 months

[navaraf] 16339: Move ROSKY to a separate SVN module.

by navaraf＠svn.reactos.com

Move ROSKY to a separate SVN module. Added: trunk/rosky/include/defines.h Added: trunk/rosky/include/rosky.h Added: trunk/rosky/include/structs.h Added: trunk/rosky/lib/libsky/ Added: trunk/rosky/lib/libskygi/ _____ Copied: trunk/rosky/include/defines.h (from rev 16333, trunk/reactos/include/rosky/defines.h) _____ Copied: trunk/rosky/include/rosky.h (from rev 16333, trunk/reactos/include/rosky/rosky.h) _____ Copied: trunk/rosky/include/structs.h (from rev 16333, trunk/reactos/include/rosky/structs.h) _____ Copied: trunk/rosky/lib/libsky (from rev 16319, trunk/reactos/lib/rosky/libsky) _____ Copied: trunk/rosky/lib/libskygi (from rev 16319, trunk/reactos/lib/rosky/libskygi)

19 years, 5 months

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 June 2005