Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 44588: copy from trunk
by tkreuzer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: tkreuzer Date: Mon Dec 14 23:44:39 2009 New Revision: 44588 URL: http://svn.reactos.org/svn/reactos?rev=44588&view=rev Log: copy from trunk Modified: branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/enum.c Modified: branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/enum.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/enum.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/enum.c [iso-8859-1] Mon Dec 14 23:44:39 2009 @@ -93,7 +93,7 @@ DriverNameA[0] = 0; if (ProductName) { - WideCharToMultiByte(CP_ACP, 0, ProductName, -1, DriverNameA, sizeof(DriverNameA) / sizeof(char), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, ProductName, -1, DriverNameA, sizeof(DriverNameA) / sizeof(char), NULL, NULL); DriverNameA[(sizeof(DriverNameA) / sizeof(char))-1] = 0; }

1 0

[tkreuzer] 44587: remove unneccessary file entry for spec file
by tkreuzer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: tkreuzer Date: Mon Dec 14 23:29:15 2009 New Revision: 44587 URL: http://svn.reactos.org/svn/reactos?rev=44587&view=rev Log: remove unneccessary file entry for spec file Modified: trunk/reactos/dll/directx/d3d8/d3d8.rbuild Modified: trunk/reactos/dll/directx/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8/d3d8.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d8/d3d8.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d8/d3d8.rbuild [iso-8859-1] Mon Dec 14 23:29:15 2009 @@ -4,5 +4,4 @@ <importlibrary definition="d3d8.spec" /> <file>d3d8.c</file> <file>d3d8.rc</file> - <file>d3d8.spec</file> </module>

1 0

[tkreuzer] 44586: Copy file from trunk. Only formatting fixes.
by tkreuzer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: tkreuzer Date: Mon Dec 14 21:31:24 2009 New Revision: 44586 URL: http://svn.reactos.org/svn/reactos?rev=44586&view=rev Log: Copy file from trunk. Only formatting fixes. Modified: branches/ros-amd64-bringup/reactos/base/setup/reactos/reactos.c Modified: branches/ros-amd64-bringup/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/setup/reactos/reactos.c [iso-8859-1] Mon Dec 14 21:31:24 2009 @@ -1021,7 +1021,7 @@ &LineLength); ++Count; } - while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.LangCount); + while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.LangCount); } } } @@ -1094,52 +1094,52 @@ // get install directory if (SetupFindFirstLine(hTxtsetupSif, _T("SetupData"), _T("DefaultPath"), &InfContext)) - { - SetupGetStringField(&InfContext, - 1, + { + SetupGetStringField(&InfContext, + 1, SetupData.InstallDir, sizeof(SetupData.InstallDir) / sizeof(TCHAR), - &LineLength); - } + &LineLength); + } SetupCloseInfFile(hTxtsetupSif); - } - } + } +} LONG LoadGenentry(HINF hinf,PCTSTR name,PGENENTRY gen,PINFCONTEXT context) - { +{ LONG TotalCount; TotalCount = SetupGetLineCount(hinf, name); if (TotalCount > 0) - { + { gen = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GENENTRY) * TotalCount); if (gen != NULL) { if (SetupFindFirstLine(hinf, name, NULL, context)) { LONG Count = 0; - do - { + do + { SetupGetStringField(context, - 0, + 0, gen[Count].Id, sizeof(gen[Count].Id) / sizeof(TCHAR), NULL); SetupGetStringField(context, - 1, + 1, gen[Count].Value, sizeof(gen[Count].Value) / sizeof(TCHAR), NULL); Count++; - } + } while (SetupFindNextLine(context, context) && Count < TotalCount); - } - } - } + } + } + } return TotalCount; - } +} BOOL isUnattendSetup() {

1 0

[tkreuzer] 44585: reduce differences to trunk
by tkreuzer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: tkreuzer Date: Mon Dec 14 21:15:56 2009 New Revision: 44585 URL: http://svn.reactos.org/svn/reactos?rev=44585&view=rev Log: reduce differences to trunk Modified: branches/ros-amd64-bringup/reactos/base/applications/iexplore/iexplore.rbuild Modified: branches/ros-amd64-bringup/reactos/base/applications/iexplore/iexplore.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/iexplore/iexplore.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/iexplore/iexplore.rbuild [iso-8859-1] Mon Dec 14 21:15:56 2009 @@ -4,7 +4,7 @@ <include base="iexplore">.</include> <library>user32</library> <library>gdi32</library> - <library>shdocvw</library> + <library>shdocvw</library> <file>main.c</file> <file>version.rc</file> </module>

1 0

[tkreuzer] 44584: remove unneccessary change from wine code
by tkreuzer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: tkreuzer Date: Mon Dec 14 21:03:59 2009 New Revision: 44584 URL: http://svn.reactos.org/svn/reactos?rev=44584&view=rev Log: remove unneccessary change from wine code Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/wined3d_private.h Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Mon Dec 14 21:03:59 2009 @@ -2551,7 +2551,7 @@ void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx, DWORD dst) DECLSPEC_HIDDEN; void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords, - BOOL transformed, WINED3DFORMAT coordtype, BOOL ffp_can_disable_proj) DECLSPEC_HIDDEN; + BOOL transformed, DWORD coordtype, BOOL ffp_can_disable_proj) DECLSPEC_HIDDEN; void texture_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) DECLSPEC_HIDDEN; void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock,

1 0

[tkreuzer] 44583: [LIBXSLT] Add HAVE_STAT definition. fixes a warning.
by tkreuzer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: tkreuzer Date: Mon Dec 14 20:47:13 2009 New Revision: 44583 URL: http://svn.reactos.org/svn/reactos?rev=44583&view=rev Log: [LIBXSLT] Add HAVE_STAT definition. fixes a warning. Modified: trunk/reactos/dll/3rdparty/libxslt/libxslt.rbuild Modified: trunk/reactos/dll/3rdparty/libxslt/libxslt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/libxs… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/libxslt.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/libxslt.rbuild [iso-8859-1] Mon Dec 14 20:47:13 2009 @@ -5,6 +5,7 @@ <define name="WIN32" /> <define name="_WINDOWS" /> <define name="_MBCS" /> + <define name="HAVE_STAT" /> <define name="HAVE_WIN32_THREADS" /> <define name="_REENTRANT" /> <define name="_WINSOCKAPI_" />

1 0

[janderwald] 44582: - Setup registry entries for the default user shell - May fix bug 5020
by janderwald＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: janderwald Date: Mon Dec 14 20:36:22 2009 New Revision: 44582 URL: http://svn.reactos.org/svn/reactos?rev=44582&view=rev Log: - Setup registry entries for the default user shell - May fix bug 5020 Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] Mon Dec 14 20:36:22 2009 @@ -1451,6 +1451,9 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu","{208D2C60-3AEA-1069-A2D7-08002B30309D}",0x00010001,0x00000000 HKCU,"Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{20D04FE0-3AEA-1069-A2D8-08002B30309D}",,0x00000012 +; default shell +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKCU,"SOFTWARE\Microsoft\Windows NT",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Mon Dec 14 20:36:22 2009 @@ -1646,6 +1646,10 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu","{208D2C60-3AEA-1069-A2D7-08002B30309D}",0x00010001,0x00000000 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{20D04FE0-3AEA-1069-A2D8-08002B30309D}",,0x00000012 + +; default shell +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x00000012

1 0

[sserapion] 44581: fix build 2.
by sserapion＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: sserapion Date: Mon Dec 14 20:12:05 2009 New Revision: 44581 URL: http://svn.reactos.org/svn/reactos?rev=44581&view=rev Log: fix build 2. Modified: branches/ros-amd64-bringup/reactos/Makefile Modified: branches/ros-amd64-bringup/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/Makef… ============================================================================== --- branches/ros-amd64-bringup/reactos/Makefile [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/Makefile [iso-8859-1] Mon Dec 14 20:12:05 2009 @@ -353,6 +353,7 @@ endif export SEP = / mkdir = -$(Q)mkdir -p + touch = $(Q)touch rm = $(Q)rm -f cp = $(Q)cp NUL = /dev/null @@ -361,6 +362,7 @@ ROS_EMPTY = export SEP = \$(ROS_EMPTY) mkdir = -$(Q)mkdir + touch = $(Q)copy /y NUL rm = $(Q)del /f /q cp = $(Q)copy /y NUL = NUL

1 0

[sserapion] 44580: fix build.
by sserapion＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: sserapion Date: Mon Dec 14 20:01:42 2009 New Revision: 44580 URL: http://svn.reactos.org/svn/reactos?rev=44580&view=rev Log: fix build. Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Mon Dec 14 20:01:42 2009 @@ -259,7 +259,7 @@ ${call RBUILD_intermediate_path_noext,$(2)}_c.c ${call RBUILD_intermediate_path_noext,$(2)}_c.h: ${call RBUILD_intermediate_path_noext,$(2)}_c ${call RBUILD_intermediate_path_noext,$(2)}_c: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} - $$(ECHO_WIDL) + $$(ECHO_WIDL) $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call RBUILD_intermediate_path_noext,$(2)}_c.c $(2) $${touch} $$@>$(NUL) ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,,${call RBUILD_intermediate_path_noext,$(2)}_c.o}

1 0

[sserapion] 44579: Try to fix IDL compilation race condition with patch from bug #4994
by sserapion＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: sserapion Date: Mon Dec 14 19:55:32 2009 New Revision: 44579 URL: http://svn.reactos.org/svn/reactos?rev=44579&view=rev Log: Try to fix IDL compilation race condition with patch from bug #4994 Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Mon Dec 14 19:55:32 2009 @@ -20,6 +20,7 @@ #(source) RBUILD_name=$(basename $(notdir $(1))) +RBUILD_noext=$(dir $(1))$(basename $(notdir $(1))) #(source) RBUILD_dir=${call RBUILD_fullpath,$(dir ${call RBUILD_compress_prefixes,$(1)})} @@ -255,10 +256,12 @@ $(2): $${$(1)_precondition} -${call RBUILD_intermediate_path_noext,$(2)}_c.c ${call RBUILD_intermediate_path_noext,$(2)}_c.h: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} - $$(ECHO_WIDL) +${call RBUILD_intermediate_path_noext,$(2)}_c.c ${call RBUILD_intermediate_path_noext,$(2)}_c.h: ${call RBUILD_intermediate_path_noext,$(2)}_c + +${call RBUILD_intermediate_path_noext,$(2)}_c: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} + $$(ECHO_WIDL) $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call RBUILD_intermediate_path_noext,$(2)}_c.c $(2) - + $${touch} $$@>$(NUL) ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,,${call RBUILD_intermediate_path_noext,$(2)}_c.o} endef @@ -268,10 +271,12 @@ $(2): $${$(1)_precondition} -${call RBUILD_intermediate_path_noext,$(2)}_s.c ${call RBUILD_intermediate_path_noext,$(2)}_s.h: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} +${call RBUILD_intermediate_path_noext,$(2)}_s.c ${call RBUILD_intermediate_path_noext,$(2)}_s.h: ${call RBUILD_intermediate_path_noext,$(2)}_s + +${call RBUILD_intermediate_path_noext,$(2)}_s: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} $$(ECHO_WIDL) $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_s.h -s -S ${call RBUILD_intermediate_path_noext,$(2)}_s.c $(2) - + $${touch} $$@>$(NUL) ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,,${call RBUILD_intermediate_path_noext,$(2)}_s.o} endef @@ -281,10 +286,12 @@ $(2): $${$(1)_precondition} -${call RBUILD_intermediate_path_noext,$(2)}_p.c ${call RBUILD_intermediate_path_noext,$(2)}_p.h: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} +${call RBUILD_intermediate_path_noext,$(2)}_p.c ${call RBUILD_intermediate_path_noext,$(2)}_p.h: ${call RBUILD_intermediate_path_noext,$(2)}_p + +${call RBUILD_intermediate_path_noext,$(2)}_p: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} $$(ECHO_WIDL) $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_p.h -p -P ${call RBUILD_intermediate_path_noext,$(2)}_p.c $(2) - + $${touch} $$@>$(NUL) ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_p.c,,,${call RBUILD_intermediate_path_noext,$(2)}_p.o} endef

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