Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 68901: [NTOS:EX] - Remove the timer's list entry instead of the list head in NtSetTimer and NtCancelTimer. Fixes list entry corruption on VMware Hybrid builder CORE-10081 #resolve
by tfaber＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: tfaber Date: Tue Sep 1 17:52:09 2015 New Revision: 68901 URL: http://svn.reactos.org/svn/reactos?rev=68901&view=rev Log: [NTOS:EX] - Remove the timer's list entry instead of the list head in NtSetTimer and NtCancelTimer. Fixes list entry corruption on VMware Hybrid builder CORE-10081 #resolve Modified: trunk/reactos/ntoskrnl/ex/timer.c Modified: trunk/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/timer.c?rev=68… ============================================================================== --- trunk/reactos/ntoskrnl/ex/timer.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/timer.c [iso-8859-1] Tue Sep 1 17:52:09 2015 @@ -301,7 +301,7 @@ KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock); /* Remove it */ - RemoveEntryList(&TimerThread->ActiveTimerListHead); + RemoveEntryList(&Timer->ActiveTimerListEntry); Timer->ApcAssociated = FALSE; /* Unlock the list */ @@ -659,7 +659,7 @@ KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock); /* Remove it */ - RemoveEntryList(&TimerThread->ActiveTimerListHead); + RemoveEntryList(&Timer->ActiveTimerListEntry); Timer->ApcAssociated = FALSE; /* Unlock the list */

1 0

[pschweitzer] 68900: [NTOSKRNL] Fix MSVC build?
by pschweitzer＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: pschweitzer Date: Tue Sep 1 17:32:34 2015 New Revision: 68900 URL: http://svn.reactos.org/svn/reactos?rev=68900&view=rev Log: [NTOSKRNL] Fix MSVC build? Modified: trunk/reactos/ntoskrnl/kd64/kdprint.c Modified: trunk/reactos/ntoskrnl/kd64/kdprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdprint.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] Tue Sep 1 17:32:34 2015 @@ -227,7 +227,7 @@ { ProbeForRead(PromptString, PromptLength, 1); CapturedPrompt = alloca(512); - KdpQuickMoveMemory(CapturedPrompt, PromptString, PromptLength); + RtlMoveMemory(CapturedPrompt, PromptString, PromptLength); PromptString = CapturedPrompt; ProbeForWrite(ResponseString, MaximumResponseLength, 1); @@ -274,7 +274,7 @@ { _SEH2_TRY { - KdpQuickMoveMemory(ResponseString, ResponseBuffer.Buffer, ResponseBuffer.Length); + RtlMoveMemory(ResponseString, ResponseBuffer.Buffer, ResponseBuffer.Length); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -328,7 +328,7 @@ { ProbeForRead(String, Length, 1); CapturedString = alloca(512); - KdpQuickMoveMemory(CapturedString, String, Length); + RtlMoveMemory(CapturedString, String, Length); String = CapturedString; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)

1 0

[pschweitzer] 68899: [NTOSKRNL] Probe buffers in case they come from user-mode in KdpPrint() and KdpPrompt(). This fixes two fixme.
by pschweitzer＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: pschweitzer Date: Tue Sep 1 17:23:56 2015 New Revision: 68899 URL: http://svn.reactos.org/svn/reactos?rev=68899&view=rev Log: [NTOSKRNL] Probe buffers in case they come from user-mode in KdpPrint() and KdpPrompt(). This fixes two fixme. Modified: trunk/reactos/ntoskrnl/kd64/kdprint.c Modified: trunk/reactos/ntoskrnl/kd64/kdprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdprint.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] Tue Sep 1 17:23:56 2015 @@ -213,6 +213,7 @@ { STRING PromptBuffer, ResponseBuffer; BOOLEAN Enable, Resend; + PVOID CapturedPrompt, CapturedResponse; /* Normalize the lengths */ PromptLength = min(PromptLength, 512); @@ -221,13 +222,32 @@ /* Check if we need to verify the string */ if (PreviousMode != KernelMode) { - /* FIXME: Handle user-mode */ + /* Capture user-mode buffers */ + _SEH2_TRY + { + ProbeForRead(PromptString, PromptLength, 1); + CapturedPrompt = alloca(512); + KdpQuickMoveMemory(CapturedPrompt, PromptString, PromptLength); + PromptString = CapturedPrompt; + + ProbeForWrite(ResponseString, MaximumResponseLength, 1); + CapturedResponse = alloca(512); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return 0); + } + _SEH2_END; + } + else + { + CapturedResponse = ResponseString; } /* Setup the prompt and response buffers */ PromptBuffer.Buffer = PromptString; PromptBuffer.Length = PromptLength; - ResponseBuffer.Buffer = ResponseString; + ResponseBuffer.Buffer = CapturedResponse; ResponseBuffer.Length = 0; ResponseBuffer.MaximumLength = MaximumResponseLength; @@ -248,6 +268,20 @@ /* Exit the debugger */ KdExitDebugger(Enable); + + /* Copy back response if required */ + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + KdpQuickMoveMemory(ResponseString, ResponseBuffer.Buffer, ResponseBuffer.Length); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return 0); + } + _SEH2_END; + } /* Return the number of characters received */ return ResponseBuffer.Length; @@ -267,6 +301,7 @@ NTSTATUS ReturnStatus; BOOLEAN Enable; STRING OutputString; + PVOID CapturedString; /* Assume failure */ *Handled = FALSE; @@ -288,7 +323,19 @@ /* Check if we need to verify the buffer */ if (PreviousMode != KernelMode) { - /* FIXME: Support user-mode */ + /* Capture user-mode buffers */ + _SEH2_TRY + { + ProbeForRead(String, Length, 1); + CapturedString = alloca(512); + KdpQuickMoveMemory(CapturedString, String, Length); + String = CapturedString; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return STATUS_ACCESS_VIOLATION); + } + _SEH2_END; } /* Setup the output string */

1 0

[tfaber] 68898: [CRT] - Rewrite _fpreset based on Wine. Fixes the last kernel32:thread test failure
by tfaber＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: tfaber Date: Tue Sep 1 14:57:30 2015 New Revision: 68898 URL: http://svn.reactos.org/svn/reactos?rev=68898&view=rev Log: [CRT] - Rewrite _fpreset based on Wine. Fixes the last kernel32:thread test failure Modified: trunk/reactos/lib/sdk/crt/float/i386/fpreset.c Modified: trunk/reactos/lib/sdk/crt/float/i386/fpreset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/fpr… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/i386/fpreset.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/i386/fpreset.c [iso-8859-1] Tue Sep 1 14:57:30 2015 @@ -1,11 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: See COPYING.LIB in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/crt/?????? - * PURPOSE: Unknown - * PROGRAMER: Unknown - * UPDATE HISTORY: - * 25/11/05: Added license header + * PURPOSE: Resets FPU state to the default + * PROGRAMER: Thomas Faber <thomas.faber(a)reactos.org> */ #include <precomp.h> @@ -15,9 +12,20 @@ */ void CDECL _fpreset(void) { -#if defined(__GNUC__) - __asm__ __volatile__( "fninit" ); + const unsigned int x86_cw = 0x27f; +#ifdef _MSC_VER + __asm { fninit } + __asm { fldcw [x86_cw] } #else - __asm fninit; + __asm__ __volatile__( "fninit; fldcw %0" : : "m" (x86_cw) ); #endif + if (IsProcessorFeaturePresent(PF_XMMI64_INSTRUCTIONS_AVAILABLE)) + { + const unsigned long sse2_cw = 0x1f80; +#ifdef _MSC_VER + __asm { ldmxcsr [sse2_cw] } +#else + __asm__ __volatile__( "ldmxcsr %0" : : "m" (sse2_cw) ); +#endif + } }

1 0

[tfaber] 68897: [NETAPI32] - Correctly reallocate buffer in NetWkstaUserGetInfo. Fixes one of the many exceptions when running netapi32 tests with DPH.
by tfaber＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: tfaber Date: Tue Sep 1 14:09:51 2015 New Revision: 68897 URL: http://svn.reactos.org/svn/reactos?rev=68897&view=rev Log: [NETAPI32] - Correctly reallocate buffer in NetWkstaUserGetInfo. Fixes one of the many exceptions when running netapi32 tests with DPH. Modified: trunk/reactos/dll/win32/netapi32/wksta.c Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] Tue Sep 1 14:09:51 2015 @@ -310,7 +310,12 @@ (lstrlenW(ui->wkui0_username) + 1) * sizeof(WCHAR), (LPVOID *) bufptr); if (nastatus != NERR_Success) + { + NetApiBufferFree(ui); return nastatus; + } + ui = (PWKSTA_USER_INFO_0) *bufptr; + ui->wkui0_username = (LMSTR) (*bufptr + sizeof(WKSTA_USER_INFO_0)); } break; }

1 0

[tfaber] 68896: [PSDK] - Sync access.idl and msinkaut.idl with Wine. Fixes MIDL warnings.
by tfaber＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: tfaber Date: Tue Sep 1 14:07:06 2015 New Revision: 68896 URL: http://svn.reactos.org/svn/reactos?rev=68896&view=rev Log: [PSDK] - Sync access.idl and msinkaut.idl with Wine. Fixes MIDL warnings. Modified: trunk/reactos/include/psdk/access.idl trunk/reactos/include/psdk/msinkaut.idl Modified: trunk/reactos/include/psdk/access.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/access.idl?re… ============================================================================== --- trunk/reactos/include/psdk/access.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/access.idl [iso-8859-1] Tue Sep 1 14:07:06 2015 @@ -34,7 +34,7 @@ [call_as(AddRefAccessor)] HRESULT RemoteAddRefAccessor([in] HACCESSOR hAccessor, - [in, out, unique, annotation("__out_opt")] DBREFCOUNT *pcRefCount, + [in, out, unique] DBREFCOUNT *pcRefCount, [out] IErrorInfo **ppErrorInfoRem); [local] Modified: trunk/reactos/include/psdk/msinkaut.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msinkaut.idl?… ============================================================================== --- trunk/reactos/include/psdk/msinkaut.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msinkaut.idl [iso-8859-1] Tue Sep 1 14:07:06 2015 @@ -211,8 +211,8 @@ [in] single VerticalComponent); [id(0x00000003)] HRESULT Rotate( [in] single Degrees, - [in, optional, defaultvalue(0)] single x, - [in, optional, defaultvalue(0)] single y); + [in, defaultvalue(0)] single x, + [in, defaultvalue(0)] single y); [id(0x00000004)] HRESULT Reflect( [in] VARIANT_BOOL Horizontally, [in] VARIANT_BOOL Vertically); @@ -336,7 +336,7 @@ [id(0x00000014), propget] HRESULT Deleted( [out, retval] VARIANT_BOOL* Deleted); [id(0x00000003)] HRESULT GetBoundingBox( - [in, optional, defaultvalue(0)] InkBoundingBoxMode BoundingBoxMode, + [in, defaultvalue(0)] InkBoundingBoxMode BoundingBoxMode, [out, retval] IInkRectangle** Rectangle); [id(0x00000005)] HRESULT FindIntersections( [in] IInkStrokes* Strokes, @@ -354,7 +354,7 @@ [id(0x00000009)] HRESULT NearestPoint( [in] long x, [in] long y, - [in, out, optional, defaultvalue(0)] single* Distance, + [in, out, defaultvalue(0)] single* Distance, [out, retval] single* Point); [id(0x0000000a)] HRESULT Split( [in] single SplitAt, @@ -366,35 +366,35 @@ [out] TabletPropertyMetricUnit* Units, [out] single* Resolution); [id(0x00000016)] HRESULT GetPoints( - [in, optional, defaultvalue(0)] long Index, - [in, optional, defaultvalue(-1)] long Count, + [in, defaultvalue(0)] long Index, + [in, defaultvalue(-1)] long Count, [out, retval] VARIANT* Points); [id(0x00000017)] HRESULT SetPoints( [in] VARIANT Points, - [in, optional, defaultvalue(0)] long Index, - [in, optional, defaultvalue(-1)] long Count, + [in, defaultvalue(0)] long Index, + [in, defaultvalue(-1)] long Count, [out, retval] long* NumberOfPointsSet); [id(0x00000018)] HRESULT GetPacketData( - [in, optional, defaultvalue(0)] long Index, - [in, optional, defaultvalue(-1)] long Count, + [in, defaultvalue(0)] long Index, + [in, defaultvalue(-1)] long Count, [out, retval] VARIANT* PacketData); [id(0x00000019)] HRESULT GetPacketValuesByProperty( [in] BSTR propertyName, - [in, optional, defaultvalue(0)] long Index, - [in, optional, defaultvalue(-1)] long Count, + [in, defaultvalue(0)] long Index, + [in, defaultvalue(-1)] long Count, [out, retval] VARIANT* PacketValues); [id(0x0000001a)] HRESULT SetPacketValuesByProperty( [in] BSTR bstrPropertyName, [in] VARIANT PacketValues, - [in, optional, defaultvalue(0)] long Index, - [in, optional, defaultvalue(-1)] long Count, + [in, defaultvalue(0)] long Index, + [in, defaultvalue(-1)] long Count, [out, retval] long* NumberOfPacketsSet); [id(0x0000001b)] HRESULT GetFlattenedBezierPoints( - [in, optional, defaultvalue(0)] long FittingError, + [in, defaultvalue(0)] long FittingError, [out, retval] VARIANT* FlattenedBezierPoints); [id(0x0000001d)] HRESULT Transform( [in] IInkTransform* Transform, - [in, optional, defaultvalue(0)] VARIANT_BOOL ApplyOnPenWidth); + [in, defaultvalue(0)] VARIANT_BOOL ApplyOnPenWidth); [id(0x0000001c)] HRESULT ScaleToRectangle( [in] IInkRectangle* Rectangle); [id(0x0000001e)] HRESULT Move( @@ -402,8 +402,8 @@ [in] single VerticalComponent); [id(0x0000001f)] HRESULT Rotate( [in] single Degrees, - [in, optional, defaultvalue(0)] single x, - [in, optional, defaultvalue(0)] single y); + [in, defaultvalue(0)] single x, + [in, defaultvalue(0)] single y); [id(0x00000020)] HRESULT Shear( [in] single HorizontalMultiplier, [in] single VerticalMultiplier); @@ -693,7 +693,7 @@ HRESULT DrawStroke( [in] long hDC, [in] IInkStrokeDisp* Stroke, - [in, optional, defaultvalue(0)] + [in, defaultvalue(0)] IInkDrawingAttributes* DrawingAttributes); HRESULT PixelToInkSpace( [in] long hDC, @@ -714,19 +714,19 @@ [out, retval] IInkRectangle** Rectangle); HRESULT MeasureStroke( [in] IInkStrokeDisp* Stroke, - [in, optional, defaultvalue(0)] IInkDrawingAttributes* DrawingAttributes, + [in, defaultvalue(0)] IInkDrawingAttributes* DrawingAttributes, [out, retval] IInkRectangle** Rectangle); HRESULT Move( [in] single HorizontalComponent, [in] single VerticalComponent); HRESULT Rotate( [in] single Degrees, - [in, optional, defaultvalue(0)] single x, - [in, optional, defaultvalue(0)] single y); + [in, defaultvalue(0)] single x, + [in, defaultvalue(0)] single y); HRESULT ScaleTransform( [in] single HorizontalMultiplier, [in] single VerticalMultiplier, - [in, optional, defaultvalue(-1)] VARIANT_BOOL ApplyOnPenWidth); + [in, defaultvalue(-1)] VARIANT_BOOL ApplyOnPenWidth); }; typedef enum { @@ -996,7 +996,7 @@ [id(0x00000017)] HRESULT SetWindowInputRectangle( [in] IInkRectangle* WindowInputRectangle); [id(0x0000001a)] HRESULT SetAllTabletsMode( - [in, optional, defaultvalue(-1)] VARIANT_BOOL UseMouseForInput); + [in, defaultvalue(-1)] VARIANT_BOOL UseMouseForInput); [id(0x0000001b)] HRESULT SetSingleTabletIntegratedMode( [in] IInkTablet* Tablet); [id(0x0000000b)] HRESULT GetEventInterest(

1 0

[cwittich] 68895: [STOBJECT] only change the volume icon when the state changed
by cwittich＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: cwittich Date: Tue Sep 1 13:55:34 2015 New Revision: 68895 URL: http://svn.reactos.org/svn/reactos?rev=68895&view=rev Log: [STOBJECT] only change the volume icon when the state changed Modified: trunk/reactos/dll/shellext/stobject/volume.cpp Modified: trunk/reactos/dll/shellext/stobject/volume.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/volu… ============================================================================== --- trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] Tue Sep 1 13:55:34 2015 @@ -171,22 +171,32 @@ HRESULT STDMETHODCALLTYPE Volume_Update(_In_ CSysTray * pSysTray) { + BOOL PrevState; + TRACE("Volume_Update\n"); + PrevState = g_IsMute; Volume_IsMute(); - WCHAR strTooltip[128]; - HICON icon; - if (g_IsMute) { - icon = g_hIconMute; - LoadStringW(g_hInstance, IDS_VOL_MUTED, strTooltip, _countof(strTooltip)); - } - else { - icon = g_hIconVolume; - LoadStringW(g_hInstance, IDS_VOL_VOLUME, strTooltip, _countof(strTooltip)); - } - - return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_VOLUME, icon, strTooltip); + if (PrevState != g_IsMute) + { + WCHAR strTooltip[128]; + HICON icon; + if (g_IsMute) { + icon = g_hIconMute; + LoadStringW(g_hInstance, IDS_VOL_MUTED, strTooltip, _countof(strTooltip)); + } + else { + icon = g_hIconVolume; + LoadStringW(g_hInstance, IDS_VOL_VOLUME, strTooltip, _countof(strTooltip)); + } + + return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_VOLUME, icon, strTooltip); + } + else + { + return S_OK; + } } HRESULT STDMETHODCALLTYPE Volume_Shutdown(_In_ CSysTray * pSysTray)

1 0

[sginsberg] 68894: - Fix what should hopefully be the last bug in the floating point state save/load code -- in KiNpxHandler check if the state is loaded before unloading it instead of checking if ...
by sginsberg＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: sginsberg Date: Tue Sep 1 13:20:50 2015 New Revision: 68894 URL: http://svn.reactos.org/svn/reactos?rev=68894&view=rev Log: - Fix what should hopefully be the last bug in the floating point state save/load code -- in KiNpxHandler check if the state is loaded before unloading it instead of checking if it is *unloaded* before... unloading it. Also clear up some comments. - Thomas is da man. Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Tue Sep 1 13:20:50 2015 @@ -262,8 +262,8 @@ } } - /* User or kernel trap -- get ready to issue an exception */ - if (Thread->NpxState == NPX_STATE_NOT_LOADED) + /* User or kernel trap -- check if we need to unload the current state */ + if (Thread->NpxState == NPX_STATE_LOADED) { /* Update CR0 */ Cr0 = __readcr0(); @@ -310,8 +310,6 @@ } /* Get legal exceptions that software should handle */ - /* We do this by first masking off from the Mask the bits we need, */ - /* This is done so we can keep the FSW_STACK_FAULT bit in Error. */ Mask &= (FSW_INVALID_OPERATION | FSW_DENORMAL | FSW_ZERO_DIVIDE | @@ -323,9 +321,10 @@ /* Check for invalid operation */ if (Error & FSW_INVALID_OPERATION) { - /* NOTE: Stack fault is handled differently than any other case. */ - /* 1. It's only raised for invalid operation. */ - /* 2. It's only raised if invalid operation is not masked. */ + /* + * Now check if this is actually a Stack Fault. This is needed because + * on x86 the Invalid Operation error is set for Stack Check faults as well. + */ if (Error & FSW_STACK_FAULT) { /* Issue stack check fault */ @@ -335,12 +334,14 @@ DataOffset, TrapFrame); } - - /* Issue fault */ - KiDispatchException1Args(STATUS_FLOAT_INVALID_OPERATION, - ErrorOffset, - 0, - TrapFrame); + else + { + /* This is an invalid operation fault after all, so raise that instead */ + KiDispatchException1Args(STATUS_FLOAT_INVALID_OPERATION, + ErrorOffset, + 0, + TrapFrame); + } } /* Check for divide by zero */

1 0

[dquintana] 68893: [EXPLORER] * Remove old icons from the tray imagelist.
by dquintana＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: dquintana Date: Tue Sep 1 12:32:05 2015 New Revision: 68893 URL: http://svn.reactos.org/svn/reactos?rev=68893&view=rev Log: [EXPLORER] * Remove old icons from the tray imagelist. Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Tue Sep 1 12:32:05 2015 @@ -163,8 +163,14 @@ if (iconData->uFlags & NIF_ICON) { + TBBUTTONINFO tbbiOld = { 0 }; + tbbiOld.cbSize = sizeof(tbbiOld); + tbbiOld.dwMask = TBIF_BYINDEX | TBIF_IMAGE; + + GetButtonInfo(index, &tbbiOld); + tbbi.dwMask |= TBIF_IMAGE; - tbbi.iImage = ImageList_AddIcon(m_ImageList, iconData->hIcon); + tbbi.iImage = ImageList_ReplaceIcon(m_ImageList, tbbiOld.iImage, iconData->hIcon); } if (iconData->uFlags & NIF_TIP) @@ -208,6 +214,14 @@ int index = FindItemByIconData(iconData, &notifyItem); if (index < 0) return FALSE; + + TBBUTTONINFO tbbiOld = { 0 }; + tbbiOld.cbSize = sizeof(tbbiOld); + tbbiOld.dwMask = TBIF_BYINDEX | TBIF_IMAGE; + + GetButtonInfo(index, &tbbiOld); + + ImageList_Remove(m_ImageList, tbbiOld.iImage); DeleteButton(index);

1 0

[gadamopoulos] 68892: [SHELL32] - Fix a hack that broke copying files after recent fixes.
by gadamopoulos＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: gadamopoulos Date: Tue Sep 1 10:18:40 2015 New Revision: 68892 URL: http://svn.reactos.org/svn/reactos?rev=68892&view=rev Log: [SHELL32] - Fix a hack that broke copying files after recent fixes. Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Tue Sep 1 10:18:40 2015 @@ -1034,7 +1034,6 @@ LPWSTR pszSrc, pszTarget, pszSrcList, pszTargetList, pszFileName; int res, length; HRESULT hr; - STRRET strRet; TRACE ("(%p)->(%p,%u,%p)\n", this, pSFFrom, cidl, apidl); @@ -1047,20 +1046,11 @@ return hr; } - hr = pSFFrom->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strRet); + hr = SHGetPathFromIDListW(pidl, szSrcPath); + SHFree(pidl); + if (FAILED(hr)) - { - SHFree(pidl); return hr; - } - - hr = StrRetToBufW(&strRet, pidl, szSrcPath, MAX_PATH); - if (FAILED(hr)) - { - SHFree(pidl); - return hr; - } - SHFree(pidl); pszSrc = PathAddBackslashW(szSrcPath);

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