Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[fireball] 69527: [ARWINSS] - Fix win32k build.
by fireball＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: fireball Date: Wed Oct 14 19:14:56 2015 New Revision: 69527 URL: http://svn.reactos.org/svn/reactos?rev=69527&view=rev Log: [ARWINSS] - Fix win32k build. Modified: branches/arwinss/arwinss/server/CMakeLists.txt branches/arwinss/arwinss/server/dib/dib1bpp.c branches/arwinss/arwinss/server/dib/dib8bpp.c branches/arwinss/arwinss/server/eng/device.c branches/arwinss/arwinss/server/eng/engblt.c branches/arwinss/arwinss/server/eng/engpal.c branches/arwinss/arwinss/server/gre/bitblt.c branches/arwinss/arwinss/server/gre/drawing.c branches/arwinss/arwinss/server/gre/font.c branches/arwinss/arwinss/server/gre/lineto.c branches/arwinss/arwinss/server/gre/rect.c branches/arwinss/arwinss/server/include/win32k.h branches/arwinss/arwinss/server/main/keyboard.c branches/arwinss/arwinss/server/wine/timeout.c Modified: branches/arwinss/arwinss/server/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/CMakeLis… ============================================================================== --- branches/arwinss/arwinss/server/CMakeLists.txt [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/CMakeLists.txt [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -3,7 +3,7 @@ include_directories( . include - ${REACTOS_SOURCE_DIR}/win32ss + ${REACTOS_SOURCE_DIR}/win32ss/include ${REACTOS_SOURCE_DIR}/ntoskrnl/include ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include ${REACTOS_SOURCE_DIR}/include/reactos/subsys Modified: branches/arwinss/arwinss/server/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/dib/dib1… ============================================================================== --- branches/arwinss/arwinss/server/dib/dib1bpp.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/dib/dib1bpp.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -82,7 +82,7 @@ int dy2; // dest y end int sy1; // src y start - int dx; + //int dx; int shift; BYTE srcmask, dstmask, xormask; @@ -139,12 +139,12 @@ pd = d; ps = s; srcmask = 0xff; - dx = dwx; /* dest x for this pass */ + //dx = dwx; /* dest x for this pass */ if ( dwx < dl ) { int diff = dl-dwx; srcmask &= (1<<(8-diff))-1; - dx = dl; + //dx = dl; } if ( dwx+7 > dr ) { Modified: branches/arwinss/arwinss/server/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/dib/dib8… ============================================================================== --- branches/arwinss/arwinss/server/dib/dib8bpp.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/dib/dib8bpp.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -263,7 +263,7 @@ RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { - ULONG RoundedRight, X, Y, SourceX = 0, SourceY = 0, Source, wd, Dest; + ULONG RoundedRight, X, Y, SourceX = 0, SourceY = 0, Source/*, wd*/, Dest; ULONG *DestBits; LONG DstHeight; @@ -279,7 +279,7 @@ RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x3); DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + DestRect->left + (DestRect->top * DestSurf->lDelta)); - wd = DestSurf->lDelta - (DestRect->right - DestRect->left); + //wd = DestSurf->lDelta - (DestRect->right - DestRect->left); for(Y = DestRect->top; Y < DestRect->bottom; Y++) { Modified: branches/arwinss/arwinss/server/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/eng/devi… ============================================================================== --- branches/arwinss/arwinss/server/eng/device.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/eng/device.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -736,6 +736,8 @@ if ((dwflags & CDS_SET_PRIMARY) == CDS_SET_PRIMARY) SetPrimary = TRUE; dwflags &= ~(CDS_RESET | CDS_SET_PRIMARY); + + DPRINT1("Global: %d, SetPrimary: %d\n", Global, SetPrimary); if (Reset && NoReset) return DISP_CHANGE_BADFLAGS; Modified: branches/arwinss/arwinss/server/eng/engblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/eng/engb… ============================================================================== --- branches/arwinss/arwinss/server/eng/engblt.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/eng/engblt.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -315,7 +315,7 @@ { BOOLEAN ret; COLORADJUSTMENT ca; - POINT MaskOrigin; + //POINT MaskOrigin; SURFACE *psurfDest; SURFACE *psurfSource = NULL; RECTL InputClippedRect; @@ -380,10 +380,10 @@ OutputRect = InputClippedRect; } - if (pMaskOrigin != NULL) + /*if (pMaskOrigin != NULL) { MaskOrigin.x = pMaskOrigin->x; MaskOrigin.y = pMaskOrigin->y; - } + }*/ /* No success yet */ ret = FALSE; @@ -711,11 +711,11 @@ POINTL Pt; ULONG Direction; BOOL UsesSource; - BOOL UsesPattern; + //BOOL UsesPattern; POINTL AdjustedBrushOrigin; UsesSource = ROP4_USES_SOURCE(rop4); - UsesPattern = ROP4_USES_PATTERN(rop4); + //UsesPattern = ROP4_USES_PATTERN(rop4); if (R4_NOOP == rop4) { /* Copy destination onto itself: nop */ Modified: branches/arwinss/arwinss/server/eng/engpal.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/eng/engp… ============================================================================== --- branches/arwinss/arwinss/server/eng/engpal.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/eng/engpal.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -460,7 +460,7 @@ int realized = 0; PDC dc; HPALETTE systemPalette; - USHORT sysMode, palMode; + //USHORT sysMode, palMode; dc = DC_LockDc(hDC); if (!dc) return 0; @@ -502,8 +502,8 @@ #endif // need to pass this to IntEngCreateXlate with palettes unlocked - sysMode = sysGDI->Mode; - palMode = palGDI->Mode; + //sysMode = sysGDI->Mode; + //palMode = palGDI->Mode; PALETTE_UnlockPalette(sysGDI); PALETTE_UnlockPalette(palGDI); Modified: branches/arwinss/arwinss/server/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/bitb… ============================================================================== --- branches/arwinss/arwinss/server/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/gre/bitblt.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -1087,7 +1087,7 @@ EXLATEOBJ exlo; PPALETTE pDDBPalette, pDIBPalette; HPALETTE DDBPalette, DIBPalette = NULL; - ULONG DDBPaletteType, DIBPaletteType; + ULONG /*DDBPaletteType,*/ DIBPaletteType; if (!Bits) return 0; @@ -1145,7 +1145,7 @@ goto Exit; } - DDBPaletteType = pDDBPalette->Mode; + //DDBPaletteType = pDDBPalette->Mode; DIBPalette = BuildDIBPalette(bmi, (PINT)&DIBPaletteType); if (!DIBPalette) Modified: branches/arwinss/arwinss/server/gre/drawing.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/draw… ============================================================================== --- branches/arwinss/arwinss/server/gre/drawing.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/gre/drawing.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -1264,10 +1264,10 @@ { int Start = ceil(StartArc); int End = ceil(EndArc); - BOOL Chord = (arctype == GdiTypeChord), ret; + BOOL Chord = (arctype == GdiTypeChord); // Sort out alignment here. - ret = app_fill_arc(dc, rect( XLeft, YLeft, Width, Height), + app_fill_arc(dc, rect( XLeft, YLeft, Width, Height), -End, //(dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -End : -Start, -Start, //(dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -Start : -End, dc->dclevel.pbrFill, BrushOrigin, Chord); Modified: branches/arwinss/arwinss/server/gre/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/font… ============================================================================== --- branches/arwinss/arwinss/server/gre/font.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/gre/font.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -318,6 +318,8 @@ /* Release the surface and delete the bitmap */ GreDeleteObject(charBitmap); + + UNREFERENCED_LOCAL_VARIABLE(bRet); } static void SmoothGlyphColor(PDC physDev, INT x, INT y, @@ -456,6 +458,8 @@ /* Release the surface and delete the bitmap */ GreDeleteObject(charBitmap); + + UNREFERENCED_LOCAL_VARIABLE(bRet); } /* PUBLIC FUNCTIONS **********************************************************/ Modified: branches/arwinss/arwinss/server/gre/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/line… ============================================================================== --- branches/arwinss/arwinss/server/gre/lineto.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/gre/lineto.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -103,7 +103,6 @@ const POINT *ptPoints, INT count) { - BOOLEAN bRet; POINT ptLine[2]; RECTL DestRect; MIX Mix; @@ -125,7 +124,7 @@ DestRect.right = max(ptLine[0].x, ptLine[1].x); DestRect.bottom = max(ptLine[0].y, ptLine[1].y); - bRet = GreLineTo(&pDC->dclevel.pSurface->SurfObj, + GreLineTo(&pDC->dclevel.pSurface->SurfObj, pDC->CombinedClip, &pDC->eboLine.BrushObject, ptLine[0].x, Modified: branches/arwinss/arwinss/server/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/rect… ============================================================================== --- branches/arwinss/arwinss/server/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/gre/rect.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -57,6 +57,7 @@ &BrushOrigin, ROP3_TO_ROP4(PATCOPY), TRUE); + UNREFERENCED_LOCAL_VARIABLE(bRet); } } @@ -102,7 +103,6 @@ INT count, PRECTL DestRect) { - BOOLEAN bRet; MIX Mix; INT i; POINTL BrushOrigin; @@ -131,7 +131,7 @@ Mix = ROP2_TO_MIX(R2_COPYPEN);/*pdcattr->jROP2*/ for (i=0; i<count-1; i++) { - bRet = GreLineTo(&pDC->dclevel.pSurface->SurfObj, + GreLineTo(&pDC->dclevel.pSurface->SurfObj, pDC->CombinedClip, &pDC->eboLine.BrushObject, ptPoints[i].x, Modified: branches/arwinss/arwinss/server/include/win32k.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/include/… ============================================================================== --- branches/arwinss/arwinss/server/include/win32k.h [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/include/win32k.h [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -45,11 +45,11 @@ #include <pseh/pseh2.h> /* Public Win32K Headers */ -#include <include/callback.h> -#include <include/ntusrtyp.h> -#include <include/ntuser.h> -#include <include/ntgdityp.h> -#include <include/ntgdihdl.h> +#include <ntusrtyp.h> +#include <ntuser.h> +#include <callback.h> +#include <ntgdityp.h> +#include <ntgdihdl.h> #include <ntgdi.h> /* Internal Win32K Header */ Modified: branches/arwinss/arwinss/server/main/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/main/key… ============================================================================== --- branches/arwinss/arwinss/server/main/keyboard.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/main/keyboard.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -591,6 +591,8 @@ // ret = 0; //} + UNREFERENCED_LOCAL_VARIABLE(KeyNames); + cleanup: //UserLeave(); return ret; Modified: branches/arwinss/arwinss/server/wine/timeout.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/wine/tim… ============================================================================== --- branches/arwinss/arwinss/server/wine/timeout.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/wine/timeout.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -212,7 +212,7 @@ ProcessTimers(); UserLeave(); } - DPRINT1("Timer thread exit!\n"); + DPRINT1("Timer thread exit! Status 0x%08X\n", Status); } VOID

1 0

[fireball] 69526: [ARWINSS] - Fix winent.drv compiling.
by fireball＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: fireball Date: Wed Oct 14 12:04:19 2015 New Revision: 69526 URL: http://svn.reactos.org/svn/reactos?rev=69526&view=rev Log: [ARWINSS] - Fix winent.drv compiling. Modified: branches/arwinss/arwinss/client/winent.drv/clipboard.c branches/arwinss/arwinss/client/winent.drv/dib.c branches/arwinss/arwinss/client/winent.drv/mouse.c branches/arwinss/arwinss/client/winent.drv/window.c Modified: branches/arwinss/arwinss/client/winent.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.d… ============================================================================== --- branches/arwinss/arwinss/client/winent.drv/clipboard.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/winent.drv/clipboard.c [iso-8859-1] Wed Oct 14 12:04:19 2015 @@ -269,14 +269,13 @@ void NTDRV_InitClipboard(void) { UINT i; - WINE_CLIPFORMAT *format; /* Register known mapping between window formats and X properties */ for (i = 0; i < sizeof(PropertyFormatMap)/sizeof(PropertyFormatMap[0]); i++) NTDRV_CLIPBOARD_InsertClipboardFormat(PropertyFormatMap[i].lpszFormat); /* Set up a conversion function from "HTML Format" to "text/html" */ - format = NTDRV_CLIPBOARD_InsertClipboardFormat(wszHTMLFormat); + (VOID)NTDRV_CLIPBOARD_InsertClipboardFormat(wszHTMLFormat); } #if 0 Modified: branches/arwinss/arwinss/client/winent.drv/dib.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.d… ============================================================================== --- branches/arwinss/arwinss/client/winent.drv/dib.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/winent.drv/dib.c [iso-8859-1] Wed Oct 14 12:04:19 2015 @@ -136,7 +136,7 @@ INT CDECL RosDrv_SetDIBits( PDC_ATTR pdcattr, HBITMAP hbitmap, UINT startscan, UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) { - LONG height, width, tmpheight; + LONG height, width; WORD infoBpp, compression; PVOID safeBits = NULL; INT result, bitsSize; @@ -146,7 +146,6 @@ &infoBpp, &compression ) == -1) return 0; - tmpheight = height; if (height < 0) height = -height; if (!lines || (startscan >= height)) return 0; Modified: branches/arwinss/arwinss/client/winent.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.d… ============================================================================== --- branches/arwinss/arwinss/client/winent.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/winent.drv/mouse.c [iso-8859-1] Wed Oct 14 12:04:19 2015 @@ -117,6 +117,8 @@ cursor = (reply->count >= 0) ? wine_server_ptr_handle(reply->cursor) : 0; } SERVER_END_REQ; + + TRACE("cursor: 0x%x\n", cursor); } /*********************************************************************** Modified: branches/arwinss/arwinss/client/winent.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.d… ============================================================================== --- branches/arwinss/arwinss/client/winent.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/winent.drv/window.c [iso-8859-1] Wed Oct 14 12:04:19 2015 @@ -317,7 +317,7 @@ { //DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE ); LONG width, height; - LONG x, y; + //LONG x, y; SwmPosChanged(data->whole_window, &data->whole_rect, old_whole_rect, NULL, swp_flags); @@ -331,12 +331,12 @@ //GrResizeWindow(data->whole_window, width, height); /* only the size is allowed to change for the desktop window */ - if (data->whole_window != root_window) + /*if (data->whole_window != root_window) { x = data->whole_rect.left; y = data->whole_rect.top; - //GrMoveWindow(data->whole_window, x, y); - } + GrMoveWindow(data->whole_window, x, y); + }*/ if (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW)) { @@ -375,7 +375,7 @@ const RECT *old_whole_rect ) { LONG width, height; - BOOL resize = FALSE; + //BOOL resize = FALSE; RECT old = *old_client_rect; RECT new = data->client_rect; @@ -388,13 +388,13 @@ { if ((width = new.right - new.left) <= 0) width = 1; else if (width > 65535) width = 65535; - resize = TRUE; + //resize = TRUE; } if (old.bottom - old.top != new.bottom - new.top) { if ((height = new.bottom - new.top) <= 0) height = 1; else if (height > 65535) height = 65535; - resize = TRUE; + //resize = TRUE; } TRACE( "setting client win %lx pos %d,%d,%dx%d\n",

1 0

[fireball] 69525: [ARWINSS] - Use Wine's winternl.h instead of PSDK's one (same to what was done to gdi32) - Introduce a csr_shared.h which defines structs used for CSR communication. - Slightly fi...
by fireball＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: fireball Date: Wed Oct 14 11:56:49 2015 New Revision: 69525 URL: http://svn.reactos.org/svn/reactos?rev=69525&view=rev Log: [ARWINSS] - Use Wine's winternl.h instead of PSDK's one (same to what was done to gdi32) - Introduce a csr_shared.h which defines structs used for CSR communication. - Slightly fix user32/csr.c ExitWindowsEx code. Added: branches/arwinss/arwinss/include/csr_shared.h (with props) Modified: branches/arwinss/arwinss/client/user32/caret.c branches/arwinss/arwinss/client/user32/combo.c branches/arwinss/arwinss/client/user32/csr.c branches/arwinss/arwinss/client/user32/hook.c branches/arwinss/arwinss/client/user32/input.c branches/arwinss/arwinss/client/user32/menu.c branches/arwinss/arwinss/client/user32/message.c branches/arwinss/arwinss/client/user32/misc.c branches/arwinss/arwinss/client/user32/msgbox.c branches/arwinss/arwinss/client/user32/painting.c branches/arwinss/arwinss/client/user32/property.c branches/arwinss/arwinss/client/user32/resource.c branches/arwinss/arwinss/client/user32/user_private.h branches/arwinss/arwinss/client/user32/win.c branches/arwinss/arwinss/client/user32/winpos.c branches/arwinss/arwinss/client/user32/winstation.c Modified: branches/arwinss/arwinss/client/user32/caret.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/c… ============================================================================== --- branches/arwinss/arwinss/client/user32/caret.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/caret.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -30,7 +30,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/server.h" #include "wine/debug.h" Modified: branches/arwinss/arwinss/client/user32/combo.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/c… ============================================================================== --- branches/arwinss/arwinss/client/user32/combo.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/combo.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -45,7 +45,7 @@ #include "user_private.h" #include "win.h" #include "controls.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(combo); Modified: branches/arwinss/arwinss/client/user32/csr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/c… ============================================================================== --- branches/arwinss/arwinss/client/user32/csr.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/csr.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -28,6 +28,7 @@ /* CSRSS Headers */ #include <subsys/csr/csr.h> +#include <csr_shared.h> #include <subsys/win/winmsg.h> #include "wine/debug.h" @@ -44,9 +45,10 @@ { NTSTATUS Status; USER_API_MESSAGE ApiMessage; + PUSER_EXIT_REACTOS ExitReactOSRequest = &ApiMessage.Data.ExitReactOSRequest; - ApiMessage.Data.ExitReactosRequest.Flags = uFlags; - ApiMessage.Data.ExitReactosRequest.Reserved = dwReserved; + ExitReactOSRequest->Flags = uFlags; + //ExitReactOSRequest->Reserved = dwReserved; Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, @@ -55,6 +57,7 @@ if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); + ExitReactOSRequest->Success = FALSE; return FALSE; } Modified: branches/arwinss/arwinss/client/user32/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/h… ============================================================================== --- branches/arwinss/arwinss/client/user32/hook.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/hook.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -78,7 +78,7 @@ #include "wine/server.h" #include "wine/unicode.h" #include "wine/debug.h" -#include "winternl.h" +#include "wine/winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(hook); WINE_DECLARE_DEBUG_CHANNEL(relay); Modified: branches/arwinss/arwinss/client/user32/input.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/i… ============================================================================== --- branches/arwinss/arwinss/client/user32/input.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/input.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -39,7 +39,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" -#include "winternl.h" +#include "wine/winternl.h" #include "winerror.h" #include "win.h" #include "user_private.h" Modified: branches/arwinss/arwinss/client/user32/menu.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/m… ============================================================================== --- branches/arwinss/arwinss/client/user32/menu.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/menu.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -51,7 +51,7 @@ #include "winbase.h" #include "wingdi.h" #include "winnls.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/server.h" #include "wine/unicode.h" #include "wine/exception.h" Modified: branches/arwinss/arwinss/client/user32/message.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/m… ============================================================================== --- branches/arwinss/arwinss/client/user32/message.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/message.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -38,7 +38,7 @@ #include "imm.h" #include "ddk/imm.h" #include "wine/unicode.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/server.h" #include "user_private.h" #include "win.h" Modified: branches/arwinss/arwinss/client/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/m… ============================================================================== --- branches/arwinss/arwinss/client/user32/misc.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/misc.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -28,7 +28,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" -#include "winternl.h" +#include "wine/winternl.h" #include "user_private.h" #include "wine/unicode.h" Modified: branches/arwinss/arwinss/client/user32/msgbox.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/m… ============================================================================== --- branches/arwinss/arwinss/client/user32/msgbox.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/msgbox.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -25,7 +25,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "winternl.h" +#include "wine/winternl.h" #include "dlgs.h" #include "user_private.h" #include "wine/debug.h" Modified: branches/arwinss/arwinss/client/user32/painting.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/p… ============================================================================== --- branches/arwinss/arwinss/client/user32/painting.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/painting.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -32,7 +32,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/server.h" #include "win.h" #include "user_private.h" Modified: branches/arwinss/arwinss/client/user32/property.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/p… ============================================================================== --- branches/arwinss/arwinss/client/user32/property.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/property.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -28,7 +28,7 @@ #include "winbase.h" #include "winuser.h" #include "wine/unicode.h" -#include "winternl.h" +#include "wine/winternl.h" #include "user_private.h" #include "wine/server.h" Modified: branches/arwinss/arwinss/client/user32/resource.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/r… ============================================================================== --- branches/arwinss/arwinss/client/user32/resource.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/resource.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -24,7 +24,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winternl.h" +#include "wine/winternl.h" #include "winnls.h" #include "wine/debug.h" #include "user_private.h" Modified: branches/arwinss/arwinss/client/user32/user_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/u… ============================================================================== --- branches/arwinss/arwinss/client/user32/user_private.h [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/user_private.h [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -28,7 +28,7 @@ #include "winuser.h" #include "winreg.h" #include <windowsx.h> -#include "winternl.h" +#include "wine/winternl.h" #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr)) Modified: branches/arwinss/arwinss/client/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/w… ============================================================================== --- branches/arwinss/arwinss/client/user32/win.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/win.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -28,7 +28,7 @@ #include "windef.h" #include "winbase.h" #include "winver.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/server.h" #include "wine/unicode.h" #include "win.h" Modified: branches/arwinss/arwinss/client/user32/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/w… ============================================================================== --- branches/arwinss/arwinss/client/user32/winpos.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/winpos.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -30,7 +30,7 @@ #include "winbase.h" #include "wingdi.h" #include "winerror.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/server.h" #include "controls.h" #include "user_private.h" Modified: branches/arwinss/arwinss/client/user32/winstation.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/w… ============================================================================== --- branches/arwinss/arwinss/client/user32/winstation.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/winstation.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -28,7 +28,7 @@ #include "winerror.h" #include "wingdi.h" #include "winuser.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/server.h" #include "wine/unicode.h" #include "wine/debug.h" Added: branches/arwinss/arwinss/include/csr_shared.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/include/csr_sha… ============================================================================== --- branches/arwinss/arwinss/include/csr_shared.h (added) +++ branches/arwinss/arwinss/include/csr_shared.h [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -0,0 +1,72 @@ +#pragma once + +/* FNID's for NtUserSetWindowFNID, NtUserMessageCall */ +#define FNID_FIRST 0x029A +#define FNID_SCROLLBAR 0x029A +#define FNID_ICONTITLE 0x029B +#define FNID_MENU 0x029C +#define FNID_DESKTOP 0x029D +#define FNID_DEFWINDOWPROC 0x029E +#define FNID_MESSAGEWND 0x029F +#define FNID_SWITCH 0x02A0 +#define FNID_BUTTON 0x02A1 +#define FNID_COMBOBOX 0x02A2 +#define FNID_COMBOLBOX 0x02A3 +#define FNID_DIALOG 0x02A4 +#define FNID_EDIT 0x02A5 +#define FNID_LISTBOX 0x02A6 +#define FNID_MDICLIENT 0x02A7 +#define FNID_STATIC 0x02A8 +#define FNID_IME 0x02A9 +#define FNID_GHOST 0x02AA +#define FNID_CALLWNDPROC 0x02AB +#define FNID_CALLWNDPROCRET 0x02AC +#define FNID_HKINLPCWPEXSTRUCT 0x02AD +#define FNID_HKINLPCWPRETEXSTRUCT 0x02AE +#define FNID_MB_DLGPROC 0x02AF +#define FNID_MDIACTIVATEDLGPROC 0x02B0 +#define FNID_SENDMESSAGE 0x02B1 +#define FNID_SENDMESSAGEFF 0x02B2 +/* Kernel has option to use TimeOut or normal msg send, based on type of msg. */ +#define FNID_SENDMESSAGEWTOOPTION 0x02B3 +#define FNID_SENDMESSAGECALLPROC 0x02B4 +#define FNID_BROADCASTSYSTEMMESSAGE 0x02B5 +#define FNID_TOOLTIPS 0x02B6 +#define FNID_SENDNOTIFYMESSAGE 0x02B7 +#define FNID_SENDMESSAGECALLBACK 0x02B8 +#define FNID_LAST 0x02B9 + +typedef struct _WNDMSG +{ + DWORD maxMsgs; + PINT abMsgs; +} WNDMSG, *PWNDMSG; + +typedef PVOID PSERVERINFO; + +typedef struct _SHAREDINFO +{ + PSERVERINFO psi; /* global Server Info */ + PVOID aheList; /* Handle Entry List */ + PVOID pDispInfo; /* global PDISPLAYINFO pointer */ + ULONG_PTR ulSharedDelta; /* Heap delta */ + WNDMSG awmControl[FNID_LAST - FNID_FIRST]; + WNDMSG DefWindowMsgs; + WNDMSG DefWindowSpecMsgs; +} SHAREDINFO, *PSHAREDINFO; + +/* See also the USERSRV_API_CONNECTINFO #define in include/reactos/subsys/win/winmsg.h */ +typedef struct _USERCONNECT +{ + ULONG ulVersion; + ULONG ulCurrentVersion; + DWORD dwDispatchCount; + SHAREDINFO siClient; +} USERCONNECT, *PUSERCONNECT; + +/* WinNT 5.0 compatible user32 / win32k */ +#define USER_VERSION MAKELONG(0x0000, 0x0005) + +#if defined(_M_IX86) +C_ASSERT(sizeof(USERCONNECT) == 0x124); +#endif Propchange: branches/arwinss/arwinss/include/csr_shared.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 69524: [ARWINSS] - Use proper winternl.h header from Wine. - metafile.c: No need to save font from the DC as it's not necessary to restore it (see recent Wine src code). - freetype.c: Co...
by fireball＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: fireball Date: Wed Oct 14 11:27:08 2015 New Revision: 69524 URL: http://svn.reactos.org/svn/reactos?rev=69524&view=rev Log: [ARWINSS] - Use proper winternl.h header from Wine. - metafile.c: No need to save font from the DC as it's not necessary to restore it (see recent Wine src code). - freetype.c: Comment out unused variable. Modified: branches/arwinss/arwinss/client/gdi32/dc.c branches/arwinss/arwinss/client/gdi32/freetype.c branches/arwinss/arwinss/client/gdi32/gdiobj.c branches/arwinss/arwinss/client/gdi32/metafile.c branches/arwinss/arwinss/client/gdi32/opengl.c Modified: branches/arwinss/arwinss/client/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/dc… ============================================================================== --- branches/arwinss/arwinss/client/gdi32/dc.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/dc.c [iso-8859-1] Wed Oct 14 11:27:08 2015 @@ -28,7 +28,7 @@ #include "winbase.h" #include "wingdi.h" #include "winreg.h" -#include "winternl.h" +#include "wine/winternl.h" #include "winerror.h" #include "gdi_private.h" #include "wine/unicode.h" Modified: branches/arwinss/arwinss/client/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/fr… ============================================================================== --- branches/arwinss/arwinss/client/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/freetype.c [iso-8859-1] Wed Oct 14 11:27:08 2015 @@ -1653,7 +1653,7 @@ { HANDLE hkey; BOOL ret = FALSE; - DWORD type, max_val, max_data, val_len, data_len, index; + DWORD /*type,*/max_val, max_data, val_len, data_len, index; WCHAR *value, *data; WCHAR *entry, *next; SYSTEM_LINKS *font_link, *system_font_link; @@ -1729,7 +1729,7 @@ } /* Copy type and data length */ - type = info->Type; + //type = info->Type; data_len = info->DataLength; Modified: branches/arwinss/arwinss/client/gdi32/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/gd… ============================================================================== --- branches/arwinss/arwinss/client/gdi32/gdiobj.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/gdiobj.c [iso-8859-1] Wed Oct 14 11:27:08 2015 @@ -31,7 +31,7 @@ #include "winreg.h" #include "winnls.h" #include "winerror.h" -#include "winternl.h" +#include "wine/winternl.h" #include "gdi_private.h" #include "wine/debug.h" Modified: branches/arwinss/arwinss/client/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/me… ============================================================================== --- branches/arwinss/arwinss/client/gdi32/metafile.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/metafile.c [iso-8859-1] Wed Oct 14 11:27:08 2015 @@ -56,7 +56,7 @@ #include "wingdi.h" #include "winreg.h" #include "winnls.h" -#include "winternl.h" +#include "wine/winternl.h" #include "gdi_private.h" #include "wine/debug.h" @@ -394,7 +394,6 @@ WORD i; HPEN hPen; HBRUSH hBrush; - HFONT hFont; HPALETTE hPal; HRGN hRgn; BOOL loaded = FALSE; @@ -409,7 +408,6 @@ /* save DC */ hPen = GetCurrentObject(hdc, OBJ_PEN); hBrush = GetCurrentObject(hdc, OBJ_BRUSH); - hFont = GetCurrentObject(hdc, OBJ_FONT); hPal = GetCurrentObject(hdc, OBJ_PAL); hRgn = CreateRectRgn(0, 0, 0, 0); Modified: branches/arwinss/arwinss/client/gdi32/opengl.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/op… ============================================================================== --- branches/arwinss/arwinss/client/gdi32/opengl.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/opengl.c [iso-8859-1] Wed Oct 14 11:27:08 2015 @@ -31,7 +31,7 @@ #include "winbase.h" #include "wingdi.h" #include "winerror.h" -#include "winternl.h" +#include "wine/winternl.h" #include "winnt.h" #include "gdi_private.h" #include "wine/debug.h"

1 0

[tfaber] 69523: [TCPIP] - Add missing OBJ_KERNEL_HANDLE and close handles accordingly CORE-10207
by tfaber＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: tfaber Date: Wed Oct 14 09:26:56 2015 New Revision: 69523 URL: http://svn.reactos.org/svn/reactos?rev=69523&view=rev Log: [TCPIP] - Add missing OBJ_KERNEL_HANDLE and close handles accordingly CORE-10207 Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Wed Oct 14 09:26:56 2015 @@ -594,7 +594,7 @@ InitializeObjectAttributes(&ObjectAttributes, &TcpipRegistryPath, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); @@ -1074,7 +1074,7 @@ OBJECT_ATTRIBUTES Attributes; NTSTATUS Status; - InitializeObjectAttributes(&Attributes, RegistryPath, OBJ_CASE_INSENSITIVE, 0, 0); + InitializeObjectAttributes(&Attributes, RegistryPath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, 0); Status = ZwOpenKey(RegHandle, KEY_ALL_ACCESS, &Attributes); return Status; } @@ -1198,8 +1198,8 @@ RtlFreeUnicodeString( &RootDevice ); RtlFreeUnicodeString( &LinkageKeyName ); RtlFreeUnicodeString( &DescKeyName ); - if( LinkageKey ) NtClose( LinkageKey ); - if( DescKey ) NtClose( DescKey ); + if( LinkageKey ) ZwClose( LinkageKey ); + if( DescKey ) ZwClose( DescKey ); TI_DbgPrint(DEBUG_DATALINK,("Returning %x\n", Status)); @@ -1242,7 +1242,7 @@ Kbio = ExAllocatePool( NonPagedPool, KbioLength ); if( !Kbio ) { TI_DbgPrint(DEBUG_DATALINK,("Failed to allocate memory\n")); - NtClose( EnumKey ); + ZwClose( EnumKey ); return STATUS_NO_MEMORY; } @@ -1251,7 +1251,7 @@ if( !NT_SUCCESS(Status) ) { TI_DbgPrint(DEBUG_DATALINK,("Couldn't enum key child %d\n", i)); - NtClose( EnumKey ); + ZwClose( EnumKey ); ExFreePool( Kbio ); return Status; } @@ -1265,14 +1265,14 @@ Status = CheckForDeviceDesc ( &EnumKeyName, &TargetKeyName, Name, DeviceDesc ); if( NT_SUCCESS(Status) ) { - NtClose( EnumKey ); + ZwClose( EnumKey ); ExFreePool( Kbio ); return Status; } else Status = STATUS_SUCCESS; } } - NtClose( EnumKey ); + ZwClose( EnumKey ); ExFreePool( Kbio ); return STATUS_UNSUCCESSFUL; }

1 0

[tfaber] 69522: [NDIS] - Add missing OBJ_KERNEL_HANDLE CORE-10207
by tfaber＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: tfaber Date: Wed Oct 14 08:32:00 2015 New Revision: 69522 URL: http://svn.reactos.org/svn/reactos?rev=69522&view=rev Log: [NDIS] - Add missing OBJ_KERNEL_HANDLE CORE-10207 Modified: trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Wed Oct 14 08:32:00 2015 @@ -291,7 +291,7 @@ RtlCopyUnicodeString(&KeyNameU, ProtocolSection); RtlAppendUnicodeToString(&KeyNameU, PARAMETERS_KEY); - InitializeObjectAttributes(&KeyAttributes, &KeyNameU, OBJ_CASE_INSENSITIVE, NULL, NULL); + InitializeObjectAttributes(&KeyAttributes, &KeyNameU, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); *Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); @@ -908,7 +908,7 @@ wcsncpy(KeyName->Buffer, KeyInformation->Name, KeyName->MaximumLength/sizeof(WCHAR)); KeyName->Length = (USHORT)min(KeyInformation->NameLength, KeyName->MaximumLength); - InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, ConfigurationHandle, NULL); + InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, ConfigurationHandle, NULL); *Status = ZwOpenKey(&RegKeyHandle, KEY_ALL_ACCESS, &KeyAttributes); @@ -971,7 +971,7 @@ *KeyHandle = NULL; - InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, ConfigurationHandle, 0); + InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, ConfigurationHandle, 0); *Status = ZwOpenKey(&RegKeyHandle, KEY_ALL_ACCESS, &KeyAttributes); if(*Status != STATUS_SUCCESS) Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Wed Oct 14 08:32:00 2015 @@ -933,7 +933,7 @@ RtlInitUnicodeString(&RegistryPath, RegistryPathStr); NDIS_DbgPrint(MAX_TRACE, ("Opening configuration key: %wZ\n", &RegistryPath)); - InitializeObjectAttributes(&ObjectAttributes, &RegistryPath, OBJ_CASE_INSENSITIVE, NULL, NULL); + InitializeObjectAttributes(&ObjectAttributes, &RegistryPath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); NtStatus = ZwOpenKey(&DriverKeyHandle, KEY_READ, &ObjectAttributes); ExFreePool(RegistryPathStr);

1 0

[tfaber] 69521: [PING] - Check for invalid values passed to the -n option. Patch by Tim Crawford CORE-10332 #resolve
by tfaber＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: tfaber Date: Wed Oct 14 07:24:09 2015 New Revision: 69521 URL: http://svn.reactos.org/svn/reactos?rev=69521&view=rev Log: [PING] - Check for invalid values passed to the -n option. Patch by Tim Crawford CORE-10332 #resolve Modified: trunk/reactos/base/applications/network/ping/lang/bg-BG.rc trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc trunk/reactos/base/applications/network/ping/lang/de-DE.rc trunk/reactos/base/applications/network/ping/lang/en-US.rc trunk/reactos/base/applications/network/ping/lang/es-ES.rc trunk/reactos/base/applications/network/ping/lang/fr-FR.rc trunk/reactos/base/applications/network/ping/lang/it-IT.rc trunk/reactos/base/applications/network/ping/lang/pl-PL.rc trunk/reactos/base/applications/network/ping/lang/ro-RO.rc trunk/reactos/base/applications/network/ping/lang/ru-RU.rc trunk/reactos/base/applications/network/ping/lang/sq-AL.rc trunk/reactos/base/applications/network/ping/lang/sv-SE.rc trunk/reactos/base/applications/network/ping/lang/tr-TR.rc trunk/reactos/base/applications/network/ping/lang/uk-UA.rc trunk/reactos/base/applications/network/ping/lang/zh-CN.rc trunk/reactos/base/applications/network/ping/ping.c trunk/reactos/base/applications/network/ping/resource.h Modified: trunk/reactos/base/applications/network/ping/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/bg-BG.rc [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -31,6 +31,7 @@ IDS_BAD_OPTION_FORMAT "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»Ð½Ð¾ Ð·Ð°Ð¿Ð¸ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑÐ° %1.\n\0" IDS_BAD_OPTION "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»Ð½Ð° ÑÑÐ¾Ð¹Ð½Ð¾ÑÑ %1.\n\0" IDS_BAD_VALUE_OPTION_L "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»Ð½Ð° ÑÑÐ¾Ð¹Ð½Ð¾ÑÑ Ð·Ð° -l, Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¸ÑÐµ ÑÐ° Ð¾Ñ 0 Ð´Ð¾ %1!d!.\n\0" + IDS_BAD_VALUE_OPTION_N "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»Ð½Ð° ÑÑÐ¾Ð¹Ð½Ð¾ÑÑ Ð·Ð° -n, Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¸ÑÐµ ÑÐ° Ð¾Ñ 1 Ð´Ð¾ %1!u!.\n\0" IDS_REPLY_FROM "ÐÑÐ³Ð¾Ð²Ð¾Ñ Ð¾Ñ %1: Ð±Ð°Ð¹ÑÐ°=%2!d! Ð²ÑÐµÐ¼Ðµ%3%4 ÐÐ(TTL)=%5!d!\n\0" IDS_DEST_UNREACHABLE "Ð¦ÐµÐ»ÐµÐ²Ð¸Ñ Ð¿ÑÐ¸ÐµÐ¼Ð½Ð¸Ðº Ðµ Ð½ÐµÐ´Ð¾ÑÑÐ¸Ð¶Ð¸Ð¼.\n\0" IDS_COULD_NOT_TRANSMIT "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¿ÑÐµÐ´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸ÑÐµ (%1!d!).\n\0" Modified: trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -30,6 +30,7 @@ IDS_BAD_OPTION_FORMAT "NesprÃ¡vnÃ½ formÃ¡t volby %1.\n\0" IDS_BAD_OPTION "NesprÃ¡vnÃ¡ volba %1.\n\0" IDS_BAD_VALUE_OPTION_L "NesprÃ¡vnÃ¡ hodnota volby -l, platnÃ½ rozsah je od 0 do %1!d!.\n\0" + IDS_BAD_VALUE_OPTION_N "NesprÃ¡vnÃ¡ hodnota volby -n, platnÃ½ rozsah je od 1 do %1!u!.\n\0" IDS_REPLY_FROM "OdpovÄÄ od %1: bajtÅ¯=%2!d! Äas%3%4 TTL=%5!d!\n\0" IDS_DEST_UNREACHABLE "CÃl je nedostupnÃ½.\n\0" IDS_COULD_NOT_TRANSMIT "Nebylo moÅ¾nÃ© pÅenÃ©st data (%1!d!).\n\0" Modified: trunk/reactos/base/applications/network/ping/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/de-DE.rc [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -25,6 +25,7 @@ IDS_BAD_OPTION_FORMAT "UngÃ¼ltiges Format %1.\n\0" IDS_BAD_OPTION "UngÃ¼ltige Option %1.\n\0" IDS_BAD_VALUE_OPTION_L "UngÃ¼ltiger Wert fÃ¼r Option -l, Erlaubter Bereich ist von 0 bis %1!d!.\n\0" + IDS_BAD_VALUE_OPTION_N "UngÃ¼ltiger Wert fÃ¼r Option -n, Erlaubter Bereich ist von 1 bis %1!u!.\n\0" IDS_REPLY_FROM "Antwort von %1: bytes=%2!d! time%3%4 TTL=%5!d!\n\0" IDS_DEST_UNREACHABLE "Zielhost nicht erreichbar.\n\0" IDS_COULD_NOT_TRANSMIT "Es konnten keine Daten gesendet werden (%1!d!).\n\0" Modified: trunk/reactos/base/applications/network/ping/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/en-US.rc [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -25,6 +25,7 @@ IDS_BAD_OPTION_FORMAT "Bad option format %1.\n\0" IDS_BAD_OPTION "Bad option %1.\n\0" IDS_BAD_VALUE_OPTION_L "Bad value for option -l, valid range is from 0 to %1!d!.\n\0" + IDS_BAD_VALUE_OPTION_N "Bad value for option -n, valid range is from 1 to %1!u!.\n\0" IDS_REPLY_FROM "Reply from %1: bytes=%2!d! time%3%4 TTL=%5!d!\n\0" IDS_DEST_UNREACHABLE "Destination host unreachable.\n\0" IDS_COULD_NOT_TRANSMIT "Could not transmit data (%1!d!).\n\0" Modified: trunk/reactos/base/applications/network/ping/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/es-ES.rc [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -28,6 +28,7 @@ IDS_BAD_OPTION_FORMAT "El formato de opciÃ³n %1 no es vÃ¡lido.\n\0" IDS_BAD_OPTION "La opciÃ³n %1 no es vÃ¡lida.\n\0" IDS_BAD_VALUE_OPTION_L "El valor para la opciÃ³n -l no es vÃ¡lido, debe de estar entre 0 y %1!d!.\n\0" + IDS_BAD_VALUE_OPTION_N "El valor para la opciÃ³n -n no es vÃ¡lido, debe de estar entre 1 y %1!u!.\n\0" IDS_REPLY_FROM "Respuesta desde %1: bytes=%2!d! tiempo%3%4 TTL=%5!d!\n\0" IDS_DEST_UNREACHABLE "Host de destino inaccesible.\n\0" IDS_COULD_NOT_TRANSMIT "No se ha podido transmitir ningÃºn dato (%1!d!).\n\0" Modified: trunk/reactos/base/applications/network/ping/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/fr-FR.rc [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -25,6 +25,7 @@ IDS_BAD_OPTION_FORMAT "Format d'option incorrect %1.\n\0" IDS_BAD_OPTION "Option incorrecte %1.\n\0" IDS_BAD_VALUE_OPTION_L "Valeur incorrecte pour l'option -l, elle doit Ãªtre entre 0 et %1!d!.\n\0" + IDS_BAD_VALUE_OPTION_N "Valeur incorrecte pour l'option -n, elle doit Ãªtre entre 1 et %1!u!.\n\0" IDS_REPLY_FROM "RÃ©ponse de %1 : octets=%2!d! durÃ©e%3%4 TTL=%5!d!\n\0" IDS_DEST_UNREACHABLE "HÃ´te de destination injoignable.\n\0" IDS_COULD_NOT_TRANSMIT "Ãchec lors de la transmission (%1!d!).\n\0" Modified: trunk/reactos/base/applications/network/ping/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/it-IT.rc [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -25,6 +25,7 @@ IDS_BAD_OPTION_FORMAT "Formato opzione errato %1.\n\0" IDS_BAD_OPTION "Opzione errata %1.\n\0" IDS_BAD_VALUE_OPTION_L "Valore errato per il parametro -l, Ã¨ valido un valore tra 0 to %1!d!.\n\0" + IDS_BAD_VALUE_OPTION_N "Valore errato per il parametro -n, Ã¨ valido un valore tra 1 to %1!u!.\n\0" IDS_REPLY_FROM "Risposta da %1: bytes=%2!d! time%3%4 TTL=%5!d!\n\0" IDS_DEST_UNREACHABLE "Host destinazione irraggiungibile.\n\0" IDS_COULD_NOT_TRANSMIT "Impossibile trasmettere dati (%1!d!).\n\0" Modified: trunk/reactos/base/applications/network/ping/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/pl-PL.rc [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -33,6 +33,7 @@ IDS_BAD_OPTION_FORMAT "NieprawidÅowy format opcji %1.\n\0" IDS_BAD_OPTION "NieprawidÅowa opcja %1.\n\0" IDS_BAD_VALUE_OPTION_L "NieprawidÅowa wartoÅÄ dla opcji -l, wymagana liczba naturalna od 0 do %1!d!.\n\0" + IDS_BAD_VALUE_OPTION_N "NieprawidÅowa wartoÅÄ dla opcji -n, wymagana liczba naturalna od 1 do %1!u!.\n\0" IDS_REPLY_FROM "OdpowiedÅº z %1: bajtÃ³w=%2!d! czas%3%4 TTL=%5!d!\n\0" IDS_DEST_UNREACHABLE "Host docelowy nieosiÄgalny.\n\0" IDS_COULD_NOT_TRANSMIT "BÅÄd podczas transmisji danych (%1!d!).\n\0" Modified: trunk/reactos/base/applications/network/ping/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/ro-RO.rc [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -34,6 +34,7 @@ IDS_BAD_OPTION_FORMAT "OpÈiune cu format eronat: %1.\n\0" IDS_BAD_OPTION "%1 este o opÈiune eronatÄ.\n\0" IDS_BAD_VALUE_OPTION_L "Valoare eronatÄ pentru opÈiunea -l, domeniul valid este 0 - %1!d!.\n\0" + IDS_BAD_VALUE_OPTION_N "Valoare eronatÄ pentru opÈiunea -n, domeniul valid este 1 - %1!u!.\n\0" IDS_REPLY_FROM "RÄspuns de la %1: octeÈi=%2!d! timp%3%4 TTL=%5!d!\n\0" IDS_DEST_UNREACHABLE "Gazda destinaÈie este inaccesibilÄ.\n\0" IDS_COULD_NOT_TRANSMIT "Nu s-a reuÈit transmiterea datelor (%1!d!).\n\0" Modified: trunk/reactos/base/applications/network/ping/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/ru-RU.rc [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -25,6 +25,7 @@ IDS_BAD_OPTION_FORMAT "Bad option format %1.\n\0" IDS_BAD_OPTION "Bad option %1.\n\0" IDS_BAD_VALUE_OPTION_L "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° -l, Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½ Ñ 0 Ð¿Ð¾ %1!d!.\n\0" + IDS_BAD_VALUE_OPTION_N "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° -n, Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½ Ñ 1 Ð¿Ð¾ %1!u!.\n\0" IDS_REPLY_FROM "ÐÑÐ²ÐµÑ Ð¾Ñ %1: ÑÐ¸ÑÐ»Ð¾ Ð±Ð°Ð¹Ñ=%2!d! Ð²ÑÐµÐ¼Ñ%3%4 TTL=%5!d!\n\0" IDS_DEST_UNREACHABLE "Destination host unreachable.\n\0" IDS_COULD_NOT_TRANSMIT "Could not transmit data (%1!d!).\n\0" Modified: trunk/reactos/base/applications/network/ping/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/sq-AL.rc [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -29,6 +29,7 @@ IDS_BAD_OPTION_FORMAT "Opsion formati i keq %1.\n\0" IDS_BAD_OPTION "Opsion i keq %1.\n\0" IDS_BAD_VALUE_OPTION_L "Vlere e keqe per opsion -l, varh i vlefshem nga 0 nÃ« %1!d!.\n\0" + IDS_BAD_VALUE_OPTION_N "Vlere e keqe per opsion -n, varh i vlefshem nga 1 nÃ« %1!u!.\n\0" IDS_REPLY_FROM "Pergjigju nga %1: bytes=%2!d! time%3%4 TTL=%5!d!\n\0" IDS_DEST_UNREACHABLE "Destinacioni i hostit i pakapshem.\n\0" IDS_COULD_NOT_TRANSMIT "Nuk transmetoj dot data (%1!d!).\n\0" Modified: trunk/reactos/base/applications/network/ping/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/sv-SE.rc [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -32,6 +32,7 @@ IDS_BAD_OPTION_FORMAT "Ogiltigt format pÃ¥ alternativ %1.\n\0" IDS_BAD_OPTION "Ogiltigt alternativ %1.\n\0" IDS_BAD_VALUE_OPTION_L "Ogiltigt vÃ¤rde fÃ¶r alternativ -l, giltig intervall Ã¤r frÃ¥n 0 till %1!d!.\n\0" + IDS_BAD_VALUE_OPTION_N "Ogiltigt vÃ¤rde fÃ¶r alternativ -n, giltig intervall Ã¤r frÃ¥n 1 till %1!u!.\n\0" IDS_REPLY_FROM "Svar frÃ¥n %1: bytes=%2!d! tid%3%4 TTL=%5!d!\n\0" IDS_DEST_UNREACHABLE "VÃ¤rddatorn gÃ¥r inte att nÃ¥.\n\0" IDS_COULD_NOT_TRANSMIT "Kunde inte sÃ¤nda data (%1!d!).\n\0" Modified: trunk/reactos/base/applications/network/ping/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/tr-TR.rc [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -27,6 +27,7 @@ IDS_BAD_OPTION_FORMAT "GeÃ§ersiz seÃ§enek biÃ§imi: %1.\n\0" IDS_BAD_OPTION "GeÃ§ersiz seÃ§enek: %1.\n\0" IDS_BAD_VALUE_OPTION_L "-l seÃ§eneÄi iÃ§in deÄer geÃ§ersiz, geÃ§erli aralÄ±k 0'dan %1!d! sayÄ±sÄ±na dektir.\n\0" + IDS_BAD_VALUE_OPTION_N "-n seÃ§eneÄi iÃ§in deÄer geÃ§ersiz, geÃ§erli aralÄ±k 1'dan %1!u! sayÄ±sÄ±na dektir.\n\0" IDS_REPLY_FROM "%1 varÄ±ÅÄ±ndan yanÄ±t: Ã§oklu=%2!d! sÃ¼re=%3%4 TTL=%5!d!\n\0" IDS_DEST_UNREACHABLE "VarÄ±Å anabilgisayarÄ± eriÅilemez.\n\0" IDS_COULD_NOT_TRANSMIT "Veri gÃ¶nderilemedi (%1!d!).\n\0" Modified: trunk/reactos/base/applications/network/ping/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/uk-UA.rc [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -33,6 +33,7 @@ IDS_BAD_OPTION_FORMAT "ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ Ð¾Ð¿ÑÑÑ %1.\n\0" IDS_BAD_OPTION "ÐÐ¾Ð³Ð°Ð½Ð° Ð¾Ð¿ÑÑÑ %1.\n\0" IDS_BAD_VALUE_OPTION_L "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¾Ð¿ÑÑÑ -l, Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¸Ð¹ Ð´ÑÐ°Ð¿Ð°Ð·Ð¾Ð½ Ð²ÑÐ´ 0 Ð´Ð¾ %1!d!.\n\0" + IDS_BAD_VALUE_OPTION_N "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¾Ð¿ÑÑÑ -n, Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¸Ð¹ Ð´ÑÐ°Ð¿Ð°Ð·Ð¾Ð½ Ð²ÑÐ´ 1 Ð´Ð¾ %1!u!.\n\0" IDS_REPLY_FROM "ÐÑÐ´Ð¿Ð¾Ð²ÑÐ´Ñ Ð²ÑÐ´ %1: Ð±Ð°Ð¹ÑÑÐ²=%2!d! ÑÐ°Ñ%3%4 TTL=%5!d!\n\0" IDS_DEST_UNREACHABLE "Ð¥Ð¾ÑÑ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¸Ð¹.\n\0" IDS_COULD_NOT_TRANSMIT "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð¿ÐµÑÐµÐ´Ð°ÑÐ¸ Ð´Ð°Ð½Ñ (%1!d!).\n\0" Modified: trunk/reactos/base/applications/network/ping/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/zh-CN.rc [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -27,6 +27,7 @@ IDS_BAD_OPTION_FORMAT "éè¯¯éé¡¹æ ¼å¼ %1ã\n\0" IDS_BAD_OPTION "éè¯¯éé¡¹ %1ã\n\0" IDS_BAD_VALUE_OPTION_L "-l éé¡¹çå¼æ æï¼ææçèå´æ¯ä» 0 å° %1!d!ã\n\0" + IDS_BAD_VALUE_OPTION_N "-n éé¡¹çå¼æ æï¼ææçèå´æ¯ä» 1 å° %1!u!ã\n\0" IDS_REPLY_FROM "æ¥èª %1 çåå¤ï¼åèæ°=%2!d! æ¶é´%3%4 TTL=%5!d!\n\0" IDS_DEST_UNREACHABLE "ç®æ ä¸»æºä¸å¯å°è¾¾ã\n\0" IDS_COULD_NOT_TRANSMIT "æ æ³åéæ°æ® (%1!d!)ã\n\0" Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -249,7 +249,15 @@ case L'a': ResolveAddresses = TRUE; break; case L'n': if (i + 1 < argc) + { PingCount = wcstoul(argv[++i], NULL, 0); + + if (PingCount == 0) + { + FormatOutput(IDS_BAD_VALUE_OPTION_N, UINT_MAX); + return FALSE; + } + } else InvalidOption = TRUE; break; Modified: trunk/reactos/base/applications/network/ping/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/resource.h [iso-8859-1] Wed Oct 14 07:24:09 2015 @@ -23,3 +23,4 @@ #define IDS_REQUEST_TIMEOUT 20 #define IDS_MS 21 #define IDS_1MS 22 +#define IDS_BAD_VALUE_OPTION_N 23

1 0

[fireball] 69520: [ARWINSS] - Update freetype CMakeLists.txt file according to r69124.
by fireball＠svn.reactos.org 13 Oct '15

13 Oct '15

Author: fireball Date: Tue Oct 13 12:05:13 2015 New Revision: 69520 URL: http://svn.reactos.org/svn/reactos?rev=69520&view=rev Log: [ARWINSS] - Update freetype CMakeLists.txt file according to r69124. Modified: branches/arwinss/arwinss/freetype/CMakeLists.txt Modified: branches/arwinss/arwinss/freetype/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/freetype/CMakeL… ============================================================================== --- branches/arwinss/arwinss/freetype/CMakeLists.txt [iso-8859-1] (original) +++ branches/arwinss/arwinss/freetype/CMakeLists.txt [iso-8859-1] Tue Oct 13 12:05:13 2015 @@ -14,6 +14,7 @@ ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/src/base/ftbitmap.c ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/src/base/ftcid.c ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/src/base/ftdebug.c + ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/src/base/ftfntfmt.c ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/src/base/ftfstype.c ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/src/base/ftgasp.c ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/src/base/ftglyph.c @@ -29,7 +30,6 @@ ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/src/base/ftsystem.c ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/src/base/fttype1.c ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/src/base/ftwinfnt.c - ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/src/base/ftxf86.c ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/src/bdf/bdf.c ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/src/cache/ftcache.c ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/src/cff/cff.c

1 0

[gedmurphy] 69519: [DEVMGR] More g++ fixes. devmgr now compiles, just a few linker issues to fixup
by gedmurphy＠svn.reactos.org 12 Oct '15

12 Oct '15

Author: gedmurphy Date: Mon Oct 12 20:44:54 2015 New Revision: 69519 URL: http://svn.reactos.org/svn/reactos?rev=69519&view=rev Log: [DEVMGR] More g++ fixes. devmgr now compiles, just a few linker issues to fixup Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt trunk/reactos/dll/win32/devmgr_new/api.cpp trunk/reactos/dll/win32/devmgr_new/devmgr.rc trunk/reactos/dll/win32/devmgr_new/precomp.h trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/CMake… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt [iso-8859-1] Mon Oct 12 20:44:54 2015 @@ -7,6 +7,7 @@ if(NOT MSVC) # HACK: this should be enabled globally! add_compile_flags_language("-std=c++11" "CXX") + add_compile_flags("-fexceptions") endif() include_directories( Modified: trunk/reactos/dll/win32/devmgr_new/api.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/api.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/api.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/api.cpp [iso-8859-1] Mon Oct 12 20:44:54 2015 @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS devmgr.dll -* FILE: lib/devmgr/stubs.c +* FILE: dll/win32/devmgr/api.cpp * PURPOSE: devmgr.dll stubs * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) * Ged Murphy (gedmurphy(a)reactos.org) Modified: trunk/reactos/dll/win32/devmgr_new/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgr.rc [iso-8859-1] Mon Oct 12 20:44:54 2015 @@ -9,8 +9,8 @@ #define REACTOS_STR_INTERNAL_NAME "devmgr" #define REACTOS_STR_ORIGINAL_FILENAME "devmgr.dll" -//#include <reactos/version.rc> -//#include <reactos/manifest_dll.rc> +#include <reactos/version.rc> +#include <reactos/manifest_dll.rc> LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/devmgr_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/preco… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/precomp.h [iso-8859-1] Mon Oct 12 20:44:54 2015 @@ -1,4 +1,4 @@ -#pragma once +//#pragma once #ifndef __REACTOS__ Modified: trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp [iso-8859-1] Mon Oct 12 20:44:54 2015 @@ -613,7 +613,7 @@ static VOID SetListViewText(HWND hwnd, INT iItem, - LPWSTR lpText) + LPCWSTR lpText) { LVITEM li; @@ -622,7 +622,7 @@ li.iSubItem = 0; li.state = 0; //(li.iItem == 0 ? LVIS_SELECTED : 0); li.stateMask = LVIS_SELECTED; - li.pszText = lpText; + li.pszText = (LPWSTR)lpText; (void)ListView_InsertItem(hwnd, &li); } @@ -1240,7 +1240,7 @@ static VOID DisplayClassProperties(IN PDEVADVPROP_INFO dap, IN HWND hwndListView, - IN LPWSTR lpProperty) + IN LPCWSTR lpProperty) { HDEVINFO DeviceInfoSet; PSP_DEVINFO_DATA DeviceInfoData; Modified: trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp [iso-8859-1] Mon Oct 12 20:44:54 2015 @@ -518,7 +518,8 @@ } else { - LPWSTR szProblem, szInfo = L"FIXME"; + LPWSTR szProblem; + WCHAR szInfo[] = L"FIXME"; DWORD dwRet; BOOL AdvFormat = FALSE; UINT StringIDs[] =

1 0

[gedmurphy] 69518: [ATL] Various g++ fixes
by gedmurphy＠svn.reactos.org 12 Oct '15

12 Oct '15

Author: gedmurphy Date: Mon Oct 12 20:33:33 2015 New Revision: 69518 URL: http://svn.reactos.org/svn/reactos?rev=69518&view=rev Log: [ATL] Various g++ fixes Modified: trunk/reactos/lib/atl/atlcoll.h trunk/reactos/lib/atl/atlmem.h trunk/reactos/lib/atl/atlsimpstr.h trunk/reactos/lib/atl/atlstr.h Modified: trunk/reactos/lib/atl/atlcoll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlcoll.h?rev=6951… ============================================================================== --- trunk/reactos/lib/atl/atlcoll.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlcoll.h [iso-8859-1] Mon Oct 12 20:33:33 2015 @@ -136,7 +136,6 @@ public CDefaultElementTraits<T> { }; - template<typename E, class ETraits = CElementTraits<E>> class CAtlList @@ -209,13 +208,12 @@ template<typename E, class ETraits> CAtlList< E, ETraits >::CAtlList(_In_ UINT nBlockSize) : - m_NumElements(0), + m_Blocks(NULL), + m_BlockSize(nBlockSize), m_HeadNode(NULL), m_TailNode(NULL), m_FreeNode(NULL), - m_Blocks(NULL), - - m_BlockSize(nBlockSize) + m_NumElements(0) { ATLASSERT(nBlockSize > 0); } Modified: trunk/reactos/lib/atl/atlmem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlmem.h?rev=69518… ============================================================================== --- trunk/reactos/lib/atl/atlmem.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlmem.h [iso-8859-1] Mon Oct 12 20:33:33 2015 @@ -4,12 +4,6 @@ #pragma once #include "atlcore.h" -// HACK HACK! This must be placed in another global ATL header!! -// Placement new operator -void *operator new (size_t, void *buf) -{ - return buf; -} namespace ATL { Modified: trunk/reactos/lib/atl/atlsimpstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlsimpstr.h?rev=6… ============================================================================== --- trunk/reactos/lib/atl/atlsimpstr.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlsimpstr.h [iso-8859-1] Mon Oct 12 20:33:33 2015 @@ -102,20 +102,9 @@ wchar_t achNil[2]; }; -template< typename BaseType = char > + +template< typename BaseType = wchar_t > class ChTraitsBase -{ -public: - typedef char XCHAR; - typedef LPSTR PXSTR; - typedef LPCSTR PCXSTR; - typedef wchar_t YCHAR; - typedef LPWSTR PYSTR; - typedef LPCWSTR PCYSTR; -}; - -template<> -class ChTraitsBase< wchar_t > { public: typedef wchar_t XCHAR; @@ -126,8 +115,6 @@ typedef LPCSTR PCYSTR; }; - - template< typename BaseType, bool t_bMFCDLL = false> class CSimpleStringT { @@ -156,12 +143,6 @@ Attach(pNewData); } - CSimpleStringT(_In_ const CSimpleStringT<BaseType, !t_bMFCDLL>& strSrc) - { - CStringData* pSrcData = strSrc.GetData(); - CStringData* pNewData = CloneData(pSrcData); - Attach(pNewData); - } CSimpleStringT& operator=(_In_opt_z_ PCXSTR pszSrc) { Modified: trunk/reactos/lib/atl/atlstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlstr.h?rev=69518… ============================================================================== --- trunk/reactos/lib/atl/atlstr.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlstr.h [iso-8859-1] Mon Oct 12 20:33:33 2015 @@ -98,7 +98,15 @@ }; -template <typename _BaseType = char, class StringIterator = ChTraitsOS<_BaseType>> +template< typename _CharType = wchar_t > +class ChTraitsOS : + public ChTraitsBase < _CharType > +{ + +}; + + +template <typename _BaseType = wchar_t, class StringIterator = ChTraitsOS<_BaseType>> class StrTraitATL : public StringIterator {

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
35
Older →

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 October 2015