Ros-diffs

ros-diffs@reactos.org

12 participants
81034 discussions

[reactos] 01/01: [SHELL32][SDK] Implement CopyStreamUI (#5848)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a049d0b68ac18d4dfdaf… commit 8a049d0b68ac18d4dfdaf4db3d3a2ef9bce2f607 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 31 22:32:02 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 31 22:32:02 2023 +0900 [SHELL32][SDK] Implement CopyStreamUI (#5848) - Modify shell32.spec. - Add CopyStreamUI prototype to <undocshell.h>. CORE-19278 --- dll/win32/shell32/shell32.spec | 2 +- dll/win32/shell32/stubs.cpp | 11 ---- dll/win32/shell32/utils.cpp | 117 +++++++++++++++++++++++++++++++++++++++ sdk/include/reactos/undocshell.h | 8 +++ 4 files changed, 126 insertions(+), 12 deletions(-) diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index dbdbfabd758..eb8685fe3c6 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -444,7 +444,7 @@ 723 stdcall -noname SHCreateSessionKey(long ptr) 724 stdcall -noname SHIsTempDisplayMode() 725 stdcall -noname GetFileDescriptor(ptr long long wstr) -726 stdcall -noname CopyStreamUI(ptr ptr ptr) +726 stdcall -noname CopyStreamUI(ptr ptr ptr int64) 727 stdcall SHGetImageList(long ptr ptr) 730 stdcall RestartDialogEx(long wstr long long) 731 stdcall -noname -stub SHRegisterDarwinLink(long long long) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index b1e153fdb67..91e8ae00beb 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -86,17 +86,6 @@ SHReValidateDarwinCache(VOID) FIXME("SHReValidateDarwinCache() stub\n"); } -/* - * Unimplemented - */ -EXTERN_C HRESULT -WINAPI -CopyStreamUI(IStream *pSrc, IStream *pDst, IProgressDialog *pProgDlg) -{ - FIXME("CopyStreamUI() stub\n"); - return E_FAIL; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 697a4f59cea..1e7cfbe28ac 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -540,6 +540,123 @@ LargeIntegerToString( pNumberFormat, dwNumberFlags); } +/************************************************************************* + * CopyStreamUI [SHELL32.726] + * + * Copy a stream to another stream with optional progress display. + */ +EXTERN_C +HRESULT WINAPI +CopyStreamUI( + _In_ IStream *pSrc, + _Out_ IStream *pDst, + _Inout_opt_ IProgressDialog *pProgress, + _In_opt_ DWORDLONG dwlSize) +{ + HRESULT hr = E_FAIL; + DWORD cbBuff, cbRead, dwSizeToWrite; + DWORDLONG cbDone; + LPVOID pBuff; + CComHeapPtr<BYTE> pHeapPtr; + STATSTG Stat; + BYTE abBuff[1024]; + + TRACE("(%p, %p, %p, %I64u)\n", pSrc, pDst, pProgress, dwlSize); + + if (dwlSize == 0) // Invalid size? + { + // Get the stream size + ZeroMemory(&Stat, sizeof(Stat)); + if (FAILED(pSrc->Stat(&Stat, STATFLAG_NONAME))) + pProgress = NULL; // No size info. Disable progress + else + dwlSize = Stat.cbSize.QuadPart; + } + + if (!pProgress) // Progress is disabled? + { + ULARGE_INTEGER uliSize; + + if (dwlSize > 0) + uliSize.QuadPart = dwlSize; + else + uliSize.HighPart = uliSize.LowPart = INVALID_FILE_SIZE; + + return pSrc->CopyTo(pDst, uliSize, NULL, NULL); // One punch + } + + // Allocate the buffer if necessary + if (dwlSize > 0 && dwlSize <= sizeof(abBuff)) + { + cbBuff = sizeof(abBuff); + pBuff = abBuff; + } + else + { +#define COPY_STREAM_DEFAULT_BUFFER_SIZE 0x4000 + cbBuff = COPY_STREAM_DEFAULT_BUFFER_SIZE; + if (pHeapPtr.AllocateBytes(cbBuff)) + { + pBuff = pHeapPtr; + } + else // Low memory? + { + cbBuff = sizeof(abBuff); + pBuff = abBuff; + } +#undef COPY_STREAM_DEFAULT_BUFFER_SIZE + } + + // Start reading + LARGE_INTEGER zero; + zero.QuadPart = 0; + pSrc->Seek(zero, 0, NULL); + pDst->Seek(zero, 0, NULL); + cbDone = 0; + pProgress->SetProgress64(cbDone, dwlSize); + + // Repeat reading and writing until goal + for (;;) + { + hr = pSrc->Read(pBuff, cbBuff, &cbRead); + if (FAILED(hr)) + break; + + // Calculate the size to write + if (dwlSize > 0) + dwSizeToWrite = (DWORD)min((DWORDLONG)(dwlSize - cbDone), (DWORDLONG)cbRead); + else + dwSizeToWrite = cbRead; + + if (dwSizeToWrite == 0) // No need to write? + { + hr = S_OK; + break; + } + + hr = pDst->Write(pBuff, dwSizeToWrite, NULL); + if (hr != S_OK) + break; + + cbDone += dwSizeToWrite; + + if (pProgress->HasUserCancelled()) // Cancelled? + { + hr = HRESULT_FROM_WIN32(ERROR_CANCELLED); + break; + } + pProgress->SetProgress64(cbDone, dwlSize); + + if (dwlSize > 0 && cbDone >= dwlSize) // Reached the goal? + { + hr = S_OK; + break; + } + } + + return hr; +} + /************************************************************************* * SHOpenPropSheetA [SHELL32.707] * diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 95cc7b6998b..8fad6faa6a8 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -817,6 +817,14 @@ LONG WINAPI SHRegQueryValueExW( #define SHRegQueryValueEx SHRegQueryValueExA #endif +EXTERN_C +HRESULT WINAPI +CopyStreamUI( + _In_ IStream *pSrc, + _Out_ IStream *pDst, + _Inout_opt_ IProgressDialog *pProgress, + _In_opt_ DWORDLONG dwlSize); + /***************************************************************************** * INVALID_FILETITLE_CHARACTERS */

1 year, 2 months

[reactos] 01/01: [BDASUP][KMIXER][MMIXER][STREAM] Replace meaningless YDEBUG (#5818)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60b0afc3af8b05781885c… commit 60b0afc3af8b05781885c217be2779fb1cfcf1c8 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Oct 31 13:04:24 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 31 12:04:24 2023 +0000 [BDASUP][KMIXER][MMIXER][STREAM] Replace meaningless YDEBUG (#5818) bdasup: Addendum to 40c15ec (r46632). kmixer: Addendum to 3e489bf (r42143). mmixer: Addendum to c42d9f2 (r44872). stream: Addendum to 4a0debf (r41662). Serge plans a follow up that will remove all other remaining YDEBUG in the source tree. The ones covered here he considered to be the most trivial ones. --- drivers/multimedia/bdasup/precomp.h | 2 +- drivers/wdm/audio/filters/kmixer/filter.c | 3 +-- drivers/wdm/audio/filters/kmixer/kmixer.c | 4 +--- drivers/wdm/audio/legacy/stream/stream.h | 3 ++- sdk/lib/drivers/sound/mmixer/controls.c | 9 +-------- sdk/lib/drivers/sound/mmixer/filter.c | 2 +- sdk/lib/drivers/sound/mmixer/midi.c | 2 +- sdk/lib/drivers/sound/mmixer/mixer.c | 4 +--- sdk/lib/drivers/sound/mmixer/sup.c | 5 +---- sdk/lib/drivers/sound/mmixer/topology.c | 10 +--------- sdk/lib/drivers/sound/mmixer/wave.c | 8 +------- 11 files changed, 12 insertions(+), 40 deletions(-) diff --git a/drivers/multimedia/bdasup/precomp.h b/drivers/multimedia/bdasup/precomp.h index 45a603ddecd..be258b38783 100644 --- a/drivers/multimedia/bdasup/precomp.h +++ b/drivers/multimedia/bdasup/precomp.h @@ -10,7 +10,7 @@ #include <bdamedia.h> #include <bdasup.h> -#define YDEBUG +// #define NDEBUG #include <debug.h> diff --git a/drivers/wdm/audio/filters/kmixer/filter.c b/drivers/wdm/audio/filters/kmixer/filter.c index 5d84eb2c2d0..f2112b758b1 100644 --- a/drivers/wdm/audio/filters/kmixer/filter.c +++ b/drivers/wdm/audio/filters/kmixer/filter.c @@ -10,7 +10,7 @@ #include <swenum.h> -#define YDEBUG +// #define NDEBUG #include <debug.h> NTSTATUS @@ -199,4 +199,3 @@ KMixAllocateDeviceHeader( CreateItem); return Status; } - diff --git a/drivers/wdm/audio/filters/kmixer/kmixer.c b/drivers/wdm/audio/filters/kmixer/kmixer.c index 978e46565cd..b9ae6e68af9 100644 --- a/drivers/wdm/audio/filters/kmixer/kmixer.c +++ b/drivers/wdm/audio/filters/kmixer/kmixer.c @@ -8,7 +8,7 @@ #include "kmixer.h" -#define YDEBUG +// #define NDEBUG #include <debug.h> NTSTATUS @@ -72,7 +72,6 @@ KMix_AddDevice( /* initialize device extension */ RtlZeroMemory(DeviceExtension, sizeof(KMIXER_DEVICE_EXT)); - Status = KMixAllocateDeviceHeader(DeviceExtension); if (!NT_SUCCESS(Status)) { @@ -98,7 +97,6 @@ cleanup: return Status; } - NTSTATUS NTAPI DriverEntry( diff --git a/drivers/wdm/audio/legacy/stream/stream.h b/drivers/wdm/audio/legacy/stream/stream.h index 5994d91be56..09054368ea0 100644 --- a/drivers/wdm/audio/legacy/stream/stream.h +++ b/drivers/wdm/audio/legacy/stream/stream.h @@ -1,7 +1,8 @@ #pragma once #include <strmini.h> -#define YDEBUG + +// #define NDEBUG #include <debug.h> #define STREAMDEBUG_LEVEL DebugLevelMaximum diff --git a/sdk/lib/drivers/sound/mmixer/controls.c b/sdk/lib/drivers/sound/mmixer/controls.c index 3b5a8036b25..a7521bf4dd3 100644 --- a/sdk/lib/drivers/sound/mmixer/controls.c +++ b/sdk/lib/drivers/sound/mmixer/controls.c @@ -8,7 +8,7 @@ #include "precomp.h" -#define YDEBUG +// #define NDEBUG #include <debug.h> const GUID KSNODETYPE_DESKTOP_MICROPHONE = {0xDFF21BE2, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; @@ -56,7 +56,6 @@ MMixerAddMixerControl( return MM_STATUS_NO_MEMORY; } - /* initialize mixer control */ MixerControl->hDevice = hMixer; MixerControl->NodeID = NodeIndex; @@ -263,7 +262,6 @@ MMixerCreateDestinationLine( DestinationLine->Line.dwUser = 0; DestinationLine->Line.fdwLine = MIXERLINE_LINEF_ACTIVE; - if (LineName) { MixerContext->Copy(DestinationLine->Line.szShortName, LineName, (min(MIXER_SHORT_NAME_CHARS, wcslen(LineName)+1)) * sizeof(WCHAR)); @@ -564,7 +562,6 @@ MMixerGetChannelCountEnhanced( Request.Property.Flags = KSPROPERTY_TYPE_BASICSUPPORT | KSPROPERTY_TYPE_TOPOLOGY; Request.Property.Id = KSPROPERTY_AUDIO_VOLUMELEVEL; - /* get description */ Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_NODE), (PVOID)&Description, sizeof(KSPROPERTY_DESCRIPTION), &BytesReturned); if (Status == MM_STATUS_SUCCESS) @@ -772,7 +769,6 @@ MMixerGetComponentAndTargetType( Request.Property.Set = KSPROPSETID_Pin; Request.Property.Id = KSPROPERTY_PIN_CATEGORY; - /* get pin category */ Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_PIN), &Guid, sizeof(GUID), &BytesReturned); if (Status != MM_STATUS_SUCCESS) @@ -1163,7 +1159,6 @@ MMixerAddMixerSourceLines( return MM_STATUS_SUCCESS; } - MIXER_STATUS MMixerAddMixerControlsToDestinationLine( IN PMIXER_CONTEXT MixerContext, @@ -1623,7 +1618,6 @@ MMixerInitializeFilter( } } - /* now get the bridge pin which is at the end of node path * For sink pins (wave out) search down stream * For source pins (wave in) search up stream @@ -1829,7 +1823,6 @@ MMixerSetupFilter( return Status; } - MIXER_STATUS MMixerAddEvent( IN PMIXER_CONTEXT MixerContext, diff --git a/sdk/lib/drivers/sound/mmixer/filter.c b/sdk/lib/drivers/sound/mmixer/filter.c index a41bcee7bb7..19033c831ad 100644 --- a/sdk/lib/drivers/sound/mmixer/filter.c +++ b/sdk/lib/drivers/sound/mmixer/filter.c @@ -8,7 +8,7 @@ #include "precomp.h" -#define YDEBUG +// #define NDEBUG #include <debug.h> ULONG diff --git a/sdk/lib/drivers/sound/mmixer/midi.c b/sdk/lib/drivers/sound/mmixer/midi.c index 969f252773a..acca89ca5ad 100644 --- a/sdk/lib/drivers/sound/mmixer/midi.c +++ b/sdk/lib/drivers/sound/mmixer/midi.c @@ -8,7 +8,7 @@ #include "precomp.h" -#define YDEBUG +// #define NDEBUG #include <debug.h> MIXER_STATUS diff --git a/sdk/lib/drivers/sound/mmixer/mixer.c b/sdk/lib/drivers/sound/mmixer/mixer.c index 3b8d900bef6..4b98ed53ae3 100644 --- a/sdk/lib/drivers/sound/mmixer/mixer.c +++ b/sdk/lib/drivers/sound/mmixer/mixer.c @@ -8,7 +8,7 @@ #include "precomp.h" -#define YDEBUG +// #define NDEBUG #include <debug.h> ULONG @@ -106,7 +106,6 @@ MMixerOpen( /* add the event */ Status = MMixerAddEvent(MixerContext, MixerInfo, MixerEventContext, MixerEventRoutine); - /* store result */ *MixerHandle = (HANDLE)MixerInfo; return MM_STATUS_SUCCESS; @@ -687,7 +686,6 @@ MMixerPrintMixers( DPRINT1("WaveOutCount %lu\n", MixerList->WaveOutListCount); DPRINT1("MixerCount %p\n", MixerList->MixerListCount); - for(Index = 0; Index < MixerList->MixerListCount; Index++) { /* get mixer info */ diff --git a/sdk/lib/drivers/sound/mmixer/sup.c b/sdk/lib/drivers/sound/mmixer/sup.c index 4fa8c080309..cfd5ab8b0b1 100644 --- a/sdk/lib/drivers/sound/mmixer/sup.c +++ b/sdk/lib/drivers/sound/mmixer/sup.c @@ -8,7 +8,7 @@ #include "precomp.h" -#define YDEBUG +// #define NDEBUG #include <debug.h> const GUID KSNODETYPE_SUM = {0xDA441A60L, 0xC556, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; @@ -36,7 +36,6 @@ const GUID KSDATAFORMAT_TYPE_MUSIC = {0xE725D360L, 0x62CC, 0x11CF, {0xA5, 0xD6, const GUID KSDATAFORMAT_SUBTYPE_MIDI = {0x1D262760L, 0xE957, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; const GUID KSDATAFORMAT_SPECIFIER_NONE = {0x0F6417D6L, 0xC318, 0x11D0, {0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; - MIXER_STATUS MMixerVerifyContext( IN PMIXER_CONTEXT MixerContext) @@ -125,7 +124,6 @@ MMixerFreeMixerInfo( MixerContext->Free((PVOID)MixerInfo); } - LPMIXER_DATA MMixerGetMixerDataByDeviceHandle( IN PMIXER_CONTEXT MixerContext, @@ -156,7 +154,6 @@ MMixerGetMixerDataByDeviceHandle( return NULL; } - LPMIXER_INFO MMixerGetMixerInfoByIndex( IN PMIXER_CONTEXT MixerContext, diff --git a/sdk/lib/drivers/sound/mmixer/topology.c b/sdk/lib/drivers/sound/mmixer/topology.c index 136dc61dee1..29b1237436b 100644 --- a/sdk/lib/drivers/sound/mmixer/topology.c +++ b/sdk/lib/drivers/sound/mmixer/topology.c @@ -8,7 +8,7 @@ #include "precomp.h" -#define YDEBUG +// #define NDEBUG #include <debug.h> VOID @@ -37,11 +37,8 @@ MMixerPrintTopology( Topology->TopologyNodes[Index].NodeConnectedFromCount, Topology->TopologyNodes[Index].NodeConnectedToCount, Topology->TopologyNodes[Index].Visited, Topology->TopologyNodes[Index].PinConnectedFromCount, Topology->TopologyNodes[Index].PinConnectedToCount); } - - } - MIXER_STATUS MMixerAllocateTopology( IN PMIXER_CONTEXT MixerContext, @@ -708,7 +705,6 @@ MMixerGetNodeIndexFromGuid( return MAXULONG; } - VOID MMixerGetAllUpOrDownstreamPinsFromNodeIndex( IN PMIXER_CONTEXT MixerContext, @@ -848,7 +844,6 @@ MMixerGetAllUpOrDownstreamPinsFromPinIndex( TopologyPinsCount = Pin->PinConnectedToCount; } - /* reset visited status */ MMixerResetTopologyVisitStatus(Topology); @@ -906,7 +901,6 @@ MMixerGetAllUpOrDownstreamNodesFromPinIndex( TopologyNodesCount = Pin->NodesConnectedToCount; } - /* reset visited status */ MMixerResetTopologyVisitStatus(Topology); @@ -924,7 +918,6 @@ MMixerGetAllUpOrDownstreamNodesFromPinIndex( } } - VOID MMixerGetNextNodesFromPinIndex( IN PMIXER_CONTEXT MixerContext, @@ -1248,7 +1241,6 @@ MMixerIsTopologyNodeReserved( *bReserved = Topology->TopologyNodes[NodeIndex].Reserved; } - MIXER_STATUS MMixerCreateTopology( IN PMIXER_CONTEXT MixerContext, diff --git a/sdk/lib/drivers/sound/mmixer/wave.c b/sdk/lib/drivers/sound/mmixer/wave.c index 6326e3227d7..e049ca485bd 100644 --- a/sdk/lib/drivers/sound/mmixer/wave.c +++ b/sdk/lib/drivers/sound/mmixer/wave.c @@ -8,7 +8,7 @@ #include "precomp.h" -#define YDEBUG +// #define NDEBUG #include <debug.h> const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; @@ -111,9 +111,6 @@ MMixerGetWaveInfoByIndexAndType( return MM_STATUS_INVALID_PARAMETER; } - - - VOID MMixerInitializeDataFormat( IN PKSDATAFORMAT_WAVEFORMATEX DataFormat, @@ -137,7 +134,6 @@ MMixerInitializeDataFormat( DataFormat->DataFormat.SampleSize = 4; } - MIXER_STATUS MMixerGetAudioPinDataRanges( IN PMIXER_CONTEXT MixerContext, @@ -307,7 +303,6 @@ MMixerCheckFormat( /* check if pin supports the sample rate in 16-Bit Mono */ Result |= TestRange[Index].Bit16Mono; - if (DataRangeAudio->MaximumChannels > 1) { /* check if pin supports the sample rate in 16-Bit Stereo */ @@ -317,7 +312,6 @@ MMixerCheckFormat( } } - if (bInput) WaveInfo->u.InCaps.dwFormats = Result; else

1 year, 2 months

[reactos] 01/01: [MSPAINT] Delete needless ImageModel::ResetToPrevious

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d7aaaade0a4735165e83… commit 6d7aaaade0a4735165e8307d0d7dec3eaedf8156 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 31 11:13:54 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Oct 31 11:13:54 2023 +0900 [MSPAINT] Delete needless ImageModel::ResetToPrevious CORE-19094 --- base/applications/mspaint/history.cpp | 12 ------------ base/applications/mspaint/history.h | 1 - 2 files changed, 13 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 283b5f0c083..22aaf6835f4 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -89,18 +89,6 @@ void ImageModel::Redo() NotifyImageChanged(); } -void ImageModel::ResetToPrevious() -{ - ATLTRACE("%s: %d\n", __FUNCTION__, m_currInd); - - // Revert current item with previous item - ::DeleteObject(m_hBms[m_currInd]); - m_hBms[m_currInd] = CopyDIBImage(m_hBms[(m_currInd + HISTORYSIZE - 1) % HISTORYSIZE]); - ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); - - NotifyImageChanged(); -} - void ImageModel::ClearHistory() { for (int i = 0; i < HISTORYSIZE; ++i) diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 093dd1c34dd..716db560a8e 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -21,7 +21,6 @@ public: BOOL CanRedo() const { return m_redoSteps > 0; } void PushImageForUndo(); void PushImageForUndo(HBITMAP hbm); - void ResetToPrevious(void); void Undo(BOOL bClearRedo = FALSE); void Redo(void); void ClearHistory(void);

1 year, 2 months

[reactos] 01/01: [NTUSER] Disable SC_MOVE if WS_MAXIMIZE or WS_MINIMIZE (#5855)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad12c6cdea05e2164396e… commit ad12c6cdea05e2164396e3794e9bee7b821cc709 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 31 06:50:00 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 31 06:50:00 2023 +0900 [NTUSER] Disable SC_MOVE if WS_MAXIMIZE or WS_MINIMIZE (#5855) Based on KRosUser's scmove.patch. - Check also WS_MINIMIZE window style to determine to disable SC_MOVE system command. CORE-19272 --- win32ss/user/ntuser/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 6b2f242cc25..a5273ea2096 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -1366,7 +1366,7 @@ void FASTCALL MENU_InitSysMenuPopup(PMENU menu, DWORD style, DWORD clsStyle, LON gray = !(style & WS_THICKFRAME) || (style & (WS_MAXIMIZE | WS_MINIMIZE)); IntEnableMenuItem( menu, SC_SIZE, (gray ? MF_GRAYED : MF_ENABLED) ); - gray = ((style & WS_MAXIMIZE) != 0); + gray = ((style & (WS_MAXIMIZE | WS_MINIMIZE)) != 0); IntEnableMenuItem( menu, SC_MOVE, (gray ? MF_GRAYED : MF_ENABLED) ); gray = !(style & WS_MINIMIZEBOX) || (style & WS_MINIMIZE); IntEnableMenuItem( menu, SC_MINIMIZE, (gray ? MF_GRAYED : MF_ENABLED) );

1 year, 2 months

[reactos] 01/01: [SHELL32] Improve file properties dialog (#5852)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00f192fa94068d9ad3ce8… commit 00f192fa94068d9ad3ce8397864850a04227bea1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 30 15:34:03 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 30 15:34:03 2023 +0900 [SHELL32] Improve file properties dialog (#5852) Based on KRosUser's patches. - Add missing version strings "Comments" and "LegalTrademarks". - Add version strings "PrivateBuild" and "SpecialBuild" if necessary. - Trim the version string for pretty display. CORE-19270, CORE-19114, CORE-19275 --- dll/win32/shell32/dialogs/filedefext.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/dialogs/filedefext.cpp b/dll/win32/shell32/dialogs/filedefext.cpp index d9f0c0e6aee..03890b20a83 100644 --- a/dll/win32/shell32/dialogs/filedefext.cpp +++ b/dll/win32/shell32/dialogs/filedefext.cpp @@ -852,6 +852,14 @@ CFileDefExt::InitVersionPage(HWND hwndDlg) AddVersionString(hwndDlg, L"OriginalFilename"); AddVersionString(hwndDlg, L"FileVersion"); AddVersionString(hwndDlg, L"ProductVersion"); + AddVersionString(hwndDlg, L"Comments"); + AddVersionString(hwndDlg, L"LegalTrademarks"); + + if (pInfo && (pInfo->dwFileFlags & VS_FF_PRIVATEBUILD)) + AddVersionString(hwndDlg, L"PrivateBuild"); + + if (pInfo && (pInfo->dwFileFlags & VS_FF_SPECIALBUILD)) + AddVersionString(hwndDlg, L"SpecialBuild"); /* Attach file version to dialog window */ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)this); @@ -957,8 +965,11 @@ CFileDefExt::VersionPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar if (pwszData == NULL) break; - TRACE("hDlgCtrl %x string %s\n", hDlgCtrl, debugstr_w(pwszData)); - SetDlgItemTextW(hwndDlg, 14010, pwszData); + CString str(pwszData); + str.Trim(); + + TRACE("hDlgCtrl %x string %s\n", hDlgCtrl, debugstr_w(str)); + SetDlgItemTextW(hwndDlg, 14010, str); return TRUE; }

1 year, 2 months

[reactos] 01/01: [KBSWITCH] Update layout list on WM_NOTIFYICONMSG

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87f94aa10ca4b0c47469d… commit 87f94aa10ca4b0c47469de280419d2aa28a5c54e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 30 10:40:27 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Oct 30 10:40:27 2023 +0900 [KBSWITCH] Update layout list on WM_NOTIFYICONMSG The layout list was not updated correctly. CORE-10667 --- base/applications/kbswitch/kbswitch.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index bc9e698774a..72b517384a7 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -145,16 +145,9 @@ static VOID UpdateLayoutList(HKL hKL OPTIONAL) if (!hKL) { - if (0 <= (g_nCurrentLayoutNum - 1) && (g_nCurrentLayoutNum - 1) < g_cKLs) - { - hKL = g_ahKLs[g_nCurrentLayoutNum - 1]; - } - else - { - HWND hwndTarget = (g_hwndLastActive ? g_hwndLastActive : GetForegroundWindow()); - DWORD dwTID = GetWindowThreadProcessId(hwndTarget, NULL); - hKL = GetKeyboardLayout(dwTID); - } + HWND hwndTarget = (g_hwndLastActive ? g_hwndLastActive : GetForegroundWindow()); + DWORD dwTID = GetWindowThreadProcessId(hwndTarget, NULL); + hKL = GetKeyboardLayout(dwTID); } g_cKLs = GetKeyboardLayoutList(ARRAYSIZE(g_ahKLs), g_ahKLs); @@ -737,6 +730,8 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) case WM_RBUTTONUP: case WM_LBUTTONUP: { + UpdateLayoutList(NULL); + GetCursorPos(&pt); SetForegroundWindow(hwnd);

1 year, 2 months

[reactos] 01/01: [MSPAINT] Fix ImageModel::PushImageForUndo bug

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aed376e00f65c496524f2… commit aed376e00f65c496524f2e413ba2f1182b730361 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 30 07:41:57 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Oct 30 07:41:57 2023 +0900 [MSPAINT] Fix ImageModel::PushImageForUndo bug CORE-19274 --- base/applications/mspaint/history.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 003d0ab5877..283b5f0c083 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -119,7 +119,7 @@ void ImageModel::ClearHistory() void ImageModel::PushImageForUndo() { HBITMAP hbm = CopyBitmap(); - if (hbm) + if (hbm == NULL) { ShowOutOfMemory(); return;

1 year, 2 months

[reactos] 03/03: [SHLWAPI_APITEST] Fix MSVC compilation warning C4309

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bdae8cf96695fe1e7302d… commit bdae8cf96695fe1e7302da46227052d0faf822ef Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Oct 28 18:17:46 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 28 18:19:04 2023 +0200 [SHLWAPI_APITEST] Fix MSVC compilation warning C4309 SHPropertyBag.cpp(161): warning C4309: 'initializing': truncation of constant value See https://stackoverflow.com/questions/33333448/warning-c4309-what-does-it-mea… for some details. --- modules/rostests/apitests/shlwapi/SHPropertyBag.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp index c155693e214..b767d4a4e6d 100644 --- a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp +++ b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp @@ -158,7 +158,7 @@ static void SHPropertyBag_ReadTest(void) HRESULT hr; CDummyPropertyBag dummy; BOOL bValue = 0xDEADFACE; - SHORT sValue = 0xDEAD; + SHORT sValue = 0xDEADu; LONG lValue = 0xDEADDEAD; DWORD dwValue = 0xFEEDF00D; BSTR bstr = NULL;

1 year, 2 months

[reactos] 02/03: [BROWSEUI] Some parenthesizing clarification around "xxx & YYY" expressions in conditionals

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46ab34662df606861b5fa… commit 46ab34662df606861b5fa8d730b19cc67b0f2920 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Oct 28 17:56:55 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 28 17:56:55 2023 +0200 [BROWSEUI] Some parenthesizing clarification around "xxx & YYY" expressions in conditionals --- dll/win32/browseui/desktopipc.cpp | 2 +- dll/win32/browseui/explorerband.cpp | 2 +- dll/win32/browseui/internettoolbar.cpp | 8 ++++---- dll/win32/browseui/shellbars/CBandSite.cpp | 10 +++++----- dll/win32/browseui/shellbrowser.cpp | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dll/win32/browseui/desktopipc.cpp b/dll/win32/browseui/desktopipc.cpp index 1e7cc68af6e..d8e11d9d65e 100644 --- a/dll/win32/browseui/desktopipc.cpp +++ b/dll/win32/browseui/desktopipc.cpp @@ -353,7 +353,7 @@ static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters) /* Handle /e parameter */ UINT wFlags = 0; - if ((parameters->dwFlags & SH_EXPLORER_CMDLINE_FLAG_E)) + if (parameters->dwFlags & SH_EXPLORER_CMDLINE_FLAG_E) wFlags |= SBSP_EXPLOREMODE; /* Handle /select parameter */ diff --git a/dll/win32/browseui/explorerband.cpp b/dll/win32/browseui/explorerband.cpp index 5dd2614bb54..5c90d5d9dd7 100644 --- a/dll/win32/browseui/explorerband.cpp +++ b/dll/win32/browseui/explorerband.cpp @@ -566,7 +566,7 @@ HTREEITEM CExplorerBand::InsertItem(HTREEITEM hParent, IShellFolder *psfParent, return NULL; /* Ignore streams */ - if ((attrs & SFGAO_STREAM)) + if (attrs & SFGAO_STREAM) { TRACE("Ignoring stream\n"); return NULL; diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index 226a637bc4f..697eb3936a7 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -250,11 +250,11 @@ HRESULT CDockSite::GetRBBandInfo(REBARBANDINFOW &bandInfo) bandInfo.fStyle |= RBBS_BREAK; if (fDeskBandInfo.dwModeFlags & DBIMF_TOPALIGN) bandInfo.fStyle |= RBBS_TOPALIGN; - if (fFlags & ITF_NOGRIPPER || fToolbar->pSettings->fLocked) + if ((fFlags & ITF_NOGRIPPER) || fToolbar->pSettings->fLocked) bandInfo.fStyle |= RBBS_NOGRIPPER; if (fFlags & ITF_NOTITLE) bandInfo.fStyle |= RBBS_HIDETITLE; - if (fFlags & ITF_GRIPPERALWAYS && !fToolbar->pSettings->fLocked) + if ((fFlags & ITF_GRIPPERALWAYS) && !fToolbar->pSettings->fLocked) bandInfo.fStyle |= RBBS_GRIPPERALWAYS; if (fFlags & ITF_FIXEDSIZE) bandInfo.fStyle |= RBBS_FIXEDSIZE; @@ -736,9 +736,9 @@ void CInternetToolbar::RefreshLockedToolbarState() if (dockSite != NULL) { rebarBandInfo.fStyle &= ~(RBBS_NOGRIPPER | RBBS_GRIPPERALWAYS); - if (dockSite->fFlags & CDockSite::ITF_NOGRIPPER || pSettings->fLocked) + if ((dockSite->fFlags & CDockSite::ITF_NOGRIPPER) || pSettings->fLocked) rebarBandInfo.fStyle |= RBBS_NOGRIPPER; - if (dockSite->fFlags & CDockSite::ITF_GRIPPERALWAYS && !pSettings->fLocked) + if ((dockSite->fFlags & CDockSite::ITF_GRIPPERALWAYS) && !pSettings->fLocked) rebarBandInfo.fStyle |= RBBS_GRIPPERALWAYS; SendMessage(fMainReBar, RB_SETBANDINFOW, x, (LPARAM)&rebarBandInfo); } diff --git a/dll/win32/browseui/shellbars/CBandSite.cpp b/dll/win32/browseui/shellbars/CBandSite.cpp index 09844fd48f2..632543284c1 100644 --- a/dll/win32/browseui/shellbars/CBandSite.cpp +++ b/dll/win32/browseui/shellbars/CBandSite.cpp @@ -154,7 +154,7 @@ VOID CBandSiteBase::_BuildBandInfo(struct BandObject *Band, REBARBANDINFOW *prbi prbi->fStyle |= RBBS_GRIPPERALWAYS; } - if (Band->bHiddenTitle || (m_dwStyle & BSIS_NOCAPTION)) + if (Band->bHiddenTitle || (m_dwStyle & BSIS_NOCAPTION)) { prbi->fMask |= RBBIM_STYLE; prbi->fStyle |= RBBS_HIDETITLE; @@ -680,9 +680,9 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::SetBandSiteInfo(const BANDSITEINFO *pbs if (!pbsinfo) return E_INVALIDARG; - if ((pbsinfo->dwMask & BSIM_STATE)) + if (pbsinfo->dwMask & BSIM_STATE) m_dwState = pbsinfo->dwState; - if ((pbsinfo->dwMask & BSIM_STYLE)) + if (pbsinfo->dwMask & BSIM_STYLE) m_dwStyle = pbsinfo->dwStyle; _UpdateAllBands(); @@ -694,9 +694,9 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::GetBandSiteInfo(BANDSITEINFO *pbsinfo) if (!pbsinfo) return E_INVALIDARG; - if ((pbsinfo->dwMask & BSIM_STATE)) + if (pbsinfo->dwMask & BSIM_STATE) pbsinfo->dwState = m_dwState; - if ((pbsinfo->dwMask & BSIM_STYLE)) + if (pbsinfo->dwMask & BSIM_STYLE) pbsinfo->dwStyle = m_dwStyle; return S_OK; diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 114d6c59553..d24c203c915 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -328,7 +328,7 @@ public: FOLDERSETTINGS *folderSettings, long flags); HRESULT GetMenuBand(REFIID riid, void **shellMenu); HRESULT GetBaseBar(bool vertical, REFIID riid, void **theBaseBar); - BOOL IsBandLoaded(const CLSID clsidBand, bool verticali, DWORD *pdwBandID); + BOOL IsBandLoaded(const CLSID clsidBand, bool vertical, DWORD *pdwBandID); HRESULT ShowBand(const CLSID &classID, bool vertical); HRESULT NavigateToParent(); HRESULT DoFolderOptions();

1 year, 2 months

[reactos] 01/03: [BROWSEUI] Fix MSVC compilation warning C4805

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64f40e7f309a9e4974468… commit 64f40e7f309a9e497446846cc18c73633c5d7e0b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Oct 28 17:50:26 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 28 17:50:26 2023 +0200 [BROWSEUI] Fix MSVC compilation warning C4805 internettoolbar.cpp(714): warning C4805: '!=': unsafe mix of type 'bool' and type 'BOOL' in operation --- dll/win32/browseui/internettoolbar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index b9d3b6273b7..226a637bc4f 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -711,9 +711,9 @@ HRESULT CInternetToolbar::CreateMenuBar(IShellMenu **pMenuBar) HRESULT CInternetToolbar::LockUnlockToolbars(bool locked) { - if (locked != pSettings->fLocked) + if (locked != !!pSettings->fLocked) { - pSettings->fLocked = locked; + pSettings->fLocked = (BOOL)locked; pSettings->Save(); RefreshLockedToolbarState(); }

1 year, 2 months

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