[PATCH v3 0/1] MR1444: kernel32: Unstub MoveFileTransactedW, Use MoveFileWithProgressW
Call MoveFileWithProgress from MoveFileTransacted such that the stub functions. This enables saving for Affinity Photo. -- v3: kernel32: Unstub MoveFileTransactedW, Use MoveFileWithProgressW https://gitlab.winehq.org/wine/wine/-/merge_requests/1444
From: James McDonnell <topgamer7(a)gmail.com> --- dlls/kernel32/path.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 2dd3eac3c26..998c08a7358 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -143,9 +143,14 @@ BOOL WINAPI CopyFileExA(LPCSTR sourceFilename, LPCSTR destFilename, */ BOOL WINAPI MoveFileTransactedA(const char *source, const char *dest, LPPROGRESS_ROUTINE progress, void *data, DWORD flags, HANDLE handle) { - FIXME("(%s, %s, %p, %p, %ld, %p)\n", debugstr_a(source), debugstr_a(dest), progress, data, flags, handle); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + BOOL ret; + + TRACE("(%s, %s, %p, %p, %ld, %p)\n", debugstr_a(source), debugstr_a(dest), progress, data, flags, handle); + if (handle) { + FIXME("Transaction handle not supported."); + } + + return MoveFileWithProgressA(source, dest, progress, data, flags); } /************************************************************************** @@ -153,9 +158,14 @@ BOOL WINAPI MoveFileTransactedA(const char *source, const char *dest, LPPROGRESS */ BOOL WINAPI MoveFileTransactedW(const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUTINE progress, void *data, DWORD flags, HANDLE handle) { - FIXME("(%s, %s, %p, %p, %ld, %p)\n", debugstr_w(source), debugstr_w(dest), progress, data, flags, handle); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + BOOL ret; + + TRACE("(%s, %s, %p, %p, %ld, %p)\n", debugstr_w(source), debugstr_w(dest), progress, data, flags, handle); + if (handle) { + FIXME("Transaction handle not supported."); + } + + return MoveFileWithProgressW(source, dest, progress, data, flags); } /************************************************************************** -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1444
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=126512 Your paranoid android. === debian11 (32 bit report) === d3d8: stateblock: Timeout visual: Timeout d3d9: d3d9ex: Timeout device: Timeout stateblock: Timeout visual: Timeout d3dcompiler_43: asm: Timeout blob: Timeout hlsl_d3d11: Timeout hlsl_d3d9: Timeout reflection: Timeout d3dcompiler_46: asm: Timeout blob: Timeout hlsl_d3d11: Timeout hlsl_d3d9: Timeout reflection: Timeout d3dcompiler_47: asm: Timeout blob: Timeout hlsl_d3d11: Timeout hlsl_d3d9: Timeout reflection: Timeout d3drm: d3drm: Timeout vector: Timeout Report validation errors: d3dx10: Timeout === debian11 (build log) === WineRunWineTest.pl:error: The task timed out
On Sun Nov 20 23:06:04 2022 +0000, James McDonnell wrote:
changed this line in [version 3 of the diff](/wine/wine/-/merge_requests/1444/diffs?diff_id=19850&start_sha=7cec195ffa86526d1e1b2b34f31cefd4770a851a#c62331529cd80bb102f1e0f60ba3883114756f66_151_153) @etaash.mathamsetty I've updated the PR and removed the fixme, is this suitable?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1444#note_20504
On Sun Jan 8 03:19:17 2023 +0000, James McDonnell wrote:
@etaash.mathamsetty I've updated the PR and removed the fixme, is this suitable? it seems fine
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1444#note_20525
participants (4)
-
Etaash Mathamsetty (@etaash.mathamsetty) -
James McDonnell -
James McDonnell (@ElementalWarrior) -
Marvin