Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 24506: include/GL folders files update to mingw w32s api version 3.6
by greatlrd＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: greatlrd Date: Fri Oct 13 23:54:59 2006 New Revision: 24506 URL: http://svn.reactos.org/svn/reactos?rev=24506&view=rev Log: include/GL folders files update to mingw w32s api version 3.6 Modified: trunk/reactos/include/GL/gl.h trunk/reactos/include/GL/glext.h trunk/reactos/include/GL/glu.h Modified: trunk/reactos/include/GL/gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/GL/gl.h?rev=24506&… ============================================================================== --- trunk/reactos/include/GL/gl.h (original) +++ trunk/reactos/include/GL/gl.h Fri Oct 13 23:54:59 2006 @@ -1,4 +1,4 @@ -/* $Id: gl.h 12852 2005-01-06 13:58:04Z mf $ */ +/* $Id: gl.h,v 1.3 2003/08/25 02:02:37 dannysmith Exp $ */ /* * Mesa 3-D graphics library @@ -1452,7 +1452,7 @@ /* Include external definitions of OpenGL extensions */ /* Removed, see this bug report for reference: * http://sourceforge.net/tracker/index.php?func=detail&aid=610178&group_id=24… - * + * * #include <GL/glext.h> */ Modified: trunk/reactos/include/GL/glext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/GL/glext.h?rev=245… ============================================================================== --- trunk/reactos/include/GL/glext.h (original) +++ trunk/reactos/include/GL/glext.h Fri Oct 13 23:54:59 2006 @@ -13,21 +13,21 @@ ** this file except in compliance with the License. You may obtain a copy ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -** +** ** http://oss.sgi.com/projects/FreeB -** +** ** Note that, as provided in the License, the Software is distributed on an ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -** +** ** Original Code. The Original Code is: OpenGL Sample Implementation, ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. ** Copyright in any portions created by third parties is as indicated ** elsewhere herein. All Rights Reserved. -** +** ** Additional Notice Provisions: This software was created using the ** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has ** not been independently verified as being compliant with the OpenGL(R) Modified: trunk/reactos/include/GL/glu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/GL/glu.h?rev=24506… ============================================================================== --- trunk/reactos/include/GL/glu.h (original) +++ trunk/reactos/include/GL/glu.h Fri Oct 13 23:54:59 2006 @@ -6,21 +6,21 @@ ** this file except in compliance with the License. You may obtain a copy ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -** +** ** http://oss.sgi.com/projects/FreeB -** +** ** Note that, as provided in the License, the Software is distributed on an ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -** +** ** Original Code. The Original Code is: OpenGL Sample Implementation, ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. ** Copyright in any portions created by third parties is as indicated ** elsewhere herein. All Rights Reserved. -** +** ** Additional Notice Provisions: This software was created using the ** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has ** not been independently verified as being compliant with the OpenGL(R) @@ -34,6 +34,7 @@ #pragma GCC system_header #endif +#include <stddef.h> /* for wchar_t */ #include <GL/gl.h> #ifdef __cplusplus @@ -104,6 +105,16 @@ #define GLU_NURBS_ERROR36 100286 #define GLU_NURBS_ERROR37 100287 +/* NurbsProperty */ +#define GLU_AUTO_LOAD_MATRIX 100200 +#define GLU_CULLING 100201 +#define GLU_SAMPLING_TOLERANCE 100203 +#define GLU_DISPLAY_MODE 100204 +#define GLU_PARAMETRIC_TOLERANCE 100202 +#define GLU_SAMPLING_METHOD 100205 +#define GLU_U_STEP 100206 +#define GLU_V_STEP 100207 + /* NurbsSampling */ #define GLU_PATH_LENGTH 100215 #define GLU_PARAMETRIC_ERROR 100216 @@ -120,7 +131,7 @@ #define GLU_SILHOUETTE 100013 /* QuadricCallback */ -/* GLU_ERROR */ +#define GLU_ERROR 100103 /* QuadricNormal */ #define GLU_SMOOTH 100000

1 0

[hpoussin] 24505: Set file security information (if provided in .inf file)
by hpoussin＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: hpoussin Date: Fri Oct 13 23:50:02 2006 New Revision: 24505 URL: http://svn.reactos.org/svn/reactos?rev=24505&view=rev Log: Set file security information (if provided in .inf file) Modified: trunk/reactos/dll/win32/setupapi/queue.c trunk/reactos/dll/win32/setupapi/setupapi_private.h Modified: trunk/reactos/dll/win32/setupapi/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/queue.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/queue.c (original) +++ trunk/reactos/dll/win32/setupapi/queue.c Fri Oct 13 23:50:02 2006 @@ -35,15 +35,16 @@ struct file_op { - struct file_op *next; - UINT style; - WCHAR *src_root; - WCHAR *src_path; - WCHAR *src_file; - WCHAR *src_descr; - WCHAR *src_tag; - WCHAR *dst_path; - WCHAR *dst_file; + struct file_op *next; + UINT style; + WCHAR *src_root; + WCHAR *src_path; + WCHAR *src_file; + WCHAR *src_descr; + WCHAR *src_tag; + WCHAR *dst_path; + WCHAR *dst_file; + PSECURITY_DESCRIPTOR dst_sd; }; struct file_op_queue @@ -121,6 +122,7 @@ HeapFree( GetProcessHeap(), 0, op->src_descr ); HeapFree( GetProcessHeap(), 0, op->src_tag ); HeapFree( GetProcessHeap(), 0, op->dst_path ); + if (op->dst_sd) LocalFree( op->dst_sd); if (op->dst_file != op->src_file) HeapFree( GetProcessHeap(), 0, op->dst_file ); t = op; op = op->next; @@ -490,8 +492,9 @@ op->src_tag = strdupW( params->SourceTagfile ); op->dst_path = strdupW( params->TargetDirectory ); op->dst_file = strdupW( params->TargetFilename ); + op->dst_sd = NULL; if (params->SecurityDescriptor) - FIXME( "Need to apply %s to %s\n", debugstr_w( params->SecurityDescriptor ), debugstr_w( op->dst_file )); + ConvertStringSecurityDescriptorToSecurityDescriptorW( params->SecurityDescriptor, SDDL_REVISION_1, &op->dst_sd, NULL ); /* some defaults */ if (!op->src_file) op->src_file = op->dst_file; @@ -1209,6 +1212,25 @@ op_result = handler( context, SPFILENOTIFY_COPYERROR, (UINT_PTR)&paths, (UINT_PTR)newpath ); if (op_result == FILEOP_ABORT) goto done; + } + if (op->dst_sd) + { + PSID psidOwner = NULL, psidGroup = NULL; + PACL pDacl = NULL, pSacl = NULL; + SECURITY_INFORMATION security_info = 0; + BOOL present, dummy; + + if (GetSecurityDescriptorOwner( op->dst_sd, &psidOwner, &dummy ) && psidOwner) + security_info |= OWNER_SECURITY_INFORMATION; + if (GetSecurityDescriptorGroup( op->dst_sd, &psidGroup, &dummy ) && psidGroup) + security_info |= GROUP_SECURITY_INFORMATION; + if (GetSecurityDescriptorDacl( op->dst_sd, &present, &pDacl, &dummy )) + security_info |= DACL_SECURITY_INFORMATION; + if (GetSecurityDescriptorSacl( op->dst_sd, &present, &pSacl, &dummy )) + security_info |= DACL_SECURITY_INFORMATION; + SetNamedSecurityInfoW( (LPWSTR)paths.Target, SE_FILE_OBJECT, security_info, + psidOwner, psidGroup, pDacl, pSacl ); + /* Yes, ignore the return code... */ } handler( context, SPFILENOTIFY_ENDCOPY, (UINT_PTR)&paths, 0 ); } Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h Fri Oct 13 23:50:02 2006 @@ -29,6 +29,7 @@ #define WIN32_NO_STATUS #include <windows.h> +#include <aclapi.h> #include <cfgmgr32.h> #include <fdi.h> #include <regstr.h>

1 0

[weiden] 24504: Don't accidentally free the object name path in case it wasn't altered when resolving paths to handles
by weiden＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: weiden Date: Fri Oct 13 23:19:16 2006 New Revision: 24504 URL: http://svn.reactos.org/svn/reactos?rev=24504&view=rev Log: Don't accidentally free the object name path in case it wasn't altered when resolving paths to handles Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c Fri Oct 13 23:19:16 2006 @@ -823,7 +823,7 @@ } Cleanup: - if (lpPath != NULL) + if (lpPath != NULL && lpPath != pObjectName) { LocalFree((HLOCAL)lpPath); }

1 0

[hpoussin] 24503: Disable DbgBreakPoint() in release versions. This lets "copy nul com1:" fail instead of crashing. Next task: fix cmd.exe to let the command succeed
by hpoussin＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: hpoussin Date: Fri Oct 13 18:31:57 2006 New Revision: 24503 URL: http://svn.reactos.org/svn/reactos?rev=24503&view=rev Log: Disable DbgBreakPoint() in release versions. This lets "copy nul com1:" fail instead of crashing. Next task: fix cmd.exe to let the command succeed Modified: trunk/reactos/drivers/bus/serenum/serenum.c Modified: trunk/reactos/drivers/bus/serenum/serenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/serenum/serenu… ============================================================================== --- trunk/reactos/drivers/bus/serenum/serenum.c (original) +++ trunk/reactos/drivers/bus/serenum/serenum.c Fri Oct 13 18:31:57 2006 @@ -7,7 +7,7 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) */ -//#define NDEBUG +#define NDEBUG #define INITGUID #include "serenum.h" @@ -51,9 +51,7 @@ { DPRINT1("Serenum: FDO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); -#ifndef NDEBUG - DbgBreakPoint(); -#endif + ASSERT(FALSE); Status = Irp->IoStatus.Status; } } @@ -74,9 +72,7 @@ { DPRINT1("Serenum: PDO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); -#ifndef NDEBUG - DbgBreakPoint(); -#endif + ASSERT(FALSE); Status = Irp->IoStatus.Status; } }

1 0

[weiden] 24502: Fix building with GCC4
by weiden＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: weiden Date: Fri Oct 13 16:52:24 2006 New Revision: 24502 URL: http://svn.reactos.org/svn/reactos?rev=24502&view=rev Log: Fix building with GCC4 Modified: trunk/reactos/base/applications/utils/binpatch/patch.c trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild Modified: trunk/reactos/base/applications/utils/binpatch/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/bi… ============================================================================== --- trunk/reactos/base/applications/utils/binpatch/patch.c (original) +++ trunk/reactos/base/applications/utils/binpatch/patch.c Fri Oct 13 16:52:24 2006 @@ -46,7 +46,7 @@ static char **m_argv = NULL; /* patch buffer where we put the patch info into */ -static unsigned char m_patchBuffer[SIZEOF_PATCH_BUFFER_MAGIC + PATCH_BUFFER_SIZE] = +static char m_patchBuffer[SIZEOF_PATCH_BUFFER_MAGIC + PATCH_BUFFER_SIZE] = PATCH_BUFFER_MAGIC; /** HELPER FUNCTIONS **********************************************************/ @@ -211,7 +211,7 @@ static int outputPatch(const char *outputFileName) { - unsigned char *patchExe, *patchBuffer = NULL; + char *patchExe, *patchBuffer = NULL; int i, size, patchExeSize, patchSize, stringSize, stringOffset, patchOffset; Patch *patch; PatchedFile *files; Modified: trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/pa… ============================================================================== --- trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild (original) +++ trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild Fri Oct 13 16:52:24 2006 @@ -1,4 +1,4 @@ -<module name="partinfo" type="win32cui" installbase="bin" installname="partinfo.exe"> +<module name="partinfo" type="win32cui" installbase="bin" installname="partinfo.exe" allowwarnings="true"> <define name="__USE_W32API" /> <library>msvcrt</library> <library>kernel32</library>

1 0

[janderwald] 24501: - add cat, load, unload, infinst, nts2w32err, objdir, partinfo to build system - fix includes in those modules
by janderwald＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: janderwald Date: Fri Oct 13 14:56:52 2006 New Revision: 24501 URL: http://svn.reactos.org/svn/reactos?rev=24501&view=rev Log: - add cat, load, unload, infinst, nts2w32err, objdir, partinfo to build system - fix includes in those modules Added: trunk/reactos/base/applications/utils/cat/cat.rbuild (with props) trunk/reactos/base/applications/utils/driver/driver.rbuild (with props) trunk/reactos/base/applications/utils/driver/load/load.rbuild (with props) trunk/reactos/base/applications/utils/driver/unload/unload.rbuild (with props) trunk/reactos/base/applications/utils/infinst/infinst.rbuild (with props) trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild (with props) trunk/reactos/base/applications/utils/objdir/objdir.rbuild (with props) trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild (with props) Modified: trunk/reactos/base/applications/utils/driver/load/load.c trunk/reactos/base/applications/utils/driver/unload/unload.c trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.c trunk/reactos/base/applications/utils/objdir/objdir.c trunk/reactos/base/applications/utils/partinfo/partinfo.c trunk/reactos/base/applications/utils/utils.rbuild Added: trunk/reactos/base/applications/utils/cat/cat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ca… ============================================================================== --- trunk/reactos/base/applications/utils/cat/cat.rbuild (added) +++ trunk/reactos/base/applications/utils/cat/cat.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,7 @@ +<module name="cat" type="win32cui" installbase="bin" installname="cat.exe" > + <define name="__USE_W32API" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <file>cat.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/cat/cat.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/utils/driver/driver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/dr… ============================================================================== --- trunk/reactos/base/applications/utils/driver/driver.rbuild (added) +++ trunk/reactos/base/applications/utils/driver/driver.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,8 @@ +<group> +<directory name="load"> + <xi:include href="load/load.rbuild" /> +</directory> +<directory name="unload"> + <xi:include href="unload/unload.rbuild" /> +</directory> +</group> Propchange: trunk/reactos/base/applications/utils/driver/driver.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/driver/load/load.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/dr… ============================================================================== --- trunk/reactos/base/applications/utils/driver/load/load.c (original) +++ trunk/reactos/base/applications/utils/driver/load/load.c Fri Oct 13 14:56:52 2006 @@ -1,31 +1,32 @@ /* * Load a device driver */ +#define WIN32_NO_STATUS #include <windows.h> -#include <ntos/zw.h> +#include <stdlib.h> +#include <ntndk.h> -int -main(int argc, char *argv[]) +int wmain(int argc, WCHAR * argv[]) { NTSTATUS Status; UNICODE_STRING ServiceName; if (argc != 2) { - printf("Usage: load <ServiceName>\n"); + wprintf(L"Usage: load <ServiceName>\n"); return 0; } - ServiceName.Length = (strlen(argv[1]) + 52) * sizeof(WCHAR); + ServiceName.Length = (wcslen(argv[1]) + 52) * sizeof(WCHAR); ServiceName.Buffer = (LPWSTR)malloc(ServiceName.Length + sizeof(UNICODE_NULL)); wsprintf(ServiceName.Buffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\%S", argv[1]); - wprintf(L"%s %d %d\n", ServiceName.Buffer, ServiceName.Length, wcslen(ServiceName.Buffer)); + wprintf(L"%s %u %d\n", ServiceName.Buffer, ServiceName.Length, wcslen(ServiceName.Buffer)); Status = NtLoadDriver(&ServiceName); free(ServiceName.Buffer); if (!NT_SUCCESS(Status)) { - printf("Failed: %X\n", Status); + wprintf(L"Failed: %x\n", Status); return 1; } return 0; Added: trunk/reactos/base/applications/utils/driver/load/load.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/dr… ============================================================================== --- trunk/reactos/base/applications/utils/driver/load/load.rbuild (added) +++ trunk/reactos/base/applications/utils/driver/load/load.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,8 @@ +<module name="load" type="win32cui" installbase="bin" installname="load.exe" unicode="true" > + <define name="__USE_W32API" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <library>user32</library> + <file>load.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/driver/load/load.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/driver/unload/unload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/dr… ============================================================================== --- trunk/reactos/base/applications/utils/driver/unload/unload.c (original) +++ trunk/reactos/base/applications/utils/driver/unload/unload.c Fri Oct 13 14:56:52 2006 @@ -1,21 +1,22 @@ /* * Unload a device driver */ +#define WIN32_NO_STATUS #include <windows.h> -#include <ntos/zw.h> +#include <stdlib.h> +#include <ntndk.h> -int -main(int argc, char *argv[]) +int wmain(int argc, WCHAR * argv[]) { NTSTATUS Status; UNICODE_STRING ServiceName; if (argc != 2) { - printf("Usage: unload <ServiceName>\n"); + wprintf(L"Usage: unload <ServiceName>\n"); return 0; } - ServiceName.Length = (strlen(argv[1]) + 52) * sizeof(WCHAR); + ServiceName.Length = (wcslen(argv[1]) + 52) * sizeof(WCHAR); ServiceName.Buffer = (LPWSTR)malloc(ServiceName.Length + sizeof(UNICODE_NULL)); wsprintf(ServiceName.Buffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\%S", @@ -25,7 +26,7 @@ free(ServiceName.Buffer); if (!NT_SUCCESS(Status)) { - printf("Failed: %X\n", Status); + wprintf(L"Failed: %X\n", Status); return 1; } return 0; Added: trunk/reactos/base/applications/utils/driver/unload/unload.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/dr… ============================================================================== --- trunk/reactos/base/applications/utils/driver/unload/unload.rbuild (added) +++ trunk/reactos/base/applications/utils/driver/unload/unload.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,8 @@ +<module name="unload" type="win32cui" installbase="bin" installname="unload.exe" unicode="true"> + <define name="__USE_W32API" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <library>user32</library> + <file>unload.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/driver/unload/unload.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/utils/infinst/infinst.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/in… ============================================================================== --- trunk/reactos/base/applications/utils/infinst/infinst.rbuild (added) +++ trunk/reactos/base/applications/utils/infinst/infinst.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,10 @@ +<module name="infinst" type="win32cui" installbase="bin" installname="infinst.exe" > + <define name="__USE_W32API" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <library>user32</library> + <library>setupapi</library> + <library>comdlg32</library> + <file>infinst.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/infinst/infinst.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/nt… ============================================================================== --- trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.c (original) +++ trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.c Fri Oct 13 14:56:52 2006 @@ -12,9 +12,10 @@ * 2004-01-10 Emanuele Aliberti * */ +#define WIN32_NO_STATUS #include <windows.h> -#include <ntddk.h> - +#include <stdlib.h> +#include <ntndk.h> #include <stdio.h> int main (int argc, char * argv []) Added: trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/nt… ============================================================================== --- trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild (added) +++ trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,7 @@ +<module name="nts2w32err" type="win32cui" installbase="bin" installname="nts2w32err.exe" > + <define name="__USE_W32API" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <file>nts2w32err.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/objdir/objdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ob… ============================================================================== --- trunk/reactos/base/applications/utils/objdir/objdir.c (original) +++ trunk/reactos/base/applications/utils/objdir/objdir.c Fri Oct 13 14:56:52 2006 @@ -17,11 +17,11 @@ * Added -r option. */ -#include <ntddk.h> -#include <stdarg.h> -#include <string.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include <stdlib.h> +#include <ntndk.h> #include <stdio.h> -#include <stdlib.h> #define MAX_DIR_ENTRY 256 Added: trunk/reactos/base/applications/utils/objdir/objdir.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ob… ============================================================================== --- trunk/reactos/base/applications/utils/objdir/objdir.rbuild (added) +++ trunk/reactos/base/applications/utils/objdir/objdir.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,9 @@ +<module name="objdir" type="win32cui" installbase="bin" installname="objdir.exe"> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <file>objdir.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/objdir/objdir.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/partinfo/partinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/pa… ============================================================================== --- trunk/reactos/base/applications/utils/partinfo/partinfo.c (original) +++ trunk/reactos/base/applications/utils/partinfo/partinfo.c Fri Oct 13 14:56:52 2006 @@ -2,13 +2,11 @@ * partinfo - partition info program */ +#define WIN32_NO_STATUS #include <windows.h> -//#include <winioctl.h> -#include <string.h> +#include <stdlib.h> +#include <ntndk.h> #include <stdio.h> -#include <stdlib.h> - -#include <ntddk.h> //#define DUMP_DATA #define DUMP_SIZE_INFO Added: trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/pa… ============================================================================== --- trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild (added) +++ trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,7 @@ +<module name="partinfo" type="win32cui" installbase="bin" installname="partinfo.exe"> + <define name="__USE_W32API" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <file>partinfo.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/utils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ut… ============================================================================== --- trunk/reactos/base/applications/utils/utils.rbuild (original) +++ trunk/reactos/base/applications/utils/utils.rbuild Fri Oct 13 14:56:52 2006 @@ -1,6 +1,24 @@ <group> <directory name="binpatch"> <xi:include href="binpatch/binpatch.rbuild" /> +</directory> +<directory name="cat"> + <xi:include href="cat/cat.rbuild" /> +</directory> +<directory name="driver"> + <xi:include href="driver/driver.rbuild" /> +</directory> +<directory name="infinst"> + <xi:include href="infinst/infinst.rbuild" /> +</directory> +<directory name="nts2w32err"> + <xi:include href="nts2w32err/nts2w32err.rbuild" /> +</directory> +<directory name="objdir"> + <xi:include href="objdir/objdir.rbuild" /> +</directory> +<directory name="partinfo"> + <xi:include href="partinfo/partinfo.rbuild" /> </directory> <directory name="ps"> <xi:include href="ps/ps.rbuild" />

1 0

[janderwald] 24500: - add binpatch to build system - fix a gcc warning
by janderwald＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: janderwald Date: Fri Oct 13 13:56:30 2006 New Revision: 24500 URL: http://svn.reactos.org/svn/reactos?rev=24500&view=rev Log: - add binpatch to build system - fix a gcc warning Added: trunk/reactos/base/applications/utils/binpatch/binpatch.rbuild (with props) Modified: trunk/reactos/base/applications/utils/binpatch/patch.c trunk/reactos/base/applications/utils/utils.rbuild Added: trunk/reactos/base/applications/utils/binpatch/binpatch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/bi… ============================================================================== --- trunk/reactos/base/applications/utils/binpatch/binpatch.rbuild (added) +++ trunk/reactos/base/applications/utils/binpatch/binpatch.rbuild Fri Oct 13 13:56:30 2006 @@ -1,0 +1,7 @@ +<module name="binpatch" type="win32cui" installbase="bin" installname="binpatch.exe" > + <define name="__USE_W32API" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <file>patch.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/binpatch/binpatch.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/binpatch/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/bi… ============================================================================== --- trunk/reactos/base/applications/utils/binpatch/patch.c (original) +++ trunk/reactos/base/applications/utils/binpatch/patch.c Fri Oct 13 13:56:30 2006 @@ -211,7 +211,7 @@ static int outputPatch(const char *outputFileName) { - unsigned char *patchExe, *patchBuffer; + unsigned char *patchExe, *patchBuffer = NULL; int i, size, patchExeSize, patchSize, stringSize, stringOffset, patchOffset; Patch *patch; PatchedFile *files; Modified: trunk/reactos/base/applications/utils/utils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ut… ============================================================================== --- trunk/reactos/base/applications/utils/utils.rbuild (original) +++ trunk/reactos/base/applications/utils/utils.rbuild Fri Oct 13 13:56:30 2006 @@ -1,4 +1,7 @@ <group> +<directory name="binpatch"> + <xi:include href="binpatch/binpatch.rbuild" /> +</directory> <directory name="ps"> <xi:include href="ps/ps.rbuild" /> </directory>

1 0

[janderwald] 24499: - give stats an rbuild file - compile stats as an unicode app
by janderwald＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: janderwald Date: Fri Oct 13 13:41:59 2006 New Revision: 24499 URL: http://svn.reactos.org/svn/reactos?rev=24499&view=rev Log: - give stats an rbuild file - compile stats as an unicode app Added: trunk/reactos/base/applications/utils/stats/stats.rbuild (with props) Modified: trunk/reactos/base/applications/utils/stats/stats.c trunk/reactos/base/applications/utils/utils.rbuild Modified: trunk/reactos/base/applications/utils/stats/stats.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/st… ============================================================================== --- trunk/reactos/base/applications/utils/stats/stats.c (original) +++ trunk/reactos/base/applications/utils/stats/stats.c Fri Oct 13 13:41:59 2006 @@ -443,13 +443,9 @@ } -int -main (int argc, char * argv []) +int _tmain(int argc, _TCHAR * argv[]) { int a; -#if UNICODE - TCHAR Path[MAX_PATH + 1]; -#endif _tprintf (_T("ReactOS Project Statistics\n")); _tprintf (_T("==========================\n\n")); @@ -469,28 +465,13 @@ for(a = 1; a < argc - 1; a++) { -#if UNICODE - int len = lstrlenA(argv[a]); - TCHAR *str = (TCHAR*)HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(TCHAR)); - if(MultiByteToWideChar(CP_ACP, 0, argv[a], -1, str, len + 1) > 0) - Options[a - 1] = str; - else - Options[a - 1] = NULL; -#else Options[a - 1] = argv[a]; -#endif } SkipEmptyLines = IsOptionSet(_T("-e")); BeSilent = IsOptionSet(_T("-s")); -#if UNICODE - ZeroMemory(Path, sizeof(Path)); - if(MultiByteToWideChar(CP_ACP, 0, argv[argc - 1], -1, Path, MAX_PATH) > 0) - Execute (Path); -#else Execute (argv[argc - 1]); -#endif Cleanup(); return 0; Added: trunk/reactos/base/applications/utils/stats/stats.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/st… ============================================================================== --- trunk/reactos/base/applications/utils/stats/stats.rbuild (added) +++ trunk/reactos/base/applications/utils/stats/stats.rbuild Fri Oct 13 13:41:59 2006 @@ -1,0 +1,9 @@ +<module name="stats" type="win32cui" installbase="bin" installname="stats.exe" unicode="true" > + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <file>stats.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/stats/stats.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/utils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ut… ============================================================================== --- trunk/reactos/base/applications/utils/utils.rbuild (original) +++ trunk/reactos/base/applications/utils/utils.rbuild Fri Oct 13 13:41:59 2006 @@ -5,6 +5,9 @@ <directory name="rosperf"> <xi:include href="rosperf/rosperf.rbuild" /> </directory> +<directory name="stats"> + <xi:include href="stats/stats.rbuild" /> +</directory> <directory name="tickcount"> <xi:include href="tickcount/tickcount.rbuild" /> </directory>

1 0

[janderwald] 24498: - give tickcount a rbuild file
by janderwald＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: janderwald Date: Fri Oct 13 13:16:34 2006 New Revision: 24498 URL: http://svn.reactos.org/svn/reactos?rev=24498&view=rev Log: - give tickcount a rbuild file Added: trunk/reactos/base/applications/utils/tickcount/tickcount.rbuild (with props) Modified: trunk/reactos/base/applications/utils/utils.rbuild Added: trunk/reactos/base/applications/utils/tickcount/tickcount.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ti… ============================================================================== --- trunk/reactos/base/applications/utils/tickcount/tickcount.rbuild (added) +++ trunk/reactos/base/applications/utils/tickcount/tickcount.rbuild Fri Oct 13 13:16:34 2006 @@ -1,0 +1,9 @@ +<module name="tickcount" type="win32cui" installbase="bin" installname="tickcount.exe" unicode="true" > + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <file>tickcount.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/tickcount/tickcount.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/utils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ut… ============================================================================== --- trunk/reactos/base/applications/utils/utils.rbuild (original) +++ trunk/reactos/base/applications/utils/utils.rbuild Fri Oct 13 13:16:34 2006 @@ -5,4 +5,7 @@ <directory name="rosperf"> <xi:include href="rosperf/rosperf.rbuild" /> </directory> +<directory name="tickcount"> + <xi:include href="tickcount/tickcount.rbuild" /> +</directory> </group>

1 0

[fireball] 24497: Move unmaintained stuff (cis, os2, rosky, vms, and msvc6) to a respective branch [02/02]
by fireball＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: fireball Date: Fri Oct 13 13:03:51 2006 New Revision: 24497 URL: http://svn.reactos.org/svn/reactos?rev=24497&view=rev Log: Move unmaintained stuff (cis, os2, rosky, vms, and msvc6) to a respective branch [02/02] Removed: trunk/cis/ trunk/msvc6/ trunk/os2/ trunk/rosky/ trunk/vms/

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