Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 67421: [ROSAPPS] Add part of missing sysutils folder and needed win32err lib to build.
by dreimer＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: dreimer Date: Sat Apr 25 17:41:44 2015 New Revision: 67421 URL: http://svn.reactos.org/svn/reactos?rev=67421&view=rev Log: [ROSAPPS] Add part of missing sysutils folder and needed win32err lib to build. Added: trunk/rosapps/applications/sysutils/chkdsk/CMakeLists.txt (with props) trunk/rosapps/applications/sysutils/chklib/CMakeLists.txt (with props) trunk/rosapps/applications/sysutils/gettype/CMakeLists.txt (with props) trunk/rosapps/lib/CMakeLists.txt (with props) trunk/rosapps/lib/win32err/CMakeLists.txt (with props) Modified: trunk/rosapps/CMakeLists.txt trunk/rosapps/applications/sysutils/CMakeLists.txt trunk/rosapps/applications/sysutils/chkdsk/chkdsk.c trunk/rosapps/applications/sysutils/chklib/chklib.c Modified: trunk/rosapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/CMakeLists.txt?rev=67421&r… ============================================================================== --- trunk/rosapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:41:44 2015 @@ -1,4 +1,4 @@ add_subdirectory(applications) add_subdirectory(demos) add_subdirectory(drivers) -# add_subdirectory(lib) +add_subdirectory(lib) Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:41:44 2015 @@ -1,7 +1,7 @@ -#add_subdirectory(chkdsk) -#add_subdirectory(chklib) +add_subdirectory(chkdsk) +add_subdirectory(chklib) add_subdirectory(ctm) -#add_subdirectory(gettype) +add_subdirectory(gettype) add_subdirectory(kill) #add_subdirectory(logevent) #add_subdirectory(lsdd) Added: trunk/rosapps/applications/sysutils/chkdsk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/chkd… ============================================================================== --- trunk/rosapps/applications/sysutils/chkdsk/CMakeLists.txt (added) +++ trunk/rosapps/applications/sysutils/chkdsk/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:41:44 2015 @@ -0,0 +1,7 @@ + +add_executable(chkdsk chkdsk.c chkdsk.rc) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fmifs) +set_module_type(chkdsk win32cui UNICODE) +target_link_libraries(chkdsk win32err) +add_importlibs(chkdsk fmifs msvcrt kernel32 ntdll) +add_cd_file(TARGET chkdsk DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/sysutils/chkdsk/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/sysutils/chkdsk/chkdsk.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/chkd… ============================================================================== --- trunk/rosapps/applications/sysutils/chkdsk/chkdsk.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/chkdsk/chkdsk.c [iso-8859-1] Sat Apr 25 17:41:44 2015 @@ -46,8 +46,8 @@ #include <fmifs/fmifs.h> #define _UNICODE 1 #include <tchar.h> -#include "config.h" -#include "win32err.h" +#include "../config.h" +#include "../win32err.h" // // Globals Added: trunk/rosapps/applications/sysutils/chklib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/chkl… ============================================================================== --- trunk/rosapps/applications/sysutils/chklib/CMakeLists.txt (added) +++ trunk/rosapps/applications/sysutils/chklib/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:41:44 2015 @@ -0,0 +1,6 @@ + +add_executable(chklib chklib.c chklib.rc) +set_module_type(chklib win32cui) +target_link_libraries(chklib win32err) +add_importlibs(chklib msvcrt kernel32) +add_cd_file(TARGET chklib DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/sysutils/chklib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/sysutils/chklib/chklib.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/chkl… ============================================================================== --- trunk/rosapps/applications/sysutils/chklib/chklib.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/chklib/chklib.c [iso-8859-1] Sat Apr 25 17:41:44 2015 @@ -34,7 +34,7 @@ #include <windef.h> #include <winbase.h> -#include "win32err.h" +#include "../win32err.h" #ifdef DISPLAY_VERSION static Added: trunk/rosapps/applications/sysutils/gettype/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/gett… ============================================================================== --- trunk/rosapps/applications/sysutils/gettype/CMakeLists.txt (added) +++ trunk/rosapps/applications/sysutils/gettype/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:41:44 2015 @@ -0,0 +1,5 @@ + +add_executable(gettype gettype.c) +set_module_type(gettype win32cui UNICODE) +add_importlibs(gettype shell32 mpr netapi32 msvcrt kernel32) +add_cd_file(TARGET gettype DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/sysutils/gettype/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/CMakeLists.txt?rev=674… ============================================================================== --- trunk/rosapps/lib/CMakeLists.txt (added) +++ trunk/rosapps/lib/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:41:44 2015 @@ -0,0 +1 @@ +add_subdirectory(win32err) Propchange: trunk/rosapps/lib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/lib/win32err/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/win32err/CMakeLists.tx… ============================================================================== --- trunk/rosapps/lib/win32err/CMakeLists.txt (added) +++ trunk/rosapps/lib/win32err/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:41:44 2015 @@ -0,0 +1,3 @@ + +add_library(win32err win32err.c) +add_dependencies(win32err psdk) Propchange: trunk/rosapps/lib/win32err/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 67420: [WIN32K] Fix drawing the Start and End Segments with Pie(). Brought to you by Barrett Karish. CORE-6851
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 17:30:43 2015 New Revision: 67420 URL: http://svn.reactos.org/svn/reactos?rev=67420&view=rev Log: [WIN32K] Fix drawing the Start and End Segments with Pie(). Brought to you by Barrett Karish. CORE-6851 Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/arc.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] Sat Apr 25 17:30:43 2015 @@ -21,9 +21,6 @@ x1, y1, x2, y2, \ &RectBounds, \ ROP2_TO_MIX(pdcattr->jROP2)); - -#define Rsin(d) ((d) == 0.0 ? 0.0 : ((d) == 90.0 ? 1.0 : sin(d*M_PI/180.0))) -#define Rcos(d) ((d) == 0.0 ? 1.0 : ((d) == 90.0 ? 0.0 : cos(d*M_PI/180.0))) static BOOL @@ -46,8 +43,7 @@ BOOL ret = TRUE; LONG PenWidth, PenOrigWidth; double AngleStart, AngleEnd; - LONG RadiusX, RadiusY, CenterX, CenterY; - LONG SfCx, SfCy, EfCx, EfCy; + LONG CenterX, CenterY; if (Right < Left) { @@ -124,8 +120,6 @@ DPRINT("1: Left: %d, Top: %d, Right: %d, Bottom: %d\n", RectBounds.left,RectBounds.top,RectBounds.right,RectBounds.bottom); - RadiusX = max((RectBounds.right - RectBounds.left) / 2, 1); - RadiusY = max((RectBounds.bottom - RectBounds.top) / 2, 1); CenterX = (RectBounds.right + RectBounds.left) / 2; CenterY = (RectBounds.bottom + RectBounds.top) / 2; AngleEnd = atan2((RectSEpts.bottom - CenterY), RectSEpts.right - CenterX)*(360.0/(M_PI*2)); @@ -136,11 +130,6 @@ { AngleStart = AngleEnd + 360.0; // Arc(), ArcTo(), Pie() and Chord() are counterclockwise APIs. } - - SfCx = (LONG)(Rcos(AngleStart) * RadiusX); - SfCy = (LONG)(Rsin(AngleStart) * RadiusY); - EfCx = (LONG)(Rcos(AngleEnd) * RadiusX); - EfCy = (LONG)(Rsin(AngleEnd) * RadiusY); if ((arctype == GdiTypePie) || (arctype == GdiTypeChord)) { @@ -175,11 +164,11 @@ if (arctype == GdiTypePie) { - PUTLINE(CenterX, CenterY, SfCx + CenterX, SfCy + CenterY, dc->eboLine); - PUTLINE(EfCx + CenterX, EfCy + CenterY, CenterX, CenterY, dc->eboLine); + PUTLINE(CenterX, CenterY, RectSEpts.left, RectSEpts.top, dc->eboLine); + PUTLINE(RectSEpts.right, RectSEpts.bottom, CenterX, CenterY, dc->eboLine); } if (arctype == GdiTypeChord) - PUTLINE(EfCx + CenterX, EfCy + CenterY, SfCx + CenterX, SfCy + CenterY, dc->eboLine); + PUTLINE(RectSEpts.right, RectSEpts.bottom, RectSEpts.left, RectSEpts.top, dc->eboLine); pbrPen->lWidth = PenOrigWidth; PEN_ShareUnlockPen(pbrPen);

1 0

[dreimer] 67419: [ROSAPPS] Add "net" subfolder to build and add all stuff which was built by rbuild TOO. Remove useless include I added last time. Fix some warnings in ncftp to keep the -Wno-* at a...
by dreimer＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: dreimer Date: Sat Apr 25 17:11:17 2015 New Revision: 67419 URL: http://svn.reactos.org/svn/reactos?rev=67419&view=rev Log: [ROSAPPS] Add "net" subfolder to build and add all stuff which was built by rbuild TOO. Remove useless include I added last time. Fix some warnings in ncftp to keep the -Wno-* at a minimum Added: trunk/rosapps/applications/net/CMakeLists.txt (with props) trunk/rosapps/applications/net/ncftp/CMakeLists.txt (with props) trunk/rosapps/applications/net/netreg/CMakeLists.txt (with props) trunk/rosapps/applications/net/niclist/CMakeLists.txt (with props) trunk/rosapps/applications/net/roshttpd/CMakeLists.txt (with props) trunk/rosapps/applications/net/tditest/CMakeLists.txt (with props) Modified: trunk/rosapps/applications/CMakeLists.txt trunk/rosapps/applications/devutils/gdihv/CMakeLists.txt trunk/rosapps/applications/fraginator/CMakeLists.txt trunk/rosapps/applications/net/ncftp/libncftp/ftp.c trunk/rosapps/applications/net/ncftp/libncftp/util.c trunk/rosapps/applications/net/ncftp/ncftp/cmds.c trunk/rosapps/applications/net/ncftp/ncftp/getline.c trunk/rosapps/applications/net/ncftp/ncftp/main.c trunk/rosapps/applications/net/ncftp/ncftp/util.c Modified: trunk/rosapps/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/CMakeLists.tx… ============================================================================== --- trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -3,7 +3,7 @@ add_subdirectory(explorer-old) add_subdirectory(fraginator) add_subdirectory(imagesoft) -#add_subdirectory(net) +add_subdirectory(net) add_subdirectory(notevil) add_subdirectory(screensavers) add_subdirectory(sysutils) Modified: trunk/rosapps/applications/devutils/gdihv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/gdih… ============================================================================== --- trunk/rosapps/applications/devutils/gdihv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/gdihv/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -1,5 +1,3 @@ - -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) list(APPEND SOURCE gdihv.c Modified: trunk/rosapps/applications/fraginator/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/CM… ============================================================================== --- trunk/rosapps/applications/fraginator/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -1,7 +1,5 @@ set_cpp(WITH_RUNTIME WITH_STL) - -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) list(APPEND SOURCE Fraginator.cpp Added: trunk/rosapps/applications/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/CMakeList… ============================================================================== --- trunk/rosapps/applications/net/CMakeLists.txt (added) +++ trunk/rosapps/applications/net/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -0,0 +1,5 @@ +add_subdirectory(ncftp) +add_subdirectory(netreg) +add_subdirectory(niclist) +add_subdirectory(roshttpd) +add_subdirectory(tditest) Propchange: trunk/rosapps/applications/net/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/net/ncftp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/CMa… ============================================================================== --- trunk/rosapps/applications/net/ncftp/CMakeLists.txt (added) +++ trunk/rosapps/applications/net/ncftp/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -0,0 +1,75 @@ + +list(APPEND SOURCE + sio/PRead.c + sio/PWrite.c + sio/SAcceptA.c + sio/SAcceptS.c + sio/SBind.c + sio/SClose.c + sio/SConnect.c + sio/SConnectByName.c + sio/SNew.c + sio/SRead.c + sio/SReadline.c + sio/SRecv.c + sio/SRecvfrom.c + sio/SRecvmsg.c + sio/SSelect.c + sio/SSend.c + sio/SSendto.c + sio/SSendtoByName.c + sio/SWrite.c + sio/SocketUtil.c + sio/StrAddr.c + sio/UAcceptA.c + sio/UAcceptS.c + sio/UBind.c + sio/UConnect.c + sio/UConnectByName.c + sio/UNew.c + sio/URecvfrom.c + sio/USendto.c + sio/USendtoByName.c + sio/SError.c + sio/SWait.c + sio/main.c + Strn/Dynscat.c + Strn/Strncpy.c + Strn/Strncat.c + Strn/Strntok.c + Strn/Strnpcpy.c + Strn/Strnpcat.c + Strn/strtokc.c + Strn/version.c + libncftp/open.c + libncftp/cmds.c + libncftp/util.c + libncftp/rcmd.c + libncftp/ftp.c + libncftp/io.c + libncftp/errno.c + libncftp/linelist.c + libncftp/glob.c + ncftp/cmds.c + ncftp/cmdlist.c + ncftp/getopt.c + ncftp/ls.c + ncftp/main.c + ncftp/version.c + ncftp/shell.c + ncftp/util.c + ncftp/readln.c + ncftp/progress.c + ncftp/bookmark.c + ncftp/pref.c + ncftp/preffw.c + ncftp/trace.c + ncftp/spool.c + ncftp/log.c + ncftp/getline.c) + +add_executable(ncftp ${SOURCE} ncftp.rc) +set_module_type(ncftp win32cui) +add_target_compile_flags(ncftp "-Wno-unused-but-set-variable -Wno-implicit-function-declaration -Wno-format-extra-args") +add_importlibs(ncftp advapi32 user32 ws2_32 msvcrt kernel32) +add_cd_file(TARGET ncftp DESTINATION reactos FOR all) Propchange: trunk/rosapps/applications/net/ncftp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/net/ncftp/libncftp/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/lib… ============================================================================== --- trunk/rosapps/applications/net/ncftp/libncftp/ftp.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/libncftp/ftp.c [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -10,7 +10,7 @@ char gLibNcFTPVersion[64] = kLibraryVersion; -#ifdef NO_SIGNALS +/* #ifdef NO_SIGNALS static char gNoSignalsMarker[] = "@(#) LibNcFTP - NO_SIGNALS"; #else @@ -19,9 +19,9 @@ static sigjmp_buf gCancelConnectJmp; #else static jmp_buf gCancelConnectJmp; -#endif /* HAVE_SIGSETJMP */ - -#endif /* NO_SIGNALS */ +#endif + +#endif */ #ifndef lint Modified: trunk/rosapps/applications/net/ncftp/libncftp/util.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/lib… ============================================================================== --- trunk/rosapps/applications/net/ncftp/libncftp/util.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/libncftp/util.c [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -13,13 +13,13 @@ #endif -static void * +/* static void * Realloc(void *ptr, size_t siz) { if (ptr == NULL) return (void *) malloc(siz); return ((void *) realloc(ptr, siz)); -} /* Realloc */ +}*/ /* Use getcwd/getwd to get the full path of the current local Modified: trunk/rosapps/applications/net/ncftp/ncftp/cmds.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncf… ============================================================================== --- trunk/rosapps/applications/net/ncftp/ncftp/cmds.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/ncftp/cmds.c [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -1375,7 +1375,7 @@ char options[32]; char option[2]; volatile int listmode; - FILE *volatile stream; + FILE *stream; volatile int paging; #if defined(WIN32) || defined(_WINDOWS) #else @@ -1557,7 +1557,7 @@ char options[32]; char option[2]; volatile int listmode; - FILE *volatile stream; + FILE *stream; volatile int paging; @@ -1703,7 +1703,7 @@ -static void +/* static void Sys(const int argc, const char **const argv, const ArgvInfoPtr aip, const char *syscmd, int noDQuote) { char cmd[256]; @@ -1730,7 +1730,7 @@ Trace(0, "Sys: %s\n", cmd); (void) system(cmd); #endif -} /* Sys */ +}*/ Modified: trunk/rosapps/applications/net/ncftp/ncftp/getline.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncf… ============================================================================== --- trunk/rosapps/applications/net/ncftp/ncftp/getline.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/ncftp/getline.c [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -28,8 +28,8 @@ # include <conio.h> # include <io.h> # include <fcntl.h> -# define strcasecmp stricmp -# define strncasecmp strnicmp +// # define strcasecmp stricmp +// # define strncasecmp strnicmp # define sleep(a) Sleep(a * 1000) # ifndef S_ISREG # define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG) @@ -152,8 +152,8 @@ static const char *gl_prompt; /* to save the prompt string */ static char gl_intrc = 0; /* keyboard SIGINT char */ static char gl_quitc = 0; /* keyboard SIGQUIT char */ -static char gl_suspc = 0; /* keyboard SIGTSTP char */ -static char gl_dsuspc = 0; /* delayed SIGTSTP char */ +// static char gl_suspc = 0; /* keyboard SIGTSTP char */ +// static char gl_dsuspc = 0; /* delayed SIGTSTP char */ static int gl_search_mode = 0; /* search mode flag */ static char **gl_matchlist = 0; static char *gl_home_dir = NULL; Modified: trunk/rosapps/applications/net/ncftp/ncftp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncf… ============================================================================== --- trunk/rosapps/applications/net/ncftp/ncftp/main.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/ncftp/main.c [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -122,7 +122,7 @@ UseTrace(); (void) STRNCPY(gConn.user, "anonymous"); gConn.host[0] = '\0'; - gConn.progress = gProgressMeter; + gConn.progress = NULL; gTransferTypeInitialized = 0; gTransferType = kTypeBinary; gConn.leavePass = 1; /* Don't let the lib zap it. */ Modified: trunk/rosapps/applications/net/ncftp/ncftp/util.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncf… ============================================================================== --- trunk/rosapps/applications/net/ncftp/ncftp/util.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/ncftp/util.c [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -1132,7 +1132,7 @@ NULL ); - if (reason[strlen(reason) - 1] = '\n') + if (reason[strlen(reason) - 1] == '\n') reason[strlen(reason) - 1] = '\0'; (void) fprintf(stderr, "%s: %s\n", errMsg, reason); } /* SysPerror */ Added: trunk/rosapps/applications/net/netreg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/netreg/CM… ============================================================================== --- trunk/rosapps/applications/net/netreg/CMakeLists.txt (added) +++ trunk/rosapps/applications/net/netreg/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -0,0 +1,6 @@ + +set_cpp(WITH_RUNTIME WITH_STL) +add_executable(netreg netreg.cpp netreg.rc) +set_module_type(netreg win32cui) +add_importlibs(netreg advapi32 user32 ws2_32 msvcrt kernel32) +add_cd_file(TARGET netreg DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/net/netreg/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/net/niclist/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/niclist/C… ============================================================================== --- trunk/rosapps/applications/net/niclist/CMakeLists.txt (added) +++ trunk/rosapps/applications/net/niclist/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -0,0 +1,5 @@ + +add_executable(niclist niclist.c niclist.rc) +set_module_type(niclist win32cui) +add_importlibs(niclist user32 msvcrt kernel32) +add_cd_file(TARGET niclist DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/net/niclist/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/net/roshttpd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/roshttpd/… ============================================================================== --- trunk/rosapps/applications/net/roshttpd/CMakeLists.txt (added) +++ trunk/rosapps/applications/net/roshttpd/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -0,0 +1,19 @@ + +set_cpp(WITH_RUNTIME WITH_STL WITH_EXCEPTIONS) +include_directories(BEFORE include) +add_compile_flags("-D__USE_W32_SOCKETS") + +list(APPEND SOURCE + config.cpp + error.cpp + http.cpp + httpd.cpp + roshttpd.cpp + common/list.cpp + common/socket.cpp + common/thread.cpp) + +add_executable(roshttpd ${SOURCE} common/roshttpd.rc) +set_module_type(roshttpd win32cui) +add_importlibs(roshttpd user32 ws2_32 msvcrt kernel32) +add_cd_file(TARGET roshttpd DESTINATION reactos FOR all) Propchange: trunk/rosapps/applications/net/roshttpd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/net/tditest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/tditest/C… ============================================================================== --- trunk/rosapps/applications/net/tditest/CMakeLists.txt (added) +++ trunk/rosapps/applications/net/tditest/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -0,0 +1,7 @@ + +include_directories(include) +add_executable(tditest tditest/tditest.c tditest.rc) +set_module_type(tditest kernelmodedriver) +target_link_libraries(tditest ${PSEH_LIB}) +add_importlibs(tditest ntoskrnl hal) +add_cd_file(TARGET tditest DESTINATION reactos/system32/drivers FOR all) Propchange: trunk/rosapps/applications/net/tditest/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 67418: [PSDK] Add missing InitializeSListHead declaration to winbase.h. Fixes amd64 build.
by tkreuzer＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: tkreuzer Date: Sat Apr 25 17:09:36 2015 New Revision: 67418 URL: http://svn.reactos.org/svn/reactos?rev=67418&view=rev Log: [PSDK] Add missing InitializeSListHead declaration to winbase.h. Fixes amd64 build. Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sat Apr 25 17:09:36 2015 @@ -3651,6 +3651,12 @@ _Inout_opt_ PVOID Parameter, _Outptr_opt_result_maybenull_ LPVOID *Context); +WINBASEAPI +VOID +WINAPI +InitializeSListHead( + _Out_ PSLIST_HEADER ListHead); + #ifdef _MSC_VER #pragma warning(pop) #endif

1 0

[akhaldi] 67417: [NETCFGX] Improve IDC_DNSADDRLIST and IDC_DNSSUFFIXLIST listboxes so they don't overlap with the buttons below them. By Joachim Henze. CORE-9575
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 16:31:56 2015 New Revision: 67417 URL: http://svn.reactos.org/svn/reactos?rev=67417&view=rev Log: [NETCFGX] Improve IDC_DNSADDRLIST and IDC_DNSSUFFIXLIST listboxes so they don't overlap with the buttons below them. By Joachim Henze. CORE-9575 Modified: trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc trunk/reactos/dll/win32/netcfgx/lang/en-US.rc trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc trunk/reactos/dll/win32/netcfgx/lang/sq-AL.rc trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc Modified: trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "ÐÐ´ÑÐµÑÐ¸ Ð½Ð° DNS, Ð¿Ð¾ ÑÐµÐ´Ð° Ð½Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ:", -1, 5, 5, 180, 12 PUSHBUTTON "ÐÐ°Ð³Ð¾ÑÐµ", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "ÐÐ°Ð´Ð¾Ð»Ñ", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "ÐÐ°ÑÑÐ°Ð²ÑÐ½Ðµ Ð½Ð° &Ð¿ÑÑÐ²Ð¸ÑÐ½Ð¸ÑÐµ Ð¸ Ð¾Ð±Ð¾ÑÐ¾Ð±ÐµÐ½Ð¸ÑÐµ Ð·Ð° Ð²ÑÑÐ·ÐºÐ¸ÑÐµ DNS Ð½Ð°ÑÑÐ°Ð²ÐºÐ¸", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "ÐÐ°ÑÑÐ°Ð²ÑÐ½Ðµ Ð½Ð° ÑÐ¾Ð´Ð¸ÑÐµÐ»ÑÐºÐ¸ÑÐµ Ð½Ð°&ÑÑÐ°Ð²ÐºÐ¸ ÐºÑÐ¼ Ð¿ÑÑÐ²Ð¸ÑÐ½Ð°ÑÐ° DNS Ð½Ð°ÑÑÐ°Ð²ÐºÐ°", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "ÐÐ¾Ð±Ð°Ð²ÑÐ½Ðµ Ð½Ð° &ÑÐµÐ·Ð¸ DNS Ð½Ð°ÑÑÐ°Ð²ÐºÐ¸ (Ð¿Ð¾Ð´ÑÐµÐ´):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "ÐÐ°Ð³Ð¾ÑÐµ", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "ÐÐ°Ð´Ð¾Ð»Ñ", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "&ÐÐ¾Ð±Ð°Ð²ÑÐ½Ðµ...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -78,7 +78,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "&Adresy DNS serverÅ¯ v poÅadÃ vyuÅ¾itÃ:", -1, 5, 5, 180, 12 PUSHBUTTON "Nahoru", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "DolÅ¯", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -89,7 +89,7 @@ CONTROL "PÅipojit p&rimÃ¡rnÃ a pÅipojenÃm danÃ© DNS pÅÃpony", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "PÅipojit rodiÄovskÃ© pÅÃpony primÃ¡rnÃ DNS pÅÃpony", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "PÅipojit &tyto DNS pÅÃpony (v tomto poÅadÃ):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "Nahoru", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "DolÅ¯", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "&PÅidat...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY LTEXT "D&NS-Serveradressen in Verwendungsreihenfolge", -1, 5, 5, 180, 12 PUSHBUTTON "AufwÃ¤rts", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "AbwÃ¤rts", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "PrimÃ¤re und verbindungspezifische DNS-Suffixe anhÃ¤ngen:", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 180, 12 CHECKBOX "Ãbergeor&dnete Suffixe des primÃ¤ren DNS-Suffixes anhÃ¤ngen", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "PrimÃ¤re und verbindungspezifische DNS-Suffixe anhÃ¤ngen:", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "AufwÃ¤rts", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "AbwÃ¤rts", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "HinzufÃ¼gen...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/en-US.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "Direcciones de servidores DNS, por orden de utili&zaciÃ³n:", -1, 5, 5, 180, 12 PUSHBUTTON "Subir", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "Bajar", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "Anexar sufijos DNS principa&les y de conexiones especÃficas", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 210, 12 CHECKBOX "Anexar sufijos primarios del su&fijo DNS principal", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "A&nexar estos sufijos DNS (en este orden):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "Subir", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Bajar", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Ag&regar...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "Adresses des serveurs DNS, dans l'ordre d'utilisation:", -1, 5, 5, 180, 12 PUSHBUTTON "Monter", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "Descendre", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "Ajouter des suffixes DNS primaires et spÃ©cifiques aux connexions", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Ajouter des suffixes parents du suffixe DNS primaire", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Ajouter ces suffixes DNS (dans l'ordre) :", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "Monter", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Descendre", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Ajouter...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 PUSHBUTTON "××× ×××¢××", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "××× ××××", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "××× ×××¢××", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "××× ×××¢××", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "×××¡×£...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/id-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "Indirizzi D&NS server in ordine di utilizzo:", -1, 5, 5, 180, 12 PUSHBUTTON "&Su", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "&GiÃ¹", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "Aggiungere suffissi DNS principali e specifici della connessione", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Aggiungere questi suffissi DNS(in ordine):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "Su", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "GiÃ¹", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "&Aggiungi...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 9, "MS UI Gothic" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "D&NS server addresser, i system etter bruk:", -1, 5, 5, 180, 12 PUSHBUTTON "Opp", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "Ned", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "Legg til &primÃ¦r og tilkobling spesifikt DNS suffikser", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Legg til forelder suffi&kser for primÃ¦r DNS suffikser", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Vis d&isse DNS suffikser(i system):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "Opp", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Ned", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "&Legg til...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -79,7 +79,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "Adresy serwerÄÅw D&NS wedÄ¹âug kolejnoÄ¹âºci uÄ¹Ä½ywania:", -1, 5, 5, 180, 12 PUSHBUTTON "W gÄÅrÃâ¢", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "W dÄÅÄ¹â", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -90,7 +90,7 @@ CONTROL "D&oÄ¹âÃâ¦cz sufiksy DNS: podstawowy i konkretnego poÄ¹âÃâ¦czenia", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "DoÄ¹âÃâ¦cz su&fiksy nadrzÃâ¢dne podstawowego sufiksu DNS", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "DoÄ¹âÃâ¦&cz poniÄ¹Ä½sze sufiksy DNS (w podanej kolejnoÄ¹âºci):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "W gÄÅrÃâ¢", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "W dÄÅÄ¹â", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Dod&aj...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -79,7 +79,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 55, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "Adrese de ser&vere DNS, Ã®n ordinea utilizÄrii:", -1, 5, 5, 180, 12 PUSHBUTTON "&Sus", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP PUSHBUTTON "&Jos", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "&ÐÐ´ÑÐµÑÐ° DNS-ÑÐµÑÐ²ÐµÑÐ¾Ð², Ð² Ð¿Ð¾ÑÑÐ´ÐºÐµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ:", -1, 5, 5, 180, 10 PUSHBUTTON "ÐÐ²ÐµÑÑ", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "ÐÐ½Ð¸Ð·", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "ÐÐ¾Ð¿Ð¸ÑÑÐ²Ð°ÑÑ &Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ DNS-ÑÑÑÑÐ¸ÐºÑ Ð¸ ÑÑÑÑÐ¸ÐºÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 234, 12 CHECKBOX "ÐÐ¾Ð¿Ð¸ÑÑÐ²Ð°ÑÑ ÑÐ¾Ð´Ð¸&ÑÐµÐ»ÑÑÐºÐ¸Ðµ ÑÑÑÑÐ¸ÐºÑÑ Ð¾ÑÐ½. DNS-ÑÑÑÑÐ¸ÐºÑÐ°", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "ÐÐ¾Ð¿Ð¸ÑÑÐ²Ð°ÑÑ ÑÐ»&ÐµÐ´ÑÑÑÐ¸Ðµ DNS-ÑÑÑÑÐ¸ÐºÑÑ (Ð¿Ð¾ Ð¿Ð¾ÑÑÐ´ÐºÑ):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 206, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "ÐÐ²ÐµÑÑ", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "ÐÐ½Ð¸Ð·", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "ÐÐ¾&Ð±Ð°Ð²Ð¸ÑÑ...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/sq-AL.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -77,7 +77,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "Adresa D&NS server, nÃ« rend pÃ«rdorimi:", -1, 5, 5, 180, 12 PUSHBUTTON "Lart", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "PoshtÃ«", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -88,7 +88,7 @@ CONTROL "Shto lidhjen primare dhe specifike suffixes pÃ«r DNS'nÃ«", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Shto prindin prapashtesÃ« tÃ« primarit DNS", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Shto kÃ«to DNS suffixes(nÃ« rend):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "Lart", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "PoshtÃ«", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "&Shto...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -74,7 +74,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "&Kullanmak iÃ§in DNS sunucusu adresleri:", -1, 5, 5, 180, 12 PUSHBUTTON "YukarÄ±", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "AÅaÄÄ±", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -85,7 +85,7 @@ CONTROL "&Birinci ve BaÄlantÄ±ya ÃzgÃ¼ DNS Son Eklerini Ekle", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Bi&rinci DNS Son Ekinin Ana Son Eklerini Ekle", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Di&ziyle Åu DNS Son Eklerini Ekle:", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "YukarÄ±", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "AÅaÄÄ±", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Ek&le...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -72,7 +72,7 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "ÐÐ´ÑÐµÑÐ¸ D&NS ÑÐµÑÐ²ÐµÑÑÐ² Ð² Ð¿Ð¾ÑÑÐ´ÐºÑ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ:", -1, 5, 5, 180, 12 PUSHBUTTON "ÐÐ²ÐµÑÑ", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "ÐÐ½Ð¸Ð·", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "ÐÐ¾Ð´Ð°Ð²Ð°ÑÐ¸ &Ð¾ÑÐ½Ð¾Ð²Ð½Ð¸Ð¹ DNS-ÑÑÑÑÐºÑ Ñ ÑÑÑÑÐºÑ Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½Ñ", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 190, 12 CHECKBOX "ÐÐ¾Ð´Ð°Ð²Ð°ÑÐ¸ &Ð±Ð°ÑÑÐºÑÐ²ÑÑÐºÑ ÑÑÑÑÐºÑÐ¸ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð³Ð¾ DNS-ÑÑÑÑÐºÑÐ°", IDC_TOPPRIMSUFFIX, 15, 125, 194, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "ÐÐ¾Ð´Ð°Ð²Ð°ÑÐ¸ &Ð½Ð°ÑÑÑÐ¿Ð½Ñ DNS-ÑÑÑÑÐºÑÐ¸ (Ð¿Ð¾ Ð¿Ð¾ÑÑÐ´ÐºÑ):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "ÐÐ²ÐµÑÑ", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "ÐÐ½Ð¸Ð·", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "&ÐÐ¾Ð´Ð°ÑÐ¸...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc [iso-8859-1] Sat Apr 25 16:31:56 2015 @@ -80,7 +80,7 @@ CAPTION "DNS" FONT 9, "MS Shell Dlg" BEGIN - LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 50, LBS_NOTIFY LTEXT "DNS æå¡å¨å°å,æä½¿ç¨é¡ºåºæå(&N):", -1, 5, 5, 180, 12 PUSHBUTTON "åä¸", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "åä¸", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP @@ -91,7 +91,7 @@ CONTROL "éå ä¸»è¦çåè¿æ¥ç¹å®ç DNS åç¼(&P)", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "éå ä¸» DNS åç¼çç¶åç¼(&X)", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "éå è¿äº DNS åç¼ (æé¡ºåº)(&H):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 - LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY PUSHBUTTON "ä¸", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "ä¸", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP PUSHBUTTON "æ·»å ...(&A)", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP

1 0

[aandrejevic] 67416: [NTVDM] Fix INT 21h, AH = 29h to stop scanning the filename when it encounters a space.
by aandrejevic＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: aandrejevic Date: Sat Apr 25 16:20:39 2015 New Revision: 67416 URL: http://svn.reactos.org/svn/reactos?rev=67416&view=rev Log: [NTVDM] Fix INT 21h, AH = 29h to stop scanning the filename when it encounters a space. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sat Apr 25 16:20:39 2015 @@ -1794,7 +1794,7 @@ /* Parse the file name */ i = 0; - while ((*FileName >= 0x20) && (i < 8)) + while ((*FileName > 0x20) && (i < 8)) { if (*FileName == '.') break; else if (*FileName == '*') @@ -1813,14 +1813,14 @@ } /* Skip to the extension part */ - while (*FileName >= 0x20 && *FileName != '.') FileName++; + while (*FileName > 0x20 && *FileName != '.') FileName++; if (*FileName == '.') FileName++; /* Now parse the extension */ i = 0; FillChar = ' '; - while ((*FileName >= 0x20) && (i < 3)) + while ((*FileName > 0x20) && (i < 3)) { if (*FileName == '*') {

1 0

[tfaber] 67415: [NTOS:CM] - Fix an ASSERT CORE-6976
by tfaber＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: tfaber Date: Sat Apr 25 15:18:37 2015 New Revision: 67415 URL: http://svn.reactos.org/svn/reactos?rev=67415&view=rev Log: [NTOS:CM] - Fix an ASSERT CORE-6976 Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Sat Apr 25 15:18:37 2015 @@ -606,7 +606,7 @@ } /* Copy the class data */ - NT_ASSERT(Length > Offset); + NT_ASSERT(Length >= Offset); RtlCopyMemory(Info->KeyFullInformation.Class, ClassData, min(Node->ClassLength, Length - Offset));

1 0

[tfaber] 67414: [NTDLL_APITEST] - Add a test for NtQueryKey(KeyFullInformation) CORE-6976
by tfaber＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: tfaber Date: Sat Apr 25 15:05:36 2015 New Revision: 67414 URL: http://svn.reactos.org/svn/reactos?rev=67414&view=rev Log: [NTDLL_APITEST] - Add a test for NtQueryKey(KeyFullInformation) CORE-6976 Modified: trunk/rostests/apitests/ntdll/NtQueryKey.c Modified: trunk/rostests/apitests/ntdll/NtQueryKey.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtQueryKey… ============================================================================== --- trunk/rostests/apitests/ntdll/NtQueryKey.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtQueryKey.c [iso-8859-1] Sat Apr 25 15:05:36 2015 @@ -3,6 +3,7 @@ * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Tests for the NtQueryKey API * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + * Thomas Faber <thomas.faber(a)reactos.org> */ #include <apitest.h> @@ -12,6 +13,181 @@ #include <ndk/cmfuncs.h> #include <ndk/cmtypes.h> #include <ndk/obfuncs.h> + +static +void +Test_KeyFullInformation(void) +{ + UNICODE_STRING HKLM_Name = RTL_CONSTANT_STRING(L"\\Registry\\Machine"); + UNICODE_STRING Software_Name = RTL_CONSTANT_STRING(L"Software"); + UNICODE_STRING Test_Name = RTL_CONSTANT_STRING(L"NtQueryKey_apitest"); + UNICODE_STRING MyClass = RTL_CONSTANT_STRING(L"MyClass"); + HANDLE HKLM_Key, HKLM_Software_Key, Test_Key; + ULONG FullInformationLength; + PKEY_FULL_INFORMATION FullInformation; + ULONG InfoLength; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + + FullInformationLength = FIELD_OFFSET(KEY_FULL_INFORMATION, Class[100]); + FullInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, FullInformationLength); + if (!FullInformation) + { + skip("Out of memory\n"); + return; + } + + InitializeObjectAttributes(&ObjectAttributes, + &HKLM_Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&HKLM_Key, KEY_READ, &ObjectAttributes); + ok_ntstatus(Status, STATUS_SUCCESS); + + InfoLength = 0x55555555; + Status = NtQueryKey(HKLM_Key, KeyFullInformation, NULL, 0, &InfoLength); + ok(Status == STATUS_BUFFER_TOO_SMALL, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "InfoLength = %lu\n", InfoLength); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(HKLM_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class), &InfoLength); + ok(Status == STATUS_SUCCESS, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart != 0x5555555555555555, "LastWriteTime unchanged\n"); + ok(FullInformation->TitleIndex == 0, "TitleIndex = %lu\n", FullInformation->TitleIndex); + ok(FullInformation->ClassOffset == 0xffffffff, "ClassOffset = %lu\n", FullInformation->ClassOffset); + ok(FullInformation->ClassLength == 0, "ClassLength = %lu\n", FullInformation->ClassLength); + ok(FullInformation->SubKeys >= 5 && FullInformation->SubKeys < 20, "SubKeys = %lu\n", FullInformation->SubKeys); + ok(FullInformation->MaxNameLen >= 8 * sizeof(WCHAR) && FullInformation->MaxNameLen < 100 * sizeof(WCHAR), "MaxNameLen = %lu\n", FullInformation->MaxNameLen); + ok(FullInformation->MaxClassLen != 0x55555555 && FullInformation->MaxClassLen % sizeof(WCHAR) == 0, "MaxClassLen = %lu\n", FullInformation->MaxClassLen); + ok(FullInformation->Values != 0x55555555, "Values = %lu\n", FullInformation->Values); + ok(FullInformation->MaxValueNameLen != 0x55555555 && FullInformation->MaxValueNameLen % sizeof(WCHAR) == 0, "MaxValueNameLen = %lu\n", FullInformation->MaxValueNameLen); + ok(FullInformation->MaxValueDataLen != 0x55555555, "MaxValueDataLen = %lu\n", FullInformation->MaxValueDataLen); + ok(FullInformation->Class[0] == 0x5555, "Class[0] = %u\n", FullInformation->Class[0]); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(HKLM_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class) - 1, &InfoLength); + ok(Status == STATUS_BUFFER_TOO_SMALL, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart == 0x5555555555555555, "LastWriteTime changed: %I64d\n", FullInformation->LastWriteTime.QuadPart); + + InitializeObjectAttributes(&ObjectAttributes, + &Software_Name, + OBJ_CASE_INSENSITIVE, + HKLM_Key, + NULL); + Status = NtOpenKey(&HKLM_Software_Key, KEY_READ, &ObjectAttributes); + ok_ntstatus(Status, STATUS_SUCCESS); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(HKLM_Software_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class), &InfoLength); + ok(Status == STATUS_SUCCESS, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart != 0x5555555555555555, "LastWriteTime unchanged\n"); + ok(FullInformation->TitleIndex == 0, "TitleIndex = %lu\n", FullInformation->TitleIndex); + ok(FullInformation->ClassOffset == 0xffffffff, "ClassOffset = %lu\n", FullInformation->ClassOffset); + ok(FullInformation->ClassLength == 0, "ClassLength = %lu\n", FullInformation->ClassLength); + ok(FullInformation->SubKeys >= 5 && FullInformation->SubKeys < 1000, "SubKeys = %lu\n", FullInformation->SubKeys); + ok(FullInformation->MaxNameLen >= 8 * sizeof(WCHAR), "MaxNameLen = %lu\n", FullInformation->MaxNameLen); + ok(FullInformation->MaxClassLen != 0x55555555 && FullInformation->MaxClassLen % sizeof(WCHAR) == 0, "MaxClassLen = %lu\n", FullInformation->MaxClassLen); + ok(FullInformation->Values != 0x55555555, "Values = %lu\n", FullInformation->Values); + ok(FullInformation->MaxValueNameLen != 0x55555555 && FullInformation->MaxValueNameLen % sizeof(WCHAR) == 0, "MaxValueNameLen = %lu\n", FullInformation->MaxValueNameLen); + ok(FullInformation->MaxValueDataLen != 0x55555555, "MaxValueDataLen = %lu\n", FullInformation->MaxValueDataLen); + ok(FullInformation->Class[0] == 0x5555, "Class[0] = %u\n", FullInformation->Class[0]); + + InitializeObjectAttributes(&ObjectAttributes, + &Test_Name, + OBJ_CASE_INSENSITIVE, + HKLM_Software_Key, + NULL); + Status = NtCreateKey(&Test_Key, KEY_ALL_ACCESS, &ObjectAttributes, 0, &MyClass, REG_OPTION_VOLATILE, NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + + InfoLength = 0x55555555; + Status = NtQueryKey(Test_Key, KeyFullInformation, NULL, 0, &InfoLength); + ok(Status == STATUS_BUFFER_TOO_SMALL, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length, "InfoLength = %lu\n", InfoLength); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(Test_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class), &InfoLength); + ok(Status == STATUS_BUFFER_OVERFLOW, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length, "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart != 0x5555555555555555, "LastWriteTime unchanged\n"); + ok(FullInformation->TitleIndex == 0, "TitleIndex = %lu\n", FullInformation->TitleIndex); + ok(FullInformation->ClassOffset == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "ClassOffset = %lu\n", FullInformation->ClassOffset); + ok(FullInformation->ClassLength == MyClass.Length, "ClassLength = %lu\n", FullInformation->ClassLength); + ok(FullInformation->SubKeys == 0, "SubKeys = %lu\n", FullInformation->SubKeys); + ok(FullInformation->MaxNameLen == 0, "MaxNameLen = %lu\n", FullInformation->MaxNameLen); + ok(FullInformation->MaxClassLen == 0, "MaxClassLen = %lu\n", FullInformation->MaxClassLen); + ok(FullInformation->Values == 0, "Values = %lu\n", FullInformation->Values); + ok(FullInformation->MaxValueNameLen == 0, "MaxValueNameLen = %lu\n", FullInformation->MaxValueNameLen); + ok(FullInformation->MaxValueDataLen == 0, "MaxValueDataLen = %lu\n", FullInformation->MaxValueDataLen); + ok(FullInformation->Class[0] == 0x5555, "Class[0] = %u\n", FullInformation->Class[0]); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(Test_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class[1]), &InfoLength); + ok(Status == STATUS_BUFFER_OVERFLOW, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length, "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart != 0x5555555555555555, "LastWriteTime unchanged\n"); + ok(FullInformation->ClassOffset == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "ClassOffset = %lu\n", FullInformation->ClassOffset); + ok(FullInformation->ClassLength == MyClass.Length, "ClassLength = %lu\n", FullInformation->ClassLength); + ok(FullInformation->Class[0] == L'M', "Class[0] = %u\n", FullInformation->Class[0]); + ok(FullInformation->Class[1] == 0x5555, "Class[1] = %u\n", FullInformation->Class[1]); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(Test_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length - 1, &InfoLength); + ok(Status == STATUS_BUFFER_OVERFLOW, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length, "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart != 0x5555555555555555, "LastWriteTime unchanged\n"); + ok(FullInformation->ClassOffset == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "ClassOffset = %lu\n", FullInformation->ClassOffset); + ok(FullInformation->ClassLength == MyClass.Length, "ClassLength = %lu\n", FullInformation->ClassLength); + ok(FullInformation->Class[0] == L'M', "Class[0] = %u\n", FullInformation->Class[0]); + ok(FullInformation->Class[1] == L'y', "Class[1] = %u\n", FullInformation->Class[1]); + ok(FullInformation->Class[6] == (L's' | 0x5500), "Class[6] = %u\n", FullInformation->Class[6]); + ok(FullInformation->Class[7] == 0x5555, "Class[7] = %u\n", FullInformation->Class[7]); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(Test_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length, &InfoLength); + ok(Status == STATUS_SUCCESS, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length, "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart != 0x5555555555555555, "LastWriteTime unchanged\n"); + ok(FullInformation->ClassOffset == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "ClassOffset = %lu\n", FullInformation->ClassOffset); + ok(FullInformation->ClassLength == MyClass.Length, "ClassLength = %lu\n", FullInformation->ClassLength); + ok(FullInformation->Class[0] == L'M', "Class[0] = %u\n", FullInformation->Class[0]); + ok(FullInformation->Class[1] == L'y', "Class[1] = %u\n", FullInformation->Class[1]); + ok(FullInformation->Class[6] == L's', "Class[6] = %u\n", FullInformation->Class[6]); + ok(FullInformation->Class[7] == 0x5555, "Class[7] = %u\n", FullInformation->Class[7]); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(Test_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length + sizeof(UNICODE_NULL), &InfoLength); + ok(Status == STATUS_SUCCESS, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length, "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart != 0x5555555555555555, "LastWriteTime unchanged\n"); + ok(FullInformation->ClassOffset == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "ClassOffset = %lu\n", FullInformation->ClassOffset); + ok(FullInformation->ClassLength == MyClass.Length, "ClassLength = %lu\n", FullInformation->ClassLength); + ok(FullInformation->Class[0] == L'M', "Class[0] = %u\n", FullInformation->Class[0]); + ok(FullInformation->Class[1] == L'y', "Class[1] = %u\n", FullInformation->Class[1]); + ok(FullInformation->Class[6] == L's', "Class[6] = %u\n", FullInformation->Class[6]); + ok(FullInformation->Class[7] == 0x5555, "Class[7] = %u\n", FullInformation->Class[7]); + + RtlFreeHeap(RtlGetProcessHeap(), 0, FullInformation); + + Status = NtDeleteKey(Test_Key); + ok_ntstatus(Status, STATUS_SUCCESS); + + NtClose(Test_Key); + NtClose(HKLM_Software_Key); + NtClose(HKLM_Key); +} static void @@ -44,7 +220,11 @@ /* Get it for real */ NameInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, InfoLength); - ok(NameInformation != NULL, "\n"); + if (!NameInformation) + { + skip("Out of memory\n"); + return; + } Status = NtQueryKey(HKLM_Key, KeyNameInformation, NameInformation, InfoLength, &InfoLength); ok_ntstatus(Status, STATUS_SUCCESS); @@ -97,5 +277,6 @@ START_TEST(NtQueryKey) { + Test_KeyFullInformation(); Test_KeyNameInformation(); }

1 0

[akhaldi] 67413: [PSDK] Update wbemdisp.idl. CORE-9246
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 13:16:43 2015 New Revision: 67413 URL: http://svn.reactos.org/svn/reactos?rev=67413&view=rev Log: [PSDK] Update wbemdisp.idl. CORE-9246 Modified: trunk/reactos/include/psdk/wbemdisp.idl Modified: trunk/reactos/include/psdk/wbemdisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wbemdisp.idl?… ============================================================================== --- trunk/reactos/include/psdk/wbemdisp.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wbemdisp.idl [iso-8859-1] Sat Apr 25 13:16:43 2015 @@ -53,6 +53,85 @@ interface ISWbemSecurity; interface ISWbemServices; +typedef +[ + v1_enum, + uuid(bf078c2a-07d9-11d2-8b21-00600806d9b6) +] +enum WbemTimeout +{ + wbemTimeoutInfinite = 0xffffffff +} WbemTimeout; + +typedef +[ + v1_enum, + uuid(4a249b72-fc9a-11d1-8b1e-00600806d9b6) +] +enum WbemChangeFlagEnum +{ + wbemChangeFlagCreateOrUpdate = 0, + wbemChangeFlagUpdateOnly = 0x00000001, + wbemChangeFlagCreateOnly = 0x00000002, + wbemChangeFlagUpdateCompatible = 0x00000000, + wbemChangeFlagUpdateSafeMode = 0x00000020, + wbemChangeFlagUpdateForceMode = 0x00000040, + wbemChangeFlagStrongValidation = 0x00000080, + wbemChangeFlagAdvisory = 0x00010000 +} WbemChangeFlagEnum; + +typedef +[ + v1_enum, + uuid(4a249b73-fc9a-11d1-8b1e-00600806d9b6) +] +enum WbemFlagEnum +{ + wbemFlagReturnImmediately = 0x00010, + wbemFlagReturnWhenComplete = 0, + wbemFlagBidirectional = 0, + wbemFlagForwardOnly = 0x00020, + wbemFlagNoErrorObject = 0x00040, + wbemFlagReturnErrorObject = 0, + wbemFlagSendStatus = 0x00080, + wbemFlagDontSendStatus = 0, + wbemFlagEnsureLocatable = 0x00100, + wbemFlagDirectRead = 0x00200, + wbemFlagSendOnlySelected = 0, + wbemFlagUseAmendedQualifiers = 0x20000, + wbemFlagGetDefault = 0x0, + wbemFlagSpawnInstance = 0x00001, + wbemFlagUseCurrentTime = 0x00001 +} WbemFlagEnum; + +typedef +[ + v1_enum, + uuid(4a249b76-fc9a-11d1-8b1e-00600806d9b6) +] +enum WbemQueryFlagEnum +{ + wbemQueryFlagDeep, + wbemQueryFlagShallow, + wbemQueryFlagPrototype +} WbemQueryFlagEnum; + +typedef +[ + v1_enum, + uuid(4A249B79-FC9A-11d1-8B1E-00600806D9B6) +] +enum WbemComparisonFlagEnum +{ + wbemComparisonFlagIncludeAll = 0, + wbemComparisonFlagIgnoreQualifiers = 1, + wbemComparisonFlagIgnoreObjectSource = 2, + wbemComparisonFlagIgnoreDefaultValues = 4, + wbemComparisonFlagIgnoreClass = 8, + wbemComparisonFlagIgnoreCase = 16, + wbemComparisonFlagIgnoreFlavor = 32 +} WbemComparisonFlagEnum; + [ object, local, @@ -66,7 +145,7 @@ { [ id(1) ] HRESULT NextEvent( - [in] long iTimeoutMs, + [in, defaultvalue(wbemTimeoutInfinite)] long iTimeoutMs, [out, retval] ISWbemObject **objWbemObject); [ id(2), propget ] @@ -87,19 +166,18 @@ { [ id(1) ] HRESULT ConnectServer( - [in] BSTR strServer, - [in] BSTR strNamespace, - [in] BSTR strUser, - [in] BSTR strPassword, - [in] BSTR strLocale, - [in] BSTR strAuthority, - [in] long iSecurityFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(".")] BSTR strServer, + [in, defaultvalue("")] BSTR strNamespace, + [in, defaultvalue("")] BSTR strUser, + [in, defaultvalue("")] BSTR strPassword, + [in, defaultvalue("")] BSTR strLocale, + [in, defaultvalue("")] BSTR strAuthority, + [in, defaultvalue(0)] long iSecurityFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemServices **objWbemServices); [ id(2), propget ] - HRESULT Security_( - ISWbemSecurity **objWbemSecurity); + HRESULT Security_([out, retval] ISWbemSecurity **objWbemSecurity); }; [ @@ -153,7 +231,7 @@ [ id(DISPID_VALUE) ] HRESULT Item( [in] BSTR strName, - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemMethod **objWbemMethod); [ id(1), propget ] @@ -201,7 +279,7 @@ [ id(DISPID_VALUE) ] HRESULT Item( [in] BSTR strName, - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemNamedValue **objWbemNamedValue); [ id(1), propget ] @@ -212,13 +290,13 @@ HRESULT Add( [in] BSTR strName, [in] VARIANT *varValue, - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemNamedValue **objWbemNamedValue); [ id(3) ] HRESULT Remove( [in] BSTR strName, - [in] long iFlags); + [in, defaultvalue(0)] long iFlags); [ id(4) ] HRESULT Clone( @@ -240,123 +318,123 @@ { [ id(1) ] HRESULT Put_( - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(wbemChangeFlagCreateOrUpdate)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectPath **objWbemObjectPath); [ id(2) ] HRESULT PutAsync_( [in] IDispatch *objWbemSink, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(wbemChangeFlagCreateOrUpdate)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id (3) ] HRESULT Delete_( - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet); + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet); [ id (4) ] HRESULT DeleteAsync_( [in] IDispatch *objWbemSink, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(5) ] HRESULT Instances_( - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(wbemFlagReturnImmediately)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(6) ] HRESULT InstancesAsync_( [in] IDispatch *objWbemSink, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(7) ] HRESULT Subclasses_( - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(wbemFlagReturnImmediately|wbemQueryFlagDeep)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(8) ] HRESULT SubclassesAsync_( [in] IDispatch *objWbemSink, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(wbemQueryFlagDeep)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(9) ] HRESULT Associators_( - [in] BSTR strAssocClass, - [in] BSTR strResultClass, - [in] BSTR strResultRole, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredAssocQualifier, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("")] BSTR strAssocClass, + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strResultRole, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredAssocQualifier, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(wbemFlagReturnImmediately)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(10) ] HRESULT AssociatorsAsync_( [in] IDispatch *objWbemSink, - [in] BSTR strAssocClass, - [in] BSTR strResultClass, - [in] BSTR strResultRole, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredAssocQualifier, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("")] BSTR strAssocClass, + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strResultRole, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredAssocQualifier, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(11) ] HRESULT References_( - [in] BSTR strResultClass, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(wbemFlagReturnImmediately)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(12) ] HRESULT ReferencesAsync_( [in] IDispatch *objWbemSink, - [in] BSTR strResultClass, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(13) ] HRESULT ExecMethod_( [in] BSTR strMethodName, - [in] IDispatch *objWbemInParameters, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemInParameters, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObject **objWbemOutParameters); [ id(14) ] HRESULT ExecMethodAsync_( [in] IDispatch *objWbemSink, [in] BSTR strMethodName, - [in] IDispatch *objWbemInParameters, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(0)] IDispatch *objWbemInParameters, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(15) ] HRESULT Clone_( @@ -364,23 +442,23 @@ [ id(16) ] HRESULT GetObjectText_( - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] BSTR *strObjectText); [ id(17) ] HRESULT SpawnDerivedClass_( - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemObject **objWbemObject); [ id(18) ] HRESULT SpawnInstance_( - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemObject **objWbemObject); [ id(19) ] HRESULT CompareTo_( [in] IDispatch *objWbemObject, - [in] long iFlags, + [in, defaultvalue(wbemComparisonFlagIncludeAll)] long iFlags, [out, retval] VARIANT_BOOL *bResult); [ id(20), propget ] @@ -528,7 +606,7 @@ [ id(DISPID_VALUE) ] HRESULT Item( [in] BSTR strObjectPath, - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemObject **objWbemObject); [ id(1), propget ] @@ -640,7 +718,7 @@ [ id(2) ] HRESULT Add( [in] WbemPrivilegeEnum iPrivilege, - [in] VARIANT_BOOL bIsEnabled, + [in, defaultvalue(TRUE)] VARIANT_BOOL bIsEnabled, [out, retval] ISWbemPrivilege **objWbemPrivilege); [ id(3) ] @@ -653,7 +731,7 @@ [ id(5) ] HRESULT AddAsString( [in] BSTR strPrivilege, - [in] VARIANT_BOOL bIsEnabled, + [in, defaultvalue(TRUE)] VARIANT_BOOL bIsEnabled, [out, retval] ISWbemPrivilege **objWbemPrivilege); }; @@ -743,7 +821,7 @@ [ id(DISPID_VALUE) ] HRESULT Item( [in] BSTR strName, - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemProperty **objWbemProperty); [ id(1), propget ] @@ -754,14 +832,14 @@ HRESULT Add( [in] BSTR strName, [in] WbemCimtypeEnum iCIMType, - [in] VARIANT_BOOL bIsArray, - [in] long iFlags, + [in, defaultvalue(FALSE)] VARIANT_BOOL bIsArray, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemProperty **objWbemProperty); [ id(3) ] HRESULT Remove( [in] BSTR strName, - [in] long iFlags); + [in, defaultvalue(0)] long iFlags); }; [ @@ -839,7 +917,7 @@ [ id(DISPID_VALUE) ] HRESULT Item( [in] BSTR name, - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemQualifier **objWbemQualifier); [ id(1), propget ] @@ -850,16 +928,16 @@ HRESULT Add( [in] BSTR strName, [in] VARIANT *varVal, - [in] VARIANT_BOOL bPropagatesToSubclass, - [in] VARIANT_BOOL bPropagatesToInstance, - [in] VARIANT_BOOL bIsOverridable, - [in] long iFlags, + [in, defaultvalue(TRUE)] VARIANT_BOOL bPropagatesToSubclass, + [in, defaultvalue(TRUE)] VARIANT_BOOL bPropagatesToInstance, + [in, defaultvalue(TRUE)] VARIANT_BOOL bIsOverridable, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemQualifier **objWbemQualifier); [ id(3) ] HRESULT Remove( [in] BSTR strName, - [in] long iFlags); + [in, defaultvalue(0)] long iFlags); }; typedef @@ -936,160 +1014,160 @@ { [ id(1) ] HRESULT Get( - [in] BSTR strObjectPath, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("")] BSTR strObjectPath, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObject **objWbemObject); [ id(2) ] HRESULT GetAsync( [in] IDispatch *objWbemSink, - [in] BSTR strObjectPath, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("")] BSTR strObjectPath, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(3) ] HRESULT Delete( [in] BSTR strObjectPath, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet); + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet); [ id(4) ] HRESULT DeleteAsync( [in] IDispatch *objWbemSink, [in] BSTR strObjectPath, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(5) ] HRESULT InstancesOf( [in] BSTR strClass, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(wbemFlagReturnImmediately)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(6) ] HRESULT InstancesOfAsync( [in] IDispatch *objWbemSink, [in] BSTR strClass, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(7) ] HRESULT SubclassesOf( - [in] BSTR strSuperclass, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("")] BSTR strSuperclass, + [in, defaultvalue(wbemFlagReturnImmediately|wbemQueryFlagDeep)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(8) ] HRESULT SubclassesOfAsync( [in] IDispatch *objWbemSink, - [in] BSTR strSuperclass, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("")] BSTR strSuperclass, + [in, defaultvalue(wbemQueryFlagDeep)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(9) ] HRESULT ExecQuery( [in] BSTR strQuery, - [in] BSTR strQueryLanguage, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("WQL")] BSTR strQueryLanguage, + [in, defaultvalue(wbemFlagReturnImmediately)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(10) ] HRESULT ExecQueryAsync( [in] IDispatch *objWbemSink, [in] BSTR strQuery, - [in] BSTR strQueryLanguage, - [in] long lFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("WQL")] BSTR strQueryLanguage, + [in, defaultvalue(0)] long lFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(11) ] HRESULT AssociatorsOf( [in] BSTR strObjectPath, - [in] BSTR strAssocClass, - [in] BSTR strResultClass, - [in] BSTR strResultRole, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredAssocQualifier, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("")] BSTR strAssocClass, + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strResultRole, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredAssocQualifier, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(wbemFlagReturnImmediately)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(12) ] HRESULT AssociatorsOfAsync( [in] IDispatch *objWbemSink, [in] BSTR strObjectPath, - [in] BSTR strAssocClass, - [in] BSTR strResultClass, - [in] BSTR strResultRole, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredAssocQualifier, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("")] BSTR strAssocClass, + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strResultRole, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredAssocQualifier, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(13) ] HRESULT ReferencesTo( [in] BSTR strObjectPath, - [in] BSTR strResultClass, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(wbemFlagReturnImmediately)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(14) ] HRESULT ReferencesToAsync( [in] IDispatch *objWbemSink, [in] BSTR strObjectPath, - [in] BSTR strResultClass, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(15) ] HRESULT ExecNotificationQuery( [in] BSTR strQuery, - [in] BSTR strQueryLanguage, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("WQL")] BSTR strQueryLanguage, + [in, defaultvalue(wbemFlagReturnImmediately|wbemFlagForwardOnly)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemEventSource **objWbemEventSource); [ id(16) ] HRESULT ExecNotificationQueryAsync( [in] IDispatch *objWbemSink, [in] BSTR strQuery, - [in] BSTR strQueryLanguage, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("WQL")] BSTR strQueryLanguage, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(17) ] HRESULT ExecMethod( [in] BSTR strObjectPath, [in] BSTR strMethodName, - [in] IDispatch *objWbemInParameters, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemInParameters, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObject **objWbemOutParameters); [ id(18) ] @@ -1097,10 +1175,10 @@ [in] IDispatch *objWbemSink, [in] BSTR strObjectPath, [in] BSTR strMethodName, - [in] IDispatch *objWbemInParameters, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(0)] IDispatch *objWbemInParameters, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(19), propget ] HRESULT Security_(

1 0

[akhaldi] 67412: [VERSION] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 13:13:50 2015 New Revision: 67412 URL: http://svn.reactos.org/svn/reactos?rev=67412&view=rev Log: [VERSION] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/version/version.c trunk/reactos/dll/win32/version/version.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/version/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/version.… ============================================================================== --- trunk/reactos/dll/win32/version/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/version/version.c [iso-8859-1] Sat Apr 25 13:13:50 2015 @@ -976,7 +976,7 @@ len = WideCharToMultiByte(CP_ACP, 0, *lplpBuffer, -1, lpBufferA + pos, info->wLength - pos, NULL, NULL); *lplpBuffer = lpBufferA + pos; - *puLen = len; + if (puLen) *puLen = len; } return ret; } @@ -1036,7 +1036,7 @@ len = MultiByteToWideChar(CP_ACP, 0, *lplpBuffer, -1, lpBufferW + pos, max/sizeof(WCHAR) - pos ); *lplpBuffer = lpBufferW + pos; - *puLen = len; + if (puLen) *puLen = len; } return ret; } @@ -1613,3 +1613,40 @@ HeapFree( GetProcessHeap(), 0, wcurd ); return ret; } + +/****************************************************************************** + * GetFileVersionInfoSizeExA [VERSION.@] + */ +DWORD WINAPI GetFileVersionInfoSizeExA(DWORD flags, LPCSTR filename, LPDWORD handle) +{ + FIXME("semi-stub: %u %s %p\n", flags, wine_dbgstr_a(filename), handle); + return GetFileVersionInfoSizeA(filename, handle); + +} + +/****************************************************************************** + * GetFileVersionInfoSizeExW [VERSION.@] + */ +DWORD WINAPI GetFileVersionInfoSizeExW(DWORD flags, LPCWSTR filename, LPDWORD handle) +{ + FIXME("semi-stub: %u %s %p\n", flags, wine_dbgstr_w(filename), handle); + return GetFileVersionInfoSizeW(filename, handle); +} + +/****************************************************************************** + * GetFileVersionInfoExA [VERSION.@] + */ +BOOL WINAPI GetFileVersionInfoExA(DWORD flags, LPCSTR filename, DWORD handle, DWORD len, LPVOID data) +{ + FIXME("semi-stub: %u %s %u %u %p\n", flags, wine_dbgstr_a(filename), handle, len, data); + return GetFileVersionInfoA(filename, handle, len, data); +} + +/****************************************************************************** + * GetFileVersionInfoExW [VERSION.@] + */ +BOOL WINAPI GetFileVersionInfoExW(DWORD flags, LPCWSTR filename, DWORD handle, DWORD len, LPVOID data) +{ + FIXME("semi-stub: %u %s %u %u %p\n", flags, wine_dbgstr_w(filename), handle, len, data); + return GetFileVersionInfoW(filename, handle, len, data); +} Modified: trunk/reactos/dll/win32/version/version.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/version.… ============================================================================== --- trunk/reactos/dll/win32/version/version.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/version/version.spec [iso-8859-1] Sat Apr 25 13:13:50 2015 @@ -1,5 +1,9 @@ @ stdcall GetFileVersionInfoA(str long long ptr) +@ stdcall GetFileVersionInfoExA(long str long long ptr) +@ stdcall GetFileVersionInfoExW(long wstr long long ptr) @ stdcall GetFileVersionInfoSizeA(str ptr) +@ stdcall GetFileVersionInfoSizeExA(long str ptr) +@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) @ stdcall GetFileVersionInfoSizeW(wstr ptr) @ stdcall GetFileVersionInfoW(wstr long long ptr) @ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Apr 25 13:13:50 2015 @@ -199,7 +199,7 @@ reactos/dll/win32/usp10 # Synced to WineStaging-1.7.37 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.7.37 -reactos/dll/win32/version # Synced to Wine-1.7.27 +reactos/dll/win32/version # Synced to WineStaging-1.7.37 reactos/dll/win32/wbemdisp # Synced to Wine-1.7.27 reactos/dll/win32/wbemprox # Synced to WineStaging-1.7.37 reactos/dll/win32/windowscodecs # Synced to Wine-1.7.27

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