Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [RICHED20_WINETEST] Restore Wine sync in txtsrv.c. ROSTESTS-355
by Thomas Faber 10 Oct '21

10 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a9535e694b6baaa4b028… commit 5a9535e694b6baaa4b028523263a39357d6d589b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Oct 9 20:18:43 2021 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Oct 9 20:44:26 2021 -0400 [RICHED20_WINETEST] Restore Wine sync in txtsrv.c. ROSTESTS-355 In particular, add the missed diff in ITextHostImpl_TxGetCharFormat. --- modules/rostests/winetests/riched20/txtsrv.c | 139 ++++++++++----------------- 1 file changed, 52 insertions(+), 87 deletions(-) diff --git a/modules/rostests/winetests/riched20/txtsrv.c b/modules/rostests/winetests/riched20/txtsrv.c index 5a59c871815..0ef617b18d2 100644 --- a/modules/rostests/winetests/riched20/txtsrv.c +++ b/modules/rostests/winetests/riched20/txtsrv.c @@ -129,24 +129,25 @@ static ULONG WINAPI ITextHostImpl_Release(ITextHost *iface) } } -static HDC WINAPI ITextHostImpl_TxGetDC(ITextHost *iface) +#ifdef __REACTOS__ +#define __thiscall WINAPI +#endif /* __REACTOS__ */ + +static HDC __thiscall ITextHostImpl_TxGetDC(ITextHost *iface) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetDC(%p)\n", This); return NULL; } -static INT WINAPI ITextHostImpl_TxReleaseDC(ITextHost *iface, - HDC hdc) +static INT __thiscall ITextHostImpl_TxReleaseDC(ITextHost *iface, HDC hdc) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxReleaseDC(%p)\n", This); return 0; } -static BOOL WINAPI ITextHostImpl_TxShowScrollBar(ITextHost *iface, - INT fnBar, - BOOL fShow) +static BOOL __thiscall ITextHostImpl_TxShowScrollBar(ITextHost *iface, INT fnBar, BOOL fShow) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxShowScrollBar(%p, fnBar=%d, fShow=%d)\n", @@ -154,9 +155,7 @@ static BOOL WINAPI ITextHostImpl_TxShowScrollBar(ITextHost *iface, return FALSE; } -static BOOL WINAPI ITextHostImpl_TxEnableScrollBar(ITextHost *iface, - INT fuSBFlags, - INT fuArrowflags) +static BOOL __thiscall ITextHostImpl_TxEnableScrollBar(ITextHost *iface, INT fuSBFlags, INT fuArrowflags) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxEnableScrollBar(%p, fuSBFlags=%d, fuArrowflags=%d)\n", @@ -164,11 +163,8 @@ static BOOL WINAPI ITextHostImpl_TxEnableScrollBar(ITextHost *iface, return FALSE; } -static BOOL WINAPI ITextHostImpl_TxSetScrollRange(ITextHost *iface, - INT fnBar, - LONG nMinPos, - INT nMaxPos, - BOOL fRedraw) +static BOOL __thiscall ITextHostImpl_TxSetScrollRange(ITextHost *iface, INT fnBar, LONG nMinPos, + INT nMaxPos, BOOL fRedraw) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxSetScrollRange(%p, fnBar=%d, nMinPos=%d, nMaxPos=%d, fRedraw=%d)\n", @@ -176,10 +172,7 @@ static BOOL WINAPI ITextHostImpl_TxSetScrollRange(ITextHost *iface, return FALSE; } -static BOOL WINAPI ITextHostImpl_TxSetScrollPos(ITextHost *iface, - INT fnBar, - INT nPos, - BOOL fRedraw) +static BOOL __thiscall ITextHostImpl_TxSetScrollPos(ITextHost *iface, INT fnBar, INT nPos, BOOL fRedraw) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxSetScrollPos(%p, fnBar=%d, nPos=%d, fRedraw=%d)\n", @@ -187,25 +180,21 @@ static BOOL WINAPI ITextHostImpl_TxSetScrollPos(ITextHost *iface, return FALSE; } -static void WINAPI ITextHostImpl_TxInvalidateRect(ITextHost *iface, - LPCRECT prc, - BOOL fMode) +static void __thiscall ITextHostImpl_TxInvalidateRect(ITextHost *iface, LPCRECT prc, BOOL fMode) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxInvalidateRect(%p, prc=%p, fMode=%d)\n", This, prc, fMode); } -static void WINAPI ITextHostImpl_TxViewChange(ITextHost *iface, BOOL fUpdate) +static void __thiscall ITextHostImpl_TxViewChange(ITextHost *iface, BOOL fUpdate) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxViewChange(%p, fUpdate=%d)\n", This, fUpdate); } -static BOOL WINAPI ITextHostImpl_TxCreateCaret(ITextHost *iface, - HBITMAP hbmp, - INT xWidth, INT yHeight) +static BOOL __thiscall ITextHostImpl_TxCreateCaret(ITextHost *iface, HBITMAP hbmp, INT xWidth, INT yHeight) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxCreateCaret(%p, nbmp=%p, xWidth=%d, yHeight=%d)\n", @@ -213,7 +202,7 @@ static BOOL WINAPI ITextHostImpl_TxCreateCaret(ITextHost *iface, return FALSE; } -static BOOL WINAPI ITextHostImpl_TxShowCaret(ITextHost *iface, BOOL fShow) +static BOOL __thiscall ITextHostImpl_TxShowCaret(ITextHost *iface, BOOL fShow) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxShowCaret(%p, fShow=%d)\n", @@ -221,16 +210,14 @@ static BOOL WINAPI ITextHostImpl_TxShowCaret(ITextHost *iface, BOOL fShow) return FALSE; } -static BOOL WINAPI ITextHostImpl_TxSetCaretPos(ITextHost *iface, - INT x, INT y) +static BOOL __thiscall ITextHostImpl_TxSetCaretPos(ITextHost *iface, INT x, INT y) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxSetCaretPos(%p, x=%d, y=%d)\n", This, x, y); return FALSE; } -static BOOL WINAPI ITextHostImpl_TxSetTimer(ITextHost *iface, - UINT idTimer, UINT uTimeout) +static BOOL __thiscall ITextHostImpl_TxSetTimer(ITextHost *iface, UINT idTimer, UINT uTimeout) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxSetTimer(%p, idTimer=%u, uTimeout=%u)\n", @@ -238,136 +225,119 @@ static BOOL WINAPI ITextHostImpl_TxSetTimer(ITextHost *iface, return FALSE; } -static void WINAPI ITextHostImpl_TxKillTimer(ITextHost *iface, UINT idTimer) +static void __thiscall ITextHostImpl_TxKillTimer(ITextHost *iface, UINT idTimer) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxKillTimer(%p, idTimer=%u)\n", This, idTimer); } -static void WINAPI ITextHostImpl_TxScrollWindowEx(ITextHost *iface, - INT dx, INT dy, - LPCRECT lprcScroll, - LPCRECT lprcClip, - HRGN hRgnUpdate, - LPRECT lprcUpdate, - UINT fuScroll) +static void __thiscall ITextHostImpl_TxScrollWindowEx(ITextHost *iface, INT dx, INT dy, LPCRECT lprcScroll, + LPCRECT lprcClip, HRGN hRgnUpdate, LPRECT lprcUpdate, + UINT fuScroll) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxScrollWindowEx(%p, %d, %d, %p, %p, %p, %p, %d)\n", This, dx, dy, lprcScroll, lprcClip, hRgnUpdate, lprcUpdate, fuScroll); } -static void WINAPI ITextHostImpl_TxSetCapture(ITextHost *iface, BOOL fCapture) +static void __thiscall ITextHostImpl_TxSetCapture(ITextHost *iface, BOOL fCapture) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxSetCapture(%p, fCapture=%d)\n", This, fCapture); } -static void WINAPI ITextHostImpl_TxSetFocus(ITextHost *iface) +static void __thiscall ITextHostImpl_TxSetFocus(ITextHost *iface) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxSetFocus(%p)\n", This); } -static void WINAPI ITextHostImpl_TxSetCursor(ITextHost *iface, - HCURSOR hcur, - BOOL fText) +static void __thiscall ITextHostImpl_TxSetCursor(ITextHost *iface, HCURSOR hcur, BOOL fText) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxSetCursor(%p, hcur=%p, fText=%d)\n", This, hcur, fText); } -static BOOL WINAPI ITextHostImpl_TxScreenToClient(ITextHost *iface, - LPPOINT lppt) +static BOOL __thiscall ITextHostImpl_TxScreenToClient(ITextHost *iface, LPPOINT lppt) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxScreenToClient(%p, lppt=%p)\n", This, lppt); return FALSE; } -static BOOL WINAPI ITextHostImpl_TxClientToScreen(ITextHost *iface, - LPPOINT lppt) +static BOOL __thiscall ITextHostImpl_TxClientToScreen(ITextHost *iface, LPPOINT lppt) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxClientToScreen(%p, lppt=%p)\n", This, lppt); return FALSE; } -static HRESULT WINAPI ITextHostImpl_TxActivate(ITextHost *iface, - LONG *plOldState) +static HRESULT __thiscall ITextHostImpl_TxActivate(ITextHost *iface, LONG *plOldState) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxActivate(%p, plOldState=%p)\n", This, plOldState); return E_NOTIMPL; } -static HRESULT WINAPI ITextHostImpl_TxDeactivate(ITextHost *iface, - LONG lNewState) +static HRESULT __thiscall ITextHostImpl_TxDeactivate(ITextHost *iface, LONG lNewState) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxDeactivate(%p, lNewState=%d)\n", This, lNewState); return E_NOTIMPL; } -static HRESULT WINAPI ITextHostImpl_TxGetClientRect(ITextHost *iface, - LPRECT prc) +static HRESULT __thiscall ITextHostImpl_TxGetClientRect(ITextHost *iface, LPRECT prc) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetClientRect(%p, prc=%p)\n", This, prc); return E_NOTIMPL; } -static HRESULT WINAPI ITextHostImpl_TxGetViewInset(ITextHost *iface, - LPRECT prc) +static HRESULT __thiscall ITextHostImpl_TxGetViewInset(ITextHost *iface, LPRECT prc) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetViewInset(%p, prc=%p)\n", This, prc); return E_NOTIMPL; } -static HRESULT WINAPI ITextHostImpl_TxGetCharFormat(ITextHost *iface, - const CHARFORMATW **ppCF) +static HRESULT __thiscall ITextHostImpl_TxGetCharFormat(ITextHost *iface, const CHARFORMATW **ppCF) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetCharFormat(%p, ppCF=%p)\n", This, ppCF); - return E_NOTIMPL; + *ppCF = (CHARFORMATW *)&This->char_format; + return S_OK; } -static HRESULT WINAPI ITextHostImpl_TxGetParaFormat(ITextHost *iface, - const PARAFORMAT **ppPF) +static HRESULT __thiscall ITextHostImpl_TxGetParaFormat(ITextHost *iface, const PARAFORMAT **ppPF) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetParaFormat(%p, ppPF=%p)\n", This, ppPF); return E_NOTIMPL; } -static COLORREF WINAPI ITextHostImpl_TxGetSysColor(ITextHost *iface, - int nIndex) +static COLORREF __thiscall ITextHostImpl_TxGetSysColor(ITextHost *iface, int nIndex) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetSysColor(%p, nIndex=%d)\n", This, nIndex); return E_NOTIMPL; } -static HRESULT WINAPI ITextHostImpl_TxGetBackStyle(ITextHost *iface, - TXTBACKSTYLE *pStyle) +static HRESULT __thiscall ITextHostImpl_TxGetBackStyle(ITextHost *iface, TXTBACKSTYLE *pStyle) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetBackStyle(%p, pStyle=%p)\n", This, pStyle); return E_NOTIMPL; } -static HRESULT WINAPI ITextHostImpl_TxGetMaxLength(ITextHost *iface, - DWORD *pLength) +static HRESULT __thiscall ITextHostImpl_TxGetMaxLength(ITextHost *iface, DWORD *pLength) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetMaxLength(%p, pLength=%p)\n", This, pLength); return E_NOTIMPL; } -static HRESULT WINAPI ITextHostImpl_TxGetScrollBars(ITextHost *iface, - DWORD *pdwScrollBar) +static HRESULT __thiscall ITextHostImpl_TxGetScrollBars(ITextHost *iface, DWORD *pdwScrollBar) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetScrollBars(%p, pdwScrollBar=%p)\n", @@ -375,40 +345,35 @@ static HRESULT WINAPI ITextHostImpl_TxGetScrollBars(ITextHost *iface, return E_NOTIMPL; } -static HRESULT WINAPI ITextHostImpl_TxGetPasswordChar(ITextHost *iface, - WCHAR *pch) +static HRESULT __thiscall ITextHostImpl_TxGetPasswordChar(ITextHost *iface, WCHAR *pch) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetPasswordChar(%p, pch=%p)\n", This, pch); return E_NOTIMPL; } -static HRESULT WINAPI ITextHostImpl_TxGetAcceleratorPos(ITextHost *iface, - LONG *pch) +static HRESULT __thiscall ITextHostImpl_TxGetAcceleratorPos(ITextHost *iface, LONG *pch) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetAcceleratorPos(%p, pch=%p)\n", This, pch); return E_NOTIMPL; } -static HRESULT WINAPI ITextHostImpl_TxGetExtent(ITextHost *iface, - LPSIZEL lpExtent) +static HRESULT __thiscall ITextHostImpl_TxGetExtent(ITextHost *iface, LPSIZEL lpExtent) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetExtent(%p, lpExtent=%p)\n", This, lpExtent); return E_NOTIMPL; } -static HRESULT WINAPI ITextHostImpl_OnTxCharFormatChange(ITextHost *iface, - const CHARFORMATW *pcf) +static HRESULT __thiscall ITextHostImpl_OnTxCharFormatChange(ITextHost *iface, const CHARFORMATW *pcf) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to OnTxCharFormatChange(%p, pcf=%p)\n", This, pcf); return E_NOTIMPL; } -static HRESULT WINAPI ITextHostImpl_OnTxParaFormatChange(ITextHost *iface, - const PARAFORMAT *ppf) +static HRESULT __thiscall ITextHostImpl_OnTxParaFormatChange(ITextHost *iface, const PARAFORMAT *ppf) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to OnTxParaFormatChange(%p, ppf=%p)\n", This, ppf); @@ -417,9 +382,7 @@ static HRESULT WINAPI ITextHostImpl_OnTxParaFormatChange(ITextHost *iface, /* This must return S_OK for the native ITextServices object to initialize. */ -static HRESULT WINAPI ITextHostImpl_TxGetPropertyBits(ITextHost *iface, - DWORD dwMask, - DWORD *pdwBits) +static HRESULT __thiscall ITextHostImpl_TxGetPropertyBits(ITextHost *iface, DWORD dwMask, DWORD *pdwBits) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetPropertyBits(%p, dwMask=0x%08x, pdwBits=%p)\n", @@ -428,22 +391,21 @@ static HRESULT WINAPI ITextHostImpl_TxGetPropertyBits(ITextHost *iface, return S_OK; } -static HRESULT WINAPI ITextHostImpl_TxNotify(ITextHost *iface, DWORD iNotify, - void *pv) +static HRESULT __thiscall ITextHostImpl_TxNotify(ITextHost *iface, DWORD iNotify, void *pv) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxNotify(%p, iNotify=%d, pv=%p)\n", This, iNotify, pv); return E_NOTIMPL; } -static HIMC WINAPI ITextHostImpl_TxImmGetContext(ITextHost *iface) +static HIMC __thiscall ITextHostImpl_TxImmGetContext(ITextHost *iface) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxImmGetContext(%p)\n", This); return 0; } -static void WINAPI ITextHostImpl_TxImmReleaseContext(ITextHost *iface, HIMC himc) +static void __thiscall ITextHostImpl_TxImmReleaseContext(ITextHost *iface, HIMC himc) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxImmReleaseContext(%p, himc=%p)\n", This, himc); @@ -452,8 +414,7 @@ static void WINAPI ITextHostImpl_TxImmReleaseContext(ITextHost *iface, HIMC himc /* This function must set the variable pointed to by *lSelBarWidth. Otherwise an uninitialized value will be used to calculate positions and sizes even if E_NOTIMPL is returned. */ -static HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *iface, - LONG *lSelBarWidth) +static HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth(ITextHost *iface, LONG *lSelBarWidth) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetSelectionBarWidth(%p, lSelBarWidth=%p)\n", @@ -462,6 +423,10 @@ static HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *iface, return E_NOTIMPL; } +#ifdef __REACTOS__ +#undef __thiscall +#endif /* __REACTOS__ */ + static ITextHostVtbl itextHostVtbl = { ITextHostImpl_QueryInterface, ITextHostImpl_AddRef,

1 0

[reactos] 01/01: [BOOTDATA] readme.txt: Trivial correction (#4014)
by Chan Chilung 09 Oct '21

09 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da4d0545ebf9610331ec1… commit da4d0545ebf9610331ec186a1275fb44ed22245f Author: Chan Chilung <eason066(a)gmail.com> AuthorDate: Sat Oct 9 20:44:09 2021 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 9 15:44:09 2021 +0300 [BOOTDATA] readme.txt: Trivial correction (#4014) Follow up of #3469 - replace "Seven" with "7" to keep Microsoft's official naming. --- boot/bootdata/readme.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/readme.txt b/boot/bootdata/readme.txt index 8723d7e37ca..f04646df30e 100644 --- a/boot/bootdata/readme.txt +++ b/boot/bootdata/readme.txt @@ -1,6 +1,6 @@ ======================== ReactOS™ Version 0.4.x -Updated July 19, 2021 +Updated October 9, 2021 ======================== 1. What is ReactOS? @@ -8,7 +8,7 @@ Updated July 19, 2021 ReactOS™ is an Open Source effort to develop a quality operating system that is compatible with applications and drivers written for the Microsoft® Windows™ NT -family of operating systems (NT4, 2000, XP, 2003, Vista, Seven). +family of operating systems (NT4, 2000, XP, 2003, Vista, 7). More information is available at: https://reactos.org

1 0

[reactos] 01/01: [ZIPFLDR] Update de-DE.rc
by Joachim Henze 09 Oct '21

09 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c99e5a2810245461e63d7… commit c99e5a2810245461e63d74a40523d829ad89f19d Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Oct 9 14:40:48 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Oct 9 14:40:48 2021 +0200 [ZIPFLDR] Update de-DE.rc --- dll/shellext/zipfldr/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/shellext/zipfldr/lang/de-DE.rc b/dll/shellext/zipfldr/lang/de-DE.rc index 50f7cc681f7..44391cdcc54 100644 --- a/dll/shellext/zipfldr/lang/de-DE.rc +++ b/dll/shellext/zipfldr/lang/de-DE.rc @@ -77,7 +77,7 @@ BEGIN IDS_CANTREADFILE "Datei '%s' konnte nicht gelesen werden." IDS_EXTRACTING "Extrahieren..." IDS_CANTEXTRACTFILE "Datei '%1' konnte nicht extrahiert werden." - IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" + IDS_DECOMPRESSERROR "Kompressionsverfahren %d wird nicht unterstützt. Dennoch fortfahren?" IDS_UNKNOWNERROR "Unbekannter Fehler 0x%08x." IDS_WIZ_TITLE "Extrahier-Assistent"

1 0

[reactos] 01/01: [IMM32] Rewrite ImmRequestMessageA/W (#4002)
by Katayama Hirofumi MZ 08 Oct '21

08 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=264a128f03f97d10653cf… commit 264a128f03f97d10653cf74ac81bed9336fbddaa Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 9 07:40:56 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 9 07:40:56 2021 +0900 [IMM32] Rewrite ImmRequestMessageA/W (#4002) - Re-implement ImmRequestMessageA and ImmRequestMessageW functions. - Add IchWideFromAnsi, IchAnsiFromWide, Imm32RequestError, Imm32ReconvertSize, Imm32ConvertReconvert, and Imm32ProcessRequest helper functions. CORE-11700 --- dll/win32/imm32/imm.c | 30 ---- dll/win32/imm32/imm32.spec | 4 +- dll/win32/imm32/keymsg.c | 335 +++++++++++++++++++++++++++++++++++++++++++++ dll/win32/imm32/precomp.h | 2 + dll/win32/imm32/utils.c | 39 ++++++ 5 files changed, 378 insertions(+), 32 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index db537ad9bf0..69cd4281a55 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -1483,36 +1483,6 @@ BOOL WINAPI ImmUnlockIMC(HIMC hIMC) return TRUE; } -/*********************************************************************** - * ImmRequestMessageA(IMM32.@) - */ -LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam) -{ - InputContextData *data = get_imc_data(hIMC); - - TRACE("%p %ld %ld\n", hIMC, wParam, wParam); - - if (data) return SendMessageA(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); - - SetLastError(ERROR_INVALID_HANDLE); - return 0; -} - -/*********************************************************************** - * ImmRequestMessageW(IMM32.@) - */ -LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) -{ - InputContextData *data = get_imc_data(hIMC); - - TRACE("%p %ld %ld\n", hIMC, wParam, wParam); - - if (data) return SendMessageW(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); - - SetLastError(ERROR_INVALID_HANDLE); - return 0; -} - /*********************************************************************** * ImmReleaseContext (IMM32.@) */ diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 09ca424fdc0..02217013950 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -87,8 +87,8 @@ @ stdcall ImmRegisterWordA(long str long str) @ stdcall ImmRegisterWordW(long wstr long wstr) @ stdcall ImmReleaseContext(ptr ptr) -@ stdcall ImmRequestMessageA(ptr long long) -@ stdcall ImmRequestMessageW(ptr long long) +@ stdcall ImmRequestMessageA(ptr ptr ptr) +@ stdcall ImmRequestMessageW(ptr ptr ptr) @ stdcall ImmSendIMEMessageExA(ptr ptr) @ stdcall ImmSendIMEMessageExW(ptr ptr) @ stub ImmSendMessageToActiveDefImeWndW diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index c8dc8670158..168382559e4 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -349,6 +349,323 @@ BOOL APIENTRY Imm32SendChange(BOOL bProcess) return ImmEnumInputContext((bProcess ? -1 : 0), Imm32SendChangeProc, 0); } +VOID APIENTRY Imm32RequestError(DWORD dwError) +{ + FIXME("()\n"); + SetLastError(dwError); +} + +DWORD APIENTRY Imm32ReconvertSize(DWORD dwSize, BOOL bAnsi, BOOL bConvert) +{ + DWORD dwOffset; + if (dwSize < sizeof(RECONVERTSTRING)) + return 0; + if (!bConvert) + return dwSize; + dwOffset = dwSize - sizeof(RECONVERTSTRING); + if (bAnsi) + dwOffset /= sizeof(WCHAR); + else + dwOffset *= sizeof(WCHAR); + return sizeof(RECONVERTSTRING) + dwOffset; +} + +DWORD APIENTRY +Imm32ConvertReconvert(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc, BOOL bAnsi, + UINT uCodePage) +{ + DWORD ret = sizeof(RECONVERTSTRING), cch0, cch1, cchDest; + + if ((pSrc->dwVersion != 0) || (pDest->dwVersion != 0)) + return 0; + + pDest->dwStrOffset = sizeof(RECONVERTSTRING); + + /* + * See RECONVERTSTRING structure: + * https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/RECONVERTSTRING.html + * + * The dwCompStrOffset and dwTargetOffset members are the relative position of dwStrOffset. + * dwStrLen, dwCompStrLen, and dwTargetStrLen are the TCHAR count. dwStrOffset, + * dwCompStrOffset, and dwTargetStrOffset are the byte offset. + */ + if (bAnsi) /* Ansi <-- Wide */ + { + LPCWSTR pchSrc = (LPCWSTR)((LPCSTR)pSrc + pSrc->dwStrOffset); + LPSTR pchDest = (LPSTR)pDest + pDest->dwStrOffset; + + cchDest = WideCharToMultiByte(uCodePage, 0, pchSrc, pSrc->dwStrLen, + pchDest, pSrc->dwStrLen, NULL, NULL); + + /* dwCompStrOffset */ + cch1 = pSrc->dwCompStrOffset / sizeof(WCHAR); + cch0 = IchAnsiFromWide(cch1, pchSrc, uCodePage); + pDest->dwCompStrOffset = cch0 * sizeof(CHAR); + + /* dwCompStrLen */ + cch0 = IchAnsiFromWide(cch1 + pSrc->dwCompStrLen, pchSrc, uCodePage); + pDest->dwCompStrLen = cch0 * sizeof(CHAR) - pDest->dwCompStrOffset; + + /* dwTargetStrOffset */ + cch1 = pSrc->dwTargetStrOffset / sizeof(WCHAR); + cch0 = IchAnsiFromWide(cch1, pchSrc, uCodePage); + pDest->dwTargetStrOffset = cch0 * sizeof(CHAR); + + /* dwTargetStrLen */ + cch0 = IchAnsiFromWide(cch1 + pSrc->dwTargetStrLen, pchSrc, uCodePage); + pDest->dwTargetStrLen = cch0 * sizeof(CHAR) - pDest->dwTargetStrOffset; + + /* dwStrLen */ + pDest->dwStrLen = cchDest; + pchDest[cchDest] = 0; + + ret += (cchDest + 1) * sizeof(CHAR); + } + else /* Wide <-- Ansi */ + { + LPCSTR pchSrc = (LPCSTR)pSrc + pSrc->dwStrOffset; + LPWSTR pchDest = (LPWSTR)((LPBYTE)pDest + pDest->dwStrOffset); + + cchDest = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, pchSrc, pSrc->dwStrLen, + pchDest, pSrc->dwStrLen); + + /* dwCompStrOffset */ + cch0 = IchWideFromAnsi(pSrc->dwCompStrOffset, pchSrc, uCodePage); + pDest->dwCompStrOffset = cch0 * sizeof(WCHAR); + + /* dwCompStrLen */ + cch0 = IchWideFromAnsi(pSrc->dwCompStrOffset + pSrc->dwCompStrLen, pchSrc, uCodePage); + pDest->dwCompStrLen = (cch0 * sizeof(WCHAR) - pDest->dwCompStrOffset) / sizeof(WCHAR); + + /* dwTargetStrOffset */ + cch0 = IchWideFromAnsi(pSrc->dwTargetStrOffset, pchSrc, uCodePage); + pDest->dwTargetStrOffset = cch0 * sizeof(WCHAR); + + /* dwTargetStrLen */ + cch0 = IchWideFromAnsi(pSrc->dwTargetStrOffset + pSrc->dwTargetStrLen, pchSrc, uCodePage); + pDest->dwTargetStrLen = (cch0 * sizeof(WCHAR) - pSrc->dwTargetStrOffset) / sizeof(WCHAR); + + /* dwStrLen */ + pDest->dwStrLen = cchDest; + pchDest[cchDest] = 0; + + ret += (cchDest + 1) * sizeof(WCHAR); + } + + return ret; +} + +LRESULT APIENTRY +Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bAnsiAPI) +{ + HWND hWnd; + DWORD ret = 0, dwCharPos, cchCompStr; + LPVOID pCS, pTempData = pData; + LPRECONVERTSTRING pRS; + LPIMECHARPOSITION pICP; + PCLIENTIMC pClientImc; + UINT uCodePage = CP_ACP; + BOOL bAnsiWnd = !!(pWnd->state & WNDS_ANSIWINDOWPROC); + static const size_t acbData[7 * 2] = + { + /* UNICODE */ + sizeof(COMPOSITIONFORM), sizeof(CANDIDATEFORM), sizeof(LOGFONTW), + sizeof(RECONVERTSTRING), sizeof(RECONVERTSTRING), + sizeof(IMECHARPOSITION), sizeof(RECONVERTSTRING), + /* ANSI */ + sizeof(COMPOSITIONFORM), sizeof(CANDIDATEFORM), sizeof(LOGFONTA), + sizeof(RECONVERTSTRING), sizeof(RECONVERTSTRING), + sizeof(IMECHARPOSITION), sizeof(RECONVERTSTRING), + }; + + if (dwCommand == 0 || dwCommand > IMR_DOCUMENTFEED) + return 0; /* Out of range */ + + if (pData && IsBadWritePtr(pData, acbData[bAnsiAPI * 7 + dwCommand - 1])) + return 0; /* Invalid pointer */ + + /* Sanity check */ + switch (dwCommand) + { + case IMR_RECONVERTSTRING: case IMR_DOCUMENTFEED: + pRS = pData; + if (pRS && (pRS->dwVersion != 0 || pRS->dwSize < sizeof(RECONVERTSTRING))) + { + Imm32RequestError(ERROR_INVALID_PARAMETER); + return 0; + } + break; + + case IMR_CONFIRMRECONVERTSTRING: + pRS = pData; + if (!pRS || pRS->dwVersion != 0) + { + Imm32RequestError(ERROR_INVALID_PARAMETER); + return 0; + } + break; + + default: + if (!pData) + { + Imm32RequestError(ERROR_INVALID_PARAMETER); + return 0; + } + break; + } + + pClientImc = ImmLockClientImc(hIMC); + if (pClientImc) + { + uCodePage = pClientImc->uCodePage; + ImmUnlockClientImc(pClientImc); + } + + /* Prepare */ + switch (dwCommand) + { + case IMR_COMPOSITIONFONT: + if (bAnsiAPI == bAnsiWnd) + goto DoIt; + if (bAnsiWnd) + pTempData = Imm32HeapAlloc(0, sizeof(LOGFONTA)); + else + pTempData = Imm32HeapAlloc(0, sizeof(LOGFONTW)); + if (!pTempData) + return 0; + break; + + case IMR_RECONVERTSTRING: case IMR_CONFIRMRECONVERTSTRING: case IMR_DOCUMENTFEED: + if (bAnsiAPI == bAnsiWnd || !pData) + goto DoIt; + + pRS = pData; + ret = Imm32ReconvertSize(pRS->dwSize, FALSE, bAnsiWnd); + pTempData = Imm32HeapAlloc(0, ret + sizeof(WCHAR)); + if (!pTempData) + return 0; + + pRS = pTempData; + pRS->dwSize = ret; + pRS->dwVersion = 0; + + if (dwCommand == IMR_CONFIRMRECONVERTSTRING) + Imm32ConvertReconvert(pData, pTempData, bAnsiWnd, uCodePage); + break; + + case IMR_QUERYCHARPOSITION: + if (bAnsiAPI == bAnsiWnd) + goto DoIt; + + pICP = pData; + dwCharPos = pICP->dwCharPos; + + if (bAnsiAPI) + { + cchCompStr = ImmGetCompositionStringA(hIMC, GCS_COMPSTR, NULL, 0); + if (!cchCompStr) + return 0; + + pCS = Imm32HeapAlloc(0, (cchCompStr + 1) * sizeof(CHAR)); + if (!pCS) + return 0; + + ImmGetCompositionStringA(hIMC, GCS_COMPSTR, pCS, cchCompStr); + pICP->dwCharPos = IchWideFromAnsi(pICP->dwCharPos, pCS, uCodePage); + } + else + { + cchCompStr = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, NULL, 0); + if (!cchCompStr) + return 0; + + pCS = Imm32HeapAlloc(0, (cchCompStr + 1) * sizeof(WCHAR)); + if (!pCS) + return 0; + + ImmGetCompositionStringW(hIMC, GCS_COMPSTR, pCS, cchCompStr); + pICP->dwCharPos = IchAnsiFromWide(pICP->dwCharPos, pCS, uCodePage); + } + + Imm32HeapFree(pCS); + break; + + default: + break; + } + +DoIt: + /* The main task */ + hWnd = pWnd->head.h; + if (bAnsiWnd) + ret = SendMessageA(hWnd, WM_IME_REQUEST, dwCommand, (LPARAM)pTempData); + else + ret = SendMessageW(hWnd, WM_IME_REQUEST, dwCommand, (LPARAM)pTempData); + + if (bAnsiAPI == bAnsiWnd) + goto Quit; + + /* Get back to caller */ + switch (dwCommand) + { + case IMR_COMPOSITIONFONT: + if (bAnsiAPI) + LogFontWideToAnsi(pTempData, pData); + else + LogFontAnsiToWide(pTempData, pData); + break; + + case IMR_RECONVERTSTRING: case IMR_DOCUMENTFEED: + if (!ret) + goto Quit; + + ret = Imm32ReconvertSize(ret, TRUE, bAnsiWnd); + if (ret < sizeof(RECONVERTSTRING) || + (pTempData && !Imm32ConvertReconvert(pData, pTempData, bAnsiAPI, uCodePage))) + { + ret = 0; + } + break; + + case IMR_QUERYCHARPOSITION: + pICP->dwCharPos = dwCharPos; + break; + + default: + break; + } + +Quit: + if (pTempData != pData) + Imm32HeapFree(pTempData); + return ret; +} + +LRESULT APIENTRY Imm32RequestMessageAW(HIMC hIMC, WPARAM wParam, LPARAM lParam, BOOL bAnsi) +{ + LRESULT ret = 0; + LPINPUTCONTEXT pIC; + HWND hWnd; + PWND pWnd = NULL; + + if (!hIMC || Imm32IsCrossThreadAccess(hIMC)) + return FALSE; + + pIC = ImmLockIMC(hIMC); + if (!pIC) + return FALSE; + + hWnd = pIC->hWnd; + if (hWnd) + pWnd = ValidateHwndNoErr(hWnd); + + if (pWnd && pWnd->head.pti == NtCurrentTeb()->Win32ThreadInfo) + ret = Imm32ProcessRequest(hIMC, pWnd, (DWORD)wParam, (LPVOID)lParam, bAnsi); + + ImmUnlockIMC(hIMC); + return ret; +} + /*********************************************************************** * ImmIsUIMessageA (IMM32.@) */ @@ -798,3 +1115,21 @@ Quit: return ret; #undef MSG_COUNT } + +/*********************************************************************** + * ImmRequestMessageA(IMM32.@) + */ +LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam) +{ + TRACE("(%p, %p, %p)\n", hIMC, wParam, lParam); + return Imm32RequestMessageAW(hIMC, wParam, lParam, TRUE); +} + +/*********************************************************************** + * ImmRequestMessageW(IMM32.@) + */ +LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) +{ + TRACE("(%p, %p, %p)\n", hIMC, wParam, lParam); + return Imm32RequestMessageAW(hIMC, wParam, lParam, FALSE); +} diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 4ca77e11fbf..17f46493c88 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -81,6 +81,8 @@ LPVOID APIENTRY Imm32HeapAlloc(DWORD dwFlags, DWORD dwBytes); LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA); LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW); +DWORD APIENTRY IchWideFromAnsi(DWORD cchAnsi, LPCSTR pchAnsi, UINT uCodePage); +DWORD APIENTRY IchAnsiFromWide(DWORD cchWide, LPCWSTR pchWide, UINT uCodePage); PIMEDPI APIENTRY ImmLockOrLoadImeDpi(HKL hKL); LPINPUTCONTEXT APIENTRY Imm32LockIMCEx(HIMC hIMC, BOOL fSelect); BOOL APIENTRY Imm32ReleaseIME(HKL hKL); diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 7024ec8f19f..20790f78110 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -50,6 +50,45 @@ LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW) return pszA; } +DWORD APIENTRY IchWideFromAnsi(DWORD cchAnsi, LPCSTR pchAnsi, UINT uCodePage) +{ + DWORD cchWide; + for (cchWide = 0; cchAnsi; ++cchWide) + { + if (IsDBCSLeadByteEx(uCodePage, *pchAnsi)) + { + if (cchAnsi <= 1) + { + ++cchWide; + break; + } + else + { + cchAnsi -= 2; + pchAnsi += 2; + } + } + else + { + --cchAnsi; + ++pchAnsi; + } + } + return cchWide; +} + +DWORD APIENTRY IchAnsiFromWide(DWORD cchWide, LPCWSTR pchWide, UINT uCodePage) +{ + DWORD cb, cchAnsi; + for (cchAnsi = 0; cchWide; ++cchAnsi, ++pchWide, --cchWide) + { + cb = WideCharToMultiByte(uCodePage, 0, pchWide, 1, NULL, 0, NULL, NULL); + if (cb > 1) + ++cchAnsi; + } + return cchAnsi; +} + BOOL Imm32GetSystemLibraryPath(LPWSTR pszPath, DWORD cchPath, LPCWSTR pszFileName) { if (!pszFileName[0] || !GetSystemDirectoryW(pszPath, cchPath))

1 0

[reactos] 01/01: [ZIPFLDR] Update Polish (pl-PL) translation (#4007)
by Adam Stachowicz 08 Oct '21

08 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e9c89836341a8dfa721c… commit 4e9c89836341a8dfa721c5f7a9f53665474689ee Author: Adam Stachowicz <saibamenppl(a)gmail.com> AuthorDate: Fri Oct 8 17:00:30 2021 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 8 20:00:30 2021 +0300 [ZIPFLDR] Update Polish (pl-PL) translation (#4007) --- dll/shellext/zipfldr/lang/pl-PL.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/shellext/zipfldr/lang/pl-PL.rc b/dll/shellext/zipfldr/lang/pl-PL.rc index a9ef3c0a94a..a7f099755b7 100644 --- a/dll/shellext/zipfldr/lang/pl-PL.rc +++ b/dll/shellext/zipfldr/lang/pl-PL.rc @@ -77,9 +77,9 @@ BEGIN IDS_CANTCREATEZIP "Nie można utworzyć folderu skompresowanego '%s' (kod błędu: %d)." IDS_CANTREADFILE "Błąd podczas czytania pliku '%s'." IDS_EXTRACTING "Trwa wyodrębnianie..." - IDS_CANTEXTRACTFILE "Cannot extract file '%1'." - IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" - IDS_UNKNOWNERROR "Unknown error 0x%08x." + IDS_CANTEXTRACTFILE "Nie można wyodrębnić pliku '%1'." + IDS_DECOMPRESSERROR "Nieobsługiwana metoda kompresji %d. Czy chcesz kontynuować?" + IDS_UNKNOWNERROR "Nieznany błąd 0x%08x." IDS_WIZ_TITLE "Kreator wyodrębniania" IDS_WIZ_DEST_TITLE "Wybierz miejsce docelowe"

1 0

[reactos] 01/01: Revert "[DSOUND] Don't force status to failure by default in primarybuffer_SetFormat (#3911)"
by Oleg Dubinskiy 07 Oct '21

07 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ef7b676154afb931d25c… commit 6ef7b676154afb931d25c5d21071497907f38fa4 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Mon Sep 27 15:02:52 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Oct 7 23:44:30 2021 +0300 Revert "[DSOUND] Don't force status to failure by default in primarybuffer_SetFormat (#3911)" Revert my last dsound fix, because it does not fix the actual problem with audio formats support. It only makes the situation worse. It prevents the error when creating an audio stream, but the sound is not playing correctly, both in ReactOS and Windows (with our dsound.dll). Without this fix, it works perfectly on Windows, but does not in ROS. In particular, the sound is not playing properly in AIMP 4.71 with other audio formats besides default (44100 Hz, 16 bit, stereo). And any other apps which request these audio formats may be also affected as well. Force the status back to failure, because otherwise the badly required code is not executed at all. I've made a more correct fix(es) in other audio component(s) instead and will submit them if further PRs. This reverts commit 183566ee584efbe6377c79e68bfe24b2d1f940ae. CORE-10907 --- dll/directx/wine/dsound/primary.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/directx/wine/dsound/primary.c b/dll/directx/wine/dsound/primary.c index 9f8ecf8e593..b04a526929e 100644 --- a/dll/directx/wine/dsound/primary.c +++ b/dll/directx/wine/dsound/primary.c @@ -459,7 +459,7 @@ LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) { - HRESULT err = S_OK; + HRESULT err = DSERR_BUFFERLOST; int i; DWORD nSamplesPerSec, bpp, chans; LPWAVEFORMATEX oldpwfx;

1 0

[reactos] 01/01: [TSCLIENT] Fix code F12 array index (#4006)
by Rafał Mikrut 07 Oct '21

07 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=782bf0e3dc980fe57da32… commit 782bf0e3dc980fe57da32ea225c403d185d4b61e Author: Rafał Mikrut <mikrutrafal(a)protonmail.com> AuthorDate: Thu Oct 7 20:12:53 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Oct 7 23:08:03 2021 +0300 [TSCLIENT] Fix code F12 array index (#4006) --- modules/rosapps/applications/net/tsclient/rdesktop/uiports/nanoxwin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rosapps/applications/net/tsclient/rdesktop/uiports/nanoxwin.c b/modules/rosapps/applications/net/tsclient/rdesktop/uiports/nanoxwin.c index c1fd04d8adf..4c5950f56cd 100644 --- a/modules/rosapps/applications/net/tsclient/rdesktop/uiports/nanoxwin.c +++ b/modules/rosapps/applications/net/tsclient/rdesktop/uiports/nanoxwin.c @@ -1243,7 +1243,7 @@ static void init_keys(void) g_keys[0x53].ch1 = 63508; /* delete */ g_keys[0x53].ch2 = 63493; /* delete */ g_keys[0x54].ch1 = 63525; /* f11 */ - g_keys[0x54].ch1 = 63527; /* f12 */ + g_keys[0x55].ch1 = 63527; /* f12 */ } /*****************************************************************************/

1 0

[reactos] 01/01: [NTOS:KE] Fix copy paste bug in exception helper routine for ARM (#4005)
by Rafał Mikrut 07 Oct '21

07 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54d5ad753346429248b51… commit 54d5ad753346429248b516eaf8fbf534d2fed113 Author: Rafał Mikrut <mikrutrafal(a)protonmail.com> AuthorDate: Thu Oct 7 19:45:21 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Oct 7 23:04:19 2021 +0300 [NTOS:KE] Fix copy paste bug in exception helper routine for ARM (#4005) --- ntoskrnl/ke/arm/exp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/ke/arm/exp.c b/ntoskrnl/ke/arm/exp.c index 1f2c7036f57..7febe920614 100644 --- a/ntoskrnl/ke/arm/exp.c +++ b/ntoskrnl/ke/arm/exp.c @@ -134,7 +134,7 @@ KeTrapFrameToContext(IN PKTRAP_FRAME TrapFrame, Context->R6 = ExceptionFrame->R6; Context->R7 = ExceptionFrame->R7; Context->R8 = ExceptionFrame->R8; - Context->R0 = ExceptionFrame->R9; + Context->R9 = ExceptionFrame->R9; Context->R10 = ExceptionFrame->R10; Context->R11 = ExceptionFrame->R11; Context->R12 = TrapFrame->R12;

1 0

[reactos] 01/01: [ZIPFLDR] Show error when compression method is not supported
by Stanislav Motylkov 07 Oct '21

07 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e3a7a0e84bb8cdff4ad3… commit 7e3a7a0e84bb8cdff4ad32cbd1a26d026ae2db1f Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Oct 6 01:04:50 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Oct 7 14:54:47 2021 +0300 [ZIPFLDR] Show error when compression method is not supported CORE-17255 --- dll/shellext/zipfldr/CZipExtract.cpp | 23 ++++++++++++++++++++--- dll/shellext/zipfldr/lang/de-DE.rc | 1 + dll/shellext/zipfldr/lang/en-US.rc | 1 + dll/shellext/zipfldr/lang/et-EE.rc | 1 + dll/shellext/zipfldr/lang/fr-FR.rc | 1 + dll/shellext/zipfldr/lang/hi-IN.rc | 1 + dll/shellext/zipfldr/lang/it-IT.rc | 1 + dll/shellext/zipfldr/lang/ja-JP.rc | 1 + dll/shellext/zipfldr/lang/pl-PL.rc | 1 + dll/shellext/zipfldr/lang/pt-PT.rc | 1 + dll/shellext/zipfldr/lang/ro-RO.rc | 1 + dll/shellext/zipfldr/lang/ru-RU.rc | 1 + dll/shellext/zipfldr/lang/sv-SE.rc | 1 + dll/shellext/zipfldr/lang/zh-CN.rc | 1 + dll/shellext/zipfldr/lang/zh-TW.rc | 1 + dll/shellext/zipfldr/resource.h | 3 ++- 16 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index 47be6caa5df..8f9381e9f83 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -590,7 +590,6 @@ public: break; case eExtractAbort: - case eOpenError: case eUnpackError: { Close(); @@ -627,6 +626,20 @@ public: } break; } + + case eOpenError: + { + if (err == UNZ_BADZIPFILE && + Info.compression_method != 0 && + Info.compression_method != Z_DEFLATED && + Info.compression_method != Z_BZIP2ED) + { + if (ShowExtractError(hDlg, FullPath, Info.compression_method, eOpenError) == IDYES) + break; + } + Close(); + return false; + } } if (Result == eNoError && is_dir) continue; @@ -643,7 +656,7 @@ public: CStringA strErr, strText; PSTR Win32ErrorString; - if (ErrorType == eFileError) + if (ErrorType == eFileError || ErrorType == eOpenError) strText.LoadString(IDS_CANTEXTRACTFILE); else strText.LoadString(GetModuleHandleA("shell32.dll"), 128); // IDS_CREATEFOLDER_DENIED @@ -660,7 +673,9 @@ public: LocalFree(Win32ErrorString); } } - if (strErr.GetLength() == 0) + if (ErrorType == eOpenError) + strErr.Format(IDS_DECOMPRESSERROR, Error); + else if (strErr.GetLength() == 0) strErr.Format(IDS_UNKNOWNERROR, Error); strText.Append("\r\n\r\n" + strErr); @@ -670,6 +685,8 @@ public: mbFlags |= MB_RETRYCANCEL; else if (ErrorType == eFileError) mbFlags |= MB_ABORTRETRYIGNORE; + else if (ErrorType == eOpenError) + mbFlags |= MB_YESNO; return MessageBoxA(hDlg, strText, strTitle, mbFlags); } diff --git a/dll/shellext/zipfldr/lang/de-DE.rc b/dll/shellext/zipfldr/lang/de-DE.rc index 19bb69ad39b..50f7cc681f7 100644 --- a/dll/shellext/zipfldr/lang/de-DE.rc +++ b/dll/shellext/zipfldr/lang/de-DE.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Datei '%s' konnte nicht gelesen werden." IDS_EXTRACTING "Extrahieren..." IDS_CANTEXTRACTFILE "Datei '%1' konnte nicht extrahiert werden." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unbekannter Fehler 0x%08x." IDS_WIZ_TITLE "Extrahier-Assistent" diff --git a/dll/shellext/zipfldr/lang/en-US.rc b/dll/shellext/zipfldr/lang/en-US.rc index e885f59a3f3..85286aa3a66 100644 --- a/dll/shellext/zipfldr/lang/en-US.rc +++ b/dll/shellext/zipfldr/lang/en-US.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Extracting..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Extraction Wizard" diff --git a/dll/shellext/zipfldr/lang/et-EE.rc b/dll/shellext/zipfldr/lang/et-EE.rc index 61bd7947e67..b36d05b7f71 100644 --- a/dll/shellext/zipfldr/lang/et-EE.rc +++ b/dll/shellext/zipfldr/lang/et-EE.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Ekstraktimine..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Ekstraktimise visard" diff --git a/dll/shellext/zipfldr/lang/fr-FR.rc b/dll/shellext/zipfldr/lang/fr-FR.rc index 217dca2d08b..9b47d0c7147 100644 --- a/dll/shellext/zipfldr/lang/fr-FR.rc +++ b/dll/shellext/zipfldr/lang/fr-FR.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Extraction..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Assistant d'extraction" diff --git a/dll/shellext/zipfldr/lang/hi-IN.rc b/dll/shellext/zipfldr/lang/hi-IN.rc index 9b972305b39..1c7f17c7e69 100644 --- a/dll/shellext/zipfldr/lang/hi-IN.rc +++ b/dll/shellext/zipfldr/lang/hi-IN.rc @@ -64,6 +64,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Extracting..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "निष्कर्षण विज़ार्ड" diff --git a/dll/shellext/zipfldr/lang/it-IT.rc b/dll/shellext/zipfldr/lang/it-IT.rc index 6b75ce72126..a3ebbf1b386 100644 --- a/dll/shellext/zipfldr/lang/it-IT.rc +++ b/dll/shellext/zipfldr/lang/it-IT.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Estrazione..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Estrazione Guidata" diff --git a/dll/shellext/zipfldr/lang/ja-JP.rc b/dll/shellext/zipfldr/lang/ja-JP.rc index 8132f95d611..072a4937160 100644 --- a/dll/shellext/zipfldr/lang/ja-JP.rc +++ b/dll/shellext/zipfldr/lang/ja-JP.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "ファイル '%s' が読めません。" IDS_EXTRACTING "展開中..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "展開ウィザード" diff --git a/dll/shellext/zipfldr/lang/pl-PL.rc b/dll/shellext/zipfldr/lang/pl-PL.rc index 166312bb90a..a9ef3c0a94a 100644 --- a/dll/shellext/zipfldr/lang/pl-PL.rc +++ b/dll/shellext/zipfldr/lang/pl-PL.rc @@ -78,6 +78,7 @@ BEGIN IDS_CANTREADFILE "Błąd podczas czytania pliku '%s'." IDS_EXTRACTING "Trwa wyodrębnianie..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Kreator wyodrębniania" diff --git a/dll/shellext/zipfldr/lang/pt-PT.rc b/dll/shellext/zipfldr/lang/pt-PT.rc index 53bd82c5e7e..c43183dff83 100644 --- a/dll/shellext/zipfldr/lang/pt-PT.rc +++ b/dll/shellext/zipfldr/lang/pt-PT.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Não é possível ler o arquivo '%s'." IDS_EXTRACTING "A extrair..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Assistente de extração" diff --git a/dll/shellext/zipfldr/lang/ro-RO.rc b/dll/shellext/zipfldr/lang/ro-RO.rc index 021bf033732..ab05fc60e1f 100644 --- a/dll/shellext/zipfldr/lang/ro-RO.rc +++ b/dll/shellext/zipfldr/lang/ro-RO.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Extragere..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Asistent de extracție" diff --git a/dll/shellext/zipfldr/lang/ru-RU.rc b/dll/shellext/zipfldr/lang/ru-RU.rc index e8b9c21b046..adfd8416be2 100644 --- a/dll/shellext/zipfldr/lang/ru-RU.rc +++ b/dll/shellext/zipfldr/lang/ru-RU.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Не удалось прочитать файл '%s'." IDS_EXTRACTING "Извлечение..." IDS_CANTEXTRACTFILE "Не удалось извлечь файл '%1'." + IDS_DECOMPRESSERROR "Неизвестный метод компрессии %d. Продолжить?" IDS_UNKNOWNERROR "Неизвестная ошибка 0x%08x." IDS_WIZ_TITLE "Мастер извлечения архивов" diff --git a/dll/shellext/zipfldr/lang/sv-SE.rc b/dll/shellext/zipfldr/lang/sv-SE.rc index 90d2676e9a5..e5da27b41a7 100644 --- a/dll/shellext/zipfldr/lang/sv-SE.rc +++ b/dll/shellext/zipfldr/lang/sv-SE.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Extraherar..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Extraheringsguiden" diff --git a/dll/shellext/zipfldr/lang/zh-CN.rc b/dll/shellext/zipfldr/lang/zh-CN.rc index f899a8e218b..3cc125f21b6 100644 --- a/dll/shellext/zipfldr/lang/zh-CN.rc +++ b/dll/shellext/zipfldr/lang/zh-CN.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "正在解压..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "解压向导" diff --git a/dll/shellext/zipfldr/lang/zh-TW.rc b/dll/shellext/zipfldr/lang/zh-TW.rc index c982d9a64c9..b2183286c27 100644 --- a/dll/shellext/zipfldr/lang/zh-TW.rc +++ b/dll/shellext/zipfldr/lang/zh-TW.rc @@ -80,6 +80,7 @@ BEGIN IDS_CANTREADFILE "無法讀取檔案 '%s'." IDS_EXTRACTING "正在解壓縮..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "解壓縮精靈" diff --git a/dll/shellext/zipfldr/resource.h b/dll/shellext/zipfldr/resource.h index c7e021c63f4..7a9566e1f47 100644 --- a/dll/shellext/zipfldr/resource.h +++ b/dll/shellext/zipfldr/resource.h @@ -48,7 +48,8 @@ #define IDS_CANTREADFILE 113 #define IDS_EXTRACTING 114 #define IDS_CANTEXTRACTFILE 115 -#define IDS_UNKNOWNERROR 116 +#define IDS_DECOMPRESSERROR 116 +#define IDS_UNKNOWNERROR 117 /* Wizard titles */ #define IDS_WIZ_TITLE 8000

1 0

[reactos] 01/01: [SHELL32] Don't smartass-renaming on folders (#3993)
by Katayama Hirofumi MZ 06 Oct '21

06 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5da934e34dfc257b5fb37… commit 5da934e34dfc257b5fb37f172713ccd8d0269ad5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 7 08:16:35 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 7 08:16:35 2021 +0900 [SHELL32] Don't smartass-renaming on folders (#3993) Selection on renaming folders shouldn't select the extension-like part of filename. CORE-17793 --- dll/win32/shell32/CDefView.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 0c3f865febc..03a639a9026 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -2093,9 +2093,11 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl HWND hEdit = reinterpret_cast<HWND>(m_ListView.SendMessage(LVM_GETEDITCONTROL)); SHLimitInputEdit(hEdit, m_pSFParent); - if (!(dwAttr & SFGAO_LINK) && (lpdi->item.mask & LVIF_TEXT) && !SelectExtOnRename()) + LPWSTR pszText = lpdi->item.pszText; + if (!(dwAttr & (SFGAO_LINK | SFGAO_FOLDER)) && (dwAttr & SFGAO_FILESYSTEM) && + (lpdi->item.mask & LVIF_TEXT) && + !SelectExtOnRename() && !SHELL_FS_HideExtension(pszText)) { - LPWSTR pszText = lpdi->item.pszText; LPWSTR pchDotExt = PathFindExtensionW(pszText); ::PostMessageW(hEdit, EM_SETSEL, 0, pchDotExt - pszText); ::PostMessageW(hEdit, EM_SCROLLCARET, 0, 0);

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