wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Fabian Maurer : ntdll/actctx: Don' t stop looking for manifest if dll without manifest is found.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 56b3304a019486b52681a05d4b5454b475275e51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56b3304a019486b52681a05d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Aug 25 19:48:37 2018 +0200 ntdll/actctx: Don't stop looking for manifest if dll without manifest is found. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/Makefile.in | 7 ++++--- dlls/kernel32/tests/actctx.c | 36 +++++++++++++++++++++++++++++++++++- dlls/kernel32/tests/dummy.c | 1 + dlls/kernel32/tests/dummy.spec | 1 + dlls/ntdll/actctx.c | 3 ++- 5 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index 2f2ac5f8..e06141d 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = kernel32.dll IMPORTS = user32 advapi32 -C_SRCS = \ +SOURCES = \ actctx.c \ atom.c \ change.c \ @@ -11,6 +11,8 @@ C_SRCS = \ debugger.c \ directory.c \ drive.c \ + dummy.c \ + dummy.spec \ environ.c \ fiber.c \ file.c \ @@ -26,6 +28,7 @@ C_SRCS = \ process.c \ profile.c \ resource.c \ + resource.rc \ sync.c \ thread.c \ time.c \ @@ -34,5 +37,3 @@ C_SRCS = \ version.c \ virtual.c \ volume.c - -RC_SRCS = resource.rc diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 96d9b8c..6891fbe 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2598,9 +2598,27 @@ static void delete_manifest_file(const char *filename) DeleteFileA(path); } +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + static void test_CreateActCtx(void) { - CHAR path[MAX_PATH], dir[MAX_PATH]; + CHAR path[MAX_PATH], dir[MAX_PATH], dll[MAX_PATH]; ACTCTXA actctx; HANDLE handle; @@ -2637,6 +2655,22 @@ todo_wine { } if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx(handle); + /* with specified directory, that does contain dependent assembly */ + GetTempPathA(ARRAY_SIZE(dir), dir); + actctx.lpAssemblyDirectory = dir; + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); + pReleaseActCtx(handle); + + /* Should still work if we add a dll with the same name, but without manifest */ + strcpy(dll, dir); + strcat(dll, "testdep1.dll"); + extract_resource("dummy.dll", "TESTDLL", dll); + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE || broken(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) , "got error %d\n", GetLastError()); + pReleaseActCtx(handle); + DeleteFileA(dll); + delete_manifest_file("main_wndcls.manifest"); delete_manifest_file("testdep1.manifest"); delete_manifest_file("testdep2.manifest"); diff --git a/dlls/kernel32/tests/dummy.c b/dlls/kernel32/tests/dummy.c new file mode 100644 index 0000000..3053583 --- /dev/null +++ b/dlls/kernel32/tests/dummy.c @@ -0,0 +1 @@ +/* nothing here */ diff --git a/dlls/kernel32/tests/dummy.spec b/dlls/kernel32/tests/dummy.spec new file mode 100644 index 0000000..b2a4ba5 --- /dev/null +++ b/dlls/kernel32/tests/dummy.spec @@ -0,0 +1 @@ +# nothing here diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 53a8b06..08b6c50 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3294,7 +3294,8 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 ); NtClose( file ); - break; + if (status == STATUS_SUCCESS) + break; } RtlFreeUnicodeString( &nameW ); }

1 0

Michael Stefaniuc : vcomp: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: ce2be144ea3ef28d4e806d71201b4ef6beb95538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce2be144ea3ef28d4e806d71… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Aug 8 22:20:06 2018 +0200 vcomp: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index ab51ef2..3a9fd22 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -523,7 +523,7 @@ void CDECL _vcomp_reduction_i1(unsigned int flags, char *dest, char val) _vcomp_atomic_bool_or_i1, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -617,7 +617,7 @@ void CDECL _vcomp_reduction_i2(unsigned int flags, short *dest, short val) _vcomp_atomic_bool_or_i2, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -711,7 +711,7 @@ void CDECL _vcomp_reduction_i4(unsigned int flags, int *dest, int val) _vcomp_atomic_bool_or_i4, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -807,7 +807,7 @@ void CDECL _vcomp_reduction_i8(unsigned int flags, LONG64 *dest, LONG64 val) _vcomp_atomic_bool_or_i8, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -891,7 +891,7 @@ void CDECL _vcomp_reduction_r4(unsigned int flags, float *dest, float val) _vcomp_atomic_bool_or_r4, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -975,7 +975,7 @@ void CDECL _vcomp_reduction_r8(unsigned int flags, double *dest, double val) _vcomp_atomic_bool_or_r8, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); }

1 0

Jason Edmeades : cmd: Correct handling of %~0 for batch call.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 987fee3791d24a63aacc0b49f59275b62c943815 URL: https://source.winehq.org/git/wine.git/?a=commit;h=987fee3791d24a63aacc0b49… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Aug 27 20:41:53 2018 +0100 cmd: Correct handling of %~0 for batch call. When a batch label is called, %0 and %~0 should be the label being called, and if you start adding modifiers to it (eg %~d0) then you get details of the batch program containing the label. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44369 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/batch.c | 23 +++++++++++++---------- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 1ed5197..5b05d88 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -460,10 +460,19 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) } if (lastModifier == firstModifier) return; /* Invalid syntax */ - /* Extract the parameter to play with */ - if (*lastModifier == '0') { + /* So now, firstModifier points to beginning of modifiers, lastModifier + points to the variable just after the modifiers. Process modifiers + in a specific order, remembering there could be duplicates */ + modifierLen = lastModifier - firstModifier; + finaloutput[0] = 0x00; + + /* Extract the parameter to play with + Special case param 0 - With %~0 you get the batch label which was called + whereas if you start applying other modifiers to it, you get the filename + the batch label is in */ + if (*lastModifier == '0' && modifierLen > 1) { strcpyW(outputparam, context->batchfileW); - } else if ((*lastModifier >= '1' && *lastModifier <= '9')) { + } else if ((*lastModifier >= '0' && *lastModifier <= '9')) { strcpyW(outputparam, WCMD_parameter (context -> command, *lastModifier-'0' + context -> shift_count[*lastModifier-'0'], @@ -473,12 +482,6 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) strcpyW(outputparam, forloopcontext.variable[foridx]); } - /* So now, firstModifier points to beginning of modifiers, lastModifier - points to the variable just after the modifiers. Process modifiers - in a specific order, remembering there could be duplicates */ - modifierLen = lastModifier - firstModifier; - finaloutput[0] = 0x00; - /* 1. Handle '~' : Strip surrounding quotes */ if (outputparam[0]=='"' && memchrW(firstModifier, '~', modifierLen) != NULL) { @@ -728,7 +731,7 @@ void WCMD_call (WCHAR *command) { li.QuadPart = 0; li.u.LowPart = SetFilePointer(context -> h, li.u.LowPart, &li.u.HighPart, FILE_CURRENT); - WCMD_batch (param1, command, TRUE, gotoLabel, context->h); + WCMD_batch (context->batchfileW, command, TRUE, gotoLabel, context->h); SetFilePointer(context -> h, li.u.LowPart, &li.u.HighPart, FILE_BEGIN); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index b36afa4..de9c889 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -687,6 +687,15 @@ echo '%~xs1' goto :eof :endEchoFuns +echo ------------ Testing parameter zero ------------ +call :func parm1 parm2 +goto :endParm0 +:func +echo %~0 %~1 +echo [%0] [%~d0] [%~p0] [%~n0] [%~x0] [%~s0] +goto :EOF +:endParm0 + echo ------------ Testing variable delayed expansion ------------ rem NT4 doesn't support this echo --- default mode (load-time expansion) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 764e454..3829318 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -578,6 +578,9 @@ N @drive@ '' '.eh'@or_broken@'' +------------ Testing parameter zero ------------ +:func parm1 +[:func] [@drive@] [@path@] [test] [.cmd] [@drive@@shortpath@test.cmd] ------------ Testing variable delayed expansion ------------ --- default mode (load-time expansion) foo

1 0

Jason Edmeades : cmd: Fix 'if exist' with a directory\ as a parameter.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: bc9d68bcbee5c9d4f4582f766a4f552870385361 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc9d68bcbee5c9d4f4582f76… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Aug 27 20:41:52 2018 +0100 cmd: Fix 'if exist' with a directory\ as a parameter. 'if exists' takes a parameter which can be directory, directory\ or directory\. for example, and should equate to true if the directory exists. The syntax directory\ is explicitly rejected by FindFirstFile and hence was not working - look for this specific case, and if found append a '.'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45506 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 9 ++++++++- programs/cmd/tests/test_builtins.cmd | 20 ++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index cb4a7b9..25d5be1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2861,7 +2861,14 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) } else if (!lstrcmpiW (condition, existW)) { WIN32_FIND_DATAW fd; - HANDLE hff = FindFirstFileW(WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE), &fd); + HANDLE hff; + WCHAR *param = WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE); + int len = strlenW(param); + + /* FindFirstFile does not like a directory path ending in '\', append a '.' */ + if (len && param[len-1] == '\\') strcatW(param, dotW); + + hff = FindFirstFileW(param, &fd); test = (hff != INVALID_HANDLE_VALUE ); if (test) FindClose(hff); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 0e88ad1..b36afa4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1046,6 +1046,26 @@ if exist idontexist\ba* ( ) else ( echo exist wildcard bad subdir broken works ) +if exist subdir ( + echo exist subdir ok +) else ( + echo ERROR exist subdir not working +) +if exist subdir\. ( + echo exist subdir with . ok +) else ( + echo ERROR exist subdir with . not working +) +if exist subdir\ ( + echo exist subdir with \ ok +) else ( + echo ERROR exist subdir with \ not working +) +if exist "subdir\" ( + echo exist subdir with \ and quotes ok +) else ( + echo ERROR exist subdir with \ and quotes not working +) del foo subdir\bar rd subdir diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1f2b5dd..764e454 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -783,6 +783,10 @@ exist simple wildcard works exist wildcard works negate exist wildcard works exist wildcard bad subdir broken works +exist subdir ok +exist subdir with . ok +exist subdir with \ ok +exist subdir with \ and quotes ok ------ for numbers negative numbers handled negative numbers handled

1 0

Jason Edmeades : cmd: for /f fails to launch quoted program plus args.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 8b6ba774c0ef5f25e1dfd314d870b16f60dce2b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b6ba774c0ef5f25e1dfd314… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Aug 27 20:41:51 2018 +0100 cmd: for /f fails to launch quoted program plus args. for /f can run a program and parse its output. The program name can supply args and be quoted or not. If quoted, wine fails to run the program because internally we were adding an extra pair of quotes. These are not needed and can be removed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39906 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd | 4 +++- programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5026f9c..cb4a7b9 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2073,7 +2073,7 @@ static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd static const WCHAR redirOutW[] = {'>','%','s','\0'}; static const WCHAR cmdW[] = {'C','M','D','\0'}; static const WCHAR cmdslashcW[] = {'C','M','D','.','E','X','E',' ', - '/','C',' ','"','%','s','"','\0'}; + '/','C',' ','%','s','\0'}; /* Remove leading and trailing character */ if ((iscmd && (itemstr[0] == '`' && usebackq)) || diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 0738f2d..0e88ad1 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1724,9 +1724,11 @@ if "%CD%"=="" goto :SkipFORFcmdNT4 for /f %%i in ('echo.Passed1') do echo %%i for /f "usebackq" %%i in (`echo.Passed2`) do echo %%i for /f usebackq %%i in (`echo.Passed3`) do echo %%i +for /f "usebackq" %%i in (`"c:\windows\system32\cmd.exe" /C echo Passed4`) do echo %%i +for /f "usebackq" %%i in (`""c:\windows\system32\cmd.exe" /C echo Passed5"`) do echo %%i goto :ContinueFORF :SkipFORFcmdNT4 -for /l %%i in (1,1,3) do echo Missing functionality - Broken%%i +for /l %%i in (1,1,5) do echo Missing functionality - Broken%%i :ContinueFORF rem FIXME: Rest not testable right now in wine: not implemented and would need rem preliminary grep-like program implementation (e.g. like findstr or fc) even diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7ec83d7..1f2b5dd 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1209,6 +1209,8 @@ c Passed1@or_broken@Missing functionality - Broken1 Passed2@or_broken@Missing functionality - Broken2 Passed3@or_broken@Missing functionality - Broken3 +Passed4@or_broken@Missing functionality - Broken4 +Passed5@or_broken@Missing functionality - Broken5 ------ eol option and@or_broken@Broken NT4 functionality1 Line@or_broken@Broken NT4 functionality2

1 0

Jason Edmeades : cmd: Handle single line 'if' as nested if or with redirects.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 58d21b3319f719b4d0b6972a801b5f81993d5c10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58d21b3319f719b4d0b6972a… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Aug 27 20:41:50 2018 +0100 cmd: Handle single line 'if' as nested if or with redirects. A single line if statement causes problems when it has redirects and/or continuation type operators (|, &&, || etc) because it is expected that if there is more than one command in the 'if', then it will use brackets. This patch changes the 'if' parsing to emulate brackets at a continuation character. In addition, 'for' and 'if' statements do not have their output redirected immediately, instead it is redirected on the individual commands being executed not the statement itself. We were opening the redirect once for the 'if' and once for the processing of the statement inside the if. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 16 +- programs/cmd/tests/test_builtins.cmd | 9 + programs/cmd/tests/test_builtins.cmd.exp | 7 +- programs/cmd/wcmdmain.c | 309 +++++++++++++++++-------------- 4 files changed, 200 insertions(+), 141 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58d21b3319f719b4d0b6…

1 0

Jason Edmeades : cmd: Fix shortpath handling in for loops.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 5c444c4e0dd51e824468d78215f795d67632ea49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c444c4e0dd51e824468d782… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Aug 27 20:41:49 2018 +0100 cmd: Fix shortpath handling in for loops. When 's' is used as a modifier, the paths that are presented to the other modifiers needs to be a short path. Given the 'filename' part of the path may not exist, we cannot use GetShortPathName directly without first removing the filename part to just leave the directory bit. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/batch.c | 17 +++++++++++++---- programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++------ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 14e2539..1ed5197 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -399,6 +399,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) WCHAR finaloutput[MAX_PATH]; WCHAR fullfilename[MAX_PATH]; WCHAR thisoutput[MAX_PATH]; + WCHAR *filepart = NULL; WCHAR *pos = *start+1; WCHAR *firstModifier = pos; WCHAR *lastModifier = NULL; @@ -522,7 +523,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* After this, we need full information on the file, which is valid not to exist. */ if (!skipFileParsing) { - if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, NULL) == 0) { + if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, &filepart) == 0) { exists = FALSE; fullfilename[0] = 0x00; } else { @@ -598,8 +599,16 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* 4. Handle 's' : Use short paths (File doesn't have to exist) */ if (memchrW(firstModifier, 's', modifierLen) != NULL) { if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); - /* Don't flag as doneModifier - %~s on its own is processed later */ - GetShortPathNameW(outputparam, outputparam, ARRAY_SIZE(outputparam)); + + /* Convert fullfilename's path to a short path - Save filename away as + only path is valid, name may not exist which causes GetShortPathName + to fail if it is provided */ + if (filepart) { + strcpyW(thisoutput, filepart); + *filepart = 0x00; + GetShortPathNameW(fullfilename, fullfilename, ARRAY_SIZE(fullfilename)); + strcatW(fullfilename, thisoutput); + } } /* 5. Handle 'f' : Fully qualified path (File doesn't have to exist) */ @@ -673,7 +682,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) memchrW(firstModifier, 's', modifierLen) != NULL) { doneModifier = TRUE; if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); - strcatW(finaloutput, outputparam); + strcatW(finaloutput, fullfilename); } } } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index ea4157c..35e0cf2 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -530,9 +530,9 @@ N '.OOL' '.TABC' '' -@todo_wine@'@drive@@shortpath@R S'@or_broken@'' -@todo_wine@'@drive@@shortpath@T'@or_broken@'' -@todo_wine@'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' +'@drive@@shortpath@R S'@or_broken@'' +'@drive@@shortpath@T'@or_broken@'' +'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' ''@or_broken@'%~ai' ''@or_broken@'%~ai' '--a------'@or_broken@'--a--------'@or_broken@'--a--c---'@or_broken@'%~ai' @@ -566,9 +566,9 @@ N '.OOL' '.TABC' '' -@todo_wine@'@drive@@shortpath@R S'@or_broken@'' -@todo_wine@'@drive@@shortpath@T'@or_broken@'' -@todo_wine@'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' +'@drive@@shortpath@R S'@or_broken@'' +'@drive@@shortpath@T'@or_broken@'' +'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' @drive@@path@ @drive@@path@ @drive@

1 0

Zhiyi Zhang : comctl32/tests: Fix a memory leak.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: ba1eb91a690b55042f967255c57d2e2f6aa1dd53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba1eb91a690b55042f967255… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 29 23:13:45 2018 +0800 comctl32/tests: Fix a memory leak. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index db8d2b0..b27ab84 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -32,8 +32,9 @@ static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); -static HIMAGELIST(WINAPI *pImageList_Create)(int, int, UINT, int, int); -static int(WINAPI *pImageList_Add)(HIMAGELIST, HBITMAP, HBITMAP); +static HIMAGELIST (WINAPI *pImageList_Create)(int, int, UINT, int, int); +static int (WINAPI *pImageList_Add)(HIMAGELIST, HBITMAP, HBITMAP); +static BOOL (WINAPI *pImageList_Destroy)(HIMAGELIST); /****************** button message test *************************/ #define ID_BUTTON 0x000e @@ -82,6 +83,7 @@ static void init_functions(void) #define X(f) p##f = (void *)GetProcAddress(hmod, #f); X(ImageList_Create); X(ImageList_Add); + X(ImageList_Destroy); #undef X } @@ -1352,6 +1354,8 @@ static void test_get_set_imagelist(void) DestroyWindow(hwnd); } + + pImageList_Destroy(himl); } static void test_get_set_textmargin(void)

1 0

Thomas Faller : wine.inf: Set CurrentBuild always to the same value as CurrentBuildNumber.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 6c1118994cc4c2ba8f24325099fdc7f76115fe4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c1118994cc4c2ba8f243250… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Wed Aug 29 00:14:17 2018 +0200 wine.inf: Set CurrentBuild always to the same value as CurrentBuildNumber. Make that the registry entry HKLM\Software\Microsoft\Windows NT\CurrentVersion\CurrentBuild has always the same value as HKLM\Software\Microsoft\Windows NT\CurrentVersion\CurrentBuildNumber Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42870 Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ programs/winecfg/appdefaults.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 79ac6c5..4f241c0 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3424,6 +3424,7 @@ HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Ca [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" @@ -3434,6 +3435,7 @@ HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" [VersionInfo.ntamd64] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index e098c2b..d598fd4 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -431,6 +431,7 @@ static void on_winver_change(HWND dialog) set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL); @@ -445,6 +446,7 @@ static void on_winver_change(HWND dialog) set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", win_versions[selection].szCSDVersion); snprintf(Buffer, sizeof(Buffer), "%d", win_versions[selection].dwBuildNumber); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", Buffer); snprintf(Buffer, sizeof(Buffer), "Microsoft %s", win_versions[selection].szDescription); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", Buffer); @@ -463,6 +465,7 @@ static void on_winver_change(HWND dialog) case VER_PLATFORM_WIN32s: set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL);

1 0

Józef Kucia : dxgi: Rename remaining "This" variables.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: ecac3a217d3a21260f134019b84b71c06482e8e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecac3a217d3a21260f134019… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 29 12:53:39 2018 +0200 dxgi: Rename remaining "This" variables. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 14 +++++++------- dlls/dxgi/surface.c | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 5607c38..67cadd5 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -33,7 +33,7 @@ static inline struct dxgi_device *impl_from_IWineDXGIDevice(IWineDXGIDevice *ifa static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *iface, REFIID riid, void **object) { - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); @@ -49,10 +49,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa return S_OK; } - if (This->child_layer) + if (device->child_layer) { - TRACE("forwarding to child layer %p.\n", This->child_layer); - return IUnknown_QueryInterface(This->child_layer, riid, object); + TRACE("Forwarding to child layer %p.\n", device->child_layer); + return IUnknown_QueryInterface(device->child_layer, riid, object); } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); @@ -63,10 +63,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa static ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IWineDXGIDevice *iface) { - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); + ULONG refcount = InterlockedIncrement(&device->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %u\n", device, refcount); return refcount; } diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index ad72a2c..1f53b25 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -90,23 +90,23 @@ static inline struct dxgi_surface *impl_from_IDXGISurface1(IDXGISurface1 *iface) static HRESULT STDMETHODCALLTYPE dxgi_surface_QueryInterface(IDXGISurface1 *iface, REFIID riid, void **object) { - struct dxgi_surface *This = impl_from_IDXGISurface1(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("Forwarding to outer IUnknown\n"); - return IUnknown_QueryInterface(This->outer_unknown, riid, object); + return IUnknown_QueryInterface(surface->outer_unknown, riid, object); } static ULONG STDMETHODCALLTYPE dxgi_surface_AddRef(IDXGISurface1 *iface) { - struct dxgi_surface *This = impl_from_IDXGISurface1(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("Forwarding to outer IUnknown\n"); - return IUnknown_AddRef(This->outer_unknown); + return IUnknown_AddRef(surface->outer_unknown); } static ULONG STDMETHODCALLTYPE dxgi_surface_Release(IDXGISurface1 *iface) { - struct dxgi_surface *This = impl_from_IDXGISurface1(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("Forwarding to outer IUnknown\n"); - return IUnknown_Release(This->outer_unknown); + return IUnknown_Release(surface->outer_unknown); } /* IDXGIObject methods */ @@ -143,22 +143,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetPrivateData(IDXGISurface1 *ifac static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface1 *iface, REFIID riid, void **parent) { - struct dxgi_surface *This = impl_from_IDXGISurface1(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); - return IDXGIDevice_QueryInterface(This->device, riid, parent); + return IDXGIDevice_QueryInterface(surface->device, riid, parent); } /* IDXGIDeviceSubObject methods */ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface1 *iface, REFIID riid, void **device) { - struct dxgi_surface *This = impl_from_IDXGISurface1(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); - return IDXGIDevice_QueryInterface(This->device, riid, device); + return IDXGIDevice_QueryInterface(surface->device, riid, device); } /* IDXGISurface methods */

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018