Ros-diffs August 2015

ros-diffs@reactos.org

15 participants
301 discussions

[pschweitzer] 68805: [HACKSSIGN] Fix typo, spotted by "Michele MZ Ji" CORE-10033

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Aug 23 17:33:15 2015 New Revision: 68805 URL: http://svn.reactos.org/svn/reactos?rev=68805&view=rev Log: [HACKSSIGN] Fix typo, spotted by "Michele MZ Ji" CORE-10033 Modified: trunk/rosapps/applications/cmdutils/hackssign/client.c Modified: trunk/rosapps/applications/cmdutils/hackssign/client.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/hack… ============================================================================== --- trunk/rosapps/applications/cmdutils/hackssign/client.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/hackssign/client.c [iso-8859-1] Sun Aug 23 17:33:15 2015 @@ -278,7 +278,7 @@ void printUsage(void) { wprintf(L"ReactOS Hackssign application\n"); - wprintf(L"\assign <letter> <share name>: Assign a drive letter to the share\n"); + wprintf(L"\tassign <letter> <share name>: Assign a drive letter to the share\n"); wprintf(L"\tdelete <letter>: delete driver letter assignation\n"); wprintf(L"\tdetect: detect VM type\n"); }

9 years, 4 months

[ekohl] 68804: [WLNOTIFY] - Disable the debug output. - Add and register the missing notification functions.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 23 15:58:18 2015 New Revision: 68804 URL: http://svn.reactos.org/svn/reactos?rev=68804&view=rev Log: [WLNOTIFY] - Disable the debug output. - Add and register the missing notification functions. Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/dll/win32/wlnotify/test.c trunk/reactos/dll/win32/wlnotify/wlnotify.spec Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Aug 23 15:58:18 2015 @@ -1105,9 +1105,19 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Disconnect",0x00000000,"TestDisconnectEvent" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","DlLName",0x00020000,"wlnotify.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Lock",0x00000000,"TestLockEvent" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Logoff",0x00000000,"TestLogoffEvent" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Logon",0x00000000,"TestLogonEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","PostShell",0x00000000,"TestPostShellEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Reconnect",0x00000000,"TestReconnectEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Shutdown",0x00000000,"TestShutdownEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","StartScreenSaver",0x00000000,"TestStartScreenSaverEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","StartShell",0x00000000,"TestStartShellEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Startup",0x00000000,"TestStartupEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","StopScreenSaver",0x00000000,"TestStopScreenSaverEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Unlock",0x00000000,"TestUnlockEvent" ; Time Zone Servers HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","1",0x00000000,"pool.ntp.org" Modified: trunk/reactos/dll/win32/wlnotify/test.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/test.c?… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/test.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlnotify/test.c [iso-8859-1] Sun Aug 23 15:58:18 2015 @@ -17,15 +17,15 @@ TestLogonEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT1("TestLogonEvent\n"); - DPRINT1("Size: %lu\n", pInfo->Size); - DPRINT1("Flags: %lx\n", pInfo->Flags); - DPRINT1("UserName: %S\n", pInfo->UserName); - DPRINT1("Domain: %S\n", pInfo->Domain); - DPRINT1("WindowStation: %S\n", pInfo->WindowStation); - DPRINT1("hToken: %p\n", pInfo->hToken); - DPRINT1("hDesktop: %p\n", pInfo->hDesktop); - DPRINT1("pStatusCallback: %p\n", pInfo->pStatusCallback); + DPRINT("TestLogonEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -34,15 +34,184 @@ TestLogoffEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT1("TestLogoffEvent\n"); - DPRINT1("Size: %lu\n", pInfo->Size); - DPRINT1("Flags: %lx\n", pInfo->Flags); - DPRINT1("UserName: %S\n", pInfo->UserName); - DPRINT1("Domain: %S\n", pInfo->Domain); - DPRINT1("WindowStation: %S\n", pInfo->WindowStation); - DPRINT1("hToken: %p\n", pInfo->hToken); - DPRINT1("hDesktop: %p\n", pInfo->hDesktop); - DPRINT1("pStatusCallback: %p\n", pInfo->pStatusCallback); + DPRINT("TestLogoffEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestLockEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestLockEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestUnlockEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestUnlockEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestStartupEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestStartupEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestShutdownEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestShutdownEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestStartScreenSaverEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestStartScreenSaverEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestStopScreenSaverEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestStopScreenSaverEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestStartShellEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestStartShellEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestPostShellEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestStartShellEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + +VOID +WINAPI +TestDisconnectEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestDisconnectEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestReconnectEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestReconnectEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); } /* EOF */ Modified: trunk/reactos/dll/win32/wlnotify/wlnotify.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/wlnotif… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/wlnotify.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlnotify/wlnotify.spec [iso-8859-1] Sun Aug 23 15:58:18 2015 @@ -1,2 +1,12 @@ +@ stdcall TestDisconnectEvent(ptr) +@ stdcall TestLockEvent(ptr) +@ stdcall TestLogoffEvent(ptr) @ stdcall TestLogonEvent(ptr) -@ stdcall TestLogoffEvent(ptr) +@ stdcall TestPostShellEvent(ptr) +@ stdcall TestReconnectEvent(ptr) +@ stdcall TestShutdownEvent(ptr) +@ stdcall TestStartScreenSaverEvent(ptr) +@ stdcall TestStartShellEvent(ptr) +@ stdcall TestStartupEvent(ptr) +@ stdcall TestStopScreenSaverEvent(ptr) +@ stdcall TestUnlockEvent(ptr)

9 years, 4 months

[ekohl] 68803: [WINLOGON] Implement calls to the notification DLLs.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 23 15:48:52 2015 New Revision: 68803 URL: http://svn.reactos.org/svn/reactos?rev=68803&view=rev Log: [WINLOGON] Implement calls to the notification DLLs. Modified: trunk/reactos/base/system/winlogon/notify.c trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/screensaver.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h Modified: trunk/reactos/base/system/winlogon/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/notif… ============================================================================== --- trunk/reactos/base/system/winlogon/notify.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/notify.c [iso-8859-1] Sun Aug 23 15:48:52 2015 @@ -15,23 +15,6 @@ // void Event_Handler_Function_Name(PWLX_NOTIFICATION_INFO pInfo); typedef VOID (WINAPI *PWLX_NOTIFY_HANDLER)(PWLX_NOTIFICATION_INFO pInfo); - -typedef enum _NOTIFICATION_TYPE -{ - LogonHandler, - LogoffHandler, - LockHandler, - UnlockHandler, - StartupHandler, - ShutdownHandler, - StartScreenSaverHandler, - StopScreenSaverHandler, - DisconnectHandler, - ReconnectHandler, - StartShellHandler, - PostShellHandler, - LastHandler -} NOTIFICATION_TYPE, *PNOTIFICATION_TYPE; static PSTR FuncNames[LastHandler] = { @@ -204,6 +187,75 @@ VOID +CallNotificationDlls( + PWLSESSION pSession, + NOTIFICATION_TYPE Type) +{ + PLIST_ENTRY ListEntry; + PNOTIFICATION_ITEM NotificationDll; + WLX_NOTIFICATION_INFO Info; + + TRACE("CallNotificationDlls()\n"); + + Info.Size = sizeof(WLX_NOTIFICATION_INFO); + + switch (Type) + { + case LogoffHandler: + case ShutdownHandler: + Info.Flags = 3; + break; + + default: + Info.Flags = 0; + break; + } + + Info.UserName = NULL; //UserName; + Info.Domain = NULL; //Domain; + Info.WindowStation = pSession->InteractiveWindowStationName; + Info.hToken = pSession->UserToken; + + switch (Type) + { + case LogonHandler: + case StartShellHandler: + Info.hDesktop = pSession->ApplicationDesktop; + break; + + case StartScreenSaverHandler: + Info.hDesktop = pSession->ApplicationDesktop; + break; + + default: + Info.hDesktop = pSession->WinlogonDesktop; + break; + } + + Info.pStatusCallback = NULL; + + ListEntry = NotificationDllListHead.Flink; + while (ListEntry != &NotificationDllListHead) + { +TRACE("ListEntry %p\n", ListEntry); + + NotificationDll = CONTAINING_RECORD(ListEntry, + NOTIFICATION_ITEM, + ListEntry); +TRACE("NotificationDll: %p\n", NotificationDll); + if (NotificationDll != NULL) + { +TRACE("NotificationDll->Handler: %p\n", NotificationDll->Handler[Type]); + if (NotificationDll->Handler[Type] != NULL) + NotificationDll->Handler[Type](&Info); + } + + ListEntry = ListEntry->Flink; + } +} + + +VOID CleanupNotifications(VOID) { PLIST_ENTRY ListEntry; @@ -217,14 +269,14 @@ ListEntry); if (NotificationDll != NULL) { - - - + FreeLibrary(NotificationDll->hInstance); } ListEntry = ListEntry->Flink; RemoveEntryList(&NotificationDll->ListEntry); + + RtlFreeHeap(RtlGetProcessHeap(), 0, NotificationDll); } } Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sun Aug 23 15:48:52 2015 @@ -446,6 +446,8 @@ goto cleanup; } + CallNotificationDlls(Session, LogonHandler); + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); UpdatePerUserSystemParameters(0, TRUE); @@ -464,6 +466,8 @@ //MessageBoxW(0, StatusMsg, NULL, MB_ICONERROR); goto cleanup; } + + CallNotificationDlls(Session, StartShellHandler); if (!InitializeScreenSaver(Session)) WARN("WL: Failed to initialize screen saver\n"); @@ -783,10 +787,14 @@ DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_SAVEYOURSETTINGS); UnloadUserProfile(Session->UserToken, Session->hProfileInfo); + + CallNotificationDlls(Session, LogoffHandler); + CloseHandle(Session->UserToken); UpdatePerUserSystemParameters(0, FALSE); Session->LogonState = STATE_LOGGED_OFF; Session->UserToken = NULL; + return STATUS_SUCCESS; } @@ -894,6 +902,8 @@ return STATUS_UNSUCCESSFUL; } + CallNotificationDlls(Session, ShutdownHandler); + /* Destroy SAS window */ UninitializeSAS(Session); @@ -932,6 +942,7 @@ if (!HandleLogon(Session)) { Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); + CallNotificationDlls(Session, LogonHandler); } } break; @@ -957,6 +968,7 @@ SwitchDesktop(Session->WinlogonDesktop); Session->LogonState = STATE_LOCKED; Session->Gina.Functions.WlxDisplayLockedNotice(Session->Gina.Context); + CallNotificationDlls(Session, LockHandler); } break; case WLX_SAS_ACTION_LOGOFF: /* 0x04 */ @@ -999,6 +1011,7 @@ case WLX_SAS_ACTION_UNLOCK_WKSTA: /* 0x08 */ SwitchDesktop(Session->ApplicationDesktop); Session->LogonState = STATE_LOGGED_ON; + CallNotificationDlls(Session, UnlockHandler); break; default: WARN("Unknown SAS action 0x%lx\n", wlxAction); Modified: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… ============================================================================== --- trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] Sun Aug 23 15:48:52 2015 @@ -348,6 +348,8 @@ SystemParametersInfoW(SPI_SETSCREENSAVERRUNNING, TRUE, NULL, 0); + CallNotificationDlls(Session, StartScreenSaverHandler); + /* Wait the end of the process or some other activity */ ResetEvent(Session->hUserActivity); HandleArray[0] = ProcessInformation.hProcess; @@ -363,6 +365,8 @@ CloseHandle(ProcessInformation.hProcess); + CallNotificationDlls(Session, StopScreenSaverHandler); + cleanup: RevertToSelf(); if (hKey) Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sun Aug 23 15:48:52 2015 @@ -434,6 +434,8 @@ } #endif + CallNotificationDlls(WLSession, StartupHandler); + /* Create a hidden window to get SAS notifications */ if (!InitializeSAS(WLSession)) { Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Sun Aug 23 15:48:52 2015 @@ -240,6 +240,23 @@ WLX_PROFILE_V2_0 *Profile; } WLSESSION, *PWLSESSION; +typedef enum _NOTIFICATION_TYPE +{ + LogonHandler, + LogoffHandler, + LockHandler, + UnlockHandler, + StartupHandler, + ShutdownHandler, + StartScreenSaverHandler, + StopScreenSaverHandler, + DisconnectHandler, + ReconnectHandler, + StartShellHandler, + PostShellHandler, + LastHandler +} NOTIFICATION_TYPE, *PNOTIFICATION_TYPE; + extern HINSTANCE hAppInstance; extern PWLSESSION WLSession; @@ -265,6 +282,11 @@ VOID CleanupNotifications(VOID); + +VOID +CallNotificationDlls( + PWLSESSION pSession, + NOTIFICATION_TYPE Type); /* rpcserver.c */ BOOL

9 years, 4 months

[pschweitzer] 68802: [HACKSSIGN] Simplify the hackssign application usage. You don't need anymore to specify which VM type you use. The client will attempt to discover it by looking at available sh...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Aug 23 10:35:52 2015 New Revision: 68802 URL: http://svn.reactos.org/svn/reactos?rev=68802&view=rev Log: [HACKSSIGN] Simplify the hackssign application usage. You don't need anymore to specify which VM type you use. The client will attempt to discover it by looking at available shared folders providers. If it recognizes one, it will perform the assignation. No Guest Additions/Tools installed will make the tool refuse to assign a drive letter (obviously). So basically, you just need to issue some: hackssign assign z ReactOS (for example) Modified: trunk/rosapps/applications/cmdutils/hackssign/client.c Modified: trunk/rosapps/applications/cmdutils/hackssign/client.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/hack… ============================================================================== --- trunk/rosapps/applications/cmdutils/hackssign/client.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/hackssign/client.c [iso-8859-1] Sun Aug 23 10:35:52 2015 @@ -19,9 +19,55 @@ vmVirtualBox, vmMax, } HV_TYPES; -PCWSTR hV[] = { L"vmware", L"virtualbox" }; +typedef BOOL (*HV_DET)(void); +BOOL isVMware(void) +{ + HANDLE dev = CreateFile(L"\\\\.\\hgfs", + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (dev != INVALID_HANDLE_VALUE) + { + wprintf(L"VMware detected\n"); + CloseHandle(dev); + return TRUE; + } + + return FALSE; +} +BOOL isVBox(void) +{ + HANDLE dev = CreateFile(L"\\\\.\\VBoxMiniRdrDN", + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (dev != INVALID_HANDLE_VALUE) + { + wprintf(L"VirtualBox detected\n"); + CloseHandle(dev); + return TRUE; + } + + return FALSE; +} PCWSTR dev[] = { L"\\Device\\hgfs\\;", L"\\Device\\VBoxMiniRdr\\;" }; PCWSTR unc[] = { L":\\vmware-host\\Shared Folders\\", L":\\vboxsvr\\" }; +HV_DET det[] = { isVMware, isVBox }; + +HV_TYPES detectVM(void) +{ + HV_TYPES vm; + + for (vm = vmVMware; vm < vmMax; ++vm) + { + if (det[vm]() == TRUE) + { + break; + } + } + + return vm; +} BOOL performDevIoCtl(DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize) { @@ -117,7 +163,7 @@ return TRUE; } -int assignLetter(WCHAR letter, PCWSTR path, PCWSTR device) +int assignLetter(WCHAR letter, PCWSTR path) { BOOL ret; DWORD len; @@ -127,13 +173,7 @@ DWORD inputBufferSize; PASSIGN_INPUT inputBuffer; - for (vm = vmVMware; vm < vmMax; ++vm) - { - if (_wcsicmp(device, hV[vm]) == 0) - { - break; - } - } + vm = detectVM(); if (vm == vmMax) { wprintf(L"Unsupported VM type\n"); @@ -221,19 +261,33 @@ return (performDevIoCtl(FSCTL_HACKSSIGN_DELETE, &capsLetter, sizeof(WCHAR)) == FALSE); } +int detect(void) +{ + HV_TYPES vm; + + vm = detectVM(); + if (vm == vmMax) + { + wprintf(L"Unsupported VM type\n"); + return 1; + } + + return 0; +} + void printUsage(void) { wprintf(L"ReactOS Hackssign application\n"); - wprintf(L"\assign <letter> <share name> <vmtype>: Assign a drive letter to the share given the VM type\n"); - wprintf(L"\t\tVM types are: vmware or virtual\n"); + wprintf(L"\assign <letter> <share name>: Assign a drive letter to the share\n"); wprintf(L"\tdelete <letter>: delete driver letter assignation\n"); + wprintf(L"\tdetect: detect VM type\n"); } int wmain(int argc, wchar_t *argv[]) { PCWSTR cmd; - if (argc < 3) + if (argc < 2) { printUsage(); return 0; @@ -243,17 +297,27 @@ if (_wcsicmp(cmd, L"assign") == 0) { - if (argc < 5) + if (argc < 4) { printUsage(); return 0; } - return assignLetter(argv[2][0], argv[3], argv[4]); + return assignLetter(argv[2][0], argv[3]); } else if (_wcsicmp(cmd, L"delete") == 0) { + if (argc < 3) + { + printUsage(); + return 0; + } + return deleteLetter(argv[2][0]); + } + else if (_wcsicmp(cmd, L"detect") == 0) + { + return detect(); } else {

9 years, 4 months

[cwittich] 68801: [CRT] Don't call DeleteCriticalSection on static critical section (wine-patch by Piotr Caban)

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Aug 23 09:05:26 2015 New Revision: 68801 URL: http://svn.reactos.org/svn/reactos?rev=68801&view=rev Log: [CRT] Don't call DeleteCriticalSection on static critical section (wine-patch by Piotr Caban) Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Sun Aug 23 09:05:26 2015 @@ -1050,8 +1050,6 @@ for(i=0; i<sizeof(fstream)/sizeof(fstream[0]); i++) free(fstream[i]); - - DeleteCriticalSection(&file_cs); } /*********************************************************************

9 years, 4 months

[cwittich] 68800: [KERNEL32] fix a regression introduced in r68797

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Aug 23 08:19:39 2015 New Revision: 68800 URL: http://svn.reactos.org/svn/reactos?rev=68800&view=rev Log: [KERNEL32] fix a regression introduced in r68797 Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Aug 23 08:19:39 2015 @@ -2118,7 +2118,7 @@ if (count >= ret) { - lstrcpynW(path, tmp_path, count); + lstrcpynW(path, full_tmp_path, count); /* the remaining buffer must be zeroed up to 32766 bytes in XP or 32767 * bytes after it, we will assume the > XP behavior for now */ memset(path + ret, 0, (min(count, 32767) - ret) * sizeof(WCHAR));

9 years, 4 months

[cwittich] 68799: [ADVAPI32] prevent buffer overflow in ParseStringSecurityDescriptorToSecurityDescriptor (wine-patch by Alistair Leslie-Hughes)

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Aug 23 07:07:25 2015 New Revision: 68799 URL: http://svn.reactos.org/svn/reactos?rev=68799&view=rev Log: [ADVAPI32] prevent buffer overflow in ParseStringSecurityDescriptorToSecurityDescriptor (wine-patch by Alistair Leslie-Hughes) Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sun Aug 23 07:07:25 2015 @@ -2544,12 +2544,14 @@ { BOOL bret = FALSE; WCHAR toktype; - WCHAR tok[MAX_PATH]; + WCHAR *tok; LPCWSTR lptoken; LPBYTE lpNext = NULL; DWORD len; *cBytes = sizeof(SECURITY_DESCRIPTOR); + + tok = heap_alloc( (lstrlenW(StringSecurityDescriptor) + 1) * sizeof(WCHAR)); if (SecurityDescriptor) lpNext = (LPBYTE)(SecurityDescriptor + 1); @@ -2672,6 +2674,7 @@ bret = TRUE; lend: + heap_free(tok); return bret; }

9 years, 4 months

[cwittich] 68798: [RTL] make RtlAddVectoredExceptionHandler hotpatchable

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Aug 23 07:01:19 2015 New Revision: 68798 URL: http://svn.reactos.org/svn/reactos?rev=68798&view=rev Log: [RTL] make RtlAddVectoredExceptionHandler hotpatchable Modified: trunk/reactos/lib/rtl/vectoreh.c Modified: trunk/reactos/lib/rtl/vectoreh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/vectoreh.c?rev=687… ============================================================================== --- trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] Sun Aug 23 07:01:19 2015 @@ -111,7 +111,7 @@ /* * @implemented */ -PVOID NTAPI +PVOID NTAPI DECLSPEC_HOTPATCH RtlAddVectoredExceptionHandler(IN ULONG FirstHandler, IN PVECTORED_EXCEPTION_HANDLER VectoredHandler) {

9 years, 4 months

[cwittich] 68797: [KERNEL32] sync GetTempPathW with wine wine-1.7.50

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Aug 23 06:53:08 2015 New Revision: 68797 URL: http://svn.reactos.org/svn/reactos?rev=68797&view=rev Log: [KERNEL32] sync GetTempPathW with wine wine-1.7.50 Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Aug 23 06:53:08 2015 @@ -2116,13 +2116,18 @@ ret++; /* add space for terminating 0 */ - if (count) - { - lstrcpynW(path, full_tmp_path, count); - if (count >= ret) - ret--; /* return length without 0 */ - else if (count < 4) - path[0] = 0; /* avoid returning ambiguous "X:" */ + if (count >= ret) + { + lstrcpynW(path, tmp_path, count); + /* the remaining buffer must be zeroed up to 32766 bytes in XP or 32767 + * bytes after it, we will assume the > XP behavior for now */ + memset(path + ret, 0, (min(count, 32767) - ret) * sizeof(WCHAR)); + ret--; /* return length without 0 */ + } + else if (count) + { + /* the buffer must be cleared if contents will not fit */ + memset(path, 0, count * sizeof(WCHAR)); } DPRINT("GetTempPathW returning %u, %S\n", ret, path);

9 years, 4 months

[cwittich] 68796: [PSDK] sync digitalv.h with wine (packing and x64 fixes)

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Aug 23 06:37:05 2015 New Revision: 68796 URL: http://svn.reactos.org/svn/reactos?rev=68796&view=rev Log: [PSDK] sync digitalv.h with wine (packing and x64 fixes) Modified: trunk/reactos/include/psdk/digitalv.h Modified: trunk/reactos/include/psdk/digitalv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/digitalv.h?re… ============================================================================== --- trunk/reactos/include/psdk/digitalv.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/digitalv.h [iso-8859-1] Sun Aug 23 06:37:05 2015 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_DIGITALV_H @@ -22,6 +22,8 @@ /* * Wine Digital Video extensions */ + +#include <pshpack1.h> #ifdef __cplusplus extern "C" { @@ -199,7 +201,7 @@ #define MCI_DGV_MONITOR_METHOD 0x00010000L #define MCI_DGV_MONITOR_SOURCE 0x00020000L -/* values for dwSource parameter of the MCI_DGV_MONITOR_PARMS struture */ +/* values for dwSource parameter of the MCI_DGV_MONITOR_PARMS structure */ #define MCI_DGV_MONITOR_INPUT 0x00004000L #define MCI_DGV_MONITOR_FILE 0x00004001L @@ -459,20 +461,20 @@ /* parameter block for MCI_WHERE, MCI_PUT, MCI_FREEZE, MCI_UNFREEZE cmds */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; RECT rc; } MCI_DGV_RECT_PARMS, *LPMCI_DGV_RECT_PARMS; /* parameter block for MCI_CAPTURE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPSTR lpstrFileName; RECT rc; } MCI_DGV_CAPTURE_PARMSA, *LPMCI_DGV_CAPTURE_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPWSTR lpstrFileName; RECT rc; } MCI_DGV_CAPTURE_PARMSW, *LPMCI_DGV_CAPTURE_PARMSW; @@ -487,7 +489,7 @@ /* parameter block for MCI_COPY command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrom; DWORD dwTo; RECT rc; @@ -498,14 +500,14 @@ /* parameter block for MCI_CUE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwTo; } MCI_DGV_CUE_PARMS, *LPMCI_DGV_CUE_PARMS; /* parameter block for MCI_CUT command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrom; DWORD dwTo; RECT rc; @@ -516,7 +518,7 @@ /* parameter block for MCI_DELETE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrom; DWORD dwTo; RECT rc; @@ -531,14 +533,14 @@ /* parameter block for MCI_INFO command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPSTR lpstrReturn; DWORD dwRetSize; DWORD dwItem; } MCI_DGV_INFO_PARMSA, * LPMCI_DGV_INFO_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPWSTR lpstrReturn; DWORD dwRetSize; DWORD dwItem; @@ -550,7 +552,7 @@ /* parameter block for MCI_LIST command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPSTR lpstrReturn; DWORD dwLength; DWORD dwNumber; @@ -559,7 +561,7 @@ } MCI_DGV_LIST_PARMSA, *LPMCI_DGV_LIST_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPWSTR lpstrReturn; DWORD dwLength; DWORD dwNumber; @@ -581,7 +583,7 @@ /* parameter block for MCI_MONITOR command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwSource; DWORD dwMethod; } MCI_DGV_MONITOR_PARMS, * LPMCI_DGV_MONITOR_PARMS; @@ -589,7 +591,7 @@ /* parameter block for MCI_OPEN command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; UINT wDeviceID; LPSTR lpstrDeviceType; LPSTR lpstrElementName; @@ -599,7 +601,7 @@ } MCI_DGV_OPEN_PARMSA, *LPMCI_DGV_OPEN_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; UINT wDeviceID; LPWSTR lpstrDeviceType; LPWSTR lpstrElementName; @@ -618,7 +620,7 @@ /* parameter block for MCI_PASTE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwTo; RECT rc; DWORD dwAudioStream; @@ -636,7 +638,7 @@ /* parameter block for MCI_QUALITY command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwItem; LPSTR lpstrName; DWORD lpstrAlgorithm; @@ -644,7 +646,7 @@ } MCI_DGV_QUALITY_PARMSA, *LPMCI_DGV_QUALITY_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwItem; LPWSTR lpstrName; DWORD lpstrAlgorithm; @@ -661,7 +663,7 @@ /* parameter block for MCI_RECORD command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrom; DWORD dwTo; RECT rc; @@ -672,13 +674,13 @@ /* parameter block for MCI_RESERVE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPSTR lpstrPath; DWORD dwSize; } MCI_DGV_RESERVE_PARMSA, *LPMCI_DGV_RESERVE_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPWSTR lpstrPath; DWORD dwSize; } MCI_DGV_RESERVE_PARMSW, *LPMCI_DGV_RESERVE_PARMSW; @@ -689,13 +691,13 @@ /* parameter block for MCI_RESTORE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPSTR lpstrFileName; RECT rc; } MCI_DGV_RESTORE_PARMSA, *LPMCI_DGV_RESTORE_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPWSTR lpstrFileName; RECT rc; } MCI_DGV_RESTORE_PARMSW, *LPMCI_DGV_RESTORE_PARMSW; @@ -710,13 +712,13 @@ /* parameter block for MCI_SAVE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPSTR lpstrFileName; RECT rc; } MCI_DGV_SAVE_PARMSA, *LPMCI_DGV_SAVE_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPWSTR lpstrFileName; RECT rc; } MCI_DGV_SAVE_PARMSW, *LPMCI_DGV_SAVE_PARMSW; @@ -727,7 +729,7 @@ /* parameter block for MCI_SET command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwTimeFormat; DWORD dwAudio; DWORD dwFileFormat; @@ -737,7 +739,7 @@ /* parameter block for MCI_SETAUDIO command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwItem; DWORD dwValue; DWORD dwOver; @@ -746,7 +748,7 @@ } MCI_DGV_SETAUDIO_PARMSA, *LPMCI_DGV_SETAUDIO_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwItem; DWORD dwValue; DWORD dwOver; @@ -760,7 +762,7 @@ /* parameter block for MCI_SIGNAL command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwPosition; DWORD dwPeriod; DWORD dwUserParm; @@ -769,7 +771,7 @@ /* parameter block for MCI_SETVIDEO command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwItem; DWORD dwValue; DWORD dwOver; @@ -779,7 +781,7 @@ } MCI_DGV_SETVIDEO_PARMSA, *LPMCI_DGV_SETVIDEO_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwItem; DWORD dwValue; DWORD dwOver; @@ -794,8 +796,8 @@ /* parameter block for MCI_STATUS command message */ typedef struct { - DWORD dwCallback; - DWORD dwReturn; + DWORD_PTR dwCallback; + DWORD_PTR dwReturn; DWORD dwItem; DWORD dwTrack; LPSTR lpstrDrive; @@ -803,8 +805,8 @@ } MCI_DGV_STATUS_PARMSA, *LPMCI_DGV_STATUS_PARMSA; typedef struct { - DWORD dwCallback; - DWORD dwReturn; + DWORD_PTR dwCallback; + DWORD_PTR dwReturn; DWORD dwItem; DWORD dwTrack; LPWSTR lpstrDrive; @@ -817,7 +819,7 @@ /* parameter block for MCI_STEP command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrames; } MCI_DGV_STEP_PARMS, *LPMCI_DGV_STEP_PARMS; @@ -832,7 +834,7 @@ /* parameter block for MCI_UPDATE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; RECT rc; HDC hDC; } MCI_DGV_UPDATE_PARMS, * LPMCI_DGV_UPDATE_PARMS; @@ -844,14 +846,14 @@ /* parameter block for MCI_WINDOW command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; HWND hWnd; UINT nCmdShow; LPSTR lpstrText; } MCI_DGV_WINDOW_PARMSA, *LPMCI_DGV_WINDOW_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; HWND hWnd; UINT nCmdShow; LPWSTR lpstrText; @@ -861,4 +863,6 @@ } #endif +#include <poppack.h> + #endif /* __WINE_DIGITALV_H */

9 years, 4 months

← Newer
1
...
6
7
8
9
10
11
12
...
31
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 August 2015