Ros-diffs September 2020

ros-diffs@reactos.org

25 participants
382 discussions

[reactos] 04/05: [CMD] Code formatting in SubstituteVar().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cf0517be1ad609838039… commit 5cf0517be1ad60983803900cd791bccc91bb1482 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 19 18:48:51 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 19 19:44:55 2020 +0200 [CMD] Code formatting in SubstituteVar(). --- base/shell/cmd/cmd.c | 225 +++++++++++++++++++++++++-------------------------- 1 file changed, 111 insertions(+), 114 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 774bc4782bc..ba4e90dd05e 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1363,137 +1363,127 @@ do { \ if (!*Src || *Src == _T('\r') || *Src == _T('\n')) goto bad_subst; + if (bc && Delim == _T('%')) { - if (bc && Delim == _T('%')) + UINT NameLen; + Var = GetBatchVar(Src, &NameLen); + if (!Var && bParseError) { - UINT NameLen; - Var = GetBatchVar(Src, &NameLen); - if (!Var && bParseError) - { - /* Return the partially-parsed command to be - * echoed for error diagnostics purposes. */ - APPEND1(Delim); - APPEND(Src, _tcslen(Src) + 1); - return FALSE; - } - if (Var != NULL) - { - VarLength = _tcslen(Var); - APPEND(Var, VarLength); - Src += NameLen; - goto success; - } + /* Return the partially-parsed command to be + * echoed for error diagnostics purposes. */ + APPEND1(Delim); + APPEND(Src, _tcslen(Src) + 1); + return FALSE; } - - /* Find the end of the variable name. A colon (:) will usually - * end the name and begin the optional modifier, but not if it - * is immediately followed by the delimiter (%VAR:%). */ - SubstStart = Src; - while (*Src && *Src != Delim && !(*Src == _T(':') && Src[1] != Delim)) + if (Var != NULL) { - ++Src; + VarLength = _tcslen(Var); + APPEND(Var, VarLength); + Src += NameLen; + goto success; } - /* If we are either at the end of the string, or the delimiter - * has been repeated more than once, fail the substitution. */ - if (!*Src || Src == SubstStart) - goto bad_subst; + } - EndChr = *Src; - *(PTSTR)Src = _T('\0'); // FIXME: HACK! - Var = GetEnvVarOrSpecial(SubstStart); - *(PTSTR)Src++ = EndChr; - if (Var == NULL) - { - /* In a batch context, %NONEXISTENT% "expands" to an - * empty string, otherwise fail the substitution. */ - if (bc) - goto success; - goto bad_subst; - } - VarLength = _tcslen(Var); + /* Find the end of the variable name. A colon (:) will usually + * end the name and begin the optional modifier, but not if it + * is immediately followed by the delimiter (%VAR:%). */ + SubstStart = Src; + while (*Src && *Src != Delim && !(*Src == _T(':') && Src[1] != Delim)) + { + ++Src; + } + /* If we are either at the end of the string, or the delimiter + * has been repeated more than once, fail the substitution. */ + if (!*Src || Src == SubstStart) + goto bad_subst; + + EndChr = *Src; + *(PTSTR)Src = _T('\0'); // FIXME: HACK! + Var = GetEnvVarOrSpecial(SubstStart); + *(PTSTR)Src++ = EndChr; + if (Var == NULL) + { + /* In a batch context, %NONEXISTENT% "expands" to an + * empty string, otherwise fail the substitution. */ + if (bc) + goto success; + goto bad_subst; + } + VarLength = _tcslen(Var); - if (EndChr == Delim) + if (EndChr == Delim) + { + /* %VAR% - use as-is */ + APPEND(Var, VarLength); + } + else if (*Src == _T('~')) + { + /* %VAR:~[start][,length]% - substring + * Negative values are offsets from the end. + */ + size_t Start = _tcstol(Src + 1, (PTSTR*)&Src, 0); + size_t End = VarLength; + if (Start < 0) + Start += VarLength; + Start = max(Start, 0); + Start = min(Start, VarLength); + if (*Src == _T(',')) { - /* %VAR% - use as-is */ - APPEND(Var, VarLength); + End = _tcstol(Src + 1, (PTSTR*)&Src, 0); + End += (End < 0) ? VarLength : Start; + End = max(End, Start); + End = min(End, VarLength); } - else if (*Src == _T('~')) + if (*Src++ != Delim) + goto bad_subst; + APPEND(&Var[Start], End - Start); + } + else + { + /* %VAR:old=new% - Replace all occurrences of old with new. + * %VAR:*old=new% - Replace first occurrence only, + * and remove everything before it. + */ + PCTSTR Old, New; + size_t OldLength, NewLength; + BOOL Star = FALSE; + size_t LastMatch = 0, i = 0; + + if (*Src == _T('*')) { - /* %VAR:~[start][,length]% - substring - * Negative values are offsets from the end. - */ - size_t Start = _tcstol(Src + 1, (PTSTR*)&Src, 0); - size_t End = VarLength; - if (Start < 0) - Start += VarLength; - Start = max(Start, 0); - Start = min(Start, VarLength); - if (*Src == _T(',')) - { - End = _tcstol(Src + 1, (PTSTR*)&Src, 0); - End += (End < 0) ? VarLength : Start; - End = max(End, Start); - End = min(End, VarLength); - } - if (*Src++ != Delim) - goto bad_subst; - APPEND(&Var[Start], End - Start); + Star = TRUE; + Src++; } - else - { - /* %VAR:old=new% - Replace all occurrences of old with new. - * %VAR:*old=new% - Replace first occurrence only, - * and remove everything before it. - */ - PCTSTR Old, New; - size_t OldLength, NewLength; - BOOL Star = FALSE; - size_t LastMatch = 0, i = 0; - - if (*Src == _T('*')) - { - Star = TRUE; - Src++; - } - /* The string to replace may contain the delimiter */ - Src = _tcschr(Old = Src, _T('=')); - if (Src == NULL) - goto bad_subst; - OldLength = Src++ - Old; - if (OldLength == 0) - goto bad_subst; + /* The string to replace may contain the delimiter */ + Src = _tcschr(Old = Src, _T('=')); + if (Src == NULL) + goto bad_subst; + OldLength = Src++ - Old; + if (OldLength == 0) + goto bad_subst; - Src = _tcschr(New = Src, Delim); - if (Src == NULL) - goto bad_subst; - NewLength = Src++ - New; + Src = _tcschr(New = Src, Delim); + if (Src == NULL) + goto bad_subst; + NewLength = Src++ - New; - while (i < VarLength) + while (i < VarLength) + { + if (_tcsnicmp(&Var[i], Old, OldLength) == 0) { - if (_tcsnicmp(&Var[i], Old, OldLength) == 0) - { - if (!Star) - APPEND(&Var[LastMatch], i - LastMatch); - APPEND(New, NewLength); - i += OldLength; - LastMatch = i; - if (Star) - break; - continue; - } - i++; + if (!Star) + APPEND(&Var[LastMatch], i - LastMatch); + APPEND(New, NewLength); + i += OldLength; + LastMatch = i; + if (Star) + break; + continue; } - APPEND(&Var[LastMatch], VarLength - LastMatch); + i++; } - - goto success; - - bad_subst: - Src = SubstStart; - /* Only if no batch context active do we echo the delimiter */ - if (!bc) - APPEND1(Delim); + APPEND(&Var[LastMatch], VarLength - LastMatch); } success: @@ -1501,6 +1491,13 @@ success: *DestIncLen = (Dest - End); return TRUE; +bad_subst: + Src = SubstStart; + /* Only if no batch context active do we echo the delimiter */ + if (!bc) + APPEND1(Delim); + goto success; + too_long: ConOutResPrintf(STRING_ALIAS_ERROR); nErrorLevel = 9023;

4 years, 3 months

[reactos] 03/05: [CMD] Fix delayed expansion of variables. CORE-13682

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdc8e45b4828b53039646… commit cdc8e45b4828b53039646d4c9f50241cfb5d46ee Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 4 02:56:18 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 19 19:44:55 2020 +0200 [CMD] Fix delayed expansion of variables. CORE-13682 - Split SubstituteVars() into its main loop and a helper SubstituteVar() that just substitutes only one variable. - Use this new helper as the basis of the proper implementation of the delayed expansion of variables. - Fix a bug introduced in commit 495c82cc, when GetBatchVar() fails. --- base/shell/cmd/cmd.c | 255 ++++++++++++++++++++++++++++++++++++++++----------- base/shell/cmd/cmd.h | 21 ++++- 2 files changed, 220 insertions(+), 56 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index c4d41d0f247..774bc4782bc 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1318,32 +1318,52 @@ GetBatchVar( } BOOL -SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) +SubstituteVar( + IN PCTSTR Src, + OUT size_t* SrcIncLen, // VarNameLen + OUT PTCHAR Dest, + IN PTCHAR DestEnd, + OUT size_t* DestIncLen, + IN TCHAR Delim) { -#define APPEND(From, Length) { \ +#define APPEND(From, Length) \ +do { \ if (Dest + (Length) > DestEnd) \ goto too_long; \ - memcpy(Dest, From, (Length) * sizeof(TCHAR)); \ - Dest += Length; } -#define APPEND1(Char) { \ + memcpy(Dest, (From), (Length) * sizeof(TCHAR)); \ + Dest += (Length); \ +} while (0) + +#define APPEND1(Char) \ +do { \ if (Dest >= DestEnd) \ goto too_long; \ - *Dest++ = Char; } + *Dest++ = (Char); \ +} while (0) - TCHAR *DestEnd = Dest + CMDLINE_LENGTH - 1; - const TCHAR *Var; - int VarLength; - TCHAR *SubstStart; + PCTSTR Var; + PCTSTR Start, End, SubstStart; TCHAR EndChr; - while (*Src) - { - if (*Src != Delim) - { - APPEND1(*Src++) - continue; - } + size_t VarLength; + + Start = Src; + End = Dest; + *SrcIncLen = 0; + *DestIncLen = 0; + + if (!Delim) + return FALSE; + if (*Src != Delim) + return FALSE; - Src++; + ++Src; + + /* If we are already at the end of the string, fail the substitution */ + SubstStart = Src; + if (!*Src || *Src == _T('\r') || *Src == _T('\n')) + goto bad_subst; + + { if (bc && Delim == _T('%')) { UINT NameLen; @@ -1353,15 +1373,15 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) /* Return the partially-parsed command to be * echoed for error diagnostics purposes. */ APPEND1(Delim); - APPEND(Src, DestEnd-Dest); + APPEND(Src, _tcslen(Src) + 1); return FALSE; } if (Var != NULL) { VarLength = _tcslen(Var); - APPEND(Var, VarLength) + APPEND(Var, VarLength); Src += NameLen; - continue; + goto success; } } @@ -1369,22 +1389,25 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) * end the name and begin the optional modifier, but not if it * is immediately followed by the delimiter (%VAR:%). */ SubstStart = Src; - while (*Src != Delim && !(*Src == _T(':') && Src[1] != Delim)) + while (*Src && *Src != Delim && !(*Src == _T(':') && Src[1] != Delim)) { - if (!*Src) - goto bad_subst; - Src++; + ++Src; } + /* If we are either at the end of the string, or the delimiter + * has been repeated more than once, fail the substitution. */ + if (!*Src || Src == SubstStart) + goto bad_subst; EndChr = *Src; - *Src = _T('\0'); + *(PTSTR)Src = _T('\0'); // FIXME: HACK! Var = GetEnvVarOrSpecial(SubstStart); - *Src++ = EndChr; + *(PTSTR)Src++ = EndChr; if (Var == NULL) { - /* In a batch file, %NONEXISTENT% "expands" to an empty string */ + /* In a batch context, %NONEXISTENT% "expands" to an + * empty string, otherwise fail the substitution. */ if (bc) - continue; + goto success; goto bad_subst; } VarLength = _tcslen(Var); @@ -1392,21 +1415,22 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) if (EndChr == Delim) { /* %VAR% - use as-is */ - APPEND(Var, VarLength) + APPEND(Var, VarLength); } else if (*Src == _T('~')) { /* %VAR:~[start][,length]% - substring - * Negative values are offsets from the end */ - int Start = _tcstol(Src + 1, &Src, 0); - int End = VarLength; + * Negative values are offsets from the end. + */ + size_t Start = _tcstol(Src + 1, (PTSTR*)&Src, 0); + size_t End = VarLength; if (Start < 0) Start += VarLength; Start = max(Start, 0); Start = min(Start, VarLength); if (*Src == _T(',')) { - End = _tcstol(Src + 1, &Src, 0); + End = _tcstol(Src + 1, (PTSTR*)&Src, 0); End += (End < 0) ? VarLength : Start; End = max(End, Start); End = min(End, VarLength); @@ -1417,13 +1441,14 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) } else { - /* %VAR:old=new% - replace all occurrences of old with new - * %VAR:*old=new% - replace first occurrence only, - * and remove everything before it */ - TCHAR *Old, *New; - DWORD OldLength, NewLength; + /* %VAR:old=new% - Replace all occurrences of old with new. + * %VAR:*old=new% - Replace first occurrence only, + * and remove everything before it. + */ + PCTSTR Old, New; + size_t OldLength, NewLength; BOOL Star = FALSE; - int LastMatch = 0, i = 0; + size_t LastMatch = 0, i = 0; if (*Src == _T('*')) { @@ -1431,7 +1456,7 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) Src++; } - /* the string to replace may contain the delimiter */ + /* The string to replace may contain the delimiter */ Src = _tcschr(Old = Src, _T('=')); if (Src == NULL) goto bad_subst; @@ -1449,8 +1474,8 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) if (_tcsnicmp(&Var[i], Old, OldLength) == 0) { if (!Star) - APPEND(&Var[LastMatch], i - LastMatch) - APPEND(New, NewLength) + APPEND(&Var[LastMatch], i - LastMatch); + APPEND(New, NewLength); i += OldLength; LastMatch = i; if (Star) @@ -1459,21 +1484,87 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) } i++; } - APPEND(&Var[LastMatch], VarLength - LastMatch) + APPEND(&Var[LastMatch], VarLength - LastMatch); } - continue; + + goto success; bad_subst: Src = SubstStart; + /* Only if no batch context active do we echo the delimiter */ if (!bc) - APPEND1(Delim) + APPEND1(Delim); } - *Dest = _T('\0'); + +success: + *SrcIncLen = (Src - Start); + *DestIncLen = (Dest - End); return TRUE; + too_long: ConOutResPrintf(STRING_ALIAS_ERROR); nErrorLevel = 9023; return FALSE; + +#undef APPEND +#undef APPEND1 +} + +BOOL +SubstituteVars( + IN PCTSTR Src, + OUT PTSTR Dest, + IN TCHAR Delim) +{ +#define APPEND(From, Length) \ +do { \ + if (Dest + (Length) > DestEnd) \ + goto too_long; \ + memcpy(Dest, (From), (Length) * sizeof(TCHAR)); \ + Dest += (Length); \ +} while (0) + +#define APPEND1(Char) \ +do { \ + if (Dest >= DestEnd) \ + goto too_long; \ + *Dest++ = (Char); \ +} while (0) + + PTCHAR DestEnd = Dest + CMDLINE_LENGTH - 1; + PCTSTR End; + size_t SrcIncLen, DestIncLen; + + while (*Src /* && (Dest < DestEnd) */) + { + if (*Src != Delim) + { + End = _tcschr(Src, Delim); + if (End == NULL) + End = Src + _tcslen(Src); + APPEND(Src, End - Src); + Src = End; + continue; + } + + if (!SubstituteVar(Src, &SrcIncLen, Dest, DestEnd, &DestIncLen, Delim)) + { + return FALSE; + } + else + { + Src += SrcIncLen; + Dest += DestIncLen; + } + } + APPEND1(_T('\0')); + return TRUE; + +too_long: + ConOutResPrintf(STRING_ALIAS_ERROR); + nErrorLevel = 9023; + return FALSE; + #undef APPEND #undef APPEND1 } @@ -1545,11 +1636,15 @@ SubstituteForVars( return TRUE; } -LPTSTR -DoDelayedExpansion(LPTSTR Line) +PTSTR +DoDelayedExpansion( + IN PCTSTR Line) { TCHAR Buf1[CMDLINE_LENGTH]; TCHAR Buf2[CMDLINE_LENGTH]; + PTCHAR Src, Dst; + PTCHAR DestEnd = Buf2 + CMDLINE_LENGTH - 1; + size_t SrcIncLen, DestIncLen; /* First, substitute FOR variables */ if (!SubstituteForVars(Line, Buf1)) @@ -1558,12 +1653,64 @@ DoDelayedExpansion(LPTSTR Line) if (!bDelayedExpansion || !_tcschr(Buf1, _T('!'))) return cmd_dup(Buf1); - /* FIXME: Delayed substitutions actually aren't quite the same as - * immediate substitutions. In particular, it's possible to escape - * the exclamation point using ^. */ - if (!SubstituteVars(Buf1, Buf2, _T('!'))) - return NULL; + /* + * Delayed substitutions are not actually completely the same as + * immediate substitutions. In particular, it is possible to escape + * the exclamation point using the escape caret. + */ + + /* + * Perform delayed expansion: expand variables around '!', + * and reparse escape carets. + */ + +#define APPEND1(Char) \ +do { \ + if (Dst >= DestEnd) \ + goto too_long; \ + *Dst++ = (Char); \ +} while (0) + + Src = Buf1; + Dst = Buf2; + while (*Src && (Src < &Buf1[CMDLINE_LENGTH])) + { + if (*Src == _T('^')) + { + ++Src; + if (!*Src || !(Src < &Buf1[CMDLINE_LENGTH])) + break; + + APPEND1(*Src++); + } + else if (*Src == _T('!')) + { + if (!SubstituteVar(Src, &SrcIncLen, Dst, DestEnd, &DestIncLen, _T('!'))) + { + return NULL; // Got an error during parsing. + } + else + { + Src += SrcIncLen; + Dst += DestIncLen; + } + } + else + { + APPEND1(*Src++); + } + continue; + } + APPEND1(_T('\0')); + return cmd_dup(Buf2); + +too_long: + ConOutResPrintf(STRING_ALIAS_ERROR); + nErrorLevel = 9023; + return NULL; + +#undef APPEND1 } diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index ac2d7fddd8c..93fefe4f4c6 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -95,14 +95,31 @@ ExecuteCommandWithEcho( LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); -BOOL SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim); + +BOOL +SubstituteVar( + IN PCTSTR Src, + OUT size_t* SrcIncLen, // VarNameLen + OUT PTCHAR Dest, + IN PTCHAR DestEnd, + OUT size_t* DestIncLen, + IN TCHAR Delim); + +BOOL +SubstituteVars( + IN PCTSTR Src, + OUT PTSTR Dest, + IN TCHAR Delim); BOOL SubstituteForVars( IN PCTSTR Src, OUT PTSTR Dest); -LPTSTR DoDelayedExpansion(LPTSTR Line); +PTSTR +DoDelayedExpansion( + IN PCTSTR Line); + INT DoCommand(LPTSTR first, LPTSTR rest, struct _PARSED_COMMAND *Cmd); BOOL ReadLine(TCHAR *commandline, BOOL bMore);

4 years, 3 months

[reactos] 02/05: [CMD] Some fixes for getting the enhanced '%~XXX' batch/FOR variables. CORE-11857 CORE-13736

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb2a9c31a6c8c207f2285… commit cb2a9c31a6c8c207f22852c68fc1464dd3b52080 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 4 17:40:58 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 19 19:44:54 2020 +0200 [CMD] Some fixes for getting the enhanced '%~XXX' batch/FOR variables. CORE-11857 CORE-13736 It will be followed with a separate fix for the FOR-loop code. Fixes some cmd_winetests. A NULL pointer can be returned for a valid existing batch/FOR variable, in which case the enhanced-variable getter should return an empty string. This situation can happen e.g. when forcing a FOR-loop to tokenize a text line with not enough tokens in it. --- base/shell/cmd/batch.c | 26 +++++--- base/shell/cmd/batch.h | 7 ++- base/shell/cmd/cmd.c | 164 +++++++++++++++++++++++++++++++++++-------------- base/shell/cmd/cmd.h | 7 ++- 4 files changed, 146 insertions(+), 58 deletions(-) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index a7dfa2fd11a..e9a1e5aa76e 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -74,29 +74,35 @@ TCHAR textline[BATCH_BUFFSIZE]; /* * Returns a pointer to the n'th parameter of the current batch file. * If no such parameter exists returns pointer to empty string. - * If no batch file is current, returns NULL - * + * If no batch file is current, returns NULL. */ -LPTSTR FindArg(TCHAR Char, BOOL *IsParam0) +BOOL +FindArg( + IN TCHAR Char, + OUT PCTSTR* ArgPtr, + OUT BOOL* IsParam0) { - LPTSTR pp; + PCTSTR pp; INT n = Char - _T('0'); - TRACE ("FindArg: (%d)\n", n); + TRACE("FindArg: (%d)\n", n); + + *ArgPtr = NULL; if (n < 0 || n > 9) - return NULL; + return FALSE; n = bc->shiftlevel[n]; *IsParam0 = (n == 0); pp = bc->params; - /* Step up the strings till we reach the end */ - /* or the one we want */ + /* Step up the strings till we reach + * the end or the one we want. */ while (*pp && n--) - pp += _tcslen (pp) + 1; + pp += _tcslen(pp) + 1; - return pp; + *ArgPtr = pp; + return TRUE; } diff --git a/base/shell/cmd/batch.h b/base/shell/cmd/batch.h index de425ee2f11..d40b640e421 100644 --- a/base/shell/cmd/batch.h +++ b/base/shell/cmd/batch.h @@ -44,7 +44,12 @@ extern BOOL bEcho; /* The echo flag */ extern TCHAR textline[BATCH_BUFFSIZE]; /* Buffer for reading Batch file lines */ -LPTSTR FindArg(TCHAR, BOOL *); +BOOL +FindArg( + IN TCHAR Char, + OUT PCTSTR* ArgPtr, + OUT BOOL* IsParam0); + VOID ExitBatch(VOID); VOID ExitAllBatches(VOID); INT Batch(LPTSTR, LPTSTR, LPTSTR, PARSED_COMMAND *); diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index caa60a466fe..c4d41d0f247 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -964,8 +964,10 @@ GetEnvVarOrSpecial(LPCTSTR varName) } /* Handle the %~var syntax */ -static LPTSTR -GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) +static PCTSTR +GetEnhancedVar( + IN OUT PCTSTR* pFormat, + IN BOOL (*GetVar)(TCHAR, PCTSTR*, BOOL*)) { static const TCHAR ModifierTable[] = _T("dpnxfsatz"); enum { @@ -980,28 +982,68 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) M_SIZE = 256, /* Z: file size */ } Modifiers = 0; - TCHAR *Format, *FormatEnd; - TCHAR *PathVarName = NULL; - LPTSTR Variable; - TCHAR *VarEnd; + PCTSTR Format, FormatEnd; + PCTSTR PathVarName = NULL; + PCTSTR Variable; + PCTSTR VarEnd; BOOL VariableIsParam0; TCHAR FullPath[MAX_PATH]; - TCHAR FixedPath[MAX_PATH], *Filename, *Extension; + TCHAR FixedPath[MAX_PATH]; + PTCHAR Filename, Extension; HANDLE hFind; WIN32_FIND_DATA w32fd; - TCHAR *In, *Out; + PTCHAR In, Out; static TCHAR Result[CMDLINE_LENGTH]; - /* There is ambiguity between modifier characters and FOR variables; - * the rule that cmd uses is to pick the longest possible match. - * For example, if there is a %n variable, then out of %~anxnd, - * %~anxn will be substituted rather than just %~an. */ + /* Check whether the current character is a recognized variable. + * If it is not, then restore the previous one: there is indeed + * ambiguity between modifier characters and FOR variables; + * the rule that CMD uses is to pick the longest possible match. + * This case can happen if we have a FOR-variable specification + * of the following form: + * + * %~<modifiers><actual FOR variable character><other characters> + * + * where the FOR variable character is also a similar to a modifier, + * but should not be interpreted as is, and the following other + * characters are not part of the possible modifier characters, and + * are unrelated to the FOR variable (they can be part of a command). + * For example, if there is a %n variable, then out of %~anxnd, + * %~anxn will be substituted rather than just %~an. + * + * In the following examples, all characters 'd','p','n','x' are valid modifiers. + * + * 1. In this example, the FOR variable character is 'x' and the actual + * modifiers are 'dpn'. Parsing will first determine that 'dpnx' + * are modifiers, with the possible (last) valid variable being 'x', + * and will stop at the letter 'g'. Since 'g' is not a valid + * variable, then the actual variable is the lattest one 'x', + * and the modifiers are then actually 'dpn'. + * The FOR-loop will then display the %x variable formatted with 'dpn' + * and will append any other characters following, 'g'. + * + * C:\Temp>for %x in (foo.exe bar.txt) do @echo %~dpnxg + * C:\Temp\foog + * C:\Temp\barg + * + * + * 2. In this second example, the FOR variable character is 'g' and + * the actual modifiers are 'dpnx'. Parsing will determine also that + * the possible (last) valid variable could be 'x', but since it's + * not present in the FOR-variables list, it won't be the case. + * This means that the actual FOR variable character must follow, + * in this case, 'g'. + * + * C:\Temp>for %g in (foo.exe bar.txt) do @echo %~dpnxg + * C:\Temp\foo.exe + * C:\Temp\bar.txt + */ /* First, go through as many modifier characters as possible */ FormatEnd = Format = *pFormat; while (*FormatEnd && _tcschr(ModifierTable, _totlower(*FormatEnd))) - FormatEnd++; + ++FormatEnd; if (*FormatEnd == _T('$')) { @@ -1012,48 +1054,52 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) return NULL; /* Must be immediately followed by the variable */ - Variable = GetVar(*++FormatEnd, &VariableIsParam0); - if (!Variable) + if (!GetVar(*++FormatEnd, &Variable, &VariableIsParam0)) return NULL; } else { /* Backtrack if necessary to get a variable name match */ - while (!(Variable = GetVar(*FormatEnd, &VariableIsParam0))) + while (!GetVar(*FormatEnd, &Variable, &VariableIsParam0)) { if (FormatEnd == Format) return NULL; - FormatEnd--; + --FormatEnd; } } - for (; Format < FormatEnd && *Format != _T('$'); Format++) - Modifiers |= 1 << (_tcschr(ModifierTable, _totlower(*Format)) - ModifierTable); - *pFormat = FormatEnd + 1; + /* If the variable is empty, return an empty string */ + if (!Variable || !*Variable) + return _T(""); + /* Exclude the leading and trailing quotes */ VarEnd = &Variable[_tcslen(Variable)]; if (*Variable == _T('"')) { - Variable++; + ++Variable; if (VarEnd > Variable && VarEnd[-1] == _T('"')) - VarEnd--; + --VarEnd; } - if ((char *)VarEnd - (char *)Variable >= sizeof Result) + if ((ULONG_PTR)VarEnd - (ULONG_PTR)Variable >= sizeof(Result)) return _T(""); - memcpy(Result, Variable, (char *)VarEnd - (char *)Variable); + memcpy(Result, Variable, (ULONG_PTR)VarEnd - (ULONG_PTR)Variable); Result[VarEnd - Variable] = _T('\0'); + /* Now determine the actual modifiers */ + for (; Format < FormatEnd && *Format != _T('$'); ++Format) + Modifiers |= 1 << (_tcschr(ModifierTable, _totlower(*Format)) - ModifierTable); + if (PathVarName) { /* $PATH: syntax - search the directories listed in the * specified environment variable for the file */ - LPTSTR PathVar; - FormatEnd[-1] = _T('\0'); + PTSTR PathVar; + ((PTSTR)FormatEnd)[-1] = _T('\0'); // FIXME: HACK! PathVar = GetEnvVar(PathVarName); - FormatEnd[-1] = _T(':'); + ((PTSTR)FormatEnd)[-1] = _T(':'); if (!PathVar || !SearchPath(PathVar, Result, NULL, ARRAYSIZE(FullPath), FullPath, NULL)) { @@ -1070,6 +1116,7 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) /* Special case: If the variable is %0 and modifier characters are present, * use the batch file's path (which includes the .bat/.cmd extension) * rather than the actual %0 variable (which might not). */ + ASSERT(bc); _tcscpy(FullPath, bc->BatchFilePath); } else @@ -1103,7 +1150,7 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) /* If it doesn't exist, just leave the name as it was given */ if (hFind != INVALID_HANDLE_VALUE) { - LPTSTR FixedComponent = w32fd.cFileName; + PTSTR FixedComponent = w32fd.cFileName; if (*w32fd.cAlternateFileName && ((Modifiers & M_SHORT) || !_tcsicmp(In, w32fd.cAlternateFileName))) { @@ -1194,7 +1241,7 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) } if (Modifiers & (M_PATH | M_FULL)) { - memcpy(Out, &FixedPath[2], (char *)Filename - (char *)&FixedPath[2]); + memcpy(Out, &FixedPath[2], (ULONG_PTR)Filename - (ULONG_PTR)&FixedPath[2]); Out += Filename - &FixedPath[2]; } if (Modifiers & (M_NAME | M_FULL)) @@ -1217,18 +1264,20 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) return Result; } -static LPCTSTR -GetBatchVar(TCHAR *varName, UINT *varNameLen) +static PCTSTR +GetBatchVar( + IN PCTSTR varName, + OUT PUINT varNameLen) { - LPCTSTR ret; - TCHAR *varNameEnd; - BOOL dummy; + PCTSTR ret; + PCTSTR varNameEnd; *varNameLen = 1; - switch ( *varName ) + switch (*varName) { case _T('~'): + { varNameEnd = varName + 1; ret = GetEnhancedVar(&varNameEnd, FindArg); if (!ret) @@ -1238,6 +1287,7 @@ GetBatchVar(TCHAR *varName, UINT *varNameLen) } *varNameLen = varNameEnd - varName; return ret; + } case _T('0'): case _T('1'): @@ -1249,7 +1299,13 @@ GetBatchVar(TCHAR *varName, UINT *varNameLen) case _T('7'): case _T('8'): case _T('9'): - return FindArg(*varName, &dummy); + { + BOOL dummy; + if (!FindArg(*varName, &ret, &dummy)) + return NULL; + else + return ret; + } case _T('*'): /* Copy over the raw params (not including the batch file name) */ @@ -1423,37 +1479,53 @@ too_long: } /* Search the list of FOR contexts for a variable */ -static LPTSTR -FindForVar(TCHAR Var, BOOL *IsParam0) +static BOOL +FindForVar( + IN TCHAR Var, + OUT PCTSTR* VarPtr, + OUT BOOL* IsParam0) { PFOR_CONTEXT Ctx; + *VarPtr = NULL; *IsParam0 = FALSE; + for (Ctx = fc; Ctx != NULL; Ctx = Ctx->prev) { if ((UINT)(Var - Ctx->firstvar) < Ctx->varcount) - return Ctx->values[Var - Ctx->firstvar]; + { + *VarPtr = Ctx->values[Var - Ctx->firstvar]; + return TRUE; + } } - return NULL; + return FALSE; } BOOL -SubstituteForVars(TCHAR *Src, TCHAR *Dest) +SubstituteForVars( + IN PCTSTR Src, + OUT PTSTR Dest) { - TCHAR *DestEnd = &Dest[CMDLINE_LENGTH - 1]; + PTCHAR DestEnd = &Dest[CMDLINE_LENGTH - 1]; while (*Src) { if (Src[0] == _T('%')) { BOOL Dummy; - LPTSTR End = &Src[2]; - LPTSTR Value = NULL; + PCTSTR End = &Src[2]; + PCTSTR Value = NULL; if (Src[1] == _T('~')) Value = GetEnhancedVar(&End, FindForVar); - if (!Value) - Value = FindForVar(Src[1], &Dummy); + if (!Value && Src[1]) + { + if (FindForVar(Src[1], &Value, &Dummy) && !Value) + { + /* The variable is empty, return an empty string */ + Value = _T(""); + } + } if (Value) { diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index b3c1c0f1d9d..ac2d7fddd8c 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -96,7 +96,12 @@ LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); BOOL SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim); -BOOL SubstituteForVars(TCHAR *Src, TCHAR *Dest); + +BOOL +SubstituteForVars( + IN PCTSTR Src, + OUT PTSTR Dest); + LPTSTR DoDelayedExpansion(LPTSTR Line); INT DoCommand(LPTSTR first, LPTSTR rest, struct _PARSED_COMMAND *Cmd); BOOL ReadLine(TCHAR *commandline, BOOL bMore);

4 years, 3 months

[reactos] 01/05: [CMD_ROSTEST] Add tests for delayed expansion.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=014efdf7e85205fa2f899… commit 014efdf7e85205fa2f899675d19a243cf5b96b5a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jun 5 00:41:31 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 19 19:44:53 2020 +0200 [CMD_ROSTEST] Add tests for delayed expansion. --- modules/rostests/win32/cmd/test_echoer_parser.cmd | 159 ++++++++++++++++++ .../rostests/win32/cmd/test_echoer_parser.cmd.exp | 187 +++++++++++++++++++++ 2 files changed, 346 insertions(+) diff --git a/modules/rostests/win32/cmd/test_echoer_parser.cmd b/modules/rostests/win32/cmd/test_echoer_parser.cmd index 85d20ad9508..e94313871f7 100644 --- a/modules/rostests/win32/cmd/test_echoer_parser.cmd +++ b/modules/rostests/win32/cmd/test_echoer_parser.cmd @@ -92,6 +92,165 @@ if 1==0 (@echo lol) else (@echo better2) :: () +:: +:: Tests for delayed expansion. +:: + +@echo off +setlocal enableextensions +setlocal enabledelayedexpansion + +echo --------- Testing Delayed Expansion --------- + +:: Checking exclamation point escaping +set ENDV= ^(an open-source operating system^) +echo This is ReactOS^^!%ENDV% +echo Hello! +echo Hello!! +echo Hello!!! +echo Hello^^^! "^!" + +:: The following tests are adapted from +:: https://ss64.com/nt/delayedexpansion.html + +echo "Hello^World" +echo "Hello^World!" + +:: Checking expansion +set "_var=first" +set "_var=second" & Echo %_var% !_var! + +:: Checking expansion and replacement +set var1=Hello ABC how are you +set var2=ABC +set result=!var1:%var2%=Developer! +echo [!result!] + +:: Test of FOR-loop +set COUNT=0 +for /l %%v in (1,1,4) do ( + set /A COUNT=!COUNT! + 1 + echo [!COUNT!] +) +echo Total = %COUNT% + + +set "com[0]=lol0" +set "com[1]=lol2" +set "com[2]=lol4" +set "com[3]=lol6" +set "com[4]=lol8" +set "com[5]=lol10" + +for /l %%k in (1,1,5) do ( + echo(!com[%%k]! + if /I "%%k" equ "5" echo OHLALA +) + + +:: +:: Re-enable the command echoer +:: +@echo on + +setlocal disabledelayedexpansion + +echo %~DP0 + +set test=abc +set abc=def + +echo % +echo %% +echo %%% +echo %%%% + +echo %test% +echo %test%% +echo %%test% +echo %%test%% +echo %%%test%%% + +echo !test! +echo !!test!! + +endlocal +setlocal enabledelayedexpansion + +:: +:: Regular and Delayed variables +:: + +echo ! +echo !! +echo !!! +echo !!!! +echo !a! +echo !!a!! + +set a=b +:: Will display b +echo !!a!! +set b=c +:: Will still display b +echo !!a!! + +echo %test% +echo %test%% +echo %%test% +echo %%test%% +echo %%%test%%% + +echo %!test!% +echo !%test%! +echo !!test!! +:: That other one is the same as the previous one. +echo !^!test^!! +echo !^^!test^^!! +echo !test! +echo !test!! +echo !!test! +echo !!test!! +echo !!!test!!! + + +set proj=XYZ +echo !%proj%_folder! +echo !!proj!_folder! + +set %proj%_folder=\\server\folder\ +echo !%proj%_folder! +echo !!proj!_folder! + + +:: +:: Delayed variables in blocks +:: + +if 1==1 ( + set "pc=T" + echo pc == !pc! + + set i=3 + set "!pc!!i!=5" + + echo other pc == !pc! and !pc!!i! == !!pc!!i!! + echo other pc == !pc! and !pc!!i! == !^!pc^!^!i^!! + echo other pc == !pc! and !pc!!i! == ^!!pc!!i!^! + echo other pc == !pc! and !pc!!i! == ^!^!pc^!^!i^!^! + set "trol=!pc!!i!" + echo the var was !trol! + + set "!pc!N=!i!" + echo updated !pc!N == !!pc!N! + echo updated !pc!N == !^!pc^!N! + echo updated !pc!N == ^!!pc!N^! + echo updated !pc!N == ^!^!pc^!N^! + set "trol=!pc!N" + echo updated !pc!N == !trol! +) + + @echo off :: diff --git a/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp b/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp index b582b62722f..796b31eef76 100644 --- a/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp +++ b/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp @@ -135,4 +135,191 @@ better2 @pwd@>(a)@space@ @pwd@>(a b )@space@ +--------- Testing Delayed Expansion --------- +This is ReactOS! (an open-source operating system) +Hello +Hello +Hello +Hello! "!" +"Hello^World" +"HelloWorld" +first second +[Hello Developer how are you] +[1] +[2] +[3] +[4] +Total = 4 +lol2 +lol4 +lol6 +lol8 +lol10 +OHLALA + +@pwd@>setlocal disabledelayedexpansion@space@ + +@pwd@>echo @pwd@\@space@ +@pwd@\ + +@pwd@>set test=abc@space@ + +@pwd@>set abc=def@space@ + +@pwd@>echo@space@@space@ +ECHO is on. + +@pwd@>echo %@space@ +% + +@pwd@>echo %@space@ +% + +@pwd@>echo %%@space@ +%% + +@pwd@>echo abc@space@ +abc + +@pwd@>echo abc@space@ +abc + +@pwd@>echo %test@space@ +%test + +@pwd@>echo %test%@space@ +%test% + +@pwd@>echo %abc%@space@ +%abc% + +@pwd@>echo !test!@space@ +!test! + +@pwd@>echo !!test!!@space@ +!!test!! + +@pwd@>endlocal + +@pwd@>setlocal enabledelayedexpansion@space@ + +@pwd@>echo !@space@ +ECHO is on. + +@pwd@>echo !!@space@ +ECHO is on. + +@pwd@>echo !!!@space@ +ECHO is on. + +@pwd@>echo !!!!@space@ +ECHO is on. + +@pwd@>echo !a!@space@ +ECHO is on. + +@pwd@>echo !!a!!@space@ +ECHO is on. + +@pwd@>set a=b@space@ + +@pwd@>echo !!a!!@space@ +b + +@pwd@>set b=c@space@ + +@pwd@>echo !!a!!@space@ +b + +@pwd@>echo@space@@space@ +ECHO is on. + +@pwd@>echo@space@@space@ +ECHO is on. + +@pwd@>echo %test@space@ +%test + +@pwd@>echo %test%@space@ +%test% + +@pwd@>echo %%@space@ +%% + +@pwd@>echo@space@@space@ +ECHO is on. + +@pwd@>echo !!@space@ +ECHO is on. + +@pwd@>echo !!test!!@space@ +ECHO is on. + +@pwd@>echo !!test!!@space@ +ECHO is on. + +@pwd@>echo !^!test^!!@space@ +test! + +@pwd@>echo !test!@space@ +ECHO is on. + +@pwd@>echo !test!!@space@ +ECHO is on. + +@pwd@>echo !!test!@space@ +ECHO is on. + +@pwd@>echo !!test!!@space@ +ECHO is on. + +@pwd@>echo !!!test!!!@space@ +ECHO is on. + +@pwd@>set proj=XYZ@space@ + +@pwd@>echo !XYZ_folder!@space@ +ECHO is on. + +@pwd@>echo !!proj!_folder!@space@ +XYZ_folder + +@pwd@>set XYZ_folder=\\server\folder\@space@ + +@pwd@>echo !XYZ_folder!@space@ +\\server\folder\ + +@pwd@>echo !!proj!_folder!@space@ +XYZ_folder + +@pwd@>if 1 == 1 ( +set "pc=T"@space@@space@ + echo pc == !pc!@space@@space@ + set i=3@space@@space@ + set "!pc!!i!=5"@space@@space@ + echo other pc == !pc! and !pc!!i! == !!pc!!i!!@space@@space@ + echo other pc == !pc! and !pc!!i! == !!pc!!i!!@space@@space@ + echo other pc == !pc! and !pc!!i! == !!pc!!i!!@space@@space@ + echo other pc == !pc! and !pc!!i! == !!pc!!i!!@space@@space@ + set "trol=!pc!!i!"@space@@space@ + echo the var was !trol!@space@@space@ + set "!pc!N=!i!"@space@@space@ + echo updated !pc!N == !!pc!N!@space@@space@ + echo updated !pc!N == !!pc!N!@space@@space@ + echo updated !pc!N == !!pc!N!@space@@space@ + echo updated !pc!N == !!pc!N!@space@@space@ + set "trol=!pc!N"@space@@space@ + echo updated !pc!N == !trol!@space@ +)@space@ +pc == T +other pc == T and T3 == T3 +other pc == T and T3 == T3 +other pc == T and T3 == T3 +other pc == T and T3 == T3 +the var was T3 +updated TN == TN +updated TN == TN +updated TN == TN +updated TN == TN +updated TN == TN --------- Finished --------------

4 years, 3 months

[reactos] 01/01: [SHELL32] Minimal SHRunControlPanel implementation (#3095)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da36f799c728bc5477e85… commit da36f799c728bc5477e85da590c31e6c20d553c4 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sat Sep 19 16:23:44 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 19 16:23:44 2020 +0200 [SHELL32] Minimal SHRunControlPanel implementation (#3095) CORE-9215 Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/win32/shell32/wine/shellord.c | 21 ++++++++++++++++++++- sdk/include/psdk/shlobj.h | 10 ++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c index ab0969a157b..37ff171d4b6 100644 --- a/dll/win32/shell32/wine/shellord.c +++ b/dll/win32/shell32/wine/shellord.c @@ -1472,10 +1472,29 @@ HRESULT WINAPI SHWinHelp(HWND hwnd, LPCWSTR pszHelp, UINT uCommand, ULONG_PTR dw * SHRunControlPanel [SHELL32.161] * */ -BOOL WINAPI SHRunControlPanel (LPCWSTR commandLine, HWND parent) +BOOL WINAPI SHRunControlPanel (_In_ LPCWSTR commandLine, _In_opt_ HWND parent) { +#ifdef __REACTOS__ + /* + * TODO: Run in-process when possible, using + * HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\ControlPanel\InProcCPLs + * and possibly some extra rules. + * See also https://docs.microsoft.com/en-us/windows/win32/api/shlobj/nf-shlobj-shrunco… + * "If the specified Control Panel item is already running, SHRunControlPanel + * attempts to switch to that instance rather than opening a new instance." + * This function is not supported as of Windows Vista, where it always returns FALSE. + * However we need to keep it "alive" even when ReactOS is compliled as NT6+ + * in order to keep control panel elements launch commands. + */ + TRACE("(%s, %p)n", debugstr_w(commandLine), parent); + WCHAR parameters[MAX_PATH] = L"shell32.dll,Control_RunDLL "; + wcscat(parameters, commandLine); + + return ((INT_PTR)ShellExecuteW(parent, L"open", L"rundll32.exe", parameters, NULL, SW_SHOWNORMAL) > 32); +#else FIXME("(%s, %p): stub\n", debugstr_w(commandLine), parent); return FALSE; +#endif } static LPUNKNOWN SHELL32_IExplorerInterface=0; diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index b478ca228f7..422714c7b9d 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -2466,6 +2466,16 @@ HRESULT WINAPI CIDLData_CreateFromIDArray( _In_reads_opt_(cidl) PCUIDLIST_RELATIVE_ARRAY apidl, _Outptr_ IDataObject **ppdtobj); +/**************************************************************************** + * SHRunControlPanel + */ + +BOOL +WINAPI +SHRunControlPanel( + _In_ LPCWSTR commandLine, + _In_opt_ HWND parent); + /**************************************************************************** * SHOpenWithDialog */

4 years, 3 months

[reactos] 01/01: [IMM32][INCLUDE] Add immtable.h and modify imm32.spec (#3207)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab115e30fe282624db703… commit ab115e30fe282624db703ad16111eaf4a59841c0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 19 22:47:40 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 19 22:47:40 2020 +0900 [IMM32][INCLUDE] Add immtable.h and modify imm32.spec (#3207) - Add immtable.h header into win32ss/user/user32/misc/. - Modify imm32.spec file. CORE-11700 --- dll/win32/imm32/imm32.spec | 120 ++++++++++++++++++------------------ win32ss/user/user32/misc/immtable.h | 52 ++++++++++++++++ 2 files changed, 112 insertions(+), 60 deletions(-) diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index ca0ddb36904..b9c0fe55516 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -1,4 +1,4 @@ -@ stub ImmActivateLayout +@ stdcall -stub ImmActivateLayout(long) @ stdcall ImmAssociateContext(ptr ptr) @ stdcall ImmAssociateContextEx(ptr ptr long) @ stdcall ImmConfigureIMEA(ptr ptr long ptr) @@ -16,100 +16,100 @@ @ stdcall ImmEnumInputContext(long ptr long) @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr) @ stdcall ImmEnumRegisterWordW(long ptr wstr long wstr ptr) -@ stdcall ImmEscapeA(long long long ptr) -@ stdcall ImmEscapeW(long long long ptr) -@ stub ImmFreeLayout +@ stdcall ImmEscapeA(long ptr long ptr) +@ stdcall ImmEscapeW(long ptr long ptr) +@ stdcall -stub ImmFreeLayout(long) @ stdcall ImmGenerateMessage(ptr) @ stdcall ImmGetCandidateListA(long long ptr long) @ stdcall ImmGetCandidateListCountA(long ptr) @ stdcall ImmGetCandidateListCountW(long ptr) @ stdcall ImmGetCandidateListW(long long ptr long) @ stdcall ImmGetCandidateWindow(long long ptr) -@ stdcall ImmGetCompositionFontA(long ptr) -@ stdcall ImmGetCompositionFontW(long ptr) -@ stdcall ImmGetCompositionString (long long ptr long) ImmGetCompositionStringA -@ stdcall ImmGetCompositionStringA (long long ptr long) -@ stdcall ImmGetCompositionStringW (long long ptr long) -@ stdcall ImmGetCompositionWindow(long ptr) -@ stdcall ImmGetContext(long) -@ stdcall ImmGetConversionListA(long long str ptr long long) -@ stdcall ImmGetConversionListW(long long wstr ptr long long) -@ stdcall ImmGetConversionStatus(long ptr ptr) -@ stdcall ImmGetDefaultIMEWnd(long) +@ stdcall ImmGetCompositionFontA(ptr ptr) +@ stdcall ImmGetCompositionFontW(ptr ptr) +@ stdcall ImmGetCompositionString(ptr long ptr long) ImmGetCompositionStringA +@ stdcall ImmGetCompositionStringA(ptr long ptr long) +@ stdcall ImmGetCompositionStringW(ptr long ptr long) +@ stdcall ImmGetCompositionWindow(ptr ptr) +@ stdcall ImmGetContext(ptr) +@ stdcall ImmGetConversionListA(long ptr str ptr long long) +@ stdcall ImmGetConversionListW(long ptr wstr ptr long long) +@ stdcall ImmGetConversionStatus(ptr ptr ptr) +@ stdcall ImmGetDefaultIMEWnd(ptr) @ stdcall ImmGetDescriptionA(long ptr long) @ stdcall ImmGetDescriptionW(long ptr long) -@ stdcall ImmGetGuideLineA(long long ptr long) -@ stdcall ImmGetGuideLineW(long long ptr long) +@ stdcall ImmGetGuideLineA(ptr long ptr long) +@ stdcall ImmGetGuideLineW(ptr long ptr long) @ stdcall ImmGetHotKey(long ptr ptr ptr) -@ stdcall ImmGetIMCCLockCount(long) -@ stdcall ImmGetIMCCSize(long) -@ stdcall ImmGetIMCLockCount(long) +@ stdcall ImmGetIMCCLockCount(ptr) +@ stdcall ImmGetIMCCSize(ptr) +@ stdcall ImmGetIMCLockCount(ptr) @ stdcall ImmGetIMEFileNameA(long ptr long) @ stdcall ImmGetIMEFileNameW(long ptr long) @ stdcall ImmGetImeInfoEx(ptr long ptr) -@ stdcall ImmGetImeMenuItemsA(long long long ptr ptr long) -@ stdcall ImmGetImeMenuItemsW(long long long ptr ptr long) -@ stdcall ImmGetOpenStatus(long) +@ stdcall ImmGetImeMenuItemsA(ptr long long ptr ptr long) +@ stdcall ImmGetImeMenuItemsW(ptr long long ptr ptr long) +@ stdcall ImmGetOpenStatus(ptr) @ stdcall ImmGetProperty(long long) @ stdcall ImmGetRegisterWordStyleA(long long ptr) @ stdcall ImmGetRegisterWordStyleW(long long ptr) -@ stdcall ImmGetStatusWindowPos(long ptr) -@ stdcall ImmGetVirtualKey(long) -@ stub ImmIMPGetIMEA -@ stub ImmIMPGetIMEW -@ stub ImmIMPQueryIMEA -@ stub ImmIMPQueryIMEW -@ stub ImmIMPSetIMEA -@ stub ImmIMPSetIMEW +@ stdcall ImmGetStatusWindowPos(ptr ptr) +@ stdcall ImmGetVirtualKey(ptr) +@ stdcall -stub ImmIMPGetIMEA(ptr ptr) +@ stdcall -stub ImmIMPGetIMEW(ptr ptr) +@ stdcall -stub ImmIMPQueryIMEA(ptr) +@ stdcall -stub ImmIMPQueryIMEW(ptr) +@ stdcall -stub ImmIMPSetIMEA(ptr ptr) +@ stdcall -stub ImmIMPSetIMEW(ptr ptr) @ stdcall ImmInstallIMEA(str str) @ stdcall ImmInstallIMEW(wstr wstr) @ stdcall ImmIsIME(long) @ stdcall ImmIsUIMessageA(long long long long) @ stdcall ImmIsUIMessageW(long long long long) -@ stub ImmLoadIME -@ stub ImmLoadLayout +@ stdcall -stub ImmLoadIME(long) +@ stdcall -stub ImmLoadLayout(long ptr) @ stub ImmLockClientImc -@ stdcall ImmLockIMC(long) -@ stdcall ImmLockIMCC(long) -@ stub ImmLockImeDpi -@ stdcall ImmNotifyIME(long long long long) +@ stdcall ImmLockIMC(ptr) +@ stdcall ImmLockIMCC(ptr) +@ stdcall -stub ImmLockImeDpi(long) +@ stdcall ImmNotifyIME(ptr long long long) @ stub ImmPenAuxInput -@ stdcall ImmProcessKey(long long long long long) -@ stub ImmPutImeMenuItemsIntoMappedFile -@ stdcall ImmReSizeIMCC(long long) +@ stdcall ImmProcessKey(ptr long long long long) +@ stdcall -stub ImmPutImeMenuItemsIntoMappedFile(ptr) +@ stdcall ImmReSizeIMCC(ptr long) @ stdcall ImmRegisterClient(ptr ptr) @ stdcall ImmRegisterWordA(long str long str) @ stdcall ImmRegisterWordW(long wstr long wstr) -@ stdcall ImmReleaseContext(long long) +@ stdcall ImmReleaseContext(ptr ptr) @ stdcall ImmRequestMessageA(ptr long long) @ stdcall ImmRequestMessageW(ptr long long) -@ stub ImmSendIMEMessageExA -@ stub ImmSendIMEMessageExW +@ stdcall -stub ImmSendIMEMessageExA(ptr long) +@ stdcall -stub ImmSendIMEMessageExW(ptr long) @ stub ImmSendMessageToActiveDefImeWndW @ stdcall ImmSetActiveContext(ptr ptr long) @ stdcall ImmSetActiveContextConsoleIME(ptr long) -@ stdcall ImmSetCandidateWindow(long ptr) -@ stdcall ImmSetCompositionFontA(long ptr) -@ stdcall ImmSetCompositionFontW(long ptr) -@ stdcall ImmSetCompositionStringA(long long ptr long ptr long) -@ stdcall ImmSetCompositionStringW(long long ptr long ptr long) -@ stdcall ImmSetCompositionWindow(long ptr) -@ stdcall ImmSetConversionStatus(long long long) +@ stdcall ImmSetCandidateWindow(ptr ptr) +@ stdcall ImmSetCompositionFontA(ptr ptr) +@ stdcall ImmSetCompositionFontW(ptr ptr) +@ stdcall ImmSetCompositionStringA(ptr long ptr long ptr long) +@ stdcall ImmSetCompositionStringW(ptr long ptr long ptr long) +@ stdcall ImmSetCompositionWindow(ptr ptr) +@ stdcall ImmSetConversionStatus(ptr long long) #@ stdcall ImmSetHotKey(long long long ptr) user32.CliImmSetHotKey -@ stdcall ImmSetOpenStatus(long long) -@ stdcall ImmSetStatusWindowPos(long ptr) +@ stdcall ImmSetOpenStatus(ptr long) +@ stdcall ImmSetStatusWindowPos(ptr ptr) @ stdcall ImmShowSoftKeyboard(ptr long) -@ stdcall ImmSimulateHotKey(long long) -@ stub ImmSystemHandler -@ stdcall ImmTranslateMessage(long long long long) +@ stdcall ImmSimulateHotKey(ptr long) +@ stdcall -stub ImmSystemHandler(ptr long long) +@ stdcall ImmTranslateMessage(ptr long long long) @ stub ImmUnlockClientImc -@ stdcall ImmUnlockIMC(long) -@ stdcall ImmUnlockIMCC(long) -@ stub ImmUnlockImeDpi +@ stdcall ImmUnlockIMC(ptr) +@ stdcall ImmUnlockIMCC(ptr) +@ stdcall -stub ImmUnlockImeDpi(ptr) @ stdcall ImmUnregisterWordA(long str long str) @ stdcall ImmUnregisterWordW(long wstr long wstr) -@ stub ImmWINNLSEnableIME -@ stub ImmWINNLSGetEnableStatus +@ stdcall -stub ImmWINNLSEnableIME(ptr long) +@ stdcall -stub ImmWINNLSGetEnableStatus(ptr) @ stub ImmWINNLSGetIMEHotkey ################################################################ diff --git a/win32ss/user/user32/misc/immtable.h b/win32ss/user/user32/misc/immtable.h new file mode 100644 index 00000000000..d0cbdc2e4a5 --- /dev/null +++ b/win32ss/user/user32/misc/immtable.h @@ -0,0 +1,52 @@ +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))

4 years, 3 months

[reactos] 01/01: [RAPPS] Update help command (#3209)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fbbc3efd60bdf5986a6c7… commit fbbc3efd60bdf5986a6c7ff5a7cee4c3a51689e5 Author: He Yang <1160386205(a)qq.com> AuthorDate: Sat Sep 19 20:20:14 2020 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 19 15:20:14 2020 +0300 [RAPPS] Update help command (#3209) Add missing FIND and INFO commands to the usage help string. --- base/applications/rapps/include/unattended.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/base/applications/rapps/include/unattended.h b/base/applications/rapps/include/unattended.h index c5bc8797b01..301f54ab9e7 100644 --- a/base/applications/rapps/include/unattended.h +++ b/base/applications/rapps/include/unattended.h @@ -6,6 +6,11 @@ #define CMD_KEY_INFO L"INFO" #define CMD_KEY_HELP L"?" -const WCHAR UsageString[] = L"RAPPS [/" CMD_KEY_HELP "] [/" CMD_KEY_INSTALL " packagename] [/" CMD_KEY_SETUP " filename]"; +const WCHAR UsageString[] = L"RAPPS \ +[/" CMD_KEY_HELP L"] \ +[/" CMD_KEY_INSTALL L" packagename] \ +[/" CMD_KEY_SETUP L" filename] \ +[/" CMD_KEY_FIND L" string] \ +[/" CMD_KEY_INFO L" packagename]"; BOOL ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow);

4 years, 3 months

[reactos] 01/01: [APPWIZ] Add ES_AUTOHSCROLL to allow users to enter long text

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d905dd531838c134b59c1… commit d905dd531838c134b59c10bf4246b63af4a0feb3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 19 13:50:58 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 19 13:50:58 2020 +0900 [APPWIZ] Add ES_AUTOHSCROLL to allow users to enter long text CORE-17291 --- dll/cpl/appwiz/lang/bg-BG.rc | 4 ++-- dll/cpl/appwiz/lang/cs-CZ.rc | 4 ++-- dll/cpl/appwiz/lang/de-DE.rc | 4 ++-- dll/cpl/appwiz/lang/el-GR.rc | 4 ++-- dll/cpl/appwiz/lang/en-US.rc | 4 ++-- dll/cpl/appwiz/lang/es-ES.rc | 4 ++-- dll/cpl/appwiz/lang/et-EE.rc | 4 ++-- dll/cpl/appwiz/lang/fr-FR.rc | 4 ++-- dll/cpl/appwiz/lang/he-IL.rc | 4 ++-- dll/cpl/appwiz/lang/id-ID.rc | 4 ++-- dll/cpl/appwiz/lang/it-IT.rc | 4 ++-- dll/cpl/appwiz/lang/ja-JP.rc | 4 ++-- dll/cpl/appwiz/lang/no-NO.rc | 4 ++-- dll/cpl/appwiz/lang/pl-PL.rc | 4 ++-- dll/cpl/appwiz/lang/pt-BR.rc | 4 ++-- dll/cpl/appwiz/lang/pt-PT.rc | 4 ++-- dll/cpl/appwiz/lang/ro-RO.rc | 4 ++-- dll/cpl/appwiz/lang/ru-RU.rc | 4 ++-- dll/cpl/appwiz/lang/sk-SK.rc | 4 ++-- dll/cpl/appwiz/lang/sq-AL.rc | 4 ++-- dll/cpl/appwiz/lang/tr-TR.rc | 4 ++-- dll/cpl/appwiz/lang/uk-UA.rc | 4 ++-- dll/cpl/appwiz/lang/zh-CN.rc | 4 ++-- dll/cpl/appwiz/lang/zh-TW.rc | 4 ++-- 24 files changed, 48 insertions(+), 48 deletions(-) diff --git a/dll/cpl/appwiz/lang/bg-BG.rc b/dll/cpl/appwiz/lang/bg-BG.rc index 1771b697598..2461e5f6f7c 100644 --- a/dll/cpl/appwiz/lang/bg-BG.rc +++ b/dll/cpl/appwiz/lang/bg-BG.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Вълшебникът ви помага за създаването на препратки към местни или мрежови приложения, файлове, папки, компютри или адреси в интернет.", -1, 120, 15, 200, 32 LTEXT "Напишете местоположението на предмета:", -1, 120, 50, 160, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Обзор...", IDC_SHORTCUT_BROWSE, 275, 65, 55, 15, ES_LEFT LTEXT "Натиснете ""Напред"" за продължаване.", -1, 120, 100, 160, 10 END @@ -37,7 +37,7 @@ CAPTION "Изберете заглавие за приложението" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Напишете име за препратката:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Натиснете ""Край"" за създаване на препратка.", -1, 120, 50, 170, 10 END diff --git a/dll/cpl/appwiz/lang/cs-CZ.rc b/dll/cpl/appwiz/lang/cs-CZ.rc index a03f07ba4b9..76f9163173a 100644 --- a/dll/cpl/appwiz/lang/cs-CZ.rc +++ b/dll/cpl/appwiz/lang/cs-CZ.rc @@ -31,7 +31,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Tento průvodce pomůže s vytvořením zástupců na místní\nnebo síťové programy, soubory, složky, počítače nebo\ninternetové adresy.", -1, 120, 15, 200, 30 LTEXT "Zadejte umístění položky:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Procházet...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Pokračujte kliknutím na Další.", -1, 120, 97, 162, 10 END @@ -42,7 +42,7 @@ CAPTION "Zvolte název programu" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Zadejte název tohoto zástupce:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Kliknutím na Dokončit vytvoříte zástupce.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/de-DE.rc b/dll/cpl/appwiz/lang/de-DE.rc index f44b8e79fee..df7c01c0cc8 100644 --- a/dll/cpl/appwiz/lang/de-DE.rc +++ b/dll/cpl/appwiz/lang/de-DE.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Mit diesem Assistenten können Sie Verknüpfungen mit lokalen oder vernetzten Programmen, Dateien, Ordnern, Computern oder Internetadressen erstellen.", -1, 120, 15, 200, 30 LTEXT "&Geben Sie den Speicherort des Elements ein:", -1, 120, 50, 150, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "&Durchsuchen...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Klicken Sie auf Weiter, um fortzufahren.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Programmbezeichnung auswählen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Geben Sie den Namen für die Verknüpfung ein:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Klicken Sie auf Fertig stellen, um die Verknüpfung zu erstellen.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/el-GR.rc b/dll/cpl/appwiz/lang/el-GR.rc index 53c815a9f37..6911ffdfc39 100644 --- a/dll/cpl/appwiz/lang/el-GR.rc +++ b/dll/cpl/appwiz/lang/el-GR.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Αυτός ο οδηγός σας βοηθάει να δημιουργήσετε συντομεύσεις σε τοπικά προγράμματα ή προγράμματα δικτύου, αρχεία, φακέλους, υπολογιστές ή διευθύνσεις στο διαδίκτυο.", -1, 120, 15, 200, 30 LTEXT "Εισάγετε την θέση του στοιχείου:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Αναζήτηση...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Πατήστε 'Επόμενο' για να συνεχίσετε.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Επιλέξτε τίτλο για το πρόγραμμα" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Πληκτρολογήστε ένα όνομα για τη συντόμευση:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Πατήστε 'Τέλος' για να δημιουργήσετε τη συντόμευση.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/en-US.rc b/dll/cpl/appwiz/lang/en-US.rc index 7f25e1b4a74..1cf1a7ab924 100644 --- a/dll/cpl/appwiz/lang/en-US.rc +++ b/dll/cpl/appwiz/lang/en-US.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Click Next to continue.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Select a Title for the Program" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Click Finish to create the shortcut.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/es-ES.rc b/dll/cpl/appwiz/lang/es-ES.rc index 9758843998e..2683b85fbab 100644 --- a/dll/cpl/appwiz/lang/es-ES.rc +++ b/dll/cpl/appwiz/lang/es-ES.rc @@ -35,7 +35,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Este asistente le ayudará a crear accesos directos a programas locales o en red, archivos, carpetas, equipos, o direcciones de Internet.", -1, 120, 15, 200, 30 LTEXT "Escriba la ubicación del elemento:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Examinar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Presione Siguiente para continuar.", -1, 120, 97, 162, 10 END @@ -46,7 +46,7 @@ CAPTION "Seleccione un título para el programa" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Escriba un nombre para este acceso directo:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Haga clic en Finalizar para crear el acceso directo.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/et-EE.rc b/dll/cpl/appwiz/lang/et-EE.rc index 1536a64b7ef..2e1bcf4b404 100644 --- a/dll/cpl/appwiz/lang/et-EE.rc +++ b/dll/cpl/appwiz/lang/et-EE.rc @@ -33,7 +33,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Selle viisardi abil saate luua otseteid kohalike või\nvõrguprogrammide, failide, kaustada, arvutite või\nInterneti-aadresside juurde.", -1, 120, 15, 200, 30 LTEXT "Tippige üksuse asukoht:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Sirvi...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Jätkamiseks klõpsake nuppu Edasi.", -1, 120, 97, 162, 10 END @@ -44,7 +44,7 @@ CAPTION "Programmi jaoks tiitli valimine" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Tippige selle otsetee nimi:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Otsetee loomiseks klõpsake nuppu Valmis.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/fr-FR.rc b/dll/cpl/appwiz/lang/fr-FR.rc index e03f2ef5d7c..59a069a0739 100644 --- a/dll/cpl/appwiz/lang/fr-FR.rc +++ b/dll/cpl/appwiz/lang/fr-FR.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Cet assistant vous aide à créer des raccourcis vers des programmes, des fichiers, des dossiers, des ordinateurs,\nou des adresses Internet locaux ou sur le réseau.", -1, 120, 15, 200, 30 LTEXT "Entrez la localisation de l'élément :", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Parcourir...", IDC_SHORTCUT_BROWSE, 272, 65, 60, 15, ES_LEFT LTEXT "Cliquez sur Suivant pour continuer.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Sélectionnez un titre pour le programme" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "En&trez un nom pour ce raccourci :", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Cliquez sur Terminer pour créer le raccourci.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/he-IL.rc b/dll/cpl/appwiz/lang/he-IL.rc index ade66f0999d..cb068fdaec9 100644 --- a/dll/cpl/appwiz/lang/he-IL.rc +++ b/dll/cpl/appwiz/lang/he-IL.rc @@ -27,7 +27,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 LTEXT "הקלד את מיקום הפריט:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "סייר...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "לחץ הבא כדי להמשיך.", -1, 120, 97, 162, 10 END @@ -38,7 +38,7 @@ CAPTION "בחירת שם לתכנית" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "הקלד שם עבור קיצור דרך זה:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "לחץ על סיום כדי ליצור את קיצור הדרך.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/id-ID.rc b/dll/cpl/appwiz/lang/id-ID.rc index 32e0a8ea171..4be97de03c6 100644 --- a/dll/cpl/appwiz/lang/id-ID.rc +++ b/dll/cpl/appwiz/lang/id-ID.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Penuntun ini membantu membuat pintasan pada lokal atau\njaringan berupa program, berkas, folder, Komputer, atau Alamat Internet.", -1, 120, 15, 200, 30 LTEXT "Ketik lokasi butir:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Cari...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Klik Lanjut untuk meneruskan.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Pilih Judul untuk Program" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Ketik nama untuk pintasan ini:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Klik Selesai untuk membuat pintasan.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/it-IT.rc b/dll/cpl/appwiz/lang/it-IT.rc index 1aa8d164e79..c545681392a 100644 --- a/dll/cpl/appwiz/lang/it-IT.rc +++ b/dll/cpl/appwiz/lang/it-IT.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Questo wizard permette la creazione di collegamenti verso programmi locali o di rete, file, cartella, computer, o\nindirizzi Internet.", -1, 120, 15, 200, 30 LTEXT "Digitare la posizione:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Sfoglia...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Premere Avanti per continuare.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Scelta del titolo del programma" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Digitare il nome per questo collegamento:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Premere Fine per creare il collegamento.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/ja-JP.rc b/dll/cpl/appwiz/lang/ja-JP.rc index 045e9ac89de..ddbe0f6cc4f 100644 --- a/dll/cpl/appwiz/lang/ja-JP.rc +++ b/dll/cpl/appwiz/lang/ja-JP.rc @@ -26,7 +26,7 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN LTEXT "このウィザードは、ローカルまたはネットワークプログラム、ファイル、フォルダー、コンピューター、またはインターネットアドレスへのショートカットを作成するのを助けます。", -1, 120, 15, 200, 30 LTEXT "項目の位置を入力して下さい:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "参照...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "次へをクリックすると続行します。", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "プログラムのタイトルを選択します" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN LTEXT "このショートカットの名前を入力して下さい(&T):", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "完了をクリックするとショートカットを作成します。", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/no-NO.rc b/dll/cpl/appwiz/lang/no-NO.rc index 8731c9b70c4..72b6971e4ee 100644 --- a/dll/cpl/appwiz/lang/no-NO.rc +++ b/dll/cpl/appwiz/lang/no-NO.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Denne veiviseren vil hjelper deg å lage snarvei til en lokal eller\nnettverk programmer, filer, mapper, datamaskiner, eller internett\nadresse.", -1, 120, 15, 200, 30 LTEXT "Velg din lagring plassering:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Bla gjennom...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Trykk på neste for å fortsette.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Velg en tittel for programmet" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Skriv inn et navn for denne snarveien:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Trykk på fullført for å opprette snarveien.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/pl-PL.rc b/dll/cpl/appwiz/lang/pl-PL.rc index 15345cb7002..5f8eb9bf1cd 100644 --- a/dll/cpl/appwiz/lang/pl-PL.rc +++ b/dll/cpl/appwiz/lang/pl-PL.rc @@ -37,7 +37,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Ten program pomoże ci stworzyć skróty do lokalnych lub sieciowych programów, plików, katalogów, komputerów, bądź adresów Internetowych.", -1, 120, 15, 200, 30 LTEXT "Wpisz ścieżkę dostępu do obiektu:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Przeglądaj...", IDC_SHORTCUT_BROWSE, 274, 65, 55, 15, ES_LEFT LTEXT "Kliknij Dalej, aby kontynuować.", -1, 120, 97, 162, 10 END @@ -48,7 +48,7 @@ CAPTION "Wybierz nazwę" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Wpisz nazwę dla tego skrótu:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Kliknij Zakończ, by utworzyć skrót.", -1, 120, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/pt-BR.rc b/dll/cpl/appwiz/lang/pt-BR.rc index 35404e74dc2..1b5fb17e00c 100644 --- a/dll/cpl/appwiz/lang/pt-BR.rc +++ b/dll/cpl/appwiz/lang/pt-BR.rc @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Este assitente irá ajudá-lo a criar atalhos para\nprogramas, arquivos, pastas, computadores ou endereços\nde Internet, ambos locais ou de rede.", -1, 120, 15, 200, 30 LTEXT "Digite a localização do item:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Procurar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Pressione Próximo para prosseguir.", -1, 120, 97, 162, 10 END @@ -39,7 +39,7 @@ CAPTION "Selecione um Título para o Programa" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Digite um nome para este atalho:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Pressione Terminar para criar o atalho.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/pt-PT.rc b/dll/cpl/appwiz/lang/pt-PT.rc index cac74180974..297c4e83b1d 100644 --- a/dll/cpl/appwiz/lang/pt-PT.rc +++ b/dll/cpl/appwiz/lang/pt-PT.rc @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Este assitente irá ajudá-lo a criar atalhos para\nprogramas, arquivos, pastas, computadores ou endereços\nde Internet, ambos locais ou de rede.", -1, 120, 15, 200, 30 LTEXT "Digite a localização do item:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Procurar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Pressione Próximo para prosseguir.", -1, 120, 97, 162, 10 END @@ -39,7 +39,7 @@ CAPTION "Seleccione um Título para o Programa" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Digite um nome para este atalho:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Pressione Terminar para criar o atalho.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc index 45eb1112d49..9a8d36f9b4e 100644 --- a/dll/cpl/appwiz/lang/ro-RO.rc +++ b/dll/cpl/appwiz/lang/ro-RO.rc @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Acest asistent vă va ajuta în crearea unei scurtături\ncătre adrese din Internet, calculatoare, dosare, fișiere\nlocale sau din rețea.", -1, 120, 15, 200, 30 LTEXT "Scrieți adresa elementului:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Spe&cificare…", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Apăsați „Înainte” pentru a continua.", -1, 120, 97, 162, 10 END @@ -43,7 +43,7 @@ CAPTION "Asistent pentru creare de scurtătură" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Scrieți un n&ume pentru scurtătură:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Apăsați „Sfârșit” pentru a crea scurtătura.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc index 42d1c80017e..fcabc788e33 100644 --- a/dll/cpl/appwiz/lang/ru-RU.rc +++ b/dll/cpl/appwiz/lang/ru-RU.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Этот мастер поможет создать ярлык для локальных или\nсетевых программ, файлов, папок, компьютеров или\nИнтернет-адресов.", -1, 120, 15, 200, 30 LTEXT "Выберите местоположение элемента:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Обзор...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Щелкните ""Далее"" для продолжения.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Выбор заголовка для программы" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Введите заголовок ярлыка:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Щелкните ""Завершить"" для создания ярлыка.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/sk-SK.rc b/dll/cpl/appwiz/lang/sk-SK.rc index 5a52da02bdc..0e10958df79 100644 --- a/dll/cpl/appwiz/lang/sk-SK.rc +++ b/dll/cpl/appwiz/lang/sk-SK.rc @@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Tento sprievodca Vám pomôže vytvoriť odkazy na miestne alebo\nsieťové programy, súbory, priečinky, počítače, alebo internetové\nadresy.", -1, 120, 15, 200, 30 LTEXT "Zadajte umiestnenie položky:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "&Prehľadávať...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Kliknite na tlačidlo Ďalej pre pokračovanie.", -1, 120, 97, 162, 10 END @@ -41,7 +41,7 @@ CAPTION "Select a Title for the Program" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Napíšte názov pre tento odkaz:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Kliknite na tlačidlo Dokončiť pre vytvorenie odkazu.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/sq-AL.rc b/dll/cpl/appwiz/lang/sq-AL.rc index bf247b9a099..3d114275343 100644 --- a/dll/cpl/appwiz/lang/sq-AL.rc +++ b/dll/cpl/appwiz/lang/sq-AL.rc @@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Ky magjistar ju ndihmon për të krijuar shkurtesat për të lokale ose\nprograme networku, dokumenta, dosje, kompjutra, ose adresa\nInterneti.", -1, 120, 15, 200, 30 LTEXT "Shkruaj vendndodhjen e sendit:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Shfleto...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Klikoni Next për të vazhduar.", -1, 120, 97, 162, 10 END @@ -41,7 +41,7 @@ CAPTION "Zgjidh një titull për Programin" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Shkruaj nje emer per kete shortcut:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Kliko Finish per te krijuar një shortcut.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/tr-TR.rc b/dll/cpl/appwiz/lang/tr-TR.rc index a45bf5a6d7e..bfe17114860 100644 --- a/dll/cpl/appwiz/lang/tr-TR.rc +++ b/dll/cpl/appwiz/lang/tr-TR.rc @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Bu yardımcı, yerli ya da ağdaki izlencelere, kütüklere,\ndizinlere, bilgisayarlara ve Umûmî Ağ adreslerine\nkısayollar oluşturmanıza yardım eder.", -1, 120, 15, 200, 30 LTEXT "Öğenin konumunu yazınız:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "&Göz At...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Sürdürmek için ""İleri""ye tıklayınız.", -1, 120, 97, 162, 10 END @@ -39,7 +39,7 @@ CAPTION "İzlencenin Adını Seç" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Bu kısayol için bir ad yazınız:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Kısayolu oluşturmak için ""Bitir""e tıklayınız.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/uk-UA.rc b/dll/cpl/appwiz/lang/uk-UA.rc index 965dc6233f2..79af27fdb4f 100644 --- a/dll/cpl/appwiz/lang/uk-UA.rc +++ b/dll/cpl/appwiz/lang/uk-UA.rc @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Цей майстер допомагає створити ярлик, який указує на\nлокальні або мережні програми, файли, папки, комп'ютери\nабо адреси в Інтернеті.", -1, 120, 15, 200, 30 LTEXT "Укажіть розташування об'єкта:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Огляд...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Щоб продовжити установку, натисніть кнопку ""Далі"".", -1, 120, 97, 162, 10 END @@ -45,7 +45,7 @@ CAPTION "Вибір назви програми" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Введіть ім'я ярлика:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Щоб створити ярлик, натисніть кнопку ""Готово"".", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/zh-CN.rc b/dll/cpl/appwiz/lang/zh-CN.rc index 42d017c2dd1..1ac9c908e01 100644 --- a/dll/cpl/appwiz/lang/zh-CN.rc +++ b/dll/cpl/appwiz/lang/zh-CN.rc @@ -35,7 +35,7 @@ FONT 9, "宋体", 0, 0, 0x0 BEGIN LTEXT "此向导可帮助您创建本地或网络程序、文件、文件夹、计算机或 Internet 地址的快捷方式。", -1, 120, 15, 200, 30 LTEXT "请输入项目位置：", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "浏览...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "点击“下一步”继续。", -1, 120, 97, 162, 10 END @@ -46,7 +46,7 @@ CAPTION "选择程序标题" FONT 9, "宋体", 0, 0, 0x0 BEGIN LTEXT "输入快捷方式名称(&T)：", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "点击“完成”创建快捷方式", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc index a33c0b93a52..76acffcfdaf 100644 --- a/dll/cpl/appwiz/lang/zh-TW.rc +++ b/dll/cpl/appwiz/lang/zh-TW.rc @@ -35,7 +35,7 @@ FONT 9, "新細明體", 0, 0, 0x0 BEGIN LTEXT "此精靈幫助您建立本地或網路程式、檔案、目錄、電腦或網際網路地址的捷徑。", -1, 120, 15, 200, 30 LTEXT "輸入項目位置：", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "瀏覽...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "按 [下一步] 繼續。", -1, 120, 97, 162, 10 END @@ -46,7 +46,7 @@ CAPTION "選擇程式標題" FONT 9, "新細明體", 0, 0, 0x0 BEGIN LTEXT "輸入捷徑名稱(&T)：", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "按 [完成] 建立捷徑", -1, 118, 97, 178, 17 END

4 years, 3 months

[reactos] 01/01: [SHELL32][SHELLEXT] Fix use of SHFileOperation results and improve log on failure / fix log spam (#3198)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5a30fc249e24108317a3… commit a5a30fc249e24108317a37fd430b119e49e38f10 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri Sep 18 21:19:55 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 18 21:19:55 2020 +0200 [SHELL32][SHELLEXT] Fix use of SHFileOperation results and improve log on failure / fix log spam (#3198) --- dll/shellext/mydocs/CMyDocsDropHandler.cpp | 7 ++++- dll/win32/shell32/CCopyToMenu.cpp | 8 +++++- dll/win32/shell32/CMoveToMenu.cpp | 8 +++++- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 33 ++++++++++++++-------- .../shell32/droptargets/CRecyclerDropTarget.cpp | 5 ++-- dll/win32/shell32/shellrecyclebin/recyclebin_v5.c | 6 ++-- dll/win32/shell32/shlfileop.cpp | 4 +++ 7 files changed, 53 insertions(+), 18 deletions(-) diff --git a/dll/shellext/mydocs/CMyDocsDropHandler.cpp b/dll/shellext/mydocs/CMyDocsDropHandler.cpp index cd74af6d016..477ca4b1d7f 100644 --- a/dll/shellext/mydocs/CMyDocsDropHandler.cpp +++ b/dll/shellext/mydocs/CMyDocsDropHandler.cpp @@ -157,7 +157,12 @@ CMyDocsDropHandler::Drop(IDataObject *pDataObject, DWORD dwKeyState, fileop.pFrom = pszzSrcList; fileop.pTo = szzDir; fileop.fFlags = FOF_ALLOWUNDO | FOF_FILESONLY | FOF_MULTIDESTFILES | FOF_NOCONFIRMMKDIR; - SHFileOperationW(&fileop); + int res = SHFileOperationW(&fileop); + if (res) + { + ERR("SHFileOperationW failed with 0x%x\n", res); + hr = E_FAIL; + } // unlock buffer strSrcList.ReleaseBuffer(); diff --git a/dll/win32/shell32/CCopyToMenu.cpp b/dll/win32/shell32/CCopyToMenu.cpp index 47da3b11f44..de2e2921ecd 100644 --- a/dll/win32/shell32/CCopyToMenu.cpp +++ b/dll/win32/shell32/CCopyToMenu.cpp @@ -211,7 +211,13 @@ HRESULT CCopyToMenu::DoRealCopy(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl) op.pFrom = strFiles; op.pTo = szPath; op.fFlags = FOF_ALLOWUNDO; - return ((SHFileOperation(&op) == 0) ? S_OK : E_FAIL); + int res = SHFileOperationW(&op); + if (res) + { + ERR("SHFileOperationW failed with 0x%x\n", res); + return E_FAIL; + } + return S_OK; } CStringW CCopyToMenu::DoGetFileTitle() diff --git a/dll/win32/shell32/CMoveToMenu.cpp b/dll/win32/shell32/CMoveToMenu.cpp index 7e74473e143..be90f97201a 100644 --- a/dll/win32/shell32/CMoveToMenu.cpp +++ b/dll/win32/shell32/CMoveToMenu.cpp @@ -178,7 +178,13 @@ HRESULT CMoveToMenu::DoRealMove(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl) op.pFrom = strFiles; op.pTo = szPath; op.fFlags = FOF_ALLOWUNDO; - return ((SHFileOperation(&op) == 0) ? S_OK : E_FAIL); + int res = SHFileOperationW(&op); + if (res) + { + ERR("SHFileOperationW failed with 0x%x\n", res); + return E_FAIL; + } + return S_OK; } CStringW CMoveToMenu::DoGetFileTitle() diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index b8e67fd9adf..4fb1657da78 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -75,7 +75,7 @@ HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, return hr; pszSrcList = BuildPathsList(strretFrom.pOleStr, cidl, apidl); - ERR("Source file (just the first) = %s, target path = %s, bCopy: %d\n", debugstr_w(pszSrcList), debugstr_w(m_sPathTarget), bCopy); + TRACE("Source file (just the first) = %s, target path = %s, bCopy: %d\n", debugstr_w(pszSrcList), debugstr_w(m_sPathTarget), bCopy); CoTaskMemFree(strretFrom.pOleStr); if (!pszSrcList) return E_OUTOFMEMORY; @@ -92,9 +92,11 @@ HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, HeapFree(GetProcessHeap(), 0, pszSrcList); if (res) + { + ERR("SHFileOperationW failed with 0x%x\n", res); return E_FAIL; - else - return S_OK; + } + return S_OK; } CFSDropTarget::CFSDropTarget(): @@ -489,7 +491,10 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, { hr = pDataObject->GetData(&fmt, &medium); TRACE("CFSTR_SHELLIDLIST.\n"); - + if (FAILED(hr)) + { + ERR("CFSTR_SHELLIDLIST failed\n"); + } /* lock the handle */ LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); if (!lpcida) @@ -597,9 +602,9 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, } hr = ppf->Save(wszTarget, FALSE); - if (FAILED(hr)) - break; - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); + if (FAILED(hr)) + break; + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); } else { @@ -636,9 +641,9 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, break; hr = ppf->Save(wszTarget, TRUE); - if (FAILED(hr)) - break; - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); + if (FAILED(hr)) + break; + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); } } } @@ -680,7 +685,13 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, op.hwnd = m_hwndSite; op.wFunc = bCopy ? FO_COPY : FO_MOVE; op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; - hr = SHFileOperationW(&op); + int res = SHFileOperationW(&op); + if (res) + { + ERR("SHFileOperationW failed with 0x%x\n", res); + hr = E_FAIL; + } + return hr; } ERR("Error calling GetData\n"); diff --git a/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp b/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp index fa2b5ff1bcb..efd446d5cfa 100644 --- a/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp @@ -58,9 +58,10 @@ class CRecyclerDropTarget : FileOp.fFlags = FOF_ALLOWUNDO; TRACE("Deleting file (just the first) = %s, allowundo: %d\n", debugstr_w(FileOp.pFrom), (FileOp.fFlags == FOF_ALLOWUNDO)); - if (SHFileOperationW(&FileOp) != 0) + int res = SHFileOperationW(&FileOp); + if (res) { - ERR("SHFileOperation failed with 0x%x\n", GetLastError()); + ERR("SHFileOperation failed with 0x%x\n", res); hr = E_FAIL; } diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c index 518cd0f216e..4e333da9f27 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c @@ -503,10 +503,12 @@ RecycleBin5_RecycleBin5_Restore( op.pFrom = pDeletedFileName; op.pTo = pDeletedFile->FileNameW; - if (!SHFileOperationW(&op)) + int res = SHFileOperationW(&op); + if (res) { + ERR("SHFileOperationW failed with 0x%x\n", res); UnmapViewOfFile(pHeader); - return HRESULT_FROM_WIN32(GetLastError()); + return E_FAIL; } /* Clear last entry in the file */ diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index c9e7400bed2..204feceaafe 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -1027,6 +1027,10 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) // Call the actual function retCode = SHFileOperationW(&nFileOp); + if (retCode) + { + ERR("SHFileOperationW failed with 0x%x\n", retCode); + } // Cleanup cleanup:

4 years, 3 months

[reactos] 01/01: [SDK][INCLUDE] Add ANSI/Unicode mappings for SHAboutInfo and SHGetValueGoodBoot

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ad5ae6389987d8322b6d… commit 3ad5ae6389987d8322b6db26a473efb8a34d19ff Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 18 17:30:16 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Sep 18 17:30:16 2020 +0900 [SDK][INCLUDE] Add ANSI/Unicode mappings for SHAboutInfo and SHGetValueGoodBoot --- sdk/include/reactos/shlwapi_undoc.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 7117d1c190b..328bd511db6 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -27,6 +27,12 @@ extern "C" { BOOL WINAPI SHAboutInfoA(LPSTR lpszDest, DWORD dwDestLen); BOOL WINAPI SHAboutInfoW(LPWSTR lpszDest, DWORD dwDestLen); +#ifdef UNICODE +#define SHAboutInfo SHAboutInfoW +#else +#define SHAboutInfo SHAboutInfoA +#endif + HRESULT WINAPI IUnknown_QueryStatus(IUnknown *lpUnknown, REFGUID pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT* pCmdText); HRESULT WINAPI IUnknown_Exec(IUnknown* lpUnknown, REFGUID pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT* pvaIn, VARIANT* pvaOut); LONG WINAPI SHSetWindowBits(HWND hwnd, INT offset, UINT wMask, UINT wFlags); @@ -127,6 +133,11 @@ DWORD WINAPI SHGetValueGoodBootA(HKEY hkey, LPCSTR pSubKey, LPCSTR pValue, LPDWORD pwType, LPVOID pvData, LPDWORD pbData); DWORD WINAPI SHGetValueGoodBootW(HKEY hkey, LPCWSTR pSubKey, LPCWSTR pValue, LPDWORD pwType, LPVOID pvData, LPDWORD pbData); +#ifdef UNICODE +#define SHGetValueGoodBoot SHGetValueGoodBootW +#else +#define SHGetValueGoodBoot SHGetValueGoodBootA +#endif int WINAPIV

4 years, 3 months

← Newer
1
...
6
7
8
9
10
11
12
...
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