June 2024 - Wine-commits - list.winehq.org

Vijay Kiran Kamuju : ntdll: Add stub RtlEnumerateGenericTableWithoutSplayingAvl function.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 1d58a4674c0fee5a68cdce26deab0beac9f37667 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d58a4674c0fee5a68cdce26deab0b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jun 19 21:37:54 2024 +0200 ntdll: Add stub RtlEnumerateGenericTableWithoutSplayingAvl function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56839 --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 80ed2d8f020..7d31bf41f55 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -650,7 +650,7 @@ # @ stub RtlEnumerateGenericTableAvl # @ stub RtlEnumerateGenericTableLikeADirectory @ stdcall RtlEnumerateGenericTableWithoutSplaying(ptr ptr) -# @ stub RtlEnumerateGenericTableWithoutSplayingAvl +@ stdcall RtlEnumerateGenericTableWithoutSplayingAvl(ptr ptr) @ stub RtlEnumerateProperties @ stdcall RtlEqualComputerName(ptr ptr) @ stdcall RtlEqualDomainName(ptr ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index d9690cdec96..9b25c6b70ab 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -788,6 +788,18 @@ void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE table, PRTL_AVL_COMPARE_ FIXME("%p %p %p %p %p: stub\n", table, compare, allocate, free, context); } +/****************************************************************************** + * RtlEnumerateGenericTableWithoutSplayingAvl (NTDLL.@) + */ +void * WINAPI RtlEnumerateGenericTableWithoutSplayingAvl(RTL_AVL_TABLE *table, PVOID *previous) +{ + static int warn_once; + + if (!warn_once++) + FIXME("(%p, %p) stub!\n", table, previous); + return NULL; +} + /*********************************************************************** * RtlInsertElementGenericTableAvl (NTDLL.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d7a77f5911a..a546c5811a6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1072,7 +1072,7 @@ @ stub RtlEnumerateGenericTableAvl @ stub RtlEnumerateGenericTableLikeADirectory @ stdcall RtlEnumerateGenericTableWithoutSplaying(ptr ptr) -@ stub RtlEnumerateGenericTableWithoutSplayingAvl +@ stdcall RtlEnumerateGenericTableWithoutSplayingAvl(ptr ptr) @ stdcall RtlEqualLuid(ptr ptr) @ stdcall RtlEqualSid(ptr ptr) @ stdcall RtlEqualString(ptr ptr long) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 7f5db987ed4..426ba4fa31b 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -275,6 +275,7 @@ NTSTATUS WINAPI PsSetLoadImageNotifyRoutineEx(PLOAD_IMAGE_NOTIFY_ROUTINE,ULONG_ LONG WINAPI RtlCompareString(const STRING*,const STRING*,BOOLEAN); void WINAPI RtlCopyString(STRING*,const STRING*); void * WINAPI RtlEnumerateGenericTableWithoutSplaying(PRTL_GENERIC_TABLE,PVOID*); +void * WINAPI RtlEnumerateGenericTableWithoutSplayingAvl(PRTL_AVL_TABLE,PVOID*); BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN); void * WINAPI RtlGetElementGenericTable(PRTL_GENERIC_TABLE,ULONG); void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *);

1 0

Vijay Kiran Kamuju : ntdll: Add stub RtlNumberGenericTableElementsAvl function.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 2a6e7ab4ed984837fc19828d4404a3cc3e6add2a URL: https://gitlab.winehq.org/wine/wine/-/commit/2a6e7ab4ed984837fc19828d4404a3… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jun 19 21:49:00 2024 +0200 ntdll: Add stub RtlNumberGenericTableElementsAvl function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56839 --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7d31bf41f55..f82146c6d39 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -898,7 +898,7 @@ @ stdcall RtlNtStatusToDosError(long) @ stdcall RtlNtStatusToDosErrorNoTeb(long) @ stdcall RtlNumberGenericTableElements(ptr) -# @ stub RtlNumberGenericTableElementsAvl +@ stdcall RtlNumberGenericTableElementsAvl(ptr) @ stdcall RtlNumberOfClearBits(ptr) @ stdcall RtlNumberOfSetBits(ptr) @ stdcall RtlOemStringToUnicodeSize(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 9b25c6b70ab..5597daa061f 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -800,6 +800,15 @@ void * WINAPI RtlEnumerateGenericTableWithoutSplayingAvl(RTL_AVL_TABLE *table, P return NULL; } +/****************************************************************************** + * RtlNumberGenericTableElementsAvl (NTDLL.@) + */ +ULONG WINAPI RtlNumberGenericTableElementsAvl(RTL_AVL_TABLE *table) +{ + FIXME("(%p) stub!\n", table); + return 0; +} + /*********************************************************************** * RtlInsertElementGenericTableAvl (NTDLL.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a546c5811a6..48e1def449c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1214,7 +1214,7 @@ @ stdcall RtlNtStatusToDosError(long) @ stdcall RtlNtStatusToDosErrorNoTeb(long) @ stdcall RtlNumberGenericTableElements(ptr) -@ stub RtlNumberGenericTableElementsAvl +@ stdcall RtlNumberGenericTableElementsAvl(ptr) @ stdcall RtlNumberOfClearBits(ptr) @ stdcall RtlNumberOfSetBits(ptr) @ stub RtlOemStringToCountedUnicodeString diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 426ba4fa31b..e9ca903715d 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -285,6 +285,7 @@ void * WINAPI RtlLookupElementGenericTable(PRTL_GENERIC_TABLE,void *); void * WINAPI RtlLookupElementGenericTableAvl(PRTL_AVL_TABLE,void *); void WINAPI RtlMapGenericMask(ACCESS_MASK*,const GENERIC_MAPPING*); ULONG WINAPI RtlNumberGenericTableElements(PRTL_GENERIC_TABLE); +ULONG WINAPI RtlNumberGenericTableElementsAvl(PRTL_AVL_TABLE); BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); NTSTATUS WINAPI RtlUpcaseUnicodeString(UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); char WINAPI RtlUpperChar(char);

1 0

Fabian Maurer : wow64: In wow64_NtSetInformationToken forward TokenIntegrityLevel.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 6c5d17af07a318d754c0c21023b2d162a0d3725d URL: https://gitlab.winehq.org/wine/wine/-/commit/6c5d17af07a318d754c0c21023b2d1… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat May 25 06:26:23 2024 +0200 wow64: In wow64_NtSetInformationToken forward TokenIntegrityLevel. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56725 --- dlls/wow64/security.c | 12 ++++++++++++ dlls/wow64/struct32.h | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/dlls/wow64/security.c b/dlls/wow64/security.c index 1a3d98fccee..645e5602872 100644 --- a/dlls/wow64/security.c +++ b/dlls/wow64/security.c @@ -521,6 +521,18 @@ NTSTATUS WINAPI wow64_NtSetInformationToken( UINT *args ) switch (class) { + case TokenIntegrityLevel: /* TOKEN_MANDATORY_LABEL */ + if (len >= sizeof(TOKEN_MANDATORY_LABEL32)) + { + TOKEN_MANDATORY_LABEL32 *label32 = ptr; + TOKEN_MANDATORY_LABEL label; + + label.Label.Sid = ULongToPtr( label32->Label.Sid ); + label.Label.Attributes = label32->Label.Attributes; + return NtSetInformationToken( handle, class, &label, sizeof(label) ); + } + else return STATUS_INFO_LENGTH_MISMATCH; + case TokenSessionId: /* ULONG */ return NtSetInformationToken( handle, class, ptr, len ); diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 87e219045f4..b196bdd53ca 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -367,6 +367,11 @@ typedef struct DWORD Attributes; } SID_AND_ATTRIBUTES32; +typedef struct +{ + SID_AND_ATTRIBUTES32 Label; +} TOKEN_MANDATORY_LABEL32; + typedef struct { ULONG DefaultDacl;

1 0

Eric Pouech : cmd: Introduce token-based syntax parser for building command nodes.
by Alexandre Julliard 21 Jun '24

21 Jun '24

1 0

Eric Pouech : cmd: Use kernel32's error codes instead of literals.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 844d6b553a72ed2ad658afd4b315f084dca525c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/844d6b553a72ed2ad658afd4b315f0… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 18 10:19:21 2024 +0200 cmd: Use kernel32's error codes instead of literals. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 70 ++++++++++++++++++++++++------------------------ programs/cmd/directory.c | 18 ++++++------- programs/cmd/wcmd.h | 8 ++++++ programs/cmd/wcmdmain.c | 12 ++++----- 5 files changed, 59 insertions(+), 51 deletions(-)

1 0

Eric Pouech : cmd: Introduce return code to indicate abort of current instruction.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 411cce36b1fe7e12dcb5901562aa3782c541ef9a URL: https://gitlab.winehq.org/wine/wine/-/commit/411cce36b1fe7e12dcb5901562aa37… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed May 1 09:51:04 2024 +0200 cmd: Introduce return code to indicate abort of current instruction. Use that return code for WCMD_exit() and WCMD_goto(). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 28 +++++++++++++--------------- programs/cmd/wcmd.h | 6 ++++-- programs/cmd/wcmdmain.c | 7 +++++-- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 15e8baa21c8..402a6f649d2 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -77,7 +77,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HA /* If processing a call :label, 'goto' the label in question */ if (startLabel) { lstrcpyW(param1, startLabel); - WCMD_goto(NULL); + WCMD_goto(); } /* diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 9033330e6d1..1c39c35ca78 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1926,7 +1926,7 @@ void WCMD_give_help (const WCHAR *args) } /**************************************************************************** - * WCMD_go_to + * WCMD_goto * * Batch file jump instruction. Not the most efficient algorithm ;-) * Prints error message if the specified label cannot be found - the file pointer is @@ -1934,27 +1934,24 @@ void WCMD_give_help (const WCHAR *args) * FIXME: DOS is supposed to allow labels with spaces - we don't. */ -void WCMD_goto (CMD_NODE **cmdList) { - +RETURN_CODE WCMD_goto(void) +{ WCHAR string[MAX_PATH]; WCHAR *labelend = NULL; const WCHAR labelEndsW[] = L"><|& :\t"; - /* Do not process any more parts of a processed multipart or multilines command */ - if (cmdList) *cmdList = NULL; - if (context != NULL) { WCHAR *paramStart = param1, *str; if (param1[0] == 0x00) { WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); - return; + return ERROR_INVALID_FUNCTION; } /* Handle special :EOF label */ if (lstrcmpiW(L":eof", param1) == 0) { context -> skip_rest = TRUE; - return; + return RETURN_CODE_ABORTED; } /* Support goto :label as well as goto label plus remove trailing chars */ @@ -2000,7 +1997,7 @@ void WCMD_goto (CMD_NODE **cmdList) { if (labelend) *labelend = 0x00; WINE_TRACE("comparing found label %s\n", wine_dbgstr_w(str)); - if (lstrcmpiW (str, paramStart) == 0) return; + if (lstrcmpiW (str, paramStart) == 0) return RETURN_CODE_ABORTED; } /* See if we have gone beyond the end point if second time through */ @@ -2021,7 +2018,7 @@ void WCMD_goto (CMD_NODE **cmdList) { WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOTARGET)); context -> skip_rest = TRUE; } - return; + return ERROR_INVALID_FUNCTION; } /***************************************************************************** @@ -3966,16 +3963,17 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) * */ -void WCMD_exit (CMD_NODE **cmdList) { +RETURN_CODE WCMD_exit(void) +{ int rc = wcstol(param1, NULL, 10); /* Note: wcstol of empty parameter is 0 */ - if (context && lstrcmpiW(quals, L"/B") == 0) { + if (context && lstrcmpiW(quals, L"/B") == 0) + { errorlevel = rc; context -> skip_rest = TRUE; - *cmdList = NULL; - } else { - ExitProcess(rc); + return RETURN_CODE_ABORTED; } + ExitProcess(rc); } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d11fcd3768f..537e078c412 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -176,10 +176,12 @@ struct _DIRECTORY_STACK *WCMD_dir_stack_free(struct _DIRECTORY_STACK *dir); /* The return code: * - some of them are directly mapped to kernel32's errors * - some others are cmd.exe specific + * - ABORTED if used to break out of FOR/IF blocks (to handle GOTO, EXIT commands) */ typedef int RETURN_CODE; #define RETURN_CODE_SYNTAX_ERROR 255 #define RETURN_CODE_CANT_LAUNCH 9009 +#define RETURN_CODE_ABORTED (-999999) void WCMD_assoc (const WCHAR *, BOOL); void WCMD_batch (WCHAR *, WCHAR *, BOOL, WCHAR *, HANDLE); @@ -195,11 +197,11 @@ void WCMD_directory (WCHAR *); void WCMD_echo (const WCHAR *); void WCMD_endlocal (void); void WCMD_enter_paged_mode(const WCHAR *); -void WCMD_exit (CMD_NODE **cmdList); +RETURN_CODE WCMD_exit(void); void WCMD_for (WCHAR *, CMD_NODE **cmdList); BOOL WCMD_get_fullpath(const WCHAR *, SIZE_T, WCHAR *, WCHAR **); void WCMD_give_help (const WCHAR *args); -void WCMD_goto (CMD_NODE **cmdList); +RETURN_CODE WCMD_goto(void); void WCMD_if (WCHAR *, CMD_NODE **cmdList); void WCMD_leave_paged_mode(void); void WCMD_more (WCHAR *); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b3202edd0d4..d2edb22c9c4 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1695,6 +1695,7 @@ static BOOL set_std_redirections(CMD_REDIRECTION *redir, WCHAR *in_pipe) */ static void execute_single_command(const WCHAR *command, CMD_NODE **cmdList, BOOL retrycall) { + RETURN_CODE return_code = NO_ERROR; WCHAR *cmd, *parms_start; int status, cmd_index, count; WCHAR *whichcmd; @@ -1797,7 +1798,7 @@ static void execute_single_command(const WCHAR *command, CMD_NODE **cmdList, BOO WCMD_echo(&whichcmd[count]); break; case WCMD_GOTO: - WCMD_goto (cmdList); + return_code = WCMD_goto(); break; case WCMD_HELP: WCMD_give_help (parms_start); @@ -1891,7 +1892,7 @@ static void execute_single_command(const WCHAR *command, CMD_NODE **cmdList, BOO WCMD_mklink(parms_start); break; case WCMD_EXIT: - WCMD_exit (cmdList); + return_code = WCMD_exit(); break; case WCMD_FOR: case WCMD_IF: @@ -1911,6 +1912,8 @@ static void execute_single_command(const WCHAR *command, CMD_NODE **cmdList, BOO } cleanup: free(cmd); + if (return_code == RETURN_CODE_ABORTED && cmdList) + *cmdList = NULL; } /*****************************************************************************

1 0

Eric Pouech : cmd/tests: Add tests for delayed substitution in IF command.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 01d0027739f3d2a0295ef7b2e1f01855f94d7284 URL: https://gitlab.winehq.org/wine/wine/-/commit/01d0027739f3d2a0295ef7b2e1f018… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 21 10:15:07 2024 +0200 cmd/tests: Add tests for delayed substitution in IF command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index c9951a66373..d5397560bc6 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -802,6 +802,12 @@ if %WINE_FOO% == foo ( set WINE_FOO=bar if !WINE_FOO! == bar (echo bar) else echo foo ) +set WINE_FOO=32 +if %WINE_FOO% == 32 ( + set WINE_FOO=33 + call :setError 33 + if errorlevel !WINE_FOO! (echo gotitright) else echo gotitwrong +) echo %ErrorLevel% setlocal DisableDelayedExpansion echo %ErrorLevel% diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1564e6c4611..0102c3bcbc5 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -629,8 +629,9 @@ foo foo(a)or_broken@!WINE_FOO! foo bar(a)or_broken@foo -0 -0(a)or_broken@1 +gotitright +33 +(a)todo_wine@0(a)or_broken@1 foo !WINE_FOO! @todo_wine(a)not empty

1 0

Eric Pouech : cmd: Expand delayed variables in IF operands.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: bd36ac98c0d51ab6b78692aa79963e9c10c64b4d URL: https://gitlab.winehq.org/wine/wine/-/commit/bd36ac98c0d51ab6b78692aa79963e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 6 09:11:39 2024 +0200 cmd: Expand delayed variables in IF operands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmd.h | 4 +--- programs/cmd/wcmdmain.c | 60 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 537e078c412..e2ee0fc02ac 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -70,9 +70,7 @@ typedef struct _CMD_IF_CONDITION op; union { - /* CMD_IF_ERRORLEVEL */ - int level; - /* CMD_IF_EXIST, CMD_IF_DEFINED */ + /* CMD_IF_ERRORLEVEL, CMD_IF_EXIST, CMD_IF_DEFINED */ const WCHAR *operand; /* CMD_BINOP_EQUAL, CMD_BINOP_LSS, CMD_BINOP_LEQ, CMD_BINOP_EQU, CMD_BINOP_NEQ, CMD_BINOP_GEQ, CMD_BINOP_GTR */ struct diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d2edb22c9c4..ce083e710f7 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1143,7 +1143,6 @@ void if_condition_dispose(CMD_IF_CONDITION *cond) switch (cond->op) { case CMD_IF_ERRORLEVEL: - break; case CMD_IF_EXIST: case CMD_IF_DEFINED: free((void*)cond->operand); @@ -1182,13 +1181,9 @@ BOOL if_condition_create(WCHAR *start, WCHAR **end, CMD_IF_CONDITION *cond) } if (!wcsicmp(param_copy, L"errorlevel")) { - WCHAR *endptr; - int level; param_copy = WCMD_parameter(start, narg++, &param_start, TRUE, FALSE); if (cond) cond->op = CMD_IF_ERRORLEVEL; - level = wcstol(param_copy, &endptr, 10); - if (*endptr) return FALSE; - if (cond) cond->level = level; + if (cond) cond->operand = wcsdup(param_copy); } else if (!wcsicmp(param_copy, L"exist")) { @@ -1266,7 +1261,7 @@ const char *debugstr_if_condition(const CMD_IF_CONDITION *cond) switch (cond->op) { - case CMD_IF_ERRORLEVEL: return wine_dbg_sprintf("%serrorlevel %d}}", header, cond->level); + case CMD_IF_ERRORLEVEL: return wine_dbg_sprintf("%serrorlevel %ls}}", header, cond->operand); case CMD_IF_EXIST: return wine_dbg_sprintf("%sexist %ls}}", header, cond->operand); case CMD_IF_DEFINED: return wine_dbg_sprintf("%sdefined %ls}}", header, cond->operand); case CMD_IF_BINOP_EQUAL: return wine_dbg_sprintf("%s%ls == %ls}}", header, cond->left, cond->right); @@ -3107,6 +3102,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_NODE **output, HANDLE BOOL if_condition_evaluate(CMD_IF_CONDITION *cond, int *test) { + WCHAR expanded_left[MAXSTRING]; + WCHAR expanded_right[MAXSTRING]; int (WINAPI *cmp)(const WCHAR*, const WCHAR*) = cond->case_insensitive ? lstrcmpiW : lstrcmpW; TRACE("About to evaluate condition %s\n", debugstr_if_condition(cond)); @@ -3114,35 +3111,51 @@ BOOL if_condition_evaluate(CMD_IF_CONDITION *cond, int *test) switch (cond->op) { case CMD_IF_ERRORLEVEL: - *test = errorlevel >= cond->level; + { + WCHAR *endptr; + int level; + + wcscpy(expanded_left, cond->operand); + handleExpansion(expanded_left, context != NULL, delayedsubst); + level = wcstol(expanded_left, &endptr, 10); + if (*endptr) return FALSE; + *test = errorlevel >= level; + } break; case CMD_IF_EXIST: { + size_t len; WIN32_FIND_DATAW fd; HANDLE hff; - size_t len = wcslen(cond->operand); - if (len) + wcscpy(expanded_left, cond->operand); + handleExpansion(expanded_left, context != NULL, delayedsubst); + if ((len = wcslen(expanded_left))) { /* FindFirstFile does not like a directory path ending in '\' or '/', so append a '.' */ - if (cond->operand[len - 1] == '\\' || cond->operand[len - 1] == '/') + if ((expanded_left[len - 1] == '\\' || expanded_left[len - 1] == '/') && len < MAXSTRING - 1) { - WCHAR *new = xrealloc((void*)cond->operand, (wcslen(cond->operand) + 2) * sizeof(WCHAR)); - wcscat(new, L"."); - cond->operand = new; + wcscat(expanded_left, L"."); } - hff = FindFirstFileW(cond->operand, &fd); + hff = FindFirstFileW(expanded_left, &fd); *test = (hff != INVALID_HANDLE_VALUE); if (*test) FindClose(hff); } } break; case CMD_IF_DEFINED: - *test = GetEnvironmentVariableW(cond->operand, NULL, 0) > 0; + wcscpy(expanded_left, cond->operand); + handleExpansion(expanded_left, context != NULL, delayedsubst); + *test = GetEnvironmentVariableW(expanded_left, NULL, 0) > 0; break; case CMD_IF_BINOP_EQUAL: + wcscpy(expanded_left, cond->left); + handleExpansion(expanded_left, context != NULL, delayedsubst); + wcscpy(expanded_right, cond->right); + handleExpansion(expanded_right, context != NULL, delayedsubst); + /* == is a special case, as it always compares strings */ - *test = (*cmp)(cond->left, cond->right) == 0; + *test = (*cmp)(expanded_left, expanded_right) == 0; break; default: { @@ -3150,13 +3163,18 @@ BOOL if_condition_evaluate(CMD_IF_CONDITION *cond, int *test) WCHAR *end_left, *end_right; int cmp_val; + wcscpy(expanded_left, cond->left); + handleExpansion(expanded_left, context != NULL, delayedsubst); + wcscpy(expanded_right, cond->right); + handleExpansion(expanded_right, context != NULL, delayedsubst); + /* Check if we have plain integers (in decimal, octal or hexadecimal notation) */ - left_int = wcstol(cond->left, &end_left, 0); - right_int = wcstol(cond->right, &end_right, 0); - if (end_left > cond->left && !*end_left && end_right > cond->right && !*end_right) + left_int = wcstol(expanded_left, &end_left, 0); + right_int = wcstol(expanded_right, &end_right, 0); + if (end_left > expanded_left && !*end_left && end_right > expanded_right && !*end_right) cmp_val = left_int - right_int; else - cmp_val = (*cmp)(cond->left, cond->right); + cmp_val = (*cmp)(expanded_left, expanded_right); switch (cond->op) { case CMD_IF_BINOP_LSS: *test = cmp_val < 0; break;

1 0

Alistair Leslie-Hughes : odbccp32: Look at the Setup key to find the driver of ODBC config functions.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 6dca99a71347731f449d39fb0a46b0331e4206f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/6dca99a71347731f449d39fb0a46b0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 17 17:55:14 2024 +1000 odbccp32: Look at the Setup key to find the driver of ODBC config functions. We need to look at the Setup key for the driver, as it can be different compare to the actually driver. For example, mysql uses the same Setup file to configure both the Ascii/Unicode vession but has a different file for the actual ODBC functions. --- dlls/odbccp32/odbccp32.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 95bfb90781e..d8d57e6bd40 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -223,7 +223,6 @@ static BOOL SQLInstall_narrow(int mode, LPSTR buffer, LPCWSTR str, WORD str_leng static HMODULE load_config_driver(const WCHAR *driver) { - static WCHAR reg_driver[] = {'d','r','i','v','e','r',0}; long ret; HMODULE hmod; WCHAR *filename = NULL; @@ -236,7 +235,7 @@ static HMODULE load_config_driver(const WCHAR *driver) if ((ret = RegOpenKeyW(hkey, driver, &hkeydriver)) == ERROR_SUCCESS) { - ret = RegGetValueW(hkeydriver, NULL, reg_driver, RRF_RT_REG_SZ, &type, NULL, &size); + ret = RegGetValueW(hkeydriver, NULL, L"Setup", RRF_RT_REG_SZ, &type, NULL, &size); if(ret != ERROR_SUCCESS || type != REG_SZ) { RegCloseKey(hkeydriver); @@ -255,7 +254,7 @@ static HMODULE load_config_driver(const WCHAR *driver) return NULL; } - ret = RegGetValueW(hkeydriver, NULL, reg_driver, RRF_RT_REG_SZ, &type, filename, &size); + ret = RegGetValueW(hkeydriver, NULL, L"Setup", RRF_RT_REG_SZ, &type, filename, &size); RegCloseKey(hkeydriver); }

1 0

Alistair Leslie-Hughes : odbccp32: SQLConfigDataSource/W fix crash with passed NULL attribute parameter.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 4aab3e42c1c2639f66b76bb43fea01f54e61a5c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/4aab3e42c1c2639f66b76bb43fea01… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 17 17:55:14 2024 +1000 odbccp32: SQLConfigDataSource/W fix crash with passed NULL attribute parameter. --- dlls/odbccp32/odbccp32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index d8d57e6bd40..46468765b86 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -372,7 +372,7 @@ BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWST WORD mapped_request; TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_w(driver), debugstr_w(attributes)); - if (TRACE_ON(odbc)) + if (TRACE_ON(odbc) && attributes) { const WCHAR *p; for (p = attributes; *p; p += lstrlenW(p) + 1) @@ -417,7 +417,7 @@ BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR a TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_a(driver), debugstr_a(attributes)); - if (TRACE_ON(odbc)) + if (TRACE_ON(odbc) && attributes) { const char *p; for (p = attributes; *p; p += lstrlenA(p) + 1)

1 0