Ros-diffs September 2020

ros-diffs@reactos.org

25 participants
382 discussions

[reactos] 01/01: [XDK] Move UNREACHABLE macro definition to ntbasedef.h

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7c58468f1ae94ae11c32… commit f7c58468f1ae94ae11c3285398bd68cc76484a57 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Sep 24 05:35:43 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Sep 24 05:35:43 2020 +0300 [XDK] Move UNREACHABLE macro definition to ntbasedef.h --- ntoskrnl/include/internal/i386/trap_x.h | 5 ----- sdk/include/xdk/ntbasedef.h | 8 ++++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/include/internal/i386/trap_x.h b/ntoskrnl/include/internal/i386/trap_x.h index cd79c2a40c4..1f1e96f04d0 100644 --- a/ntoskrnl/include/internal/i386/trap_x.h +++ b/ntoskrnl/include/internal/i386/trap_x.h @@ -9,12 +9,7 @@ #pragma once #if defined(_MSC_VER) -#define UNREACHABLE __assume(0) #define __builtin_expect(a,b) (a) -#elif defined(__GNUC__) -#define UNREACHABLE __builtin_unreachable() -#else -#error #endif // diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h index 2118935a35c..c87be90a7a0 100644 --- a/sdk/include/xdk/ntbasedef.h +++ b/sdk/include/xdk/ntbasedef.h @@ -800,6 +800,14 @@ $endif(_WINNT_) #define DEFAULT_UNREACHABLE default: break #endif +#if defined(__GNUC__) || defined(__clang__) + #define UNREACHABLE __builtin_unreachable() +#elif defined(_MSC_VER) + #define UNREACHABLE __assume(0) +#else + #define UNREACHABLE +#endif + #define VER_WORKSTATION_NT 0x40000000 #define VER_SERVER_NT 0x80000000 #define VER_SUITE_SMALLBUSINESS 0x00000001

3 years, 12 months

[reactos] 01/01: [SDK] Fix __forceinline definition for C++

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87a5311116764f1a834c4… commit 87a5311116764f1a834c45ef35861612e18eb372 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Sep 24 05:33:35 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Sep 24 05:33:35 2020 +0300 [SDK] Fix __forceinline definition for C++ --- sdk/include/crt/_mingw.h | 10 +++++++--- sdk/include/psdk/intsafe.h | 8 -------- sdk/include/xdk/ntbasedef.h | 8 +------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/sdk/include/crt/_mingw.h b/sdk/include/crt/_mingw.h index b63e0b3b17a..06a304d9605 100644 --- a/sdk/include/crt/_mingw.h +++ b/sdk/include/crt/_mingw.h @@ -190,10 +190,14 @@ allow GCC to optimize away some EH unwind code, at least in DW2 case. */ # endif # define __ptr32 # define __ptr64 -# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) -# define __forceinline extern inline __attribute__((__always_inline__,__gnu_inline__)) +# ifdef __cplusplus +# define __forceinline inline __attribute__((__always_inline__)) # else -# define __forceinline extern __inline__ __attribute__((__always_inline__)) +# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) +# define __forceinline extern inline __attribute__((__always_inline__,__gnu_inline__)) +# else +# define __forceinline extern __inline__ __attribute__((__always_inline__)) +# endif # endif #endif diff --git a/sdk/include/psdk/intsafe.h b/sdk/include/psdk/intsafe.h index e30cb1182af..10fb173beb5 100644 --- a/sdk/include/psdk/intsafe.h +++ b/sdk/include/psdk/intsafe.h @@ -30,14 +30,6 @@ #include <specstrings.h> -#if defined(__GNUC__) && !defined(__forceinline) -# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) -# define __forceinline extern inline __attribute__((__always_inline__,__gnu_inline__)) -# else -# define __forceinline extern __inline__ __attribute__((__always_inline__)) -# endif -#endif - /* Handle ntintsafe here too */ #ifdef _NTINTSAFE_H_INCLUDED_ #ifndef _NTDEF_ /* Guard agains redefinition from ntstatus.h */ diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h index a7d0935a8fd..2118935a35c 100644 --- a/sdk/include/xdk/ntbasedef.h +++ b/sdk/include/xdk/ntbasedef.h @@ -213,13 +213,7 @@ /* Inlines */ #ifndef FORCEINLINE - #if defined(_MSC_VER) - #define FORCEINLINE __forceinline - #elif ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) - #define FORCEINLINE extern inline __attribute__((__always_inline__,__gnu_inline__)) - #else - #define FORCEINLINE extern __inline__ __attribute__((__always_inline__)) - #endif + #define FORCEINLINE __forceinline #endif /* FORCEINLINE */ #ifndef DECLSPEC_NOINLINE

3 years, 12 months

[reactos] 01/01: [USER32] Load IMM table (#3215)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=33fe4333f40dadfda1c92… commit 33fe4333f40dadfda1c9232639c887249573459e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 23 21:42:54 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 23 21:42:54 2020 +0900 [USER32] Load IMM table (#3215) Implement the IMM function table in module user32.dll. CORE-11700 File immtable.h is located at win32ss/user/user32/include, that is a list of the DEFINE_IMM_ENTRY macro calls. --- win32ss/user/user32/include/immtable.h | 53 +++++++++ win32ss/user/user32/include/user32.h | 2 + win32ss/user/user32/include/user32p.h | 35 +++--- win32ss/user/user32/misc/imm.c | 202 ++++++++------------------------- win32ss/user/user32/misc/immtable.h | 52 --------- 5 files changed, 119 insertions(+), 225 deletions(-) diff --git a/win32ss/user/user32/include/immtable.h b/win32ss/user/user32/include/immtable.h new file mode 100644 index 00000000000..ca37779bdd2 --- /dev/null +++ b/win32ss/user/user32/include/immtable.h @@ -0,0 +1,53 @@ +/* DEFINE_IMM_ENTRY(type, name, params, retval, retkind) */ +DEFINE_IMM_ENTRY(BOOL, ImmWINNLSEnableIME, (HWND hwnd, BOOL enable), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmWINNLSGetEnableStatus, (HWND hwnd), 0, NONVOID) +DEFINE_IMM_ENTRY(LRESULT, ImmSendIMEMessageExW, (HWND hwnd, LPARAM lParam), 0, NONVOID) +DEFINE_IMM_ENTRY(LRESULT, ImmSendIMEMessageExA, (HWND hwnd, LPARAM lParam), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmIMPGetIMEW, (HWND hwnd, LPIMEPROW ime), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmIMPGetIMEA, (HWND hwnd, LPIMEPROA ime), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmIMPQueryIMEW, (LPIMEPROW ime), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmIMPQueryIMEA, (LPIMEPROA ime), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmIMPSetIMEW, (HWND hwnd, LPIMEPROW ime), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmIMPSetIMEA, (HWND hwnd, LPIMEPROA ime), 0, NONVOID) +DEFINE_IMM_ENTRY(HIMC, ImmAssociateContext, (HWND hwnd, HIMC hIMC), 0, NONVOID) +DEFINE_IMM_ENTRY(LRESULT, ImmEscapeA, (HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData), 0, NONVOID) +DEFINE_IMM_ENTRY(LRESULT, ImmEscapeW, (HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData), 0, NONVOID) +DEFINE_IMM_ENTRY(LONG, ImmGetCompositionStringA, (HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen), 0, NONVOID) +DEFINE_IMM_ENTRY(LONG, ImmGetCompositionStringW, (HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionWindow, (HIMC hIMC, LPCOMPOSITIONFORM lpCompForm), 0, NONVOID) +DEFINE_IMM_ENTRY(HIMC, ImmGetContext, (HWND hwnd), 0, NONVOID) +DEFINE_IMM_ENTRY(HWND, ImmGetDefaultIMEWnd, (HWND hwnd), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmIsIME, (HKL hKL), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmReleaseContext, (HWND hwnd, HIMC hIMC), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmRegisterClient, (/*PSHAREDINFO*/ LPVOID pInfo, HINSTANCE hInst), TRUE, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionFontW, (HIMC hIMC, LPLOGFONTW plf), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionFontA, (HIMC hIMC, LPLOGFONTA plf), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontW, (HIMC hIMC, LPLOGFONTW plf), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontA, (HIMC hIMC, LPLOGFONTA plf), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionWindow, (HIMC hIMC, LPCOMPOSITIONFORM lpCompForm), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmNotifyIME, (HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue), 0, NONVOID) +DEFINE_IMM_ENTRY(/*PINPUTCONTEXT*/ LPVOID, ImmLockIMC, (HIMC hIMC), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmUnlockIMC, (HIMC hIMC), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmLoadIME, (HKL hKL), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetOpenStatus, (HIMC hIMC, BOOL bOpen), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmFreeLayout, (DWORD dwFlags), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmActivateLayout, (HKL hKL), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetCandidateWindow, (HIMC hIMC, LPCANDIDATEFORM lpCandForm), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmConfigureIMEW, (HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmGetConversionStatus, (HIMC hIMC, LPDWORD lpdwConversion, LPDWORD lpdwSentence), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetConversionStatus, (HIMC hIMC, DWORD dwConversion, DWORD dwSentence), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetStatusWindowPos, (HIMC hIMC, LPPOINT lppt), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmGetImeInfoEx, (PIMEINFOEX info, IMEINFOEXCLASS type, LPVOID pvKey), 0, NONVOID) +DEFINE_IMM_ENTRY(/*PIMEDPI*/ LPVOID, ImmLockImeDpi, (HKL hKL), 0, NONVOID) +DEFINE_IMM_ENTRY(VOID, ImmUnlockImeDpi, (/*PIMEDPI*/ LPVOID dpi), 0, VOID) +DEFINE_IMM_ENTRY(BOOL, ImmGetOpenStatus, (HIMC hIMC), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetActiveContext, (HWND hwnd, HIMC hIMC, BOOL bFlag), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmTranslateMessage, (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmLoadLayout, (HKL hKL, PIMEINFOEX info), 0, NONVOID) +DEFINE_IMM_ENTRY(DWORD, ImmProcessKey, (HWND hwnd, HKL hKL, UINT uVKey, LPARAM lParam, DWORD dwHotKeyID), 0, NONVOID) +DEFINE_IMM_ENTRY(LRESULT, ImmPutImeMenuItemsIntoMappedFile, (HIMC hIMC), 0, NONVOID) +DEFINE_IMM_ENTRY(DWORD, ImmGetProperty, (HKL hKL, DWORD dwIndex), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionStringA, (HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionStringW, (HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmEnumInputContext, (DWORD dwThreadID, IMCENUMPROC lpfn, LPARAM lParam), 0, NONVOID) +DEFINE_IMM_ENTRY(LRESULT, ImmSystemHandler, (HIMC hIMC, WPARAM wParam, LPARAM lParam), 0, NONVOID) diff --git a/win32ss/user/user32/include/user32.h b/win32ss/user/user32/include/user32.h index 56415399ffc..2615fb61549 100644 --- a/win32ss/user/user32/include/user32.h +++ b/win32ss/user/user32/include/user32.h @@ -57,6 +57,8 @@ #include <wine/unicode.h> #include <wine/debug.h> +#include <winnls32.h> + /* Internal User32 Headers */ #include "user32p.h" diff --git a/win32ss/user/user32/include/user32p.h b/win32ss/user/user32/include/user32p.h index 9bfaeecf83a..5ec7b322bd1 100644 --- a/win32ss/user/user32/include/user32p.h +++ b/win32ss/user/user32/include/user32p.h @@ -17,31 +17,24 @@ #include "resource.h" #include "ntwrapper.h" +#define IMM_RETURN_VOID(retval) /* empty */ +#define IMM_RETURN_NONVOID(retval) return (retval) +/* typedef FN_... */ +#undef DEFINE_IMM_ENTRY +#define DEFINE_IMM_ENTRY(type, name, params, retval, retkind) \ + typedef type (WINAPI *FN_##name)params; +#include "immtable.h" + +/* define Imm32ApiTable */ typedef struct { - BOOL (WINAPI* pImmIsIME) (HKL); - LRESULT (WINAPI* pImmEscapeA) (HKL, HIMC, UINT, LPVOID); - LRESULT (WINAPI* pImmEscapeW) (HKL, HIMC, UINT, LPVOID); - LONG (WINAPI* pImmGetCompositionStringA) (HIMC, DWORD, LPVOID, DWORD); - LONG (WINAPI* pImmGetCompositionStringW) (HIMC, DWORD, LPVOID, DWORD); - BOOL (WINAPI* pImmGetCompositionFontA) (HIMC, LPLOGFONTA); - BOOL (WINAPI* pImmGetCompositionFontW) (HIMC, LPLOGFONTW); - BOOL (WINAPI* pImmSetCompositionFontA)(HIMC, LPLOGFONTA); - BOOL (WINAPI* pImmSetCompositionFontW)(HIMC, LPLOGFONTW); - BOOL (WINAPI* pImmGetCompositionWindow) (HIMC, LPCOMPOSITIONFORM); - BOOL (WINAPI* pImmSetCompositionWindow) (HIMC, LPCOMPOSITIONFORM); - HIMC (WINAPI* pImmAssociateContext) (HWND, HIMC); - BOOL (WINAPI* pImmReleaseContext) (HWND, HIMC); - HIMC (WINAPI* pImmGetContext) (HWND); - HWND (WINAPI* pImmGetDefaultIMEWnd) (HWND); - BOOL (WINAPI* pImmNotifyIME) (HIMC, DWORD, DWORD, DWORD); - BOOL (WINAPI* pImmRegisterClient) (PVOID, HINSTANCE); - UINT (WINAPI* pImmProcessKey) (HWND, HKL, UINT, LPARAM, DWORD); - +#undef DEFINE_IMM_ENTRY +#define DEFINE_IMM_ENTRY(type, name, params, retval, retkind) \ + FN_##name p##name; +#include "immtable.h" } Imm32ApiTable; - /* global variables */ extern HINSTANCE User32Instance; #define user32_module User32Instance @@ -61,6 +54,8 @@ extern HINSTANCE ghmodUserApiHook; extern HICON hIconSmWindows, hIconWindows; extern Imm32ApiTable gImmApiEntries; +#define IMM_FN(name) gImmApiEntries.p##name + #define IS_ATOM(x) \ (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000)) diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index b06bb5da1d8..03e040230a9 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -3,46 +3,35 @@ * PROJECT: ReactOS user32.dll * FILE: win32ss/user/user32/misc/imm.c * PURPOSE: User32.dll Imm functions - * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) * UPDATE HISTORY: * 01/27/2009 Created */ #include <user32.h> - -#include <winnls32.h> #include <strsafe.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); #define IMM_INIT_MAGIC 0x19650412 - -Imm32ApiTable gImmApiEntries = {0}; HINSTANCE ghImm32 = NULL; BOOL bImmInitializing = FALSE; -BOOL ImmApiTableZero = TRUE; +/* define stub functions */ +#undef DEFINE_IMM_ENTRY +#define DEFINE_IMM_ENTRY(type, name, params, retval, retkind) \ + static type WINAPI IMMSTUB_##name params { IMM_RETURN_##retkind((type)retval); } +#include "immtable.h" -/* - * This function should not be implemented, it is used, - * if you can not load function from imm32.dll - */ -BOOL WINAPI IMM_ImmIsIME(HKL hKL) { return 0; } -HIMC WINAPI IMM_ImmAssociateContext(HWND hwnd, HIMC himc) { return 0; } -BOOL WINAPI IMM_ImmReleaseContext(HWND hwnd, HIMC himc) { return 0; } -LRESULT WINAPI IMM_ImmEscapeAW(HKL hkl, HIMC himc, UINT uint, LPVOID lpvoid) { return 0; } -LONG WINAPI IMM_ImmGetCompositionStringAW(HIMC himc, DWORD dword1, LPVOID lpvoid, DWORD dword2) { return 0; } -BOOL WINAPI IMM_ImmGetCompositionFontA(HIMC himc, LPLOGFONTA lplf) { return 0; } -BOOL WINAPI IMM_ImmGetCompositionFontW(HIMC himc, LPLOGFONTW lplf) { return 0; } -BOOL WINAPI IMM_ImmSetCompositionFontA(HIMC himc, LPLOGFONTA lplf) { return 0; } -BOOL WINAPI IMM_ImmSetCompositionFontW(HIMC himc, LPLOGFONTW lplf) { return 0; } -BOOL WINAPI IMM_ImmSetGetCompositionWindow(HIMC himc, LPCOMPOSITIONFORM lpcf) { return 0; } -HIMC WINAPI IMM_ImmGetContext(HWND hwnd) { return 0; } -HWND WINAPI IMM_ImmGetDefaultIMEWnd(HWND hwnd) { return 0; } -BOOL WINAPI IMM_ImmNotifyIME(HIMC himc, DWORD dword1, DWORD dword2, DWORD dword3) { return 0; } -BOOL WINAPI IMM_ImmRegisterClient(PVOID ptr, HINSTANCE hMod) { return 0; } -UINT WINAPI IMM_ImmProcessKey(HWND hwnd, HKL hkl, UINT Vk, LPARAM lParam, DWORD HotKey) { return 0; } +Imm32ApiTable gImmApiEntries = { +/* initialize by stubs */ +#undef DEFINE_IMM_ENTRY +#define DEFINE_IMM_ENTRY(type, name, params, retval, retkind) \ + IMMSTUB_##name, +#include "immtable.h" +}; HRESULT WINAPI GetImmFileName(PWSTR lpBuffer, UINT uSize) { @@ -66,11 +55,8 @@ BOOL WINAPI IntInitializeImmEntryTable(VOID) WCHAR ImmFile[MAX_PATH]; HMODULE imm32 = ghImm32; - if (gImmApiEntries.pImmIsIME != 0) - { - ERR("Imm Api Table Init 1\n"); - return TRUE; - } + if (IMM_FN(ImmWINNLSEnableIME) != IMMSTUB_ImmWINNLSEnableIME) + return TRUE; GetImmFileName(ImmFile, sizeof(ImmFile)); TRACE("File %ws\n",ImmFile); @@ -91,91 +77,16 @@ BOOL WINAPI IntInitializeImmEntryTable(VOID) return TRUE; } - if (ImmApiTableZero) - { - ImmApiTableZero = FALSE; - ZeroMemory(&gImmApiEntries, sizeof(Imm32ApiTable)); - } - - gImmApiEntries.pImmIsIME = (BOOL (WINAPI*)(HKL)) GetProcAddress(imm32, "ImmIsIME"); - if (!gImmApiEntries.pImmIsIME) - gImmApiEntries.pImmIsIME = IMM_ImmIsIME; - - gImmApiEntries.pImmEscapeA = (LRESULT (WINAPI*)(HKL, HIMC, UINT, LPVOID)) GetProcAddress(imm32, "ImmEscapeA"); - if (!gImmApiEntries.pImmEscapeA) - gImmApiEntries.pImmEscapeA = IMM_ImmEscapeAW; - - gImmApiEntries.pImmEscapeW = (LRESULT (WINAPI*)(HKL, HIMC, UINT, LPVOID)) GetProcAddress(imm32, "ImmEscapeW"); - if (!gImmApiEntries.pImmEscapeW) - gImmApiEntries.pImmEscapeW = IMM_ImmEscapeAW; - - gImmApiEntries.pImmGetCompositionStringA = (LONG (WINAPI*)(HIMC, DWORD, LPVOID, DWORD)) GetProcAddress(imm32, "ImmGetCompositionStringA"); - if (!gImmApiEntries.pImmGetCompositionStringA) - gImmApiEntries.pImmGetCompositionStringA = IMM_ImmGetCompositionStringAW; - - gImmApiEntries.pImmGetCompositionStringW = (LONG (WINAPI*)(HIMC, DWORD, LPVOID, DWORD)) GetProcAddress(imm32, "ImmGetCompositionStringW"); - if (!gImmApiEntries.pImmGetCompositionStringW) - gImmApiEntries.pImmGetCompositionStringW = IMM_ImmGetCompositionStringAW; - - gImmApiEntries.pImmGetCompositionFontA = (BOOL (WINAPI*)(HIMC, LPLOGFONTA)) GetProcAddress(imm32, "ImmGetCompositionFontA"); - if (!gImmApiEntries.pImmGetCompositionFontA) - gImmApiEntries.pImmGetCompositionFontA = IMM_ImmGetCompositionFontA; - - gImmApiEntries.pImmGetCompositionFontW = (BOOL (WINAPI*)(HIMC, LPLOGFONTW)) GetProcAddress(imm32, "ImmGetCompositionFontW"); - if (!gImmApiEntries.pImmGetCompositionFontW) - gImmApiEntries.pImmGetCompositionFontW = IMM_ImmGetCompositionFontW; - - gImmApiEntries.pImmSetCompositionFontA = (BOOL (WINAPI*)(HIMC, LPLOGFONTA)) GetProcAddress(imm32, "ImmSetCompositionFontA"); - if (!gImmApiEntries.pImmSetCompositionFontA) - gImmApiEntries.pImmSetCompositionFontA = IMM_ImmSetCompositionFontA; - - gImmApiEntries.pImmSetCompositionFontW = (BOOL (WINAPI*)(HIMC, LPLOGFONTW)) GetProcAddress(imm32, "ImmSetCompositionFontW"); - if (!gImmApiEntries.pImmSetCompositionFontW) - gImmApiEntries.pImmSetCompositionFontW = IMM_ImmSetCompositionFontW; - - gImmApiEntries.pImmGetCompositionWindow = (BOOL (WINAPI*)(HIMC, LPCOMPOSITIONFORM)) GetProcAddress(imm32, "ImmGetCompositionWindow"); - if (!gImmApiEntries.pImmGetCompositionWindow) - gImmApiEntries.pImmGetCompositionWindow = IMM_ImmSetGetCompositionWindow; - - gImmApiEntries.pImmSetCompositionWindow = (BOOL (WINAPI*)(HIMC, LPCOMPOSITIONFORM)) GetProcAddress(imm32, "ImmSetCompositionWindow"); - if (!gImmApiEntries.pImmSetCompositionWindow) - gImmApiEntries.pImmSetCompositionWindow = IMM_ImmSetGetCompositionWindow; - - gImmApiEntries.pImmAssociateContext = (HIMC (WINAPI*)(HWND, HIMC)) GetProcAddress(imm32, "ImmAssociateContext"); - if (!gImmApiEntries.pImmAssociateContext) - gImmApiEntries.pImmAssociateContext = IMM_ImmAssociateContext; - - gImmApiEntries.pImmReleaseContext = (BOOL (WINAPI*)(HWND, HIMC)) GetProcAddress(imm32, "ImmReleaseContext"); - if (!gImmApiEntries.pImmReleaseContext) - gImmApiEntries.pImmReleaseContext = IMM_ImmReleaseContext; - - gImmApiEntries.pImmGetContext = (HIMC (WINAPI*)(HWND)) GetProcAddress(imm32, "ImmGetContext"); - if (!gImmApiEntries.pImmGetContext) - gImmApiEntries.pImmGetContext = IMM_ImmGetContext; - - gImmApiEntries.pImmGetDefaultIMEWnd = (HWND (WINAPI*)(HWND)) GetProcAddress(imm32, "ImmGetDefaultIMEWnd"); - if (!gImmApiEntries.pImmGetDefaultIMEWnd) - gImmApiEntries.pImmGetDefaultIMEWnd = IMM_ImmGetDefaultIMEWnd; - - gImmApiEntries.pImmNotifyIME = (BOOL (WINAPI*)(HIMC, DWORD, DWORD, DWORD)) GetProcAddress(imm32, "ImmNotifyIME"); - if (!gImmApiEntries.pImmNotifyIME) - gImmApiEntries.pImmNotifyIME = IMM_ImmNotifyIME; - - /* - * TODO: Load more functions from imm32.dll - * Function like IMPSetIMEW, IMPQueryIMEW etc. call functions - * from imm32.dll through pointers in the structure gImmApiEntries. - * I do not know whether it is necessary to initialize a table - * of functions to load user32 (DLL_PROCESS_ATTACH) - */ - - gImmApiEntries.pImmRegisterClient = (BOOL (WINAPI*)(PVOID, HINSTANCE)) GetProcAddress(imm32, "ImmRegisterClient"); - if (!gImmApiEntries.pImmRegisterClient) - gImmApiEntries.pImmRegisterClient = IMM_ImmRegisterClient; - - gImmApiEntries.pImmProcessKey = (UINT (WINAPI*)(HWND, HKL, UINT, LPARAM, DWORD)) GetProcAddress(imm32, "ImmProcessKey"); - if (!gImmApiEntries.pImmProcessKey) - gImmApiEntries.pImmProcessKey = IMM_ImmProcessKey; +/* load imm procedures */ +#undef DEFINE_IMM_ENTRY +#define DEFINE_IMM_ENTRY(type, name, params, retval, retkind) \ + do { \ + FN_##name proc = (FN_##name)GetProcAddress(imm32, #name); \ + if (proc) { \ + IMM_FN(name) = proc; \ + } \ + } while (0); +#include "immtable.h" return TRUE; } @@ -212,12 +123,7 @@ BOOL WINAPI User32InitializeImmEntryTable(DWORD magic) return FALSE; } } -#if 0 // For real Imm32.dll testing!!!! - if (ghImm32 && !gImmApiEntries.pImmRegisterClient(&gSharedInfo, ghImm32)) - { - ERR("Wine is stubed!\n"); - } -#endif + return TRUE; } @@ -349,113 +255,103 @@ BOOL WINAPI CliImmSetHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL h } /* - * @unimplemented + * @implemented */ BOOL WINAPI IMPSetIMEW(HWND hwnd, LPIMEPROW ime) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmIMPSetIMEW)(hwnd, ime); } /* - * @unimplemented + * @implemented */ BOOL WINAPI IMPQueryIMEW(LPIMEPROW ime) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmIMPQueryIMEW)(ime); } /* - * @unimplemented + * @implemented */ BOOL WINAPI IMPGetIMEW(HWND hwnd, LPIMEPROW ime) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmIMPGetIMEW)(hwnd, ime); } /* - * @unimplemented + * @implemented */ BOOL WINAPI IMPSetIMEA(HWND hwnd, LPIMEPROA ime) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmIMPSetIMEA)(hwnd, ime); } /* - * @unimplemented + * @implemented */ BOOL WINAPI IMPQueryIMEA(LPIMEPROA ime) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmIMPQueryIMEA)(ime); } /* - * @unimplemented + * @implemented */ BOOL WINAPI IMPGetIMEA(HWND hwnd, LPIMEPROA ime) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmIMPGetIMEA)(hwnd, ime); } /* - * @unimplemented + * @implemented */ LRESULT WINAPI -SendIMEMessageExW(HWND hwnd, LPARAM lparam) +SendIMEMessageExW(HWND hwnd, LPARAM lParam) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmSendIMEMessageExW)(hwnd, lParam); } /* - * @unimplemented + * @implemented */ LRESULT WINAPI -SendIMEMessageExA(HWND hwnd, LPARAM lparam) +SendIMEMessageExA(HWND hwnd, LPARAM lParam) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmSendIMEMessageExA)(hwnd, lParam); } /* - * @unimplemented + * @implemented */ BOOL WINAPI WINNLSEnableIME(HWND hwnd, BOOL enable) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmWINNLSEnableIME)(hwnd, enable); } /* - * @unimplemented + * @implemented */ BOOL WINAPI WINNLSGetEnableStatus(HWND hwnd) { - UNIMPLEMENTED; - return FALSE; + return IMM_FN(ImmWINNLSGetEnableStatus)(hwnd); } /* diff --git a/win32ss/user/user32/misc/immtable.h b/win32ss/user/user32/misc/immtable.h deleted file mode 100644 index d0cbdc2e4a5..00000000000 --- a/win32ss/user/user32/misc/immtable.h +++ /dev/null @@ -1,52 +0,0 @@ -DEFINE_IMM_ENTRY(BOOL, ImmWINNLSEnableIME, (HWND, BOOL)) -DEFINE_IMM_ENTRY(BOOL, ImmWINNLSGetEnableStatus, (HWND)) -DEFINE_IMM_ENTRY(LRESULT, ImmSendIMEMessageExW, (HWND, LPARAM)) -DEFINE_IMM_ENTRY(LRESULT, ImmSendIMEMessageExA, (HWND, LPARAM)) -DEFINE_IMM_ENTRY(BOOL, ImmIMPGetIMEW, (HWND, LPIMEPROW)) -DEFINE_IMM_ENTRY(BOOL, ImmIMPGetIMEA, (HWND, LPIMEPROA)) -DEFINE_IMM_ENTRY(BOOL, ImmIMPQueryIMEW, (LPIMEPROW)) -DEFINE_IMM_ENTRY(BOOL, ImmIMPQueryIMEA, (LPIMEPROA)) -DEFINE_IMM_ENTRY(BOOL, ImmIMPSetIMEW, (HWND, LPIMEPROW)) -DEFINE_IMM_ENTRY(BOOL, ImmIMPSetIMEA, (HWND, LPIMEPROA)) -DEFINE_IMM_ENTRY(HIMC, ImmAssociateContext, (HWND, HIMC)) -DEFINE_IMM_ENTRY(LRESULT, ImmEscapeA, (HKL, HIMC, UINT, LPVOID)) -DEFINE_IMM_ENTRY(LRESULT, ImmEscapeW, (HKL, HIMC, UINT, LPVOID)) -DEFINE_IMM_ENTRY(LONG, ImmGetCompositionStringA, (HIMC, DWORD, LPVOID, DWORD)) -DEFINE_IMM_ENTRY(LONG, ImmGetCompositionStringW, (HIMC, DWORD, LPVOID, DWORD)) -DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionWindow, (HIMC, LPCOMPOSITIONFORM)) -DEFINE_IMM_ENTRY(HIMC, ImmGetContext, (HWND)) -DEFINE_IMM_ENTRY(HWND, ImmGetDefaultIMEWnd, (HWND)) -DEFINE_IMM_ENTRY(BOOL, ImmIsIME, (HKL)) -DEFINE_IMM_ENTRY(BOOL, ImmReleaseContext, (HWND, HIMC)) -DEFINE_IMM_ENTRY(BOOL, ImmRegisterClient, (/*PSHAREDINFO*/ LPVOID, HINSTANCE)) -DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionFontW, (HIMC, LPLOGFONTW)) -DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionFontA, (HIMC, LPLOGFONTA)) -DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontW, (HIMC, LPLOGFONTW)) -DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontA, (HIMC, LPLOGFONTA)) -DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionWindow, (HIMC, LPCOMPOSITIONFORM)) -DEFINE_IMM_ENTRY(BOOL, ImmNotifyIME, (HIMC, DWORD, DWORD, DWORD)) -DEFINE_IMM_ENTRY(PINPUTCONTEXT, ImmLockIMC, (HIMC)) -DEFINE_IMM_ENTRY(BOOL, ImmUnlockIMC, (HIMC)) -DEFINE_IMM_ENTRY(BOOL, ImmLoadIME, (HKL)) -DEFINE_IMM_ENTRY(BOOL, ImmSetOpenStatus, (HIMC, BOOL)) -DEFINE_IMM_ENTRY(BOOL, ImmFreeLayout, (DWORD)) -DEFINE_IMM_ENTRY(BOOL, ImmActivateLayout, (HKL)) -DEFINE_IMM_ENTRY(BOOL, ImmSetCandidateWindow, (HIMC, LPCANDIDATEFORM)) -DEFINE_IMM_ENTRY(BOOL, ImmConfigureIMEW, (HKL, HWND, DWORD, LPVOID)) -DEFINE_IMM_ENTRY(BOOL, ImmGetConversionStatus, (HIMC, LPDWORD, LPDWORD)) -DEFINE_IMM_ENTRY(BOOL, ImmSetConversionStatus, (HIMC, DWORD, DWORD)) -DEFINE_IMM_ENTRY(BOOL, ImmSetStatusWindowPos, (HIMC, LPPOINT)) -DEFINE_IMM_ENTRY(BOOL, ImmGetImeInfoEx, (PIMEINFOEX, IMEINFOEXCLASS, LPVOID)) -DEFINE_IMM_ENTRY(PIMEDPI, ImmLockImeDpi, (HKL)) -DEFINE_IMM_ENTRY(VOID, ImmUnlockImeDpi, (/*PIMEDPI*/ LPVOID)) -DEFINE_IMM_ENTRY(BOOL, ImmGetOpenStatus, (HIMC)) -DEFINE_IMM_ENTRY(BOOL, ImmSetActiveContext, (HWND, HIMC, BOOL)) -DEFINE_IMM_ENTRY(BOOL, ImmTranslateMessage, (HWND, UINT, WPARAM, LPARAM)) -DEFINE_IMM_ENTRY(BOOL, ImmLoadLayout, (HKL, PIMEINFOEX)) -DEFINE_IMM_ENTRY(DWORD, ImmProcessKey, (HWND, HKL, UINT, LPARAM, DWORD)) -DEFINE_IMM_ENTRY(LRESULT, ImmPutImeMenuItemsIntoMappedFile, (HIMC)) -DEFINE_IMM_ENTRY(DWORD, ImmGetProperty, (HKL, DWORD)) -DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionStringA, (HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD)) -DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionStringW, (HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD)) -DEFINE_IMM_ENTRY(BOOL, ImmEnumInputContext, (DWORD, IMCENUMPROC, LPARAM)) -DEFINE_IMM_ENTRY(LRESULT, ImmSystemHandler, (HIMC, WPARAM, LPARAM))

3 years, 12 months

[reactos] 01/01: [COMCTL32] Improve IP Address Controls (Tab and caret) (#3212)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f30b1eda7e51dae1df0b… commit 3f30b1eda7e51dae1df0b411e75b99a03e9fbca2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 23 08:32:40 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 23 08:32:40 2020 +0900 [COMCTL32] Improve IP Address Controls (Tab and caret) (#3212) Improve IP address controls. - Set focus to EDIT control to show caret. - Process WM_GETDLGCODE messages on EDIT control to catch Tab key. - Process Tab key and Shift+Tab key in processing WM_KEYDOWN. CORE-3479 --- dll/win32/comctl32/ipaddress.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dll/win32/comctl32/ipaddress.c b/dll/win32/comctl32/ipaddress.c index 6e7b703bb49..9f1b2c08c38 100644 --- a/dll/win32/comctl32/ipaddress.c +++ b/dll/win32/comctl32/ipaddress.c @@ -453,6 +453,9 @@ static BOOL IPADDRESS_GotoNextField (const IPADDRESS_INFO *infoPtr, int cur, int end = -1; SendMessageW(next->EditHwnd, EM_SETSEL, start, end); } +#ifdef __REACTOS__ + SetFocus(next->EditHwnd); +#endif return TRUE; } @@ -563,6 +566,26 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; } break; +#ifdef __REACTOS__ + case VK_TAB: + if (GetKeyState(VK_SHIFT) < 0) + { + /* Shift+Tab */ + if (index == 0) + SetFocus(GetNextDlgTabItem(GetParent(infoPtr->Self), infoPtr->Self, TRUE)); + else + IPADDRESS_GotoNextField(infoPtr, index - 2, POS_SELALL); + } + else + { + /* Tab */ + if (index == 3) + SetFocus(GetNextDlgTabItem(GetParent(infoPtr->Self), infoPtr->Self, FALSE)); + else + IPADDRESS_GotoNextField(infoPtr, index, POS_SELALL); + } + break; +#endif } break; case WM_KILLFOCUS: @@ -573,6 +596,13 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (IPADDRESS_GetPartIndex(infoPtr, (HWND)wParam) < 0) IPADDRESS_Notify(infoPtr, EN_SETFOCUS); break; +#ifdef __REACTOS__ + case WM_GETDLGCODE: + { + LRESULT ret = DefWindowProcW(hwnd, uMsg, wParam, lParam); + return ret | DLGC_WANTTAB; + } +#endif } return CallWindowProcW (part->OrigProc, hwnd, uMsg, wParam, lParam); } @@ -602,6 +632,11 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_PAINT: return IPADDRESS_Paint (infoPtr, (HDC)wParam); +#ifdef __REACTOS__ + case WM_SETFOCUS: + IPADDRESS_GotoNextField(infoPtr, -1, POS_SELALL); + return 0; +#endif case WM_COMMAND: switch(wParam >> 16) { case EN_CHANGE:

3 years, 12 months

[reactos] 07/07: [CMD] SET: Diverse fixes for the arithmetic-expression parser (/A option).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17e094cd34648d48d3804… commit 17e094cd34648d48d3804f9419b78718fb2c207e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 19 21:30:50 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 23 00:22:48 2020 +0200 [CMD] SET: Diverse fixes for the arithmetic-expression parser (/A option). - Detect whether a division by zero is done, and fail if so. - Detect whether an invalid number is provided: * If _tcstol() fails with errno == ERANGE, we've got an overflow or underflow. * If the next character where _tcstol() is not a whitespace but is a character compatible with the first character of an identifier, the number is invalid. - Add + to the list of existing unary operators (!,~,-), and parse them where many of these are present. Indeed, expressions like: +3, -+-+3, !!-+3 (or with other unary ops, etc.) are valid. - Operators constituted of more than one characters, can contain whitespace separating their constituting characters. Thus, "a + = 3" is equivalent to "a += 3" (and the same for -=, *=, /=, %=, &=, |= and ^=), and "a < < 3" is equivalent to "a << 3" (and the same for >>, <<= and >>=). - After evaluating everything, if unparsed data remains, fail and bail out. - Return Windows' CMD-compatible errorlevels. See https://ss64.com/nt/set.html for more details. Fixes some cmd_winetests. --- base/shell/cmd/set.c | 171 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 147 insertions(+), 24 deletions(-) diff --git a/base/shell/cmd/set.c b/base/shell/cmd/set.c index beded9515fc..1adf091ad84 100644 --- a/base/shell/cmd/set.c +++ b/base/shell/cmd/set.c @@ -112,14 +112,22 @@ INT cmd_set(LPTSTR param) if (!_tcsnicmp(param, _T("/A"), 2)) { BOOL Success; + + /* Save error level since seta_eval() modifies it, as + * we need to set it later according to specific rules. */ + INT nOldErrorLevel = nErrorLevel; + StripQuotes(param); Success = seta_eval(skip_ws(param + 2)); if (!Success) { +#if 0 /* Might seem random but this is what windows xp does -- This is a message ID */ retval = 9165; +#endif + retval = nErrorLevel; + nErrorLevel = nOldErrorLevel; } - // return !Success; else { retval = 0; @@ -287,12 +295,33 @@ calc(INT* lval, TCHAR op, INT rval) case '*': *lval *= rval; break; + case '/': + { + if (rval == 0) + { + // FIXME: Localize + ConErrPuts(_T("Division by zero error.\n")); + nErrorLevel = 0x400023D1; // 1073750993; + return FALSE; + } *lval /= rval; break; + } + case '%': + { + if (rval == 0) + { + // FIXME: Localize + ConErrPuts(_T("Division by zero error.\n")); + nErrorLevel = 0x400023D1; // 1073750993; + return FALSE; + } *lval %= rval; break; + } + case '+': *lval += rval; break; @@ -308,8 +337,10 @@ calc(INT* lval, TCHAR op, INT rval) case '|': *lval |= rval; break; + default: ConErrResPuts(STRING_INVALID_OPERAND); + nErrorLevel = 0x400023CE; // 1073750990; return FALSE; } return TRUE; @@ -322,23 +353,47 @@ static BOOL seta_unaryTerm(LPCTSTR* p_, INT* result) { LPCTSTR p = *p_; + INT rval; if (*p == _T('(')) { - INT rval; p = skip_ws(p + 1); if (!seta_stmt(&p, &rval)) return FALSE; if (*p++ != _T(')')) { ConErrResPuts(STRING_EXPECTED_CLOSE_PAREN); + nErrorLevel = 0x400023CC; // 1073750988; return FALSE; } *result = rval; } - else if (isdigit(*p)) + else if (_istdigit(*p)) { - *result = _tcstol(p, (LPTSTR*)&p, 0); + errno = 0; + rval = _tcstol(p, (LPTSTR*)&p, 0); + + /* Check for overflow / underflow */ + if (errno == ERANGE) + { + // FIXME: Localize + ConErrPuts(_T("Invalid number. Numbers are limited to 32-bits of precision.\n")); + nErrorLevel = 0x400023D0; // 1073750992; + return FALSE; + } + /* + * _tcstol() stopped at the first non-digit character. If it's not a whitespace, + * or if it's the start of a possible identifier, this means the number being + * interpreted was invalid. + */ + else if (*p && !_istspace(*p) && __iscsymf(*p)) + { + // FIXME: Localize + ConErrPuts(_T("Invalid number. Numeric constants are either decimal (42), hexadecimal (0x2A), or octal (052).\n")); + nErrorLevel = 0x400023CF; // 1073750991; + return FALSE; + } + *result = rval; } else if (__iscsymf(*p)) { @@ -350,6 +405,7 @@ seta_unaryTerm(LPCTSTR* p_, INT* result) else { ConErrResPuts(STRING_EXPECTED_NUMBER_OR_VARIABLE); + nErrorLevel = 0x400023CD; // 1073750989; return FALSE; } *p_ = skip_ws(p); @@ -363,24 +419,36 @@ seta_mulTerm(LPCTSTR* p_, INT* result) TCHAR op = 0; INT rval; - if (_tcschr(_T("!~-"), *p)) + if (_tcschr(_T("!~-+"), *p)) { op = *p; p = skip_ws(p + 1); + + if (!seta_mulTerm(&p, &rval)) + return FALSE; + + switch (op) + { + case '!': + rval = !rval; + break; + case '~': + rval = ~rval; + break; + case '-': + rval = -rval; + break; +#if 0 + case '+': + rval = rval; + break; +#endif + } } - if (!seta_unaryTerm(&p, &rval)) - return FALSE; - switch (op) + else { - case '!': - rval = !rval; - break; - case '~': - rval = ~rval; - break; - case '-': - rval = -rval; - break; + if (!seta_unaryTerm(&p, &rval)) + return FALSE; } *result = rval; @@ -442,12 +510,18 @@ seta_bitAndTerm(LPCTSTR* p_, INT* result) return FALSE; /* Handle << >> operators */ - while (*p && _tcschr(_T("<>"), *p) && p[0] == p[1]) + while (*p && _tcschr(_T("<>"), *p)) { INT rval; TCHAR op = *p; - p = skip_ws(p + 2); + /* Check whether the next non-whitespace character is the same operator */ + p = skip_ws(p + 1); + if (*p != op) + break; + + /* Skip it */ + p = skip_ws(p + 1); /* Evaluate the immediate right-hand side */ if (!seta_logShiftTerm(&p, &rval)) @@ -473,6 +547,7 @@ seta_bitAndTerm(LPCTSTR* p_, INT* result) default: ConErrResPuts(STRING_INVALID_OPERAND); + nErrorLevel = 0x400023CE; // 1073750990; return FALSE; } } @@ -512,17 +587,56 @@ seta_assignment(LPCTSTR* p_, INT* result) if (identlen) { p = skip_ws(p); + /* Handle = assignment */ if (*p == _T('=')) - op = *p, p = skip_ws(p + 1); + { + op = *p; + p = skip_ws(p + 1); + } /* Handle *= /= %= += -= &= ^= |= assignments */ - else if (_tcschr(_T("*/%+-&^|"), *p) && p[1] == _T('=')) - op = *p, p = skip_ws(p + 2); + else if (_tcschr(_T("*/%+-&^|"), *p)) + { + op = *p; + + /* Find the '=', there may be some spaces before it */ + p = skip_ws(p + 1); + if (*p != _T('=')) + { + op = 0; + goto evaluate; + } + + /* Skip it */ + p = skip_ws(p + 1); + } /* Handle <<= >>= assignments */ - else if (_tcschr(_T("<>"), *p) && *p == p[1] && p[2] == _T('=')) - op = *p, p = skip_ws(p + 3); + else if (_tcschr(_T("<>"), *p)) + { + op = *p; + + /* Check whether the next non-whitespace character is the same operator */ + p = skip_ws(p + 1); + if (*p != op) + { + op = 0; + goto evaluate; + } + + /* Find the '=', there may be some spaces before it */ + p = skip_ws(p + 1); + if (*p != _T('=')) + { + op = 0; + goto evaluate; + } + + /* Skip it */ + p = skip_ws(p + 1); + } } +evaluate: /* Allow to chain multiple assignments, such as: a=b=1 */ if (ident && op) { @@ -613,11 +727,20 @@ seta_eval(LPCTSTR p) if (!*p) { ConErrResPuts(STRING_SYNTAX_COMMAND_INCORRECT); + nErrorLevel = 1; return FALSE; } if (!seta_stmt(&p, &rval)) return FALSE; + /* If unparsed data remains, fail and bail out */ + if (*p) + { + ConErrResPuts(STRING_SYNTAX_COMMAND_INCORRECT); // Actually syntax error / missing operand. + nErrorLevel = 0x400023CE; // 1073750990; + return FALSE; + } + /* Echo the result of the evaluation only in interactive (non-batch) mode */ if (!bc) ConOutPrintf(_T("%i"), rval);

3 years, 12 months

[reactos] 06/07: [CMD_ROSTEST] Add tests for SET /A errorlevels.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5cf67f455f22ac030021… commit f5cf67f455f22ac03002165707bb41a8fdfa8535 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jul 27 16:46:49 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 23 00:22:48 2020 +0200 [CMD_ROSTEST] Add tests for SET /A errorlevels. --- modules/rostests/win32/cmd/test_builtins.cmd | 56 ++++++++++++++++++++++++ modules/rostests/win32/cmd/test_builtins.cmd.exp | 29 ++++++++++++ 2 files changed, 85 insertions(+) diff --git a/modules/rostests/win32/cmd/test_builtins.cmd b/modules/rostests/win32/cmd/test_builtins.cmd index 4cec71c48aa..5545f33b288 100644 --- a/modules/rostests/win32/cmd/test_builtins.cmd +++ b/modules/rostests/win32/cmd/test_builtins.cmd @@ -498,6 +498,62 @@ goto :eof :continue +:: Testing different ERRORLEVELs from the SET command. +:: See https://ss64.com/nt/set.html for more details. + +echo ---------- Testing SET /A ERRORLEVELs ---------- + +echo --- Success +call :setError 0 +set /a "total=1+1" +call :checkErrorLevel 0 +echo %errorlevel% +echo %total% + +echo --- Unbalanced parentheses +call :setError 0 +set /a "total=(2+1" +call :checkErrorLevel 1073750988 +echo %errorlevel% +echo %total% + +echo --- Missing operand +call :setError 0 +set /a "total=5*" +call :checkErrorLevel 1073750989 +echo %errorlevel% +echo %total% + +echo --- Syntax error +call :setError 0 +set /a "total=7$3" +call :checkErrorLevel 1073750990 +echo %errorlevel% +echo %total% + +echo --- Invalid number +call :setError 0 +set /a "total=0xdeadbeeg" +call :checkErrorLevel 1073750991 +echo %errorlevel% +echo %total% + +echo --- Number larger than 32-bits +call :setError 0 +set /a "total=999999999999999999999999" +call :checkErrorLevel 1073750992 +echo %errorlevel% +echo %total% + +echo --- Division by zero +call :setError 0 +set /a "total=1/0" +call :checkErrorLevel 1073750993 +echo %errorlevel% +echo %total% + + + :: :: Finished! :: diff --git a/modules/rostests/win32/cmd/test_builtins.cmd.exp b/modules/rostests/win32/cmd/test_builtins.cmd.exp index 50cff1eae09..96be9047fda 100644 --- a/modules/rostests/win32/cmd/test_builtins.cmd.exp +++ b/modules/rostests/win32/cmd/test_builtins.cmd.exp @@ -130,4 +130,33 @@ OK 0 0 0 +---------- Testing SET /A ERRORLEVELs ---------- +--- Success +OK +0 +2 +--- Unbalanced parentheses +OK +1073750988 +2 +--- Missing operand +OK +1073750989 +2 +--- Syntax error +OK +1073750990 +7 +--- Invalid number +OK +1073750991 +7 +--- Number larger than 32-bits +OK +1073750992 +7 +--- Division by zero +OK +1073750993 +7 --------- Finished --------------

3 years, 12 months

[reactos] 05/07: [CMD] Add a MSCMD_BATCH_ECHO define for enabling Windows' CMD.EXE way of preserving/restoring the echo flag across batch calls.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87a5403318f4b64f2d8b0… commit 87a5403318f4b64f2d8b0c56ebc69b89889ad6c8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 18 23:41:56 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 23 00:22:47 2020 +0200 [CMD] Add a MSCMD_BATCH_ECHO define for enabling Windows' CMD.EXE way of preserving/restoring the echo flag across batch calls. Observation shows that this is done only when the top-level batch file is being run (and then terminates); the echo flag is not restored to its previous state when a child batch file terminates and gives main back to its parent batch. --- base/shell/cmd/batch.c | 20 ++++++++++++++++++++ base/shell/cmd/batch.h | 10 ++++++++++ 2 files changed, 30 insertions(+) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index 5015bd338ea..1876b84deab 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -66,6 +66,10 @@ BATCH_TYPE BatType = NONE; PBATCH_CONTEXT bc = NULL; +#ifdef MSCMD_BATCH_ECHO +BOOL bBcEcho = TRUE; +#endif + BOOL bEcho = TRUE; /* The echo flag */ /* Buffer for reading Batch file lines */ @@ -195,8 +199,10 @@ VOID ExitBatch(VOID) UndoRedirection(bc->RedirList, NULL); FreeRedirection(bc->RedirList); +#ifndef MSCMD_BATCH_ECHO /* Preserve echo state across batch calls */ bEcho = bc->bEcho; +#endif while (bc->setlocal) cmd_endlocal(_T("")); @@ -213,6 +219,10 @@ VOID ExitBatch(VOID) { CheckCtrlBreak(BREAK_OUTOFBATCH); BatType = NONE; + +#ifdef MSCMD_BATCH_ECHO + bEcho = bBcEcho; +#endif } } @@ -352,7 +362,9 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) } bc->mempos = 0; /* Go to the beginning of the batch file */ +#ifndef MSCMD_BATCH_ECHO bc->bEcho = bEcho; /* Preserve echo across batch calls */ +#endif for (i = 0; i < 10; i++) bc->shiftlevel[i] = i; @@ -381,6 +393,10 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) { BatType = CMD_TYPE; } + +#ifdef MSCMD_BATCH_ECHO + bBcEcho = bEcho; +#endif } /* Check if this is a "CALL :label" */ @@ -424,6 +440,10 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) { /* Reset the top-level batch context type */ BatType = NONE; + +#ifdef MSCMD_BATCH_ECHO + bEcho = bBcEcho; +#endif } /* Restore the FOR variables */ diff --git a/base/shell/cmd/batch.h b/base/shell/cmd/batch.h index 25b8857b1c3..982965c794a 100644 --- a/base/shell/cmd/batch.h +++ b/base/shell/cmd/batch.h @@ -19,6 +19,10 @@ typedef enum _BATCH_TYPE CMD_TYPE /* New-style NT OS/2 batch file */ } BATCH_TYPE; + +/* Enable this define for Windows' CMD batch-echo behaviour compatibility */ +#define MSCMD_BATCH_ECHO + typedef struct _BATCH_CONTEXT { struct _BATCH_CONTEXT *prev; @@ -30,7 +34,9 @@ typedef struct _BATCH_CONTEXT LPTSTR params; LPTSTR raw_params; /* Holds the raw params given by the input */ INT shiftlevel[10]; +#ifndef MSCMD_BATCH_ECHO BOOL bEcho; /* Preserve echo flag across batch calls */ +#endif REDIRECTION *RedirList; PARSED_COMMAND *current; struct _SETLOCAL *setlocal; @@ -53,6 +59,10 @@ extern BATCH_TYPE BatType; extern PBATCH_CONTEXT bc; extern PFOR_CONTEXT fc; +#ifdef MSCMD_BATCH_ECHO +extern BOOL bBcEcho; +#endif + extern BOOL bEcho; /* The echo flag */ #define BATCH_BUFFSIZE 8192

3 years, 12 months

[reactos] 04/07: [CMD] ASSOC: Simplify the code and make it more robust; fix returned ERRORLEVEL values.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=141378cfc8c7964516c1f… commit 141378cfc8c7964516c1f7383110e440aac1f84d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jul 28 01:10:58 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 23 00:22:47 2020 +0200 [CMD] ASSOC: Simplify the code and make it more robust; fix returned ERRORLEVEL values. - Make sure that non-administrator users can list associations, and display appropriate error messages when e.g. they don't have sufficient privileges to perform an operation. - Make the helper functions all return Win32 values, used as the ERRORVALUE, except when a specific extension association fails to be displayed, in which case the ERRORVALUE is normalized to 1. - Since the 'param' is a modifiable string (that can be modified by the command, independently of the way it's called), just use it to isolate the extension by zeroing out the equls-sign separator. --- base/shell/cmd/assoc.c | 291 ++++++++++++++++++++++++++++--------------------- 1 file changed, 167 insertions(+), 124 deletions(-) diff --git a/base/shell/cmd/assoc.c b/base/shell/cmd/assoc.c index 3e5611e6b1f..6441d3d369e 100644 --- a/base/shell/cmd/assoc.c +++ b/base/shell/cmd/assoc.c @@ -13,187 +13,232 @@ * * TODO: * - PrintAllAssociations could be optimized to not fetch all registry subkeys under 'Classes', just the ones that start with '.' - * - Make sure that non-administrator users can list associations, and get appropriate error messages when they don't have sufficient - * privileges to perform an operation. */ #include "precomp.h" #ifdef INCLUDE_CMD_ASSOC -static INT -PrintAssociation( - IN LPCTSTR extension) +static LONG +PrintAssociationEx( + IN HKEY hKeyClasses, + IN PCTSTR pszExtension) { - DWORD lRet; - HKEY hKey = NULL, hSubKey = NULL; - DWORD fileTypeLength = 0; - LPTSTR fileType = NULL; - - lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_READ, &hKey); - if (lRet != ERROR_SUCCESS) - return -1; - - lRet = RegOpenKeyEx(hKey, extension, 0, KEY_READ, &hSubKey); - RegCloseKey(hKey); + LONG lRet; + HKEY hKey; + DWORD dwFileTypeLen = 0; + PTSTR pszFileType; + lRet = RegOpenKeyEx(hKeyClasses, pszExtension, 0, KEY_QUERY_VALUE, &hKey); if (lRet != ERROR_SUCCESS) - return 0; + { + if (lRet != ERROR_FILE_NOT_FOUND) + ErrorMessage(lRet, NULL); + return lRet; + } - /* Obtain string length */ - lRet = RegQueryValueEx(hSubKey, NULL, NULL, NULL, NULL, &fileTypeLength); + /* Obtain the string length */ + lRet = RegQueryValueEx(hKey, NULL, NULL, NULL, NULL, &dwFileTypeLen); - /* If there is no default value, don't display */ + /* If there is no default value, don't display it */ if (lRet == ERROR_FILE_NOT_FOUND) { - RegCloseKey(hSubKey); - return 0; + RegCloseKey(hKey); + return lRet; } if (lRet != ERROR_SUCCESS) { - RegCloseKey(hSubKey); - return -2; + ErrorMessage(lRet, NULL); + RegCloseKey(hKey); + return lRet; } - fileType = cmd_alloc(fileTypeLength * sizeof(TCHAR)); - if (!fileType) + ++dwFileTypeLen; + pszFileType = cmd_alloc(dwFileTypeLen * sizeof(TCHAR)); + if (!pszFileType) { - WARN("Cannot allocate memory for fileType!\n"); - RegCloseKey(hSubKey); - return -2; + WARN("Cannot allocate memory for pszFileType!\n"); + RegCloseKey(hKey); + return ERROR_NOT_ENOUGH_MEMORY; } - /* Obtain actual file type */ - lRet = RegQueryValueEx(hSubKey, NULL, NULL, NULL, (LPBYTE)fileType, &fileTypeLength); - RegCloseKey(hSubKey); + /* Obtain the actual file type */ + lRet = RegQueryValueEx(hKey, NULL, NULL, NULL, (LPBYTE)pszFileType, &dwFileTypeLen); + RegCloseKey(hKey); if (lRet != ERROR_SUCCESS) { - cmd_free(fileType); - return -2; + ErrorMessage(lRet, NULL); + cmd_free(pszFileType); + return lRet; } - /* If there is a default key, display relevant information */ - if (fileTypeLength != 0) + /* If there is a default key, display the relevant information */ + if (dwFileTypeLen != 0) { - ConOutPrintf(_T("%s=%s\n"), extension, fileType); + ConOutPrintf(_T("%s=%s\n"), pszExtension, pszFileType); } - cmd_free(fileType); - return 1; + cmd_free(pszFileType); + return ERROR_SUCCESS; } -static INT -PrintAllAssociations(VOID) +static LONG +PrintAssociation( + IN PCTSTR pszExtension) { - DWORD lRet = 0; - HKEY hKey = NULL; - DWORD numKeys = 0; + LONG lRet; + HKEY hKeyClasses; + + lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, + KEY_ENUMERATE_SUB_KEYS, &hKeyClasses); + if (lRet != ERROR_SUCCESS) + { + ErrorMessage(lRet, NULL); + return lRet; + } + + lRet = PrintAssociationEx(hKeyClasses, pszExtension); - DWORD extLength = 0; - LPTSTR extName = NULL; - DWORD keyCtr = 0; + RegCloseKey(hKeyClasses); + return lRet; +} - lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_READ, &hKey); +static LONG +PrintAllAssociations(VOID) +{ + LONG lRet; + HKEY hKeyClasses; + DWORD dwKeyCtr; + DWORD dwNumKeys = 0; + DWORD dwExtLen = 0; + PTSTR pszExtName; + + lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, + KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, &hKeyClasses); if (lRet != ERROR_SUCCESS) - return -1; + { + ErrorMessage(lRet, NULL); + return lRet; + } - lRet = RegQueryInfoKey(hKey, NULL, NULL, NULL, &numKeys, &extLength, + lRet = RegQueryInfoKey(hKeyClasses, NULL, NULL, NULL, &dwNumKeys, &dwExtLen, NULL, NULL, NULL, NULL, NULL, NULL); if (lRet != ERROR_SUCCESS) { - RegCloseKey(hKey); - return -2; + ErrorMessage(lRet, NULL); + RegCloseKey(hKeyClasses); + return lRet; } - extLength++; - extName = cmd_alloc(extLength * sizeof(TCHAR)); - if (!extName) + ++dwExtLen; + pszExtName = cmd_alloc(dwExtLen * sizeof(TCHAR)); + if (!pszExtName) { - WARN("Cannot allocate memory for extName!\n"); - RegCloseKey(hKey); - return -2; + WARN("Cannot allocate memory for pszExtName!\n"); + RegCloseKey(hKeyClasses); + return ERROR_NOT_ENOUGH_MEMORY; } - for (keyCtr = 0; keyCtr < numKeys; ++keyCtr) + for (dwKeyCtr = 0; dwKeyCtr < dwNumKeys; ++dwKeyCtr) { - DWORD dwBufSize = extLength; - lRet = RegEnumKeyEx(hKey, keyCtr, extName, &dwBufSize, + DWORD dwBufSize = dwExtLen; + lRet = RegEnumKeyEx(hKeyClasses, dwKeyCtr, pszExtName, &dwBufSize, NULL, NULL, NULL, NULL); if (lRet == ERROR_SUCCESS || lRet == ERROR_MORE_DATA) { - if (*extName == _T('.')) - PrintAssociation(extName); + /* Name starts with '.': this is an extension */ + if (*pszExtName == _T('.')) + PrintAssociationEx(hKeyClasses, pszExtName); } else { - cmd_free(extName); - RegCloseKey(hKey); - return -1; + ErrorMessage(lRet, NULL); + cmd_free(pszExtName); + RegCloseKey(hKeyClasses); + return lRet; } } - RegCloseKey(hKey); + RegCloseKey(hKeyClasses); - cmd_free(extName); - return numKeys; + cmd_free(pszExtName); + return ERROR_SUCCESS; } -static INT +static LONG AddAssociation( - IN LPCTSTR extension, - IN LPCTSTR type) + IN PCTSTR pszExtension, + IN PCTSTR pszType) { - DWORD lRet; - HKEY hKey = NULL, hSubKey = NULL; + LONG lRet; + HKEY hKeyClasses, hKey; - lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_ALL_ACCESS, &hKey); + lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, + KEY_CREATE_SUB_KEY, &hKeyClasses); if (lRet != ERROR_SUCCESS) - return -1; + { + ErrorMessage(lRet, NULL); + return lRet; + } - lRet = RegCreateKeyEx(hKey, extension, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, NULL, &hSubKey, NULL); - RegCloseKey(hKey); + lRet = RegCreateKeyEx(hKeyClasses, pszExtension, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_SET_VALUE, NULL, &hKey, NULL); + RegCloseKey(hKeyClasses); if (lRet != ERROR_SUCCESS) - return -1; + { + ErrorMessage(lRet, NULL); + return lRet; + } - lRet = RegSetValueEx(hSubKey, NULL, 0, REG_SZ, - (LPBYTE)type, (_tcslen(type) + 1) * sizeof(TCHAR)); - RegCloseKey(hSubKey); + lRet = RegSetValueEx(hKey, NULL, 0, REG_SZ, + (LPBYTE)pszType, (DWORD)(_tcslen(pszType) + 1) * sizeof(TCHAR)); + RegCloseKey(hKey); if (lRet != ERROR_SUCCESS) - return -2; + { + ErrorMessage(lRet, NULL); + return lRet; + } - return 0; + return ERROR_SUCCESS; } -static INT +static LONG RemoveAssociation( - IN LPCTSTR extension) + IN PCTSTR pszExtension) { - DWORD lRet; - HKEY hKey; + LONG lRet; + HKEY hKeyClasses; - lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_ALL_ACCESS, &hKey); + lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, + KEY_QUERY_VALUE, &hKeyClasses); if (lRet != ERROR_SUCCESS) - return -1; + { + ErrorMessage(lRet, NULL); + return lRet; + } - lRet = RegDeleteKey(hKey, extension); - RegCloseKey(hKey); + lRet = RegDeleteKey(hKeyClasses, pszExtension); + RegCloseKey(hKeyClasses); if (lRet != ERROR_SUCCESS) - return -2; + { + if (lRet != ERROR_FILE_NOT_FOUND) + ErrorMessage(lRet, NULL); + return lRet; + } - return 0; + return ERROR_SUCCESS; } INT CommandAssoc(LPTSTR param) { INT retval = 0; - LPTSTR lpEqualSign; + PTCHAR pEqualSign; /* Print help */ if (!_tcsncmp(param, _T("/?"), 2)) @@ -202,53 +247,51 @@ INT CommandAssoc(LPTSTR param) return 0; } - if (_tcslen(param) == 0) + /* Print all associations if no parameter has been specified */ + if (!*param) { PrintAllAssociations(); goto Quit; } - lpEqualSign = _tcschr(param, _T('=')); - if (lpEqualSign != NULL) + pEqualSign = _tcschr(param, _T('=')); + if (pEqualSign != NULL) { - LPTSTR fileType = lpEqualSign + 1; - LPTSTR extension = cmd_alloc((lpEqualSign - param + 1) * sizeof(TCHAR)); - if (!extension) - { - WARN("Cannot allocate memory for extension!\n"); - error_out_of_memory(); - retval = 1; - goto Quit; - } + PTSTR pszFileType = pEqualSign + 1; - _tcsncpy(extension, param, lpEqualSign - param); - extension[lpEqualSign - param] = _T('\0'); + /* NULL-terminate at the equals sign */ + *pEqualSign = 0; - /* If the equal sign is the last character - * in the string, then delete the key. */ - if (_tcslen(fileType) == 0) + /* If the equals sign is the last character + * in the string, delete the association. */ + if (*pszFileType == 0) { - retval = RemoveAssociation(extension); + retval = RemoveAssociation(param); } else - /* Otherwise, add the key and print out the association */ + /* Otherwise, add the association and print it out */ { - retval = AddAssociation(extension, fileType); - PrintAssociation(extension); + retval = AddAssociation(param, pszFileType); + PrintAssociation(param); } - cmd_free(extension); - - if (retval) - retval = 1; /* Fixup the error value */ + if (retval != ERROR_SUCCESS) + { + if (retval != ERROR_FILE_NOT_FOUND) + { + // FIXME: Localize + ConErrPrintf(_T("Error occurred while processing: %s.\n"), param); + } + // retval = 1; /* Fixup the error value */ + } } else { - /* No equal sign, print all associations */ + /* No equals sign, print the association */ retval = PrintAssociation(param); - if (retval == 0) /* If nothing printed out */ + if (retval != ERROR_SUCCESS) { - ConOutResPrintf(STRING_ASSOC_ERROR, param); + ConErrResPrintf(STRING_ASSOC_ERROR, param); retval = 1; /* Fixup the error value */ } }

3 years, 12 months

[reactos] 03/07: [CMD] Change ERRORLEVEL behaviour for commands ASSOC, PATH, PROMPT and SET.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63316df5202f6f038cc47… commit 63316df5202f6f038cc47841ed81544fc18263e0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jul 1 02:15:52 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 23 00:22:46 2020 +0200 [CMD] Change ERRORLEVEL behaviour for commands ASSOC, PATH, PROMPT and SET. Commands APPEND/DPATH and FTYPE are also concerned by this; however we do not implement them in our CMD.EXE yet. These commands set the ERRORLEVEL differently, whether or not they are run manually from the command-line/from a .BAT file, or from a .CMD file: - From command-line/.BAT file, these commands set the ERRORLEVEL only if an error occurs. So, if two commands are run consecutively and the first one fails, the ERRORLEVEL will remain set even if the second command succeeds. - However, when being run from a .CMD file, these command will always set the ERRORLEVEL. In the example case described above, the second command that succeeds will reset the ERRORLEVEL to 0. This behaviour is determined from the top-level batch/script file being run. This means that, if a .BAT file is first started, then starts a .CMD file, the commands will still behave the .BAT way; on the opposite, if a .CMD file is first started, then starts a .BAT file, these commands will still behave the .CMD way. To implement this we introduce one global BATCH_TYPE enum variable that is initialized to the corresponding batch/script file type when the top-level script is loaded. It is reset to "none" when that script terminates. See https://ss64.com/nt/errorlevel.html for more details, section "Old style .bat Batch files vs .cmd Batch scripts", and https://groups.google.com/forum/#!msg/microsoft.public.win2000.cmdprompt.ad… (comment by Mark Zbikowski). --- base/shell/cmd/assoc.c | 33 +++++++++++++++++++++++++-------- base/shell/cmd/batch.c | 43 ++++++++++++++++++++++++++++++++++++++----- base/shell/cmd/batch.h | 16 ++++++++++++++++ base/shell/cmd/path.c | 34 +++++++++++++++++++++++++--------- base/shell/cmd/prompt.c | 17 ++++++++++++++--- base/shell/cmd/set.c | 49 ++++++++++++++++++++++++++++++++++--------------- 6 files changed, 152 insertions(+), 40 deletions(-) diff --git a/base/shell/cmd/assoc.c b/base/shell/cmd/assoc.c index a9ce5c6682a..3e5611e6b1f 100644 --- a/base/shell/cmd/assoc.c +++ b/base/shell/cmd/assoc.c @@ -192,6 +192,7 @@ RemoveAssociation( INT CommandAssoc(LPTSTR param) { + INT retval = 0; LPTSTR lpEqualSign; /* Print help */ @@ -201,12 +202,10 @@ INT CommandAssoc(LPTSTR param) return 0; } - nErrorLevel = 0; - if (_tcslen(param) == 0) { PrintAllAssociations(); - return 0; + goto Quit; } lpEqualSign = _tcschr(param, _T('=')); @@ -218,7 +217,8 @@ INT CommandAssoc(LPTSTR param) { WARN("Cannot allocate memory for extension!\n"); error_out_of_memory(); - return 1; + retval = 1; + goto Quit; } _tcsncpy(extension, param, lpEqualSign - param); @@ -228,26 +228,43 @@ INT CommandAssoc(LPTSTR param) * in the string, then delete the key. */ if (_tcslen(fileType) == 0) { - RemoveAssociation(extension); + retval = RemoveAssociation(extension); } else /* Otherwise, add the key and print out the association */ { - AddAssociation(extension, fileType); + retval = AddAssociation(extension, fileType); PrintAssociation(extension); } cmd_free(extension); + + if (retval) + retval = 1; /* Fixup the error value */ } else { /* No equal sign, print all associations */ - INT retval = PrintAssociation(param); + retval = PrintAssociation(param); if (retval == 0) /* If nothing printed out */ + { ConOutResPrintf(STRING_ASSOC_ERROR, param); + retval = 1; /* Fixup the error value */ + } } - return 0; +Quit: + if (BatType != CMD_TYPE) + { + if (retval != 0) + nErrorLevel = retval; + } + else + { + nErrorLevel = retval; + } + + return retval; } #endif /* INCLUDE_CMD_ASSOC */ diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index e9a1e5aa76e..5015bd338ea 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -63,6 +63,7 @@ /* The stack of current batch contexts. * NULL when no batch is active. */ +BATCH_TYPE BatType = NONE; PBATCH_CONTEXT bc = NULL; BOOL bEcho = TRUE; /* The echo flag */ @@ -209,7 +210,10 @@ VOID ExitBatch(VOID) /* If there is no more batch contexts, notify the signal handler */ if (!bc) + { CheckCtrlBreak(BREAK_OUTOFBATCH); + BatType = NONE; + } } /* @@ -258,7 +262,8 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) INT ret = 0; INT i; HANDLE hFile = NULL; - BOOL bSameFn = FALSE; + BOOLEAN bSameFn = FALSE; + BOOLEAN bTopLevel; BATCH_CONTEXT new; PFOR_CONTEXT saved_fc; @@ -286,6 +291,13 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) } } + /* + * Remember whether this is a top-level batch context, i.e. if there is + * no batch context existing prior (bc == NULL originally), and we are + * going to create one below. + */ + bTopLevel = !bc; + if (bc != NULL && Cmd == bc->current) { /* Then we are transferring to another batch */ @@ -353,14 +365,28 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) return 1; } - /* Check if this is a "CALL :label" */ - if (*firstword == _T(':')) - ret = cmd_goto(firstword); - /* If we are calling from inside a FOR, hide the FOR variables */ saved_fc = fc; fc = NULL; + /* Perform top-level batch initialization */ + if (bTopLevel) + { + /* Default the top-level batch context type to .BAT */ + BatType = BAT_TYPE; + + /* If this is a .CMD file, adjust the type */ + TCHAR *dot = _tcsrchr(bc->BatchFilePath, _T('.')); + if (dot && (!_tcsicmp(dot, _T(".cmd")))) + { + BatType = CMD_TYPE; + } + } + + /* Check if this is a "CALL :label" */ + if (*firstword == _T(':')) + ret = cmd_goto(firstword); + /* If we have created a new context, don't return * until this batch file has completed. */ while (bc == &new && !bExit) @@ -393,6 +419,13 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) FreeCommand(Cmd); } + /* Perform top-level batch cleanup */ + if (!bc || bTopLevel) + { + /* Reset the top-level batch context type */ + BatType = NONE; + } + /* Restore the FOR variables */ fc = saved_fc; diff --git a/base/shell/cmd/batch.h b/base/shell/cmd/batch.h index d40b640e421..25b8857b1c3 100644 --- a/base/shell/cmd/batch.h +++ b/base/shell/cmd/batch.h @@ -4,6 +4,21 @@ #pragma once +/* + * This batch type enumeration allows us to adjust the behaviour of some commands + * depending on whether they are run from within a .BAT or a .CMD file. + * The behaviour is selected when the top-level batch file is loaded, + * and it remains the same for any child batch file that may be loaded later. + * + * See https://ss64.com/nt/errorlevel.html for more details. + */ +typedef enum _BATCH_TYPE +{ + NONE, + BAT_TYPE, /* Old-style DOS batch file */ + CMD_TYPE /* New-style NT OS/2 batch file */ +} BATCH_TYPE; + typedef struct _BATCH_CONTEXT { struct _BATCH_CONTEXT *prev; @@ -34,6 +49,7 @@ typedef struct _FOR_CONTEXT * The stack of current batch contexts. * NULL when no batch is active. */ +extern BATCH_TYPE BatType; extern PBATCH_CONTEXT bc; extern PFOR_CONTEXT fc; diff --git a/base/shell/cmd/path.c b/base/shell/cmd/path.c index 6235b459362..2286a13e674 100644 --- a/base/shell/cmd/path.c +++ b/base/shell/cmd/path.c @@ -35,14 +35,14 @@ INT cmd_path(LPTSTR param) { + INT retval = 0; + if (!_tcsncmp(param, _T("/?"), 2)) { ConOutResPaging(TRUE, STRING_PATH_HELP1); return 0; } - nErrorLevel = 0; - /* If param is empty, display the PATH environment variable */ if (!param || !*param) { @@ -53,7 +53,9 @@ INT cmd_path(LPTSTR param) if (!pszBuffer) { WARN("Cannot allocate memory for pszBuffer!\n"); - return 1; + error_out_of_memory(); + retval = 1; + goto Quit; } dwBuffer = GetEnvironmentVariable(_T("PATH"), pszBuffer, ENV_BUFFER_SIZE); @@ -61,7 +63,8 @@ INT cmd_path(LPTSTR param) { cmd_free(pszBuffer); ConErrResPrintf(STRING_SET_ENV_ERROR, _T("PATH")); - return 0; + retval = 0; + goto Quit; } else if (dwBuffer > ENV_BUFFER_SIZE) { @@ -70,8 +73,10 @@ INT cmd_path(LPTSTR param) if (!pszBuffer) { WARN("Cannot reallocate memory for pszBuffer!\n"); + error_out_of_memory(); cmd_free(pszOldBuffer); - return 1; + retval = 1; + goto Quit; } GetEnvironmentVariable(_T("PATH"), pszBuffer, dwBuffer); } @@ -79,7 +84,8 @@ INT cmd_path(LPTSTR param) ConOutPrintf(_T("PATH=%s\n"), pszBuffer); cmd_free(pszBuffer); - return 0; + retval = 0; + goto Quit; } /* Skip leading '=' */ @@ -89,11 +95,21 @@ INT cmd_path(LPTSTR param) /* Set PATH environment variable */ if (!SetEnvironmentVariable(_T("PATH"), param)) { - nErrorLevel = 1; - return 1; + retval = 1; + } + +Quit: + if (BatType != CMD_TYPE) + { + if (retval != 0) + nErrorLevel = retval; + } + else + { + nErrorLevel = retval; } - return 0; + return retval; } #endif diff --git a/base/shell/cmd/prompt.c b/base/shell/cmd/prompt.c index ce47cd70499..d835ea5f1e3 100644 --- a/base/shell/cmd/prompt.c +++ b/base/shell/cmd/prompt.c @@ -243,10 +243,11 @@ VOID PrintPrompt(VOID) INT cmd_prompt(LPTSTR param) { + INT retval = 0; + if (!_tcsncmp(param, _T("/?"), 2)) { ConOutResPaging(TRUE, STRING_PROMPT_HELP1); - #ifdef FEATURE_DIRECTORY_STACK ConOutResPaging(FALSE, STRING_PROMPT_HELP2); #endif @@ -263,10 +264,20 @@ INT cmd_prompt(LPTSTR param) if (!SetEnvironmentVariable(_T("PROMPT"), (param && param[0] != _T('\0') ? param : NULL))) { - return 1; + retval = 1; + } + + if (BatType != CMD_TYPE) + { + if (retval != 0) + nErrorLevel = retval; + } + else + { + nErrorLevel = retval; } - return 0; + return retval; } #endif diff --git a/base/shell/cmd/set.c b/base/shell/cmd/set.c index 0128314ca57..beded9515fc 100644 --- a/base/shell/cmd/set.c +++ b/base/shell/cmd/set.c @@ -71,6 +71,7 @@ GetQuotedString(TCHAR *p) INT cmd_set(LPTSTR param) { + INT retval = 0; LPTSTR p; LPTSTR lpEnv; LPTSTR lpOutput; @@ -103,7 +104,8 @@ INT cmd_set(LPTSTR param) FreeEnvironmentStrings(lpEnv); } - return 0; + retval = 0; + goto Quit; } /* The /A does *NOT* have to be followed by a whitespace */ @@ -115,9 +117,14 @@ INT cmd_set(LPTSTR param) if (!Success) { /* Might seem random but this is what windows xp does -- This is a message ID */ - nErrorLevel = 9165; + retval = 9165; + } + // return !Success; + else + { + retval = 0; } - return !Success; + goto Quit; } if (!_tcsnicmp(param, _T("/P"), 2)) @@ -128,8 +135,8 @@ INT cmd_set(LPTSTR param) if (!p) { ConErrResPuts(STRING_SYNTAX_COMMAND_INCORRECT); - nErrorLevel = 1; - return 1; + retval = 1; + goto Quit; } *p++ = _T('\0'); @@ -138,10 +145,11 @@ INT cmd_set(LPTSTR param) if (!*value || !SetEnvironmentVariable(param, value)) { - nErrorLevel = 1; - return 1; + retval = 1; + goto Quit; } - return 0; + retval = 0; + goto Quit; } param = GetQuotedString(param); @@ -154,15 +162,15 @@ INT cmd_set(LPTSTR param) { /* Handle set =val case */ ConErrResPuts(STRING_SYNTAX_COMMAND_INCORRECT); - nErrorLevel = 1; - return 1; + retval = 1; + goto Quit; } *p++ = _T('\0'); if (!SetEnvironmentVariable(param, *p ? p : NULL)) { - nErrorLevel = 1; - return 1; + retval = 1; + goto Quit; } } else @@ -220,12 +228,23 @@ INT cmd_set(LPTSTR param) if (!bFound) { ConErrResPrintf(STRING_SET_ENV_ERROR, param); - nErrorLevel = 1; - return 1; + retval = 1; + goto Quit; } } - return 0; +Quit: + if (BatType != CMD_TYPE) + { + if (retval != 0) + nErrorLevel = retval; + } + else + { + nErrorLevel = retval; + } + + return retval; } static INT

3 years, 12 months

[reactos] 02/07: [CMD_ROSTEST] Add tests for particular ERRORLEVEL behaviour in some commands.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b400bbb98313197147eb… commit 0b400bbb98313197147ebc4718b0618986816641 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jul 27 16:42:42 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 23 00:22:45 2020 +0200 [CMD_ROSTEST] Add tests for particular ERRORLEVEL behaviour in some commands. --- modules/rostests/win32/cmd/test_builtins.cmd | 102 +++++++++++++++++++++++ modules/rostests/win32/cmd/test_builtins.cmd.exp | 29 +++++++ 2 files changed, 131 insertions(+) diff --git a/modules/rostests/win32/cmd/test_builtins.cmd b/modules/rostests/win32/cmd/test_builtins.cmd index 7e232ca7ca6..4cec71c48aa 100644 --- a/modules/rostests/win32/cmd/test_builtins.cmd +++ b/modules/rostests/win32/cmd/test_builtins.cmd @@ -396,6 +396,108 @@ del tmp.cmd cd .. & rmdir /s/q foobar +:: +:: ERRORLEVEL tests for special commands. +:: +:: For some commands, the errorlevel is set differently, +:: whether or not they are run within a .BAT, a .CMD, or +:: directly from the command-line. +:: +:: These commands are: +:: APPEND/DPATH, ASSOC, FTYPE, PATH, PROMPT, SET. +:: +:: See https://ss64.com/nt/errorlevel.html for more details. +:: + +echo ---------- Testing ERRORLEVEL in .BAT and .CMD ---------- + +:: Use an auxiliary CMD file +mkdir foobar && cd foobar + +echo --- In .BAT file +call :outputErrLvlTestToBatch tmp.bat +cmd /c tmp.bat +del tmp.bat + +echo --- In .CMD file +call :outputErrLvlTestToBatch tmp.cmd +cmd /c tmp.cmd +del tmp.cmd + +:: Cleanup +cd .. & rmdir /s/q foobar + +:: Go to the next tests below. +goto :continue + +:: ERRORLEVEL test helper function +:outputErrLvlTestToBatch (filename) + +echo @echo off> %1 +echo setlocal enableextensions>> %1 + +:: Reset the errorlevel +echo call :zeroErrLvl>> %1 + +:: dpath +:: echo %errorlevel% +:: dpath xxx +:: echo %errorlevel% +:: dpath +:: echo %errorlevel% + +echo assoc^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo assoc .nonexisting^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo assoc .nonexisting^=^>NUL>> %1 +echo echo %%errorlevel%%>> %1 + +:: ftype +:: echo %errorlevel% +:: ftype xxx +:: echo %errorlevel% +:: ftype +:: echo %errorlevel% + +echo path^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo path^;^>NUL>> %1 +echo echo %%errorlevel%%>> %1 + +echo prompt^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo prompt ^$p^$g^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo prompt foobar^>NUL>> %1 +echo echo %%errorlevel%%>> %1 + +echo set^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo set nonexisting^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo set nonexisting^=^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo set nonexisting^=trololol^>NUL>> %1 +echo echo %%errorlevel%%>> %1 +echo set nonexisting^=^>NUL>> %1 +echo echo %%errorlevel%%>> %1 + +echo goto :eof>> %1 + +:: Zero ERRORLEVEL +echo :zeroErrLvl>> %1 +echo exit /B 0 >> %1 + +goto :eof + + +:: +:: Next suite of tests. +:: +:continue + + :: :: Finished! :: diff --git a/modules/rostests/win32/cmd/test_builtins.cmd.exp b/modules/rostests/win32/cmd/test_builtins.cmd.exp index 98f084e90a4..50cff1eae09 100644 --- a/modules/rostests/win32/cmd/test_builtins.cmd.exp +++ b/modules/rostests/win32/cmd/test_builtins.cmd.exp @@ -101,4 +101,33 @@ OK OK OK OK +---------- Testing ERRORLEVEL in .BAT and .CMD ---------- +--- In .BAT file +0 +1 +2 +2 +2 +2 +2 +2 +2 +1 +1 +1 +1 +--- In .CMD file +0 +1 +2 +0 +0 +0 +0 +0 +0 +1 +0 +0 +0 --------- Finished --------------

3 years, 12 months

← Newer
1
2
3
4
5
6
7
8
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2020