Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 53579: [SERVICES] RStartServiceA: Convert the ANSI start arguments vector to a UNICODE vector and pass it to ScmStartService. Calls to StartServiceA can now be used to pass arguments to a s...
by ekohl＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: ekohl Date: Sun Sep 4 14:42:08 2011 New Revision: 53579 URL: http://svn.reactos.org/svn/reactos?rev=53579&view=rev Log: [SERVICES] RStartServiceA: Convert the ANSI start arguments vector to a UNICODE vector and pass it to ScmStartService. Calls to StartServiceA can now be used to pass arguments to a starting service. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Sep 4 14:42:08 2011 @@ -4086,6 +4086,9 @@ DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; + LPWSTR *lpVector = NULL; + DWORD i; + DWORD dwLength; DPRINT("RStartServiceA() called\n"); @@ -4119,12 +4122,56 @@ if (lpService->bDeleted) return ERROR_SERVICE_MARKED_FOR_DELETE; - /* FIXME: Convert argument vector to Unicode */ + /* Build a Unicode argument vector */ + if (argc > 0) + { + lpVector = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + argc * sizeof(LPWSTR)); + if (lpVector == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + for (i = 0; i < argc; i++) + { + dwLength = MultiByteToWideChar(CP_ACP, + 0, + ((LPSTR*)argv)[i], + -1, + NULL, + 0); + + lpVector[i] = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwLength * sizeof(WCHAR)); + if (lpVector[i] == NULL) + { + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + + MultiByteToWideChar(CP_ACP, + 0, + ((LPSTR*)argv)[i], + -1, + lpVector[i], + dwLength); + } + } /* Start the service */ - dwError = ScmStartService(lpService, 0, NULL); - - /* FIXME: Free argument vector */ + dwError = ScmStartService(lpService, argc, lpVector); + +done: + /* Free the Unicode argument vector */ + if (lpVector != NULL) + { + for (i = 0; i < argc; i++) + { + if (lpVector[i] != NULL) + HeapFree(GetProcessHeap(), 0, lpVector[i]); + } + HeapFree(GetProcessHeap(), 0, lpVector); + } return dwError; }

1 0

[jgardou] 53578: [PSDK] - put NOGDI guard at the right place...
by jgardou＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jgardou Date: Sun Sep 4 14:09:14 2011 New Revision: 53578 URL: http://svn.reactos.org/svn/reactos?rev=53578&view=rev Log: [PSDK] - put NOGDI guard at the right place... Modified: trunk/reactos/include/psdk/wincon.h Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wincon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincon.h [iso-8859-1] Sun Sep 4 14:09:14 2011 @@ -141,14 +141,13 @@ #if (_WIN32_WINNT >= 0x0600) #define HISTORY_NO_DUP_FLAG 0x1 #define CONSOLE_OVERSTRIKE 0x1 -#ifndef NOGDI + typedef struct _CONSOLE_HISTORY_INFO { UINT cbSize; UINT HistoryBufferSize; UINT NumberOfHistoryBuffers; DWORD dwFlags; } CONSOLE_HISTORY_INFO, *PCONSOLE_HISTORY_INFO; -#endif typedef struct _CONSOLE_SCREEN_BUFFER_INFOEX { ULONG cbSize; @@ -161,6 +160,7 @@ COLORREF ColorTable[16]; } CONSOLE_SCREEN_BUFFER_INFOEX, *PCONSOLE_SCREEN_BUFFER_INFOEX; +#ifndef NOGDI typedef struct _CONSOLE_FONT_INFOEX { ULONG cbSize; DWORD nFont; @@ -169,6 +169,7 @@ UINT FontWeight; WCHAR FaceName[LF_FACESIZE]; } CONSOLE_FONT_INFOEX, *PCONSOLE_FONT_INFOEX; +#endif #endif BOOL WINAPI AllocConsole(void);

1 0

[jgardou] 53577: [WINETESTS/WININET] - fix warnings
by jgardou＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jgardou Date: Sun Sep 4 13:09:16 2011 New Revision: 53577 URL: http://svn.reactos.org/svn/reactos?rev=53577&view=rev Log: [WINETESTS/WININET] - fix warnings Modified: trunk/rostests/winetests/wininet/CMakeLists.txt Modified: trunk/rostests/winetests/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/CMakeLi… ============================================================================== --- trunk/rostests/winetests/wininet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/CMakeLists.txt [iso-8859-1] Sun Sep 4 13:09:16 2011 @@ -1,3 +1,5 @@ + +remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) add_definitions( -D__ROS_LONG64__

1 0

[jgardou] 53576: [WINETESTS/URLMON] - fix warnings
by jgardou＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jgardou Date: Sun Sep 4 13:01:38 2011 New Revision: 53576 URL: http://svn.reactos.org/svn/reactos?rev=53576&view=rev Log: [WINETESTS/URLMON] - fix warnings Modified: trunk/rostests/winetests/urlmon/CMakeLists.txt Modified: trunk/rostests/winetests/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/CMakeLis… ============================================================================== --- trunk/rostests/winetests/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/CMakeLists.txt [iso-8859-1] Sun Sep 4 13:01:38 2011 @@ -1,3 +1,5 @@ + +remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) add_definitions( -D__ROS_LONG64__

1 0

[spetreolle] 53575: [WINETESTS] Allow to run skipped test in interactive mode.
by spetreolle＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: spetreolle Date: Sun Sep 4 12:26:49 2011 New Revision: 53575 URL: http://svn.reactos.org/svn/reactos?rev=53575&view=rev Log: [WINETESTS] Allow to run skipped test in interactive mode. Modified: trunk/rostests/winetests/gdi32/metafile.c Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Sun Sep 4 12:26:49 2011 @@ -1427,7 +1427,7 @@ const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1); const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2); -if(1) +if(!winetest_interactive) skip("skipping match_emf_record(), bug 5393\n"); else {

1 0

[tfaber] 53574: [KMTestSuite] - Thank you, SVN, for sucking at merging
by tfaber＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: tfaber Date: Sun Sep 4 12:10:38 2011 New Revision: 53574 URL: http://svn.reactos.org/svn/reactos?rev=53574&view=rev Log: [KMTestSuite] - Thank you, SVN, for sucking at merging Added: branches/GSoC_2011/KMTestSuite/winetests/kernel32/dosdev.c - copied unchanged from r53570, trunk/rostests/winetests/kernel32/dosdev.c

1 0

[jgardou] 53573: [PSDK] - fix compilation for any fool wanting to use our headers outside of NT 5.2 scope
by jgardou＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jgardou Date: Sun Sep 4 12:08:54 2011 New Revision: 53573 URL: http://svn.reactos.org/svn/reactos?rev=53573&view=rev Log: [PSDK] - fix compilation for any fool wanting to use our headers outside of NT 5.2 scope Modified: trunk/reactos/include/psdk/wincon.h Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wincon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincon.h [iso-8859-1] Sun Sep 4 12:08:54 2011 @@ -3,6 +3,10 @@ #ifdef __cplusplus extern "C" { +#endif + +#if (_WIN32_WINNT >= 0x0600) && !defined(NOGDI) +# include "wingdi.h" #endif #ifdef _MSC_VER @@ -137,12 +141,14 @@ #if (_WIN32_WINNT >= 0x0600) #define HISTORY_NO_DUP_FLAG 0x1 #define CONSOLE_OVERSTRIKE 0x1 +#ifndef NOGDI typedef struct _CONSOLE_HISTORY_INFO { UINT cbSize; UINT HistoryBufferSize; UINT NumberOfHistoryBuffers; DWORD dwFlags; } CONSOLE_HISTORY_INFO, *PCONSOLE_HISTORY_INFO; +#endif typedef struct _CONSOLE_SCREEN_BUFFER_INFOEX { ULONG cbSize;

1 0

[ekohl] 53572: [ADVAPI32] Pass service start arguments to ANSI services too. Clean up the service start code.
by ekohl＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: ekohl Date: Sun Sep 4 12:01:27 2011 New Revision: 53572 URL: http://svn.reactos.org/svn/reactos?rev=53572&view=rev Log: [ADVAPI32] Pass service start arguments to ANSI services too. Clean up the service start code. Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sun Sep 4 12:01:27 2011 @@ -278,119 +278,146 @@ static DWORD -ScStartService(PACTIVE_SERVICE lpService, - PSCM_CONTROL_PACKET ControlPacket) -{ - HANDLE ThreadHandle; - DWORD ThreadId; - LPWSTR *lpArgW; +ScBuildUnicodeArgsVector(PSCM_CONTROL_PACKET ControlPacket, + LPDWORD lpArgCount, + LPWSTR **lpArgVector) +{ + LPWSTR *lpVector; + LPWSTR *lpArg; DWORD i; - TRACE("ScStartService() called\n"); - TRACE("Size: %lu\n", ControlPacket->dwSize); - TRACE("Service: %S\n", (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset)); - - /* Set the service status handle */ - lpService->hServiceStatus = ControlPacket->hServiceStatus; - - if (lpService->bUnicode == TRUE) - { - lpService->ThreadParams.W.dwArgCount = ControlPacket->dwArgumentsCount; - lpService->ThreadParams.W.lpArgVector = NULL; - - if (ControlPacket->dwArgumentsOffset > 0) - { - lpService->ThreadParams.W.lpArgVector = - HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - ControlPacket->dwSize - ControlPacket->dwArgumentsOffset); - if (lpService->ThreadParams.W.lpArgVector == NULL) - return ERROR_OUTOFMEMORY; - - memcpy(lpService->ThreadParams.W.lpArgVector, - ((PBYTE)ControlPacket + ControlPacket->dwArgumentsOffset), - ControlPacket->dwSize - ControlPacket->dwArgumentsOffset); - - lpArgW = lpService->ThreadParams.W.lpArgVector; - for (i = 0; i < lpService->ThreadParams.W.dwArgCount; i++) - { - *lpArgW = (LPWSTR)((ULONG_PTR)lpArgW + (ULONG_PTR)*lpArgW); - lpArgW++; - } - } - } - else - { - /* FIXME */ - lpService->ThreadParams.A.dwArgCount = 0; - lpService->ThreadParams.A.lpArgVector = NULL; - -#if 0 - LPSTR *lpArgVector; - LPSTR Ptr; - LPSTR AnsiString; - DWORD AnsiLength; - - AnsiLength = WideCharToMultiByte(CP_ACP, + *lpArgCount = 0; + *lpArgVector = NULL; + + if (ControlPacket->dwArgumentsCount > 0) + { + lpVector = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + ControlPacket->dwSize - ControlPacket->dwArgumentsOffset); + if (lpVector == NULL) + return ERROR_OUTOFMEMORY; + + memcpy(lpVector, + ((PBYTE)ControlPacket + ControlPacket->dwArgumentsOffset), + ControlPacket->dwSize - ControlPacket->dwArgumentsOffset); + + lpArg = lpVector; + for (i = 0; i < ControlPacket->dwArgumentsCount; i++) + { + *lpArg = (LPWSTR)((ULONG_PTR)lpArg + (ULONG_PTR)*lpArg); + lpArg++; + } + + *lpArgCount = ControlPacket->dwArgumentsCount; + *lpArgVector = lpVector; + } + + return ERROR_SUCCESS; +} + + +static DWORD +ScBuildAnsiArgsVector(PSCM_CONTROL_PACKET ControlPacket, + LPDWORD lpArgCount, + LPSTR **lpArgVector) +{ + LPSTR *lpVector; + LPSTR *lpPtr; + LPWSTR lpUnicodeString; + LPSTR lpAnsiString; + DWORD dwVectorSize; + DWORD dwUnicodeSize; + DWORD dwAnsiSize; + DWORD i; + + *lpArgCount = 0; + *lpArgVector = NULL; + + if (ControlPacket->dwArgumentsCount > 0) + { + dwVectorSize = ControlPacket->dwArgumentsCount * sizeof(LPWSTR); + + lpUnicodeString = (LPWSTR)((PBYTE)ControlPacket + + ControlPacket->dwArgumentsOffset + + dwVectorSize); + dwUnicodeSize = (ControlPacket->dwSize - + ControlPacket->dwArgumentsOffset - + dwVectorSize) / sizeof(WCHAR); + + dwAnsiSize = WideCharToMultiByte(CP_ACP, 0, - lpService->Arguments, - dwLength, + lpUnicodeString, + dwUnicodeSize, NULL, 0, NULL, NULL); - if (AnsiLength == 0) - return ERROR_INVALID_PARAMETER; /* ? */ - - AnsiString = HeapAlloc(GetProcessHeap(), - 0, - AnsiLength + 1); - if (AnsiString == NULL) + + lpVector = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwVectorSize + dwAnsiSize); + if (lpVector == NULL) return ERROR_OUTOFMEMORY; + + lpPtr = (LPSTR*)lpVector; + lpAnsiString = (LPSTR)((ULONG_PTR)lpVector + dwVectorSize); WideCharToMultiByte(CP_ACP, 0, - lpService->Arguments, - dwLength, - AnsiString, - AnsiLength, + lpUnicodeString, + dwUnicodeSize, + lpAnsiString, + dwAnsiSize, NULL, NULL); - AnsiString[AnsiLength] = ANSI_NULL; - - lpArgVector = HeapAlloc(GetProcessHeap(), - 0, - (dwArgCount + 1) * sizeof(LPSTR)); - if (lpArgVector == NULL) - { - HeapFree(GetProcessHeap(), - 0, - AnsiString); - return ERROR_OUTOFMEMORY; - } - - dwArgCount = 0; - Ptr = AnsiString; - while (*Ptr) - { - lpArgVector[dwArgCount] = Ptr; - - dwArgCount++; - Ptr += (strlen(Ptr) + 1); - } - lpArgVector[dwArgCount] = NULL; - - (lpService->ThreadParams.A.lpServiceMain)(dwArgCount, lpArgVector); - - HeapFree(GetProcessHeap(), - 0, - lpArgVector); - HeapFree(GetProcessHeap(), - 0, - AnsiString); -#endif - } + for (i = 0; i < ControlPacket->dwArgumentsCount; i++) + { + *lpPtr = lpAnsiString; + + lpPtr++; + lpAnsiString += (strlen(lpAnsiString) + 1); + } + + *lpArgCount = ControlPacket->dwArgumentsCount; + *lpArgVector = lpVector; + } + + return ERROR_SUCCESS; +} + + +static DWORD +ScStartService(PACTIVE_SERVICE lpService, + PSCM_CONTROL_PACKET ControlPacket) +{ + HANDLE ThreadHandle; + DWORD ThreadId; + DWORD dwError; + + TRACE("ScStartService() called\n"); + TRACE("Size: %lu\n", ControlPacket->dwSize); + TRACE("Service: %S\n", (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset)); + + /* Set the service status handle */ + lpService->hServiceStatus = ControlPacket->hServiceStatus; + + /* Build the arguments vector */ + if (lpService->bUnicode == TRUE) + { + dwError = ScBuildUnicodeArgsVector(ControlPacket, + &lpService->ThreadParams.W.dwArgCount, + &lpService->ThreadParams.W.lpArgVector); + } + else + { + dwError = ScBuildAnsiArgsVector(ControlPacket, + &lpService->ThreadParams.A.dwArgCount, + &lpService->ThreadParams.A.lpArgVector); + } + + if (dwError != ERROR_SUCCESS) + return dwError; /* Invoke the services entry point and implement the command loop */ ThreadHandle = CreateThread(NULL,

1 0

[jgardou] 53571: [WINETESTS/GDI32] - fix warnings
by jgardou＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jgardou Date: Sun Sep 4 11:31:17 2011 New Revision: 53571 URL: http://svn.reactos.org/svn/reactos?rev=53571&view=rev Log: [WINETESTS/GDI32] - fix warnings Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt trunk/rostests/winetests/gdi32/metafile.c Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/CMakeList… ============================================================================== --- trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] Sun Sep 4 11:31:17 2011 @@ -2,6 +2,8 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) list(APPEND SOURCE bitmap.c Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Sun Sep 4 11:31:17 2011 @@ -1427,14 +1427,15 @@ const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1); const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2); -#if 1 +if(1) skip("skipping match_emf_record(), bug 5393\n"); -#else +else +{ trace("%s: EMF record %u, size %u/record %u, size %u\n", desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); if (!match_emf_record(emr1, emr2, desc, ignore_scaling)) return -1; -#endif +} /* We have already bailed out if iType or nSize don't match */ offset1 += emr1->nSize;

1 0

[akhaldi] 53570: [CMAKE/DLLS] * Set some imports as delay-loaded.
by akhaldi＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: akhaldi Date: Sun Sep 4 00:52:28 2011 New Revision: 53570 URL: http://svn.reactos.org/svn/reactos?rev=53570&view=rev Log: [CMAKE/DLLS] * Set some imports as delay-loaded. Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/comctl32/CMakeLists.txt trunk/reactos/dll/win32/comdlg32/CMakeLists.txt trunk/reactos/dll/win32/cryptnet/CMakeLists.txt trunk/reactos/dll/win32/cryptui/CMakeLists.txt trunk/reactos/dll/win32/dbghelp/CMakeLists.txt trunk/reactos/dll/win32/gdiplus/CMakeLists.txt trunk/reactos/dll/win32/hlink/CMakeLists.txt trunk/reactos/dll/win32/inetmib1/CMakeLists.txt trunk/reactos/dll/win32/mlang/CMakeLists.txt trunk/reactos/dll/win32/mshtml/CMakeLists.txt trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/oleaut32/CMakeLists.txt trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt trunk/reactos/dll/win32/setupapi/CMakeLists.txt trunk/reactos/dll/win32/shdocvw/CMakeLists.txt trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shlwapi/CMakeLists.txt trunk/reactos/dll/win32/user32/CMakeLists.txt trunk/reactos/dll/win32/uxtheme/CMakeLists.txt trunk/reactos/dll/win32/winhttp/CMakeLists.txt trunk/reactos/dll/win32/wininet/CMakeLists.txt trunk/reactos/dll/win32/wintrust/CMakeLists.txt trunk/reactos/dll/win32/ws2_32/CMakeLists.txt Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -55,17 +55,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/svcctl_c.c) add_library(advapi32 SHARED ${SOURCE}) - set_module_type(advapi32 win32dll UNICODE) - -target_link_libraries(advapi32 - wine - ${PSEH_LIB}) - -add_importlibs(advapi32 rpcrt4 msvcrt kernel32 ntdll) +target_link_libraries(advapi32 wine ${PSEH_LIB}) +add_delay_importlibs(advapi32 rpcrt4) +add_importlibs(advapi32 msvcrt kernel32 ntdll) add_pch(advapi32 advapi32.h ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.h ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_c.h) + add_cd_file(TARGET advapi32 DESTINATION reactos/system32 FOR all) add_importlib_target(advapi32.spec) Modified: trunk/reactos/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -55,17 +55,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def) add_library(comctl32 SHARED ${SOURCE}) - set_module_type(comctl32 win32dll UNICODE) - target_link_libraries(comctl32 uuid wine) +add_delay_importlibs(comctl32 winmm uxtheme) add_importlibs(comctl32 user32 gdi32 advapi32 - winmm - uxtheme msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -23,10 +23,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def) add_library(comdlg32 SHARED ${SOURCE}) - set_module_type(comdlg32 win32dll) - target_link_libraries(comdlg32 uuid wine) +add_delay_importlibs(comdlg32 ole32) add_importlibs(comdlg32 shell32 @@ -36,7 +35,6 @@ user32 gdi32 advapi32 - ole32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -10,14 +10,12 @@ ${CMAKE_CURRENT_BINARY_DIR}/cryptnet.def) add_library(cryptnet SHARED ${SOURCE}) - set_module_type(cryptnet win32dll) - target_link_libraries(cryptnet wine) +add_delay_importlibs(cryptnet wininet) add_importlibs(cryptnet crypt32 - wininet msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -16,10 +16,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def) add_library(cryptui SHARED ${SOURCE}) - set_module_type(cryptui win32dll) - target_link_libraries(cryptui uuid wine) +add_delay_importlibs(cryptui urlmon wintrust) add_importlibs(cryptui user32 @@ -27,8 +26,6 @@ crypt32 gdi32 advapi32 - urlmon - wintrust comctl32 comdlg32 msvcrt Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -45,14 +45,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def) add_library(dbghelp SHARED ${SOURCE}) - set_module_type(dbghelp win32dll) -target_link_libraries(dbghelp - wine - ${PSEH_LIB} - oldnames) - -add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll) +target_link_libraries(dbghelp wine ${PSEH_LIB} oldnames) +add_delay_importlibs(dbghelp version) +add_importlibs(dbghelp psapi msvcrt kernel32 ntdll) add_pch(dbghelp dbghelp_private.h) add_importlib_target(dbghelp.spec) add_cd_file(TARGET dbghelp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -33,9 +33,9 @@ endif() add_library(gdiplus SHARED ${SOURCE}) - set_module_type(gdiplus win32dll) target_link_libraries(gdiplus uuid wine) +add_delay_importlibs(gdiplus windowscodecs) add_importlibs(gdiplus msvcrt @@ -44,7 +44,6 @@ ole32 user32 gdi32 - windowscodecs kernel32 ntdll) Modified: trunk/reactos/dll/win32/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/hlink/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -13,16 +13,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/hlink.def) add_library(hlink SHARED ${SOURCE}) - set_module_type(hlink win32dll) - target_link_libraries(hlink uuid wine) +add_delay_importlibs(hlink urlmon) add_importlibs(hlink shell32 ole32 advapi32 - urlmon msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/inetmib1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetmib1/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/inetmib1/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetmib1/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -10,14 +10,13 @@ ${CMAKE_CURRENT_BINARY_DIR}/inetmib1.def) add_library(inetmib1 SHARED ${SOURCE}) - set_module_type(inetmib1 win32dll) target_link_libraries(inetmib1 wine) +add_delay_importlibs(inetmib1 iphlpapi) add_importlibs(inetmib1 msvcrt snmpapi - iphlpapi kernel32 ntdll) Modified: trunk/reactos/dll/win32/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/mlang/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -15,16 +15,15 @@ ${CMAKE_CURRENT_BINARY_DIR}/mlang.def) add_library(mlang SHARED ${SOURCE}) - set_entrypoint(mlang 0) target_link_libraries(mlang uuid wine) +add_delay_importlibs(mlang oleaut32) add_importlibs(mlang ole32 user32 gdi32 advapi32 - oleaut32 kernel32 ntdll) Modified: trunk/reactos/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -78,14 +78,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def) add_library(mshtml SHARED ${SOURCE}) - set_module_type(mshtml win32dll) - -target_link_libraries(mshtml - uuid - wine - strmiids - oldnames) +target_link_libraries(mshtml uuid wine strmiids oldnames) +add_delay_importlibs(mshtml wininet) add_importlibs(mshtml urlmon @@ -95,7 +90,6 @@ user32 gdi32 advapi32 - wininet msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -69,18 +69,18 @@ add_library(msi SHARED ${SOURCE}) -add_idl_Headers(msi_idlheader msiserver.idl) +add_idl_headers(msi_idlheader msiserver.idl) add_typelib(msi_tlb msiserver.idl) set_module_type(msi win32dll) target_link_libraries(msi uuid ${PSEH_LIB} wine) add_dependencies(msi msi_idlheader msi_tlb) +add_delay_importlibs(msi odbccp32) add_importlibs(msi advapi32 cabinet comctl32 gdi32 - odbccp32 ole32 oleaut32 shell32 Modified: trunk/reactos/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -54,7 +54,6 @@ endif() add_library(oleaut32 SHARED ${SOURCE}) - set_module_type(oleaut32 win32dll) target_link_libraries(oleaut32 @@ -63,7 +62,7 @@ uuid ${PSEH_LIB}) -add_importlibs(oleaut32 windowscodecs ole32 rpcrt4 user32 gdi32 advapi32 comctl32 urlmon msvcrt kernel32 ntdll) - +add_delay_importlibs(oleaut32 comctl32 urlmon windowscodecs) +add_importlibs(oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET oleaut32 DESTINATION reactos/system32 FOR all) add_importlib_target(oleaut32.spec) Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -43,16 +43,10 @@ spec2def(rpcrt4.dll rpcrt4.spec) add_library(rpcrt4 SHARED ${SOURCE}) +set_module_type(rpcrt4 win32dll) +target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB}) -set_module_type(rpcrt4 win32dll) - -target_link_libraries(rpcrt4 - wine - uuid - ${PSEH_LIB}) - -add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 ntdll) -add_delay_importlibs(rpcrt4 wininet) - +add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32) +add_importlibs(rpcrt4 msvcrt advapi32 ws2_32 kernel32 ntdll) add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all) add_importlib_target(rpcrt4.spec) Modified: trunk/reactos/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -38,13 +38,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/pnp_c.c) add_library(setupapi SHARED ${SOURCE}) - set_module_type(setupapi win32dll UNICODE) - -target_link_libraries(setupapi - uuid - wine - ${PSEH_LIB}) +target_link_libraries(setupapi uuid wine ${PSEH_LIB}) +add_delay_importlibs(setupapi shell32) add_importlibs(setupapi msvcrt @@ -54,7 +50,6 @@ user32 rpcrt4 version - shell32 kernel32 ntdll) Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -33,21 +33,17 @@ ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def) add_library(shdocvw SHARED ${SOURCE}) - set_module_type(shdocvw win32dll) - target_link_libraries(shdocvw uuid wine) +add_delay_importlibs(shdocvw version ole32 oleaut32) add_importlibs(shdocvw comctl32 - ole32 - oleaut32 shlwapi shell32 user32 advapi32 gdi32 - version urlmon msvcrt kernel32 Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -73,13 +73,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) add_library(shell32 SHARED ${SOURCE}) - set_module_type(shell32 win32dll) - -target_link_libraries(shell32 - wine - uuid - recyclebin) +target_link_libraries(shell32 wine uuid recyclebin) +add_delay_importlibs(shell32 ole32 version) add_importlibs(shell32 advapi32 @@ -88,8 +84,6 @@ comctl32 comdlg32 shlwapi - ole32 - version devmgr winspool winmm @@ -98,6 +92,5 @@ ntdll) add_pch(shell32 precomp.h) - add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all) add_importlib_target(shell32.spec) Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -27,31 +27,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def) add_library(shlwapi SHARED ${SOURCE}) - set_module_type(shlwapi win32dll) - target_link_libraries(shlwapi wine uuid) - -add_importlibs(shlwapi - user32 - gdi32 - advapi32 - oleaut32 - ole32 - comctl32 - comdlg32 - mpr - mlang - urlmon - winmm - version - shell32 - msvcrt - kernel32 - userenv - wininet - ntdll) - +add_delay_importlibs(shlwapi userenv oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version) +add_importlibs(shlwapi user32 gdi32 advapi32 msvcrt wininet kernel32 ntdll) add_cd_file(TARGET shlwapi DESTINATION reactos/system32 FOR all) - add_importlib_target(shlwapi.spec) Modified: trunk/reactos/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -1,4 +1,3 @@ - spec2def(user32.dll user32.spec) @@ -65,7 +64,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/user32.def) add_library(user32 SHARED ${SOURCE}) - set_module_type(user32 win32dll UNICODE) target_link_libraries(user32 @@ -74,7 +72,8 @@ win32ksys ${PSEH_LIB}) -add_importlibs(user32 gdi32 advapi32 imm32 msvcrt kernel32 ntdll) +add_delay_importlibs(user32 imm32) +add_importlibs(user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_pch(user32 include/user32.h) add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) add_importlib_target(user32.spec) Modified: trunk/reactos/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -20,12 +20,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def) add_library(uxtheme SHARED ${SOURCE}) - set_module_type(uxtheme win32dll) - target_link_libraries(uxtheme wine) - -add_importlibs(uxtheme user32 advapi32 gdi32 msimg32 msvcrt kernel32 ntdll) - +add_delay_importlibs(uxtheme msimg32) +add_importlibs(uxtheme user32 advapi32 gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET uxtheme DESTINATION reactos/system32 FOR all) add_importlib_target(uxtheme.spec) Modified: trunk/reactos/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -18,6 +18,7 @@ set_module_type(winhttp win32dll) target_link_libraries(winhttp wine) -add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt crypt32 advapi32 kernel32 ntdll) +add_delay_importlibs(winhttp crypt32) +add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt advapi32 kernel32 ntdll) add_importlib_target(winhttp.spec) add_cd_file(TARGET winhttp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/wininet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -1,7 +1,8 @@ add_definitions( - -D__WINESRC__ -D_WINE - -Dclose=_close) + -D__WINESRC__ + -D_WINE + -Dclose=_close) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -28,10 +29,8 @@ add_library(wininet SHARED ${SOURCE}) set_module_type(wininet win32dll) - target_link_libraries(wininet wine ${PSEH_LIB}) - -add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll) - +add_delay_importlibs(wininet secur32 crypt32) +add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET wininet DESTINATION reactos/system32 FOR all) add_importlib_target(wininet.spec) Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -16,16 +16,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def) add_library(wintrust SHARED ${SOURCE}) - set_module_type(wintrust win32dll) - -target_link_libraries(wintrust - wine - ${PSEH_LIB}) - -add_importlibs(wintrust crypt32 cryptui user32 advapi32 imagehlp msvcrt kernel32 ntdll) - +target_link_libraries(wintrust wine ${PSEH_LIB}) +add_delay_importlibs(wintrust cryptui imagehlp) +add_importlibs(wintrust crypt32 user32 advapi32 msvcrt kernel32 ntdll) add_importlib_target(wintrust.spec) - add_cd_file(TARGET wintrust DESTINATION reactos/system32 FOR all) - Modified: trunk/reactos/dll/win32/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -1,4 +1,3 @@ - add_definitions(-DLE) add_definitions(-DWINSOCK_API_LINKAGE=DECLSPEC_EXPORT) @@ -23,13 +22,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def) add_library(ws2_32 SHARED ${SOURCE}) - set_module_type(ws2_32 win32dll UNICODE) - target_link_libraries(ws2_32 wine) - -add_importlibs(ws2_32 user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) +add_delay_importlibs(ws2_32 user32) +add_importlibs(ws2_32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) add_pch(ws2_32 include/ws2_32.h) - add_cd_file(TARGET ws2_32 DESTINATION reactos/system32 FOR all) add_importlib_target(ws2_32.spec)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs