Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[fireball] 42091: - Set window proc for the desktop background window. Now, the CsrShowDesktop call is missing.
by fireball＠svn.reactos.org 19 Jul '09

19 Jul '09

Author: fireball Date: Sun Jul 19 22:34:00 2009 New Revision: 42091 URL: http://svn.reactos.org/svn/reactos?rev=42091&view=rev Log: - Set window proc for the desktop background window. Now, the CsrShowDesktop call is missing. Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] Sun Jul 19 22:34:00 2009 @@ -183,6 +183,9 @@ return 1; } + /* Set window proc */ + SetWindowLongPtrW( BackgroundWnd, GWLP_WNDPROC, (LONG_PTR)DtbgWindowProc ); + ThreadData->Status = STATUS_SUCCESS; SetEvent(ThreadData->Event);

1 0

[fireball] 42090: - Fix win32csr build (get rid of NtUserInitialize invocation). - Don't create the desktop window class (looks like a hack).
by fireball＠svn.reactos.org 19 Jul '09

19 Jul '09

Author: fireball Date: Sun Jul 19 20:53:22 2009 New Revision: 42090 URL: http://svn.reactos.org/svn/reactos?rev=42090&view=rev Log: - Fix win32csr build (get rid of NtUserInitialize invocation). - Don't create the desktop window class (looks like a hack). Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/dllmain.c Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] Sun Jul 19 20:53:22 2009 @@ -11,7 +11,7 @@ #include "w32csr.h" #include <debug.h> -#define DESKTOP_WINDOW_ATOM 32769 //32880 +#define DESKTOP_WINDOW_ATOM 32769 #define PM_SHOW_DESKTOP 1 #define PM_HIDE_DESKTOP 2 @@ -39,7 +39,7 @@ static BOOL BgInitialized = FALSE; static HWND VisibleDesktopWindow = NULL; -static LRESULT CALLBACK +LRESULT CALLBACK DtbgWindowProc(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) { switch(Msg) @@ -119,12 +119,13 @@ static BOOL FASTCALL DtbgInit() { - WNDCLASSEXW Class; - ATOM ClassAtom; + //WNDCLASSEXW Class; + //ATOM ClassAtom; /* * Create the desktop window class */ +#if 0 Class.cbSize = sizeof(WNDCLASSEXW); Class.style = 0; Class.lpfnWndProc = DtbgWindowProc; @@ -143,6 +144,7 @@ GetLastError()); return FALSE; } +#endif VisibleDesktopWindow = NULL; return TRUE; Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sun Jul 19 20:53:22 2009 @@ -588,7 +588,7 @@ CsrExports = *Exports; Win32CsrApiHeap = CsrssApiHeap; - Status = NtUserInitialize(0 ,NULL, NULL); + Status = STATUS_SUCCESS;//NtUserInitialize(0 ,NULL, NULL); PrivateCsrssManualGuiCheck(0); CsrInitConsoleSupport();

1 0

[hpoussin] 42089: Fix bug introduced in r1514, where memory was freed once in DLL_THREAD_DETACH and once more in DLL_PROCESS_DETACH
by hpoussin＠svn.reactos.org 19 Jul '09

19 Jul '09

Author: hpoussin Date: Sun Jul 19 20:37:58 2009 New Revision: 42089 URL: http://svn.reactos.org/svn/reactos?rev=42089&view=rev Log: Fix bug introduced in r1514, where memory was freed once in DLL_THREAD_DETACH and once more in DLL_PROCESS_DETACH Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Sun Jul 19 20:37:58 2009 @@ -885,25 +885,20 @@ case DLL_PROCESS_DETACH: { + DestroyCatalog(); + + FreeProviderHandleTable(); + } + break; + + case DLL_THREAD_DETACH: + { p = NtCurrentTeb()->WinSockData; if (p) HeapFree(GlobalHeap, 0, p); - - DestroyCatalog(); - - FreeProviderHandleTable(); } break; - - case DLL_THREAD_DETACH: - { - p = NtCurrentTeb()->WinSockData; - - if (p) - HeapFree(GlobalHeap, 0, p); - } - break; } WS_DbgPrint(MAX_TRACE, ("DllMain of ws2_32.dll. Leaving.\n"));

1 0

[cgutman] 42088: - Generate a random ID for use during datagram reassembly
by cgutman＠svn.reactos.org 19 Jul '09

19 Jul '09

Author: cgutman Date: Sun Jul 19 19:40:36 2009 New Revision: 42088 URL: http://svn.reactos.org/svn/reactos?rev=42088&view=rev Log: - Generate a random ID for use during datagram reassembly Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/r… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Sun Jul 19 19:40:36 2009 @@ -59,7 +59,7 @@ /* Length of header and data */ IPHeader->TotalLength = WH2N((USHORT)IPPacket->TotalSize); /* Identification */ - IPHeader->Id = 0; + IPHeader->Id = (USHORT)Random(); /* One fragment at offset 0 */ IPHeader->FlagsFragOfs = 0; /* Time-to-Live is 128 */

1 0

[cgutman] 42087: - Properly implement ICMP - Now Raw IP works correctly because it isn't being hacked to handle ICMP packets
by cgutman＠svn.reactos.org 19 Jul '09

19 Jul '09

Author: cgutman Date: Sun Jul 19 16:48:48 2009 New Revision: 42087 URL: http://svn.reactos.org/svn/reactos?rev=42087&view=rev Log: - Properly implement ICMP - Now Raw IP works correctly because it isn't being hacked to handle ICMP packets Modified: trunk/reactos/drivers/network/tcpip/include/icmp.h trunk/reactos/drivers/network/tcpip/include/rawip.h trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/lib/drivers/ip/network/icmp.c trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c Modified: trunk/reactos/drivers/network/tcpip/include/icmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/icmp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/icmp.h [iso-8859-1] Sun Jul 19 16:48:48 2009 @@ -48,6 +48,16 @@ /* ICMP codes for ICMP_TYPE_PARAMETER */ #define ICMP_CODE_TP_POINTER 1 /* Pointer indicates the error */ +NTSTATUS ICMPSendDatagram( + PADDRESS_FILE AddrFile, + PTDI_CONNECTION_INFORMATION ConnInfo, + PCHAR BufferData, + ULONG DataSize, + PULONG DataUsed ); + +NTSTATUS ICMPStartup(); + +NTSTATUS ICMPShutdown(); VOID ICMPReceive( PIP_INTERFACE Interface, Modified: trunk/reactos/drivers/network/tcpip/include/rawip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/rawip.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/rawip.h [iso-8859-1] Sun Jul 19 16:48:48 2009 @@ -14,7 +14,7 @@ ULONG DataSize, PULONG DataUsed); -VOID RawIPReceive( +VOID RawIpReceive( PIP_INTERFACE Interface, PIP_PACKET IPPacket); 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] Sun Jul 19 16:48:48 2009 @@ -291,6 +291,11 @@ 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; Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Sun Jul 19 16:48:48 2009 @@ -646,6 +646,7 @@ TCPShutdown(); UDPShutdown(); RawIPShutdown(); + ICMPShutdown(); /* Shutdown network level protocol subsystem */ IPShutdown(); @@ -871,6 +872,23 @@ Status = TCPStartup(); if( !NT_SUCCESS(Status) ) { + UDPShutdown(); + RawIPShutdown(); + IPShutdown(); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + exFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + return Status; + } + + Status = ICMPStartup(); + if( !NT_SUCCESS(Status) ) { + TCPShutdown(); UDPShutdown(); RawIPShutdown(); IPShutdown(); Modified: trunk/reactos/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/icm… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] Sun Jul 19 16:48:48 2009 @@ -10,6 +10,19 @@ #include "precomp.h" +NTSTATUS ICMPStartup() +{ + IPRegisterProtocol(IPPROTO_ICMP, ICMPReceive); + + return STATUS_SUCCESS; +} + +NTSTATUS ICMPShutdown() +{ + IPRegisterProtocol(IPPROTO_ICMP, NULL); + + return STATUS_SUCCESS; +} VOID SendICMPComplete( PVOID Context, @@ -118,6 +131,89 @@ return TRUE; } +VOID ICMPSendPacketComplete +( PVOID Context, PNDIS_PACKET Packet, NDIS_STATUS Status ) { + FreeNdisPacket( Packet ); +} + +NTSTATUS ICMPSendDatagram( + PADDRESS_FILE AddrFile, + PTDI_CONNECTION_INFORMATION ConnInfo, + PCHAR BufferData, + ULONG DataSize, + PULONG DataUsed ) +/* + * FUNCTION: Sends an ICMP datagram to a remote address + * ARGUMENTS: + * Request = Pointer to TDI request + * ConnInfo = Pointer to connection information + * Buffer = Pointer to NDIS buffer with data + * DataSize = Size in bytes of data to be sent + * RETURNS: + * Status of operation + */ +{ + IP_PACKET Packet; + PTA_IP_ADDRESS RemoteAddressTa = (PTA_IP_ADDRESS)ConnInfo->RemoteAddress; + IP_ADDRESS RemoteAddress, LocalAddress; + USHORT RemotePort; + NTSTATUS Status; + PNEIGHBOR_CACHE_ENTRY NCE; + + TI_DbgPrint(MID_TRACE,("Sending Datagram(%x %x %x %d)\n", + AddrFile, ConnInfo, BufferData, DataSize)); + TI_DbgPrint(MID_TRACE,("RemoteAddressTa: %x\n", RemoteAddressTa)); + + switch( RemoteAddressTa->Address[0].AddressType ) { + case TDI_ADDRESS_TYPE_IP: + RemoteAddress.Type = IP_ADDRESS_V4; + RemoteAddress.Address.IPv4Address = + RemoteAddressTa->Address[0].Address[0].in_addr; + RemotePort = RemoteAddressTa->Address[0].Address[0].sin_port; + break; + + default: + return STATUS_UNSUCCESSFUL; + } + + TI_DbgPrint(MID_TRACE,("About to get route to destination\n")); + + if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) + return STATUS_NETWORK_UNREACHABLE; + + LocalAddress = AddrFile->Address; + if (AddrIsUnspecified(&LocalAddress)) + { + /* If the local address is unspecified (0), + * then use the unicast address of the + * interface we're sending over + */ + LocalAddress = NCE->Interface->Unicast; + } + + Status = PrepareICMPPacket( NCE->Interface, + &Packet, + &RemoteAddress, + BufferData, + DataSize ); + + if( !NT_SUCCESS(Status) ) + return Status; + + TI_DbgPrint(MID_TRACE,("About to send datagram\n")); + + if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, ICMPSendPacketComplete, NULL ))) + { + FreeNdisPacket(Packet.NdisPacket); + return Status; + } + + TI_DbgPrint(MID_TRACE,("Leaving\n")); + + return STATUS_SUCCESS; +} + + VOID ICMPReceive( PIP_INTERFACE Interface, @@ -144,6 +240,8 @@ TI_DbgPrint(DEBUG_ICMP, ("Code (%d).\n", ICMPHeader->Code)); TI_DbgPrint(DEBUG_ICMP, ("Checksum (0x%X).\n", ICMPHeader->Checksum)); + + RawIpReceive(Interface, IPPacket); /* Checksum ICMP header and data */ if (!IPv4CorrectChecksum(IPPacket->Data, IPPacket->TotalSize - IPPacket->HeaderSize)) { Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Sun Jul 19 16:48:48 2009 @@ -113,11 +113,6 @@ { /* Call the appropriate protocol handler */ (*ProtocolTable[Protocol])(Interface, IPPacket); - - /* Special case for ICMP -- ICMP can be caught by a SOCK_RAW but also - * must be handled here. */ - if( Protocol == IPPROTO_ICMP ) - ICMPReceive( Interface, IPPacket ); } } Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/r… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Sun Jul 19 16:48:48 2009 @@ -126,7 +126,7 @@ Status = AddGenericHeaderIPv4 (RemoteAddress, RemotePort, LocalAddress, LocalPort, Packet, DataLen, - IPPROTO_ICMP, /* XXX Figure out a better way to do this */ + IPPROTO_RAW, 0, (PVOID *)&Payload ); break; case IP_ADDRESS_V6: @@ -332,7 +332,7 @@ #endif /* Register this protocol with IP layer */ - IPRegisterProtocol(IPPROTO_ICMP, RawIpReceive); + IPRegisterProtocol(IPPROTO_RAW, RawIpReceive); return STATUS_SUCCESS; } @@ -346,7 +346,7 @@ */ { /* Deregister this protocol with IP layer */ - IPRegisterProtocol(IPPROTO_ICMP, NULL); + IPRegisterProtocol(IPPROTO_RAW, NULL); return STATUS_SUCCESS; }

1 0

[hpoussin] 42086: Add missing SetWindowsHookW prototype
by hpoussin＠svn.reactos.org 19 Jul '09

19 Jul '09

Author: hpoussin Date: Sun Jul 19 16:03:10 2009 New Revision: 42086 URL: http://svn.reactos.org/svn/reactos?rev=42086&view=rev Log: Add missing SetWindowsHookW prototype Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Jul 19 16:03:10 2009 @@ -4393,6 +4393,7 @@ HHOOK WINAPI SetWindowsHookA(int,HOOKPROC); HHOOK WINAPI SetWindowsHookExA(int,HOOKPROC,HINSTANCE,DWORD); HHOOK WINAPI SetWindowsHookExW(int,HOOKPROC,HINSTANCE,DWORD); +HHOOK WINAPI SetWindowsHookW(int,HOOKPROC); BOOL WINAPI SetWindowTextA(HWND,LPCSTR); BOOL WINAPI SetWindowTextW(HWND,LPCWSTR); WORD WINAPI SetWindowWord(HWND,int,WORD);

1 0

[fireball] 42085: - Fix build by disabling registry related code for now (advapi32 is not available for linking).
by fireball＠svn.reactos.org 19 Jul '09

19 Jul '09

Author: fireball Date: Sun Jul 19 14:32:42 2009 New Revision: 42085 URL: http://svn.reactos.org/svn/reactos?rev=42085&view=rev Log: - Fix build by disabling registry related code for now (advapi32 is not available for linking). Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] Sun Jul 19 14:32:42 2009 @@ -2607,6 +2607,7 @@ static void populate_system_links(HKEY hkey, const WCHAR *name, const WCHAR *const *values) { +#if 0 const WCHAR *value; int i; FontSubst *psub; @@ -2678,10 +2679,12 @@ TRACE("no SystemLink fonts found for %s\n", debugstr_w(name)); } else TRACE("removed SystemLink for %s\n", debugstr_w(name)); +#endif } static void update_system_links(void) { +#if 0 HKEY hkey = 0; UINT i, j; BOOL done = FALSE; @@ -2727,6 +2730,7 @@ WARN("there is no SystemLink default list for MS Shell Dlg %s\n", debugstr_w(psub->to.name)); } else WARN("failed to create SystemLink key\n"); +#endif }

1 0

[fireball] 42084: - Enable usermode font engine in gdi32.
by fireball＠svn.reactos.org 19 Jul '09

19 Jul '09

Author: fireball Date: Sun Jul 19 14:31:17 2009 New Revision: 42084 URL: http://svn.reactos.org/svn/reactos?rev=42084&view=rev Log: - Enable usermode font engine in gdi32. Modified: branches/arwinss/reactos/include/reactos/wine/config.h Modified: branches/arwinss/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/config.h [iso-8859-1] Sun Jul 19 14:31:17 2009 @@ -93,37 +93,43 @@ #define HAVE_FPCLASS 1 /* Define if FreeType 2 is installed */ -/* #undef HAVE_FREETYPE */ +#define HAVE_FREETYPE 1 /* Define to 1 if you have the <freetype/freetype.h> header file. */ -/* #undef HAVE_FREETYPE_FREETYPE_H */ +#define HAVE_FREETYPE_FREETYPE_H 1 /* Define to 1 if you have the <freetype/ftglyph.h> header file. */ -/* #undef HAVE_FREETYPE_FTGLYPH_H */ +#define HAVE_FREETYPE_FTGLYPH_H 1 + +/* Define to 1 if you have the <freetype/ftlcdfil.h> header file. */ +#define HAVE_FREETYPE_FTLCDFIL_H 1 + +/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */ +#define HAVE_FREETYPE_FTMODAPI_H 1 /* Define to 1 if you have the <freetype/ftnames.h> header file. */ /* #undef HAVE_FREETYPE_FTNAMES_H */ /* Define to 1 if you have the <freetype/ftoutln.h> header file. */ -/* #undef HAVE_FREETYPE_FTOUTLN_H */ +#define HAVE_FREETYPE_FTOUTLN_H 1 /* Define to 1 if you have the <freetype/ftsnames.h> header file. */ -/* #undef HAVE_FREETYPE_FTSNAMES_H */ +#define HAVE_FREETYPE_FTSNAMES_H 1 /* Define if you have the <freetype/fttrigon.h> header file. */ -/* #undef HAVE_FREETYPE_FTTRIGON_H */ +#define HAVE_FREETYPE_FTTRIGON_H 1 /* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */ -/* #undef HAVE_FREETYPE_FTWINFNT_H */ +#define HAVE_FREETYPE_FTWINFNT_H 1 /* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */ -/* #undef HAVE_FREETYPE_INTERNAL_SFNT_H */ +/* #define HAVE_FREETYPE_INTERNAL_SFNT_H 1 */ /* Define to 1 if you have the <freetype/ttnameid.h> header file. */ -/* #undef HAVE_FREETYPE_TTNAMEID_H */ +#define HAVE_FREETYPE_TTNAMEID_H 1 /* Define to 1 if you have the <freetype/tttables.h> header file. */ -/* #undef HAVE_FREETYPE_TTTABLES_H */ +#define HAVE_FREETYPE_TTTABLES_H 1 /* Define to 1 if the system has the type `fsblkcnt_t'. */ /* #undef HAVE_FSBLKCNT_T */ @@ -138,7 +144,13 @@ /* #undef HAVE_FSTATVFS */ /* Define to 1 if you have the <ft2build.h> header file. */ -/* #undef HAVE_FT2BUILD_H */ +#define HAVE_FT2BUILD_H 1 + +/* Define to 1 if you have the `FT_Load_Sfnt_Table' function. */ +/* #undef HAVE_FT_LOAD_SFNT_TABLE */ + +/* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */ +#define HAVE_FT_TRUETYPEENGINETYPE 1 /* Define to 1 if you have the `ftruncate' function. */ #define HAVE_FTRUNCATE 1 @@ -277,8 +289,6 @@ /* Define if you have the libxml2 library */ #define HAVE_LIBXML2 -#define HAVE_XMLNEWDOCPI -#define HAVE_XMLREADMEMORY /* Define to 1 if you have the <libxml/parser.h> header file. */ #define HAVE_LIBXML_PARSER_H @@ -296,10 +306,10 @@ /* #undef HAVE_LIBXSLT */ /* Define to 1 if you have the <libxslt/pattern.h> header file. */ -#define HAVE_LIBXSLT_PATTERN_H +/* #undef HAVE_LIBXSLT_PATTERN_H */ /* Define to 1 if you have the <libxslt/transform.h> header file. */ -#define HAVE_LIBXSLT_TRANSFORM_H +/* #undef HAVE_LIBXSLT_TRANSFORM_H */ /* Define if you have the Xxf86dga library version 2 */ /* #undef HAVE_LIBXXF86DGA2 */

1 0

[fireball] 42083: - Remove ftfd from build (it depends on a kernel-mode-built freetype library).
by fireball＠svn.reactos.org 19 Jul '09

19 Jul '09

Author: fireball Date: Sun Jul 19 14:29:35 2009 New Revision: 42083 URL: http://svn.reactos.org/svn/reactos?rev=42083&view=rev Log: - Remove ftfd from build (it depends on a kernel-mode-built freetype library). Modified: branches/arwinss/reactos/drivers/video/font/directory.rbuild Modified: branches/arwinss/reactos/drivers/video/font/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/f… ============================================================================== --- branches/arwinss/reactos/drivers/video/font/directory.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/drivers/video/font/directory.rbuild [iso-8859-1] Sun Jul 19 14:29:35 2009 @@ -4,8 +4,8 @@ <directory name="bmfd"> <xi:include href="bmfd/bmfd.rbuild" /> </directory> - <directory name="ftfd"> +  </group>

1 0

[fireball] 42082: - Build freetype as a usual win32 dll.
by fireball＠svn.reactos.org 19 Jul '09

19 Jul '09

Author: fireball Date: Sun Jul 19 14:27:58 2009 New Revision: 42082 URL: http://svn.reactos.org/svn/reactos?rev=42082&view=rev Log: - Build freetype as a usual win32 dll. Added: branches/arwinss/reactos/dll/3rdparty/freetype/ - copied from r42002, branches/arwinss/reactos/lib/3rdparty/freetype/ branches/arwinss/reactos/dll/3rdparty/freetype/rosglue.c (with props) Removed: branches/arwinss/reactos/lib/3rdparty/freetype/ Modified: branches/arwinss/reactos/dll/3rdparty/3rdparty.rbuild branches/arwinss/reactos/dll/3rdparty/freetype/freetype.rbuild branches/arwinss/reactos/lib/3rdparty/3rdparty.rbuild Modified: branches/arwinss/reactos/dll/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/3rdparty/3r… ============================================================================== --- branches/arwinss/reactos/dll/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/3rdparty/3rdparty.rbuild [iso-8859-1] Sun Jul 19 14:27:58 2009 @@ -1,6 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="freetype"> + <xi:include href="freetype/freetype.rbuild" /> + </directory> <directory name="mesa32"> <xi:include href="mesa32/mesa32.rbuild" /> </directory> Modified: branches/arwinss/reactos/dll/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/3rdparty/fr… ============================================================================== --- branches/arwinss/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] Sun Jul 19 14:27:58 2009 @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="freetype" type="staticlibrary" allowwarnings="true"> +<module name="freetype" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="freetype.dll" allowwarnings="true" crt="msvcrt"> + <importlibrary definition="freetype.def" /> <include base="freetype">include</include> <define name="_DISABLE_TIDENTS" /> <define name="__NTDRIVER__" /> @@ -12,6 +13,7 @@ <if property="NSWPAT" value="1"> <define name="TT_CONFIG_OPTION_BYTECODE_INTERPRETER" /> </if> + <library>kernel32</library> <if property="ARCH" value="i386"> <directory name="i386"> <file>setjmplongjmp.s</file> @@ -101,4 +103,6 @@ <file>winfnt.c</file> </directory> </directory> + <file>rosglue.c</file> + <file>freetype.rc</file> </module> Added: branches/arwinss/reactos/dll/3rdparty/freetype/rosglue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/3rdparty/fr… ============================================================================== --- branches/arwinss/reactos/dll/3rdparty/freetype/rosglue.c (added) +++ branches/arwinss/reactos/dll/3rdparty/freetype/rosglue.c [iso-8859-1] Sun Jul 19 14:27:58 2009 @@ -1,0 +1,131 @@ +/* $Id: rosglue.c 29690 2007-10-19 23:21:45Z dreimer $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: FreeType implementation for ReactOS + * PURPOSE: Glue functions between FreeType + * FILE: thirdparty/freetype/rosglue.c + * PROGRAMMER: Ge van Geldorp (ge(a)gse.nl) + * NOTES: + */ + +#include <ntddk.h> +#include <ctype.h> +#include <errno.h> +#include <setjmp.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#define NDEBUG +#include <debug.h> + +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#define TAG_FREETYPE TAG('F', 'T', 'Y', 'P') + +/* + * First some generic routines + */ + + + +/* + * Memory allocation + * + * Because of realloc, we need to keep track of the size of the allocated + * buffer (need to copy the old contents to the new buffer). So, allocate + * extra space for a size_t, store the allocated size in there and return + * the address just past it as the allocated buffer. + */ +#if 0 +void * +malloc(size_t Size) +{ + void *Object; + + Object = ExAllocatePoolWithTag(PagedPool, sizeof(size_t) + Size, TAG_FREETYPE); + if (NULL != Object) + { + *((size_t *) Object) = Size; + Object = (void *)((size_t *) Object + 1); + } + + return Object; +} + +void * +realloc(void *Object, size_t Size) +{ + void *NewObject; + size_t CopySize; + + NewObject = ExAllocatePoolWithTag(PagedPool, sizeof(size_t) + Size, TAG_FREETYPE); + if (NULL != NewObject) + { + *((size_t *) NewObject) = Size; + NewObject = (void *)((size_t *) NewObject + 1); + CopySize = *((size_t *) Object - 1); + if (Size < CopySize) + { + CopySize = Size; + } + memcpy(NewObject, Object, CopySize); + ExFreePool((size_t *) Object - 1); + } + + return NewObject; +} + +void +free(void *Object) +{ + ExFreePool((size_t *) Object - 1); +} + +/* + * File I/O + * + * This is easy, we don't want FreeType to do any I/O. So return an + * error on each I/O attempt. Note that errno is not being set, it is + * not used by FreeType. + */ + +FILE * +fopen(const char *FileName, const char *Mode) +{ + DPRINT1("Freetype tries to open file %s\n", FileName); + + return NULL; +} + +int +fseek(FILE *Stream, long Offset, int Origin) +{ + DPRINT1("Doubleplus ungood: freetype shouldn't fseek!\n"); + + return -1; +} + +long +ftell(FILE *Stream) +{ + DPRINT1("Doubleplus ungood: freetype shouldn't ftell!\n"); + + return -1; +} + +size_t +fread(void *Buffer, size_t Size, size_t Count, FILE *Stream) +{ + DPRINT1("Doubleplus ungood: freetype shouldn't fread!\n"); + + return 0; +} + +int +fclose(FILE *Stream) +{ + DPRINT1("Doubleplus ungood: freetype shouldn't fclose!\n"); + + return EOF; +} +#endif Propchange: branches/arwinss/reactos/dll/3rdparty/freetype/rosglue.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/lib/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/3rdparty/3r… ============================================================================== --- branches/arwinss/reactos/lib/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/3rdparty/3rdparty.rbuild [iso-8859-1] Sun Jul 19 14:27:58 2009 @@ -9,9 +9,6 @@ </directory> <directory name="expat"> <xi:include href="expat/expat.rbuild" /> - </directory> - <directory name="freetype"> - <xi:include href="freetype/freetype.rbuild" /> </directory> <directory name="icu4ros"> <xi:include href="icu4ros/icu4ros.rbuild" />

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009