Ros-diffs May 2013

ros-diffs@reactos.org

16 participants
234 discussions

[akhaldi] 59040: [CMAKE] * Add some missing order only dependencies.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun May 19 13:43:47 2013 New Revision: 59040 URL: http://svn.reactos.org/svn/reactos?rev=59040&view=rev Log: [CMAKE] * Add some missing order only dependencies. Modified: trunk/reactos/dll/directx/devenum/CMakeLists.txt trunk/reactos/dll/directx/ksproxy/CMakeLists.txt trunk/reactos/dll/directx/quartz/CMakeLists.txt trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt trunk/reactos/hal/halx86/acpi.cmake trunk/reactos/hal/halx86/legacy.cmake trunk/reactos/hal/halx86/up.cmake Modified: trunk/reactos/dll/directx/devenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/CMakeL… ============================================================================== --- trunk/reactos/dll/directx/devenum/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/devenum/CMakeLists.txt [iso-8859-1] Sun May 19 13:43:47 2013 @@ -1,4 +1,3 @@ - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -17,22 +16,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/devenum.def) set_module_type(devenum win32dll UNICODE) - -target_link_libraries(devenum - strmiids - uuid - wine) - -add_importlibs(devenum - advapi32 - ole32 - oleaut32 - winmm - user32 - avicap32 - msvcrt - kernel32 - ntdll) - +target_link_libraries(devenum strmiids uuid wine) +add_importlibs(devenum advapi32 ole32 oleaut32 winmm user32 avicap32 msvcrt kernel32 ntdll) add_pch(devenum devenum_private.h) +add_dependencies(devenum dxsdk) add_cd_file(TARGET devenum DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/ksproxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/CMakeL… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Sun May 19 13:43:47 2013 @@ -23,10 +23,7 @@ qualityforward.cpp ${CMAKE_CURRENT_BINARY_DIR}/ksproxy.def) -add_library(ksproxy SHARED - ${SOURCE} - ksproxy.rc) - +add_library(ksproxy SHARED ${SOURCE} ksproxy.rc) set_module_type(ksproxy win32dll) set_target_properties(ksproxy PROPERTIES SUFFIX ".ax") @@ -39,15 +36,6 @@ endif() target_link_libraries(ksproxy strmiids) - -add_importlibs(ksproxy - advapi32 - ole32 - setupapi - ksuser - msvcrt - kernel32 - ntdll) - +add_importlibs(ksproxy advapi32 ole32 setupapi ksuser msvcrt kernel32 ntdll) +add_dependencies(ksproxy dxsdk) add_cd_file(TARGET ksproxy DESTINATION reactos/system32 FOR all) - Modified: trunk/reactos/dll/directx/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/CMakeLi… ============================================================================== --- trunk/reactos/dll/directx/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/CMakeLists.txt [iso-8859-1] Sun May 19 13:43:47 2013 @@ -43,34 +43,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/quartz_strmif_p.c ${CMAKE_CURRENT_BINARY_DIR}/quartz.def) -add_library(quartz SHARED - ${SOURCE} - version.rc) - +add_library(quartz SHARED ${SOURCE} version.rc) set_module_type(quartz win32dll) - -target_link_libraries(quartz - strmiids - uuid - wine - ${PSEH_LIB}) - -add_importlibs(quartz - msvcrt - advapi32 - dsound - ole32 - oleaut32 - shlwapi - user32 - gdi32 - advapi32 - msvfw32 - msacm32 - rpcrt4 - kernel32 - ntdll) - +target_link_libraries(quartz strmiids uuid wine ${PSEH_LIB}) +add_importlibs(quartz dsound ole32 oleaut32 shlwapi user32 gdi32 advapi32 msvfw32 msacm32 rpcrt4 msvcrt kernel32 ntdll) +add_dependencies(quartz dxsdk) add_pch(quartz quartz_private.h) add_cd_file(TARGET quartz DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] Sun May 19 13:43:47 2013 @@ -14,4 +14,5 @@ set_module_type(mciqtz32 win32dll) target_link_libraries(mciqtz32 wine strmiids) add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 msvcrt kernel32 ntdll) +add_dependencies(mciqtz32 dxsdk) add_cd_file(TARGET mciqtz32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/hal/halx86/acpi.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi.cmake?rev=… ============================================================================== --- trunk/reactos/hal/halx86/acpi.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi.cmake [iso-8859-1] Sun May 19 13:43:47 2013 @@ -6,7 +6,7 @@ legacy/bus/pcibus.c) add_object_library(lib_hal_acpi ${HAL_ACPI_SOURCE}) - +add_dependencies(lib_hal_acpi bugcodes) #add_pch(lib_hal_acpi include/hal.h) if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7)) Modified: trunk/reactos/hal/halx86/legacy.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy.cmake?re… ============================================================================== --- trunk/reactos/hal/halx86/legacy.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy.cmake [iso-8859-1] Sun May 19 13:43:47 2013 @@ -12,7 +12,7 @@ legacy/halpcat.c) add_object_library(lib_hal_legacy ${HAL_LEGACY_SOURCE}) - +add_dependencies(lib_hal_legacy bugcodes) #add_pch(lib_hal_legacy include/hal.h) if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7)) Modified: trunk/reactos/hal/halx86/up.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up.cmake?rev=59… ============================================================================== --- trunk/reactos/hal/halx86/up.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up.cmake [iso-8859-1] Sun May 19 13:43:47 2013 @@ -4,3 +4,4 @@ up/processor.c) add_object_library(lib_hal_up ${HAL_UP_SOURCE}) +add_dependencies(lib_hal_up bugcodes)

11 years, 7 months

[janderwald] 59039: [USB] - Fix race condition for status change worker routine CORE-7193 #resolve - Tested by Thomas Faber (Blame him ; )

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat May 18 20:16:50 2013 New Revision: 59039 URL: http://svn.reactos.org/svn/reactos?rev=59039&view=rev Log: [USB] - Fix race condition for status change worker routine CORE-7193 #resolve - Tested by Thomas Faber (Blame him ;) Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp trunk/reactos/drivers/usb/usbohci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sat May 18 20:16:50 2013 @@ -96,7 +96,7 @@ PVOID m_SCEContext; // status change callback routine context BOOLEAN m_DoorBellRingInProgress; // door bell ring in progress WORK_QUEUE_ITEM m_StatusChangeWorkItem; // work item for status change callback - ULONG m_WorkItemActive; // work item status + volatile LONG m_StatusChangeWorkItemStatus; // work item status ULONG m_SyncFramePhysAddr; // periodic frame list physical address BUS_INTERFACE_STANDARD m_BusInterface; // pci bus interface BOOLEAN m_PortResetInProgress[0xF]; // stores reset in progress (vbox hack) @@ -1433,13 +1433,13 @@ // if (QueueSCEWorkItem && This->m_SCECallBack != NULL) { - // work item is now active - This->m_WorkItemActive = TRUE; - - // - // queue work item for processing - // - ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); + if (InterlockedCompareExchange(&This->m_StatusChangeWorkItemStatus, 1, 0) == 0) + { + // + // queue work item for processing + // + ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); + } } } return; @@ -1466,8 +1466,10 @@ This->m_SCECallBack(This->m_SCEContext); } - // work item is completed - This->m_WorkItemActive = FALSE; + // + // reset active status + // + InterlockedDecrement(&This->m_StatusChangeWorkItemStatus); } NTSTATUS Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Sat May 18 20:16:50 2013 @@ -101,6 +101,7 @@ HD_INIT_CALLBACK* m_SCECallBack; // status change callback routine PVOID m_SCEContext; // status change callback routine context WORK_QUEUE_ITEM m_StatusChangeWorkItem; // work item for status change callback + volatile LONG m_StatusChangeWorkItemStatus; // work item active status ULONG m_SyncFramePhysAddr; // periodic frame list physical address ULONG m_IntervalValue; // periodic interval value }; @@ -1523,10 +1524,13 @@ // if (QueueSCEWorkItem && This->m_SCECallBack != NULL) { - // - // queue work item for processing - // - ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); + if (InterlockedCompareExchange(&This->m_StatusChangeWorkItemStatus, 1, 0) == 0) + { + // + // queue work item for processing + // + ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); + } } } } @@ -1552,6 +1556,10 @@ This->m_SCECallBack(This->m_SCEContext); } + // + // reset active status + // + InterlockedDecrement(&This->m_StatusChangeWorkItemStatus); } NTSTATUS

11 years, 7 months

[ekohl] 59038: [RPCRT4] Fix a bug that corrupted in-parameters when a remote function is called. If the in-parameter is an array of UNICODE_STRINGS, the bug terminates all strings at the length of ...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat May 18 19:19:27 2013 New Revision: 59038 URL: http://svn.reactos.org/svn/reactos?rev=59038&view=rev Log: [RPCRT4] Fix a bug that corrupted in-parameters when a remote function is called. If the in-parameter is an array of UNICODE_STRINGS, the bug terminates all strings at the length of the first string. For example, when LsaLookupNames is called in order to retrieve the SIDs of the "Guest" and "Administrator" users, the remote function received the strings "Guest" and "Admin". The patch will be sent to the WINE project after a similar bug for out-parameters has been fixed too. Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] Sat May 18 19:19:27 2013 @@ -1210,7 +1210,7 @@ unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; unsigned char *saved_memory = pStubMsg->Memory; - pStubMsg->Memory = pMemory; + pStubMsg->Memory = membase; PointerMarshall(pStubMsg, bufptr, *(unsigned char**)memptr, info+4); pStubMsg->Memory = saved_memory; } @@ -1362,7 +1362,7 @@ unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *saved_memory = pStubMsg->Memory; - pStubMsg->Memory = pMemory; + pStubMsg->Memory = membase; PointerBufferSize(pStubMsg, *(unsigned char**)memptr, info+4); pStubMsg->Memory = saved_memory; } Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ro… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] Sat May 18 19:19:27 2013 @@ -15,6 +15,24 @@ =================================================================== --- ndr_marshall.c (working copy) +++ ndr_marshall.c (working copy) +@@ -1210,7 +1210,7 @@ + unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; + unsigned char *saved_memory = pStubMsg->Memory; + +- pStubMsg->Memory = pMemory; ++ pStubMsg->Memory = membase; + PointerMarshall(pStubMsg, bufptr, *(unsigned char**)memptr, info+4); + pStubMsg->Memory = saved_memory; + } +@@ -1362,7 +1362,7 @@ + unsigned char *memptr = membase + *(const SHORT*)&info[0]; + unsigned char *saved_memory = pStubMsg->Memory; + +- pStubMsg->Memory = pMemory; ++ pStubMsg->Memory = membase; + PointerBufferSize(pStubMsg, *(unsigned char**)memptr, info+4); + pStubMsg->Memory = saved_memory; + } @@ -6159,6 +6159,7 @@ static LONG unmarshall_discriminant(PMID case RPC_FC_WCHAR: case RPC_FC_SHORT:

11 years, 7 months

[zguo] 59037: Make sure the start menu banner says 0.3.15, noticed by Thommas Faber.

by zguo＠svn.reactos.org

Author: zguo Date: Sat May 18 18:26:52 2013 New Revision: 59037 URL: http://svn.reactos.org/svn/reactos?rev=59037&view=rev Log: Make sure the start menu banner says 0.3.15, noticed by Thommas Faber. Modified: branches/ReactOS-0.3.15/base/shell/explorer/res/logov.bmp Modified: branches/ReactOS-0.3.15/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/base/shell/explo… ============================================================================== Binary files - no diff available.

11 years, 7 months

[akhaldi] 59036: [MSPAINT] * Plug a handle leak. Fixed by Andre Guibert de Bruet. CORE-7190 #resolve #comment Committed in r59036. Thanks !

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 18 14:48:51 2013 New Revision: 59036 URL: http://svn.reactos.org/svn/reactos?rev=59036&view=rev Log: [MSPAINT] * Plug a handle leak. Fixed by Andre Guibert de Bruet. CORE-7190 #resolve #comment Committed in r59036. Thanks ! Modified: trunk/reactos/base/applications/mspaint/dib.c Modified: trunk/reactos/base/applications/mspaint/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/dib.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/dib.c [iso-8859-1] Sat May 18 14:48:51 2013 @@ -131,7 +131,10 @@ bi = HeapAlloc(GetProcessHeap(), 0, bfh.bfOffBits - sizeof(BITMAPFILEHEADER)); if (!bi) + { + CloseHandle(hFile); return; + } ReadFile(hFile, bi, bfh.bfOffBits - sizeof(BITMAPFILEHEADER), &dwBytesRead, NULL); *hBitmap = CreateDIBSection(NULL, bi, DIB_RGB_COLORS, &pvBits, NULL, 0);

11 years, 7 months

[akhaldi] 59035: [IERNONCE] * Add to trunk, with a stubbed RunonceEx. Brought to you by Robert Naumann. CORE-7194 #resolve #comment Committed in r59035. Cheers ; )

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 18 14:41:18 2013 New Revision: 59035 URL: http://svn.reactos.org/svn/reactos?rev=59035&view=rev Log: [IERNONCE] * Add to trunk, with a stubbed RunonceEx. Brought to you by Robert Naumann. CORE-7194 #resolve #comment Committed in r59035. Cheers ;) Added: trunk/reactos/dll/win32/iernonce/ trunk/reactos/dll/win32/iernonce/CMakeLists.txt (with props) trunk/reactos/dll/win32/iernonce/iernonce.c (with props) trunk/reactos/dll/win32/iernonce/iernonce.spec (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sat May 18 14:41:18 2013 @@ -50,6 +50,7 @@ add_subdirectory(iccvid) add_subdirectory(icmp) add_subdirectory(ieframe) +add_subdirectory(iernonce) add_subdirectory(imaadp32.acm) add_subdirectory(imagehlp) add_subdirectory(imm32) Added: trunk/reactos/dll/win32/iernonce/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iernonce/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/iernonce/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/iernonce/CMakeLists.txt [iso-8859-1] Sat May 18 14:41:18 2013 @@ -0,0 +1,10 @@ + +spec2def(iernonce.dll iernonce.spec) + +add_library(iernonce SHARED + iernonce.c + ${CMAKE_CURRENT_BINARY_DIR}/iernonce.def) + +set_module_type(iernonce win32dll UNICODE) +add_importlibs(iernonce msvcrt kernel32 ntdll) +add_cd_file(TARGET iernonce DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/iernonce/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/iernonce/iernonce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iernonce/iernonc… ============================================================================== --- trunk/reactos/dll/win32/iernonce/iernonce.c (added) +++ trunk/reactos/dll/win32/iernonce/iernonce.c [iso-8859-1] Sat May 18 14:41:18 2013 @@ -0,0 +1,44 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\iernonce\iernonce.c + * PURPOSE: DLL for RunOnceEx Keys + * PROGRAMMERS: Copyright 2013 Robert Naumann + */ + + +#define WIN32_NO_STATUS +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winuser.h> +#include <setupapi.h> + +#define NDEBUG +#include <debug.h> + +HINSTANCE hInstance; + +BOOL +WINAPI +DllMain(HINSTANCE hinstDLL, + DWORD dwReason, + LPVOID reserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + break; + case DLL_PROCESS_DETACH: + hInstance = hinstDLL; + break; + } + + return TRUE; +} + +VOID WINAPI RunOnceExProcess(HWND hwnd, HINSTANCE hInst, LPCSTR path, int nShow) +{ + DPRINT1("RunOnceExProcess() not implemented\n"); +} Propchange: trunk/reactos/dll/win32/iernonce/iernonce.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/iernonce/iernonce.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iernonce/iernonc… ============================================================================== --- trunk/reactos/dll/win32/iernonce/iernonce.spec (added) +++ trunk/reactos/dll/win32/iernonce/iernonce.spec [iso-8859-1] Sat May 18 14:41:18 2013 @@ -0,0 +1 @@ +@ stdcall RunOnceExProcess(ptr ptr str long) Propchange: trunk/reactos/dll/win32/iernonce/iernonce.spec ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 7 months

[akhaldi] 59034: [MSIEXEC] * Sync with Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 18 13:53:18 2013 New Revision: 59034 URL: http://svn.reactos.org/svn/reactos?rev=59034&view=rev Log: [MSIEXEC] * Sync with Wine 1.5.26. Modified: trunk/reactos/base/system/msiexec/msiexec.c trunk/reactos/base/system/msiexec/rsrc.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/system/msiexec/msiexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== --- trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] Sat May 18 13:53:18 2013 @@ -114,10 +114,8 @@ static VOID StringListAppend(struct string_list **list, LPCWSTR str) { struct string_list *entry; - DWORD size; - - size = sizeof *entry + lstrlenW(str) * sizeof (WCHAR); - entry = HeapAlloc(GetProcessHeap(), 0, size); + + entry = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(struct string_list, str[lstrlenW(str) + 1])); if(!entry) { WINE_ERR("Out of memory!\n"); @@ -351,29 +349,57 @@ static DWORD DoRegServer(void) { + static const WCHAR msiserverW[] = {'M','S','I','S','e','r','v','e','r',0}; + static const WCHAR msiexecW[] = {'\\','m','s','i','e','x','e','c',' ','/','V',0}; SC_HANDLE scm, service; - CHAR path[MAX_PATH+12]; - DWORD ret = 0; - - scm = OpenSCManagerA(NULL, SERVICES_ACTIVE_DATABASEA, SC_MANAGER_CREATE_SERVICE); - if (!scm) + WCHAR path[MAX_PATH+12]; + DWORD len, ret = 0; + + if (!(scm = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASEW, SC_MANAGER_CREATE_SERVICE))) { fprintf(stderr, "Failed to open the service control manager.\n"); return 1; } - - GetSystemDirectoryA(path, MAX_PATH); - lstrcatA(path, "\\msiexec.exe /V"); - - service = CreateServiceA(scm, "MSIServer", "MSIServer", GENERIC_ALL, - SERVICE_WIN32_SHARE_PROCESS, SERVICE_DEMAND_START, - SERVICE_ERROR_NORMAL, path, NULL, NULL, - NULL, NULL, NULL); - - if (service) CloseServiceHandle(service); + len = GetSystemDirectoryW(path, MAX_PATH); + lstrcpyW(path + len, msiexecW); + if ((service = CreateServiceW(scm, msiserverW, msiserverW, GENERIC_ALL, + SERVICE_WIN32_SHARE_PROCESS, SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, path, NULL, NULL, NULL, NULL, NULL))) + { + CloseServiceHandle(service); + } else if (GetLastError() != ERROR_SERVICE_EXISTS) { fprintf(stderr, "Failed to create MSI service\n"); + ret = 1; + } + CloseServiceHandle(scm); + return ret; +} + +static DWORD DoUnregServer(void) +{ + static const WCHAR msiserverW[] = {'M','S','I','S','e','r','v','e','r',0}; + SC_HANDLE scm, service; + DWORD ret = 0; + + if (!(scm = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASEW, SC_MANAGER_CONNECT))) + { + fprintf(stderr, "Failed to open service control manager\n"); + return 1; + } + if ((service = OpenServiceW(scm, msiserverW, DELETE))) + { + if (!DeleteService(service)) + { + fprintf(stderr, "Failed to delete MSI service\n"); + ret = 1; + } + CloseServiceHandle(service); + } + else if (GetLastError() != ERROR_SERVICE_DOES_NOT_EXIST) + { + fprintf(stderr, "Failed to open MSI service\n"); ret = 1; } CloseServiceHandle(scm); @@ -477,12 +503,12 @@ *pargv = argv; } -static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) +static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***pargv ) { LONG r; - HKEY hkey = 0, hkeyArgs = 0; + HKEY hkey; DWORD sz = 0, type = 0; - LPWSTR buf = NULL; + WCHAR *buf; BOOL ret = FALSE; r = RegOpenKeyW(HKEY_LOCAL_MACHINE, InstallRunOnce, &hkey); @@ -491,8 +517,15 @@ r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz); if(r == ERROR_SUCCESS && type == REG_SZ) { - buf = HeapAlloc(GetProcessHeap(), 0, sz); - r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)buf, &sz); + int len = lstrlenW( *pargv[0] ); + if (!(buf = HeapAlloc( GetProcessHeap(), 0, sz + (len + 1) * sizeof(WCHAR) ))) + { + RegCloseKey( hkey ); + return FALSE; + } + memcpy( buf, *pargv[0], len * sizeof(WCHAR) ); + buf[len++] = ' '; + r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)(buf + len), &sz); if( r == ERROR_SUCCESS ) { process_args(buf, pargc, pargv); @@ -500,7 +533,7 @@ } HeapFree(GetProcessHeap(), 0, buf); } - RegCloseKey(hkeyArgs); + RegCloseKey(hkey); return ret; } @@ -569,7 +602,8 @@ { FunctionRegServer = TRUE; } - else if (msi_option_equal(argvW[i], "unregserver") || msi_option_equal(argvW[i], "unregister")) + else if (msi_option_equal(argvW[i], "unregserver") || msi_option_equal(argvW[i], "unregister") + || msi_option_equal(argvW[i], "unreg")) { FunctionUnregServer = TRUE; } @@ -884,6 +918,11 @@ InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; WINE_FIXME("Unknown modifier: !\n"); } + else if(msi_strequal(argvW[i]+2, "b!")) + { + InstallUILevel = INSTALLUILEVEL_BASIC; + WINE_FIXME("Unknown modifier: !\n"); + } else { fprintf(stderr, "Unknown option \"%s\" for UI level\n", @@ -976,7 +1015,7 @@ } else if (FunctionUnregServer) { - WINE_FIXME( "/unregserver not implemented yet, ignoring\n" ); + ReturnCode = DoUnregServer(); } else if (FunctionServer) { Modified: trunk/reactos/base/system/msiexec/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/rsrc.r… ============================================================================== --- trunk/reactos/base/system/msiexec/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/rsrc.rc [iso-8859-1] Sat May 18 13:53:18 2013 @@ -21,10 +21,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine Installer" #define WINE_FILENAME_STR "msiexec.exe" #define WINE_FILETYPE VFT_APP -#define WINE_FILEVERSION 3,1,4000,1823 -#define WINE_FILEVERSION_STR "3.1.4000.1823" -#define WINE_PRODUCTVERSION 3,1,4000,1823 -#define WINE_PRODUCTVERSION_STR "3.1.4000.1823" +#define WINE_FILEVERSION 4,5,6001,22299 +#define WINE_FILEVERSION_STR "4.5.6001.22299" +#define WINE_PRODUCTVERSION 4,5,6001,22299 +#define WINE_PRODUCTVERSION_STR "4.5.6001.22299" #define WINE_PRODUCTNAME_STR "Wine Installer" #include "wine/wine_common_ver.rc" Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 18 13:53:18 2013 @@ -221,7 +221,7 @@ reactos/base/applications/wordpad # Synced to Wine-1.5.26 reactos/base/services/rpcss # Synced to Wine-20081105 reactos/base/system/expand # Synced to Wine-1.5.26 -reactos/base/system/msiexec # Autosync +reactos/base/system/msiexec # Synced to Wine-1.5.26 reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported

11 years, 7 months

[tfaber] 59033: [LT2013] - Merge r58706 (ntos/ke: Reset the state of the right thread when switching NPX threads) - Merge r58727 (ntos/mm: Fix check for address range fitting the VAD when commiting...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 18 11:54:48 2013 New Revision: 59033 URL: http://svn.reactos.org/svn/reactos?rev=59033&view=rev Log: [LT2013] - Merge r58706 (ntos/ke: Reset the state of the right thread when switching NPX threads) - Merge r58727 (ntos/mm: Fix check for address range fitting the VAD when commiting memory) - Merge r58865 (bootdata: Add Themes folder during setup) - Merge r59015 (rundll32: always return 0) Modified: branches/ros-branch-0_3_15-lt2013/ (props changed) branches/ros-branch-0_3_15-lt2013/base/system/rundll32/rundll32.c branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in branches/ros-branch-0_3_15-lt2013/cmake/CMakeMacros.cmake branches/ros-branch-0_3_15-lt2013/ntoskrnl/ke/i386/traphdlr.c branches/ros-branch-0_3_15-lt2013/ntoskrnl/mm/ARM3/virtual.c Propchange: branches/ros-branch-0_3_15-lt2013/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat May 18 11:54:48 2013 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:58534,58553,58561,58614,58627-58628,58633,58759 +/trunk/reactos:58534,58553,58561,58614,58627-58628,58633,58706,58727,58759,58865,59015 Modified: branches/ros-branch-0_3_15-lt2013/base/system/rundll32/rundll32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/base/system/rundll32/rundll32.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/base/system/rundll32/rundll32.c [iso-8859-1] Sat May 18 11:54:48 2013 @@ -343,7 +343,7 @@ DllWinMainW fnDllWinMainW; DllWinMainA fnDllWinMainA; HWND hWindow; - int nRetVal,i; + int i; size_t nStrLen; // Get command-line in argc-argv format @@ -380,8 +380,6 @@ lptCmdLine = argv[i]; else lptCmdLine = _T(""); - - nRetVal = 0; // Everything is all setup, so load the dll now hDll = LoadLibrary(lptDllName); @@ -439,13 +437,13 @@ if (fnDllWinMainW) { // Convert the command-line string to unicode and call the dll function lpwCmdLine = ConvertToWideChar(lptCmdLine); - nRetVal = fnDllWinMainW(hWindow,hInstance,lpwCmdLine,nCmdShow); + fnDllWinMainW(hWindow,hInstance,lpwCmdLine,nCmdShow); FreeConvertedWideChar(lpwCmdLine); } else if (fnDllWinMainA) { // Convert the command-line string to ansi and call the dll function lpaCmdLine = ConvertToMultiByte(lptCmdLine); - nRetVal = fnDllWinMainA(hWindow,hInstance,lpaCmdLine,nCmdShow); + fnDllWinMainA(hWindow,hInstance,lpaCmdLine,nCmdShow); FreeConvertedMultiByte(lpaCmdLine); } else { @@ -478,6 +476,6 @@ } if (argv) free(argv); - return nRetVal; -} - + return 0; /* rundll32 always returns 0! */ +} + Modified: branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/boot/b… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Sat May 18 11:54:48 2013 @@ -28,6 +28,8 @@ 12 = Microsoft.NET\Framework\v1.0.3705 13 = Microsoft.NET\Framework\v1.1.4322 14 = Microsoft.NET\Framework\v2.0.50727 +15 = Resources +16 = Resources\Themes .InfEnd Modified: branches/ros-branch-0_3_15-lt2013/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/cmake/… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/cmake/CMakeMacros.cmake [iso-8859-1] Sat May 18 11:54:48 2013 @@ -111,6 +111,10 @@ set(${var} 13) elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727) set(${var} 14) + elseif(${dir} STREQUAL reactos/Resources) + set(${var} 15) + elseif(${dir} STREQUAL reactos/Resources/Themes) + set(${var} 16) else() message(ERROR "Wrong destination: ${dir}") endif() Modified: branches/ros-branch-0_3_15-lt2013/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/ntoskr… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sat May 18 11:54:48 2013 @@ -756,7 +756,7 @@ //Ke386SaveFpuState(NpxSaveArea); /* Update NPX state */ - Thread->NpxState = NPX_STATE_NOT_LOADED; + NpxThread->NpxState = NPX_STATE_NOT_LOADED; } /* Load FPU state */ Modified: branches/ros-branch-0_3_15-lt2013/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/ntoskr… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat May 18 11:54:48 2013 @@ -4080,7 +4080,7 @@ // // Make sure that this address range actually fits within the VAD for it // - if (((StartingAddress >> PAGE_SHIFT) < FoundVad->StartingVpn) && + if (((StartingAddress >> PAGE_SHIFT) < FoundVad->StartingVpn) || ((EndingAddress >> PAGE_SHIFT) > FoundVad->EndingVpn)) { DPRINT1("Address range does not fit into the VAD\n");

11 years, 7 months

[tfaber] 59032: [LT2013] - Update version - Add themed wallpaper - Add cmake-adjusted hybridcd tools

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 18 11:41:34 2013 New Revision: 59032 URL: http://svn.reactos.org/svn/reactos?rev=59032&view=rev Log: [LT2013] - Update version - Add themed wallpaper - Add cmake-adjusted hybridcd tools Added: branches/ros-branch-0_3_15-lt2013/hybridcd_freeldr.ini - copied unchanged from r59031, tags/ReactOS-0.3.14-CLT2012/hybridcd_freeldr.ini branches/ros-branch-0_3_15-lt2013/make_hybridcd.cmd - copied, changed from r59031, tags/ReactOS-0.3.14-CLT2012/make_hybridcd.cmd branches/ros-branch-0_3_15-lt2013/modules/wallpaper/angelus-ros-lt.bmp - copied, changed from r59031, branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_02_ROSWP.bmp Removed: branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_02_ROSWP.bmp branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp branches/ros-branch-0_3_15-lt2013/modules/wallpaper/RainInTheScreen_4x3.bmp Modified: branches/ros-branch-0_3_15-lt2013/base/shell/explorer-new/res/logov.bmp branches/ros-branch-0_3_15-lt2013/base/shell/explorer/res/logov.bmp branches/ros-branch-0_3_15-lt2013/boot/bootdata/hivedef.inf branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in branches/ros-branch-0_3_15-lt2013/include/reactos/version.cmake branches/ros-branch-0_3_15-lt2013/modules/wallpaper/CMakeLists.txt Modified: branches/ros-branch-0_3_15-lt2013/base/shell/explorer-new/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_15-lt2013/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_15-lt2013/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/boot/b… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/boot/bootdata/hivedef.inf [iso-8859-1] Sat May 18 11:41:34 2013 @@ -95,7 +95,7 @@ HKCU,"Control Panel\Desktop","ScreenSaverIsSecure",2,"1" HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Angelus_02_ROSWP.bmp" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\angelus-ros-lt.bmp" HKCU,"Control Panel\Desktop","FontSmoothing",0,"1" HKCU,"Control Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","FontSmoothingType",0x00010003,0x00000001 Modified: branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/boot/b… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Sat May 18 11:41:34 2013 @@ -59,5 +59,3 @@ modules\optional\vmx_svga.sys 2 optional modules\optional\wine_gecko-1.0.0-x86.cab 4 optional boot\bootdata\bootcdregtest\AHKAppTests.cmd 7 optional - -modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional Modified: branches/ros-branch-0_3_15-lt2013/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/includ… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/include/reactos/version.cmake [iso-8859-1] Sat May 18 11:41:34 2013 @@ -34,7 +34,7 @@ set(KERNEL_VERSION_PATCH_LEVEL "15") set(COPYRIGHT_YEAR "2013") # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) -set(KERNEL_VERSION_BUILD_TYPE "") +set(KERNEL_VERSION_BUILD_TYPE "LT2013") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}") Copied: branches/ros-branch-0_3_15-lt2013/make_hybridcd.cmd (from r59031, tags/ReactOS-0.3.14-CLT2012/make_hybridcd.cmd) URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/make_h… ============================================================================== --- tags/ReactOS-0.3.14-CLT2012/make_hybridcd.cmd [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/make_hybridcd.cmd [iso-8859-1] Sat May 18 11:41:34 2013 @@ -10,21 +10,27 @@ :: - the user already built Boot-CDs and Live-CDs :: - put his extra stuff into "hybridcd_extras" :: - added a copy of mkisofs -if exist "output-i386\bootcd\." ( - if exist "output-i386\livecd\." ( +if exist "boot\bootcd\." ( + if exist "boot\livecd\." ( if exist "hybridcd_extras\." ( - if exist "mkisofs.exe" ( - goto NEXT + if exist "hybridcd_freeldr.ini" ( + if exist "mkisofs.exe" ( + goto NEXT + ) ) ) ) ) -echo Please build regular Boot-CDs and Live-CDs first! -echo Also create a directory "hybridcd_extras" and put everything else -echo for the CD root into this directory. +echo Please make sure to copy this file (make_hybridcd.cmd) and +echo hybridcd_freeldr.ini to the "reactos" subfolder in your build directory. +echo You should run make_hybridcd from there. echo. -echo You also need to put a version of "mkisofs.exe" into this +echo Also build regular Boot-CDs and Live-CDs first, and create a directory +echo "hybridcd_extras" (inside the reactos folder). Put everything else +echo that should go in the CD root into that directory. +echo. +echo You also need to put a version of "mkisofs.exe" into the reactos echo directory. Get one from e.g. "PE Builder" at http://nu2.nu/. echo Our cdmake doesn't support creating an ISO9660:1999 filesystem, which is echo important for a universally usable disc. @@ -37,9 +43,9 @@ mkdir "hybridcd\live" mkdir "hybridcd\Profiles" -xcopy /e "output-i386\bootcd" "hybridcd" -xcopy /e "output-i386\livecd\reactos" "hybridcd\live" -xcopy /e "output-i386\livecd\Profiles" "hybridcd\Profiles" +xcopy /e "boot\bootcd" "hybridcd" +xcopy /e "boot\livecd\reactos" "hybridcd\live" +xcopy /e "boot\livecd\Profiles" "hybridcd\Profiles" :: Copy our modified "freeldr.ini" copy /y "hybridcd_freeldr.ini" "hybridcd\freeldr.ini" @@ -48,4 +54,4 @@ xcopy /e "hybridcd_extras" "hybridcd" :: Create the ISO -mkisofs -iso-level 4 -volid "ReactOS-HybridCD" -b "loader/isoboot.bin" -no-emul-boot -boot-load-size 4 -hide "boot.catalog" -o "hybridcd.iso" "hybridcd" +mkisofs -iso-level 4 -volid "ReactOS-HybridCD" -b "loader/isoboot.bin" -no-emul-boot -boot-load-size 4 -hide "boot.catalog" -o "hybridcd.iso" "hybridcd" Removed: branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_02_ROSWP.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/module… ============================================================================== Binary file - no diff available. Removed: branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/module… ============================================================================== Binary file - no diff available. Removed: branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/module… ============================================================================== Binary file - no diff available. Modified: branches/ros-branch-0_3_15-lt2013/modules/wallpaper/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/module… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/modules/wallpaper/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/modules/wallpaper/CMakeLists.txt [iso-8859-1] Sat May 18 11:41:34 2013 @@ -1,4 +1 @@ -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_ReactOS7_Dark_4-3.bmp DESTINATION reactos FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_02_ROSWP.bmp DESTINATION reactos FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_Sea04_FarBeyondTheSea_4x3.bmp DESTINATION reactos FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/RainInTheScreen_4x3.bmp DESTINATION reactos FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/angelus-ros-lt.bmp DESTINATION reactos FOR all) Removed: branches/ros-branch-0_3_15-lt2013/modules/wallpaper/RainInTheScreen_4x3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/module… ============================================================================== Binary file - no diff available. Copied: branches/ros-branch-0_3_15-lt2013/modules/wallpaper/angelus-ros-lt.bmp (from r59031, branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_02_ROSWP.bmp) URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/module… ============================================================================== Binary files - no diff available.

11 years, 7 months

[tfaber] 59031: [LT2013] - Branch for Linuxtag release

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 18 10:07:35 2013 New Revision: 59031 URL: http://svn.reactos.org/svn/reactos?rev=59031&view=rev Log: [LT2013] - Branch for Linuxtag release Added: branches/ros-branch-0_3_15-lt2013/ (props changed) - copied from r59030, branches/ReactOS-0.3.15/ Propchange: branches/ros-branch-0_3_15-lt2013/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat May 18 10:07:35 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-branch-0_3_15-lt2013/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-branch-0_3_15-lt2013/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-branch-0_3_15-lt2013/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat May 18 10:07:35 2013 @@ -0,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/ros-branch-0_3_15-lt2013/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat May 18 10:07:35 2013 @@ -0,0 +1,16 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 +/branches/wlan-bringup:54809-54998 +/trunk/reactos:58534,58553,58561,58614,58627-58628,58633,58759 Propchange: branches/ros-branch-0_3_15-lt2013/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

11 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2013