Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mkupfer] 42781: - third part of German translation of rapps entries. - change some entries to proper values
by mkupfer＠svn.reactos.org 19 Aug '09

19 Aug '09

Author: mkupfer Date: Wed Aug 19 13:28:00 2009 New Revision: 42781 URL: http://svn.reactos.org/svn/reactos?rev=42781&view=rev Log: - third part of German translation of rapps entries. - change some entries to proper values Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] Wed Aug 19 13:28:00 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Simple Direct Media Layer (SDL) Mixer @@ -10,3 +10,10 @@ URLSite = Unknown URLDownload = http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.8-win32.zip CDPath = none + + +[Section.0407] +Licence = Unbekannt +Description = Erforderlich um einige Open Source Spiele auszufÃ¼hren. Sie brauchen 7-Zip oder einen Ã¤hnlichen Entpacker um es zu entpacken. +Size = Unbekannt +URLSite = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] Wed Aug 19 13:28:00 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Simple Direct Media Layer (SDL) Runtime @@ -10,3 +10,11 @@ URLSite = Unknown URLDownload = http://www.libsdl.org/release/SDL-1.2.13-win32.zip CDPath = none + + +[Section.0407] +Name = Simple Direct Media Layer (SDL) Laufzeitumgebung +Licence = Unbekannt +Description = Erforderlich um einige Open Source Spiele auszufÃ¼hren. Sie brauchen 7-Zip oder einen Ã¤hnlichen Entpacker um es zu entpacken. +Size = Unbekannt +URLSite = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Wed Aug 19 13:28:00 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Mozilla SeaMonkey @@ -15,3 +15,10 @@ Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Licence = ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾ URLSite = http://www.mozilla-europe.org/ru/ + +[Section.0407] +Licence = Unbekannt +Description = Mozilla Suite ist lebendig. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. +Size = 8.9M +URLSite = http://www.mozilla-europe.org/de/ +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.16/contrib-localized/se… Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] Wed Aug 19 13:28:00 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = SMPlayer @@ -10,3 +10,9 @@ URLSite = Unknown URLDownload = http://dfn.dl.sourceforge.net/sourceforge/smplayer/smplayer_0.6.7_setup.exe CDPath = none + + +[Section.0407] +Licence = Unbekannt +Size = Unbekannt +URLSite = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Wed Aug 19 13:28:00 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Mozilla Thunderbird 2.0 @@ -7,12 +7,18 @@ Description = The most popular and one of the best free Mail Clients out there. Size = 6.4M Category = 5 -URLSite = http://www.mozilla.com/en-US/ +URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w… CDPath = none [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 7.0M -URLSite = http://www.mozilla-europe.org/ru/ +URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w… + +[Section.0407] +Description = Der populÃ¤rste und einer der besten freien Mail-Clients. +Size = 6.2M +URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w…

1 0

[gschneider] 42780: - GetGlyphOutline: fail if output or transformation matrix buffers are not passed - Fixes three gdi32 font winetests
by gschneider＠svn.reactos.org 19 Aug '09

19 Aug '09

Author: gschneider Date: Wed Aug 19 13:23:31 2009 New Revision: 42780 URL: http://svn.reactos.org/svn/reactos?rev=42780&view=rev Log: - GetGlyphOutline: fail if output or transformation matrix buffers are not passed - Fixes three gdi32 font winetests Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Wed Aug 19 13:23:31 2009 @@ -929,6 +929,7 @@ DWORD ret; UINT c; DPRINT("GetGlyphOutlineA uChar %x\n", uChar); + if (!lpgm || !lpmat2) return GDI_ERROR; if(!(uFormat & GGO_GLYPH_INDEX)) { int len; char mbchs[2]; @@ -966,7 +967,7 @@ ) { DPRINT("GetGlyphOutlineW uChar %x\n", uChar); - if (!lpgm & !lpmat2) return GDI_ERROR; + if (!lpgm || !lpmat2) return GDI_ERROR; if (!lpvBuffer) cbBuffer = 0; return NtGdiGetGlyphOutline ( hdc, uChar, uFormat, lpgm, cbBuffer, lpvBuffer, (CONST LPMAT2)lpmat2, TRUE); }

1 0

[gschneider] 42779: - Sync and adapt Wine font metric code for setting first, last, default and break characters - Fixes approx 80 gdi32 font winetests
by gschneider＠svn.reactos.org 19 Aug '09

19 Aug '09

Author: gschneider Date: Wed Aug 19 13:02:10 2009 New Revision: 42779 URL: http://svn.reactos.org/svn/reactos?rev=42779&view=rev Log: - Sync and adapt Wine font metric code for setting first, last, default and break characters - Fixes approx 80 gdi32 font winetests Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Wed Aug 19 13:02:10 2009 @@ -566,6 +566,18 @@ } +static BOOL face_has_symbol_charmap(FT_Face ft_face) +{ + int i; + + for(i = 0; i < ft_face->num_charmaps; i++) + { + if(ft_face->charmaps[i]->encoding == FT_ENCODING_MS_SYMBOL) + return TRUE; + } + return FALSE; +} + static void FASTCALL FillTM(TEXTMETRICW *TM, PFONTGDI FontGDI, TT_OS2 *pOS2, TT_HoriHeader *pHori, FT_WinFNT_HeaderRec *pWin) { @@ -644,10 +656,36 @@ TM->tmOverhang = 0; TM->tmDigitizedAspectX = 96; TM->tmDigitizedAspectY = 96; - TM->tmFirstChar = pOS2->usFirstCharIndex; - TM->tmDefaultChar = pOS2->usDefaultChar ? pOS2->usDefaultChar : 0xffff; - TM->tmLastChar = pOS2->usLastCharIndex; - TM->tmBreakChar = L'\0' != pOS2->usBreakChar ? pOS2->usBreakChar : ' '; + if (face_has_symbol_charmap(Face) || (pOS2->usFirstCharIndex >= 0xf000 && pOS2->usFirstCharIndex < 0xf100)) + { + USHORT cpOEM, cpAnsi; + + EngGetCurrentCodePage(&cpOEM, &cpAnsi); + TM->tmFirstChar = 0; + switch(cpAnsi) + { + case 1257: /* Baltic */ + TM->tmLastChar = 0xf8fd; + break; + default: + TM->tmLastChar = 0xf0ff; + } + TM->tmBreakChar = 0x20; + TM->tmDefaultChar = 0x1f; + } + else + { + TM->tmFirstChar = pOS2->usFirstCharIndex; /* Should be the first char in the cmap */ + TM->tmLastChar = pOS2->usLastCharIndex; /* Should be min(cmap_last, os2_last) */ + + if(pOS2->usFirstCharIndex <= 1) + TM->tmBreakChar = pOS2->usFirstCharIndex + 2; + else if (pOS2->usFirstCharIndex > 0xff) + TM->tmBreakChar = 0x20; + else + TM->tmBreakChar = pOS2->usFirstCharIndex; + TM->tmDefaultChar = TM->tmBreakChar - 1; + } TM->tmItalic = (Face->style_flags & FT_STYLE_FLAG_ITALIC) ? 255 : 0; TM->tmUnderlined = FontGDI->Underline; TM->tmStruckOut = FontGDI->StrikeOut;

1 0

[cgutman] 42778: - Fix release build
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Wed Aug 19 00:15:06 2009 New Revision: 42778 URL: http://svn.reactos.org/svn/reactos?rev=42778&view=rev Log: - Fix release build Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] Wed Aug 19 00:15:06 2009 @@ -14,7 +14,6 @@ #define NTOS_MODE_USER #define _CRT_SECURE_NO_DEPRECATE #define WINSOCK_API_LINKAGE -#define DBG 1 /* C Header */ #include <stdio.h>

1 0

[cgutman] 42777: - I guess kdesvn didn't realize that when I check the box for include/reactos/winsock that I actually wanted the files in it to be committed also
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 23:54:55 2009 New Revision: 42777 URL: http://svn.reactos.org/svn/reactos?rev=42777&view=rev Log: - I guess kdesvn didn't realize that when I check the box for include/reactos/winsock that I actually wanted the files in it to be committed also Added: trunk/reactos/include/reactos/winsock/nsp_dns.h (with props) trunk/reactos/include/reactos/winsock/ws2help.h (with props) Added: trunk/reactos/include/reactos/winsock/nsp_dns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winsock/ns… ============================================================================== --- trunk/reactos/include/reactos/winsock/nsp_dns.h (added) +++ trunk/reactos/include/reactos/winsock/nsp_dns.h [iso-8859-1] Tue Aug 18 23:54:55 2009 @@ -1,0 +1,27 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2 Headers + * FILE: include/winsock/nsp_dns.h + * PURPOSE: WinSock 2 Shared NSP Header + */ + + +#ifndef __NSP_DNS_H +#define __NSP_DNS_H + +/* Includes */ +#include <svcguid.h> + +/* Globals */ +GUID HostnameGuid = SVCID_HOSTNAME; +GUID AddressGuid = SVCID_INET_HOSTADDRBYINETSTRING; +GUID HostAddrByNameGuid = SVCID_INET_HOSTADDRBYNAME; +GUID IANAGuid = SVCID_INET_SERVICEBYNAME; +GUID InetHostName = SVCID_INET_HOSTADDRBYNAME; +GUID Ipv6Guid = SVCID_DNS_TYPE_AAAA; + +/* Macros and Defines */ +#define RNR_BUFFER_SIZE 512 + +#endif + Propchange: trunk/reactos/include/reactos/winsock/nsp_dns.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/reactos/winsock/ws2help.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winsock/ws… ============================================================================== --- trunk/reactos/include/reactos/winsock/ws2help.h (added) +++ trunk/reactos/include/reactos/winsock/ws2help.h [iso-8859-1] Tue Aug 18 23:54:55 2009 @@ -1,0 +1,163 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2 Helper DLL + * FILE: include/libs/winsock/ws2help.h + * PURPOSE: WinSock 2 Helper DLL header + */ + +#ifndef __WS2HELP_H +#define __WS2HELP_H + +/* Types */ +typedef struct _WSH_HANDLE +{ + LONG RefCount; + HANDLE Handle; +} WSH_HANDLE, *PWAH_HANDLE; + +typedef struct _WSH_HASH_TABLE +{ + DWORD Size; + PWAH_HANDLE Handles[1]; +} WSH_HASH_TABLE, *PWAH_HASH_TABLE; + +typedef struct _WSH_SEARCH_TABLE +{ + volatile PWAH_HASH_TABLE HashTable; + volatile PLONG CurrentCount; + LONG Count1; + LONG Count2; + LONG SpinCount; + BOOL Expanding; + CRITICAL_SECTION Lock; +} WSH_SEARCH_TABLE, *PWAH_SEARCH_TABLE; + +typedef struct _WSH_HANDLE_TABLE +{ + DWORD Mask; + WSH_SEARCH_TABLE SearchTables[1]; +} WSH_HANDLE_TABLE, *PWAH_HANDLE_TABLE; + +//typedef struct _WSH_HANDLE_TABLE *PWAH_HANDLE_TABLE; + +typedef BOOL +(WINAPI *PWAH_HANDLE_ENUMERATE_PROC)( + IN PVOID Context, + IN PWAH_HANDLE Handle +); + +PWAH_HANDLE +WINAPI +WahReferenceContextByHandle( + IN PWAH_HANDLE_TABLE Table, + IN HANDLE Handle +); + +DWORD +WINAPI +WahRemoveHandleContext( + IN PWAH_HANDLE_TABLE Table, + IN PWAH_HANDLE Handle +); + +DWORD +WINAPI +WahCloseSocketHandle( + IN HANDLE HelperHandle, + IN SOCKET Socket +); + +DWORD +WINAPI +WahOpenCurrentThread( + IN HANDLE HelperHandle, + OUT LPWSATHREADID ThreadId +); + +DWORD +WINAPI +WahCloseApcHelper( + IN HANDLE HelperHandle +); + +DWORD +WINAPI +WahCloseThread( + IN HANDLE HelperHandle, + IN LPWSATHREADID ThreadId +); + +DWORD +WINAPI +WahCloseHandleHelper( + IN HANDLE HelperHandle +); + +DWORD +WINAPI +WahCloseNotificationHandleHelper( + IN HANDLE HelperHandle +); + +DWORD +WINAPI +WahOpenNotificationHandleHelper( + OUT PHANDLE HelperHandle +); + +DWORD +WINAPI +WahCreateNotificationHandle( + IN HANDLE HelperHandle, + OUT PHANDLE NotificationHelperHandle +); + +INT +WINAPI +WahWaitForNotification( + IN HANDLE NotificationHelperHandle, + IN HANDLE lpNotificationHandle, + IN LPWSAOVERLAPPED lpOverlapped, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine +); + +INT +WINAPI +WahNotifyAllProcesses( + IN HANDLE NotificationHelperHandle +); + +BOOL +WINAPI +WahEnumerateHandleContexts( + IN PWAH_HANDLE_TABLE Table, + IN PWAH_HANDLE_ENUMERATE_PROC Callback, + IN PVOID Context +); + +DWORD +WINAPI +WahCreateHandleContextTable( + OUT PWAH_HANDLE_TABLE *Table +); + +DWORD +WINAPI +WahDestroyHandleContextTable( + IN PWAH_HANDLE_TABLE Table +); + +PWAH_HANDLE +WINAPI +WahInsertHandleContext( + IN PWAH_HANDLE_TABLE Table, + IN PWAH_HANDLE Handle +); + +DWORD +WINAPI +WahOpenApcHelper( + OUT PHANDLE ApcHelperHandle +); + +#endif Propchange: trunk/reactos/include/reactos/winsock/ws2help.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 42776: - Fix ws2_32_new's build problems - ws2_32_new is now included in build (output file is ws2_32_new.dll for any curious testers :P)
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 23:40:20 2009 New Revision: 42776 URL: http://svn.reactos.org/svn/reactos?rev=42776&view=rev Log: - Fix ws2_32_new's build problems - ws2_32_new is now included in build (output file is ws2_32_new.dll for any curious testers :P) Added: trunk/reactos/include/reactos/winsock/ Removed: trunk/reactos/dll/win32/ws2help/ws2help.h Modified: trunk/reactos/dll/win32/win32.rbuild trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild trunk/reactos/dll/win32/ws2help/ws2help.rbuild Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Tue Aug 18 23:40:20 2009 @@ -619,6 +619,9 @@ <directory name="ws2_32"> <xi:include href="ws2_32/ws2_32.rbuild" /> </directory> +<directory name="ws2_32_new"> + <xi:include href="ws2_32_new/ws2_32.rbuild" /> +</directory> <directory name="ws2help"> <xi:include href="ws2help/ws2help.rbuild" /> </directory> Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] Tue Aug 18 23:40:20 2009 @@ -25,9 +25,7 @@ #include <ws2spi.h> #include <ndk/umtypes.h> #include <ndk/rtlfuncs.h> - -/* Shared NSP Headers */ -#include <nsp_dns.h> +#include <svcguid.h> /* Winsock Helper Header */ #include <ws2help.h> Modified: trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/g… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] Tue Aug 18 23:40:20 2009 @@ -8,6 +8,7 @@ /* INCLUDES ******************************************************************/ #include "ws2_32.h" +#include <nsp_dns.h> //#define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/ws2_3… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] Tue Aug 18 23:40:20 2009 @@ -1,6 +1,7 @@ <module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32_new.dll"> <importlibrary definition="ws2_32.spec" /> <include base="ws2_32_new">inc</include> + <include base="ReactOS">include/reactos/winsock</include> <define name="LE" /> <library>wine</library> <library>ntdll</library> Removed: trunk/reactos/dll/win32/ws2help/ws2help.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/ws2help.… ============================================================================== --- trunk/reactos/dll/win32/ws2help/ws2help.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/ws2help.h (removed) @@ -1,163 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS WinSock 2 Helper DLL - * FILE: include/libs/winsock/ws2help.h - * PURPOSE: WinSock 2 Helper DLL header - */ - -#ifndef __WS2HELP_H -#define __WS2HELP_H - -/* Types */ -typedef struct _WSH_HANDLE -{ - LONG RefCount; - HANDLE Handle; -} WSH_HANDLE, *PWAH_HANDLE; - -typedef struct _WSH_HASH_TABLE -{ - DWORD Size; - PWAH_HANDLE Handles[1]; -} WSH_HASH_TABLE, *PWAH_HASH_TABLE; - -typedef struct _WSH_SEARCH_TABLE -{ - volatile PWAH_HASH_TABLE HashTable; - volatile PLONG CurrentCount; - LONG Count1; - LONG Count2; - LONG SpinCount; - BOOL Expanding; - CRITICAL_SECTION Lock; -} WSH_SEARCH_TABLE, *PWAH_SEARCH_TABLE; - -typedef struct _WSH_HANDLE_TABLE -{ - DWORD Mask; - WSH_SEARCH_TABLE SearchTables[1]; -} WSH_HANDLE_TABLE, *PWAH_HANDLE_TABLE; - -//typedef struct _WSH_HANDLE_TABLE *PWAH_HANDLE_TABLE; - -typedef BOOL -(WINAPI *PWAH_HANDLE_ENUMERATE_PROC)( - IN PVOID Context, - IN PWAH_HANDLE Handle -); - -PWAH_HANDLE -WINAPI -WahReferenceContextByHandle( - IN PWAH_HANDLE_TABLE Table, - IN HANDLE Handle -); - -DWORD -WINAPI -WahRemoveHandleContext( - IN PWAH_HANDLE_TABLE Table, - IN PWAH_HANDLE Handle -); - -DWORD -WINAPI -WahCloseSocketHandle( - IN HANDLE HelperHandle, - IN SOCKET Socket -); - -DWORD -WINAPI -WahOpenCurrentThread( - IN HANDLE HelperHandle, - OUT LPWSATHREADID ThreadId -); - -DWORD -WINAPI -WahCloseApcHelper( - IN HANDLE HelperHandle -); - -DWORD -WINAPI -WahCloseThread( - IN HANDLE HelperHandle, - IN LPWSATHREADID ThreadId -); - -DWORD -WINAPI -WahCloseHandleHelper( - IN HANDLE HelperHandle -); - -DWORD -WINAPI -WahCloseNotificationHandleHelper( - IN HANDLE HelperHandle -); - -DWORD -WINAPI -WahOpenNotificationHandleHelper( - OUT PHANDLE HelperHandle -); - -DWORD -WINAPI -WahCreateNotificationHandle( - IN HANDLE HelperHandle, - OUT PHANDLE NotificationHelperHandle -); - -INT -WINAPI -WahWaitForNotification( - IN HANDLE NotificationHelperHandle, - IN HANDLE lpNotificationHandle, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine -); - -INT -WINAPI -WahNotifyAllProcesses( - IN HANDLE NotificationHelperHandle -); - -BOOL -WINAPI -WahEnumerateHandleContexts( - IN PWAH_HANDLE_TABLE Table, - IN PWAH_HANDLE_ENUMERATE_PROC Callback, - IN PVOID Context -); - -DWORD -WINAPI -WahCreateHandleContextTable( - OUT PWAH_HANDLE_TABLE *Table -); - -DWORD -WINAPI -WahDestroyHandleContextTable( - IN PWAH_HANDLE_TABLE Table -); - -PWAH_HANDLE -WINAPI -WahInsertHandleContext( - IN PWAH_HANDLE_TABLE Table, - IN PWAH_HANDLE Handle -); - -DWORD -WINAPI -WahOpenApcHelper( - OUT PHANDLE ApcHelperHandle -); - -#endif Modified: trunk/reactos/dll/win32/ws2help/ws2help.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/ws2help.… ============================================================================== --- trunk/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] Tue Aug 18 23:40:20 2009 @@ -1,6 +1,7 @@ <module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}" installbase="system32" installname="ws2help.dll"> <importlibrary definition="ws2help.spec" /> <include base="ws2help">.</include> + <include base="ReactOS">include/reactos/winsock</include> <library>advapi32</library> <library>ntdll</library> <library>kernel32</library>

1 0

[cgutman] 42775: - Print a message to the debug log if ZwClose returns STATUS_INVALID_HANDLE - This message will only after "cont"ing past the bugcheck and will hopefully help me track down bug 4796
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 22:43:13 2009 New Revision: 42775 URL: http://svn.reactos.org/svn/reactos?rev=42775&view=rev Log: - Print a message to the debug log if ZwClose returns STATUS_INVALID_HANDLE - This message will only after "cont"ing past the bugcheck and will hopefully help me track down bug 4796 Modified: trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Tue Aug 18 22:43:13 2009 @@ -233,10 +233,20 @@ ObDereferenceObject(FCB->AddressFile.Object); if( FCB->AddressFile.Handle != INVALID_HANDLE_VALUE ) - ZwClose(FCB->AddressFile.Handle); + { + if (ZwClose(FCB->AddressFile.Handle) == STATUS_INVALID_HANDLE) + { + DbgPrint("INVALID ADDRESS FILE HANDLE VALUE: %x %x\n", FCB->AddressFile.Handle, FCB->AddressFile.Object); + } + } if( FCB->Connection.Handle != INVALID_HANDLE_VALUE ) - ZwClose(FCB->Connection.Handle); + { + if (ZwClose(FCB->Connection.Handle) == STATUS_INVALID_HANDLE) + { + DbgPrint("INVALID CONNECTION HANDLE VALUE: %x %x\n", FCB->Connection.Handle, FCB->Connection.Object); + } + } if( FCB->TdiDeviceName.Buffer ) ExFreePool(FCB->TdiDeviceName.Buffer);

1 0

[cgutman] 42774: - Fix null pointer dereferences - Fix out of bounds array access - Check that we got a valid pointer from HeapAlloc - Don't close the caller's handle when we fail - Fix a memory leak - Found by Amine Khaldi
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 22:30:58 2009 New Revision: 42774 URL: http://svn.reactos.org/svn/reactos?rev=42774&view=rev Log: - Fix null pointer dereferences - Fix out of bounds array access - Check that we got a valid pointer from HeapAlloc - Don't close the caller's handle when we fail - Fix a memory leak - Found by Amine Khaldi Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c trunk/reactos/dll/win32/iphlpapi/registry.c trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ifenum_… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] Tue Aug 18 22:30:58 2009 @@ -582,6 +582,8 @@ interfaceName = HeapAlloc( GetProcessHeap(), 0, strlen(adapter_name) + 1 ); + if (!interfaceName) return NULL; + strcpy( interfaceName, adapter_name ); } @@ -847,15 +849,14 @@ char *toIPAddressString(unsigned int addr, char string[16]) { - if (string) { struct in_addr iAddr; iAddr.s_addr = addr; - /* extra-anal, just to make auditors happy */ - strncpy(string, inet_ntoa(iAddr), 16); - string[16] = '\0'; - } - return string; + + if (string) + strncpy(string, inet_ntoa(iAddr), 16); + + return inet_ntoa(iAddr); } NTSTATUS addIPAddress( IPAddr Address, IPMask Mask, DWORD IfIndex, Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Tue Aug 18 22:30:58 2009 @@ -102,6 +102,7 @@ { DWORD ndx, retVal = 0, numRoutes = getNumRoutes(); RouteTable *table = getRouteTable(); + if (!table) return 0; for (ndx = 0; ndx < numRoutes; ndx++) { @@ -645,9 +646,12 @@ DWORD addrLen = sizeof(ptr->Address), type; const char *ifname = getInterfaceNameByIndex(table->indexes[ndx]); + if (!ifname) { + ret = ERROR_OUTOFMEMORY; + break; + } /* on Win98 this is left empty, but whatever */ - strncpy(ptr->AdapterName,ifname,sizeof(ptr->AdapterName)); consumeInterfaceName(ifname); ptr->AdapterName[MAX_ADAPTER_NAME_LENGTH] = '\0'; @@ -983,9 +987,9 @@ } else { InterfaceIndexTable *table = getNonLoopbackInterfaceIndexTable(); - TRACE("table->numIndexes == 0x%x\n", table->numIndexes); if (table) { + TRACE("table->numIndexes == 0x%x\n", table->numIndexes); size = sizeof(IP_INTERFACE_INFO) + (table->numIndexes) * sizeof(IP_ADAPTER_INDEX_MAP); if (*dwOutBufLen < size) { Modified: trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ipstats… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c [iso-8859-1] Tue Aug 18 22:30:58 2009 @@ -459,6 +459,10 @@ out_route_table = HeapAlloc( GetProcessHeap(), 0, sizeof(RouteTable) + (sizeof(RouteEntry) * (numRoutes - 1)) ); + if (!out_route_table) { + closeTcpFile(tcpFile); + return NULL; + } out_route_table->numRoutes = numRoutes; @@ -586,6 +590,10 @@ IpArpTable = HeapAlloc ( GetProcessHeap(), 0, sizeof(DWORD) + (sizeof(MIB_IPNETROW) * totalNumber) ); + if (!IpArpTable) { + closeTcpFile(tcpFile); + return NULL; + } status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); Modified: trunk/reactos/dll/win32/iphlpapi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/registr… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/registry.c [iso-8859-1] Tue Aug 18 22:30:58 2009 @@ -44,18 +44,19 @@ PWCHAR Value; DWORD ValueLen; - if (MaxAdapterName == -1) { - RegCloseKey( RegHandle ); + if (MaxAdapterName == -1) return 0; - } ValueLen = MaxAdapterName; Value = (PWCHAR)HeapAlloc( GetProcessHeap(), 0, MaxAdapterName * sizeof(WCHAR) ); + if (!Value) return 0; + Status = RegEnumKeyExW( RegHandle, n, Value, &ValueLen, NULL, NULL, NULL, NULL ); - if (Status != ERROR_SUCCESS) + if (Status != ERROR_SUCCESS) { + HeapFree(GetProcessHeap(), 0, Value); return 0; - else { + } else { Value[ValueLen] = 0; return Value; } Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/resinfo… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] Tue Aug 18 22:30:58 2009 @@ -151,11 +151,13 @@ } if (ch - LastNameStart > 0) { /* A last name? */ PWCHAR NameServer = malloc(((ch - LastNameStart) + 1) * sizeof(WCHAR)); - memcpy(NameServer,NameServerString + LastNameStart, - (ch - LastNameStart) * sizeof(WCHAR)); - NameServer[ch - LastNameStart] = 0; - cb( Interface, NameServer, Data ); - free(NameServer); + if (NameServer) { + memcpy(NameServer,NameServerString + LastNameStart, + (ch - LastNameStart) * sizeof(WCHAR)); + NameServer[ch - LastNameStart] = 0; + cb( Interface, NameServer, Data ); + free(NameServer); + } } ConsumeRegValueString(NameServerString); } @@ -223,6 +225,8 @@ PrivateNSEnum.NumServers = ServerCount; DnsList = HeapAlloc(GetProcessHeap(), 0, ServerCount * sizeof(IP_ADDR_STRING)); + if (!DnsList) return NULL; + ZeroMemory(DnsList, ServerCount * sizeof(IP_ADDR_STRING)); ResInfo = (PIPHLP_RES_INFO)RtlAllocateHeap ( GetProcessHeap(), 0, sizeof(IPHLP_RES_INFO));

1 0

[gschneider] 42773: - Improve glyph guard from r42749: allow displaying glyphs if the application knows the character placements - Some rendering engines (like FF3) do the conversion without using GetCharacterPlacementA/W
by gschneider＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: gschneider Date: Tue Aug 18 21:51:32 2009 New Revision: 42773 URL: http://svn.reactos.org/svn/reactos?rev=42773&view=rev Log: - Improve glyph guard from r42749: allow displaying glyphs if the application knows the character placements - Some rendering engines (like FF3) do the conversion without using GetCharacterPlacementA/W Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Tue Aug 18 21:51:32 2009 @@ -3695,7 +3695,10 @@ } /* FIXME: remove this as soon as GetCharacterPlacementA/W work properly */ - fuOptions &= ~ETO_GLYPH_INDEX; + if ((fuOptions & ETO_GLYPH_INDEX) && (fuOptions != (ETO_GLYPH_INDEX | ETO_PDY))) + { + fuOptions &= ~ETO_GLYPH_INDEX; + } /* Finally call the internal routine */ Result = GreExtTextOutW(hDC,

1 0

[cgutman] 42772: - Fix dereference of freed memory
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 21:06:52 2009 New Revision: 42772 URL: http://svn.reactos.org/svn/reactos?rev=42772&view=rev Log: - Fix dereference of freed memory Modified: trunk/reactos/dll/win32/ws2help/handle.c Modified: trunk/reactos/dll/win32/ws2help/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/handle.c… ============================================================================== --- trunk/reactos/dll/win32/ws2help/handle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/handle.c [iso-8859-1] Tue Aug 18 21:06:52 2009 @@ -65,6 +65,7 @@ ExitThreadApc(ULONG_PTR Context) { PWAH_HELPER_CONTEXT HelperContext = (PWAH_HELPER_CONTEXT)Context; + HMODULE DllHandle = HelperContext->DllHandle; /* Close the file handle */ CloseHandle(HelperContext->FileHandle); @@ -73,7 +74,7 @@ HeapFree(GlobalHeap, 0, HelperContext); /* Exit the thread and library */ - FreeLibraryAndExitThread(HelperContext->DllHandle, ERROR_SUCCESS); + FreeLibraryAndExitThread(DllHandle, ERROR_SUCCESS); } DWORD

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