Ros-diffs February 2016

ros-diffs@reactos.org

10 participants
155 discussions

[jimtabor] 70784: [Win32SS] - Fix hang, CORE-10785 and ROSTESTS-208.
by jimtabor＠svn.reactos.org 24 Feb '16

24 Feb '16

Author: jimtabor Date: Wed Feb 24 10:20:06 2016 New Revision: 70784 URL: http://svn.reactos.org/svn/reactos?rev=70784&view=rev Log: [Win32SS] - Fix hang, CORE-10785 and ROSTESTS-208. Modified: trunk/reactos/win32ss/user/ntuser/focus.c Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Wed Feb 24 10:20:06 2016 @@ -535,7 +535,9 @@ else { //ERR("Activate Not same PQ and WQ and Wnd.\n"); - co_IntSendMessage(hWnd, WM_ASYNC_SETACTIVEWINDOW, (WPARAM)Wnd, (LPARAM)MouseActivate ); + //// CORE-10785 fix hang, ROSTESTS-208 allows test to run. + //// co_IntSendMessage(hWnd, WM_ASYNC_SETACTIVEWINDOW, (WPARAM)Wnd, (LPARAM)MouseActivate ); + co_IntSendMessageNoWait(hWnd, WM_ASYNC_SETACTIVEWINDOW, (WPARAM)Wnd, (LPARAM)MouseActivate ); Ret = TRUE; } return Ret && fgRet;

1 0

[jimtabor] 70783: - Fix build, this is used later.
by jimtabor＠svn.reactos.org 24 Feb '16

24 Feb '16

Author: jimtabor Date: Wed Feb 24 08:45:36 2016 New Revision: 70783 URL: http://svn.reactos.org/svn/reactos?rev=70783&view=rev Log: - Fix build, this is used later. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed Feb 24 08:45:36 2016 @@ -1989,7 +1989,7 @@ } pti->ptLast = msg.pt; pti->timeLast = msg.time; - MessageQueue->ExtraInfo = ExtraInfo; + //MessageQueue->ExtraInfo = ExtraInfo; Ret = TRUE; break; }

1 0

[jimtabor] 70782: [Win32SS] - Fix all wine win:test_GetMessagePos tests. - See CORE-10867, please verify this is a fix.
by jimtabor＠svn.reactos.org 24 Feb '16

24 Feb '16

Author: jimtabor Date: Wed Feb 24 08:41:26 2016 New Revision: 70782 URL: http://svn.reactos.org/svn/reactos?rev=70782&view=rev Log: [Win32SS] - Fix all wine win:test_GetMessagePos tests. - See CORE-10867, please verify this is a fix. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/timer.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed Feb 24 08:41:26 2016 @@ -1982,6 +1982,14 @@ if (AcceptMessage) { *pMsg = msg; + // Fix all but one wine win:test_GetMessagePos WM_TIMER tests. See PostTimerMessages. + if (!RtlEqualMemory(&pti->ptLast, &msg.pt, sizeof(POINT))) + { + pti->TIF_flags |= TIF_MSGPOSCHANGED; + } + pti->ptLast = msg.pt; + pti->timeLast = msg.time; + MessageQueue->ExtraInfo = ExtraInfo; Ret = TRUE; break; } Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Wed Feb 24 08:41:26 2016 @@ -415,6 +415,8 @@ Msg.message = (pTmr->flags & TMRF_SYSTEM) ? WM_SYSTIMER : WM_TIMER; Msg.wParam = (WPARAM) pTmr->nID; Msg.lParam = (LPARAM) pTmr->pfn; + // Fix all wine win:test_GetMessagePos WM_TIMER tests. See CORE-10867. + Msg.pt = gpsi->ptCursor; MsqPostMessage(pti, &Msg, FALSE, (QS_POSTMESSAGE|QS_ALLPOSTMESSAGE), 0, 0); pTmr->flags &= ~TMRF_READY;

1 0

[pschweitzer] 70781: [DISK] Also had the nasty partition number hack to IOCTL_DISK_GET_PARTITION_INFO_EX. It is required for some file system to work in ReactOS (teasing :-))
by pschweitzer＠svn.reactos.org 24 Feb '16

24 Feb '16

Author: pschweitzer Date: Wed Feb 24 07:55:36 2016 New Revision: 70781 URL: http://svn.reactos.org/svn/reactos?rev=70781&view=rev Log: [DISK] Also had the nasty partition number hack to IOCTL_DISK_GET_PARTITION_INFO_EX. It is required for some file system to work in ReactOS (teasing :-)) Modified: trunk/reactos/drivers/storage/class/disk/disk.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Wed Feb 24 07:55:36 2016 @@ -2310,6 +2310,7 @@ status = STATUS_INFO_LENGTH_MISMATCH; } +#if 0 // HACK: ReactOS partition numbers must be wrong else if (diskData->PartitionNumber == 0) { // @@ -2320,9 +2321,15 @@ status = STATUS_INVALID_DEVICE_REQUEST; } +#endif else { PPARTITION_INFORMATION_EX outputBuffer; + + if (diskData->PartitionNumber == 0) { + DPRINT1("HACK: Handling partition 0 request!\n"); + //ASSERT(FALSE); + } // // Update the geometry in case it has changed.

1 0

[pschweitzer] 70780: [NTFS] Properly queue the IRP for deferred execution in case we got pending status
by pschweitzer＠svn.reactos.org 24 Feb '16

24 Feb '16

Author: pschweitzer Date: Wed Feb 24 07:54:20 2016 New Revision: 70780 URL: http://svn.reactos.org/svn/reactos?rev=70780&view=rev Log: [NTFS] Properly queue the IRP for deferred execution in case we got pending status Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Wed Feb 24 07:54:20 2016 @@ -503,6 +503,11 @@ break; } + if (Status == STATUS_PENDING && IrpContext->Flags & IRPCONTEXT_COMPLETE) + { + return NtfsMarkIrpContextForQueue(IrpContext); + } + IrpContext->Irp->IoStatus.Information = 0; return Status;

1 0

[pschweitzer] 70779: [NTFS] Even more locking
by pschweitzer＠svn.reactos.org 23 Feb '16

23 Feb '16

Author: pschweitzer Date: Tue Feb 23 22:19:38 2016 New Revision: 70779 URL: http://svn.reactos.org/svn/reactos?rev=70779&view=rev Log: [NTFS] Even more locking Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Tue Feb 23 22:19:38 2016 @@ -305,6 +305,12 @@ return STATUS_NOT_IMPLEMENTED; } + if (!ExAcquireResourceSharedLite(&Fcb->MainResource, + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) + { + return STATUS_PENDING; + } + if (SearchPattern != NULL) { if (!Ccb->DirectorySearchPattern) @@ -316,6 +322,7 @@ ExAllocatePoolWithTag(NonPagedPool, Pattern.MaximumLength, TAG_NTFS); if (!Ccb->DirectorySearchPattern) { + ExReleaseResourceLite(&Fcb->MainResource); return STATUS_INSUFFICIENT_RESOURCES; } @@ -329,6 +336,7 @@ Ccb->DirectorySearchPattern = ExAllocatePoolWithTag(NonPagedPool, 2 * sizeof(WCHAR), TAG_NTFS); if (!Ccb->DirectorySearchPattern) { + ExReleaseResourceLite(&Fcb->MainResource); return STATUS_INSUFFICIENT_RESOURCES; } @@ -461,6 +469,8 @@ Buffer0->NextEntryOffset = 0; } + ExReleaseResourceLite(&Fcb->MainResource); + if (FileIndex > 0) { Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] Tue Feb 23 22:19:38 2016 @@ -246,6 +246,7 @@ NTSTATUS Status = STATUS_SUCCESS; PVOID SystemBuffer; ULONG BufferLength; + PDEVICE_EXTENSION DeviceExt; DPRINT("NtfsQueryVolumeInformation() called\n"); @@ -253,7 +254,15 @@ Irp = IrpContext->Irp; DeviceObject = IrpContext->DeviceObject; + DeviceExt = DeviceObject->DeviceExtension; Stack = IrpContext->Stack; + + if (!ExAcquireResourceSharedLite(&DeviceExt->DirResource, + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) + { + return NtfsMarkIrpContextForQueue(IrpContext); + } + FsInformationClass = Stack->Parameters.QueryVolume.FsInformationClass; BufferLength = Stack->Parameters.QueryVolume.Length; SystemBuffer = Irp->AssociatedIrp.SystemBuffer; @@ -292,6 +301,8 @@ Status = STATUS_NOT_SUPPORTED; } + ExReleaseResourceLite(&DeviceExt->DirResource); + if (NT_SUCCESS(Status)) Irp->IoStatus.Information = Stack->Parameters.QueryVolume.Length - BufferLength;

1 0

[pschweitzer] 70778: [NTFS] Moar locking Any resemblance to previous commit, living or dead, is purely coincidental
by pschweitzer＠svn.reactos.org 23 Feb '16

23 Feb '16

Author: pschweitzer Date: Tue Feb 23 20:45:11 2016 New Revision: 70778 URL: http://svn.reactos.org/svn/reactos?rev=70778&view=rev Log: [NTFS] Moar locking Any resemblance to previous commit, living or dead, is purely coincidental Modified: trunk/reactos/drivers/filesystems/ntfs/close.c Modified: trunk/reactos/drivers/filesystems/ntfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/close.c [iso-8859-1] Tue Feb 23 20:45:11 2016 @@ -101,7 +101,20 @@ FileObject = IrpContext->FileObject; DeviceExtension = DeviceObject->DeviceExtension; + if (!ExAcquireResourceExclusiveLite(&DeviceExtension->DirResource, + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) + { + return NtfsMarkIrpContextForQueue(IrpContext); + } + Status = NtfsCloseFile(DeviceExtension, FileObject); + + ExReleaseResourceLite(&DeviceExtension->DirResource); + + if (Status == STATUS_PENDING) + { + return NtfsMarkIrpContextForQueue(IrpContext); + } IrpContext->Irp->IoStatus.Information = 0; return Status;

1 0

[pschweitzer] 70777: [NTFS] Moar locking
by pschweitzer＠svn.reactos.org 23 Feb '16

23 Feb '16

Author: pschweitzer Date: Tue Feb 23 19:57:10 2016 New Revision: 70777 URL: http://svn.reactos.org/svn/reactos?rev=70777&view=rev Log: [NTFS] Moar locking Modified: trunk/reactos/drivers/filesystems/ntfs/cleanup.c Modified: trunk/reactos/drivers/filesystems/ntfs/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/cleanup.c [iso-8859-1] Tue Feb 23 19:57:10 2016 @@ -106,7 +106,16 @@ FileObject = IrpContext->FileObject; DeviceExtension = DeviceObject->DeviceExtension; + if (!ExAcquireResourceExclusiveLite(&DeviceExtension->DirResource, + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) + { + return NtfsMarkIrpContextForQueue(IrpContext); + } + Status = NtfsCleanupFile(DeviceExtension, FileObject, BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT)); + + ExReleaseResourceLite(&DeviceExtension->DirResource); + if (Status == STATUS_PENDING) { return NtfsMarkIrpContextForQueue(IrpContext);

1 0

[gedmurphy] 70776: [ATL] - Move CComBSTR and CComPtr to atlcomcli.h - Patch from Mark Jansen CORE-10610[ATL] - Move CComBSTR and CComPtr to atlcomcli.h - Patch from Mark Jansen CORE-10610
by gedmurphy＠svn.reactos.org 23 Feb '16

23 Feb '16

Author: gedmurphy Date: Tue Feb 23 19:31:38 2016 New Revision: 70776 URL: http://svn.reactos.org/svn/reactos?rev=70776&view=rev Log: [ATL] - Move CComBSTR and CComPtr to atlcomcli.h - Patch from Mark Jansen CORE-10610[ATL] - Move CComBSTR and CComPtr to atlcomcli.h - Patch from Mark Jansen CORE-10610 Added: trunk/reactos/lib/atl/atlcomcli.h (with props) Modified: trunk/reactos/lib/atl/atlbase.h Modified: trunk/reactos/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlbase.h?rev=7077… ============================================================================== --- trunk/reactos/lib/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlbase.h [iso-8859-1] Tue Feb 23 19:31:38 2016 @@ -22,6 +22,7 @@ #include "atlcore.h" #include "statreg.h" +#include "atlcomcli.h" #ifdef _MSC_VER // It is common to use this in ATL constructors. They only store this for later use, so the usage is safe. @@ -816,100 +817,6 @@ extern CAtlWinModule _AtlWinModule; -template<class T> -class CComPtr -{ -public: - T *p; -public: - CComPtr() - { - p = NULL; - } - - CComPtr(T *lp) - { - p = lp; - if (p != NULL) - p->AddRef(); - } - - CComPtr(const CComPtr<T> &lp) - { - p = lp.p; - if (p != NULL) - p->AddRef(); - } - - ~CComPtr() - { - if (p != NULL) - p->Release(); - } - - T *operator = (T *lp) - { - if (p != NULL) - p->Release(); - p = lp; - if (p != NULL) - p->AddRef(); - return *this; - } - - T *operator = (const CComPtr<T> &lp) - { - if (p != NULL) - p->Release(); - p = lp.p; - if (p != NULL) - p->AddRef(); - return *this; - } - - void Release() - { - if (p != NULL) - { - p->Release(); - p = NULL; - } - } - - void Attach(T *lp) - { - if (p != NULL) - p->Release(); - p = lp; - } - - T *Detach() - { - T *saveP; - - saveP = p; - p = NULL; - return saveP; - } - - T **operator & () - { - ATLASSERT(p == NULL); - return &p; - } - - operator T * () - { - return p; - } - - T *operator -> () - { - ATLASSERT(p != NULL); - return p; - } -}; - // TODO: When someone needs it, make the allocator a template, so you can use it for both // CoTask* allocations, and CRT-like allocations (malloc, realloc, free) @@ -997,154 +904,6 @@ T *m_Data; }; - -class CComBSTR -{ -public: - BSTR m_str; -public: - CComBSTR() : - m_str(NULL) - { - } - - CComBSTR(LPCOLESTR pSrc) - { - if (pSrc == NULL) - m_str = NULL; - else - m_str = ::SysAllocString(pSrc); - } - - CComBSTR(int length) - { - if (length == 0) - m_str = NULL; - else - m_str = ::SysAllocStringLen(NULL, length); - } - - CComBSTR(int length, LPCOLESTR pSrc) - { - if (length == 0) - m_str = NULL; - else - m_str = ::SysAllocStringLen(pSrc, length); - } - - CComBSTR(PCSTR pSrc) - { - if (pSrc) - { - int len = MultiByteToWideChar(CP_THREAD_ACP, 0, pSrc, -1, NULL, 0); - m_str = ::SysAllocStringLen(NULL, len - 1); - if (m_str) - { - int res = MultiByteToWideChar(CP_THREAD_ACP, 0, pSrc, -1, m_str, len); - ATLASSERT(res == len); - if (res != len) - { - ::SysFreeString(m_str); - m_str = NULL; - } - } - } - else - { - m_str = NULL; - } - } - - CComBSTR(const CComBSTR &other) - { - m_str = other.Copy(); - } - - CComBSTR(REFGUID guid) - { - OLECHAR szGuid[40]; - ::StringFromGUID2(guid, szGuid, 40); - m_str = ::SysAllocString(szGuid); - } - - ~CComBSTR() - { - ::SysFreeString(m_str); - m_str = NULL; - } - - operator BSTR () const - { - return m_str; - } - - BSTR *operator & () - { - return &m_str; - } - - CComBSTR &operator = (const CComBSTR &other) - { - ::SysFreeString(m_str); - m_str = other.Copy(); - return *this; - } - - BSTR Copy() const - { - if (!m_str) - return NULL; - return ::SysAllocStringLen(m_str, ::SysStringLen(m_str)); - } - - HRESULT CopyTo(BSTR *other) const - { - if (!other) - return E_POINTER; - *other = Copy(); - return S_OK; - } - - bool LoadString(HMODULE module, DWORD uID) - { - ::SysFreeString(m_str); - m_str = NULL; - const wchar_t *ptr = NULL; - int len = ::LoadStringW(module, uID, (PWSTR)&ptr, 0); - if (len) - m_str = ::SysAllocStringLen(ptr, len); - return m_str != NULL; - } - - unsigned int Length() const - { - return ::SysStringLen(m_str); - } - - unsigned int ByteLength() const - { - return ::SysStringByteLen(m_str); - } -}; - -class CComVariant : public tagVARIANT -{ -public: - CComVariant() - { - ::VariantInit(this); - } - - ~CComVariant() - { - Clear(); - } - - HRESULT Clear() - { - return ::VariantClear(this); - } -}; inline HRESULT __stdcall AtlAdvise(IUnknown *pUnkCP, IUnknown *pUnk, const IID &iid, LPDWORD pdw) { Added: trunk/reactos/lib/atl/atlcomcli.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlcomcli.h?rev=70… ============================================================================== --- trunk/reactos/lib/atl/atlcomcli.h (added) +++ trunk/reactos/lib/atl/atlcomcli.h [iso-8859-1] Tue Feb 23 19:31:38 2016 @@ -0,0 +1,308 @@ +/* + * ReactOS ATL + * + * Copyright 2009 Andrew Hill <ash77(a)reactos.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * 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 + */ + +#pragma once + +#include "atlcore.h" + + +#ifdef _MSC_VER +// It is common to use this in ATL constructors. They only store this for later use, so the usage is safe. +#pragma warning(disable:4355) +#endif + +#ifndef _ATL_PACKING +#define _ATL_PACKING 8 +#endif + +#ifndef _ATL_FREE_THREADED +#ifndef _ATL_APARTMENT_THREADED +#ifndef _ATL_SINGLE_THREADED +#define _ATL_FREE_THREADED +#endif +#endif +#endif + +#ifndef ATLTRY +#define ATLTRY(x) x; +#endif + +#ifdef _ATL_DISABLE_NO_VTABLE +#define ATL_NO_VTABLE +#else +#define ATL_NO_VTABLE __declspec(novtable) +#endif + +namespace ATL +{ + + +template<class T> +class CComPtr +{ +public: + T *p; +public: + CComPtr() + { + p = NULL; + } + + CComPtr(T *lp) + { + p = lp; + if (p != NULL) + p->AddRef(); + } + + CComPtr(const CComPtr<T> &lp) + { + p = lp.p; + if (p != NULL) + p->AddRef(); + } + + ~CComPtr() + { + if (p != NULL) + p->Release(); + } + + T *operator = (T *lp) + { + if (p != NULL) + p->Release(); + p = lp; + if (p != NULL) + p->AddRef(); + return *this; + } + + T *operator = (const CComPtr<T> &lp) + { + if (p != NULL) + p->Release(); + p = lp.p; + if (p != NULL) + p->AddRef(); + return *this; + } + + void Release() + { + if (p != NULL) + { + p->Release(); + p = NULL; + } + } + + void Attach(T *lp) + { + if (p != NULL) + p->Release(); + p = lp; + } + + T *Detach() + { + T *saveP; + + saveP = p; + p = NULL; + return saveP; + } + + T **operator & () + { + ATLASSERT(p == NULL); + return &p; + } + + operator T * () + { + return p; + } + + T *operator -> () + { + ATLASSERT(p != NULL); + return p; + } +}; + + +class CComBSTR +{ +public: + BSTR m_str; +public: + CComBSTR() : + m_str(NULL) + { + } + + CComBSTR(LPCOLESTR pSrc) + { + if (pSrc == NULL) + m_str = NULL; + else + m_str = ::SysAllocString(pSrc); + } + + CComBSTR(int length) + { + if (length == 0) + m_str = NULL; + else + m_str = ::SysAllocStringLen(NULL, length); + } + + CComBSTR(int length, LPCOLESTR pSrc) + { + if (length == 0) + m_str = NULL; + else + m_str = ::SysAllocStringLen(pSrc, length); + } + + CComBSTR(PCSTR pSrc) + { + if (pSrc) + { + int len = MultiByteToWideChar(CP_THREAD_ACP, 0, pSrc, -1, NULL, 0); + m_str = ::SysAllocStringLen(NULL, len - 1); + if (m_str) + { + int res = MultiByteToWideChar(CP_THREAD_ACP, 0, pSrc, -1, m_str, len); + ATLASSERT(res == len); + if (res != len) + { + ::SysFreeString(m_str); + m_str = NULL; + } + } + } + else + { + m_str = NULL; + } + } + + CComBSTR(const CComBSTR &other) + { + m_str = other.Copy(); + } + + CComBSTR(REFGUID guid) + { + OLECHAR szGuid[40]; + ::StringFromGUID2(guid, szGuid, 40); + m_str = ::SysAllocString(szGuid); + } + + ~CComBSTR() + { + ::SysFreeString(m_str); + m_str = NULL; + } + + operator BSTR () const + { + return m_str; + } + + BSTR *operator & () + { + return &m_str; + } + + CComBSTR &operator = (const CComBSTR &other) + { + ::SysFreeString(m_str); + m_str = other.Copy(); + return *this; + } + + BSTR Copy() const + { + if (!m_str) + return NULL; + return ::SysAllocStringLen(m_str, ::SysStringLen(m_str)); + } + + HRESULT CopyTo(BSTR *other) const + { + if (!other) + return E_POINTER; + *other = Copy(); + return S_OK; + } + + bool LoadString(HMODULE module, DWORD uID) + { + ::SysFreeString(m_str); + m_str = NULL; + const wchar_t *ptr = NULL; + int len = ::LoadStringW(module, uID, (PWSTR)&ptr, 0); + if (len) + m_str = ::SysAllocStringLen(ptr, len); + return m_str != NULL; + } + + unsigned int Length() const + { + return ::SysStringLen(m_str); + } + + unsigned int ByteLength() const + { + return ::SysStringByteLen(m_str); + } +}; + + +class CComVariant : public tagVARIANT +{ +public: + CComVariant() + { + ::VariantInit(this); + } + + ~CComVariant() + { + Clear(); + } + + HRESULT Clear() + { + return ::VariantClear(this); + } +}; + + + +}; // namespace ATL + +#ifndef _ATL_NO_AUTOMATIC_NAMESPACE +using namespace ATL; +#endif //!_ATL_NO_AUTOMATIC_NAMESPACE + Propchange: trunk/reactos/lib/atl/atlcomcli.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[rnaumann] 70775: [SHELL32] Fix displaying icons and some strings in the file overwrite dialog. Patch by Jared Smudde CORE-10832
by rnaumann＠svn.reactos.org 23 Feb '16

23 Feb '16

Author: rnaumann Date: Tue Feb 23 16:06:27 2016 New Revision: 70775 URL: http://svn.reactos.org/svn/reactos?rev=70775&view=rev Log: [SHELL32] Fix displaying icons and some strings in the file overwrite dialog. Patch by Jared Smudde CORE-10832 Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shlfileop.cpp Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Tue Feb 23 16:06:27 2016 @@ -694,7 +694,7 @@ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" - IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" + IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" IDS_FILEOOP_COPYING "Copying..." Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Tue Feb 23 16:06:27 2016 @@ -694,7 +694,7 @@ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" - IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" + IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" IDS_FILEOOP_COPYING "Copying..." Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Tue Feb 23 16:06:27 2016 @@ -694,7 +694,7 @@ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" - IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" + IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" IDS_FILEOOP_COPYING "Copying..." Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Tue Feb 23 16:06:27 2016 @@ -694,7 +694,7 @@ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" - IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" + IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" IDS_FILEOOP_COPYING "Copying..." Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Tue Feb 23 16:06:27 2016 @@ -694,7 +694,7 @@ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" - IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" + IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" IDS_FILEOOP_COPYING "Copying..." Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Tue Feb 23 16:06:27 2016 @@ -694,7 +694,7 @@ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" - IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" + IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" IDS_FILEOOP_COPYING "Copying..." Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Tue Feb 23 16:06:27 2016 @@ -694,7 +694,7 @@ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" - IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" + IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" IDS_FILEOOP_COPYING "Copying..." Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Tue Feb 23 16:06:27 2016 @@ -694,7 +694,7 @@ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" - IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" + IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" IDS_FILEOOP_COPYING "Copying..." Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Tue Feb 23 16:06:27 2016 @@ -702,7 +702,7 @@ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" - IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" + IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" IDS_FILEOOP_COPYING "Copying..." Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Tue Feb 23 16:06:27 2016 @@ -274,15 +274,13 @@ return TRUE; case ASK_OVERWRITE_FILE: - ids->hIconInstance = NULL; - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->icon_resource_id = IDI_SHELL_FOLDER_MOVE2; ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; ids->text_resource_id = IDS_OVERWRITEFILE_TEXT; return TRUE; case ASK_OVERWRITE_FOLDER: - ids->hIconInstance = NULL; - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->icon_resource_id = IDI_SHELL_FOLDER_MOVE2; ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; ids->text_resource_id = IDS_OVERWRITEFOLDER_TEXT; return TRUE;

1 0

← Newer
1
2
3
4
5
6
7
8
...
16
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2016