Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 44598: [MSACM32] Copy from trunk
by tkreuzer＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: tkreuzer Date: Tue Dec 15 05:25:05 2009 New Revision: 44598 URL: http://svn.reactos.org/svn/reactos?rev=44598&view=rev Log: [MSACM32] Copy from trunk Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Cs.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Da.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ja.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ko.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Lt.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Pl.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ro.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ru.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Si.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Tr.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Zh.rc Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Cs.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Cs.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Cs.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -19,6 +19,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "wineacm.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Da.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Da.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "wineacm.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ja.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ja.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -27,24 +27,24 @@ DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "???????" +CAPTION "ãµã¦ã³ãã®é¸æ" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "??(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP + LTEXT "åå(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "????????(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "??(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "ååãä»ãã¦ä¿å(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "åé¤(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - LTEXT "??????(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "ãã©ã¼ããã(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "??(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "å±æ§(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP #if 0 COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, @@ -55,9 +55,7 @@ CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP #endif DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "?????", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "???(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "ãã«ã(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END - -#pragma code_page(default) Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ko.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ko.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "wineacm.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Lt.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Lt.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "wineacm.h" /* UTF-8 */ #pragma code_page(65001) @@ -57,5 +59,3 @@ PUSHBUTTON "&Å½inynas", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END - -#pragma code_page(default) Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Pl.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Pl.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -18,6 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #include "wineacm.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ro.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ro.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -16,6 +16,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "wineacm.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -50,5 +52,3 @@ PUSHBUTTON "&Ajutor", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END - -#pragma code_page(default) Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ru.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ru.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -27,24 +27,24 @@ DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "????? ?????" +CAPTION "ÐÑÐ±Ð¾Ñ Ð·Ð²ÑÐºÐ°" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&???:", -1, 5, 5, 115, 8, NOT WS_GROUP + LTEXT "&ÐÐ¼Ñ:", -1, 5, 5, 115, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&????????? ???...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&???????", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÐºÐ°Ðº...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - LTEXT "&??????:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Ð¤Ð¾ÑÐ¼Ð°Ñ:", -1, 5, 41, 44, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&????????:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°:", -1, 5, 59, 44, 8, NOT WS_GROUP #if 0 COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, @@ -55,7 +55,7 @@ CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP #endif DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "??????", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&??????", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&ÐÐ¾Ð¼Ð¾ÑÑ", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Si.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Si.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "wineacm.h" #pragma code_page(65001) @@ -56,5 +58,3 @@ PUSHBUTTON "&PomoÄ", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END - -#pragma code_page(default) Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Tr.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Tr.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "wineacm.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Zh.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Zh.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "wineacm.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -94,5 +96,3 @@ PUSHBUTTON "å¹«å©(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END - -#pragma code_page(default)

1 0

[jimtabor] 44597: [Win32k] - Remove LastChild.
by jimtabor＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: jimtabor Date: Tue Dec 15 02:11:46 2009 New Revision: 44597 URL: http://svn.reactos.org/svn/reactos?rev=44597&view=rev Log: [Win32k] - Remove LastChild. Modified: trunk/reactos/subsystems/win32/win32k/include/window.h Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Tue Dec 15 02:11:46 2009 @@ -42,7 +42,6 @@ /* Pointer to the owning thread's message queue. */ PUSER_MESSAGE_QUEUE MessageQueue; struct _WINDOW_OBJECT* spwndChild; - struct _WINDOW_OBJECT* LastChild; struct _WINDOW_OBJECT* spwndNext; struct _WINDOW_OBJECT* spwndPrev; /* Entry in the list of thread windows. */

1 0

[tkreuzer] 44596: [IMAGEHLP] Don't use explicit 32 bit version of IMAGE_OPTIONAL_HEADER
by tkreuzer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: tkreuzer Date: Tue Dec 15 00:35:40 2009 New Revision: 44596 URL: http://svn.reactos.org/svn/reactos?rev=44596&view=rev Log: [IMAGEHLP] Don't use explicit 32 bit version of IMAGE_OPTIONAL_HEADER Modified: trunk/reactos/dll/win32/imagehlp/modify.c Modified: trunk/reactos/dll/win32/imagehlp/modify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/modify.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] Tue Dec 15 00:35:40 2009 @@ -882,7 +882,7 @@ LOADED_IMAGE FileData; PLOADED_IMAGE File; PIMAGE_FILE_HEADER FileHeader; - PIMAGE_OPTIONAL_HEADER32 OptionalHeader; + PIMAGE_OPTIONAL_HEADER OptionalHeader; ULONG CheckSum, HeaderCheckSum, OldChecksum; SYSTEMTIME SystemTime; FILETIME LastWriteTime;

1 0

[dreimer] 44595: Fix makex in the PS Version of RosBE. (Where does this } come from???)
by dreimer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: dreimer Date: Tue Dec 15 00:20:59 2009 New Revision: 44595 URL: http://svn.reactos.org/svn/reactos?rev=44595&view=rev Log: Fix makex in the PS Version of RosBE. (Where does this } come from???) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Dec 15 00:20:59 2009 @@ -102,7 +102,7 @@ set-alias HELP "$_ROSBE_BASEDIR\Help.ps1" -scope Global set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global - function global:MAKEX {IEX "&'$_ROSBE_BASEDIR\Build.ps1' multi $args}"} + function global:MAKEX {IEX "&'$_ROSBE_BASEDIR\Build.ps1' multi $args"} if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { set-alias RADDR2LINE "$_ROSBE_BASEDIR\reladdr2line.ps1" -scope Global

1 0

[hyperion] 44594: modified Makefile New ${checkpoint} command to create an empty "checkpoint" file, to store the last modified date of a make target modified tools/rbuild/backend/mingw/rules.mak Rules that output more than one file at once don't mix well with parallel builds: serialize dependency checks through the use of checkpoint files. Fixes intermittent widl issues in highly parallel builds Bonus internal rbuild function that I had to commit one day or another See issue #4994 for more detai
by hyperion＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: hyperion Date: Tue Dec 15 00:02:28 2009 New Revision: 44594 URL: http://svn.reactos.org/svn/reactos?rev=44594&view=rev Log: modified Makefile New ${checkpoint} command to create an empty "checkpoint" file, to store the last modified date of a make target modified tools/rbuild/backend/mingw/rules.mak Rules that output more than one file at once don't mix well with parallel builds: serialize dependency checks through the use of checkpoint files. Fixes intermittent widl issues in highly parallel builds Bonus internal rbuild function that I had to commit one day or another See issue #4994 for more details. Modified: trunk/reactos/Makefile trunk/reactos/tools/rbuild/backend/mingw/rules.mak Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=44594&r1=4459… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Tue Dec 15 00:02:28 2009 @@ -353,6 +353,7 @@ endif export SEP = / mkdir = -$(Q)mkdir -p + checkpoint = $(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 + checkpoint = $(Q)copy /y NUL rm = $(Q)del /f /q cp = $(Q)copy /y NUL = NUL Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Tue Dec 15 00:02:28 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,9 +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)} +${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) + $${checkpoint} $$@>$(NUL) ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_c.o} @@ -268,9 +272,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) + $${checkpoint} $$@>$(NUL) ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_s.o} @@ -281,9 +288,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) + $${checkpoint} $$@>$(NUL) ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_p.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_p.o}

1 0

[tkreuzer] 44593: use tabs in rbuild file (copied from trunk)
by tkreuzer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: tkreuzer Date: Mon Dec 14 23:59:38 2009 New Revision: 44593 URL: http://svn.reactos.org/svn/reactos?rev=44593&view=rev Log: use tabs in rbuild file (copied from trunk) Modified: branches/ros-amd64-bringup/reactos/dll/win32/nddeapi/nddeapi.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/nddeapi/nddeapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/nddeapi/nddeapi.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/nddeapi/nddeapi.rbuild [iso-8859-1] Mon Dec 14 23:59:38 2009 @@ -1,9 +1,9 @@ <module name="nddeapi" type="win32dll" baseaddress="${BASEADDRESS_NDDEAPI}" installbase="system32" installname="nddeapi.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="nddeapi.spec" /> - <include base="nddeapi">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> - <library>wine</library> - <library>ntdll</library> - <file>nddeapi.c</file> + <importlibrary definition="nddeapi.spec" /> + <include base="nddeapi">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>wine</library> + <library>ntdll</library> + <file>nddeapi.c</file> </module>

1 0

[tkreuzer] 44592: revert last commit (sorry, wrong direction)
by tkreuzer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: tkreuzer Date: Mon Dec 14 23:58:51 2009 New Revision: 44592 URL: http://svn.reactos.org/svn/reactos?rev=44592&view=rev Log: revert last commit (sorry, wrong direction) Modified: trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild Modified: trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/nddeapi/nddeapi.… ============================================================================== --- trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild [iso-8859-1] Mon Dec 14 23:58:51 2009 @@ -1,9 +1,9 @@ <module name="nddeapi" type="win32dll" baseaddress="${BASEADDRESS_NDDEAPI}" installbase="system32" installname="nddeapi.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="nddeapi.spec" /> - <include base="nddeapi">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> - <library>wine</library> - <library>ntdll</library> - <file>nddeapi.c</file> + <importlibrary definition="nddeapi.spec" /> + <include base="nddeapi">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>wine</library> + <library>ntdll</library> + <file>nddeapi.c</file> </module>

1 0

[gadamopoulos] 44591: [win32k] - Don't store LastChild in WINDOW_OBJECT
by gadamopoulos＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: gadamopoulos Date: Mon Dec 14 23:58:03 2009 New Revision: 44591 URL: http://svn.reactos.org/svn/reactos?rev=44591&view=rev Log: [win32k] - Don't store LastChild in WINDOW_OBJECT Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Dec 14 23:58:03 2009 @@ -1060,11 +1060,6 @@ /* link after WndPrevSibling */ if ((Wnd->spwndNext = WndPrevSibling->spwndNext)) Wnd->spwndNext->spwndPrev = Wnd; - else if ((Parent = Wnd->spwndParent)) - { - if(Parent->LastChild == WndPrevSibling) - Parent->LastChild = Wnd; - } Wnd->spwndPrev->spwndNext = Wnd; } else @@ -1075,7 +1070,6 @@ Wnd->spwndNext->spwndPrev = Wnd; else if (Parent) { - Parent->LastChild = Wnd; Parent->spwndChild = Wnd; return; } @@ -1276,8 +1270,6 @@ if (Wnd->spwndNext) Wnd->spwndNext->spwndPrev = Wnd->spwndPrev; - else if (WndParent && WndParent->LastChild == Wnd) - WndParent->LastChild = Wnd->spwndPrev; if (Wnd->spwndPrev) Wnd->spwndPrev->spwndNext = Wnd->spwndNext; @@ -1956,7 +1948,6 @@ Window->OwnerThread = PsGetCurrentThread(); Window->spwndChild = NULL; - Window->LastChild = NULL; Window->spwndPrev = NULL; Window->spwndNext = NULL; @@ -2290,7 +2281,13 @@ { PWINDOW_OBJECT PrevSibling; - PrevSibling = ParentWindow->LastChild; + PrevSibling = ParentWindow->spwndChild; + + if(PrevSibling) + { + while (PrevSibling->spwndNext) + PrevSibling = PrevSibling->spwndNext; + } /* link window as bottom sibling */ IntLinkWindow(Window, ParentWindow, PrevSibling /*prev sibling*/); @@ -3698,8 +3695,16 @@ case GW_HWNDLAST: if((Parent = Window->spwndParent)) { - if (Parent->LastChild) - hWndResult = Parent->LastChild->hSelf; + if (Parent->spwndChild) + { + Window = Parent->spwndChild; + if(Window) + { + while(Window->spwndNext) + Window = Window->spwndNext; + } + hWndResult = Window->hSelf; + } } break; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Mon Dec 14 23:58:03 2009 @@ -1002,10 +1002,17 @@ } else if (WinPos.hwndInsertAfter == HWND_BOTTOM) { - if(ParentWindow->LastChild) + if(ParentWindow->spwndChild) { - UserReferenceObject(ParentWindow->LastChild); - InsertAfterWindow = ParentWindow->LastChild; + InsertAfterWindow = ParentWindow->spwndChild; + + if(InsertAfterWindow) + { + while (InsertAfterWindow->spwndNext) + InsertAfterWindow = InsertAfterWindow->spwndNext; + } + + UserReferenceObject(InsertAfterWindow); } else InsertAfterWindow = NULL;

1 0

[tkreuzer] 44590: use tabs in rbuild file (copied from trunk)
by tkreuzer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: tkreuzer Date: Mon Dec 14 23:57:33 2009 New Revision: 44590 URL: http://svn.reactos.org/svn/reactos?rev=44590&view=rev Log: use tabs in rbuild file (copied from trunk) Modified: trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild Modified: trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/nddeapi/nddeapi.… ============================================================================== --- trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild [iso-8859-1] Mon Dec 14 23:57:33 2009 @@ -1,9 +1,9 @@ <module name="nddeapi" type="win32dll" baseaddress="${BASEADDRESS_NDDEAPI}" installbase="system32" installname="nddeapi.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="nddeapi.spec" /> - <include base="nddeapi">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> - <library>wine</library> - <library>ntdll</library> - <file>nddeapi.c</file> + <importlibrary definition="nddeapi.spec" /> + <include base="nddeapi">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>wine</library> + <library>ntdll</library> + <file>nddeapi.c</file> </module>

1 0

[tkreuzer] 44589: [KSUSER] Remove broken HeapAlloc prototype
by tkreuzer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: tkreuzer Date: Mon Dec 14 23:52:08 2009 New Revision: 44589 URL: http://svn.reactos.org/svn/reactos?rev=44589&view=rev Log: [KSUSER] Remove broken HeapAlloc prototype Modified: trunk/reactos/dll/directx/ksuser/ksuser.h Modified: trunk/reactos/dll/directx/ksuser/ksuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] Mon Dec 14 23:52:08 2009 @@ -10,14 +10,6 @@ #include <ks.h> -LPVOID -__stdcall -HeapAlloc( - HANDLE hHeap, - DWORD dwFlags, - DWORD dwBytes -); - #define ROUND_DOWN(n, align) \ (((ULONG)n) & ~((align) - 1l))

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