Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 61841: [BOOTVID] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: akhaldi Date: Sun Jan 26 20:24:59 2014 New Revision: 61841 URL: http://svn.reactos.org/svn/reactos?rev=61841&view=rev Log: [BOOTVID] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/drivers/base/bootvid/arm/bootvid.c trunk/reactos/drivers/base/bootvid/i386/bootvid.c trunk/reactos/drivers/base/bootvid/i386/vga.c trunk/reactos/drivers/base/bootvid/precomp.h Modified: trunk/reactos/drivers/base/bootvid/arm/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/arm/b… ============================================================================== --- trunk/reactos/drivers/base/bootvid/arm/bootvid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/arm/bootvid.c [iso-8859-1] Sun Jan 26 20:24:59 2014 @@ -1,6 +1,7 @@ #include "precomp.h" + #define NDEBUG -#include "debug.h" +#include <debug.h> #define LCDTIMING0_PPL(x) ((((x) / 16 - 1) & 0x3f) << 2) #define LCDTIMING1_LPP(x) (((x) & 0x3ff) - 1) Modified: trunk/reactos/drivers/base/bootvid/i386/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] Sun Jan 26 20:24:59 2014 @@ -1,4 +1,7 @@ #include "precomp.h" + +#include <ntifs.h> +#include <ndk/halfuncs.h> /* PRIVATE FUNCTIONS *********************************************************/ @@ -472,4 +475,3 @@ InitializePalette(); VidSolidColorFill(0, 0, 639, 479, 0); } - Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] Sun Jan 26 20:24:59 2014 @@ -1152,4 +1152,3 @@ } } } - Modified: trunk/reactos/drivers/base/bootvid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/preco… ============================================================================== --- trunk/reactos/drivers/base/bootvid/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/precomp.h [iso-8859-1] Sun Jan 26 20:24:59 2014 @@ -1,26 +1,18 @@ -#include "ntddk.h" -#include "ntifs.h" -#include "arc/arc.h" -#include "halfuncs.h" -#include "drivers/bootvid/bootvid.h" -#include "ioaccess.h" +#include <wdm.h> +#include <drivers/bootvid/bootvid.h> /* Define if FontData has upside down characters */ #undef CHAR_GEN_UPSIDE_DOWN #define BOOTCHAR_HEIGHT 13 -// -// Command Stream Definitions -// +/* Command Stream Definitions */ #define CMD_STREAM_WRITE 0x0 #define CMD_STREAM_WRITE_ARRAY 0x2 #define CMD_STREAM_USHORT 0x4 #define CMD_STREAM_READ 0x8 -// -// Bitmap Header -// +/* Bitmap Header */ typedef struct tagBITMAPINFOHEADER { ULONG biSize; @@ -42,9 +34,7 @@ VOID ); -// -// Globals -// +/* Globals */ extern USHORT AT_Initialization[]; extern ULONG curr_x; extern ULONG curr_y;

1 0

[akhaldi] 61840: [WS2HELP] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716
by akhaldi＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: akhaldi Date: Sun Jan 26 19:57:03 2014 New Revision: 61840 URL: http://svn.reactos.org/svn/reactos?rev=61840&view=rev Log: [WS2HELP] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/dll/win32/ws2help/context.c trunk/reactos/dll/win32/ws2help/handle.c trunk/reactos/dll/win32/ws2help/precomp.h trunk/reactos/dll/win32/ws2help/wshdrv.h Modified: trunk/reactos/dll/win32/ws2help/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/context.… ============================================================================== --- trunk/reactos/dll/win32/ws2help/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/context.c [iso-8859-1] Sun Jan 26 19:57:03 2014 @@ -8,6 +8,8 @@ /* INCLUDES ******************************************************************/ #include "precomp.h" + +#include <ws2help.h> /* DATA **********************************************************************/ 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] Sun Jan 26 19:57:03 2014 @@ -8,6 +8,10 @@ /* INCLUDES ******************************************************************/ #include "precomp.h" + +#include <ndk/iofuncs.h> + +#include "wshdrv.h" /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/ws2help/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/precomp.… ============================================================================== --- trunk/reactos/dll/win32/ws2help/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/precomp.h [iso-8859-1] Sun Jan 26 19:57:03 2014 @@ -4,6 +4,7 @@ * FILE: lib/ws2help/precomp.h * PURPOSE: WinSock 2 Helper DLL */ + #ifndef __PRECOMP_H #define __PRECOMP_H @@ -16,6 +17,7 @@ #define INCL_WINSOCK_API_TYPEDEFS 1 #include <stdarg.h> + #include <windef.h> #include <winbase.h> #include <winreg.h> @@ -23,12 +25,7 @@ #include <ws2spi.h> /* NDK Headers */ -#include <rtlfuncs.h> -#include <iofuncs.h> - -/* Shared Winsock Helper headers */ -#include <ws2help.h> -#include "wshdrv.h" +#include <ndk/rtlfuncs.h> /* Missing definition */ #define SO_OPENTYPE 0x20 @@ -50,6 +47,4 @@ #define WS2HELP_PROLOG() \ (Ws2helpInitialized? ERROR_SUCCESS : Ws2helpInitialize()) -#endif /* __WS2HELP_H */ - -/* EOF */ +#endif /* __PRECOMP_H */ Modified: trunk/reactos/dll/win32/ws2help/wshdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/wshdrv.h… ============================================================================== --- trunk/reactos/dll/win32/ws2help/wshdrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/wshdrv.h [iso-8859-1] Sun Jan 26 19:57:03 2014 @@ -25,4 +25,4 @@ #define IOCTL_WS2IFSL_SET_HANDLE 0x12B00 -#endif +#endif /* __WSHDRV_H */

1 0

[akhaldi] 61839: [WS2_32_NEW] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716
by akhaldi＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: akhaldi Date: Sun Jan 26 19:40:58 2014 New Revision: 61839 URL: http://svn.reactos.org/svn/reactos?rev=61839&view=rev Log: [WS2_32_NEW] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h trunk/reactos/dll/win32/ws2_32_new/src/addrconv.c trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c trunk/reactos/dll/win32/ws2_32_new/src/async.c trunk/reactos/dll/win32/ws2_32_new/src/bhook.c trunk/reactos/dll/win32/ws2_32_new/src/dcatalog.c trunk/reactos/dll/win32/ws2_32_new/src/dcatitem.c trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c trunk/reactos/dll/win32/ws2_32_new/src/dprocess.c trunk/reactos/dll/win32/ws2_32_new/src/dprovide.c trunk/reactos/dll/win32/ws2_32_new/src/dsocket.c trunk/reactos/dll/win32/ws2_32_new/src/dthread.c trunk/reactos/dll/win32/ws2_32_new/src/dupsock.c trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c trunk/reactos/dll/win32/ws2_32_new/src/event.c trunk/reactos/dll/win32/ws2_32_new/src/getproto.c trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c trunk/reactos/dll/win32/ws2_32_new/src/ioctl.c trunk/reactos/dll/win32/ws2_32_new/src/nscatalo.c trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c trunk/reactos/dll/win32/ws2_32_new/src/nspinstl.c trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c trunk/reactos/dll/win32/ws2_32_new/src/nsquery.c trunk/reactos/dll/win32/ws2_32_new/src/qos.c trunk/reactos/dll/win32/ws2_32_new/src/qshelpr.c trunk/reactos/dll/win32/ws2_32_new/src/rasdial.c trunk/reactos/dll/win32/ws2_32_new/src/recv.c trunk/reactos/dll/win32/ws2_32_new/src/rnr.c trunk/reactos/dll/win32/ws2_32_new/src/scihlpr.c trunk/reactos/dll/win32/ws2_32_new/src/select.c trunk/reactos/dll/win32/ws2_32_new/src/send.c trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c trunk/reactos/dll/win32/ws2_32_new/src/socklife.c trunk/reactos/dll/win32/ws2_32_new/src/spinstal.c trunk/reactos/dll/win32/ws2_32_new/src/sputil.c trunk/reactos/dll/win32/ws2_32_new/src/startup.c trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c 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] Sun Jan 26 19:40:58 2014 @@ -23,11 +23,8 @@ #include <winreg.h> #include <winnls.h> #include <winuser.h> -#include <ws2tcpip.h> #include <ws2spi.h> -//#include <ndk/umtypes.h> #include <ndk/rtlfuncs.h> -//#include <svcguid.h> /* Winsock Helper Header */ #include <ws2help.h> Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrconv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/addrconv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/addrconv.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,11 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - + /* DEFINES *******************************************************************/ #ifndef BE Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,7 +7,10 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> + +#include <ws2tcpip.h> //#define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/ws2_32_new/src/async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/async.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/async.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,9 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* DATA **********************************************************************/ + BOOLEAN WsAsyncThreadInitialized; LONG WsAsyncTaskHandle; PLIST_ENTRY WsAsyncQueue; Modified: trunk/reactos/dll/win32/ws2_32_new/src/bhook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/b… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/bhook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/bhook.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dcatalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dcatalog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dcatalog.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dcatitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dcatitem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dcatitem.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,9 +7,8 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -13,6 +13,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dprocess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dprocess.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dprocess.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,9 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* DATA **********************************************************************/ + PWSPROCESS CurrentWsProcess; #define WsProcLock() EnterCriticalSection((LPCRITICAL_SECTION)&Process->ThreadLock); Modified: trunk/reactos/dll/win32/ws2_32_new/src/dprovide.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dprovide.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dprovide.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dsocket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dsocket.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dsocket.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dthread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dthread.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/dupsock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dupsock.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dupsock.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/e… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/e… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/event.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,11 +7,12 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - + /* FUNCTIONS *****************************************************************/ /* Modified: trunk/reactos/dll/win32/ws2_32_new/src/getproto.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/getproto.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/getproto.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ 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] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG Modified: trunk/reactos/dll/win32/ws2_32_new/src/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/i… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/ioctl.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nscatalo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nscatalo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nscatalo.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,9 +7,8 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nspinstl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nspinstl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nspinstl.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nsquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nsquery.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nsquery.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/qos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/q… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/qos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/qos.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/qshelpr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/q… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/qshelpr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/qshelpr.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/rasdial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/r… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/rasdial.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/rasdial.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG Modified: trunk/reactos/dll/win32/ws2_32_new/src/recv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/r… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/recv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/recv.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/rnr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/r… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/rnr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/rnr.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/scihlpr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/scihlpr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/scihlpr.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG Modified: trunk/reactos/dll/win32/ws2_32_new/src/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/send.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/send.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/socklife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/socklife.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/socklife.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/spinstal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/spinstal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/spinstal.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/sputil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/sputil.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/sputil.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,12 +7,11 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG #include <debug.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32_new/src/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/startup.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,6 +7,7 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> //#define NDEBUG Modified: trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c [iso-8859-1] Sun Jan 26 19:40:58 2014 @@ -7,9 +7,8 @@ */ /* INCLUDES ******************************************************************/ + #include <ws2_32.h> - -/* DATA **********************************************************************/ /* FUNCTIONS *****************************************************************/

1 0

[hbelusca] 61838: [NTVDM] - Start to refactor the DOS sources: Introduce the DEM (DOS Emulation) support library that is used by our built-in DOS, and that is used (via BOPs) by windows NT DOS (fil...
by hbelusca＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: hbelusca Date: Sun Jan 26 18:25:59 2014 New Revision: 61838 URL: http://svn.reactos.org/svn/reactos?rev=61838&view=rev Log: [NTVDM] - Start to refactor the DOS sources: Introduce the DEM (DOS Emulation) support library that is used by our built-in DOS, and that is used (via BOPs) by windows NT DOS (files: ntio.sys and ntdos.sys). - Export some of DEM functions; stub most of them and implement the remaining ones (with existing code that we had in dos.c before). Added: branches/ntvdm/subsystems/ntvdm/dos/dem.c (with props) branches/ntvdm/subsystems/ntvdm/dos/dem.h (with props) branches/ntvdm/subsystems/ntvdm/dos/dos32/ (with props) branches/ntvdm/subsystems/ntvdm/dos/dos32/dos.c - copied, changed from r61829, branches/ntvdm/subsystems/ntvdm/dos/dos.c branches/ntvdm/subsystems/ntvdm/dos/dos32/dos.h - copied, changed from r61829, branches/ntvdm/subsystems/ntvdm/dos/dos.h Removed: branches/ntvdm/subsystems/ntvdm/dos/dos.c branches/ntvdm/subsystems/ntvdm/dos/dos.h Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/bios/bios.c branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.spec [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… Added: branches/ntvdm/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dem.… Added: branches/ntvdm/subsystems/ntvdm/dos/dem.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dem.… Removed: branches/ntvdm/subsystems/ntvdm/dos/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos.… Removed: branches/ntvdm/subsystems/ntvdm/dos/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos.… Copied: branches/ntvdm/subsystems/ntvdm/dos/dos32/dos.c (from r61829, branches/ntvdm/subsystems/ntvdm/dos/dos.c) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… Copied: branches/ntvdm/subsystems/ntvdm/dos/dos32/dos.h (from r61829, branches/ntvdm/subsystems/ntvdm/dos/dos.h) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.sp…

1 0

[akhaldi] 61837: [WS2_32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: akhaldi Date: Sun Jan 26 17:48:17 2014 New Revision: 61837 URL: http://svn.reactos.org/svn/reactos?rev=61837&view=rev Log: [WS2_32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/ws2_32/include/catalog.h trunk/reactos/dll/win32/ws2_32/include/debug.h trunk/reactos/dll/win32/ws2_32/include/handle.h trunk/reactos/dll/win32/ws2_32/include/upcall.h trunk/reactos/dll/win32/ws2_32/include/ws2_32.h trunk/reactos/dll/win32/ws2_32/misc/async.c trunk/reactos/dll/win32/ws2_32/misc/ns.c trunk/reactos/dll/win32/ws2_32/misc/stubs.c Modified: trunk/reactos/dll/win32/ws2_32/include/catalog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/catalog.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/catalog.h [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -4,6 +4,7 @@ * FILE: include/catalog.h * PURPOSE: Service Provider Catalog definitions */ + #ifndef __CATALOG_H #define __CATALOG_H @@ -54,5 +55,3 @@ VOID DestroyCatalog(VOID); #endif /* __CATALOG_H */ - -/* EOF */ Modified: trunk/reactos/dll/win32/ws2_32/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/debug.h [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -6,6 +6,7 @@ * DEFINES: DBG - Enable debug output * NASSERT - Disable assertions */ + #ifndef __DEBUG_H #define __DEBUG_H @@ -62,5 +63,3 @@ #define CP CHECKPOINT #endif /* __DEBUG_H */ - -/* EOF */ Modified: trunk/reactos/dll/win32/ws2_32/include/handle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/h… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/handle.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/handle.h [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -4,10 +4,9 @@ * FILE: include/handle.h * PURPOSE: Provider handle definitions */ + #ifndef __HANDLE_H #define __HANDLE_H - -//#include <catalog.h> typedef struct _PROVIDER_HANDLE { @@ -44,5 +43,3 @@ FreeProviderHandleTable(VOID); #endif /* __HANDLE_H */ - -/* EOF */ Modified: trunk/reactos/dll/win32/ws2_32/include/upcall.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/u… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/upcall.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/upcall.h [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -4,6 +4,7 @@ * FILE: include/upcall.h * PURPOSE: Upcall function defintions */ + #ifndef __UPCALL_H #define __UPCALL_H @@ -100,5 +101,3 @@ OUT LPINT lpErrno); #endif /* __UPCALL_H */ - -/* EOF */ Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/ws2_32.h [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -4,22 +4,20 @@ * FILE: include/ws2_32.h * PURPOSE: WinSock 2 DLL header */ + #ifndef __WS2_32_H #define __WS2_32_H -#include <stdlib.h> -#include <stdio.h> +#include <stdarg.h> #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> + #include <windef.h> #include <winbase.h> -#include <winnls.h> #include <winuser.h> #include <ws2spi.h> -#include <ws2tcpip.h> #define NTOS_MODE_USER #include <ndk/rtlfuncs.h> @@ -31,7 +29,6 @@ #include "catalog.h" #include "handle.h" -//#include "upcall.h" #define EXPORT WINAPI @@ -129,5 +126,3 @@ #endif /* LE */ #endif /* __WS2_32_H */ - -/* EOF */ Modified: trunk/reactos/dll/win32/ws2_32/misc/async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/asyn… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/async.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/async.c [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -39,15 +39,12 @@ #define COM_NO_WINDOWS_H #include <wine/config.h> -//#include "wine/port.h" #include <stdarg.h> #include <windef.h> #include <winbase.h> -//#include "wingdi.h" #include <winuser.h> #include <winsock2.h> -//#include "ws2spi.h" #include <wine/debug.h> Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -9,6 +9,10 @@ */ #include "ws2_32.h" + +#include <stdio.h> +#include <stdlib.h> +#include <winnls.h> #ifndef BUFSIZ #define BUFSIZ 1024 Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Sun Jan 26 17:48:17 2014 @@ -9,6 +9,8 @@ */ #include "ws2_32.h" + +#include <ws2tcpip.h> /* * @implemented

1 0

[akhaldi] 61836: [WINTRUST] * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: akhaldi Date: Sun Jan 26 17:46:23 2014 New Revision: 61836 URL: http://svn.reactos.org/svn/reactos?rev=61836&view=rev Log: [WINTRUST] * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/wintrust/wintrust_priv.h Modified: trunk/reactos/dll/win32/wintrust/wintrust_priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_priv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust_priv.h [iso-8859-1] Sun Jan 26 17:46:23 2014 @@ -15,12 +15,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef __WINTRUST_PRIV_H__ #define __WINTRUST_PRIV_H__ -#include <config.h> +#include <wine/config.h> -#include <stdarg.h> #include <stdio.h> #define _INC_WINDOWS @@ -33,10 +33,8 @@ #include <winuser.h> #include <winreg.h> #include <winternl.h> -#include <wintrust.h> #include <softpub.h> #include <mscat.h> -#include <mssip.h> #include <wine/debug.h> #include <wine/unicode.h> @@ -51,4 +49,4 @@ BOOL WINAPI WINTRUST_AddPrivData(CRYPT_PROVIDER_DATA *data, CRYPT_PROVIDER_PRIVDATA *pPrivData2Add) DECLSPEC_HIDDEN; -#endif /* ndef __WINTRUST_PRIV_H__ */ +#endif /* __WINTRUST_PRIV_H__ */

1 0

[dreimer] 61835: Small correction...
by dreimer＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: dreimer Date: Sun Jan 26 17:08:43 2014 New Revision: 61835 URL: http://svn.reactos.org/svn/reactos?rev=61835&view=rev Log: Small correction... Modified: trunk/reactos/base/applications/rapps/loaddlg.c Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Sun Jan 26 17:08:43 2014 @@ -292,7 +292,7 @@ /* run it */ if (!bCab) { - ShellExecute( NULL, L"open", path, NULL, NULL, SW_SHOWNORMAL ); + ShellExecuteW( NULL, L"open", path, NULL, NULL, SW_SHOWNORMAL ); } end: CloseHandle(hOut);

1 0

[akhaldi] 61834: [RAPPS] * Fix MSVC build.
by akhaldi＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: akhaldi Date: Sun Jan 26 16:02:28 2014 New Revision: 61834 URL: http://svn.reactos.org/svn/reactos?rev=61834&view=rev Log: [RAPPS] * Fix MSVC build. Modified: trunk/reactos/base/applications/rapps/loaddlg.c Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Sun Jan 26 16:02:28 2014 @@ -209,7 +209,8 @@ WCHAR path[MAX_PATH]; LPWSTR p; HWND Dlg = (HWND) Context; - DWORD len, dwContentLen, dwBytesWritten, dwBytesRead, dwCurrentBytesRead; + DWORD len, dwContentLen, dwBytesWritten, dwBytesRead; + DWORD dwCurrentBytesRead = 0; DWORD dwBufLen = sizeof(dwContentLen); BOOL bCancelled = FALSE; BOOL bTempfile = FALSE;

1 0

[dreimer] 61833: [RAPPS] rapps: (for database) Many Improvements and Many Fixes CORE-7710 #resolve #comment Fixed a few things like missing sizes for your edited ff2, ff3 and ff3.6 files. Thx for y...
by dreimer＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: dreimer Date: Sun Jan 26 15:49:23 2014 New Revision: 61833 URL: http://svn.reactos.org/svn/reactos?rev=61833&view=rev Log: [RAPPS] rapps: (for database) Many Improvements and Many Fixes CORE-7710 #resolve #comment Fixed a few things like missing sizes for your edited ff2, ff3 and ff3.6 files. Thx for your help. Added universal download links for sf.net linked files. Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/abiword26.txt trunk/reactos/base/applications/rapps/rapps/abyss.txt trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/applications/rapps/rapps/alreader.txt trunk/reactos/base/applications/rapps/rapps/ants.txt trunk/reactos/base/applications/rapps/rapps/audiograbber.txt trunk/reactos/base/applications/rapps/rapps/bittorrent.txt trunk/reactos/base/applications/rapps/rapps/bochs.txt trunk/reactos/base/applications/rapps/rapps/boswars.txt trunk/reactos/base/applications/rapps/rapps/chromium.txt trunk/reactos/base/applications/rapps/rapps/cnt.txt trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt trunk/reactos/base/applications/rapps/rapps/diablo2.txt trunk/reactos/base/applications/rapps/rapps/dosblaster.txt trunk/reactos/base/applications/rapps/rapps/dosbox.txt trunk/reactos/base/applications/rapps/rapps/doublecommander.txt trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt trunk/reactos/base/applications/rapps/rapps/fap.txt trunk/reactos/base/applications/rapps/rapps/fira.txt trunk/reactos/base/applications/rapps/rapps/firefox.txt trunk/reactos/base/applications/rapps/rapps/firefox2.txt trunk/reactos/base/applications/rapps/rapps/firefox3.txt trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt trunk/reactos/base/applications/rapps/rapps/globulation2.txt trunk/reactos/base/applications/rapps/rapps/hover.txt trunk/reactos/base/applications/rapps/rapps/hxd.txt trunk/reactos/base/applications/rapps/rapps/indiftpd.txt trunk/reactos/base/applications/rapps/rapps/irfanview.txt trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt trunk/reactos/base/applications/rapps/rapps/kdewin.txt trunk/reactos/base/applications/rapps/rapps/kyodai.txt trunk/reactos/base/applications/rapps/rapps/lazaruside.txt trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt trunk/reactos/base/applications/rapps/rapps/lgeneral.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/lmarbles.txt trunk/reactos/base/applications/rapps/rapps/mfc40.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/mirc6.txt trunk/reactos/base/applications/rapps/rapps/mono2.txt trunk/reactos/base/applications/rapps/rapps/mpc.txt trunk/reactos/base/applications/rapps/rapps/mpxplay.txt trunk/reactos/base/applications/rapps/rapps/msxml3.txt trunk/reactos/base/applications/rapps/rapps/net11.txt trunk/reactos/base/applications/rapps/rapps/net20.txt trunk/reactos/base/applications/rapps/rapps/net20sp2.txt trunk/reactos/base/applications/rapps/rapps/npp.txt trunk/reactos/base/applications/rapps/rapps/offbyone.txt trunk/reactos/base/applications/rapps/rapps/opencodecs.txt trunk/reactos/base/applications/rapps/rapps/openoffice.txt trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/opera9.txt trunk/reactos/base/applications/rapps/rapps/pengupop.txt trunk/reactos/base/applications/rapps/rapps/photofiltre.txt trunk/reactos/base/applications/rapps/rapps/pingus.txt trunk/reactos/base/applications/rapps/rapps/pspad.txt trunk/reactos/base/applications/rapps/rapps/ptanks.txt trunk/reactos/base/applications/rapps/rapps/putty.txt trunk/reactos/base/applications/rapps/rapps/python.txt trunk/reactos/base/applications/rapps/rapps/python2.txt trunk/reactos/base/applications/rapps/rapps/qb64sdl.txt trunk/reactos/base/applications/rapps/rapps/qmmp.txt trunk/reactos/base/applications/rapps/rapps/remood.txt trunk/reactos/base/applications/rapps/rapps/reshack.txt trunk/reactos/base/applications/rapps/rapps/rocks.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt trunk/reactos/base/applications/rapps/rapps/rosbearm.txt trunk/reactos/base/applications/rapps/rapps/sambatng.txt trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/scummvm.txt 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/stamina.txt trunk/reactos/base/applications/rapps/rapps/steam.txt trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt trunk/reactos/base/applications/rapps/rapps/superdxb.txt trunk/reactos/base/applications/rapps/rapps/superfinder.txt trunk/reactos/base/applications/rapps/rapps/supertux.txt trunk/reactos/base/applications/rapps/rapps/tahoma.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/thunderbird3.txt trunk/reactos/base/applications/rapps/rapps/tileworld.txt trunk/reactos/base/applications/rapps/rapps/totalcommander.txt trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt trunk/reactos/base/applications/rapps/rapps/ultravnc.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt trunk/reactos/base/applications/rapps/rapps/vb5run.txt trunk/reactos/base/applications/rapps/rapps/vb6run.txt trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2010run.txt trunk/reactos/base/applications/rapps/rapps/vc6run.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt trunk/reactos/base/applications/rapps/rapps/winboard.txt trunk/reactos/base/applications/rapps/rapps/wme9.txt trunk/reactos/base/applications/rapps/rapps/zaz.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/abiword26.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/alreader.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ants.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/bochs.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/boswars.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/chromium.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/cnt.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/dosblaster.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/fira.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/firefox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/globulation2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/hover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/hxd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/indiftpd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/kyodai.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mirc6.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mpxplay.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/net11.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/net20.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/net20sp2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/opencodecs.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/openoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/pengupop.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/photofiltre.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/pingus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/pspad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ptanks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/python2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/qb64sdl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/reshack.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/rocks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/rosbearm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/stamina.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/steam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/superdxb.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/superfinder.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/supertux.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc2010run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/wme9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/zaz.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…

1 0

[dreimer] 61832: [RAPPS] - Replace URLDownloadToFileW download routine by InternetOpenW, InternetOpenUrlW, InternetReadFile download routine. This makes it possible to set the user agent which allo...
by dreimer＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: dreimer Date: Sun Jan 26 15:46:34 2014 New Revision: 61832 URL: http://svn.reactos.org/svn/reactos?rev=61832&view=rev Log: [RAPPS] - Replace URLDownloadToFileW download routine by InternetOpenW, InternetOpenUrlW, InternetReadFile download routine. This makes it possible to set the user agent which allows us to use http://download.sourceforge.net URLs and not needing any hard coded mirrors anymore. (Thx goes to Usurp for that idea.) - Replace CreateProcessW by ShellExecute. This reenables the question for elevated rights in Windows and allows RApps to open any file format the shell knows about. Big thx goes out to AmineKhaldi, Christoph_vW, gigaherz and ThFabba for helping a rusted Java coder to get things in a resonable shape. ^^ Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt trunk/reactos/base/applications/rapps/loaddlg.c Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CM… ============================================================================== --- trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Sun Jan 26 15:46:34 2014 @@ -25,7 +25,7 @@ add_pch(rapps rapps.h) set_module_type(rapps win32gui UNICODE) target_link_libraries(rapps uuid) -add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) +add_importlibs(rapps advapi32 comctl32 gdi32 urlmon wininet user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) add_dependencies(rapps rappsmsg) add_message_headers(ANSI rappsmsg.mc) add_cd_file(TARGET rapps DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Sun Jan 26 15:46:34 2014 @@ -26,6 +26,8 @@ */ #include "rapps.h" +#include <wininet.h> +#include <shellapi.h> static PAPPLICATION_INFO AppInfo; static HICON hIcon = NULL; @@ -206,13 +208,17 @@ IBindStatusCallback *dl; WCHAR path[MAX_PATH]; LPWSTR p; - STARTUPINFOW si; - PROCESS_INFORMATION pi; HWND Dlg = (HWND) Context; - DWORD r, len; + DWORD len, dwContentLen, dwBytesWritten, dwBytesRead, dwCurrentBytesRead; + DWORD dwBufLen = sizeof(dwContentLen); BOOL bCancelled = FALSE; BOOL bTempfile = FALSE; BOOL bCab = FALSE; + HINTERNET hOpen = NULL; + HINTERNET hFile = NULL; + HANDLE hOut = NULL; + unsigned char lpBuffer[4096]; + const LPWSTR lpszAgent = L"RApps/1.0"; /* built the path for the download */ p = wcsrchr(AppInfo->szUrlDownload, L'/'); @@ -255,24 +261,43 @@ /* download it */ bTempfile = TRUE; dl = CreateDl(Context, &bCancelled); - r = URLDownloadToFileW(NULL, AppInfo->szUrlDownload, path, 0, dl); + + hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + if (!hOpen) goto end; + + hFile = InternetOpenUrlW(hOpen, AppInfo->szUrlDownload, NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE|INTERNET_FLAG_KEEP_CONNECTION, 0); + if(!hFile) goto end; + + hOut = CreateFileW(path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + if (hOut == INVALID_HANDLE_VALUE) goto end; + + HttpQueryInfo(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwBufLen, 0); + + do + { + if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead)) goto end; + if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL)) goto end; + dwCurrentBytesRead += dwBytesRead; + IBindStatusCallback_OnProgress(dl, dwCurrentBytesRead, dwContentLen, 0, AppInfo->szUrlDownload); + } + while (dwBytesRead); + + CloseHandle(hOut); if (dl) IBindStatusCallback_Release(dl); - if (S_OK != r) goto end; - else if (bCancelled) goto end; + if (bCancelled) goto end; ShowWindow(Dlg, SW_HIDE); /* run it */ - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - r = CreateProcessW(path, NULL, NULL, NULL, 0, 0, NULL, NULL, &si, &pi); - if (0 == r) goto end; - - CloseHandle(pi.hThread); - WaitForSingleObject(pi.hProcess, INFINITE); - CloseHandle(pi.hProcess); - + if (!bCab) + { + ShellExecute( NULL, L"open", path, NULL, NULL, SW_SHOWNORMAL ); + } end: + CloseHandle(hOut); + InternetCloseHandle(hFile); + InternetCloseHandle(hOpen); + if (bTempfile) { if (bCancelled || (SettingsInfo.bDelInstaller && !bCab))

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