Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[peterw] 29760: - Updated patches to the latest ones.
by peterw＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: peterw Date: Mon Oct 22 03:12:07 2007 New Revision: 29760 URL: http://svn.reactos.org/svn/reactos?rev=29760&view=rev Log: - Updated patches to the latest ones. Added: trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-prerelease-w3seek.patch (with props) trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-virtual-stdcall-bug27067.patch (with props) trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch (with props) trunk/tools/RosBE-Windows/Patches/binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch (with props) Removed: trunk/tools/RosBE-Windows/Patches/ld.patch trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch Added: trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-prerelease-w3seek.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/GCC-v4… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-prerelease-w3seek.patch (added) +++ trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-prerelease-w3seek.patch Mon Oct 22 03:12:07 2007 @@ -1,0 +1,81 @@ +Index: libstdc++-v3/config/os/mingw32/os_defines.h +=================================================================== +--- libstdc++-v3/config/os/mingw32/os_defines.h (revision 129382) ++++ libstdc++-v3/config/os/mingw32/os_defines.h (working copy) +@@ -45,6 +45,13 @@ + #undef NOMINMAX + #define NOMINMAX 1 + ++// mingw32 local hack: Override _GLIBCXX_USE_WCHAR_T for wstring ++#define _GLIBCXX_USE_WSTRING 1 ++ ++// mingw32 local hack: Cast long double to doubles to workaround ++// printf bug. ++#define _GLIBCXX_NO_LONG_DOUBLE_IO 0 ++ + // See libstdc++/20806. + #define _GLIBCXX_HAVE_DOS_BASED_FILESYSTEM 1 + +Index: libstdc++-v3/include/bits/char_traits.h +=================================================================== +--- libstdc++-v3/include/bits/char_traits.h (revision 129382) ++++ libstdc++-v3/include/bits/char_traits.h (working copy) +@@ -295,7 +295,7 @@ + }; + + +-#ifdef _GLIBCXX_USE_WCHAR_T ++#if defined (_GLIBCXX_USE_WCHAR_T) || defined (_GLIBCXX_USE_WSTRING) + /// @brief 21.1.3.2 char_traits specializations + template<> + struct char_traits<wchar_t> +@@ -303,8 +303,10 @@ + typedef wchar_t char_type; + typedef wint_t int_type; + typedef streamoff off_type; ++#if defined (_GLIBCXX_USE_WCHAR_T) + typedef wstreampos pos_type; + typedef mbstate_t state_type; ++#endif + + static void + assign(char_type& __c1, const char_type& __c2) +Index: libstdc++-v3/include/bits/stringfwd.h +=================================================================== +--- libstdc++-v3/include/bits/stringfwd.h (revision 129382) ++++ libstdc++-v3/include/bits/stringfwd.h (working copy) +@@ -59,7 +59,7 @@ + + typedef basic_string<char> string; + +-#ifdef _GLIBCXX_USE_WCHAR_T ++#if defined (_GLIBCXX_USE_WCHAR_T) || defined (_GLIBCXX_USE_WSTRING) + template<> struct char_traits<wchar_t>; + + typedef basic_string<wchar_t> wstring; +Index: libstdc++-v3/include/c_std/std_cwchar.h +=================================================================== +--- libstdc++-v3/include/c_std/std_cwchar.h (revision 129382) ++++ libstdc++-v3/include/c_std/std_cwchar.h (working copy) +@@ -138,7 +138,7 @@ + #undef wprintf + #undef wscanf + +-#if _GLIBCXX_USE_WCHAR_T ++#if _GLIBCXX_USE_WCHAR_T || _GLIBCXX_USE_WSTRING + namespace std + { + using ::wint_t; +Index: libstdc++-v3/include/c_std/std_cwctype.h +=================================================================== +--- libstdc++-v3/include/c_std/std_cwctype.h (revision 129382) ++++ libstdc++-v3/include/c_std/std_cwctype.h (working copy) +@@ -75,7 +75,7 @@ + #undef wctrans + #undef wctype + +-#if _GLIBCXX_USE_WCHAR_T ++#if _GLIBCXX_USE_WCHAR_T || _GLIBCXX_USE_WSTRING + namespace std + { + using ::wint_t; // cwchar Propchange: trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-prerelease-w3seek.patch ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-virtual-stdcall-bug27067.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/GCC-v4… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-virtual-stdcall-bug27067.patch (added) +++ trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-virtual-stdcall-bug27067.patch Mon Oct 22 03:12:07 2007 @@ -1,0 +1,137 @@ +Index: gcc/target.h +=================================================================== +--- gcc/target.h (revision 129382) ++++ gcc/target.h (working copy) +@@ -186,6 +186,13 @@ + /* Output a DTP-relative reference to a TLS symbol. */ + void (*output_dwarf_dtprel) (FILE *file, int size, rtx x); + ++/* This target hook allows the operating system to modify the extern ++ assembler name ++ of a DECL. For example, windows targets use this to decorate stdcall and ++ fastcall functions ++ with a a trailing '@n'. */ ++ void (*change_extern_name) (tree decl); ++ + } asm_out; + + /* Functions relating to instruction scheduling. */ +Index: gcc/cp/method.c +=================================================================== +--- gcc/cp/method.c (revision 129382) ++++ gcc/cp/method.c (working copy) +@@ -350,6 +350,8 @@ + this translation unit. */ + TREE_ADDRESSABLE (function) = 1; + mark_used (function); ++ /* The DECL_ASSEMBLER_NAME of the thunked function may need modification. */ ++ targetm.asm_out.change_extern_name (function); + if (!emit_p) + return; + +Index: gcc/target-def.h +=================================================================== +--- gcc/target-def.h (revision 129382) ++++ gcc/target-def.h (working copy) +@@ -205,6 +205,10 @@ + #define TARGET_ASM_OUTPUT_DWARF_DTPREL NULL + #endif + ++#ifndef TARGET_ASM_CHANGE_EXTERN_NAME ++#define TARGET_ASM_CHANGE_EXTERN_NAME hook_void_tree ++#endif ++ + #define TARGET_ASM_ALIGNED_INT_OP \ + {TARGET_ASM_ALIGNED_HI_OP, \ + TARGET_ASM_ALIGNED_SI_OP, \ +@@ -248,7 +252,8 @@ + TARGET_ASM_FILE_END, \ + TARGET_ASM_EXTERNAL_LIBCALL, \ + TARGET_ASM_MARK_DECL_PRESERVED, \ +- TARGET_ASM_OUTPUT_DWARF_DTPREL} ++ TARGET_ASM_OUTPUT_DWARF_DTPREL, \ ++ TARGET_ASM_CHANGE_EXTERN_NAME} + + /* Scheduler hooks. All of these default to null pointers, which + haifa-sched.c looks for and handles. */ +Index: gcc/config/i386/cygming.h +=================================================================== +--- gcc/config/i386/cygming.h (revision 129382) ++++ gcc/config/i386/cygming.h (working copy) +@@ -335,6 +335,7 @@ + extern void i386_pe_file_end (void); + extern int i386_pe_dllexport_name_p (const char *); + extern int i386_pe_dllimport_name_p (const char *); ++extern void i386_pe_decorate_assembler_name (tree); + + /* For Win32 ABI compatibility */ + #undef DEFAULT_PCC_STRUCT_RETURN +@@ -412,6 +413,7 @@ + + #define TARGET_VALID_DLLIMPORT_ATTRIBUTE_P i386_pe_valid_dllimport_attribute_p + #define TARGET_CXX_ADJUST_CLASS_AT_DEFINITION i386_pe_adjust_class_at_definition ++#define TARGET_ASM_CHANGE_EXTERN_NAME i386_pe_decorate_assembler_name + + #undef TREE + +Index: gcc/config/i386/winnt.c +=================================================================== +--- gcc/config/i386/winnt.c (revision 129382) ++++ gcc/config/i386/winnt.c (working copy) +@@ -335,33 +335,38 @@ + } + + void +-i386_pe_encode_section_info (tree decl, rtx rtl, int first) ++i386_pe_decorate_assembler_name (tree decl) + { +- default_encode_section_info (decl, rtl, first); ++ tree type_attributes = TYPE_ATTRIBUTES (TREE_TYPE (decl)); ++ tree newid = NULL_TREE; + +- if (first && TREE_CODE (decl) == FUNCTION_DECL) +- { +- tree type_attributes = TYPE_ATTRIBUTES (TREE_TYPE (decl)); +- tree newid = NULL_TREE; ++ if (lookup_attribute ("stdcall", type_attributes)) ++ newid = gen_stdcall_or_fastcall_suffix (decl, false); ++ else if (lookup_attribute ("fastcall", type_attributes)) ++ newid = gen_stdcall_or_fastcall_suffix (decl, true); ++ if (newid != NULL_TREE) ++ { ++ rtx rtlname = XEXP (DECL_RTL (decl), 0); ++ if (GET_CODE (rtlname) == MEM) ++ rtlname = XEXP (rtlname, 0); ++ XSTR (rtlname, 0) = IDENTIFIER_POINTER (newid); + +- if (lookup_attribute ("stdcall", type_attributes)) +- newid = gen_stdcall_or_fastcall_suffix (decl, false); +- else if (lookup_attribute ("fastcall", type_attributes)) +- newid = gen_stdcall_or_fastcall_suffix (decl, true); +- if (newid != NULL_TREE) +- { +- rtx rtlname = XEXP (rtl, 0); +- if (GET_CODE (rtlname) == MEM) +- rtlname = XEXP (rtlname, 0); +- XSTR (rtlname, 0) = IDENTIFIER_POINTER (newid); +- /* These attributes must be present on first declaration, ++ /* These attributes must be present on first declaration, + change_decl_assembler_name will warn if they are added + later and the decl has been referenced, but duplicate_decls + should catch the mismatch before this is called. */ + change_decl_assembler_name (decl, newid); +- } + } ++ } + ++void ++i386_pe_encode_section_info (tree decl, rtx rtl, int first) ++{ ++ default_encode_section_info (decl, rtl, first); ++ ++ if (first && TREE_CODE (decl) == FUNCTION_DECL) ++ i386_pe_decorate_assembler_name (decl); ++ + /* Mark the decl so we can tell from the rtl whether the object is + dllexport'd or dllimport'd. tree.c: merge_dllimport_decl_attributes + handles dllexport/dllimport override semantics. */ Propchange: trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-virtual-stdcall-bug27067.patch ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/GCC-v4… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch (added) +++ trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch Mon Oct 22 03:12:07 2007 @@ -1,0 +1,98 @@ +Index: gcc/config/i386/host-mingw32.c +=================================================================== +--- gcc/config/i386/host-mingw32.c (revision 129490) ++++ gcc/config/i386/host-mingw32.c (working copy) +@@ -28,6 +28,8 @@ + + + #define WIN32_LEAN_AND_MEAN /* Not so important if we have windows.h.gch. */ ++#include <tchar.h> ++#include <stdlib.h> + #include <windows.h> + + static void * mingw32_gt_pch_get_address (size_t, int); +@@ -47,7 +49,7 @@ + static const size_t pch_VA_max_size = 128 * 1024 * 1024; + + /* Granularity for reserving address space. */ +-static const size_t va_granularity = 0x10000; ++static size_t va_granularity = 0x10000; + + /* Print out the GetLastError() translation. */ + static inline void +@@ -70,7 +72,9 @@ + /* Granularity for reserving address space. */ + static size_t mingw32_gt_pch_alloc_granularity (void) + { +- return va_granularity; ++ SYSTEM_INFO SysInfo; ++ GetSystemInfo(&SysInfo); ++ return (va_granularity = (size_t)SysInfo.dwAllocationGranularity); + } + + /* Identify an address that's likely to be free in a subsequent invocation +@@ -116,6 +120,9 @@ + { + void * mmap_addr; + static HANDLE mmap_handle; ++ TCHAR szMappingName[26]; ++ OSVERSIONINFO version_info; ++ int i = 0; + + if (size == 0) + return 0; +@@ -125,16 +132,49 @@ + if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size) + return -1; + +- mmap_handle = CreateFileMapping ((HANDLE) _get_osfhandle (fd), +- NULL, PAGE_WRITECOPY | SEC_COMMIT, +- 0, 0, NULL); ++ /* Determine the version of Windows we are running on. */ ++ version_info.dwOSVersionInfoSize = sizeof (version_info); ++ GetVersionEx (&version_info); ++ ++ srand(1); ++ while (1) ++ { ++ /* Generate a unique mapping name. This is neccessary to avoid ++ needing the SeCreateGlobalPrivilege privilege in certain cases. ++ However, the documentation for CreateFileMapping says that on NT4 ++ and earlier, backslashes are invalid in object name. So, we need ++ to check if we are on Windows2000 or higher. */ ++ _stprintf(szMappingName, _T("Local\\MinGWGCCPCH%08X"), rand()); ++ mmap_handle = CreateFileMapping ((HANDLE) _get_osfhandle (fd), ++ NULL, PAGE_WRITECOPY | SEC_COMMIT, ++ 0, 0, (version_info.dwMajorVersion > ++ 4 ? szMappingName : NULL)); ++ if (mmap_handle != NULL && GetLastError() == ERROR_ALREADY_EXISTS) ++ CloseHandle(mmap_handle); ++ else ++ break; ++ } ++ + if (mmap_handle == NULL) + { + w32_error (__FUNCTION__, __FILE__, __LINE__, "CreateFileMapping"); + return -1; + } +- mmap_addr = MapViewOfFileEx (mmap_handle, FILE_MAP_COPY, 0, offset, +- size, addr); ++ /* wait/retry a couple of times if needed. ++ Fixes a race when running multiple gcc's (-j) */ ++ for(i = 0; i < 5; i++) ++ { ++ mmap_addr = MapViewOfFileEx (mmap_handle, FILE_MAP_COPY, 0, offset, ++ size, addr); ++ if (mmap_addr != addr) ++ { ++ Sleep(500); ++ } ++ else ++ { ++ break; ++ } ++ } + if (mmap_addr != addr) + { + w32_error (__FUNCTION__, __FILE__, __LINE__, "MapViewOfFileEx"); Propchange: trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE-Windows/Patches/binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/binuti… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch (added) +++ trunk/tools/RosBE-Windows/Patches/binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch Mon Oct 22 03:12:07 2007 @@ -1,0 +1,15 @@ +--- ld/pe-dll.c Mon Aug 06 08:32:08 2007 ++++ ld/pe-dll.c Tue Oct 16 18:47:02 2007 +@@ -598,10 +598,9 @@ + } + } + +- /* If we are not building a DLL, when there are no exports ++ /* If there are no exports + we do not build an export table at all. */ +- if (!pe_dll_export_everything && pe_def_file->num_exports == 0 +- && info->executable) ++ if (!pe_dll_export_everything && pe_def_file->num_exports == 0) + return; + + /* Now, maybe export everything else the default way. */ Propchange: trunk/tools/RosBE-Windows/Patches/binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/tools/RosBE-Windows/Patches/ld.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/ld.pat… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/ld.patch (original) +++ trunk/tools/RosBE-Windows/Patches/ld.patch (removed) @@ -1,15 +1,0 @@ ---- ld/pe-dll.c Thu Jul 19 13:12:24 2007 -+++ ld/pe-dll.c Fri Aug 3 09:53:58 2007 -@@ -524,10 +524,9 @@ - } - } - -- /* If we are not building a DLL, when there are no exports -+ /* If there are no exports - we do not build an export table at all. */ -- if (!pe_dll_export_everything && pe_def_file->num_exports == 0 -- && info->executable) -+ if (!pe_dll_export_everything && pe_def_file->num_exports == 0) - return; - - /* Now, maybe export everything else the default way. */ Removed: trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/mingw-… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch (original) +++ trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch (removed) @@ -1,278 +1,0 @@ -Index: gcc/config/i386/cygming.h -=================================================================== ---- gcc/config/i386/cygming.h (revision 125623) -+++ gcc/config/i386/cygming.h (working copy) -@@ -335,6 +335,7 @@ - extern void i386_pe_file_end (void); - extern int i386_pe_dllexport_name_p (const char *); - extern int i386_pe_dllimport_name_p (const char *); -+extern void i386_pe_decorate_assembler_name (tree); - - /* For Win32 ABI compatibility */ - #undef DEFAULT_PCC_STRUCT_RETURN -@@ -412,6 +413,7 @@ - - #define TARGET_VALID_DLLIMPORT_ATTRIBUTE_P i386_pe_valid_dllimport_attribute_p - #define TARGET_CXX_ADJUST_CLASS_AT_DEFINITION i386_pe_adjust_class_at_definition -+#define TARGET_ASM_CHANGE_EXTERN_NAME i386_pe_decorate_assembler_name - - #undef TREE - -Index: gcc/config/i386/host-mingw32.c -=================================================================== ---- gcc/config/i386/host-mingw32.c (revision 125623) -+++ gcc/config/i386/host-mingw32.c (working copy) -@@ -28,6 +28,8 @@ - - - #define WIN32_LEAN_AND_MEAN /* Not so important if we have windows.h.gch. */ -+#include <tchar.h> -+#include <stdlib.h> - #include <windows.h> - - static void * mingw32_gt_pch_get_address (size_t, int); -@@ -47,7 +49,7 @@ - static const size_t pch_VA_max_size = 128 * 1024 * 1024; - - /* Granularity for reserving address space. */ --static const size_t va_granularity = 0x10000; -+static size_t va_granularity = 0x10000; - - /* Print out the GetLastError() translation. */ - static inline void -@@ -70,7 +72,9 @@ - /* Granularity for reserving address space. */ - static size_t mingw32_gt_pch_alloc_granularity (void) - { -- return va_granularity; -+ SYSTEM_INFO SysInfo; -+ GetSystemInfo(&SysInfo); -+ return (va_granularity = (size_t)SysInfo.dwAllocationGranularity); - } - - /* Identify an address that's likely to be free in a subsequent invocation -@@ -125,9 +129,23 @@ - if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size) - return -1; - -- mmap_handle = CreateFileMapping ((HANDLE) _get_osfhandle (fd), -- NULL, PAGE_WRITECOPY | SEC_COMMIT, -- 0, 0, NULL); -+ srand(1); -+ while (1) -+ { -+ TCHAR szMappingName[26]; -+ -+ /* Generate a unique mapping name. This is neccessary to avoid -+ needing the SeCreateGlobalPrivilege privilege in certain cases */ -+ _stprintf(szMappingName, _T("Local\\MinGWGCCPCH%08X"), rand()); -+ mmap_handle = CreateFileMapping ((HANDLE) _get_osfhandle (fd), -+ NULL, PAGE_WRITECOPY | SEC_COMMIT, -+ 0, 0, szMappingName); -+ if (mmap_handle != NULL && GetLastError() == ERROR_ALREADY_EXISTS) -+ CloseHandle(mmap_handle); -+ else -+ break; -+ } -+ - if (mmap_handle == NULL) - { - w32_error (__FUNCTION__, __FILE__, __LINE__, "CreateFileMapping"); -Index: gcc/config/i386/winnt.c -=================================================================== ---- gcc/config/i386/winnt.c (revision 125623) -+++ gcc/config/i386/winnt.c (working copy) -@@ -335,33 +335,38 @@ - } - - void --i386_pe_encode_section_info (tree decl, rtx rtl, int first) -+i386_pe_decorate_assembler_name (tree decl) - { -- default_encode_section_info (decl, rtl, first); -+ tree type_attributes = TYPE_ATTRIBUTES (TREE_TYPE (decl)); -+ tree newid = NULL_TREE; - -- if (first && TREE_CODE (decl) == FUNCTION_DECL) -- { -- tree type_attributes = TYPE_ATTRIBUTES (TREE_TYPE (decl)); -- tree newid = NULL_TREE; -+ if (lookup_attribute ("stdcall", type_attributes)) -+ newid = gen_stdcall_or_fastcall_suffix (decl, false); -+ else if (lookup_attribute ("fastcall", type_attributes)) -+ newid = gen_stdcall_or_fastcall_suffix (decl, true); -+ if (newid != NULL_TREE) -+ { -+ rtx rtlname = XEXP (DECL_RTL (decl), 0); -+ if (GET_CODE (rtlname) == MEM) -+ rtlname = XEXP (rtlname, 0); -+ XSTR (rtlname, 0) = IDENTIFIER_POINTER (newid); - -- if (lookup_attribute ("stdcall", type_attributes)) -- newid = gen_stdcall_or_fastcall_suffix (decl, false); -- else if (lookup_attribute ("fastcall", type_attributes)) -- newid = gen_stdcall_or_fastcall_suffix (decl, true); -- if (newid != NULL_TREE) -- { -- rtx rtlname = XEXP (rtl, 0); -- if (GET_CODE (rtlname) == MEM) -- rtlname = XEXP (rtlname, 0); -- XSTR (rtlname, 0) = IDENTIFIER_POINTER (newid); -- /* These attributes must be present on first declaration, -+ /* These attributes must be present on first declaration, - change_decl_assembler_name will warn if they are added - later and the decl has been referenced, but duplicate_decls - should catch the mismatch before this is called. */ - change_decl_assembler_name (decl, newid); -- } - } -+ } - -+void -+i386_pe_encode_section_info (tree decl, rtx rtl, int first) -+{ -+ default_encode_section_info (decl, rtl, first); -+ -+ if (first && TREE_CODE (decl) == FUNCTION_DECL) -+ i386_pe_decorate_assembler_name (decl); -+ - /* Mark the decl so we can tell from the rtl whether the object is - dllexport'd or dllimport'd. tree.c: merge_dllimport_decl_attributes - handles dllexport/dllimport override semantics. */ -Index: gcc/cp/method.c -=================================================================== ---- gcc/cp/method.c (revision 125623) -+++ gcc/cp/method.c (working copy) -@@ -350,6 +350,8 @@ - this translation unit. */ - TREE_ADDRESSABLE (function) = 1; - mark_used (function); -+ /* The DECL_ASSEMBLER_NAME of the thunked function may need modification. */ -+ targetm.asm_out.change_extern_name (function); - if (!emit_p) - return; - -Index: gcc/target-def.h -=================================================================== ---- gcc/target-def.h (revision 125623) -+++ gcc/target-def.h (working copy) -@@ -205,6 +205,10 @@ - #define TARGET_ASM_OUTPUT_DWARF_DTPREL NULL - #endif - -+#ifndef TARGET_ASM_CHANGE_EXTERN_NAME -+#define TARGET_ASM_CHANGE_EXTERN_NAME hook_void_tree -+#endif -+ - #define TARGET_ASM_ALIGNED_INT_OP \ - {TARGET_ASM_ALIGNED_HI_OP, \ - TARGET_ASM_ALIGNED_SI_OP, \ -@@ -248,7 +252,8 @@ - TARGET_ASM_FILE_END, \ - TARGET_ASM_EXTERNAL_LIBCALL, \ - TARGET_ASM_MARK_DECL_PRESERVED, \ -- TARGET_ASM_OUTPUT_DWARF_DTPREL} -+ TARGET_ASM_OUTPUT_DWARF_DTPREL, \ -+ TARGET_ASM_CHANGE_EXTERN_NAME} - - /* Scheduler hooks. All of these default to null pointers, which - haifa-sched.c looks for and handles. */ -Index: gcc/target.h -=================================================================== ---- gcc/target.h (revision 125623) -+++ gcc/target.h (working copy) -@@ -186,6 +186,13 @@ - /* Output a DTP-relative reference to a TLS symbol. */ - void (*output_dwarf_dtprel) (FILE *file, int size, rtx x); - -+/* This target hook allows the operating system to modify the extern -+ assembler name -+ of a DECL. For example, windows targets use this to decorate stdcall and -+ fastcall functions -+ with a a trailing '@n'. */ -+ void (*change_extern_name) (tree decl); -+ - } asm_out; - - /* Functions relating to instruction scheduling. */ -Index: libstdc++-v3/config/os/mingw32/os_defines.h -=================================================================== ---- libstdc++-v3/config/os/mingw32/os_defines.h (revision 125623) -+++ libstdc++-v3/config/os/mingw32/os_defines.h (working copy) -@@ -45,6 +45,13 @@ - #undef NOMINMAX - #define NOMINMAX 1 - -+// mingw32 local hack: Override _GLIBCXX_USE_WCHAR_T for wstring -+#define _GLIBCXX_USE_WSTRING 1 -+ -+// mingw32 local hack: Cast long double to doubles to workaround -+// printf bug. -+#define _GLIBCXX_NO_LONG_DOUBLE_IO 0 -+ - // See libstdc++/20806. - #define _GLIBCXX_HAVE_DOS_BASED_FILESYSTEM 1 - -Index: libstdc++-v3/include/bits/char_traits.h -=================================================================== ---- libstdc++-v3/include/bits/char_traits.h (revision 125623) -+++ libstdc++-v3/include/bits/char_traits.h (working copy) -@@ -295,7 +295,7 @@ - }; - - --#ifdef _GLIBCXX_USE_WCHAR_T -+#if defined (_GLIBCXX_USE_WCHAR_T) || defined (_GLIBCXX_USE_WSTRING) - /// @brief 21.1.3.2 char_traits specializations - template<> - struct char_traits<wchar_t> -@@ -303,8 +303,10 @@ - typedef wchar_t char_type; - typedef wint_t int_type; - typedef streamoff off_type; -+#if defined (_GLIBCXX_USE_WCHAR_T) - typedef wstreampos pos_type; - typedef mbstate_t state_type; -+#endif - - static void - assign(char_type& __c1, const char_type& __c2) -Index: libstdc++-v3/include/bits/stringfwd.h -=================================================================== ---- libstdc++-v3/include/bits/stringfwd.h (revision 125623) -+++ libstdc++-v3/include/bits/stringfwd.h (working copy) -@@ -59,7 +59,7 @@ - - typedef basic_string<char> string; - --#ifdef _GLIBCXX_USE_WCHAR_T -+#if defined (_GLIBCXX_USE_WCHAR_T) || defined (_GLIBCXX_USE_WSTRING) - template<> struct char_traits<wchar_t>; - - typedef basic_string<wchar_t> wstring; -Index: libstdc++-v3/include/c_std/std_cwchar.h -=================================================================== ---- libstdc++-v3/include/c_std/std_cwchar.h (revision 125623) -+++ libstdc++-v3/include/c_std/std_cwchar.h (working copy) -@@ -138,7 +138,7 @@ - #undef wprintf - #undef wscanf - --#if _GLIBCXX_USE_WCHAR_T -+#if _GLIBCXX_USE_WCHAR_T || _GLIBCXX_USE_WSTRING - namespace std - { - using ::wint_t; -Index: libstdc++-v3/include/c_std/std_cwctype.h -=================================================================== ---- libstdc++-v3/include/c_std/std_cwctype.h (revision 125623) -+++ libstdc++-v3/include/c_std/std_cwctype.h (working copy) -@@ -75,7 +75,7 @@ - #undef wctrans - #undef wctype - --#if _GLIBCXX_USE_WCHAR_T -+#if _GLIBCXX_USE_WCHAR_T || _GLIBCXX_USE_WSTRING - namespace std - { - using ::wint_t; // cwchar

1 0

[dreimer] 29759: Fixed chdefdir. Now it should work. Updated options. It now checks if the .exe exists. If not, it throws an error. Updated echo Messages a bit.
by dreimer＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: dreimer Date: Mon Oct 22 03:11:16 2007 New Revision: 29759 URL: http://svn.reactos.org/svn/reactos?rev=29759&view=rev Log: Fixed chdefdir. Now it should work. Updated options. It now checks if the .exe exists. If not, it throws an error. Updated echo Messages a bit. Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE-Windows/Root/options.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Clean.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Clean.cmd Mon Oct 22 03:11:16 2007 @@ -101,7 +101,7 @@ echo Done cleaning ReactOS source directory. ) else ( - echo There is nothing to clean. + echo ERROR: There is nothing to clean. ) title ReactOS Build Environment %_ROSBE_VERSION% goto :EOC @@ -117,7 +117,7 @@ echo Done cleaning build logs. ) else ( - echo There are no logs to clean. + echo ERROR: There are no logs to clean. ) goto :EOC ) Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Mon Oct 22 03:11:16 2007 @@ -47,7 +47,7 @@ del "%_ROSBE_BASEDIR%\*.rbuild" del "config.rbuild" copy "config.template.rbuild" "%_ROSBE_BASEDIR%\config.rbuild" - echo Updated. + echo Successfully Updated. goto :NOK ) if not "%1" == "" ( @@ -102,10 +102,10 @@ :: :: Start with reading settings from config.rbuild and let the user edit them. :: -echo Sub-architecture to build for. +echo Sub-Architecture to build for. echo Default is: none echo. -echo Right now +echo Right now: grep \"SARCH\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P X="(), (xbox)" sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" "%_ROSBE_BASEDIR%\config.rbuild" > "%_ROSBE_BASEDIR%\config2.rbuild" @@ -118,7 +118,7 @@ echo See GCC manual for more CPU names and which CPUs GCC can optimize for. echo Default is: pentium echo. -echo Right now +echo Right now: grep \"OARCH\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P XX= if "%XX%" == "" ( @@ -134,7 +134,7 @@ echo official release builds and debug builds. echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. echo. -echo Right now +echo Right now: grep \"OPTIMIZE\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P Y="(0), (1), (2), (3), (4), (5)" if "%Y%" == "" ( @@ -146,7 +146,7 @@ echo Whether to compile for an uniprocessor or multiprocessor machine. echo Default is: 0 echo. -echo Right now +echo Right now: grep \"MP\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P Z="(0), (1)" if "%Z%" == "" ( @@ -158,7 +158,7 @@ echo Whether to compile in the integrated kernel debugger. echo Default is: 0 echo. -echo Right now +echo Right now: grep \"KDBG\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P A="(0), (1)" if "%A%" == "" ( @@ -171,7 +171,7 @@ echo performed. echo Default is: 1 echo. -echo Right now +echo Right now: grep \"DBG\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P B="(0), (1)" if "%B%" == "" ( @@ -184,7 +184,7 @@ echo don't enable this. echo Default is: 0 echo. -echo Right now +echo Right now: grep \"GDB\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P C="(0), (1)" if "%C%" == "" ( @@ -199,7 +199,7 @@ echo from the patent owner). echo Default is: 0 echo. -echo Right now +echo Right now: grep \"NSWPAT\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P D="(0), (1)" if "%D%" == "" ( @@ -216,7 +216,7 @@ echo unless you know what you're doing. echo Default is: 0 echo. -echo Right now +echo Right now: grep \"_WINKD_\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P F="(0), (1)" if "%F%" == "" ( Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Oct 22 03:11:16 2007 @@ -57,7 +57,7 @@ :EndCommandParse :: -:: Load the Base Directory from the Shortcut-XML and set it as new +:: Load the Base Directory from the Shortcut-txt and set it as new :: Source Directory and add PATH for Tools Folder. :: set PATH=%_ROSBE_BASEDIR%\Tools;%PATH% @@ -85,7 +85,7 @@ doskey /macrofile="%_ROSBE_BASEDIR%\RosBE.mac" :: -:: Look if the Source Folder is empty. If so, ask for using "svn create". +:: Look if the Source Folder is empty. If so, ask for using "ssvn create". :: dir /b "%_ROSBE_ROSSOURCEDIR%" 2>nul|findstr "." >nul if errorlevel 1 ( Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Mon Oct 22 03:11:16 2007 @@ -10,11 +10,13 @@ title Change the Default Dir... +set _ROSBE_ROSSOURCEDIRBCK=%_ROSBE_ROSSOURCEDIR% + if /i "%1" == "" ( goto :INTERACTIVE ) if /i "%1" == "default" ( - set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% + set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIRBCK% ) else ( set _ROSBE_ROSSOURCEDIR=%1 ) Modified: trunk/tools/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/options.c… ============================================================================== --- trunk/tools/RosBE-Windows/Root/options.cmd (original) +++ trunk/tools/RosBE-Windows/Root/options.cmd Mon Oct 22 03:11:16 2007 @@ -10,7 +10,15 @@ title Options -"%_ROSBE_BASEDIR%\options.exe" -echo Press any Button to reset RosBE with the new Settings. -pause -"%_ROSBE_BASEDIR%\RosBE.cmd" +:: +:: Run options.exe +:: +if exist "%_ROSBE_BASEDIR%\options.exe" ( + "%_ROSBE_BASEDIR%\options.exe" + echo Press any Button to reset RosBE with the new Settings. + pause + "%_ROSBE_BASEDIR%\RosBE.cmd" +) else ( + echo ERROR: options.exe was not found. + title ReactOS Build Environment %_ROSBE_VERSION% +) Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Mon Oct 22 03:11:16 2007 @@ -39,14 +39,14 @@ if "%1" == "create" ( title Creating... if exist ".svn\." ( - echo Folder already cotains a Reposority. Exiting + echo ERROR: Folder already cotains a Reposority. Exiting goto :ExitSVN ) dir /b 2>nul|findstr "." >nul if errorlevel 1 ( svn checkout svn://svn.reactos.org/reactos/trunk/reactos ) else ( - echo Folder is not empty. Continuing is dangerous and can cause errors. ABORTED + echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) goto :ExitSVN ) Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Mon Oct 22 03:11:16 2007 @@ -31,7 +31,7 @@ if /I "%1"=="run" ( for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( if %%i == Base ( - echo Used Shortcut: %%j + echo Active Shortcut: %%j echo. :: : Set new source directory, if needed. @@ -49,7 +49,7 @@ goto :END :: -:: Load Shortcut from XML and set it active. +:: Load Shortcut from txt and set it active. :: :DEF echo Choose your Source Folder: @@ -61,11 +61,11 @@ goto :END ) ) -echo ERROR: This Shortcut (%XY%) does not exist. +echo ERROR: The Shortcut %XY% does not exist. goto :END :: -:: Add new Shortcut to XML. +:: Add new Shortcut to txt. :: :ADD if not "%2" == "" ( @@ -90,7 +90,7 @@ :ADD23 for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( if %%i == %CUT% ( - echo ERROR: A Shortcut with the name %CUT% does already exists. + echo ERROR: A Shortcut with the name %CUT% does already exist. goto :END ) ) @@ -98,7 +98,7 @@ goto :END :: -:: Remove Shortcut from XML. +:: Remove Shortcut from txt. :: :REM if not "%2" == "" ( @@ -137,6 +137,9 @@ :DEF1 call "%_ROSBE_BASEDIR%\scut.cmd" edit Base %DIR% +:: +:: Edit a existing Shortcut. +:: :EDIT if not "%2" == "" ( if not "%3" == "" (

1 0

[peterw] 29758: - Remove unneeded file.
by peterw＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: peterw Date: Mon Oct 22 02:41:18 2007 New Revision: 29758 URL: http://svn.reactos.org/svn/reactos?rev=29758&view=rev Log: - Remove unneeded file. Removed: trunk/tools/RosBE-Windows/Root/srclist.xml Removed: trunk/tools/RosBE-Windows/Root/srclist.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/srclist.x… ============================================================================== --- trunk/tools/RosBE-Windows/Root/srclist.xml (original) +++ trunk/tools/RosBE-Windows/Root/srclist.xml (removed) @@ -1,13 +1,0 @@ -<?xml version="1.0"?> -<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - - -<property base="Default" -<property name="main" value="C:\RosBE\Source" />

1 0

[dreimer] 29757: - Updated ChangeLog.txt and readme.txt - Completely rewrote scut to work without grep sed cut and co and added a edit function. thx to Peter Ward for his help. - Updated help. - Successfully removed two of three workarounds in cutz.cmd.
by dreimer＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: dreimer Date: Mon Oct 22 02:37:16 2007 New Revision: 29757 URL: http://svn.reactos.org/svn/reactos?rev=29757&view=rev Log: - Updated ChangeLog.txt and readme.txt - Completely rewrote scut to work without grep sed cut and co and added a edit function. thx to Peter Ward for his help. - Updated help. - Successfully removed two of three workarounds in cutz.cmd. Added: trunk/tools/RosBE-Windows/Root/srclist.txt (with props) Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE-Windows/Root/scut.cmd trunk/tools/RosBE-Windows/Tools/cutz.cmd Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Mon Oct 22 02:37:16 2007 @@ -1,6 +1,6 @@ *** XXX XXth, 200X - RosBE 0.X.X.X Released -- Updated RosBE COnfiguration Tool. (Pierre Schweitzer) +- Updated RosBE Configuration Tool. (Pierre Schweitzer) - Added French translation. - Added the possibility to choose MingW directory. - Added check to see if MingW dir is right (look up gcc) @@ -14,7 +14,32 @@ - Added check to test if log dir exists and if it doesn't, it's created - Added check to avoid writing in a non-existant file - Updated todo list + - Reorganized resources + - Added a basic font preview + - Continue dralnix code cleanup. + - Added checks to avoid buffers overflow. + +- Added a very simple makefile for the RosBE tools. (Peter Ward) +- Fix a warning in echoh.c. (Peter Ward) +- Fix options.exe compile with RosBE 0.3.8.1 (Peter Ward) +- Merge the three build.cmd files into one. (Peter Ward) +- Heaviliy cleaning up the .cmd files. (Peter Ward) +- remove typos. (Peter Ward) +- Make variable names more consistent. (Peter Ward) +- Merged the NSIS files back together. (Peter Ward) +- Renamed options.cmd -> rosbe-options.cmd. (Peter Ward) +- Completely rewrote scut to work without *nix tools + and added a edit function (Parter Ward, Daniel Reimer) +- Updated to NASM 0.99.05 (Daniel Reimer) +- Make helpfile entries dependant on the installed optional files. (Daniel Reimer) +- Readd chdefdir due to popular Demand. (Daniel Reimer) +- Make options.exe startable from cmd window. After exiting rosbe resets to use the new settings. (Daniel Reimer) - Added ccache 2.4 to RosBE. (Daniel Reimer) +- Remove trailing Spaces. (Daniel Reimer) +- Modify options.exe to enable and disable strpping and ccache. (Daniel Reimer) +- Fixed German RC File of Options.exe (Daniel Reimer) + +- Fixed Russian RC File of options.exe (towerr) *** Sep 24th, 2007 - RosBE 0.3.8.1 Released Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Mon Oct 22 02:37:16 2007 @@ -31,8 +31,8 @@ echo. if exist "%_ROSBE_BASEDIR%\scut.cmd" ( - echo scut - Define, Remove, Switch and Default to Shortcutted - echo Source-Directories. + echo scut - Define, Edit, Remove, Switch and Default to + echo Shortcutted Source-Directories. ) if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( @@ -155,14 +155,16 @@ ) if "%1" == "scut" ( echo Usage: scut [OPTIONS] - echo Defines, Removes, Switches and Defaults to Shortcutted Source Directories. - echo scut started without a parameter or with the name of a Shortcut as - echo parameter sets this Shortcut active. + echo Defines, Edits, Removes, Switches and Defaults to Shortcutted Source + echo Directories. scut started without a parameter or with the name of a + echo Shortcut as parameter sets this Shortcut active. echo. echo add - Adds a Shortcut. echo (Optional: "Shortcut" "Directory" as second and third parameter) - echo remove - Removes a shortcut. + echo rem - Removes a shortcut. echo (Optional: "Shortcut" as second parameter) + echo edit - Edits a shortcut. + echo (Optional: "Shortcut" "Directory" as second and third parameter) echo def - Chooses Default Shortcut which is enabled on echo every start of RosBE. "Default" is the Source echo Directory as you know it from previous Versions Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Mon Oct 22 02:37:16 2007 @@ -11,12 +11,12 @@ The ReactOS Build Environment v0.X.X.X contains the following packages: -binutils-2.17.50-20070806 +binutils-2.18.50-20071015 mingw-runtime-3.13 w32api-3.10 mingw32-make-3.81-2 -nasm-0.99.04-win32 -mingw-4.1.3-20070829-prerelease +nasm-0.99.05-win32 +mingw-4.1.3-20071015-prerelease - Patched to fix a GCC bug concerning decorating virtual methods with stdcall in C++, see GCC issue: Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Oct 22 02:37:16 2007 @@ -30,8 +30,8 @@ :: Check if the user has used the options utility and :: if so, load their options. :: -if exist %_ROSBE_BASEDIR%\rosbe-options.cmd ( - call %_ROSBE_BASEDIR%\rosbe-options.cmd +if exist "%_ROSBE_BASEDIR%\rosbe-options.cmd" ( + call "%_ROSBE_BASEDIR%\rosbe-options.cmd" ) title ReactOS Build Environment %_ROSBE_VERSION% @@ -61,9 +61,7 @@ :: Source Directory and add PATH for Tools Folder. :: set PATH=%_ROSBE_BASEDIR%\Tools;%PATH% -for /f "usebackq" %%i in (`"grep base= "%_ROSBE_BASEDIR%\srclist.xml"|cutz main"`) do set scut=%%i -echo Used Shortcut: %scut% -echo. +if exist "%_ROSBE_BASEDIR%\scut.cmd" (call "%_ROSBE_BASEDIR%\scut.cmd" run) :: :: Display the current version of GCC, NASM, ld and make. @@ -85,13 +83,6 @@ :: Load the doskey macros that serve as our commands. :: doskey /macrofile="%_ROSBE_BASEDIR%\RosBE.mac" - -:: -:: Set new source directory, if needed. -:: -if not "%scut%" == "Default" ( - call %_ROSBE_BASEDIR%\scut %scut% -) :: :: Look if the Source Folder is empty. If so, ask for using "svn create". Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Mon Oct 22 02:37:16 2007 @@ -12,8 +12,8 @@ if /i "%1" == "" ( goto :INTERACTIVE -) -if /i "%1" == "default" ( +) +if /i "%1" == "default" ( set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% ) else ( set _ROSBE_ROSSOURCEDIR=%1 @@ -26,8 +26,8 @@ if /i "%XY%" == "" ( goto :END -) -if /i "%XY%"=="default" ( +) +if /i "%XY%"=="default" ( set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% ) else ( set _ROSBE_ROSSOURCEDIR=%XY% Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Mon Oct 22 02:37:16 2007 @@ -22,8 +22,26 @@ if /I "%1"=="rem" ( goto :REM ) +if /I "%1"=="edit" ( + goto :EDIT +) if /I "%1"=="def" ( goto :DEF2 +) +if /I "%1"=="run" ( + for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( + if %%i == Base ( + echo Used Shortcut: %%j + echo. + :: + : Set new source directory, if needed. + :: + if not "%%j" == "Default" ( + call "%_ROSBE_BASEDIR%\scut.cmd" %%j + ) + ) + ) + goto :END ) else ( set XY=%1 goto :RUN @@ -37,18 +55,14 @@ echo Choose your Source Folder: set /P XY= :RUN -grep name=\"%XY%\" "%_ROSBE_BASEDIR%\srclist.xml"|cutz dir > "%_ROSBE_BASEDIR%\aaa.tmp" -test -s "%_ROSBE_BASEDIR%\aaa.tmp" -if errorlevel 1 ( - echo Shortcut with that name does not exist. - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :END -) else ( - set /P dir=<"%_ROSBE_BASEDIR%\aaa.tmp" - call cd /D %dir% - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :END +for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( + if %%i == %XY% ( + cd /d %%j + goto :END + ) ) +echo ERROR: This Shortcut (%XY%) does not exist. +goto :END :: :: Add new Shortcut to XML. @@ -74,11 +88,13 @@ echo Choose your Source Folder: set /P DIR= :ADD23 -echo ^<property name="%CUT%" value="%DIR%" /^> > "%_ROSBE_BASEDIR%\aaa.tmp" -copy "%_ROSBE_BASEDIR%\srclist.xml" + "%_ROSBE_BASEDIR%\aaa.tmp" "%_ROSBE_BASEDIR%\srclist2.xml" -del "%_ROSBE_BASEDIR%\srclist.xml" -ren "%_ROSBE_BASEDIR%\srclist2.xml" srclist.xml -del "%_ROSBE_BASEDIR%\aaa.tmp" +for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( + if %%i == %CUT% ( + echo ERROR: A Shortcut with the name %CUT% does already exists. + goto :END + ) +) +echo %CUT%,%DIR%>> "%_ROSBE_BASEDIR%\srclist.txt" goto :END :: @@ -92,47 +108,78 @@ echo Choose your Shortcut: set /P CUTREM= :REM1 -grep name=\"%CUTREM%\" "%_ROSBE_BASEDIR%\srclist.xml"|cutz dir > "%_ROSBE_BASEDIR%\aaa.tmp" -test -s "%_ROSBE_BASEDIR%\aaa.tmp" -if errorlevel 1 ( - echo Shortcut with that name does not exist. - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :END -) else ( - grep -v name=\"%CUTREM%\" "%_ROSBE_BASEDIR%\srclist.xml" > "%_ROSBE_BASEDIR%\srclist2.xml" - del "%_ROSBE_BASEDIR%\srclist.xml" - ren "%_ROSBE_BASEDIR%\srclist2.xml" srclist.xml - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :END +set _ROSBE_REM=0 +for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( + if not %%i == %CUTREM% ( + echo %%i,%%j>> "%_ROSBE_BASEDIR%\srclist2.txt" + ) else ( + set _ROSBE_REM=1 + ) ) +del "%_ROSBE_BASEDIR%\srclist.txt" +ren "%_ROSBE_BASEDIR%\srclist2.txt" srclist.txt +if %_ROSBE_REM% == 0 ( + echo ERROR: The Shortcut %CUTREM% does not exist. +) +goto :END + :: :: Set Default Shortcut. :: :DEF2 if not "%2" == "" ( - set DEF=%2 + set DIR=%2 goto :DEF1 ) echo Choose your new Default Shortcut: -set /P DEF= +set /P DIR= :DEF1 -grep name=\"%DEF%\" "%_ROSBE_BASEDIR%\srclist.xml"|cutz dir > "%_ROSBE_BASEDIR%\aaa.tmp" -test -s "%_ROSBE_BASEDIR%\aaa.tmp" -if errorlevel 1 ( - echo Shortcut with that name does not exist. - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :END +call "%_ROSBE_BASEDIR%\scut.cmd" edit Base %DIR% + +:EDIT +if not "%2" == "" ( + if not "%3" == "" ( + set CUT=%2 + set DIR=%3 + goto :EDIT23 + ) else ( + set CUT=%2 + goto :EDIT2 + ) ) else ( - sed "s/base=\".*\"/base=\"%DEF%\"/g" "%_ROSBE_BASEDIR%\srclist.xml" > "%_ROSBE_BASEDIR%\srclist2.xml" - del "%_ROSBE_BASEDIR%\srclist.xml" - ren "%_ROSBE_BASEDIR%\srclist2.xml" srclist.xml - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :PREEND + goto :EDIT1 ) -:PREEND -call "%_ROSBE_BASEDIR%\RosBE.cmd" +:EDIT1 +echo Choose your Shortcut: +set /P CUT= +:EDIT2 +echo Choose your Source Folder: +set /P DIR= +:EDIT23 +set _ROSBE_EDIT=0 +for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( + if %%i == %CUT% ( + set _ROSBE_EDIT=1 + if exist "%_ROSBE_BASEDIR%\temporaryfile.tmp" ( + echo %%i,%DIR%>> "%_ROSBE_BASEDIR%\temporaryfile.tmp" + ) else ( + echo %%i,%DIR%> "%_ROSBE_BASEDIR%\temporaryfile.tmp" + ) + ) else ( + if exist "%_ROSBE_BASEDIR%\temporaryfile.tmp" ( + echo %%i,%%j>> "%_ROSBE_BASEDIR%\temporaryfile.tmp" + ) else ( + echo %%i,%%j> "%_ROSBE_BASEDIR%\temporaryfile.tmp" + ) + ) +) +del "%_ROSBE_BASEDIR%\srclist.txt" +ren "%_ROSBE_BASEDIR%\temporaryfile.tmp" srclist.txt +if %_ROSBE_EDIT% == 0 ( + echo ERROR: The Shortcut %CUT% does not exist. +) :END title ReactOS Build Environment %_ROSBE_VERSION% Added: trunk/tools/RosBE-Windows/Root/srclist.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/srclist.t… ============================================================================== --- trunk/tools/RosBE-Windows/Root/srclist.txt (added) +++ trunk/tools/RosBE-Windows/Root/srclist.txt Mon Oct 22 02:37:16 2007 @@ -1,0 +1,2 @@ +Base,Default +Default,C:\RosBE\Source Propchange: trunk/tools/RosBE-Windows/Root/srclist.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Tools/cutz.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cutz.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/cutz.cmd (original) +++ trunk/tools/RosBE-Windows/Tools/cutz.cmd Mon Oct 22 02:37:16 2007 @@ -7,12 +7,6 @@ :: :: @echo off -if "%1" == "dir" ( - cut -d "\"" -f 4 -) if "%1" == "svn" ( cut -d " " -f 2 ) -if "%1" == "main" ( - cut -d """ -f 2 -)

1 0

[janderwald] 29756: - use RegLoadMUIString for a translated keys - insert shortcut assitent in front of shellnew list - adjust item id for create shortcut action
by janderwald＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: janderwald Date: Mon Oct 22 01:59:55 2007 New Revision: 29756 URL: http://svn.reactos.org/svn/reactos?rev=29756&view=rev Log: - use RegLoadMUIString for a translated keys - insert shortcut assitent in front of shellnew list - adjust item id for create shortcut action Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Mon Oct 22 01:59:55 2007 @@ -76,6 +76,58 @@ static PSHELLNEW_ITEM s_SnHead = NULL; +static +BOOL +GetKeyDescription(LPWSTR szKeyName, LPWSTR szResult) +{ + HKEY hKey; + DWORD dwDesc, dwError; + WCHAR szDesc[100]; + + static const WCHAR szFriendlyTypeName[] = { '\\','F','r','i','e','n','d','l','y','T','y','p','e','N','a','m','e',0 }; + + TRACE("GetKeyDescription: keyname %s\n", debugstr_w(szKeyName)); + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT,szKeyName,0, KEY_READ | KEY_QUERY_VALUE,&hKey) != ERROR_SUCCESS) + return FALSE; + + if (RegLoadMUIStringW(hKey,szFriendlyTypeName,szResult,MAX_PATH,&dwDesc,0,NULL) == ERROR_SUCCESS) + { + TRACE("result %s\n", debugstr_w(szResult)); + RegCloseKey(hKey); + return TRUE; + } + /* fetch default value */ + dwDesc = sizeof(szDesc); + dwError = RegGetValueW(hKey,NULL,NULL, RRF_RT_REG_SZ,NULL,szDesc,&dwDesc); + if(dwError == ERROR_SUCCESS) + { + if (wcsncmp(szDesc, szKeyName, dwDesc / sizeof(WCHAR))) + { + /* recurse for to a linked key */ + if (!GetKeyDescription(szDesc, szResult)) + { + /* use description */ + wcscpy(szResult, szDesc); + } + } + else + { + /* use default value as description */ + wcscpy(szResult, szDesc); + } + } + else + { + /* registry key w/o default key?? */ + TRACE("RegGetValue failed with %x\n", dwError); + wcscpy(szResult, szKeyName); + } + + RegCloseKey(hKey); + return TRUE; +} + PSHELLNEW_ITEM LoadItem(LPWSTR szKeyName) { @@ -83,9 +135,9 @@ DWORD dwIndex; WCHAR szName[MAX_PATH]; WCHAR szCommand[MAX_PATH]; - WCHAR szDesc[MAX_PATH]; - WCHAR szIcon[MAX_PATH]; - DWORD dwName, dwCommand, dwDesc; + WCHAR szDesc[MAX_PATH] = {0}; + WCHAR szIcon[MAX_PATH] = {0}; + DWORD dwName, dwCommand; LONG result; PSHELLNEW_ITEM pNewItem; @@ -94,40 +146,17 @@ static const WCHAR szData[] = { 'D','a','t','a',0 }; static const WCHAR szFileName[] = { 'F','i','l','e','N','a','m','e', 0 }; static const WCHAR szNullFile[] = { 'N','u','l','l','F','i','l','e', 0 }; - static const WCHAR szDefaultIcon[] ={ '\\','D','e','f','a','u','l','t','I','c','o','n',0 }; - - result = RegOpenKeyExW(HKEY_CLASSES_ROOT,szKeyName,0,KEY_READ,&hKey); - - if (result != ERROR_SUCCESS) - { - return NULL; - } - - dwName = MAX_PATH; - result = RegGetValueW(hKey,NULL,NULL,RRF_RT_REG_SZ,NULL,szName, &dwName); - - RegCloseKey(hKey); - szDesc[0] = L'\0'; - szIcon[0] = L'\0'; - if (result == ERROR_SUCCESS) - { - dwDesc = MAX_PATH; - RegGetValueW(HKEY_CLASSES_ROOT,szName,NULL,RRF_RT_REG_SZ,NULL,szDesc,&dwDesc); - dwDesc = MAX_PATH; - wcscat(szName, szDefaultIcon); - RegGetValueW(HKEY_CLASSES_ROOT,szName,NULL,RRF_RT_REG_SZ,NULL,szIcon,&dwDesc); - } - + wcscpy(szName, szKeyName); + GetKeyDescription(szKeyName, szDesc); wcscat(szName, szShellNew); result = RegOpenKeyExW(HKEY_CLASSES_ROOT,szName,0,KEY_READ,&hKey); - //TRACE("LoadItem keyname %s szName %s szDesc %s szIcon %s\n", debugstr_w(szKeyName), debugstr_w(szName), debugstr_w(szDesc), debugstr_w(szIcon)); - + //TRACE("LoadItem dwName %d keyname %s szName %s szDesc %s szIcon %s\n", dwName, debugstr_w(szKeyName), debugstr_w(szName), debugstr_w(szDesc), debugstr_w(szIcon)); if (result != ERROR_SUCCESS) { - return NULL; + return NULL; } dwIndex = 0; @@ -190,6 +219,7 @@ LONG result; PSHELLNEW_ITEM pNewItem; PSHELLNEW_ITEM pCurItem = NULL; + static WCHAR szLnk[] = { '.','l','n','k',0 }; dwIndex = 0; do @@ -200,14 +230,29 @@ pNewItem = LoadItem(szName); if (pNewItem) { - if (pCurItem) + if (!wcsicmp(pNewItem->szExt, szLnk)) { - pCurItem->Next = pNewItem; - pCurItem = pNewItem; + if (s_SnHead) + { + pNewItem->Next = s_SnHead; + s_SnHead = pNewItem; + } + else + { + s_SnHead = pCurItem = pNewItem; + } } else { - pCurItem = s_SnHead = pNewItem; + if (pCurItem) + { + pCurItem->Next = pNewItem; + pCurItem = pNewItem; + } + else + { + pCurItem = s_SnHead = pNewItem; + } } } } @@ -232,8 +277,26 @@ } + ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); + + This->iIdShellNewFirst = idFirst; + + /* + * FIXME: small hack for new shortcut + */ + + mii.fMask = MIIM_ID; + mii.wID = idFirst; + SetMenuItemInfoW(hMenu, 1, TRUE, &mii); + idFirst++; + + mii.fMask = MIIM_TYPE | MIIM_ID; + mii.fType = MFT_SEPARATOR; + mii.wID = -1; + InsertMenuItemW(hMenu, -1, TRUE, &mii); + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; //MIIM_BITMAP; mii.fType = MFT_STRING; @@ -244,18 +307,19 @@ while(pCurItem) { - mii.dwTypeData = pCurItem->szDesc; - mii.cch = strlenW(mii.dwTypeData); - mii.wID = idFirst + i; - if (InsertMenuItemW(hMenu, idMenu, TRUE, &mii)) + if (i >= 1) { - idMenu++; - i++; + mii.dwTypeData = pCurItem->szDesc; + mii.cch = strlenW(mii.dwTypeData); + mii.wID = idFirst; + InsertMenuItemW(hMenu, idMenu, TRUE, &mii); + idMenu++; + idFirst++; } pCurItem = pCurItem->Next; - } - This->iIdShellNewFirst = idFirst; - This->iIdShellNewLast = idFirst + i; + i++; + } + This->iIdShellNewLast = idFirst; } VOID DoShellNewCmd(BgCmImpl * This, LPCMINVOKECOMMANDINFO lpcmi) @@ -276,7 +340,6 @@ static const WCHAR szNew[] = { 'N','e','w',' ',0 }; //FIXME static const WCHAR szP1[] = { '%', '1', 0 }; static const WCHAR szFormat[] = {'%','s',' ','(','%','d',')','%','s',0 }; - i = This->iIdShellNewFirst; target = LOWORD(lpcmi->lpVerb);

1 0

[peterw] 29755: - Make sure banner is displayed when rosbe.cmd is called without parameters.
by peterw＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: peterw Date: Mon Oct 22 01:16:17 2007 New Revision: 29755 URL: http://svn.reactos.org/svn/reactos?rev=29755&view=rev Log: - Make sure banner is displayed when rosbe.cmd is called without parameters. Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Oct 22 01:16:17 2007 @@ -49,11 +49,10 @@ cls echo Unknown parameter specified. Exiting. goto :ExitRosBE -) else ( - cls - call :RosBE4 - goto :EndCommandParse ) + +cls +call :RosBE4 :EndCommandParse

1 0

[peterw] 29754: - Small chdefdir cleanup and change _VER to _ROSBE_VERSION.
by peterw＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: peterw Date: Mon Oct 22 01:06:49 2007 New Revision: 29754 URL: http://svn.reactos.org/svn/reactos?rev=29754&view=rev Log: - Small chdefdir cleanup and change _VER to _ROSBE_VERSION. Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Mon Oct 22 01:06:49 2007 @@ -10,25 +10,24 @@ title Change the Default Dir... -if /I "%1"=="" ( - goto :DEF +if /i "%1" == "" ( + goto :INTERACTIVE ) -if /I "%1"=="default" ( +if /i "%1" == "default" ( set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% ) else ( set _ROSBE_ROSSOURCEDIR=%1 ) goto :END -:DEF +:INTERACTIVE +echo Type in a Path to use RosBE in or "default" to revert to Default Dir: +set /p XY= -echo Type in a Path to use RosBE in or "default" to revert to Default Dir: -SET /P XY= - -if /I "%XY%"=="" ( +if /i "%XY%" == "" ( goto :END ) -if /I "%XY%"=="default" ( +if /i "%XY%"=="default" ( set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% ) else ( set _ROSBE_ROSSOURCEDIR=%XY% @@ -36,5 +35,5 @@ goto :END :END -title ReactOS Build Environment %_VER% -cd /D "%_ROSBE_ROSSOURCEDIR%" +title ReactOS Build Environment %_ROSBE_VERSION% +cd /d "%_ROSBE_ROSSOURCEDIR%"

1 0

[cfinck] 29753: Shell32 resource file cleanup - Part 1/2 for today - Move all language-dependent resource files to a "lang" subdirectory and rename them appropriately - Rename "shres.rc" to "shell32.rc" - Make all translations consistent, if some elements were missing I copied the english ones. Also use a consistent indentation. All resource files from "bg-BG.rc" to "fi-FI.rc" (alphabetically) should be consistent now, I'll do the rest later. - Fix some mistakes in the german translation
by cfinck＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: cfinck Date: Mon Oct 22 01:04:36 2007 New Revision: 29753 URL: http://svn.reactos.org/svn/reactos?rev=29753&view=rev Log: Shell32 resource file cleanup - Part 1/2 for today - Move all language-dependent resource files to a "lang" subdirectory and rename them appropriately - Rename "shres.rc" to "shell32.rc" - Make all translations consistent, if some elements were missing I copied the english ones. Also use a consistent indentation. All resource files from "bg-BG.rc" to "fi-FI.rc" (alphabetically) should be consistent now, I'll do the rest later. - Fix some mistakes in the german translation Added: trunk/reactos/dll/win32/shell32/lang/ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_Bg.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_Ca.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_Cs.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_Da.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_En.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_Eo.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_Es.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_Fi.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Fr.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Hu.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_It.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Ja.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Ko.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_No.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Nl.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Pl.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Pt.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Ru.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Sk.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Si.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Sv.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Tr.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Uk.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Wa.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Cn.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Zh.rc trunk/reactos/dll/win32/shell32/shell32.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shres.rc Removed: trunk/reactos/dll/win32/shell32/shell32_Bg.rc trunk/reactos/dll/win32/shell32/shell32_Ca.rc trunk/reactos/dll/win32/shell32/shell32_Cn.rc trunk/reactos/dll/win32/shell32/shell32_Cs.rc trunk/reactos/dll/win32/shell32/shell32_Da.rc trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/shell32_En.rc trunk/reactos/dll/win32/shell32/shell32_Eo.rc trunk/reactos/dll/win32/shell32/shell32_Es.rc trunk/reactos/dll/win32/shell32/shell32_Fi.rc trunk/reactos/dll/win32/shell32/shell32_Fr.rc trunk/reactos/dll/win32/shell32/shell32_Hu.rc trunk/reactos/dll/win32/shell32/shell32_It.rc trunk/reactos/dll/win32/shell32/shell32_Ja.rc trunk/reactos/dll/win32/shell32/shell32_Ko.rc trunk/reactos/dll/win32/shell32/shell32_Nl.rc trunk/reactos/dll/win32/shell32/shell32_No.rc trunk/reactos/dll/win32/shell32/shell32_Pl.rc trunk/reactos/dll/win32/shell32/shell32_Pt.rc trunk/reactos/dll/win32/shell32/shell32_Ru.rc trunk/reactos/dll/win32/shell32/shell32_Si.rc trunk/reactos/dll/win32/shell32/shell32_Sk.rc trunk/reactos/dll/win32/shell32/shell32_Sv.rc trunk/reactos/dll/win32/shell32/shell32_Tr.rc trunk/reactos/dll/win32/shell32/shell32_Uk.rc trunk/reactos/dll/win32/shell32/shell32_Wa.rc trunk/reactos/dll/win32/shell32/shell32_Zh.rc trunk/reactos/dll/win32/shell32/shell32_xx.rc trunk/reactos/dll/win32/shell32/shres.rc Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Copied: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_Bg.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Copied: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_Ca.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Copied: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_Cs.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Copied: trunk/reactos/dll/win32/shell32/lang/da-DK.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_Da.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Copied: trunk/reactos/dll/win32/shell32/lang/de-DE.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_De.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Copied: trunk/reactos/dll/win32/shell32/lang/en-US.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_En.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Copied: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_Eo.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… Copied: trunk/reactos/dll/win32/shell32/lang/es-ES.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_Es.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Copied: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_Fi.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Copied: trunk/reactos/dll/win32/shell32/shell32.rc (from r29729, trunk/reactos/dll/win32/shell32/shres.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Removed: trunk/reactos/dll/win32/shell32/shell32_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Ca.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Wa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_xx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shres.rc…

1 0

[weiden] 29752: Load libraries as data files in RegLoadMUIString
by weiden＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: weiden Date: Sun Oct 21 23:14:19 2007 New Revision: 29752 URL: http://svn.reactos.org/svn/reactos?rev=29752&view=rev Log: Load libraries as data files in RegLoadMUIString Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c Sun Oct 21 23:14:19 2007 @@ -4967,7 +4967,7 @@ uiStringId = _wtoi(pComma+2); *pComma = L'\0'; - hModule = LoadLibraryW(pwszExpandedBuffer + 1); + hModule = LoadLibraryExW(pwszExpandedBuffer + 1, NULL, LOAD_LIBRARY_AS_DATAFILE); if (!hModule || !load_string(hModule, uiStringId, pszOutBuf, cbOutBuf / sizeof(WCHAR))) result = ERROR_BADKEY; FreeLibrary(hModule);

1 0

[greatlrd] 29751: fix compilng forget implement stub for DxEngIncDispUniq
by greatlrd＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: greatlrd Date: Sun Oct 21 22:52:42 2007 New Revision: 29751 URL: http://svn.reactos.org/svn/reactos?rev=29751&view=rev Log: fix compilng forget implement stub for DxEngIncDispUniq Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Sun Oct 21 22:52:42 2007 @@ -115,6 +115,7 @@ DWORD DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngGetRedirectionBitmap(DWORD x1); DWORD DxEngLoadImage(DWORD x1,DWORD x2); +DWORD DxEngIncDispUniq(); Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Sun Oct 21 22:52:42 2007 @@ -483,4 +483,13 @@ return FALSE; } - +/************************************************************************/ +/* DxEngIncDispUniq */ +/************************************************************************/ +DWORD DxEngIncDispUniq() +{ + UNIMPLEMENTED; + return FALSE; +} + +

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007