Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NTUSER][USER32] Classic Theme: disabled "checked" checkboxes should be grey (#4874)
by Joachim Henze 13 Nov '22

13 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1dd9d2ef3715d97ab462d… commit 1dd9d2ef3715d97ab462d2aaf5cf20f675f55439 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Mon Nov 14 00:01:29 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 14 00:01:29 2022 +0100 [NTUSER][USER32] Classic Theme: disabled "checked" checkboxes should be grey (#4874) Classic Theme: disabled "checked" checkboxes should be grey CORE-18609 and not black, like they erroneously were. This patch does not seem to have any impact on how they are rendered for themed ros. Ftr: We experimented also with COLOR_GRAYTEXT instead of COLOR_BTNSHADOW but that did result in incorrect drawing of disabled "checked" checkboxes for the 'High Contrast' Color Schemes. --- win32ss/user/ntuser/draw.c | 2 +- win32ss/user/user32/windows/draw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/draw.c b/win32ss/user/ntuser/draw.c index 9e382b50290..7f3ec40d8f5 100644 --- a/win32ss/user/ntuser/draw.c +++ b/win32ss/user/ntuser/draw.c @@ -743,7 +743,7 @@ BOOL FASTCALL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL { WCHAR Check = (Radio) ? 'i' : 'b'; - IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWTEXT)); + IntGdiSetTextColor(dc, IntGetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_WINDOWTEXT)); GreTextOutW(dc, myr.left, myr.top, &Check, 1); } diff --git a/win32ss/user/user32/windows/draw.c b/win32ss/user/user32/windows/draw.c index 310f31493e5..7dffc787ac2 100644 --- a/win32ss/user/user32/windows/draw.c +++ b/win32ss/user/user32/windows/draw.c @@ -759,7 +759,7 @@ static BOOL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL R { TCHAR Check = (Radio) ? 'i' : 'b'; - SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); + SetTextColor(dc, GetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_WINDOWTEXT)); TextOut(dc, X, Y, &Check, 1); } }

1 0

[reactos] 01/01: [MSPAINT] Update de-DE.rc CORE-12356
by Joachim Henze 13 Nov '22

13 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45e79c3f23ecf00657e3e… commit 45e79c3f23ecf00657e3e1e417fded2a4f9ff52f Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Nov 13 22:41:05 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Nov 13 22:41:05 2022 +0100 [MSPAINT] Update de-DE.rc CORE-12356 An addendum to 0.4.14-dev-843-g 15bc263b07186fce778e6c0da60ff85a52d9bfba --- base/applications/mspaint/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 04af89c3585..6a5b4409cf6 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -209,7 +209,7 @@ BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint für ReactOS" - IDS_INFOTEXT "Unter der GNU Lesser General Public License stehen (LGPL, siehe www.gnu.org)" + IDS_INFOTEXT "Steht unter der GNU Lesser General Public License (LGPL, siehe www.gnu.org)" IDS_SAVEPROMPTTEXT "Möchten Sie die Änderungen an %s speichern?" IDS_DEFAULTFILENAME "Unbenannt" IDS_MINIATURETITLE "Miniaturansicht"

1 0

[reactos] 01/01: [IMM32] Get gHighestUserAddress in ImmInitializeGlobals
by Katayama Hirofumi MZ 13 Nov '22

13 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d298831db03c30682ac1… commit 3d298831db03c30682ac10d449655b68751362f9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 13 20:04:34 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 13 20:04:34 2022 +0900 [IMM32] Get gHighestUserAddress in ImmInitializeGlobals CORE-11700 --- dll/win32/imm32/imm.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 14193efb5cb..40f686e44f0 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -10,6 +10,7 @@ */ #include "precomp.h" +#include <ndk/exfuncs.h> WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -17,11 +18,13 @@ HMODULE ghImm32Inst = NULL; // Win: ghInst PSERVERINFO gpsi = NULL; // Win: gpsi SHAREDINFO gSharedInfo = { NULL }; // Win: gSharedInfo BYTE gfImmInitialized = FALSE; // Win: gfInitialized +ULONG_PTR gHighestUserAddress = 0; // Win: ImmInitializeGlobals static BOOL APIENTRY ImmInitializeGlobals(HMODULE hMod) { NTSTATUS status; + SYSTEM_BASIC_INFORMATION SysInfo; if (hMod) ghImm32Inst = hMod; @@ -36,6 +39,14 @@ static BOOL APIENTRY ImmInitializeGlobals(HMODULE hMod) return FALSE; } + status = NtQuerySystemInformation(SystemBasicInformation, &SysInfo, sizeof(SysInfo), NULL); + if (NT_ERROR(status)) + { + ERR("\n"); + return FALSE; + } + gHighestUserAddress = SysInfo.MaximumUserModeAddress; + gfImmInitialized = TRUE; return TRUE; }

1 0

[reactos] 01/01: [USER32] Rewrite CharPrev(Ex)A functions and fix tests (#4860)
by Stanislav Motylkov 13 Nov '22

13 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51f78918dab21a9e10468… commit 51f78918dab21a9e10468ac02144e30cf4bccbb2 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Nov 8 00:42:26 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Nov 13 13:22:26 2022 +0300 [USER32] Rewrite CharPrev(Ex)A functions and fix tests (#4860) Fixes 48 failing tests of user32:CharFuncs. Only 12 minor failing tests are left! Thanks to Simone Mario Lombardo for the problem analysis! CORE-18415 CORE-18452 --- win32ss/user/user32/windows/text.c | 41 ++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/win32ss/user/user32/windows/text.c b/win32ss/user/user32/windows/text.c index bf730d749c9..1a73d674101 100644 --- a/win32ss/user/user32/windows/text.c +++ b/win32ss/user/user32/windows/text.c @@ -148,13 +148,25 @@ LPSTR WINAPI CharPrevA(LPCSTR start, LPCSTR ptr) { - while (*start && (start < ptr)) + if (ptr > start) { - LPCSTR next = CharNextA(start); - if (next >= ptr) break; - start = next; + --ptr; + if (gpsi->dwSRVIFlags & SRVINFO_DBCSENABLED) + { + LPCSTR ch; + BOOL dbl = FALSE; + + for (ch = ptr - 1; ch >= start; --ch) + { + if (!IsDBCSLeadByte(*ch)) + break; + + dbl = !dbl; + } + if (dbl) --ptr; + } } - return (LPSTR)start; + return (LPSTR)ptr; } /* @@ -164,13 +176,22 @@ LPSTR WINAPI CharPrevExA(WORD codepage, LPCSTR start, LPCSTR ptr, DWORD flags) { - while (*start && (start < ptr)) + if (ptr > start) { - LPCSTR next = CharNextExA(codepage, start, flags); - if (next >= ptr) break; - start = next; + LPCSTR ch; + BOOL dbl = FALSE; + + --ptr; + for (ch = ptr - 1; ch >= start; --ch) + { + if (!IsDBCSLeadByteEx(codepage, *ch)) + break; + + dbl = !dbl; + } + if (dbl) --ptr; } - return (LPSTR)start; + return (LPSTR)ptr; } /*

1 0

[reactos] 01/01: [USER32] Follow-up of e1f8b32; Delete unnecessary empty line
by Katayama Hirofumi MZ 13 Nov '22

13 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b53f6d824681bebace41… commit 6b53f6d824681bebace41a6a10e1f718bc66569b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 13 11:50:54 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 13 11:50:54 2022 +0900 [USER32] Follow-up of e1f8b32; Delete unnecessary empty line CORE-11700 --- win32ss/user/user32/misc/imm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index cd34d945a1e..451f49e4c7c 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -1080,7 +1080,6 @@ ImeWndProc_common(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicod break; } - Finish: if (unicode) return DefWindowProcW(hwnd, msg, wParam, lParam);

1 0

[reactos] 01/01: [INCLUDE][USER32] Add WM_FINALDESTROY and improve ImeWndProcA/W
by Katayama Hirofumi MZ 13 Nov '22

13 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1f8b32c3d64da4d35070… commit e1f8b32c3d64da4d35070fa87558e74e0fe48cf6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 13 09:59:17 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 13 09:59:17 2022 +0900 [INCLUDE][USER32] Add WM_FINALDESTROY and improve ImeWndProcA/W CORE-11700 --- sdk/include/reactos/undocuser.h | 1 + win32ss/user/user32/misc/imm.c | 111 ++++++++++++++++++++++------------------ 2 files changed, 61 insertions(+), 51 deletions(-) diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h index d742e3a541c..b2bc7a8ccc9 100644 --- a/sdk/include/reactos/undocuser.h +++ b/sdk/include/reactos/undocuser.h @@ -36,6 +36,7 @@ extern "C" { #define WM_COPYGLOBALDATA 0x00000049 #define WM_LOGONNOTIFY 0x0000004C #define WM_KEYF1 0x0000004D +#define WM_FINALDESTROY 0x00000070 #define WM_KLUDGEMINRECT 0x0000008B #define WM_UAHDRAWMENU 0x00000091 #define WM_UAHDRAWITEM 0x00000092 // WM_DRAWITEM diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 56112afc0ae..cd34d945a1e 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -939,42 +939,43 @@ ImeWndProc_common(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicod LRESULT ret; pWnd = ValidateHwnd(hwnd); - if (pWnd) + if (pWnd == NULL) { - if (IS_CICERO_MODE()) + ERR("hwnd was %p\n", hwnd); + return 0; + } + + if (!pWnd->fnid) + { + NtUserSetWindowFNID(hwnd, FNID_IME); + } + else if (pWnd->fnid != FNID_IME) + { + ERR("fnid was 0x%x\n", pWnd->fnid); + return 0; + } + + pimeui = (PIMEUI)GetWindowLongPtrW(hwnd, 0); + if (pimeui == NULL) + { + pimeui = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMEUI)); + if (pimeui == NULL) { - ret = IMM_FN(CtfImmDispatchDefImeMessage)(hwnd, msg, wParam, lParam); - if (ret) - return ret; + ERR("HeapAlloc failed\n"); + NtUserSetWindowFNID(hwnd, FNID_DESTROY); + DestroyWindow(hwnd); + return 0; } - if (!pWnd->fnid) - { - if (msg != WM_NCCREATE) - { - if (unicode) - return DefWindowProcW(hwnd, msg, wParam, lParam); - return DefWindowProcA(hwnd, msg, wParam, lParam); - } - NtUserSetWindowFNID(hwnd, FNID_IME); - pimeui = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMEUI)); - pimeui->spwnd = pWnd; - SetWindowLongPtrW(hwnd, 0, (LONG_PTR)pimeui); - } - else - { - if (pWnd->fnid != FNID_IME) - { - ERR("Wrong window class for Ime! fnId 0x%x\n",pWnd->fnid); - return 0; - } - pimeui = (PIMEUI)GetWindowLongPtrW(hwnd, 0); - if (pimeui == NULL) - { - ERR("Window is not set to IME!\n"); - return 0; - } - } + SetWindowLongPtrW(hwnd, 0, (LONG_PTR)pimeui); + pimeui->spwnd = pWnd; + } + + if (IS_CICERO_MODE()) + { + ret = IMM_FN(CtfImmDispatchDefImeMessage)(hwnd, msg, wParam, lParam); + if (ret) + return ret; } if (pimeui->nCntInIMEProc > 0) @@ -1011,11 +1012,21 @@ ImeWndProc_common(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicod break; default: - { - if (unicode) - return DefWindowProcW(hwnd, msg, wParam, lParam); - return DefWindowProcA(hwnd, msg, wParam, lParam); - } + goto Finish; + } + } + + if ((pWnd->state2 & WNDS2_INDESTROY) || (pWnd->state & WNDS_DESTROYED)) + { + switch (msg) + { + case WM_DESTROY: + case WM_NCDESTROY: + case WM_FINALDESTROY: + break; + + default: + return 0; } } @@ -1026,9 +1037,11 @@ ImeWndProc_common(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicod case WM_DESTROY: User32DestroyImeUIWindow(pimeui); - break; + return 0; case WM_NCDESTROY: + case WM_FINALDESTROY: + pimeui->spwnd = NULL; HeapFree(GetProcessHeap(), 0, pimeui); NtUserSetWindowFNID(hwnd, FNID_DESTROY); break; @@ -1037,11 +1050,7 @@ ImeWndProc_common(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicod return TRUE; case WM_PAINT: - break; - - case WM_COPYDATA: - // TODO: - break; + return 0; case WM_IME_STARTCOMPOSITION: case WM_IME_COMPOSITION: @@ -1055,11 +1064,11 @@ ImeWndProc_common(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicod return ImeWnd_OnImeNotify(pimeui, wParam, lParam); case WM_IME_REQUEST: - break; + return 0; case WM_IME_SELECT: ImeWnd_OnImeSelect(pimeui, wParam, lParam); - break; + return (LRESULT)pimeui; case WM_IME_SETCONTEXT: return ImeWnd_OnImeSetContext(pimeui, wParam, lParam); @@ -1068,14 +1077,14 @@ ImeWndProc_common(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicod return ImeWnd_OnImeSystem(pimeui, wParam, lParam); default: - { - if (unicode) - return DefWindowProcW(hwnd, msg, wParam, lParam); - return DefWindowProcA(hwnd, msg, wParam, lParam); - } + break; } - return 0; + +Finish: + if (unicode) + return DefWindowProcW(hwnd, msg, wParam, lParam); + return DefWindowProcA(hwnd, msg, wParam, lParam); } // Win: ImeWndProcA

1 0

[reactos] 01/01: [USER32] Fix ImeWndProc_common comment
by Katayama Hirofumi MZ 12 Nov '22

12 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7e8b544bc56a5fb576af… commit c7e8b544bc56a5fb576afabb197eb9dc87f56167 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 13 08:49:38 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 13 08:49:38 2022 +0900 [USER32] Fix ImeWndProc_common comment CORE-11700 --- win32ss/user/user32/misc/imm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 2d861540314..56112afc0ae 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -930,7 +930,7 @@ LRESULT ImeWnd_OnImeSetContext(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) } /* The window procedure of the default IME window */ -/* Win: ImeWndProcWorker(hwnd, msg, wParam, lParam, !unicode) */ +/* Win: ImeWndProcWorker(pWnd, msg, wParam, lParam, !unicode) */ LRESULT WINAPI ImeWndProc_common(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) // ReactOS {

1 0

[reactos] 02/02: [SETUP][INF] Use the standard "Helv" -> "MS Sans Serif" substitution... (#4864)
by Hermès Bélusca-Maïto 12 Nov '22

12 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9bb5627df60392b900392… commit 9bb5627df60392b90039266f277ff668b574b4cd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 8 19:06:26 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 13 00:26:13 2022 +0100 [SETUP][INF] Use the standard "Helv" -> "MS Sans Serif" substitution... (#4864) ... and let the latter one substitute to whatever we want. Hindi however had "Helv" -> "Tahoma", but "MS Sans Serif" -> "FreeSans". Now its "Helv" will go to "FreeSans". --- base/setup/lib/muifonts.h | 18 +++++++++--------- media/inf/font.inf | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 82cf04cfe43..72afe0a5083 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -15,7 +15,7 @@ MUI_SUBFONT LatinFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"Tahoma" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, @@ -46,7 +46,7 @@ MUI_SUBFONT CyrillicFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"Tahoma" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, @@ -77,7 +77,7 @@ MUI_SUBFONT GreekFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"Tahoma" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, @@ -108,7 +108,7 @@ MUI_SUBFONT HebrewFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"Tahoma" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, @@ -145,7 +145,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Helv", L"Droid Sans Fallback" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, @@ -198,7 +198,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"DLCMingMedium", L"Droid Sans Fallback" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Helv", L"Droid Sans Fallback" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, @@ -247,7 +247,7 @@ MUI_SUBFONT JapaneseFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Helv", L"Droid Sans Fallback" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Gothic", L"Droid Sans Fallback" }, { L"MS Mincho", L"Droid Sans Fallback" }, @@ -305,7 +305,7 @@ MUI_SUBFONT KoreanFonts[] = { L"GulimChe", L"Droid Sans Fallback" }, { L"Gungsuh", L"Droid Sans Fallback" }, { L"GungsuhChe", L"Droid Sans Fallback" }, - { L"Helv", L"Droid Sans Fallback" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, @@ -376,7 +376,7 @@ MUI_SUBFONT HindiFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"Tahoma" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"FreeSans" }, { L"MS Shell Dlg", L"FreeSans" }, diff --git a/media/inf/font.inf b/media/inf/font.inf index f14707f1835..749d673b01c 100644 --- a/media/inf/font.inf +++ b/media/inf/font.inf @@ -26,7 +26,7 @@ HKLM,"System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts","LogPix [Font.Latin.Reg] HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" @@ -38,7 +38,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x [Font.Cyrillic.Reg] HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" @@ -50,7 +50,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x [Font.Greek.Reg] HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" @@ -62,7 +62,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x [Font.Hebrew.Reg] HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" @@ -75,7 +75,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Franklin Gothic Medium",0x00000000,"Droid Sans Fallback" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Droid Sans Fallback" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Droid Sans Fallback"

1 0

[reactos] 01/02: [SETUP] muifonts.h Formatting only.
by Hermès Bélusca-Maïto 12 Nov '22

12 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34c0bd0d5a840133a2b94… commit 34c0bd0d5a840133a2b943f4e50b4643f91423f5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 8 19:04:25 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 13 00:25:53 2022 +0100 [SETUP] muifonts.h Formatting only. --- base/setup/lib/muifonts.h | 148 +++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index f928653e168..82cf04cfe43 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -194,37 +194,37 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Courier New CYR,204", L"Courier New,204" }, { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, - { L"DLCMingBold", L"Droid Sans Fallback" }, - { L"DLCMingMedium", L"Droid Sans Fallback" }, - { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"DLCMingBold", L"Droid Sans Fallback" }, + { L"DLCMingMedium", L"Droid Sans Fallback" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Helv", L"Droid Sans Fallback" }, - { L"Helvetica", L"Arial" }, - { L"MS Sans Serif", L"Droid Sans Fallback" }, - { L"MS Shell Dlg", L"Droid Sans Fallback" }, - { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, - { L"MS UI Gothic", L"Droid Sans Fallback" }, - { L"MS UI Gothic 2", L"Droid Sans Fallback" }, - { L"Ming Light", L"Droid Sans Fallback" }, - { L"MingLiU", L"Droid Sans Fallback" }, - { L"PMingLiU", L"Droid Sans Fallback" }, - { L"Source Sans Pro", L"Droid Sans Fallback" }, - { L"System", L"Droid Sans Fallback" }, - { L"Tahoma", L"Droid Sans Fallback" }, - { L"Terminal", L"Lucida Console" }, - { L"Times", L"Times New Roman" }, + { L"Helv", L"Droid Sans Fallback" }, + { L"Helvetica", L"Arial" }, + { L"MS Sans Serif", L"Droid Sans Fallback" }, + { L"MS Shell Dlg", L"Droid Sans Fallback" }, + { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, + { L"MS UI Gothic", L"Droid Sans Fallback" }, + { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Ming Light", L"Droid Sans Fallback" }, + { L"MingLiU", L"Droid Sans Fallback" }, + { L"PMingLiU", L"Droid Sans Fallback" }, + { L"Source Sans Pro", L"Droid Sans Fallback" }, + { L"System", L"Droid Sans Fallback" }, + { L"Tahoma", L"Droid Sans Fallback" }, + { L"Terminal", L"Lucida Console" }, + { L"Times", L"Times New Roman" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, - { L"Tms Rmn", L"Times New Roman" }, - { L"Trebuchet MS", L"Droid Sans Fallback" }, + { L"Tms Rmn", L"Times New Roman" }, + { L"Trebuchet MS", L"Droid Sans Fallback" }, /* localized names */ - { CTF_LocalName0, L"Droid Sans Fallback" }, - { CTF_LocalName1, L"Droid Sans Fallback" }, - { CTF_LocalName2, L"Droid Sans Fallback" }, - { CTF_LocalName3, L"Droid Sans Fallback" }, + { CTF_LocalName0, L"Droid Sans Fallback" }, + { CTF_LocalName1, L"Droid Sans Fallback" }, + { CTF_LocalName2, L"Droid Sans Fallback" }, + { CTF_LocalName3, L"Droid Sans Fallback" }, { NULL, NULL } }; @@ -245,36 +245,36 @@ MUI_SUBFONT JapaneseFonts[] = { L"Courier New CYR,204", L"Courier New,204" }, { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, - { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Helv", L"Droid Sans Fallback" }, - { L"Helvetica", L"Arial" }, - { L"MS Gothic", L"Droid Sans Fallback" }, - { L"MS Mincho", L"Droid Sans Fallback" }, - { L"MS PGothic", L"Droid Sans Fallback" }, - { L"MS PMincho", L"Droid Sans Fallback" }, - { L"MS Sans Serif", L"Droid Sans Fallback" }, - { L"MS Shell Dlg", L"Droid Sans Fallback" }, - { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, - { L"MS UI Gothic", L"Droid Sans Fallback" }, - { L"MS UI Gothic 2", L"Droid Sans Fallback" }, - { L"Source Sans Pro", L"Droid Sans Fallback" }, - { L"System", L"Droid Sans Fallback" }, - { L"Tahoma", L"Droid Sans Fallback" }, - { L"Terminal", L"Lucida Console" }, - { L"Times", L"Times New Roman" }, + { L"Helv", L"Droid Sans Fallback" }, + { L"Helvetica", L"Arial" }, + { L"MS Gothic", L"Droid Sans Fallback" }, + { L"MS Mincho", L"Droid Sans Fallback" }, + { L"MS PGothic", L"Droid Sans Fallback" }, + { L"MS PMincho", L"Droid Sans Fallback" }, + { L"MS Sans Serif", L"Droid Sans Fallback" }, + { L"MS Shell Dlg", L"Droid Sans Fallback" }, + { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, + { L"MS UI Gothic", L"Droid Sans Fallback" }, + { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Source Sans Pro", L"Droid Sans Fallback" }, + { L"System", L"Droid Sans Fallback" }, + { L"Tahoma", L"Droid Sans Fallback" }, + { L"Terminal", L"Lucida Console" }, + { L"Times", L"Times New Roman" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, - { L"Tms Rmn", L"Times New Roman" }, - { L"Trebuchet MS", L"Droid Sans Fallback" }, + { L"Tms Rmn", L"Times New Roman" }, + { L"Trebuchet MS", L"Droid Sans Fallback" }, /* localized names */ - { JF_LocalName0, L"Droid Sans Fallback" }, - { JF_LocalName1, L"Droid Sans Fallback" }, - { JF_LocalName2, L"Droid Sans Fallback" }, - { JF_LocalName3, L"Droid Sans Fallback" }, + { JF_LocalName0, L"Droid Sans Fallback" }, + { JF_LocalName1, L"Droid Sans Fallback" }, + { JF_LocalName2, L"Droid Sans Fallback" }, + { JF_LocalName3, L"Droid Sans Fallback" }, { NULL, NULL } }; @@ -291,46 +291,46 @@ MUI_SUBFONT KoreanFonts[] = { L"Arial CYR,204", L"Arial,204" }, { L"Arial Greek,161", L"Arial,161" }, { L"Arial TUR,162", L"Arial,162" }, - { L"Batang", L"Droid Sans Fallback" }, - { L"BatangChe", L"Droid Sans Fallback" }, + { L"Batang", L"Droid Sans Fallback" }, + { L"BatangChe", L"Droid Sans Fallback" }, { L"Courier", L"Courier New" }, { L"Courier New Baltic,186", L"Courier New,186" }, { L"Courier New CE,238", L"Courier New,238" }, { L"Courier New CYR,204", L"Courier New,204" }, { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, - { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Gulim", L"Droid Sans Fallback" }, - { L"GulimChe", L"Droid Sans Fallback" }, - { L"Gungsuh", L"Droid Sans Fallback" }, - { L"GungsuhChe", L"Droid Sans Fallback" }, - { L"Helv", L"Droid Sans Fallback" }, - { L"Helvetica", L"Arial" }, - { L"MS Sans Serif", L"Droid Sans Fallback" }, - { L"MS Shell Dlg", L"Droid Sans Fallback" }, - { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, - { L"MS UI Gothic", L"Droid Sans Fallback" }, - { L"MS UI Gothic 2", L"Droid Sans Fallback" }, - { L"Source Sans Pro", L"Droid Sans Fallback" }, - { L"System", L"Droid Sans Fallback" }, - { L"Tahoma", L"Droid Sans Fallback" }, - { L"Terminal", L"Lucida Console" }, - { L"Times", L"Times New Roman" }, + { L"Gulim", L"Droid Sans Fallback" }, + { L"GulimChe", L"Droid Sans Fallback" }, + { L"Gungsuh", L"Droid Sans Fallback" }, + { L"GungsuhChe", L"Droid Sans Fallback" }, + { L"Helv", L"Droid Sans Fallback" }, + { L"Helvetica", L"Arial" }, + { L"MS Sans Serif", L"Droid Sans Fallback" }, + { L"MS Shell Dlg", L"Droid Sans Fallback" }, + { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, + { L"MS UI Gothic", L"Droid Sans Fallback" }, + { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Source Sans Pro", L"Droid Sans Fallback" }, + { L"System", L"Droid Sans Fallback" }, + { L"Tahoma", L"Droid Sans Fallback" }, + { L"Terminal", L"Lucida Console" }, + { L"Times", L"Times New Roman" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, - { L"Tms Rmn", L"Times New Roman" }, - { L"Trebuchet MS", L"Droid Sans Fallback" }, + { L"Tms Rmn", L"Times New Roman" }, + { L"Trebuchet MS", L"Droid Sans Fallback" }, /* localized names */ - { KF_LocalName0, L"Droid Sans Fallback" }, - { KF_LocalName1, L"Droid Sans Fallback" }, - { KF_LocalName2, L"Droid Sans Fallback" }, - { KF_LocalName3, L"Droid Sans Fallback" }, - { KF_LocalName4, L"Droid Sans Fallback" }, - { KF_LocalName5, L"Droid Sans Fallback" }, + { KF_LocalName0, L"Droid Sans Fallback" }, + { KF_LocalName1, L"Droid Sans Fallback" }, + { KF_LocalName2, L"Droid Sans Fallback" }, + { KF_LocalName3, L"Droid Sans Fallback" }, + { KF_LocalName4, L"Droid Sans Fallback" }, + { KF_LocalName5, L"Droid Sans Fallback" }, { NULL, NULL } };

1 0

[reactos] 01/01: [DISKPART] Fix help for multi-word command crashing. (#4873)
by Marcin Jabłoński 12 Nov '22

12 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a3a79bb721f9e3496769… commit 6a3a79bb721f9e34967693f3f8dfc8a4b26ec95c Author: Marcin Jabłoński <24442148+TheNNX(a)users.noreply.github.com> AuthorDate: Sat Nov 12 13:02:33 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 12 13:02:33 2022 +0100 [DISKPART] Fix help for multi-word command crashing. (#4873) * [DISKPART] Fix help for multi-word command crashing. When the HELP command is executed for a multi-word command, for example "HELP CREATE PARTITION PRIMARY", diskpart crashes. This happens because before the desired form of the command is encountered, its single word form is found - since the first word of the command matches the one HELP is looking for, it tries to compare the second word of the input command with the second (nonexistent) word of the encountered single word command, which is NULL. This results in diskpart crashing. The fix makes HELP check if the to-be-compared word is not NULL, before calling wcsicmp. --- base/system/diskpart/help.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/base/system/diskpart/help.c b/base/system/diskpart/help.c index 2caf271e5f2..0e20175e10c 100644 --- a/base/system/diskpart/help.c +++ b/base/system/diskpart/help.c @@ -60,7 +60,7 @@ HelpCommand( { if (pCommand->cmd1 != NULL && pCommand->cmd2 == NULL && pCommand->cmd3 == NULL) { - if ((wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && + if ((cmdptr->cmd1 != NULL && wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && (cmdptr->cmd2 != NULL) && (cmdptr->cmd3 == NULL) && (cmdptr->help != IDS_NONE)) @@ -72,8 +72,8 @@ HelpCommand( } else if (pCommand->cmd1 != NULL && pCommand->cmd2 != NULL && pCommand->cmd3 == NULL) { - if ((wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && - (wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) && + if ((cmdptr->cmd1 != NULL && wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL && wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) && (cmdptr->cmd3 != NULL) && (cmdptr->help != IDS_NONE)) { @@ -84,9 +84,9 @@ HelpCommand( } else if (pCommand->cmd1 != NULL && pCommand->cmd2 != NULL && pCommand->cmd3 != NULL) { - if ((wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && - (wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) && - (wcsicmp(pCommand->cmd3, cmdptr->cmd3) == 0) && + if ((cmdptr->cmd1 != NULL && wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL && wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) && + (cmdptr->cmd3 != NULL && wcsicmp(pCommand->cmd3, cmdptr->cmd3) == 0) && (cmdptr->help_detail != MSG_NONE)) { ConMsgPuts(StdOut, @@ -134,21 +134,27 @@ BOOL help_main(INT argc, LPWSTR *argv) for (cmdptr = cmds; cmdptr->cmd1; cmdptr++) { if ((cmdptr1 == NULL) && - (wcsicmp(argv[1], cmdptr->cmd1) == 0)) + (cmdptr->cmd1 != NULL && wcsicmp(argv[1], cmdptr->cmd1) == 0)) + { cmdptr1 = cmdptr; + } if ((cmdptr2 == NULL) && (argc >= 3) && - (wcsicmp(argv[1], cmdptr->cmd1) == 0) && - (wcsicmp(argv[2], cmdptr->cmd2) == 0)) + (cmdptr->cmd1 != NULL && wcsicmp(argv[1], cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL && wcsicmp(argv[2], cmdptr->cmd2) == 0)) + { cmdptr2 = cmdptr; - + } + if ((cmdptr3 == NULL) && (argc >= 4) && - (wcsicmp(argv[1], cmdptr->cmd1) == 0) && - (wcsicmp(argv[2], cmdptr->cmd2) == 0) && - (wcsicmp(argv[3], cmdptr->cmd3) == 0)) + (cmdptr->cmd1 != NULL && wcsicmp(argv[1], cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL && wcsicmp(argv[2], cmdptr->cmd2) == 0) && + (cmdptr->cmd3 != NULL && wcsicmp(argv[3], cmdptr->cmd3) == 0)) + { cmdptr3 = cmdptr; + } } if (cmdptr3 != NULL)

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