Ros-diffs February 2023

ros-diffs@reactos.org

16 participants
97 discussions

[reactos] 01/01: [SHELL32][SHELL32_APITEST] Improve CommandLineToArgvW (#5055)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=324cda08358d2e2493f7e… commit 324cda08358d2e2493f7e8f097346e88b3ccd86a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 14 20:53:48 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Feb 14 20:53:48 2023 +0900 [SHELL32][SHELL32_APITEST] Improve CommandLineToArgvW (#5055) This PR will reduce the failures of CommandLineToArgvW testcase of shell32_apitest. - Use isspace and isblank in shell32!CommandLineToArgvW. - Strengthen shell32_apitest:CommandLineToArgvW testcase. CORE-17787 --- dll/win32/shell32/wine/shell32_main.c | 17 ++++++----- .../apitests/shell32/CommandLineToArgvW.cpp | 35 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c index 58e114e09e1..3ab985c0740 100644 --- a/dll/win32/shell32/wine/shell32_main.c +++ b/dll/win32/shell32/wine/shell32_main.c @@ -134,11 +134,11 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) else { /* The executable path ends at the next space, no matter what */ - while (*s && *s!=' ' && *s!='\t') + while (*s && !isspace(*s)) s++; } /* skip to the first argument, if any */ - while (*s==' ' || *s=='\t') + while (isblank(*s)) s++; if (*s) argc++; @@ -147,10 +147,10 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) qcount=bcount=0; while (*s) { - if ((*s==' ' || *s=='\t') && qcount==0) + if (isblank(*s) && qcount==0) { /* skip to the next argument and count it if any */ - while (*s==' ' || *s=='\t') + while (isblank(*s)) s++; if (*s) argc++; @@ -218,7 +218,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) else { /* The executable path ends at the next space, no matter what */ - while (*d && *d!=' ' && *d!='\t') + while (*d && !isspace(*d)) d++; s=d; if (*s) @@ -227,8 +227,9 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) /* close the executable path */ *d++=0; /* skip to the first argument and initialize it if any */ - while (*s==' ' || *s=='\t') + while (isblank(*s)) s++; + if (!*s) { /* There are no parameters so we are all done */ @@ -242,7 +243,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) qcount=bcount=0; while (*s) { - if ((*s==' ' || *s=='\t') && qcount==0) + if (isblank(*s) && qcount==0) { /* close the argument */ *d++=0; @@ -251,7 +252,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) /* skip to the next one and initialize it if any */ do { s++; - } while (*s==' ' || *s=='\t'); + } while (isblank(*s)); if (*s) argv[argc++]=d; } diff --git a/modules/rostests/apitests/shell32/CommandLineToArgvW.cpp b/modules/rostests/apitests/shell32/CommandLineToArgvW.cpp index 03495b602e9..72d91caae59 100644 --- a/modules/rostests/apitests/shell32/CommandLineToArgvW.cpp +++ b/modules/rostests/apitests/shell32/CommandLineToArgvW.cpp @@ -45,15 +45,50 @@ START_TEST(CommandLineToArgvW) DoEntry(__LINE__, L"test.exe\t", 1); DoEntry(__LINE__, L"test.exe\r", 1); DoEntry(__LINE__, L"test.exe\n", 1); + DoEntry(__LINE__, L"test.exe\v", 1); + DoEntry(__LINE__, L"test.exe\f", 1); + DoEntry(__LINE__, L"test.exe\u3000", 1); DoEntry(__LINE__, L"\"This is a test.exe\"", 1); DoEntry(__LINE__, L"\"This is a test.exe\" ", 1); DoEntry(__LINE__, L"\"This is a test.exe\"\t", 1); DoEntry(__LINE__, L"\"This is a test.exe\"\r", 2, L"\r"); DoEntry(__LINE__, L"\"This is a test.exe\"\n", 2, L"\n"); + DoEntry(__LINE__, L"\"This is a test.exe\"\v", 2, L"\v"); + DoEntry(__LINE__, L"\"This is a test.exe\"\f", 2, L"\f"); + DoEntry(__LINE__, L"\"This is a test.exe\"\u3000", 2, L"\u3000"); DoEntry(__LINE__, L"test.exe a", 2, L"a"); DoEntry(__LINE__, L"test.exe\ta", 2, L"a"); DoEntry(__LINE__, L"test.exe\ra", 2, L"a"); DoEntry(__LINE__, L"test.exe\na", 2, L"a"); + DoEntry(__LINE__, L"test.exe\va", 2, L"a"); + DoEntry(__LINE__, L"test.exe\fa", 2, L"a"); + DoEntry(__LINE__, L"test.exe\u3000" L"a", 1); + DoEntry(__LINE__, L"test.exe a", 2, L"a"); + DoEntry(__LINE__, L"test.exe \ta", 2, L"a"); + DoEntry(__LINE__, L"test.exe \ra", 2, L"\ra"); + DoEntry(__LINE__, L"test.exe \na", 2, L"\na"); + DoEntry(__LINE__, L"test.exe \va", 2, L"\va"); + DoEntry(__LINE__, L"test.exe \fa", 2, L"\fa"); + DoEntry(__LINE__, L"test.exe a ", 2, L"a"); + DoEntry(__LINE__, L"test.exe a\t", 2, L"a"); + DoEntry(__LINE__, L"test.exe a\r", 2, L"a\r"); + DoEntry(__LINE__, L"test.exe a\n", 2, L"a\n"); + DoEntry(__LINE__, L"test.exe a\v", 2, L"a\v"); + DoEntry(__LINE__, L"test.exe a\f", 2, L"a\f"); + DoEntry(__LINE__, L"test.exe \"a\" ", 2, L"a"); + DoEntry(__LINE__, L"test.exe \"a\"\t", 2, L"a"); + DoEntry(__LINE__, L"test.exe \"a\"\r", 2, L"a\r"); + DoEntry(__LINE__, L"test.exe \"a\"\n", 2, L"a\n"); + DoEntry(__LINE__, L"test.exe \"a\"\v", 2, L"a\v"); + DoEntry(__LINE__, L"test.exe \"a\"\f", 2, L"a\f"); + DoEntry(__LINE__, L"test.exe \u3000" L"a", 2, L"\u3000" L"a"); + DoEntry(__LINE__, L"test.exe \"a b\"", 2, L"a b"); + DoEntry(__LINE__, L"test.exe \"a\tb\"", 2, L"a\tb"); + DoEntry(__LINE__, L"test.exe \"a\rb\"", 2, L"a\rb"); + DoEntry(__LINE__, L"test.exe \"a\nb\"", 2, L"a\nb"); + DoEntry(__LINE__, L"test.exe \"a\vb\"", 2, L"a\vb"); + DoEntry(__LINE__, L"test.exe \"a\fb\"", 2, L"a\fb"); + DoEntry(__LINE__, L"test.exe \"a\u3000" L"b\"", 2, L"a\u3000" L"b"); DoEntry(__LINE__, L"test.exe a b c", 4, L"a", L"b", L"c"); DoEntry(__LINE__, L"test.exe a b \"c", 4, L"a", L"b", L"c"); DoEntry(__LINE__, L"test.exe \"a b\" \"c d\"", 3, L"a b", L"c d");

1 year, 10 months

[reactos] 01/01: [NOTEPAD] Optimize AnalyzeEncoding

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=647b67c1acf5d86450a71… commit 647b67c1acf5d86450a71777e5092bdaf0aeccd8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 14 13:34:20 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Feb 14 13:34:20 2023 +0900 [NOTEPAD] Optimize AnalyzeEncoding CORE-14641 --- base/applications/notepad/text.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/base/applications/notepad/text.c b/base/applications/notepad/text.c index f74fd01abd2..7f0511229a1 100644 --- a/base/applications/notepad/text.c +++ b/base/applications/notepad/text.c @@ -39,7 +39,7 @@ BOOL IsTextNonZeroASCII(const void *pText, DWORD dwSize) ENCODING AnalyzeEncoding(const char *pBytes, DWORD dwSize) { - INT flags = IS_TEXT_UNICODE_STATISTICS; + INT flags = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS; if (dwSize <= 1 || IsTextNonZeroASCII(pBytes, dwSize)) return ENCODING_ANSI; @@ -47,8 +47,6 @@ ENCODING AnalyzeEncoding(const char *pBytes, DWORD dwSize) if (IsTextUnicode(pBytes, dwSize, &flags)) return ENCODING_UTF16LE; - flags = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS; - IsTextUnicode(pBytes, dwSize, &flags); if (((flags & IS_TEXT_UNICODE_REVERSE_MASK) == IS_TEXT_UNICODE_REVERSE_STATISTICS)) return ENCODING_UTF16BE;

1 year, 10 months

[reactos] 01/01: [NOTEPAD] Follow-up of d3da0cb; *pBytes should be unsigned

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=361e0c72b8a2b69851459… commit 361e0c72b8a2b69851459cfa872040a79e4a9dcb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 14 13:25:44 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Feb 14 13:25:44 2023 +0900 [NOTEPAD] Follow-up of d3da0cb; *pBytes should be unsigned CORE-14641 --- base/applications/notepad/text.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/applications/notepad/text.c b/base/applications/notepad/text.c index 86b0fa78c37..f74fd01abd2 100644 --- a/base/applications/notepad/text.c +++ b/base/applications/notepad/text.c @@ -167,7 +167,7 @@ ProcessNewLinesAndNulls(HLOCAL *phLocal, LPWSTR *ppszText, SIZE_T *pcchText, EOL BOOL ReadText(HANDLE hFile, HLOCAL *phLocal, ENCODING *pencFile, EOLN *piEoln) { - PCHAR pBytes = NULL; + LPBYTE pBytes = NULL; LPWSTR pszText, pszNewText = NULL; DWORD dwSize, dwPos; SIZE_T i, cchText, cbContent; @@ -224,7 +224,7 @@ ReadText(HANDLE hFile, HLOCAL *phLocal, ENCODING *pencFile, EOLN *piEoln) } else { - encFile = AnalyzeEncoding((const char *)pBytes, dwSize); + encFile = AnalyzeEncoding((LPCSTR)pBytes, dwSize); } switch(encFile) @@ -267,7 +267,7 @@ ReadText(HANDLE hFile, HLOCAL *phLocal, ENCODING *pencFile, EOLN *piEoln) cchText = 0; if (cbContent > 0) { - cchText = MultiByteToWideChar(iCodePage, 0, &pBytes[dwPos], (INT)cbContent, NULL, 0); + cchText = MultiByteToWideChar(iCodePage, 0, (LPCSTR)&pBytes[dwPos], (INT)cbContent, NULL, 0); if (cchText == 0) goto done; } @@ -282,8 +282,8 @@ ReadText(HANDLE hFile, HLOCAL *phLocal, ENCODING *pencFile, EOLN *piEoln) /* Do ANSI-to-Wide conversion */ if (cbContent > 0) { - if (!MultiByteToWideChar(iCodePage, 0, - &pBytes[dwPos], (INT)cbContent, pszNewText, (INT)cchText)) + if (!MultiByteToWideChar(iCodePage, 0, (LPCSTR)&pBytes[dwPos], (INT)cbContent, + pszNewText, (INT)cchText)) { goto done; }

1 year, 10 months

[reactos] 01/01: [NOTEPAD] Follow-up of #5012 (0a851ea); Fix encoding

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3da0cb7edf37448b74d7… commit d3da0cb7edf37448b74d7ef4cf3af18689ec3ff4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 14 13:12:47 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Feb 14 13:12:47 2023 +0900 [NOTEPAD] Follow-up of #5012 (0a851ea); Fix encoding There was a bug in encoding analyzer. CORE-14641 --- base/applications/notepad/text.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/base/applications/notepad/text.c b/base/applications/notepad/text.c index 0025ddf9dac..86b0fa78c37 100644 --- a/base/applications/notepad/text.c +++ b/base/applications/notepad/text.c @@ -39,7 +39,7 @@ BOOL IsTextNonZeroASCII(const void *pText, DWORD dwSize) ENCODING AnalyzeEncoding(const char *pBytes, DWORD dwSize) { - INT flags = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS; + INT flags = IS_TEXT_UNICODE_STATISTICS; if (dwSize <= 1 || IsTextNonZeroASCII(pBytes, dwSize)) return ENCODING_ANSI; @@ -47,7 +47,9 @@ ENCODING AnalyzeEncoding(const char *pBytes, DWORD dwSize) if (IsTextUnicode(pBytes, dwSize, &flags)) return ENCODING_UTF16LE; - if ((flags & IS_TEXT_UNICODE_REVERSE_MASK) && !(flags & IS_TEXT_UNICODE_ILLEGAL_CHARS)) + flags = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS; + IsTextUnicode(pBytes, dwSize, &flags); + if (((flags & IS_TEXT_UNICODE_REVERSE_MASK) == IS_TEXT_UNICODE_REVERSE_STATISTICS)) return ENCODING_UTF16BE; /* is it UTF-8? */

1 year, 10 months

[reactos] 01/01: [NTUSER] Add 'Win:' comments to co_UserHideCaret and co_UserShowCaret

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7014f63057daf4a428110… commit 7014f63057daf4a428110fa238c063370396aac7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 14 10:57:25 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Feb 14 10:57:25 2023 +0900 [NTUSER] Add 'Win:' comments to co_UserHideCaret and co_UserShowCaret CORE-11700 --- win32ss/user/ntuser/caret.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win32ss/user/ntuser/caret.c b/win32ss/user/ntuser/caret.c index 52ebb1bdb22..a4e4afc1acb 100644 --- a/win32ss/user/ntuser/caret.c +++ b/win32ss/user/ntuser/caret.c @@ -222,6 +222,7 @@ co_IntSetCaretPos(int X, int Y) return FALSE; } +/* Win: zzzHideCaret */ BOOL FASTCALL co_UserHideCaret(PWND Window OPTIONAL) { PTHREADINFO pti; @@ -257,6 +258,7 @@ BOOL FASTCALL co_UserHideCaret(PWND Window OPTIONAL) return TRUE; } +/* Win: zzzShowCaret */ BOOL FASTCALL co_UserShowCaret(PWND Window OPTIONAL) { PTHREADINFO pti;

1 year, 10 months

[reactos] 01/01: [NTUSER] Add 'Win:' comment to IntRealChildWindowFromPoint

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73c1a8d19f5159e14ab27… commit 73c1a8d19f5159e14ab27b0f29fff2d481578470 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 14 10:45:19 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Feb 14 10:45:19 2023 +0900 [NTUSER] Add 'Win:' comment to IntRealChildWindowFromPoint CORE-11700 --- win32ss/user/ntuser/winpos.c | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index d1f37c55bbe..ba4d451de93 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -2917,6 +2917,7 @@ co_WinPosWindowFromPoint( return Window; } +/* Win: _RealChildWindowFromPoint */ PWND FASTCALL IntRealChildWindowFromPoint(PWND Parent, LONG x, LONG y) {

1 year, 10 months

[reactos] 01/01: [NTUSER] Add 'Win:' comment to IntChildWindowFromPointEx

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83b8cb96f762b5601f636… commit 83b8cb96f762b5601f636cdc31b2f3f97cb1ec4e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 14 10:43:37 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Feb 14 10:43:37 2023 +0900 [NTUSER] Add 'Win:' comment to IntChildWindowFromPointEx CORE-11700 --- win32ss/user/ntuser/winpos.c | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 955ddd7ceca..d1f37c55bbe 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -2959,6 +2959,7 @@ IntRealChildWindowFromPoint(PWND Parent, LONG x, LONG y) return pwndHit ? pwndHit : Parent; } +/* Win: _ChildWindowFromPointEx */ PWND APIENTRY IntChildWindowFromPointEx(PWND Parent, LONG x, LONG y, UINT uiFlags) {

1 year, 10 months

[reactos] 01/01: [NTUSER] Add 'Win:' comment to IntDeferWindowPos

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=798d0352a066ce0fe539d… commit 798d0352a066ce0fe539d17e473ee42cff00a083 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 14 10:39:26 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Feb 14 10:39:26 2023 +0900 [NTUSER] Add 'Win:' comment to IntDeferWindowPos CORE-11700 --- win32ss/user/ntuser/winpos.c | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 516d9620b97..955ddd7ceca 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -3010,6 +3010,7 @@ IntChildWindowFromPointEx(PWND Parent, LONG x, LONG y, UINT uiFlags) return pwndHit ? pwndHit : Parent; } +/* Win: _DeferWindowPos(PSMWP, PWND, PWND, ...) */ HDWP FASTCALL IntDeferWindowPos( HDWP hdwp,

1 year, 10 months

[reactos] 01/01: [NTUSER] Add 'Win:' comment to IntEndDeferWindowPosEx

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9140300c2a924fdb957c6… commit 9140300c2a924fdb957c6c4a1d2603133163d4da Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 14 10:30:16 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Feb 14 10:30:22 2023 +0900 [NTUSER] Add 'Win:' comment to IntEndDeferWindowPosEx CORE-11700 --- win32ss/user/ntuser/winpos.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index f95da850077..516d9620b97 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -3100,7 +3100,8 @@ END: return retvalue; } -BOOL FASTCALL IntEndDeferWindowPosEx( HDWP hdwp, BOOL sAsync ) +/* Win: xxxEndDeferWindowPosEx */ +BOOL FASTCALL IntEndDeferWindowPosEx(HDWP hdwp, BOOL bAsync) { PSMWP pDWP; PCVR winpos; @@ -3130,7 +3131,7 @@ BOOL FASTCALL IntEndDeferWindowPosEx( HDWP hdwp, BOOL sAsync ) UserRefObjectCo(pwnd, &Ref); - if ( sAsync ) + if (bAsync) { LRESULT lRes; PWINDOWPOS ppos = ExAllocatePoolWithTag(PagedPool, sizeof(WINDOWPOS), USERTAG_SWP);

1 year, 10 months

[reactos] 01/01: [BROWSEUI] Fix crash while editing a label in the folder tree

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=460a01b167066f755e5ae… commit 460a01b167066f755e5ae06ac9fbd913f73065d2 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Feb 13 23:19:55 2023 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Feb 13 23:20:20 2023 +0100 [BROWSEUI] Fix crash while editing a label in the folder tree + Add a missing break CORE-18646 --- dll/win32/browseui/explorerband.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/browseui/explorerband.cpp b/dll/win32/browseui/explorerband.cpp index dcab4f4455b..5dd2614bb54 100644 --- a/dll/win32/browseui/explorerband.cpp +++ b/dll/win32/browseui/explorerband.cpp @@ -1218,10 +1218,8 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::HasFocusIO() HRESULT STDMETHODCALLTYPE CExplorerBand::TranslateAcceleratorIO(LPMSG lpMsg) { - if (m_isEditing) - return S_FALSE; - - if (lpMsg->hwnd == m_hWnd) + if (lpMsg->hwnd == m_hWnd || + (m_isEditing && IsChild(lpMsg->hwnd))) { TranslateMessage(lpMsg); DispatchMessage(lpMsg); @@ -1298,6 +1296,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM case TVN_BEGINDRAG: case TVN_BEGINRDRAG: OnTreeItemDragging((LPNMTREEVIEW)lParam, pNotifyHeader->code == TVN_BEGINRDRAG); + break; case TVN_BEGINLABELEDITW: { // TODO: put this in a function ? (mostly copypasta from CDefView) @@ -1317,9 +1316,10 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM return E_FAIL; hr = pParent->GetAttributesOf(1, &pChild, &dwAttr); - if (SUCCEEDED(hr) && (dwAttr & SFGAO_CANRENAME) && theResult) + if (SUCCEEDED(hr) && (dwAttr & SFGAO_CANRENAME)) { - *theResult = 0; + if (theResult) + *theResult = 0; m_isEditing = TRUE; } return S_OK;

1 year, 10 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2023