ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
September 2022
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
21 participants
142 discussions
Start a n
N
ew thread
[reactos] 01/01: [IMM32] Remove unnecessary NULL checks for function pointers
by Katayama Hirofumi MZ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=020d7d582f1b130472f99…
commit 020d7d582f1b130472f999314a1d65862813eddd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 8 09:57:17 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Sep 8 09:57:17 2022 +0900 [IMM32] Remove unnecessary NULL checks for function pointers CORE-11700 --- dll/win32/imm32/ctf.c | 6 ++---- dll/win32/imm32/ime.c | 7 ++----- dll/win32/imm32/imm.c | 8 ++++---- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index 7f5268bffe9..61a36b305ff 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -129,8 +129,7 @@ BOOL WINAPI CtfImmIsGuidMapEnable(HIMC hIMC) if (!pImeDpi) return ret; - if (pImeDpi->CtfImeIsGuidMapEnable) - ret = pImeDpi->CtfImeIsGuidMapEnable(hIMC); + ret = pImeDpi->CtfImeIsGuidMapEnable(hIMC); ImmUnlockImeDpi(pImeDpi); return ret; @@ -162,8 +161,7 @@ HRESULT WINAPI CtfImmGetGuidAtom(HIMC hIMC, DWORD dwUnknown, LPDWORD pdwGuidAtom if (!pImeDpi) return hr; - if (pImeDpi->CtfImeGetGuidAtom) - hr = pImeDpi->CtfImeGetGuidAtom(hIMC, dwUnknown, pdwGuidAtom); + hr = pImeDpi->CtfImeGetGuidAtom(hIMC, dwUnknown, pdwGuidAtom); ImmUnlockImeDpi(pImeDpi); return hr; diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 30cd10b7658..5d6eb7bb374 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -59,7 +59,7 @@ BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi) if (!pImeDpi->ImeInquire(pImeInfo, szUIClass, dwSysInfoFlags)) return FALSE; } - else if (IS_CICERO_MODE() && pImeDpi->CtfImeInquireExW) + else if (IS_CICERO_MODE()) { if (!pImeDpi->CtfImeInquireExW(pImeInfo, szUIClass, dwSysInfoFlags, pImeDpi->hKL)) return FALSE; @@ -311,7 +311,7 @@ ImeDpi_Escape(PIMEDPI pImeDpi, HIMC hIMC, UINT uSubFunc, LPVOID lpData, HKL hKL) if (IS_IME_HKL(hKL)) return pImeDpi->ImeEscape(hIMC, uSubFunc, lpData); - if (IS_CICERO_MODE() && pImeDpi->CtfImeEscapeEx) + if (IS_CICERO_MODE()) return pImeDpi->CtfImeEscapeEx(hIMC, uSubFunc, lpData, hKL); return 0; @@ -604,9 +604,6 @@ ImmGetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParentM return 0; } - if (pImeDpi->ImeGetImeMenuItems == NULL) - goto Quit; - bImcIsAnsi = Imm32IsImcAnsi(hIMC); if (bImcIsAnsi != bTargetIsAnsi) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 9cc21e111c3..2a87fc945ee 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -220,7 +220,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) { if (IS_IME_HKL(hOldKL)) pOldImeDpi->ImeSelect(hIMC, FALSE); - else if (IS_CICERO_MODE() && !IS_16BIT_MODE() && pOldImeDpi->CtfImeSelectEx) + else if (IS_CICERO_MODE() && !IS_16BIT_MODE()) pOldImeDpi->CtfImeSelectEx(hIMC, FALSE, hOldKL); } pClientImc->hKL = NULL; @@ -242,7 +242,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) { if (IS_IME_HKL(hNewKL)) pNewImeDpi->ImeSelect(hIMC, TRUE); - else if (IS_CICERO_MODE() && !IS_16BIT_MODE() && pNewImeDpi->CtfImeSelectEx) + else if (IS_CICERO_MODE() && !IS_16BIT_MODE()) pNewImeDpi->CtfImeSelectEx(hIMC, TRUE, hNewKL); pClientImc->hKL = hNewKL; @@ -389,7 +389,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) { if (IS_IME_HKL(hNewKL)) pNewImeDpi->ImeSelect(hIMC, TRUE); - else if (IS_CICERO_MODE() && !IS_16BIT_MODE() && pNewImeDpi->CtfImeSelectEx) + else if (IS_CICERO_MODE() && !IS_16BIT_MODE()) pNewImeDpi->CtfImeSelectEx(hIMC, TRUE, hNewKL); pClientImc->hKL = hNewKL; @@ -781,7 +781,7 @@ Imm32CreateInputContext(HIMC hIMC, LPINPUTCONTEXT pIC, PCLIENTIMC pClientImc, HK { if (IS_IME_HKL(hKL)) pImeDpi->ImeSelect(hIMC, TRUE); - else if (IS_CICERO_MODE() && !IS_16BIT_MODE() && pImeDpi->CtfImeSelectEx) + else if (IS_CICERO_MODE() && !IS_16BIT_MODE()) pImeDpi->CtfImeSelectEx(hIMC, TRUE, hKL); }
2 years, 3 months
1
0
0
0
[reactos] 01/01: [IMM32] s/Imm32Is16BitMode/IS_16BIT_MODE/
by Katayama Hirofumi MZ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ba378c9015f95d2e5c14…
commit 8ba378c9015f95d2e5c1422bfc68f0a08cdb2573 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 8 09:43:43 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Sep 8 09:43:43 2022 +0900 [IMM32] s/Imm32Is16BitMode/IS_16BIT_MODE/ CORE-11700 --- dll/win32/imm32/ctf.c | 4 ++-- dll/win32/imm32/ime.c | 8 ++++---- dll/win32/imm32/imm.c | 16 ++++++++-------- dll/win32/imm32/precomp.h | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index ecab88a5198..7f5268bffe9 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -116,7 +116,7 @@ BOOL WINAPI CtfImmIsGuidMapEnable(HIMC hIMC) TRACE("(%p)\n", hIMC); - if (!IS_CICERO_MODE() || Imm32Is16BitMode()) + if (!IS_CICERO_MODE() || IS_16BIT_MODE()) return ret; dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); @@ -150,7 +150,7 @@ HRESULT WINAPI CtfImmGetGuidAtom(HIMC hIMC, DWORD dwUnknown, LPDWORD pdwGuidAtom *pdwGuidAtom = 0; - if (!IS_CICERO_MODE() || Imm32Is16BitMode()) + if (!IS_CICERO_MODE() || IS_16BIT_MODE()) return hr; dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 1b2b0c66c2d..30cd10b7658 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -296,7 +296,7 @@ PIMEDPI APIENTRY Imm32FindOrLoadImeDpi(HKL hKL) { PIMEDPI pImeDpi; - if (!IS_IME_HKL(hKL) && (!IS_CICERO_MODE() || Imm32Is16BitMode())) + if (!IS_IME_HKL(hKL) && (!IS_CICERO_MODE() || IS_16BIT_MODE())) return NULL; pImeDpi = ImmLockImeDpi(hKL); @@ -886,7 +886,7 @@ ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID pvSearch if (!IS_IME_HKL(hKL)) { if (!CtfImmIsTextFrameServiceDisabled() || - !IS_CICERO_MODE() || Imm32Is16BitMode()) + !IS_CICERO_MODE() || IS_16BIT_MODE()) { return FALSE; } @@ -997,7 +997,7 @@ BOOL WINAPI ImmLoadIME(HKL hKL) { PIMEDPI pImeDpi; - if (!IS_IME_HKL(hKL) && (!IS_CICERO_MODE() || Imm32Is16BitMode())) + if (!IS_IME_HKL(hKL) && (!IS_CICERO_MODE() || IS_16BIT_MODE())) return FALSE; pImeDpi = Imm32FindImeDpi(hKL); @@ -1825,7 +1825,7 @@ BOOL WINAPI ImmSetConversionStatus(HIMC hIMC, DWORD fdwConversion, DWORD fdwSent TRACE("(%p, 0x%lX, 0x%lX)\n", hIMC, fdwConversion, fdwSentence); hKL = GetKeyboardLayout(0); - if (!IS_IME_HKL(hKL) && IS_CICERO_MODE() && !Imm32Is16BitMode()) + if (!IS_IME_HKL(hKL) && IS_CICERO_MODE() && !IS_16BIT_MODE()) fUseCicero = TRUE; if (Imm32IsCrossThreadAccess(hIMC)) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index b5f288bfa5b..9cc21e111c3 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -62,7 +62,7 @@ BOOL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) ZeroMemory(pImeInfoEx, sizeof(IMEINFOEX)); - if (IS_IME_HKL(hKL) || !IS_CICERO_MODE() || Imm32Is16BitMode()) + if (IS_IME_HKL(hKL) || !IS_CICERO_MODE() || IS_16BIT_MODE()) { StringCchPrintfW(szLayout, _countof(szLayout), L"%s\\%08lX", REGKEY_KEYBOARD_LAYOUTS, HandleToUlong(hKL)); @@ -220,7 +220,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) { if (IS_IME_HKL(hOldKL)) pOldImeDpi->ImeSelect(hIMC, FALSE); - else if (IS_CICERO_MODE() && !Imm32Is16BitMode() && pOldImeDpi->CtfImeSelectEx) + else if (IS_CICERO_MODE() && !IS_16BIT_MODE() && pOldImeDpi->CtfImeSelectEx) pOldImeDpi->CtfImeSelectEx(hIMC, FALSE, hOldKL); } pClientImc->hKL = NULL; @@ -242,7 +242,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) { if (IS_IME_HKL(hNewKL)) pNewImeDpi->ImeSelect(hIMC, TRUE); - else if (IS_CICERO_MODE() && !Imm32Is16BitMode() && pNewImeDpi->CtfImeSelectEx) + else if (IS_CICERO_MODE() && !IS_16BIT_MODE() && pNewImeDpi->CtfImeSelectEx) pNewImeDpi->CtfImeSelectEx(hIMC, TRUE, hNewKL); pClientImc->hKL = hNewKL; @@ -389,7 +389,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) { if (IS_IME_HKL(hNewKL)) pNewImeDpi->ImeSelect(hIMC, TRUE); - else if (IS_CICERO_MODE() && !Imm32Is16BitMode() && pNewImeDpi->CtfImeSelectEx) + else if (IS_CICERO_MODE() && !IS_16BIT_MODE() && pNewImeDpi->CtfImeSelectEx) pNewImeDpi->CtfImeSelectEx(hIMC, TRUE, hNewKL); pClientImc->hKL = hNewKL; @@ -681,7 +681,7 @@ BOOL APIENTRY Imm32DestroyInputContext(HIMC hIMC, HKL hKL, BOOL bKeep) { if (IS_IME_HKL(hKL)) pImeDpi->ImeSelect(hIMC, FALSE); - else if (IS_CICERO_MODE() && !Imm32Is16BitMode()) + else if (IS_CICERO_MODE() && !IS_16BIT_MODE()) pImeDpi->CtfImeSelectEx(hIMC, FALSE, hKL); ImmUnlockImeDpi(pImeDpi); @@ -781,7 +781,7 @@ Imm32CreateInputContext(HIMC hIMC, LPINPUTCONTEXT pIC, PCLIENTIMC pClientImc, HK { if (IS_IME_HKL(hKL)) pImeDpi->ImeSelect(hIMC, TRUE); - else if (IS_CICERO_MODE() && !Imm32Is16BitMode() && pImeDpi->CtfImeSelectEx) + else if (IS_CICERO_MODE() && !IS_16BIT_MODE() && pImeDpi->CtfImeSelectEx) pImeDpi->CtfImeSelectEx(hIMC, TRUE, hKL); } @@ -831,7 +831,7 @@ LPINPUTCONTEXT APIENTRY Imm32InternalLockIMC(HIMC hIMC, BOOL fSelect) } dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); - if (dwThreadId == GetCurrentThreadId() && IS_CICERO_MODE() && !Imm32Is16BitMode()) + if (dwThreadId == GetCurrentThreadId() && IS_CICERO_MODE() && !IS_16BIT_MODE()) { hOldKL = GetKeyboardLayout(0); LangID = LOWORD(hOldKL); @@ -1177,7 +1177,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive) hKL = GetKeyboardLayout(0); - if (IS_CICERO_MODE() && !Imm32Is16BitMode()) + if (IS_CICERO_MODE() && !IS_16BIT_MODE()) { Imm32CiceroSetActiveContext(hIMC, fActive, hWnd, hKL); hKL = GetKeyboardLayout(0); diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 5c693eab26f..ca8da55a108 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -114,7 +114,7 @@ static inline BOOL Imm32IsCrossProcessAccess(HWND hWnd) BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC); #define ImeDpi_IsUnicode(pImeDpi) ((pImeDpi)->ImeInfo.fdwProperty & IME_PROP_UNICODE) -#define Imm32Is16BitMode() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT) +#define IS_16BIT_MODE() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT) DWORD APIENTRY CandidateListWideToAnsi(const CANDIDATELIST *pWideCL, LPCANDIDATELIST pAnsiCL, DWORD dwBufLen,
2 years, 3 months
1
0
0
0
[reactos] 01/01: [IMM32] s/Imm32IsCiceroMode/IS_CICERO_MODE/
by Katayama Hirofumi MZ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b87c95e2328eb3e742b2…
commit 5b87c95e2328eb3e742b2ba260ade9a27050a738 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 8 09:40:50 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Sep 8 09:40:50 2022 +0900 [IMM32] s/Imm32IsCiceroMode/IS_CICERO_MODE/ CORE-11700 --- dll/win32/imm32/ctf.c | 8 ++++---- dll/win32/imm32/ime.c | 12 ++++++------ dll/win32/imm32/imm.c | 18 +++++++++--------- dll/win32/imm32/precomp.h | 2 -- win32ss/include/ntuser.h | 3 ++- win32ss/user/ntuser/ntuser.h | 1 - 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index 7c4c9dae4ac..ecab88a5198 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -40,7 +40,7 @@ HRESULT APIENTRY Imm32CtfImeDestroyInputContext(HIMC hIMC) // Win: CtfImmTIMDestroyInputContext HRESULT APIENTRY CtfImmTIMDestroyInputContext(HIMC hIMC) { - if (!Imm32IsCiceroMode() || (GetWin32ClientInfo()->dwCompatFlags2 & 2)) + if (!IS_CICERO_MODE() || (GetWin32ClientInfo()->dwCompatFlags2 & 2)) return E_NOINTERFACE; return Imm32CtfImeDestroyInputContext(hIMC); @@ -58,7 +58,7 @@ HRESULT APIENTRY CtfImmTIMCreateInputContext(HIMC hIMC) */ BOOL WINAPI CtfImmIsCiceroEnabled(VOID) { - return Imm32IsCiceroMode(); + return IS_CICERO_MODE(); } /*********************************************************************** @@ -116,7 +116,7 @@ BOOL WINAPI CtfImmIsGuidMapEnable(HIMC hIMC) TRACE("(%p)\n", hIMC); - if (!Imm32IsCiceroMode() || Imm32Is16BitMode()) + if (!IS_CICERO_MODE() || Imm32Is16BitMode()) return ret; dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); @@ -150,7 +150,7 @@ HRESULT WINAPI CtfImmGetGuidAtom(HIMC hIMC, DWORD dwUnknown, LPDWORD pdwGuidAtom *pdwGuidAtom = 0; - if (!Imm32IsCiceroMode() || Imm32Is16BitMode()) + if (!IS_CICERO_MODE() || Imm32Is16BitMode()) return hr; dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index dd3519087a4..1b2b0c66c2d 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -59,7 +59,7 @@ BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi) if (!pImeDpi->ImeInquire(pImeInfo, szUIClass, dwSysInfoFlags)) return FALSE; } - else if (Imm32IsCiceroMode() && pImeDpi->CtfImeInquireExW) + else if (IS_CICERO_MODE() && pImeDpi->CtfImeInquireExW) { if (!pImeDpi->CtfImeInquireExW(pImeInfo, szUIClass, dwSysInfoFlags, pImeDpi->hKL)) return FALSE; @@ -296,7 +296,7 @@ PIMEDPI APIENTRY Imm32FindOrLoadImeDpi(HKL hKL) { PIMEDPI pImeDpi; - if (!IS_IME_HKL(hKL) && (!Imm32IsCiceroMode() || Imm32Is16BitMode())) + if (!IS_IME_HKL(hKL) && (!IS_CICERO_MODE() || Imm32Is16BitMode())) return NULL; pImeDpi = ImmLockImeDpi(hKL); @@ -311,7 +311,7 @@ ImeDpi_Escape(PIMEDPI pImeDpi, HIMC hIMC, UINT uSubFunc, LPVOID lpData, HKL hKL) if (IS_IME_HKL(hKL)) return pImeDpi->ImeEscape(hIMC, uSubFunc, lpData); - if (Imm32IsCiceroMode() && pImeDpi->CtfImeEscapeEx) + if (IS_CICERO_MODE() && pImeDpi->CtfImeEscapeEx) return pImeDpi->CtfImeEscapeEx(hIMC, uSubFunc, lpData, hKL); return 0; @@ -886,7 +886,7 @@ ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID pvSearch if (!IS_IME_HKL(hKL)) { if (!CtfImmIsTextFrameServiceDisabled() || - !Imm32IsCiceroMode() || Imm32Is16BitMode()) + !IS_CICERO_MODE() || Imm32Is16BitMode()) { return FALSE; } @@ -997,7 +997,7 @@ BOOL WINAPI ImmLoadIME(HKL hKL) { PIMEDPI pImeDpi; - if (!IS_IME_HKL(hKL) && (!Imm32IsCiceroMode() || Imm32Is16BitMode())) + if (!IS_IME_HKL(hKL) && (!IS_CICERO_MODE() || Imm32Is16BitMode())) return FALSE; pImeDpi = Imm32FindImeDpi(hKL); @@ -1825,7 +1825,7 @@ BOOL WINAPI ImmSetConversionStatus(HIMC hIMC, DWORD fdwConversion, DWORD fdwSent TRACE("(%p, 0x%lX, 0x%lX)\n", hIMC, fdwConversion, fdwSentence); hKL = GetKeyboardLayout(0); - if (!IS_IME_HKL(hKL) && Imm32IsCiceroMode() && !Imm32Is16BitMode()) + if (!IS_IME_HKL(hKL) && IS_CICERO_MODE() && !Imm32Is16BitMode()) fUseCicero = TRUE; if (Imm32IsCrossThreadAccess(hIMC)) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 13512cadb11..b5f288bfa5b 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -62,7 +62,7 @@ BOOL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) ZeroMemory(pImeInfoEx, sizeof(IMEINFOEX)); - if (IS_IME_HKL(hKL) || !Imm32IsCiceroMode() || Imm32Is16BitMode()) + if (IS_IME_HKL(hKL) || !IS_CICERO_MODE() || Imm32Is16BitMode()) { StringCchPrintfW(szLayout, _countof(szLayout), L"%s\\%08lX", REGKEY_KEYBOARD_LAYOUTS, HandleToUlong(hKL)); @@ -220,7 +220,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) { if (IS_IME_HKL(hOldKL)) pOldImeDpi->ImeSelect(hIMC, FALSE); - else if (Imm32IsCiceroMode() && !Imm32Is16BitMode() && pOldImeDpi->CtfImeSelectEx) + else if (IS_CICERO_MODE() && !Imm32Is16BitMode() && pOldImeDpi->CtfImeSelectEx) pOldImeDpi->CtfImeSelectEx(hIMC, FALSE, hOldKL); } pClientImc->hKL = NULL; @@ -228,7 +228,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) if (CtfImmIsTextFrameServiceDisabled()) { - if (IS_IMM_MODE() && !Imm32IsCiceroMode()) + if (IS_IMM_MODE() && !IS_CICERO_MODE()) { bIsNewHKLIme = IS_IME_HKL(hNewKL); bIsOldHKLIme = IS_IME_HKL(hOldKL); @@ -242,7 +242,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) { if (IS_IME_HKL(hNewKL)) pNewImeDpi->ImeSelect(hIMC, TRUE); - else if (Imm32IsCiceroMode() && !Imm32Is16BitMode() && pNewImeDpi->CtfImeSelectEx) + else if (IS_CICERO_MODE() && !Imm32Is16BitMode() && pNewImeDpi->CtfImeSelectEx) pNewImeDpi->CtfImeSelectEx(hIMC, TRUE, hNewKL); pClientImc->hKL = hNewKL; @@ -389,7 +389,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) { if (IS_IME_HKL(hNewKL)) pNewImeDpi->ImeSelect(hIMC, TRUE); - else if (Imm32IsCiceroMode() && !Imm32Is16BitMode() && pNewImeDpi->CtfImeSelectEx) + else if (IS_CICERO_MODE() && !Imm32Is16BitMode() && pNewImeDpi->CtfImeSelectEx) pNewImeDpi->CtfImeSelectEx(hIMC, TRUE, hNewKL); pClientImc->hKL = hNewKL; @@ -681,7 +681,7 @@ BOOL APIENTRY Imm32DestroyInputContext(HIMC hIMC, HKL hKL, BOOL bKeep) { if (IS_IME_HKL(hKL)) pImeDpi->ImeSelect(hIMC, FALSE); - else if (Imm32IsCiceroMode() && !Imm32Is16BitMode()) + else if (IS_CICERO_MODE() && !Imm32Is16BitMode()) pImeDpi->CtfImeSelectEx(hIMC, FALSE, hKL); ImmUnlockImeDpi(pImeDpi); @@ -781,7 +781,7 @@ Imm32CreateInputContext(HIMC hIMC, LPINPUTCONTEXT pIC, PCLIENTIMC pClientImc, HK { if (IS_IME_HKL(hKL)) pImeDpi->ImeSelect(hIMC, TRUE); - else if (Imm32IsCiceroMode() && !Imm32Is16BitMode() && pImeDpi->CtfImeSelectEx) + else if (IS_CICERO_MODE() && !Imm32Is16BitMode() && pImeDpi->CtfImeSelectEx) pImeDpi->CtfImeSelectEx(hIMC, TRUE, hKL); } @@ -831,7 +831,7 @@ LPINPUTCONTEXT APIENTRY Imm32InternalLockIMC(HIMC hIMC, BOOL fSelect) } dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); - if (dwThreadId == GetCurrentThreadId() && Imm32IsCiceroMode() && !Imm32Is16BitMode()) + if (dwThreadId == GetCurrentThreadId() && IS_CICERO_MODE() && !Imm32Is16BitMode()) { hOldKL = GetKeyboardLayout(0); LangID = LOWORD(hOldKL); @@ -1177,7 +1177,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive) hKL = GetKeyboardLayout(0); - if (Imm32IsCiceroMode() && !Imm32Is16BitMode()) + if (IS_CICERO_MODE() && !Imm32Is16BitMode()) { Imm32CiceroSetActiveContext(hIMC, fActive, hWnd, hKL); hKL = GetKeyboardLayout(0); diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index c87e6fa6e54..5c693eab26f 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -114,8 +114,6 @@ static inline BOOL Imm32IsCrossProcessAccess(HWND hWnd) BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC); #define ImeDpi_IsUnicode(pImeDpi) ((pImeDpi)->ImeInfo.fdwProperty & IME_PROP_UNICODE) -#define IS_IMM_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_IMM32)) -#define Imm32IsCiceroMode() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) #define Imm32Is16BitMode() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT) DWORD APIENTRY diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 2a6194841e0..f7d753b5361 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -1201,7 +1201,8 @@ typedef enum IMEINFOEXCLASS } IMEINFOEXCLASS; #define IS_IME_HKL(hkl) ((((ULONG_PTR)(hkl)) & 0xF0000000) == 0xE0000000) -#define IS_CICERO_MODE() (gpsi->dwSRVIFlags & SRVINFO_CICERO_ENABLED) +#define IS_IMM_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_IMM32)) +#define IS_CICERO_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) typedef struct tagIMEUI { diff --git a/win32ss/user/ntuser/ntuser.h b/win32ss/user/ntuser/ntuser.h index 5060a661305..01232f9323a 100644 --- a/win32ss/user/ntuser/ntuser.h +++ b/win32ss/user/ntuser/ntuser.h @@ -4,7 +4,6 @@ #define RETURN(value) { _ret_ = value; goto _cleanup_; } #define CLEANUP /*unreachable*/ ASSERT(FALSE); _cleanup_ #define END_CLEANUP return _ret_; -#define IS_IMM_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_IMM32)) #define UserEnterCo UserEnterExclusive #define UserLeaveCo UserLeave
2 years, 3 months
1
0
0
0
[reactos] 01/01: [DESKADP] Add some spacing between the "legend" and the data (#4668)
by Kyle Katarn
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f47c261ad01e2b0eff845…
commit f47c261ad01e2b0eff8456de6d4582c0d8d16d0f Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Thu Sep 8 01:28:13 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 8 02:28:13 2022 +0300 [DESKADP] Add some spacing between the "legend" and the data (#4668) Follow up of PR #4665 (cb6b07ee). Reviewed-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/shellext/deskadp/lang/bg-BG.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/cs-CZ.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/de-DE.rc | 18 +++++++++--------- dll/shellext/deskadp/lang/el-GR.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/en-US.rc | 10 +++++----- dll/shellext/deskadp/lang/es-ES.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/eu-ES.rc | 22 +++++++++++----------- dll/shellext/deskadp/lang/fr-FR.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/he-IL.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/hi-IN.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/it-IT.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/no-NO.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/pl-PL.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/pt-PT.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/ro-RO.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/ru-RU.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/sk-SK.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/sq-AL.rc | 10 +++++----- dll/shellext/deskadp/lang/tr-TR.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/uk-UA.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/zh-CN.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/zh-HK.rc | 20 ++++++++++---------- dll/shellext/deskadp/lang/zh-TW.rc | 20 ++++++++++---------- 23 files changed, 220 insertions(+), 220 deletions(-) diff --git a/dll/shellext/deskadp/lang/bg-BG.rc b/dll/shellext/deskadp/lang/bg-BG.rc index 226c92a30fe..68ae07c8623 100644 --- a/dll/shellext/deskadp/lang/bg-BG.rc +++ b/dll/shellext/deskadp/lang/bg-BG.rc @@ -10,16 +10,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Свойства", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Сведения за картата:", -1, 7, 56, 237, 75 - LTEXT "Вид чип:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 85, 68, 155, 8, SS_NOPREFIX - LTEXT "Вид ЦАП:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 85, 80, 155, 8, SS_NOPREFIX - LTEXT "Размер на паметта:", -1, 13, 92, 75, 8 - LTEXT "", IDC_MEMORYSIZE, 85, 92, 155, 8, SS_NOPREFIX - LTEXT "Низ на картата:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 85, 104, 155, 8, SS_NOPREFIX - LTEXT "Сведения на БИОСа:", -1, 13, 115, 75, 8 - LTEXT "", IDC_BIOSINFORMATION, 85, 115, 155, 8, SS_NOPREFIX + LTEXT "Вид чип:", -1, 13, 68, 72, 8 + LTEXT "", IDC_CHIPTYPE, 91, 68, 150, 8, SS_NOPREFIX + LTEXT "Вид ЦАП:", -1, 13, 80, 72, 8 + LTEXT "", IDC_DACTYPE, 91, 80, 150, 8, SS_NOPREFIX + LTEXT "Размер на паметта:", -1, 13, 92, 72, 8 + LTEXT "", IDC_MEMORYSIZE, 91, 92, 150, 8, SS_NOPREFIX + LTEXT "Низ на картата:", -1, 13, 104, 72, 8 + LTEXT "", IDC_ADAPTERSTRING, 91, 104, 150, 8, SS_NOPREFIX + LTEXT "Сведения на БИОСа:", -1, 13, 115, 72, 8 + LTEXT "", IDC_BIOSINFORMATION, 91, 115, 150, 8, SS_NOPREFIX PUSHBUTTON "&Списък на всички режими...", IDC_LISTALLMODES, 7, 139, 110, 14 END diff --git a/dll/shellext/deskadp/lang/cs-CZ.rc b/dll/shellext/deskadp/lang/cs-CZ.rc index ce635d65fb3..66f656a7fd0 100644 --- a/dll/shellext/deskadp/lang/cs-CZ.rc +++ b/dll/shellext/deskadp/lang/cs-CZ.rc @@ -15,16 +15,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Vlastnosti", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Informace o adaptéru", -1, 7, 56, 237, 75 - LTEXT "Typ čipu:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "Typ DAC:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "Velikost paměti:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "Řetězec:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "BIOS informace:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "Typ čipu:", -1, 13, 68, 53, 8 + LTEXT "", IDC_CHIPTYPE, 72, 68, 169, 8, SS_NOPREFIX + LTEXT "Typ DAC:", -1, 13, 80, 53, 8 + LTEXT "", IDC_DACTYPE, 72, 80, 169, 8, SS_NOPREFIX + LTEXT "Velikost paměti:", -1, 13, 92, 53, 8 + LTEXT "", IDC_MEMORYSIZE, 72, 92, 169, 8, SS_NOPREFIX + LTEXT "Řetězec:", -1, 13, 104, 53, 8 + LTEXT "", IDC_ADAPTERSTRING, 72, 104, 169, 8, SS_NOPREFIX + LTEXT "BIOS informace:", -1, 13, 116, 53, 8 + LTEXT "", IDC_BIOSINFORMATION, 72, 116, 169, 8, SS_NOPREFIX PUSHBUTTON "&Zobrazit režimy", IDC_LISTALLMODES, 7, 139, 75, 14 END diff --git a/dll/shellext/deskadp/lang/de-DE.rc b/dll/shellext/deskadp/lang/de-DE.rc index 268f2267ce4..211242c5949 100644 --- a/dll/shellext/deskadp/lang/de-DE.rc +++ b/dll/shellext/deskadp/lang/de-DE.rc @@ -10,16 +10,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Einstellungen", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Adapter-Informationen", -1, 7, 56, 237, 75 - LTEXT "Chiptyp:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 81, 68, 160, 8, SS_NOPREFIX - LTEXT "DAC Typ:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 81, 80, 160, 8, SS_NOPREFIX - LTEXT "Speichergröße:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 81, 92, 160, 8, SS_NOPREFIX - LTEXT "Zeichenfolge:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 81, 104, 160, 8, SS_NOPREFIX + LTEXT "Chiptyp:", -1, 13, 68, 65, 8 + LTEXT "", IDC_CHIPTYPE, 84, 68, 157, 8, SS_NOPREFIX + LTEXT "DAC Typ:", -1, 13, 80, 65, 8 + LTEXT "", IDC_DACTYPE, 84, 80, 157, 8, SS_NOPREFIX + LTEXT "Speichergröße:", -1, 13, 92, 65, 8 + LTEXT "", IDC_MEMORYSIZE, 84, 92, 157, 8, SS_NOPREFIX + LTEXT "Zeichenfolge:", -1, 13, 104, 65, 8 + LTEXT "", IDC_ADAPTERSTRING, 84, 104, 157, 8, SS_NOPREFIX LTEXT "BIOS-Informationen:", -1, 13, 116, 65, 8 - LTEXT "", IDC_BIOSINFORMATION, 81, 116, 160, 8, SS_NOPREFIX + LTEXT "", IDC_BIOSINFORMATION, 84, 116, 157, 8, SS_NOPREFIX PUSHBUTTON "Alle Modi auf&listen...", IDC_LISTALLMODES, 7, 139, 75, 14 END diff --git a/dll/shellext/deskadp/lang/el-GR.rc b/dll/shellext/deskadp/lang/el-GR.rc index 23336e3fbe5..09496888f4d 100644 --- a/dll/shellext/deskadp/lang/el-GR.rc +++ b/dll/shellext/deskadp/lang/el-GR.rc @@ -10,16 +10,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Ιδιότητες", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Πληφορορίες για τον προσαρμογέα", -1, 7, 56, 237, 75 - LTEXT "Τύπος chip:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "Τύπος DAC:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "Μέγεθος μνήμης:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "Συμβολοσειρά προσαρμογέα:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "Στοιχεία BIOS:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "Τύπος chip:", -1, 13, 68, 56, 8 + LTEXT "", IDC_CHIPTYPE, 75, 68, 166, 8, SS_NOPREFIX + LTEXT "Τύπος DAC:", -1, 13, 80, 56, 8 + LTEXT "", IDC_DACTYPE, 75, 80, 166, 8, SS_NOPREFIX + LTEXT "Μέγεθος μνήμης:", -1, 13, 92, 56, 8 + LTEXT "", IDC_MEMORYSIZE, 75, 92, 166, 8, SS_NOPREFIX + LTEXT "Συμβολοσειρά προσαρμογέα:", -1, 13, 104, 56, 8 + LTEXT "", IDC_ADAPTERSTRING, 75, 104, 166, 8, SS_NOPREFIX + LTEXT "Στοιχεία BIOS:", -1, 13, 116, 56, 8 + LTEXT "", IDC_BIOSINFORMATION, 75, 116, 166, 8, SS_NOPREFIX PUSHBUTTON "&Λίστα καταστάσεων λειτουργίας...", IDC_LISTALLMODES, 7, 139, 75, 14 END diff --git a/dll/shellext/deskadp/lang/en-US.rc b/dll/shellext/deskadp/lang/en-US.rc index 71d5237f7a9..2347f96574d 100644 --- a/dll/shellext/deskadp/lang/en-US.rc +++ b/dll/shellext/deskadp/lang/en-US.rc @@ -11,15 +11,15 @@ BEGIN PUSHBUTTON "&Properties", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Adapter Information", -1, 7, 56, 237, 75 LTEXT "Chip Type:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "", IDC_CHIPTYPE, 77, 68, 164, 8, SS_NOPREFIX LTEXT "DAC Type:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "", IDC_DACTYPE, 77, 80, 164, 8, SS_NOPREFIX LTEXT "Memory Size:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "", IDC_MEMORYSIZE, 77, 92, 164, 8, SS_NOPREFIX LTEXT "Adapter String:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX + LTEXT "", IDC_ADAPTERSTRING, 77, 104, 164, 8, SS_NOPREFIX LTEXT "BIOS Information:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "", IDC_BIOSINFORMATION, 77, 116, 164, 8, SS_NOPREFIX PUSHBUTTON "&List All Modes...", IDC_LISTALLMODES, 7, 139, 75, 14 END diff --git a/dll/shellext/deskadp/lang/es-ES.rc b/dll/shellext/deskadp/lang/es-ES.rc index 3293fc82519..f4706d3e1b1 100644 --- a/dll/shellext/deskadp/lang/es-ES.rc +++ b/dll/shellext/deskadp/lang/es-ES.rc @@ -12,16 +12,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Propiedades", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Información del adaptador ", -1, 7, 56, 237, 75 - LTEXT "Tipo de Chip:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 90, 68, 150, 8, SS_NOPREFIX - LTEXT "Tipo de DAC:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 90, 80, 150, 8, SS_NOPREFIX - LTEXT "Tamaño de memoria:", -1, 13, 92, 70, 8 - LTEXT "", IDC_MEMORYSIZE, 90, 92, 150, 8, SS_NOPREFIX - LTEXT "Nombre del adaptador:", -1, 13, 104, 80, 8 - LTEXT "", IDC_ADAPTERSTRING, 90, 104, 150, 8, SS_NOPREFIX - LTEXT "Información de la BIOS:", -1, 13, 116, 80, 8 - LTEXT "", IDC_BIOSINFORMATION, 90, 116, 150, 8, SS_NOPREFIX + LTEXT "Tipo de Chip:", -1, 13, 68, 77, 8 + LTEXT "", IDC_CHIPTYPE, 96, 68, 145, 8, SS_NOPREFIX + LTEXT "Tipo de DAC:", -1, 13, 80, 77, 8 + LTEXT "", IDC_DACTYPE, 96, 80, 145, 8, SS_NOPREFIX + LTEXT "Tamaño de memoria:", -1, 13, 92, 77, 8 + LTEXT "", IDC_MEMORYSIZE, 96, 92, 145, 8, SS_NOPREFIX + LTEXT "Nombre del adaptador:", -1, 13, 104, 77, 8 + LTEXT "", IDC_ADAPTERSTRING, 96, 104, 145, 8, SS_NOPREFIX + LTEXT "Información de la BIOS:", -1, 13, 116, 77, 8 + LTEXT "", IDC_BIOSINFORMATION, 96, 116, 145, 8, SS_NOPREFIX PUSHBUTTON "&Listar todos los modos...", IDC_LISTALLMODES, 7, 139, 85, 14 END diff --git a/dll/shellext/deskadp/lang/eu-ES.rc b/dll/shellext/deskadp/lang/eu-ES.rc index 178c95a0744..8ace5204dd8 100644 --- a/dll/shellext/deskadp/lang/eu-ES.rc +++ b/dll/shellext/deskadp/lang/eu-ES.rc @@ -9,17 +9,17 @@ BEGIN ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Propietateak", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 - GROUPBOX "Adaptadorearen informazioa ", -1, 7, 56, 237, 75 - LTEXT "Chip mota:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 90, 68, 150, 8, SS_NOPREFIX - LTEXT "DAC mota:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 90, 80, 150, 8, SS_NOPREFIX - LTEXT "Memoriaren neurria:", -1, 13, 92, 70, 8 - LTEXT "", IDC_MEMORYSIZE, 90, 92, 150, 8, SS_NOPREFIX - LTEXT "Adaptadorearen izena:", -1, 13, 104, 80, 8 - LTEXT "", IDC_ADAPTERSTRING, 90, 104, 150, 8, SS_NOPREFIX - LTEXT "BIOS-aren informazioa:", -1, 13, 116, 80, 8 - LTEXT "", IDC_BIOSINFORMATION, 90, 116, 150, 8, SS_NOPREFIX + GROUPBOX "Adaptadorearen informazioa", -1, 7, 56, 237, 75 + LTEXT "Chip mota:", -1, 13, 68, 76, 8 + LTEXT "", IDC_CHIPTYPE, 95, 68, 146, 8, SS_NOPREFIX + LTEXT "DAC mota:", -1, 13, 80, 76, 8 + LTEXT "", IDC_DACTYPE, 95, 80, 146, 8, SS_NOPREFIX + LTEXT "Memoriaren neurria:", -1, 13, 92, 76, 8 + LTEXT "", IDC_MEMORYSIZE, 95, 92, 146, 8, SS_NOPREFIX + LTEXT "Adaptadorearen izena:", -1, 13, 104, 76, 8 + LTEXT "", IDC_ADAPTERSTRING, 95, 104, 146, 8, SS_NOPREFIX + LTEXT "BIOS-aren informazioa:", -1, 13, 116, 76, 8 + LTEXT "", IDC_BIOSINFORMATION, 95, 116, 146, 8, SS_NOPREFIX PUSHBUTTON "&Modu guztiak zerrendatu...", IDC_LISTALLMODES, 7, 139, 95, 14 END diff --git a/dll/shellext/deskadp/lang/fr-FR.rc b/dll/shellext/deskadp/lang/fr-FR.rc index f2edf43b85b..0d37198ce8d 100644 --- a/dll/shellext/deskadp/lang/fr-FR.rc +++ b/dll/shellext/deskadp/lang/fr-FR.rc @@ -10,16 +10,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Propriétés", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Informations sur l'adaptateur", -1, 7, 56, 237, 75 - LTEXT "Type de puce :", -1, 13, 68, 85, 8 - LTEXT "", IDC_CHIPTYPE, 87, 68, 148, 8, SS_NOPREFIX - LTEXT "Type de CNA :", -1, 13, 80, 85, 8 - LTEXT "", IDC_DACTYPE, 87, 80, 148, 8, SS_NOPREFIX - LTEXT "Taille de la mémoire :", -1, 13, 92, 85, 8 - LTEXT "", IDC_MEMORYSIZE, 87, 92, 148, 8, SS_NOPREFIX - LTEXT "Adaptateur :", -1, 13, 104, 85, 8 - LTEXT "", IDC_ADAPTERSTRING, 87, 104, 148, 8, SS_NOPREFIX - LTEXT "Informations du BIOS :", -1, 13, 116, 85, 8 - LTEXT "", IDC_BIOSINFORMATION, 87, 116, 148, 8, SS_NOPREFIX + LTEXT "Type de puce :", -1, 13, 68, 74, 8 + LTEXT "", IDC_CHIPTYPE, 93, 68, 148, 8, SS_NOPREFIX + LTEXT "Type de CNA :", -1, 13, 80, 74, 8 + LTEXT "", IDC_DACTYPE, 93, 80, 148, 8, SS_NOPREFIX + LTEXT "Taille de la mémoire :", -1, 13, 92, 74, 8 + LTEXT "", IDC_MEMORYSIZE, 93, 92, 148, 8, SS_NOPREFIX + LTEXT "Adaptateur :", -1, 13, 104, 74, 8 + LTEXT "", IDC_ADAPTERSTRING, 93, 104, 148, 8, SS_NOPREFIX + LTEXT "Informations du BIOS :", -1, 13, 116, 74, 8 + LTEXT "", IDC_BIOSINFORMATION, 93, 116, 148, 8, SS_NOPREFIX PUSHBUTTON "&Lister tous les modes...", IDC_LISTALLMODES, 7, 139, 80, 14 END diff --git a/dll/shellext/deskadp/lang/he-IL.rc b/dll/shellext/deskadp/lang/he-IL.rc index d9fda3723b0..5db6febb84d 100644 --- a/dll/shellext/deskadp/lang/he-IL.rc +++ b/dll/shellext/deskadp/lang/he-IL.rc @@ -11,16 +11,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "מאפיינים", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "פרטי המתאם", -1, 7, 56, 237, 75 - LTEXT "סוג שבב:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "סוג DAC:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "גודל זיכרון:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "מחרוזת מתאם:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "מידע BIOS:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "סוג שבב:", -1, 13, 68, 40, 8 + LTEXT "", IDC_CHIPTYPE, 59, 68, 182, 8, SS_NOPREFIX + LTEXT "סוג DAC:", -1, 13, 80, 40, 8 + LTEXT "", IDC_DACTYPE, 59, 80, 182, 8, SS_NOPREFIX + LTEXT "גודל זיכרון:", -1, 13, 92, 40, 8 + LTEXT "", IDC_MEMORYSIZE, 59, 92, 182, 8, SS_NOPREFIX + LTEXT "מחרוזת מתאם:", -1, 13, 104, 40, 8 + LTEXT "", IDC_ADAPTERSTRING, 59, 104, 182, 8, SS_NOPREFIX + LTEXT "מידע BIOS:", -1, 13, 116, 40, 8 + LTEXT "", IDC_BIOSINFORMATION, 59, 116, 182, 8, SS_NOPREFIX PUSHBUTTON "פרט את כל המצבים...", IDC_LISTALLMODES, 7, 139, 84, 14 END diff --git a/dll/shellext/deskadp/lang/hi-IN.rc b/dll/shellext/deskadp/lang/hi-IN.rc index 44717d95ab8..283e28e9f26 100644 --- a/dll/shellext/deskadp/lang/hi-IN.rc +++ b/dll/shellext/deskadp/lang/hi-IN.rc @@ -17,16 +17,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&गुण", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "अडैप्टर जानकारी", -1, 7, 56, 237, 75 - LTEXT "चिप प्रकार:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "डीएसी प्रकार:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "मेमोरी क्षमता:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "अडैप्टर स्ट्रिंग:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "बाआईओएस जानकारी:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "चिप प्रकार:", -1, 13, 68, 43, 8 + LTEXT "", IDC_CHIPTYPE, 62, 68, 179, 8, SS_NOPREFIX + LTEXT "डीएसी प्रकार:", -1, 13, 80, 43, 8 + LTEXT "", IDC_DACTYPE, 62, 80, 179, 8, SS_NOPREFIX + LTEXT "मेमोरी क्षमता:", -1, 13, 92, 43, 8 + LTEXT "", IDC_MEMORYSIZE, 62, 92, 179, 8, SS_NOPREFIX + LTEXT "अडैप्टर स्ट्रिंग:", -1, 13, 104, 43, 8 + LTEXT "", IDC_ADAPTERSTRING, 62, 104, 179, 8, SS_NOPREFIX + LTEXT "बाआईओएस जानकारी:", -1, 13, 116, 43, 8 + LTEXT "", IDC_BIOSINFORMATION, 62, 116, 179, 8, SS_NOPREFIX PUSHBUTTON "&सभी मोड की सूची दें...", IDC_LISTALLMODES, 7, 139, 75, 14 END diff --git a/dll/shellext/deskadp/lang/it-IT.rc b/dll/shellext/deskadp/lang/it-IT.rc index 79f6ce9b2d6..33f1bc380b3 100644 --- a/dll/shellext/deskadp/lang/it-IT.rc +++ b/dll/shellext/deskadp/lang/it-IT.rc @@ -10,16 +10,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Proprietà", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Informazioni sul'adattatore", -1, 7, 56, 237, 75 - LTEXT "Tipo di Chip:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "Tipo di DAC:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "Quantità di memoria:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "Testo dell'adattatore:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "Informazioni sul BIOS:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "Tipo di Chip:", -1, 13, 68, 72, 8 + LTEXT "", IDC_CHIPTYPE, 91, 68, 150, 8, SS_NOPREFIX + LTEXT "Tipo di DAC:", -1, 13, 80, 72, 8 + LTEXT "", IDC_DACTYPE, 91, 80, 150, 8, SS_NOPREFIX + LTEXT "Quantità di memoria:", -1, 13, 92, 72, 8 + LTEXT "", IDC_MEMORYSIZE, 91, 92, 150, 8, SS_NOPREFIX + LTEXT "Testo dell'adattatore:", -1, 13, 104, 72, 8 + LTEXT "", IDC_ADAPTERSTRING, 91, 104, 150, 8, SS_NOPREFIX + LTEXT "Informazioni sul BIOS:", -1, 13, 116, 72, 8 + LTEXT "", IDC_BIOSINFORMATION, 91, 116, 150, 8, SS_NOPREFIX PUSHBUTTON "&Elenco di tutte le modalità...", IDC_LISTALLMODES, 7, 139, 75, 14 END diff --git a/dll/shellext/deskadp/lang/no-NO.rc b/dll/shellext/deskadp/lang/no-NO.rc index 3cb248bc027..0f944199027 100644 --- a/dll/shellext/deskadp/lang/no-NO.rc +++ b/dll/shellext/deskadp/lang/no-NO.rc @@ -10,16 +10,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Egenskaper", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Kortinformasjon", -1, 7, 56, 237, 75 - LTEXT "Brikketype:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "DAC-type:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "Minne størrelse:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "Kortstreng:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "BIOS-informasjon:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "Brikketype:", -1, 13, 68, 60, 8 + LTEXT "", IDC_CHIPTYPE, 79, 68, 162, 8, SS_NOPREFIX + LTEXT "DAC-type:", -1, 13, 80, 60, 8 + LTEXT "", IDC_DACTYPE, 79, 80, 162, 8, SS_NOPREFIX + LTEXT "Minne størrelse:", -1, 13, 92, 60, 8 + LTEXT "", IDC_MEMORYSIZE, 79, 92, 162, 8, SS_NOPREFIX + LTEXT "Kortstreng:", -1, 13, 104, 60, 8 + LTEXT "", IDC_ADAPTERSTRING, 79, 104, 162, 8, SS_NOPREFIX + LTEXT "BIOS-informasjon:", -1, 13, 116, 60, 8 + LTEXT "", IDC_BIOSINFORMATION, 79, 116, 162, 8, SS_NOPREFIX PUSHBUTTON "&Vis alle modier...", IDC_LISTALLMODES, 7, 139, 75, 14 END diff --git a/dll/shellext/deskadp/lang/pl-PL.rc b/dll/shellext/deskadp/lang/pl-PL.rc index 2b28c09cd49..12e9a86c408 100644 --- a/dll/shellext/deskadp/lang/pl-PL.rc +++ b/dll/shellext/deskadp/lang/pl-PL.rc @@ -19,16 +19,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Właściwości", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Informacje o karcie", -1, 7, 56, 237, 75 - LTEXT "Typ GPU:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "Typ DAC:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "Rozmiar pamięci:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "Ciąg karty:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "Wersja BIOS:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "Typ GPU:", -1, 13, 68, 55, 8 + LTEXT "", IDC_CHIPTYPE, 74, 68, 167, 8, SS_NOPREFIX + LTEXT "Typ DAC:", -1, 13, 80, 55, 8 + LTEXT "", IDC_DACTYPE, 74, 80, 167, 8, SS_NOPREFIX + LTEXT "Rozmiar pamięci:", -1, 13, 92, 55, 8 + LTEXT "", IDC_MEMORYSIZE, 74, 92, 167, 8, SS_NOPREFIX + LTEXT "Ciąg karty:", -1, 13, 104, 55, 8 + LTEXT "", IDC_ADAPTERSTRING, 74, 104, 167, 8, SS_NOPREFIX + LTEXT "Wersja BIOS:", -1, 13, 116, 55, 8 + LTEXT "", IDC_BIOSINFORMATION, 74, 116, 167, 8, SS_NOPREFIX PUSHBUTTON "&Lista wszystkich trybów...", IDC_LISTALLMODES, 7, 139, 110, 14 END diff --git a/dll/shellext/deskadp/lang/pt-PT.rc b/dll/shellext/deskadp/lang/pt-PT.rc index a765064da21..b67915a9eac 100644 --- a/dll/shellext/deskadp/lang/pt-PT.rc +++ b/dll/shellext/deskadp/lang/pt-PT.rc @@ -10,16 +10,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Propriedades", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Informações do Adaptador", -1, 7, 56, 237, 75 - LTEXT "Tipo de chip:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "Tipo de DAC:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "Tamanho da memória:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "Cadeia da placa gráfica:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "Informação sobre o BIOS:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "Tipo de chip:", -1, 13, 68, 84, 8 + LTEXT "", IDC_CHIPTYPE, 103, 68, 138, 8, SS_NOPREFIX + LTEXT "Tipo de DAC:", -1, 13, 80, 84, 8 + LTEXT "", IDC_DACTYPE, 103, 80, 138, 8, SS_NOPREFIX + LTEXT "Tamanho da memória:", -1, 13, 92, 84, 8 + LTEXT "", IDC_MEMORYSIZE, 103, 92, 138, 8, SS_NOPREFIX + LTEXT "Cadeia da placa gráfica:", -1, 13, 104, 84, 8 + LTEXT "", IDC_ADAPTERSTRING, 103, 104, 138, 8, SS_NOPREFIX + LTEXT "Informação sobre o BIOS:", -1, 13, 116, 84, 8 + LTEXT "", IDC_BIOSINFORMATION, 103, 116, 138, 8, SS_NOPREFIX PUSHBUTTON "&Modos...", IDC_LISTALLMODES, 7, 139, 75, 14 END diff --git a/dll/shellext/deskadp/lang/ro-RO.rc b/dll/shellext/deskadp/lang/ro-RO.rc index e0358c515af..8cbc6d448ff 100644 --- a/dll/shellext/deskadp/lang/ro-RO.rc +++ b/dll/shellext/deskadp/lang/ro-RO.rc @@ -18,16 +18,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Proprietăți…", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Despre adaptor", -1, 7, 56, 237, 75 - LTEXT "Tipul de cip:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "Tipul de DAC:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "Memorie:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "Șir adaptor:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "Informație BIOS:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "Tipul de cip:", -1, 13, 68, 56, 8 + LTEXT "", IDC_CHIPTYPE, 75, 68, 166, 8, SS_NOPREFIX + LTEXT "Tipul de DAC:", -1, 13, 80, 56, 8 + LTEXT "", IDC_DACTYPE, 75, 80, 166, 8, SS_NOPREFIX + LTEXT "Memorie:", -1, 13, 92, 56, 8 + LTEXT "", IDC_MEMORYSIZE, 75, 92, 166, 8, SS_NOPREFIX + LTEXT "Șir adaptor:", -1, 13, 104, 56, 8 + LTEXT "", IDC_ADAPTERSTRING, 75, 104, 166, 8, SS_NOPREFIX + LTEXT "Informație BIOS:", -1, 13, 116, 56, 8 + LTEXT "", IDC_BIOSINFORMATION, 75, 116, 166, 8, SS_NOPREFIX PUSHBUTTON "&Enumerare moduri valide…", IDC_LISTALLMODES, 7, 139, 130, 14 END diff --git a/dll/shellext/deskadp/lang/ru-RU.rc b/dll/shellext/deskadp/lang/ru-RU.rc index fb064c19416..8dca13e7b54 100644 --- a/dll/shellext/deskadp/lang/ru-RU.rc +++ b/dll/shellext/deskadp/lang/ru-RU.rc @@ -10,16 +10,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Свойства", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Сведения об адаптере", -1, 7, 56, 237, 75 - LTEXT "Тип микросхем:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 90, 68, 150, 8, SS_NOPREFIX - LTEXT "Тип конвертера DAC:", -1, 13, 80, 80, 8 - LTEXT "", IDC_DACTYPE, 90, 80, 150, 8, SS_NOPREFIX - LTEXT "Объем памяти:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 90, 92, 150, 8, SS_NOPREFIX - LTEXT "Строка контроллера:", -1, 13, 104, 80, 8 - LTEXT "", IDC_ADAPTERSTRING, 90, 104, 150, 8, SS_NOPREFIX - LTEXT "Сведения о BIOS:", -1, 13, 116, 67, 8 - LTEXT "", IDC_BIOSINFORMATION, 90, 116, 150, 8, SS_NOPREFIX + LTEXT "Тип микросхем:", -1, 13, 68, 75, 8 + LTEXT "", IDC_CHIPTYPE, 94, 68, 147, 8, SS_NOPREFIX + LTEXT "Тип конвертера DAC:", -1, 13, 80, 75, 8 + LTEXT "", IDC_DACTYPE, 94, 80, 147, 8, SS_NOPREFIX + LTEXT "Объем памяти:", -1, 13, 92, 75, 8 + LTEXT "", IDC_MEMORYSIZE, 94, 92, 147, 8, SS_NOPREFIX + LTEXT "Строка контроллера:", -1, 13, 104, 75, 8 + LTEXT "", IDC_ADAPTERSTRING, 94, 104, 147, 8, SS_NOPREFIX + LTEXT "Сведения о BIOS:", -1, 13, 116, 75, 8 + LTEXT "", IDC_BIOSINFORMATION, 94, 116, 147, 8, SS_NOPREFIX PUSHBUTTON "&Список всех режимов...", IDC_LISTALLMODES, 7, 139, 95, 14 END diff --git a/dll/shellext/deskadp/lang/sk-SK.rc b/dll/shellext/deskadp/lang/sk-SK.rc index 7a1e19d045f..d1730557f9c 100644 --- a/dll/shellext/deskadp/lang/sk-SK.rc +++ b/dll/shellext/deskadp/lang/sk-SK.rc @@ -17,16 +17,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "Vl&astnosti", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Informácie o adaptéri", -1, 7, 56, 237, 75 - LTEXT "Typ čipu:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "Typ konvertora:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "Veľkosť pamäte:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "Reťazec adaptéra:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "BIOS – informácie:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "Typ čipu:", -1, 13, 68, 61, 8 + LTEXT "", IDC_CHIPTYPE, 80, 68, 161, 8, SS_NOPREFIX + LTEXT "Typ konvertora:", -1, 13, 80, 61, 8 + LTEXT "", IDC_DACTYPE, 80, 80, 161, 8, SS_NOPREFIX + LTEXT "Veľkosť pamäte:", -1, 13, 92, 61, 8 + LTEXT "", IDC_MEMORYSIZE, 80, 92, 161, 8, SS_NOPREFIX + LTEXT "Reťazec adaptéra:", -1, 13, 104, 61, 8 + LTEXT "", IDC_ADAPTERSTRING, 80, 104, 161, 8, SS_NOPREFIX + LTEXT "BIOS – informácie:", -1, 13, 116, 61, 8 + LTEXT "", IDC_BIOSINFORMATION, 80, 116, 161, 8, SS_NOPREFIX PUSHBUTTON "&Zoznam všetkých režimov...", IDC_LISTALLMODES, 7, 139, 100, 14 END diff --git a/dll/shellext/deskadp/lang/sq-AL.rc b/dll/shellext/deskadp/lang/sq-AL.rc index e4901706abb..189c4aa2f06 100644 --- a/dll/shellext/deskadp/lang/sq-AL.rc +++ b/dll/shellext/deskadp/lang/sq-AL.rc @@ -15,15 +15,15 @@ BEGIN PUSHBUTTON "Tipare", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Info mbi dapter", -1, 7, 56, 237, 75 LTEXT "Tipi Chipit:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "", IDC_CHIPTYPE, 77, 68, 164, 8, SS_NOPREFIX LTEXT "Tipi DAC:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "", IDC_DACTYPE, 77, 80, 164, 8, SS_NOPREFIX LTEXT "Masa e Memories:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "", IDC_MEMORYSIZE, 77, 92, 164, 8, SS_NOPREFIX LTEXT "Adapter String:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX + LTEXT "", IDC_ADAPTERSTRING, 77, 104, 164, 8, SS_NOPREFIX LTEXT "BIOS Infor:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "", IDC_BIOSINFORMATION, 77, 116, 164, 8, SS_NOPREFIX PUSHBUTTON "&Listo te gjith mjetet...", IDC_LISTALLMODES, 7, 139, 75, 14 END diff --git a/dll/shellext/deskadp/lang/tr-TR.rc b/dll/shellext/deskadp/lang/tr-TR.rc index 7d0ed9eef5c..85d6a5d816a 100644 --- a/dll/shellext/deskadp/lang/tr-TR.rc +++ b/dll/shellext/deskadp/lang/tr-TR.rc @@ -12,16 +12,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Özellikler", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Bağdaştırıcı Bilgisi", -1, 7, 56, 237, 75 - LTEXT "Yonga Türü:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "DAC Türü:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "Bellek Büyüklüğü:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "Bağdaştırıcı Dizesi:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "BIOS Bilgisi:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "Yonga Türü:", -1, 13, 68, 56, 8 + LTEXT "", IDC_CHIPTYPE, 75, 68, 166, 8, SS_NOPREFIX + LTEXT "DAC Türü:", -1, 13, 80, 56, 8 + LTEXT "", IDC_DACTYPE, 75, 80, 166, 8, SS_NOPREFIX + LTEXT "Bellek Büyüklüğü:", -1, 13, 92, 56, 8 + LTEXT "", IDC_MEMORYSIZE, 75, 92, 166, 8, SS_NOPREFIX + LTEXT "Bağdaştırıcı Dizesi:", -1, 13, 104, 56, 8 + LTEXT "", IDC_ADAPTERSTRING, 75, 104, 166, 8, SS_NOPREFIX + LTEXT "BIOS Bilgisi:", -1, 13, 116, 56, 8 + LTEXT "", IDC_BIOSINFORMATION, 75, 116, 166, 8, SS_NOPREFIX PUSHBUTTON "&Tüm Biçimleri Listele...", IDC_LISTALLMODES, 7, 139, 75, 14 END diff --git a/dll/shellext/deskadp/lang/uk-UA.rc b/dll/shellext/deskadp/lang/uk-UA.rc index f98d60ae05d..cffdf1aae82 100644 --- a/dll/shellext/deskadp/lang/uk-UA.rc +++ b/dll/shellext/deskadp/lang/uk-UA.rc @@ -18,16 +18,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "В&ластивості", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Відомості про адаптер", -1, 7, 56, 237, 75 - LTEXT "Тип мікросхем:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 78, 68, 160, 8, SS_NOPREFIX - LTEXT "Тип ЦАП:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 78, 80, 160, 8, SS_NOPREFIX - LTEXT "Об'єм пам'яті:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 78, 92, 160, 8, SS_NOPREFIX - LTEXT "Рядок контролера:", -1, 13, 104, 80, 8 - LTEXT "", IDC_ADAPTERSTRING, 78, 104, 160, 8, SS_NOPREFIX - LTEXT "Відомості про BIOS:", -1, 13, 116, 80, 8 - LTEXT "", IDC_BIOSINFORMATION, 78, 116, 160, 8, SS_NOPREFIX + LTEXT "Тип мікросхем:", -1, 13, 68, 67, 8 + LTEXT "", IDC_CHIPTYPE, 86, 68, 155, 8, SS_NOPREFIX + LTEXT "Тип ЦАП:", -1, 13, 80, 67, 8 + LTEXT "", IDC_DACTYPE, 86, 80, 155, 8, SS_NOPREFIX + LTEXT "Об'єм пам'яті:", -1, 13, 92, 67, 8 + LTEXT "", IDC_MEMORYSIZE, 86, 92, 155, 8, SS_NOPREFIX + LTEXT "Рядок контролера:", -1, 13, 104, 67, 8 + LTEXT "", IDC_ADAPTERSTRING, 86, 104, 155, 8, SS_NOPREFIX + LTEXT "Відомості про BIOS:", -1, 13, 116, 67, 8 + LTEXT "", IDC_BIOSINFORMATION, 86, 116, 155, 8, SS_NOPREFIX PUSHBUTTON "&Список усіх режимів...", IDC_LISTALLMODES, 7, 139, 80, 14 END diff --git a/dll/shellext/deskadp/lang/zh-CN.rc b/dll/shellext/deskadp/lang/zh-CN.rc index eb08d41cc12..4e16ee3e427 100644 --- a/dll/shellext/deskadp/lang/zh-CN.rc +++ b/dll/shellext/deskadp/lang/zh-CN.rc @@ -12,16 +12,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "属性(&P)", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "适配器信息", -1, 7, 56, 237, 75 - LTEXT "芯片类型:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "DAC 类型:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "内存大小:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "适配器字符串:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "BIOS 信息:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "芯片类型:", -1, 13, 68, 56, 8 + LTEXT "", IDC_CHIPTYPE, 75, 68, 166, 8, SS_NOPREFIX + LTEXT "DAC 类型:", -1, 13, 80, 56, 8 + LTEXT "", IDC_DACTYPE, 75, 80, 166, 8, SS_NOPREFIX + LTEXT "内存大小:", -1, 13, 92, 56, 8 + LTEXT "", IDC_MEMORYSIZE, 75, 92, 166, 8, SS_NOPREFIX + LTEXT "适配器字符串:", -1, 13, 104, 56, 8 + LTEXT "", IDC_ADAPTERSTRING, 75, 104, 166, 8, SS_NOPREFIX + LTEXT "BIOS 信息:", -1, 13, 116, 56, 8 + LTEXT "", IDC_BIOSINFORMATION, 75, 116, 166, 8, SS_NOPREFIX PUSHBUTTON "列出所有模式...(&L)", IDC_LISTALLMODES, 7, 139, 75, 14 END diff --git a/dll/shellext/deskadp/lang/zh-HK.rc b/dll/shellext/deskadp/lang/zh-HK.rc index bbb370f85c0..b3ed19f9fe9 100644 --- a/dll/shellext/deskadp/lang/zh-HK.rc +++ b/dll/shellext/deskadp/lang/zh-HK.rc @@ -18,16 +18,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "內容(&P)", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "介面卡資訊", -1, 7, 56, 237, 75 - LTEXT "晶片類型:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "DAC 類型:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "記憶體大小:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "介面卡字元串:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "BIOS 資訊:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "晶片類型:", -1, 13, 68, 56, 8 + LTEXT "", IDC_CHIPTYPE, 75, 68, 166, 8, SS_NOPREFIX + LTEXT "DAC 類型:", -1, 13, 80, 56, 8 + LTEXT "", IDC_DACTYPE, 75, 80, 166, 8, SS_NOPREFIX + LTEXT "記憶體大小:", -1, 13, 92, 56, 8 + LTEXT "", IDC_MEMORYSIZE, 75, 92, 166, 8, SS_NOPREFIX + LTEXT "介面卡字元串:", -1, 13, 104, 56, 8 + LTEXT "", IDC_ADAPTERSTRING, 75, 104, 166, 8, SS_NOPREFIX + LTEXT "BIOS 資訊:", -1, 13, 116, 56, 8 + LTEXT "", IDC_BIOSINFORMATION, 75, 116, 166, 8, SS_NOPREFIX PUSHBUTTON "列出所有模式(&L)...", IDC_LISTALLMODES, 7, 139, 75, 14 END diff --git a/dll/shellext/deskadp/lang/zh-TW.rc b/dll/shellext/deskadp/lang/zh-TW.rc index aefd9ed2fc6..404f018f1fe 100644 --- a/dll/shellext/deskadp/lang/zh-TW.rc +++ b/dll/shellext/deskadp/lang/zh-TW.rc @@ -18,16 +18,16 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "內容(&P)", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "介面卡資訊", -1, 7, 56, 237, 75 - LTEXT "晶片類型:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "DAC 類型:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "記憶體大小:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "介面卡字元串:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "BIOS 資訊:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "晶片類型:", -1, 13, 68, 56, 8 + LTEXT "", IDC_CHIPTYPE, 75, 68, 166, 8, SS_NOPREFIX + LTEXT "DAC 類型:", -1, 13, 80, 56, 8 + LTEXT "", IDC_DACTYPE, 75, 80, 166, 8, SS_NOPREFIX + LTEXT "記憶體大小:", -1, 13, 92, 56, 8 + LTEXT "", IDC_MEMORYSIZE, 75, 92, 166, 8, SS_NOPREFIX + LTEXT "介面卡字元串:", -1, 13, 104, 56, 8 + LTEXT "", IDC_ADAPTERSTRING, 75, 104, 166, 8, SS_NOPREFIX + LTEXT "BIOS 資訊:", -1, 13, 116, 56, 8 + LTEXT "", IDC_BIOSINFORMATION, 75, 116, 166, 8, SS_NOPREFIX PUSHBUTTON "列出所有模式(&L)...", IDC_LISTALLMODES, 7, 139, 75, 14 END
2 years, 3 months
1
0
0
0
[reactos] 01/01: [BOOTDATA] Delete "Layout Id" from Japanese/Korean Keyboard Layout
by Katayama Hirofumi MZ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3f8f52f3d719d9893d17…
commit e3f8f52f3d719d9893d17f879c9ec2d66dcebb5b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 7 17:40:51 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Sep 7 17:40:51 2022 +0900 [BOOTDATA] Delete "Layout Id" from Japanese/Korean Keyboard Layout CORE-11700 --- boot/bootdata/hivesys.inf | 2 -- 1 file changed, 2 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 08210654e43..ff31905f025 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -629,12 +629,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout Displa HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout File",0x00000000,"kbdjpn.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Text",0x00000000,%JAPANESE% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5061" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Id",0x00000000,"0001" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout File",0x00000000,"kbdkor.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Text",0x00000000,%KOREAN% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5063" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Id",0x00000000,"0001" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000413","Layout File",0x00000000,"kbdne.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000413","Layout Text",0x00000000,%DUTCH%
2 years, 3 months
1
0
0
0
[reactos] 04/04: [STOBJECT] Add support for the mouse key tray icon
by Mark Jansen
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27bc31100eda0d5424ef9…
commit 27bc31100eda0d5424ef991b6dbe033bd31522b5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jun 18 21:24:41 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Sep 6 21:11:09 2022 +0200 [STOBJECT] Add support for the mouse key tray icon --- dll/shellext/stobject/CMakeLists.txt | 1 + dll/shellext/stobject/csystray.cpp | 25 +++++ dll/shellext/stobject/csystray.h | 1 + dll/shellext/stobject/mouse.cpp | 125 +++++++++++++++++++++ dll/shellext/stobject/precomp.h | 6 + dll/shellext/stobject/resource.h | 12 ++ dll/shellext/stobject/resources/mouse/disabled.ico | Bin 0 -> 1406 bytes .../stobject/resources/mouse/left_active.ico | Bin 0 -> 1406 bytes .../resources/mouse/left_active_right_down.ico | Bin 0 -> 1406 bytes .../stobject/resources/mouse/left_down.ico | Bin 0 -> 1406 bytes .../resources/mouse/left_down_right_active.ico | Bin 0 -> 1406 bytes .../stobject/resources/mouse/left_right_active.ico | Bin 0 -> 1406 bytes .../stobject/resources/mouse/left_right_down.ico | Bin 0 -> 1406 bytes dll/shellext/stobject/resources/mouse/none.ico | Bin 0 -> 1406 bytes .../stobject/resources/mouse/right_active.ico | Bin 0 -> 1406 bytes .../stobject/resources/mouse/right_down.ico | Bin 0 -> 1406 bytes dll/shellext/stobject/stobject.rc | 12 ++ 17 files changed, 182 insertions(+) diff --git a/dll/shellext/stobject/CMakeLists.txt b/dll/shellext/stobject/CMakeLists.txt index b8b18915cab..7604c3caecf 100644 --- a/dll/shellext/stobject/CMakeLists.txt +++ b/dll/shellext/stobject/CMakeLists.txt @@ -10,6 +10,7 @@ list(APPEND SOURCE csystray.cpp stobject.cpp hotplug.cpp + mouse.cpp power.cpp volume.cpp precomp.h) diff --git a/dll/shellext/stobject/csystray.cpp b/dll/shellext/stobject/csystray.cpp index 93d17406115..bab008c0d01 100644 --- a/dll/shellext/stobject/csystray.cpp +++ b/dll/shellext/stobject/csystray.cpp @@ -22,6 +22,7 @@ const int g_NumIcons = _countof(g_IconHandlers); CSysTray::CSysTray() : dwServicesEnabled(0) { + wm_SHELLHOOK = RegisterWindowMessageW(L"SHELLHOOK"); wm_DESTROYWINDOW = RegisterWindowMessageW(L"CSysTray_DESTROY"); } @@ -128,6 +129,8 @@ HRESULT CSysTray::InitIcons() } } + MouseKeys_Init(this); + return InitNetShell(); } @@ -144,6 +147,8 @@ HRESULT CSysTray::ShutdownIcons() } } + MouseKeys_Shutdown(this); + return ShutdownNetShell(); } @@ -318,6 +323,17 @@ BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM { return DestroyWindow(); } + + if (wm_SHELLHOOK && uMsg == wm_SHELLHOOK) + { + if (wParam == HSHELL_ACCESSIBILITYSTATE && lParam == ACCESS_MOUSEKEYS) + { + MouseKeys_Update(this); + } + lResult = 0L; + return TRUE; + } + switch (uMsg) { case WM_NCCREATE: @@ -328,6 +344,7 @@ BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM GetServicesEnabled(); InitIcons(); SetTimer(1, 2000, NULL); + RegisterShellHookWindow(hWnd); return TRUE; case WM_TIMER: @@ -337,8 +354,16 @@ BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM ProcessIconMessage(uMsg, wParam, lParam, lResult); return TRUE; + case WM_SETTINGCHANGE: + if (wParam == SPI_SETMOUSEKEYS) + { + MouseKeys_Update(this); + } + break; + case WM_DESTROY: KillTimer(1); + DeregisterShellHookWindow(hWnd); ShutdownIcons(); PostQuitMessage(0); return TRUE; diff --git a/dll/shellext/stobject/csystray.h b/dll/shellext/stobject/csystray.h index 692948efcbf..059e7047f0b 100644 --- a/dll/shellext/stobject/csystray.h +++ b/dll/shellext/stobject/csystray.h @@ -29,6 +29,7 @@ class CSysTray : // TODO: keep icon handlers here DWORD dwServicesEnabled; + UINT wm_SHELLHOOK; UINT wm_DESTROYWINDOW; static DWORD WINAPI s_SysTrayThreadProc(PVOID param); diff --git a/dll/shellext/stobject/mouse.cpp b/dll/shellext/stobject/mouse.cpp new file mode 100644 index 00000000000..103b1235503 --- /dev/null +++ b/dll/shellext/stobject/mouse.cpp @@ -0,0 +1,125 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (
https://spdx.org/licenses/GPL-2.0-or-later
) + * PURPOSE: Mouse keys notification icon handler + * COPYRIGHT: Copyright 2022 Mark Jansen <mark.jansen(a)reactos.org> + */ + +#include "precomp.h" + +static MOUSEKEYS g_Mk; +static UINT g_MkState; +static HICON g_MkStateIcon; + +HRESULT STDMETHODCALLTYPE +MouseKeys_Init(_In_ CSysTray *pSysTray) +{ + TRACE("MouseKeys_Init!\n"); + + return MouseKeys_Update(pSysTray); +} + +HRESULT STDMETHODCALLTYPE +MouseKeys_Shutdown(_In_ CSysTray *pSysTray) +{ + TRACE("MouseKeys_Shutdown!\n"); + + if (g_MkStateIcon) + { + DestroyIcon(g_MkStateIcon); + g_MkStateIcon = NULL; + } + + if (g_MkState) + { + g_MkState = 0; + pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_MOUSE, g_MkStateIcon, L"MouseKeys"); + } + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE +MouseKeys_Update(_In_ CSysTray *pSysTray) +{ + TRACE("MouseKeys_Update!\n"); + + g_Mk.cbSize = sizeof(g_Mk); + SystemParametersInfoW(SPI_GETMOUSEKEYS, sizeof(g_Mk), &g_Mk, 0); + + UINT state = 0; + if ((g_Mk.dwFlags & (MKF_INDICATOR | MKF_MOUSEKEYSON)) == (MKF_INDICATOR | MKF_MOUSEKEYSON)) + { + if (g_Mk.dwFlags & MKF_MOUSEMODE) + { + switch (g_Mk.dwFlags & (MKF_LEFTBUTTONDOWN | MKF_LEFTBUTTONSEL | MKF_RIGHTBUTTONDOWN | MKF_RIGHTBUTTONSEL)) + { + case 0: + default: + state = IDI_MOUSE_NOBTN; + break; + case MKF_LEFTBUTTONSEL: + state = IDI_MOUSE_L_ACTIVE; + break; + case MKF_LEFTBUTTONDOWN: + case MKF_LEFTBUTTONDOWN | MKF_LEFTBUTTONSEL: + state = IDI_MOUSE_L_DOWN; + break; + case MKF_RIGHTBUTTONSEL: + state = IDI_MOUSE_R_ACTIVE; + break; + case MKF_RIGHTBUTTONDOWN: + case MKF_RIGHTBUTTONDOWN | MKF_RIGHTBUTTONSEL: + state = IDI_MOUSE_R_DOWN; + break; + case MKF_LEFTBUTTONSEL | MKF_RIGHTBUTTONSEL: + state = IDI_MOUSE_LR_ACTIVE; + break; + case MKF_RIGHTBUTTONDOWN | MKF_LEFTBUTTONDOWN: + case MKF_RIGHTBUTTONDOWN | MKF_LEFTBUTTONDOWN | MKF_LEFTBUTTONSEL: + case MKF_RIGHTBUTTONDOWN | MKF_LEFTBUTTONDOWN | MKF_LEFTBUTTONSEL | MKF_RIGHTBUTTONSEL: + case MKF_RIGHTBUTTONDOWN | MKF_LEFTBUTTONDOWN | MKF_RIGHTBUTTONSEL: + state = IDI_MOUSE_LR_DOWN; + break; + case MKF_LEFTBUTTONSEL | MKF_RIGHTBUTTONDOWN: + case MKF_LEFTBUTTONSEL | MKF_RIGHTBUTTONDOWN | MKF_RIGHTBUTTONSEL: + state = IDI_MOUSE_L_ACTIVE_R_DOWN; + break; + case MKF_LEFTBUTTONDOWN | MKF_RIGHTBUTTONSEL: + case MKF_LEFTBUTTONDOWN | MKF_RIGHTBUTTONSEL | MKF_LEFTBUTTONSEL: + state = IDI_MOUSE_R_ACTIVE_L_DOWN; + break; + } + } + else + { + state = IDI_MOUSE_DISABLED; + } + } + + UINT uId = NIM_MODIFY; + if (state != g_MkState) + { + if (g_MkStateIcon) + { + DestroyIcon(g_MkStateIcon); + g_MkStateIcon = NULL; + } + + if (g_MkState == 0) + uId = NIM_ADD; + + g_MkState = state; + if (g_MkState) + { + g_MkStateIcon = LoadIcon(g_hInstance, MAKEINTRESOURCE(g_MkState)); + } + } + + if (g_MkState == 0) + { + uId = NIM_DELETE; + } + + return pSysTray->NotifyIcon(uId, ID_ICON_MOUSE, g_MkStateIcon, L"MouseKeys"); +} diff --git a/dll/shellext/stobject/precomp.h b/dll/shellext/stobject/precomp.h index e60b0a265b8..3d891af31b6 100644 --- a/dll/shellext/stobject/precomp.h +++ b/dll/shellext/stobject/precomp.h @@ -33,6 +33,7 @@ extern HINSTANCE g_hInstance; #define ID_ICON_VOLUME (WM_APP + 0x4CB) #define ID_ICON_HOTPLUG (WM_APP + 0x4CC) #define ID_ICON_POWER (WM_APP + 0x4CD) +#define ID_ICON_MOUSE (WM_APP + 0x4CE) #define POWER_SERVICE_FLAG 0x00000001 #define HOTPLUG_SERVICE_FLAG 0x00000002 @@ -74,6 +75,11 @@ extern HRESULT STDMETHODCALLTYPE Power_Shutdown(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Power_Update(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Power_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult); +extern HRESULT STDMETHODCALLTYPE MouseKeys_Init(_In_ CSysTray * pSysTray); +extern HRESULT STDMETHODCALLTYPE MouseKeys_Shutdown(_In_ CSysTray * pSysTray); +extern HRESULT STDMETHODCALLTYPE MouseKeys_Update(_In_ CSysTray * pSysTray); + + #define POWER_TIMER_ID 2 #define VOLUME_TIMER_ID 3 #define HOTPLUG_TIMER_ID 4 diff --git a/dll/shellext/stobject/resource.h b/dll/shellext/stobject/resource.h index 71d500ec25b..66e6aed204f 100644 --- a/dll/shellext/stobject/resource.h +++ b/dll/shellext/stobject/resource.h @@ -56,4 +56,16 @@ #define IDI_HOTPLUG_ERR 420 #define IDI_HOTPLUG_OK 421 +#define IDI_MOUSE_DISABLED 440 +#define IDI_MOUSE_NOBTN 441 +#define IDI_MOUSE_L_ACTIVE 442 +#define IDI_MOUSE_L_DOWN 443 +#define IDI_MOUSE_R_ACTIVE 444 +#define IDI_MOUSE_R_DOWN 445 +#define IDI_MOUSE_LR_ACTIVE 446 +#define IDI_MOUSE_LR_DOWN 447 +#define IDI_MOUSE_L_ACTIVE_R_DOWN 448 +#define IDI_MOUSE_R_ACTIVE_L_DOWN 449 + + #define IDR_SYSTRAY 11001 diff --git a/dll/shellext/stobject/resources/mouse/disabled.ico b/dll/shellext/stobject/resources/mouse/disabled.ico new file mode 100644 index 00000000000..e5b51a6d65b Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/disabled.ico differ diff --git a/dll/shellext/stobject/resources/mouse/left_active.ico b/dll/shellext/stobject/resources/mouse/left_active.ico new file mode 100644 index 00000000000..d87b21b3d36 Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/left_active.ico differ diff --git a/dll/shellext/stobject/resources/mouse/left_active_right_down.ico b/dll/shellext/stobject/resources/mouse/left_active_right_down.ico new file mode 100644 index 00000000000..ee977316081 Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/left_active_right_down.ico differ diff --git a/dll/shellext/stobject/resources/mouse/left_down.ico b/dll/shellext/stobject/resources/mouse/left_down.ico new file mode 100644 index 00000000000..97346434deb Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/left_down.ico differ diff --git a/dll/shellext/stobject/resources/mouse/left_down_right_active.ico b/dll/shellext/stobject/resources/mouse/left_down_right_active.ico new file mode 100644 index 00000000000..95899121b79 Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/left_down_right_active.ico differ diff --git a/dll/shellext/stobject/resources/mouse/left_right_active.ico b/dll/shellext/stobject/resources/mouse/left_right_active.ico new file mode 100644 index 00000000000..4964f037312 Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/left_right_active.ico differ diff --git a/dll/shellext/stobject/resources/mouse/left_right_down.ico b/dll/shellext/stobject/resources/mouse/left_right_down.ico new file mode 100644 index 00000000000..0283f66338a Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/left_right_down.ico differ diff --git a/dll/shellext/stobject/resources/mouse/none.ico b/dll/shellext/stobject/resources/mouse/none.ico new file mode 100644 index 00000000000..0c84cf292e1 Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/none.ico differ diff --git a/dll/shellext/stobject/resources/mouse/right_active.ico b/dll/shellext/stobject/resources/mouse/right_active.ico new file mode 100644 index 00000000000..b2dcfe6fa2d Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/right_active.ico differ diff --git a/dll/shellext/stobject/resources/mouse/right_down.ico b/dll/shellext/stobject/resources/mouse/right_down.ico new file mode 100644 index 00000000000..624999a41c9 Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/right_down.ico differ diff --git a/dll/shellext/stobject/stobject.rc b/dll/shellext/stobject/stobject.rc index f9b6e1bcf3d..bf310d7b95d 100644 --- a/dll/shellext/stobject/stobject.rc +++ b/dll/shellext/stobject/stobject.rc @@ -31,6 +31,18 @@ IDI_HOTPLUG_ERR ICON "resources/hotplug/0.ico" IDI_HOTPLUG_OK ICON "resources/hotplug/1.ico" +IDI_MOUSE_DISABLED ICON "resources/mouse/disabled.ico" +IDI_MOUSE_NOBTN ICON "resources/mouse/none.ico" +IDI_MOUSE_L_ACTIVE ICON "resources/mouse/left_active.ico" +IDI_MOUSE_L_DOWN ICON "resources/mouse/left_down.ico" +IDI_MOUSE_R_ACTIVE ICON "resources/mouse/right_active.ico" +IDI_MOUSE_R_DOWN ICON "resources/mouse/right_down.ico" +IDI_MOUSE_LR_ACTIVE ICON "resources/mouse/left_right_active.ico" +IDI_MOUSE_LR_DOWN ICON "resources/mouse/left_right_down.ico" +IDI_MOUSE_L_ACTIVE_R_DOWN ICON "resources/mouse/left_active_right_down.ico" +IDI_MOUSE_R_ACTIVE_L_DOWN ICON "resources/mouse/left_down_right_active.ico" + + IDR_SYSTRAY REGISTRY "resources/rgs/systray.rgs" #include <reactos/manifest_dll.rc>
2 years, 3 months
1
0
0
0
[reactos] 03/04: [PSDK] Add missing defines / argument names
by Mark Jansen
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab760e539d2196e107531…
commit ab760e539d2196e1075316cd1857c30015b4f644 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jun 18 21:24:04 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Sep 6 21:11:09 2022 +0200 [PSDK] Add missing defines / argument names --- sdk/include/psdk/winuser.h | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index 4af5369cca5..bde95161a69 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -1256,6 +1256,9 @@ extern "C" { #endif /* WINVER >= 0x0400 */ #if(_WIN32_WINNT >= 0x0500) #define HSHELL_ACCESSIBILITYSTATE 11 +#define ACCESS_STICKYKEYS 0x01 +#define ACCESS_FILTERKEYS 0x02 +#define ACCESS_MOUSEKEYS 0x03 #define HSHELL_APPCOMMAND 12 #endif /* _WIN32_WINNT >= 0x0500 */ #if(_WIN32_WINNT >= 0x0501) @@ -2125,14 +2128,21 @@ extern "C" { #define HCF_HOTKEYSOUND 16 #define HCF_INDICATOR 32 #define HCF_HOTKEYAVAILABLE 64 -#define MKF_AVAILABLE 2 -#define MKF_CONFIRMHOTKEY 8 -#define MKF_HOTKEYACTIVE 4 -#define MKF_HOTKEYSOUND 16 -#define MKF_INDICATOR 32 -#define MKF_MOUSEKEYSON 1 -#define MKF_MODIFIERS 64 -#define MKF_REPLACENUMBERS 128 + +#define MKF_MOUSEKEYSON 0x00000001 +#define MKF_AVAILABLE 0x00000002 +#define MKF_HOTKEYACTIVE 0x00000004 +#define MKF_CONFIRMHOTKEY 0x00000008 +#define MKF_HOTKEYSOUND 0x00000010 +#define MKF_INDICATOR 0x00000020 +#define MKF_MODIFIERS 0x00000040 +#define MKF_REPLACENUMBERS 0x00000080 +#define MKF_LEFTBUTTONDOWN 0x01000000 +#define MKF_RIGHTBUTTONDOWN 0x02000000 +#define MKF_LEFTBUTTONSEL 0x10000000 +#define MKF_RIGHTBUTTONSEL 0x20000000 +#define MKF_MOUSEMODE 0x80000000 + #define SERKF_ACTIVE 8 /* May be obsolete. Not in recent MS docs. */ #define SERKF_AVAILABLE 2 #define SERKF_INDICATOR 4 @@ -5039,13 +5049,13 @@ MapWindowPoints( _In_ UINT cPoints); int WINAPI MenuItemFromPoint(_In_opt_ HWND, _In_ HMENU, _In_ POINT); -BOOL WINAPI MessageBeep(_In_ UINT); -int WINAPI MessageBoxA(_In_opt_ HWND, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_ UINT); -int WINAPI MessageBoxW(_In_opt_ HWND, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_ UINT); -int WINAPI MessageBoxExA(_In_opt_ HWND, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_ UINT, _In_ WORD); -int WINAPI MessageBoxExW(_In_opt_ HWND, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_ UINT, _In_ WORD); -int WINAPI MessageBoxIndirectA(_In_ CONST MSGBOXPARAMSA*); -int WINAPI MessageBoxIndirectW(_In_ CONST MSGBOXPARAMSW*); +BOOL WINAPI MessageBeep(_In_ UINT uType); +int WINAPI MessageBoxA(_In_opt_ HWND hWnd, _In_opt_ LPCSTR lpText, _In_opt_ LPCSTR lpCaption, _In_ UINT uType); +int WINAPI MessageBoxW(_In_opt_ HWND hWnd, _In_opt_ LPCWSTR lpText, _In_opt_ LPCWSTR lpCaption, _In_ UINT uType); +int WINAPI MessageBoxExA(_In_opt_ HWND hWnd, _In_opt_ LPCSTR lpText, _In_opt_ LPCSTR lpCaption, _In_ UINT uType, _In_ WORD wLanguageId); +int WINAPI MessageBoxExW(_In_opt_ HWND hWnd, _In_opt_ LPCWSTR lpText, _In_opt_ LPCWSTR lpCaption, _In_ UINT uType, _In_ WORD wLanguageId); +int WINAPI MessageBoxIndirectA(_In_ CONST MSGBOXPARAMSA* lpmbp); +int WINAPI MessageBoxIndirectW(_In_ CONST MSGBOXPARAMSW* lpmbp); BOOL WINAPI ModifyMenuA(_In_ HMENU, _In_ UINT, _In_ UINT, _In_ UINT_PTR, _In_opt_ LPCSTR); BOOL WINAPI ModifyMenuW(_In_ HMENU, _In_ UINT, _In_ UINT, _In_ UINT_PTR, _In_opt_ LPCWSTR); HMONITOR WINAPI MonitorFromPoint(_In_ POINT, _In_ DWORD); @@ -5347,8 +5357,8 @@ BOOL WINAPI SwitchDesktop(_In_ HDESK); #if(_WIN32_WINNT >= 0x0500) VOID WINAPI SwitchToThisWindow(_In_ HWND, _In_ BOOL); #endif /* (_WIN32_WINNT >= 0x0500) */ -BOOL WINAPI SystemParametersInfoA(_In_ UINT, _In_ UINT, _Inout_opt_ PVOID, _In_ UINT); -BOOL WINAPI SystemParametersInfoW(_In_ UINT, _In_ UINT, _Inout_opt_ PVOID, _In_ UINT); +BOOL WINAPI SystemParametersInfoA(_In_ UINT uiAction, _In_ UINT uiParam, _Inout_opt_ PVOID pvParam, _In_ UINT fWinIni); +BOOL WINAPI SystemParametersInfoW(_In_ UINT uiAction, _In_ UINT uiParam, _Inout_opt_ PVOID pvParam, _In_ UINT fWinIni); LONG WINAPI
2 years, 3 months
1
0
0
0
[reactos] 02/04: [PSDK] Add COWAIT_DEFAULT
by Mark Jansen
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=876085212976bf5bb37b3…
commit 876085212976bf5bb37b3ff0b747d3c4f552127a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jun 18 21:23:43 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Sep 6 21:11:09 2022 +0200 [PSDK] Add COWAIT_DEFAULT --- sdk/include/psdk/objbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/include/psdk/objbase.h b/sdk/include/psdk/objbase.h index e93356c469c..d12f399d855 100644 --- a/sdk/include/psdk/objbase.h +++ b/sdk/include/psdk/objbase.h @@ -692,6 +692,7 @@ CoRegisterChannelHook( typedef enum tagCOWAIT_FLAGS { + COWAIT_DEFAULT = 0x00000000, COWAIT_WAITALL = 0x00000001, COWAIT_ALERTABLE = 0x00000002, COWAIT_INPUTAVAILABLE = 0x00000004
2 years, 3 months
1
0
0
0
[reactos] 01/04: [STOBJECT] Keep the object alive while the thread is running,
by Mark Jansen
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=334c7cee35e4ba184b313…
commit 334c7cee35e4ba184b3138550994229a5e24eb71 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jun 18 21:19:42 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Sep 6 21:11:09 2022 +0200 [STOBJECT] Keep the object alive while the thread is running, Fix shutting down the thread. --- dll/shellext/stobject/csystray.cpp | 32 ++++++++++++++++++++++++-------- dll/shellext/stobject/csystray.h | 4 ++-- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dll/shellext/stobject/csystray.cpp b/dll/shellext/stobject/csystray.cpp index 14f9c213a9f..93d17406115 100644 --- a/dll/shellext/stobject/csystray.cpp +++ b/dll/shellext/stobject/csystray.cpp @@ -9,6 +9,7 @@ #include "precomp.h" +#include <regstr.h> #include <undocshell.h> #include <shellutils.h> @@ -19,8 +20,14 @@ SysTrayIconHandlers_t g_IconHandlers [] = { }; const int g_NumIcons = _countof(g_IconHandlers); -CSysTray::CSysTray() {} -CSysTray::~CSysTray() {} +CSysTray::CSysTray() : dwServicesEnabled(0) +{ + wm_DESTROYWINDOW = RegisterWindowMessageW(L"CSysTray_DESTROY"); +} + +CSysTray::~CSysTray() +{ +} VOID CSysTray::GetServicesEnabled() { @@ -30,8 +37,7 @@ VOID CSysTray::GetServicesEnabled() /* Enable power, volume and hotplug by default */ this->dwServicesEnabled = POWER_SERVICE_FLAG | VOLUME_SERVICE_FLAG | HOTPLUG_SERVICE_FLAG; - if (RegCreateKeyExW(HKEY_CURRENT_USER, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\SysTray", + if (RegCreateKeyExW(HKEY_CURRENT_USER, REGSTR_PATH_SYSTRAY, 0, NULL, REG_OPTION_NON_VOLATILE, @@ -132,9 +138,9 @@ HRESULT CSysTray::ShutdownIcons() { if (this->dwServicesEnabled & g_IconHandlers[i].dwServiceFlag) { + this->dwServicesEnabled &= ~g_IconHandlers[i].dwServiceFlag; HRESULT hr = g_IconHandlers[i].pfnShutdown(this); - if (FAILED(hr)) - return hr; + FAILED_UNEXPECTEDLY(hr); } } @@ -253,12 +259,14 @@ HRESULT CSysTray::SysTrayThreadProc() CoUninitialize(); + Release(); FreeLibraryAndExitThread(hLib, ret); } HRESULT CSysTray::CreateSysTrayThread() { TRACE("CSysTray Init TODO: Initialize tray icon handlers.\n"); + AddRef(); HANDLE hThread = CreateThread(NULL, 0, s_SysTrayThreadProc, this, 0, NULL); @@ -269,8 +277,11 @@ HRESULT CSysTray::CreateSysTrayThread() HRESULT CSysTray::DestroySysTrayWindow() { - DestroyWindow(); - hwndSysTray = NULL; + if (!DestroyWindow()) + { + // Window is from another thread, ask it politely to destroy itself: + SendMessage(wm_DESTROYWINDOW); + } return S_OK; } @@ -303,6 +314,10 @@ BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM if (hWnd != m_hWnd) return FALSE; + if (wm_DESTROYWINDOW && uMsg == wm_DESTROYWINDOW) + { + return DestroyWindow(); + } switch (uMsg) { case WM_NCCREATE: @@ -325,6 +340,7 @@ BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM case WM_DESTROY: KillTimer(1); ShutdownIcons(); + PostQuitMessage(0); return TRUE; } diff --git a/dll/shellext/stobject/csystray.h b/dll/shellext/stobject/csystray.h index 0ff52367825..692948efcbf 100644 --- a/dll/shellext/stobject/csystray.h +++ b/dll/shellext/stobject/csystray.h @@ -29,7 +29,7 @@ class CSysTray : // TODO: keep icon handlers here DWORD dwServicesEnabled; - HWND hwndSysTray; + UINT wm_DESTROYWINDOW; static DWORD WINAPI s_SysTrayThreadProc(PVOID param); HRESULT SysTrayMessageLoop(); @@ -76,4 +76,4 @@ public: COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) END_COM_MAP() -}; \ No newline at end of file +};
2 years, 3 months
1
0
0
0
[reactos] 01/01: [KERNEL32] Fix BaseDefaultPath containing extra '.'
by Mark Jansen
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f10d40f9122b926bf01b5…
commit f10d40f9122b926bf01b5409a6d3c3d9d06806c3 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon May 16 12:34:40 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Sep 6 21:09:38 2022 +0200 [KERNEL32] Fix BaseDefaultPath containing extra '.' --- dll/win32/kernel32/client/dllmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/dllmain.c b/dll/win32/kernel32/client/dllmain.c index a6720cd78a8..fe173bb10d8 100644 --- a/dll/win32/kernel32/client/dllmain.c +++ b/dll/win32/kernel32/client/dllmain.c @@ -174,7 +174,7 @@ DllMain(HANDLE hDll, /* Construct the default path (using the static buffer) */ Status = RtlStringCbPrintfW(BaseDefaultPathBuffer, sizeof(BaseDefaultPathBuffer), - L".;%wZ;%wZ\\system;%wZ;", + L"%wZ;%wZ\\system;%wZ;", &BaseWindowsSystemDirectory, &BaseWindowsDirectory, &BaseWindowsDirectory);
2 years, 3 months
1
0
0
0
← Newer
1
...
9
10
11
12
13
14
15
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
Results per page:
10
25
50
100
200