Author: ekohl
Date: Wed Dec 16 14:45:19 2015
New Revision: 70361
URL: http://svn.reactos.org/svn/reactos?rev=70361&view=rev
Log:
[WINLOGON]
Get rid of setup.h.
Removed:
trunk/reactos/base/system/winlogon/setup.h
Modified:
trunk/reactos/base/system/winlogon/winlogon.h
Removed: trunk/reactos/base/system/winlogon/setup.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/setup…
==============================================================================
--- trunk/reactos/base/system/winlogon/setup.h [iso-8859-1] (original)
+++ trunk/reactos/base/system/winlogon/setup.h (removed)
@@ -1,32 +0,0 @@
-/*
- * ReactOS kernel
- * Copyright (C) 2003 ReactOS Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-/*
- * COPYRIGHT: See COPYING in the top level directory
- * PROJECT: ReactOS winlogon
- * FILE: base/system/winlogon/setup.h
- * PURPOSE: Setup support functions
- * PROGRAMMER: Eric Kohl
- */
-
-#pragma once
-
-DWORD GetSetupType (VOID);
-BOOL RunSetup (VOID);
-
-/* EOF */
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] Wed Dec 16 14:45:19 2015
@@ -46,7 +46,6 @@
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(winlogon);
-#include "setup.h"
#include "resource.h"
typedef BOOL (WINAPI * PFWLXNEGOTIATE) (DWORD, DWORD *);
@@ -306,8 +305,14 @@
VOID
StartScreenSaver(IN PWLSESSION Session);
+/* setup.c */
+DWORD
+GetSetupType(VOID);
+
+BOOL
+RunSetup(VOID);
+
/* winlogon.c */
-
BOOL
PlaySoundRoutine(IN LPCWSTR FileName,
IN UINT Logon,
Author: akhaldi
Date: Wed Dec 16 10:26:31 2015
New Revision: 70358
URL: http://svn.reactos.org/svn/reactos?rev=70358&view=rev
Log:
[CLIPBRD] Translate ERROR_INVALID_FILE_FORMAT to Romanian. By Ștefan Fulea.
Modified:
trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc
Modified: trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/…
==============================================================================
--- trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 10:26:31 2015
@@ -61,5 +61,5 @@
STRINGTABLE
BEGIN
ERROR_UNSUPPORTED_FORMAT "Ãn clipboard sunt date într-un format care nu poate fi afiÈat."
- ERROR_INVALID_FILE_FORMAT "The selected file is not a valid clipboard file."
+ ERROR_INVALID_FILE_FORMAT "FiÈierul selectat nu e un fiÈier clipboard valid."
END
Author: hbelusca
Date: Wed Dec 16 00:26:27 2015
New Revision: 70355
URL: http://svn.reactos.org/svn/reactos?rev=70355&view=rev
Log:
[WIN32K:CLIPBOARD]
- When cleaning the clipboard, cancel any pending delayed rendering and increment all the sequence&serial numbers.
- Fix the clipboard access check when performing a delay rendering. This fixes VBox host <-> guest copy/paste amongst others...
CORE-5512 CORE-9620
CORE-8367 CORE-8627 #comment Please retest with revision >= 70355.
Modified:
trunk/reactos/win32ss/user/ntuser/clipboard.c
Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Wed Dec 16 00:26:27 2015
@@ -628,10 +628,12 @@
co_IntSendMessageNoWait(pWinStaObj->spwndClipOwner->head.h, WM_DESTROYCLIPBOARD, 0, 0);
}
- pWinStaObj->spwndClipOwner = pWinStaObj->spwndClipOpen;
-
- pWinStaObj->iClipSequenceNumber++;
- pWinStaObj->fClipboardChanged = TRUE;
+ pWinStaObj->spwndClipOwner = pWinStaObj->spwndClipOpen;
+
+ pWinStaObj->iClipSerialNumber++;
+ pWinStaObj->iClipSequenceNumber++;
+ pWinStaObj->fClipboardChanged = TRUE;
+ pWinStaObj->fInDelayedRendering = FALSE;
bRet = TRUE;
@@ -930,10 +932,15 @@
if (!pWinStaObj)
goto cleanup;
- /* If it's delayed rendering we don't have to open clipboard */
- if ((pWinStaObj->fInDelayedRendering &&
- pWinStaObj->spwndClipOwner->head.pti != PsGetCurrentThreadWin32Thread()) ||
- !IntIsClipboardOpenByMe(pWinStaObj))
+ /*
+ * Check if the clipboard is correctly opened:
+ * - in case of normal rendering, we must have opened the clipboard;
+ * - in case of delayed rendering, the clipboard must be already opened
+ * by another application, but we need to be the clipboard owner.
+ */
+ if ((!pWinStaObj->fInDelayedRendering && !IntIsClipboardOpenByMe(pWinStaObj)) ||
+ (pWinStaObj->fInDelayedRendering && !(pWinStaObj->ptiClipLock &&
+ pWinStaObj->spwndClipOwner->head.pti == PsGetCurrentThreadWin32Thread())))
{
ERR("Access denied!\n");
EngSetLastError(ERROR_CLIPBOARD_NOT_OPEN);
@@ -957,7 +964,10 @@
IntAddFormatedData(pWinStaObj, fmt, hData, scd->fGlobalHandle, FALSE);
TRACE("hData stored\n");
- pWinStaObj->iClipSequenceNumber++;
+ /* If the serial number was increased, increase also the sequence number */
+ if (scd->fIncSerialNumber)
+ pWinStaObj->iClipSequenceNumber++;
+
pWinStaObj->fClipboardChanged = TRUE;
/* Note: Synthesized formats are added in NtUserCloseClipboard */