Ros-diffs

ros-diffs@reactos.org

81390 discussions

[khornicek] 37962: - sync d3d8, d3d9 with wine
by khornicek＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: khornicek Date: Tue Dec 9 07:50:12 2008 New Revision: 37962 URL: http://svn.reactos.org/svn/reactos?rev=37962&view=rev Log: - sync d3d8, d3d9 with wine Added: trunk/reactos/include/reactos/wine/wined3d.idl (with props) Removed: trunk/reactos/dll/directx/wine/wined3d/wined3d.idl trunk/reactos/include/reactos/wine/wined3d_caps.h trunk/reactos/include/reactos/wine/wined3d_gl.h trunk/reactos/include/reactos/wine/wined3d_interface.h trunk/reactos/include/reactos/wine/wined3d_types.h Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/wineheaders.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Removed: trunk/reactos/dll/directx/wine/wined3d/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Added: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Removed: trunk/reactos/include/reactos/wine/wined3d_caps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Removed: trunk/reactos/include/reactos/wine/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Removed: trunk/reactos/include/reactos/wine/wined3d_interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Removed: trunk/reactos/include/reactos/wine/wined3d_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Modified: trunk/reactos/include/reactos/wine/wineheaders.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wineh…

1 0

[sginsberg] 37961: - Test commit for the crash which the build server is experiencing (will be reverted)
by sginsberg＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: sginsberg Date: Tue Dec 9 07:35:06 2008 New Revision: 37961 URL: http://svn.reactos.org/svn/reactos?rev=37961&view=rev Log: - Test commit for the crash which the build server is experiencing (will be reverted) Modified: trunk/rostests/winetests/advapi32/security.c Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Tue Dec 9 07:35:06 2008 @@ -2409,6 +2409,7 @@ "G:S-1-5-21-93476-23408-4576" "D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)" "S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)", SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n"); + DbgPrint("Received %p\n", sec); buf = HeapAlloc(GetProcessHeap(), 0, dwDescSize); pSetSecurityDescriptorControl(sec, SE_DACL_PROTECTED, SE_DACL_PROTECTED); GetSecurityDescriptorControl(sec, &ctrl, &dwRevision);

1 0

[cwittich] 37960: show file/line information for usermode crashes
by cwittich＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: cwittich Date: Tue Dec 9 06:44:27 2008 New Revision: 37960 URL: http://svn.reactos.org/svn/reactos?rev=37960&view=rev Log: show file/line information for usermode crashes Modified: trunk/tools/sysreg2/makefile trunk/tools/sysreg2/raddr2line.c Modified: trunk/tools/sysreg2/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/makefile?rev=37960&r… ============================================================================== --- trunk/tools/sysreg2/makefile [iso-8859-1] (original) +++ trunk/tools/sysreg2/makefile [iso-8859-1] Tue Dec 9 06:44:27 2008 @@ -5,8 +5,8 @@ all: $(TARGET) CC=gcc -CFLAGS := -O2 -std=c99 -D_GNU_SOURCE -LFLAGS := -s -L/usr/lib64 +CFLAGS := -g -O0 -std=c99 -D_GNU_SOURCE +LFLAGS := -L/usr/lib64 LIBS := -lgcc -lm -lvirt -ltasn1 -lz -lxml2 -lgnutls INC := -I/usr/include/libvirt/ -I/usr/include/libxml2/ Modified: trunk/tools/sysreg2/raddr2line.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/raddr2line.c?rev=379… ============================================================================== --- trunk/tools/sysreg2/raddr2line.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/raddr2line.c [iso-8859-1] Tue Dec 9 06:44:27 2008 @@ -33,6 +33,7 @@ bool ResolveAddressFromFile(char* Buffer, int BuffSize, char* Data) { + int Resolved = 0; char* sep; char* sep2; char Module[32]; @@ -50,35 +51,59 @@ Module[(int)(sep-Data)-2] = '\0'; sep2 = strchr(Data, '>'); strncpy(Addr, Data + (sep - Data + 1), (int) (sep2 - sep) -1); - Addr[(int)(sep2- sep)-1] = '\0'; + Addr[(int)(sep2-sep)-1] = '\0'; + Resolved = 1; + } + } - if (GetPackagePath(PkgData, sizeof(PkgData), Module)) + sep = strchr(Data, '+'); + if ((sep) && strchr(Data, ':')) + { + sep2 = strchr(Data + (sep - Data), ' '); + strncpy(Addr, Data + (sep - Data + 1), (int) (sep2 - sep) - 1); + Addr[(int)(sep2-sep) - 1] = '\0'; + sep = strrchr(Data, '\\'); + strcpy(Module, sep + 1); + Module[strlen(Module) - 2] = '\0'; + Resolved = 2; + } + + if (Resolved > 0) + { + if (GetPackagePath(PkgData, sizeof(PkgData), Module)) + { + const char* outdir = getenv("ROS_OUTPUT"); + char* ptr; + if (!outdir) + outdir = emptystr; + sprintf(Command, "%s/tools/raddr2line %s/%s %s 2>&1", + outdir, outdir, PkgData, Addr); + FILE* p = popen(Command, "r"); + char buf[100] = {'\0'}; + while(feof(p)==0) { - const char* outdir = getenv("ROS_OUTPUT"); - char* ptr; - if (!outdir) - outdir = emptystr; - sprintf(Command, "%s/tools/raddr2line %s/%s %s 2>&1", - outdir, outdir, PkgData, Addr); - FILE* p = popen(Command, "r"); - char buf[100] = {'\0'}; - while(feof(p)==0) + fgets(buf,100,p); + if (strstr(buf, "error")) + strcpy(buf, "(no debug info)"); + ptr = strchr(buf, '\n'); + if (ptr) + *ptr = '\0'; + ptr = strchr(Data, '>'); + if (ptr) + *ptr = '\0'; + if (Resolved == 2) { - fgets(buf,100,p); - if (strstr(buf, "error")) - strcpy(buf, "(no debug info)"); - ptr = strchr(buf, '\n'); - if (ptr) - *ptr = '\0'; - ptr = strchr(Data, '>'); + ptr = strchr(Data, '\n'); if (ptr) *ptr = '\0'; - strcpy(Buffer, Data); - strcat(Buffer, " "); - strcat(Buffer, buf); - strcat(Buffer, ">\n"); - return true; } + strcpy(Buffer, Data); + strcat(Buffer, " "); + if (Resolved == 2) + strcat(Buffer, "<"); + strcat(Buffer, buf); + strcat(Buffer, ">\n"); + return true; } } }

1 0

[khornicek] 37959: - revert 37958 for now, sorry
by khornicek＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: khornicek Date: Tue Dec 9 06:27:50 2008 New Revision: 37959 URL: http://svn.reactos.org/svn/reactos?rev=37959&view=rev Log: - revert 37958 for now, sorry Added: trunk/reactos/include/reactos/wine/wined3d_caps.h - copied unchanged from r37957, trunk/reactos/include/reactos/wine/wined3d_caps.h trunk/reactos/include/reactos/wine/wined3d_gl.h - copied unchanged from r37957, trunk/reactos/include/reactos/wine/wined3d_gl.h trunk/reactos/include/reactos/wine/wined3d_interface.h - copied unchanged from r37957, trunk/reactos/include/reactos/wine/wined3d_interface.h trunk/reactos/include/reactos/wine/wined3d_types.h - copied unchanged from r37957, trunk/reactos/include/reactos/wine/wined3d_types.h

1 0

[khornicek] 37958: - remove leftovers
by khornicek＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: khornicek Date: Tue Dec 9 06:17:40 2008 New Revision: 37958 URL: http://svn.reactos.org/svn/reactos?rev=37958&view=rev Log: - remove leftovers Removed: trunk/reactos/include/reactos/wine/wined3d_caps.h trunk/reactos/include/reactos/wine/wined3d_gl.h trunk/reactos/include/reactos/wine/wined3d_interface.h trunk/reactos/include/reactos/wine/wined3d_types.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/include/reactos/wine/wined3d_caps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Removed: trunk/reactos/include/reactos/wine/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Removed: trunk/reactos/include/reactos/wine/wined3d_interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Removed: trunk/reactos/include/reactos/wine/wined3d_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

1 0

[khornicek] 37957: - sync wined3d with wine
by khornicek＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: khornicek Date: Tue Dec 9 06:16:19 2008 New Revision: 37957 URL: http://svn.reactos.org/svn/reactos?rev=37957&view=rev Log: - sync wined3d with wine Added: trunk/reactos/dll/directx/wine/wined3d/wined3d.idl (with props) trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h (with props) Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/clipper.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/indexbuffer.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexbuffer.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/i… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Added: trunk/reactos/dll/directx/wine/wined3d/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Added: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w…

1 0

[dreimer] 37956: Some more clean up and code reduction.
by dreimer＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: dreimer Date: Tue Dec 9 02:39:06 2008 New Revision: 37956 URL: http://svn.reactos.org/svn/reactos?rev=37956&view=rev Log: Some more clean up and code reduction. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Tue Dec 9 02:39:06 2008 @@ -51,49 +51,20 @@ if ($_ROSBE_USECCACHE -ne $null) { if ($_ROSBE_USECCACHE -eq 1) { $ENV:CCACHE_DIR = "$APPDATA\RosBE\.ccache" - $ENV:HOST_CC = "ccache gcc" - $ENV:HOST_CPP = "ccache g++" - - # - #Target defaults to host(i386) - # - - $ENV:TARGET_CC = "ccache gcc" - $ENV:TARGET_CPP = "ccache g++" - if ($ENV:ROS_ARCH -eq "arm") { - $ENV:TARGET_CC = "ccache arm-pc-mingw32-gcc" - $ENV:TARGET_CPP = "ccache arm-pc-mingw32-g++" - } - if ($ENV:ROS_ARCH -eq "amd64") { - $ENV:TARGET_CC = "ccache x86_64-pc-mingw32-gcc" - $ENV:TARGET_CPP = "ccache x86_64-pc-mingw32-g++" - } - if ($ENV:ROS_ARCH -eq "ppc") { - $ENV:TARGET_CC = "ccache ppc-pc-mingw32-gcc" - $ENV:TARGET_CPP = "ccache ppc-pc-mingw32-g++" - } - } else { - $ENV:HOST_CC = "gcc" - $ENV:HOST_CPP = "g++" - - # - #Target defaults to host(i386) - # - - $ENV:TARGET_CC = "gcc" - $ENV:TARGET_CPP = "g++" - if ($ENV:ROS_ARCH -eq "arm") { - $ENV:TARGET_CC = "arm-pc-mingw32-gcc" - $ENV:TARGET_CPP = "arm-pc-mingw32-g++" - } - if ($ENV:ROS_ARCH -eq "amd64") { - $ENV:TARGET_CC = "x86_64-pc-mingw32-gcc" - $ENV:TARGET_CPP = "x86_64-pc-mingw32-g++" - } - if ($ENV:ROS_ARCH -eq "ppc") { - $ENV:TARGET_CC = "ppc-pc-mingw32-gcc" - $ENV:TARGET_CPP = "ppc-pc-mingw32-g++" - } + $_ROSBE_CCACHE = "ccache " + } + $ENV:HOST_CC = "$_ROSBE_CCACHE" + "gcc" + $ENV:HOST_CPP = "$_ROSBE_CCACHE" + "g++" + + # + #Target defaults to host(i386) + # + + $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "gcc" + $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "g++" + if ($ENV:ROS_ARCH -ne $null) { + $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "$ROS_ARCH-pc-mingw32-gcc" + $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "$ROS_ARCH-pc-mingw32-g++" } } @@ -103,7 +74,7 @@ # if ($_ROSBE_OBJPATH -ne $null) { if (Test-Path "$_ROSBE_OBJPATH") { - "ERROR: The path specified doesn't seem to exist." + "ERROR: The Object-Path specified doesn't seem to exist." exit } else { $ENV:ROS_INTERMEDIATE = "$_ROSBE_OBJPATH" @@ -111,7 +82,7 @@ } if ($_ROSBE_OUTPATH -ne $null) { if (Test-Path "$_ROSBE_OUTPATH") { - "ERROR: The path specified doesn't seem to exist." + "ERROR: The Output-Path specified doesn't seem to exist." exit } else { $ENV:ROS_OUTPUT = "$_ROSBE_OUTPATH" @@ -240,3 +211,4 @@ $TIMENAME = $null $CPUCOUNT = $null $sw = $null +$_ROSBE_CCACHE = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Tue Dec 9 02:39:06 2008 @@ -27,67 +27,26 @@ # Check if we have something to clean, if so, clean it. # - if ($ENV:ROS_ARCH -eq "arm") { - if (Test-Path ".\obj-arm") { - "Cleaning ReactOS ARM source directory..." + if ($ENV:ROS_ARCH -ne $null) { + if (Test-Path ".\obj-$ENV:ROS_ARCH") { + "Cleaning ReactOS $ENV:ROS_ARCH source directory..." # # Remove directories/makefile.auto created by the build. # - if (Test-Path ".\obj-arm") { - $null = (Remove-Item ".\obj-arm" -recurse -force) + if (Test-Path ".\obj-$ENV:ROS_ARCH") { + $null = (Remove-Item ".\obj-$ENV:ROS_ARCH" -recurse -force) } - if (Test-Path ".\output-arm") { - $null = (Remove-Item ".\output-arm" -recurse -force) + if (Test-Path ".\output-$ENV:ROS_ARCH") { + $null = (Remove-Item ".\output-$ENV:ROS_ARCH" -recurse -force) } - if (Test-Path ".\makefile-arm.auto") { - $null = (Remove-Item ".\makefile-arm.auto" -force) + if (Test-Path ".\makefile-$ENV:ROS_ARCH.auto") { + $null = (Remove-Item ".\makefile-$ENV:ROS_ARCH.auto" -force) } - "Done cleaning ReactOS ARM source directory." + "Done cleaning ReactOS $ENV:ROS_ARCH source directory." } else { - "ERROR: There is no compiler output to clean." + "ERROR: There is no $ENV:ROS_ARCH compiler output to clean." } - } - elseif ($ENV:ROS_ARCH -eq "ppc") { - if (Test-Path ".\obj-ppc") { - "Cleaning ReactOS PPC source directory..." - # - # Remove directories/makefile.auto created by the build. - # - if (Test-Path ".\obj-ppc") { - $null = (Remove-Item ".\obj-ppc" -recurse -force) - } - if (Test-Path ".\output-ppc") { - $null = (Remove-Item ".\output-ppc" -recurse -force) - } - if (Test-Path ".\makefile-ppc.auto") { - $null = (Remove-Item ".\makefile-ppc.auto" -force) - } - "Done cleaning ReactOS PPC source directory." - } else { - "ERROR: There is no compiler output to clean." - } - } - elseif ($ENV:ROS_ARCH -eq "amd64") { - if (Test-Path ".\obj-amd64") { - "Cleaning ReactOS x86_64 source directory..." - # - # Remove directories/makefile.auto created by the build. - # - if (Test-Path ".\obj-amd64") { - $null = (Remove-Item ".\obj-amd64" -recurse -force) - } - if (Test-Path ".\output-amd64") { - $null = (Remove-Item ".\output-amd64" -recurse -force) - } - if (Test-Path ".\makefile-amd64.auto") { - $null = (Remove-Item ".\makefile-amd64.auto" -force) - } - "Done cleaning ReactOS x86_64 source directory." - } else { - "ERROR: There is no compiler output to clean." - } - } - elseif ($ENV:ROS_ARCH -eq $null) { + } else { if (Test-Path ".\obj-i386") { "Cleaning ReactOS i386 source directory..." # @@ -104,7 +63,7 @@ } "Done cleaning ReactOS i386 source directory." } else { - "ERROR: There is no compiler output to clean." + "ERROR: There is no i386 compiler output to clean." } } if (Test-Path "reactos") { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Tue Dec 9 02:39:06 2008 @@ -75,7 +75,6 @@ "" $YESNO = Read-Host "(yes), (no)" - if ($YESNO -ne "yes") {settitle} # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Tue Dec 9 02:39:06 2008 @@ -110,7 +110,7 @@ & yasm --version | select-string "yasm 0" } else { if ($_ROSBE_MODE -eq "RosBE") { - "ERROR: NASM or YASM is required to build ReactOS, none found in the current MinGW/GCC." + "ERROR: NASM or YASM is required to build ReactOS, none was found in the current MinGW/GCC." } } } @@ -118,7 +118,7 @@ & bison '--version' | select-string "GNU Bison" } else { if ($_ROSBE_MODE -eq "RosBE") { - "WARNING: Bison will soon be required to build ReactOS, none found in the current MinGW/GCC." + "WARNING: Bison will soon be required to build ReactOS, none was found in the current MinGW/GCC." } } if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\flex.exe") { @@ -126,7 +126,7 @@ "flex $fver" } else { if ($_ROSBE_MODE -eq "RosBE") { - "WARNING: Flex will soon be required to build ReactOS, none found in the current MinGW/GCC." + "WARNING: Flex will soon be required to build ReactOS, none was found in the current MinGW/GCC." } } & mingw32-make -v | & find "GNU Make" Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Tue Dec 9 02:39:06 2008 @@ -36,68 +36,43 @@ :: :: Check if strip, no Debug Symbols or ccache are being used and set the appropriate options. :: -if .%_ROSBE_NOSTRIP%. == .1. ( +if "%_ROSBE_NOSTRIP%" == "1" ( set ROS_BUILDNOSTRIP=yes ) else ( set ROS_BUILDNOSTRIP=no ) -if .%_ROSBE_STRIP%. == .1. ( +if "%_ROSBE_STRIP%" == "1" ( set ROS_LEAN_AND_MEAN=yes ) else ( set ROS_LEAN_AND_MEAN=no ) :: Small Security Check to prevent useless apps. -if .%ROS_LEAN_AND_MEAN%. == .yes. ( - if .%ROS_BUILDNOSTRIP%. == .yes. ( +if "%ROS_LEAN_AND_MEAN%" == "yes" ( + if "%ROS_BUILDNOSTRIP%" == "yes" ( cls echo Selecting Stripping and removing Debug Symbols together will most likely cause useless apps. Please deselect one of them. goto :EOC ) ) -if .%_ROSBE_USECCACHE%. == .1. ( +if "%_ROSBE_USECCACHE%" == "1" ( set CCACHE_DIR=%APPDATA%\RosBE\.ccache - set HOST_CC=ccache gcc - set HOST_CPP=ccache g++ - - REM Target defaults to host(i386) - - set TARGET_CC=ccache gcc - set TARGET_CPP=ccache g++ - if .%ROS_ARCH%. == .arm. ( - set TARGET_CC=ccache arm-pc-mingw32-gcc - set TARGET_CPP=ccache arm-pc-mingw32-g++ - ) - if .%ROS_ARCH%. == .amd64. ( - set TARGET_CC=ccache x86_64-pc-mingw32-gcc - set TARGET_CPP=ccache x86_64-pc-mingw32-g++ - ) - if .%ROS_ARCH%. == .ppc. ( - set TARGET_CC=ccache ppc-pc-mingw32-gcc - set TARGET_CPP=ccache ppc-pc-mingw32-g++ - ) -) else ( - set HOST_CC=gcc - set HOST_CPP=g++ - - REM Target defaults to host(i386) - - set TARGET_CC=gcc - set TARGET_CPP=g++ - if .%ROS_ARCH%. == .arm. ( - set TARGET_CC=arm-pc-mingw32-gcc - set TARGET_CPP=arm-pc-mingw32-g++ - ) - if .%ROS_ARCH%. == .amd64. ( - set TARGET_CC=x86_64-pc-mingw32-gcc - set TARGET_CPP=x86_64-pc-mingw32-g++ - ) - if .%ROS_ARCH%. == .ppc. ( - set TARGET_CC=ppc-pc-mingw32-gcc - set TARGET_CPP=ppc-pc-mingw32-g++ - ) + set _ROSBE_CCACHE=ccache +) + +:: Target defaults to host(i386) + +set HOST_CC=%_ROSBE_CCACHE%gcc +set HOST_CPP=%_ROSBE_CCACHE%g++ + +set TARGET_CC=%_ROSBE_CCACHE%gcc +set TARGET_CPP=%_ROSBE_CCACHE%g++ + +if not "%ROS_ARCH%" == "" ( + set TARGET_CC=%_ROSBE_CCACHE%%ROS_ARCH%-pc-mingw32-gcc + set TARGET_CPP=%_ROSBE_CCACHE%%ROS_ARCH%-pc-mingw32-g++ ) :: @@ -106,7 +81,7 @@ :: if defined _ROSBE_OBJPATH ( if not exist "%_ROSBE_OBJPATH%\." ( - echo ERROR: The path specified doesn't seem to exist. + echo ERROR: The Object-Path specified doesn't seem to exist. goto :EOC ) else ( set ROS_INTERMEDIATE=%_ROSBE_OBJPATH% @@ -114,7 +89,7 @@ ) if defined _ROSBE_OUTPATH ( if not exist "%_ROSBE_OUTPATH%\." ( - echo ERROR: The path specified doesn't seem to exist. + echo ERROR: The Output-Path specified doesn't seem to exist. goto :EOC ) else ( set ROS_OUTPUT=%_ROSBE_OUTPATH% @@ -228,5 +203,4 @@ set ROS_TEMPORARY= set CPUCOUNT= set CCACHE_DIR= -set ROSA_DEL= -set ROSB_DEL= +set _ROSBE_CCACHE= Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Tue Dec 9 02:39:06 2008 @@ -54,57 +54,21 @@ :DEL -if .%ROS_ARCH%. == .arm. ( - if exist "obj-arm\." ( - echo Cleaning ReactOS ARM source directory... - if exist "obj-arm\." ( - rd /s /q "obj-arm" 1> NUL 2> NUL +if not "%ROS_ARCH%" == "" ( + if exist "obj-%ROS_ARCH%\." ( + echo Cleaning ReactOS %ROS_ARCH% source directory... + if exist "obj-%ROS_ARCH%\." ( + rd /s /q "obj-%ROS_ARCH%" 1> NUL 2> NUL ) - if exist "output-arm\." ( - rd /s /q "output-arm" 1> NUL 2> NUL + if exist "output-%ROS_ARCH%\." ( + rd /s /q "output-%ROS_ARCH%" 1> NUL 2> NUL ) - if exist "makefile-arm.auto" ( - del "makefile-arm.auto" 1> NUL 2> NUL + if exist "makefile-%ROS_ARCH%.auto" ( + del "makefile-%ROS_ARCH%.auto" 1> NUL 2> NUL ) - echo Done cleaning ReactOS ARM source directory. + echo Done cleaning ReactOS %ROS_ARCH% source directory. ) else ( - echo ERROR: There is no compiler output to clean. - ) - goto :ROS -) -if .%ROS_ARCH%. == .ppc. ( - if exist "obj-ppc\." ( - echo Cleaning ReactOS PPC source directory... - if exist "obj-ppc\." ( - rd /s /q "obj-ppc" 1> NUL 2> NUL - ) - if exist "output-ppc\." ( - rd /s /q "output-ppc" 1> NUL 2> NUL - ) - if exist "makefile-ppc.auto" ( - del "makefile-ppc.auto" 1> NUL 2> NUL - ) - echo Done cleaning ReactOS PPC source directory. - ) else ( - echo ERROR: There is no compiler output to clean. - ) - goto :ROS -) -if .%ROS_ARCH%. == .amd64. ( - if exist "obj-amd64\." ( - echo Cleaning ReactOS X86_64 source directory... - if exist "obj-amd64\." ( - rd /s /q "obj-amd64" 1> NUL 2> NUL - ) - if exist "output-amd64\." ( - rd /s /q "output-amd64" 1> NUL 2> NUL - ) - if exist "makefile-amd64.auto" ( - del "makefile-amd64.auto" 1> NUL 2> NUL - ) - echo Done cleaning ReactOS X86_64 source directory. - ) else ( - echo ERROR: There is no compiler output to clean. + echo ERROR: There is no %ROS_ARCH% compiler output to clean. ) goto :ROS ) @@ -122,7 +86,7 @@ ) echo Done cleaning ReactOS i386 source directory. ) else ( - echo ERROR: There is no compiler output to clean. + echo ERROR: There is no i386 compiler output to clean. ) :ROS Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Tue Dec 9 02:39:06 2008 @@ -22,7 +22,6 @@ echo Continue? set /p YESNO="(yes), (no)" if /i "%YESNO%"=="yes" goto :CONT - if /i "%YESNO%"=="no" goto :NOK goto :NOK :CONT @@ -46,7 +45,7 @@ echo Continue? set /p YESNO="(yes), (no)" if /i "%YESNO%"=="yes" goto :CONT2 - if /i "%YESNO%"=="no" goto :NOK + goto :NOK :CONT2 del "%_ROSBE_BASEDIR%\*.rbuild" @@ -78,9 +77,7 @@ echo. set /p YESNO="(yes), (no)" - if /i "%YESNO%"=="yes" goto :OK -if /i "%YESNO%"=="no" goto :NOK goto :NOK :OK @@ -101,7 +98,6 @@ echo. set /p YESNO="(yes), (no)" if /i "%YESNO%"=="yes" del "%APPDATA%\RosBE\*.rbuild" | del "config.rbuild" | copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" | goto :OK - if /i "%YESNO%"=="no" goto :NOK endlocal goto :NOK ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Tue Dec 9 02:39:06 2008 @@ -53,7 +53,6 @@ call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" goto :EOC - :: :: If Parameters were set, parse them, if not, ask the user to add them. :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Tue Dec 9 02:39:06 2008 @@ -25,7 +25,7 @@ call :INTERACTIVE ) if "%_2%" == "" ( - call :INTERACTIVE + call :INTERACTIVE2 ) if exist "%_ROSBE_BASEDIR%\%_1%\." ( @@ -66,6 +66,9 @@ echo ERROR: You must enter a MinGW/GCC directory. goto :EOC ) + +:INTERACTIVE2 + set /p _2="Please specify, if this will be the Target or Host GCC: " if "%_2%" == "" ( echo ERROR: You must enter "target" or "host". Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Tue Dec 9 02:39:06 2008 @@ -18,9 +18,7 @@ :: Run options.exe :: if exist "%_ROSBE_BASEDIR%\Tools\options.exe" ( - pushd "%_ROSBE_BASEDIR%" call "%_ROSBE_BASEDIR%\Tools\options.exe" - popd "%_ROSBE_BASEDIR%" if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( call "%APPDATA%\RosBE\rosbe-options.cmd" ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Dec 9 02:39:06 2008 @@ -33,17 +33,17 @@ goto :main ) -if .%_ROSBE_ARCH%. == .1. ( +if "%_ROSBE_ARCH%" == "1" ( set ROS_ARCH=arm set ROS_PREFIX=arm-pc-mingw32 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\arm ) -if .%_ROSBE_ARCH%. == .2. ( +if "%_ROSBE_ARCH%" == "2" ( set ROS_ARCH=ppc set ROS_PREFIX=ppc-pc-mingw32 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\ppc ) -if .%_ROSBE_ARCH%. == .3. ( +if "%_ROSBE_ARCH%" == "3" ( set ROS_ARCH=amd64 set ROS_PREFIX=x86_64-pc-mingw32 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 @@ -101,9 +101,9 @@ :: :: Display the current version of GCC, NASM, ld and make. :: -if not .%ROS_ARCH%. == .. ( +if not "%ROS_ARCH%" == "" ( "%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%-gcc" -v 2>&1 | find "gcc version" - if .%ROS_PREFIX%. == .. ( + if "%ROS_PREFIX%" == "" ( echo gcc target^: %_ROSBE_GCCTARGET% ) else ( echo gcc target^: %ROS_PREFIX:~0,-11% @@ -111,7 +111,7 @@ "%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%-ld" -v ) else ( gcc -v 2>&1 | find "gcc version" - if .%ROS_PREFIX%. == .. ( + if "%ROS_PREFIX%" == "" ( echo gcc target^: %_ROSBE_GCCTARGET% ) else ( echo gcc target^: %ROS_PREFIX:~0,-11% @@ -126,7 +126,7 @@ yasm --version | find "yasm 0" ) else ( if "%_ROSBE_MODE%" == "RosBE" ( - echo ERROR: NASM or YASM is required to build ReactOS, none found in the current MinGW/GCC. + echo ERROR: NASM or YASM is required to build ReactOS, none was found in the current MinGW/GCC. ) ) ) @@ -134,14 +134,14 @@ bison --version | find "GNU Bison" ) else ( if "%_ROSBE_MODE%" == "RosBE" ( - echo WARNING: Bison will soon be required to build ReactOS, none found in the current MinGW/GCC. + echo WARNING: Bison will soon be required to build ReactOS, none was found in the current MinGW/GCC. ) ) if exist "%_ROSBE_HOST_MINGWPATH%\bin\flex.exe" ( flex --version ) else ( if "%_ROSBE_MODE%" == "RosBE" ( - echo WARNING: Flex will soon be required to build ReactOS, none found in the current MinGW/GCC. + echo WARNING: Flex will soon be required to build ReactOS, none was found in the current MinGW/GCC. ) ) mingw32-make -v | find "GNU Make" Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Tue Dec 9 02:39:06 2008 @@ -90,14 +90,14 @@ ) if %OFFSVN% equ %ONSVN% ( echo Your tree is up to date. - goto :EOC + goto :EOF ) :UP2 set /p UP="Please enter 'yes' or 'no': " if /i "%UP%"=="yes" "%_ROSBE_BASEDIR%\ssvn" update -if /i "%UP%"=="no" goto :EOC +if /i "%UP%"=="no" goto :EOF :EOC Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Tue Dec 9 02:39:06 2008 @@ -123,7 +123,8 @@ call :STATUS set /a _ROSBE_STATCOUNT+=1 call :STATUS - goto :UPDFIN + call :UPDFIN + goto :EOC ) if not "%1" == "" ( echo Unknown parameter specified. Try 'help update'. @@ -166,7 +167,7 @@ ) else ( echo RosBE is up to Date. ) -goto :EOC +goto :EOF :UPDCHECK

1 0

[cwittich] 37954: sync CreateWellKnownSid with wine
by cwittich＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: cwittich Date: Tue Dec 9 01:09:25 2008 New Revision: 37954 URL: http://svn.reactos.org/svn/reactos?rev=37954&view=rev Log: sync CreateWellKnownSid with wine Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Tue Dec 9 01:09:25 2008 @@ -97,6 +97,39 @@ { {'R','U'}, WinBuiltinPreWindows2000CompatibleAccessSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_PREW2KCOMPACCESS } } }, { {'R','D'}, WinBuiltinRemoteDesktopUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS } } }, { {'N','O'}, WinBuiltinNetworkConfigurationOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS } } }, + { {0,0}, WinNTLMAuthenticationSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_PACKAGE_BASE_RID, SECURITY_PACKAGE_NTLM_RID } } }, + { {0,0}, WinDigestAuthenticationSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_PACKAGE_BASE_RID, SECURITY_PACKAGE_DIGEST_RID } } }, + { {0,0}, WinSChannelAuthenticationSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_PACKAGE_BASE_RID, SECURITY_PACKAGE_SCHANNEL_RID } } }, + { {0,0}, WinThisOrganizationSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_THIS_ORGANIZATION_RID } } }, + { {0,0}, WinOtherOrganizationSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_OTHER_ORGANIZATION_RID } } }, + { {0,0}, WinBuiltinIncomingForestTrustBuildersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_INCOMING_FOREST_TRUST_BUILDERS } } }, + { {0,0}, WinBuiltinPerfMonitoringUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_MONITORING_USERS } } }, + { {0,0}, WinBuiltinPerfLoggingUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_LOGGING_USERS } } }, + { {0,0}, WinBuiltinAuthorizationAccessSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS } } }, + { {0,0}, WinBuiltinTerminalServerLicenseServersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS } } }, + { {0,0}, WinBuiltinDCOMUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_DCOM_USERS } } }, +}; + +typedef struct WELLKNOWNRID +{ + WELL_KNOWN_SID_TYPE Type; + DWORD Rid; +} WELLKNOWNRID; + +static const WELLKNOWNRID WellKnownRids[] = { + { WinAccountAdministratorSid, DOMAIN_USER_RID_ADMIN }, + { WinAccountGuestSid, DOMAIN_USER_RID_GUEST }, + { WinAccountKrbtgtSid, DOMAIN_USER_RID_KRBTGT }, + { WinAccountDomainAdminsSid, DOMAIN_GROUP_RID_ADMINS }, + { WinAccountDomainUsersSid, DOMAIN_GROUP_RID_USERS }, + { WinAccountDomainGuestsSid, DOMAIN_GROUP_RID_GUESTS }, + { WinAccountComputersSid, DOMAIN_GROUP_RID_COMPUTERS }, + { WinAccountControllersSid, DOMAIN_GROUP_RID_CONTROLLERS }, + { WinAccountCertAdminsSid, DOMAIN_GROUP_RID_CERT_ADMINS }, + { WinAccountSchemaAdminsSid, DOMAIN_GROUP_RID_SCHEMA_ADMINS }, + { WinAccountEnterpriseAdminsSid, DOMAIN_GROUP_RID_ENTERPRISE_ADMINS }, + { WinAccountPolicyAdminsSid, DOMAIN_GROUP_RID_POLICY_ADMINS }, + { WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, }; static const SID sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; @@ -1533,27 +1566,16 @@ unsigned int i; TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid); - if (DomainSid != NULL) - { - FIXME("Only local computer supported!\n"); - SetLastError(ERROR_INVALID_PARAMETER); /* FIXME */ - return FALSE; - } - - if (cbSid == NULL || pSid == NULL) - { + if (cbSid == NULL || pSid == NULL || (DomainSid && !IsValidSid(DomainSid))) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) - { - if (WellKnownSids[i].Type == WellKnownSidType) - { + for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) { + if (WellKnownSids[i].Type == WellKnownSidType) { DWORD length = GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); - if (*cbSid < length) - { + if (*cbSid < length) { SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } @@ -1563,6 +1585,30 @@ return TRUE; } } + + if (DomainSid == NULL || *GetSidSubAuthorityCount(DomainSid) == SID_MAX_SUB_AUTHORITIES) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) + if (WellKnownRids[i].Type == WellKnownSidType) { + UCHAR domain_subauth = *GetSidSubAuthorityCount(DomainSid); + DWORD domain_sid_length = GetSidLengthRequired(domain_subauth); + DWORD output_sid_length = GetSidLengthRequired(domain_subauth + 1); + + if (*cbSid < output_sid_length) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + CopyMemory(pSid, DomainSid, domain_sid_length); + (*GetSidSubAuthorityCount(pSid))++; + (*GetSidSubAuthority(pSid, domain_subauth)) = WellKnownRids[i].Rid; + *cbSid = output_sid_length; + return TRUE; + } SetLastError(ERROR_INVALID_PARAMETER); return FALSE;

1 0

[jimtabor] 37953: - Fixed build.
by jimtabor＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: jimtabor Date: Tue Dec 9 00:05:29 2008 New Revision: 37953 URL: http://svn.reactos.org/svn/reactos?rev=37953&view=rev Log: - Fixed build. Modified: trunk/reactos/include/reactos/wine/winnls.h Modified: trunk/reactos/include/reactos/wine/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winnl… ============================================================================== --- trunk/reactos/include/reactos/wine/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winnls.h [iso-8859-1] Tue Dec 9 00:05:29 2008 @@ -19,6 +19,8 @@ #ifndef __WINE_WINNLS_H #define __WINE_WINNLS_H +#include_next <winnls.h> + #define CP_UNIXCP CP_ACP

1 0

[jimtabor] 37951: - New patch by hto: Suspicious code in User32.dll, see bug 3935.
by jimtabor＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: jimtabor Date: Mon Dec 8 19:40:37 2008 New Revision: 37951 URL: http://svn.reactos.org/svn/reactos?rev=37951&view=rev Log: - New patch by hto: Suspicious code in User32.dll, see bug 3935. Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Mon Dec 8 19:40:37 2008 @@ -2035,7 +2035,7 @@ LPSTR lpString, int nMaxCount) { - if (lpString && (lpString > 0)) lpString[0] = '\0'; + if (lpString && (nMaxCount > 0)) lpString[0] = '\0'; return (UINT)SendDlgItemMessageA( hDlg, nIDDlgItem, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); } @@ -2051,7 +2051,7 @@ LPWSTR lpString, int nMaxCount) { - if (lpString && (lpString > 0)) lpString[0] = '\0'; + if (lpString && (nMaxCount > 0)) lpString[0] = '\0'; return (UINT)SendDlgItemMessageW( hDlg, nIDDlgItem, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); }

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