diff --git a/reactos/dll/win32/qmgr/file.c b/reactos/dll/win32/qmgr/file.c index da5c9df2487..f4e1b0abb52 100644 --- a/reactos/dll/win32/qmgr/file.c +++ b/reactos/dll/win32/qmgr/file.c @@ -412,7 +412,8 @@ done: WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); - if (!ret) DeleteFileW(tmpfile); + if (!ret && !transitionJobState(job, BG_JOB_STATE_CONNECTING, BG_JOB_STATE_ERROR)) + transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_ERROR); SetEvent(job->done); return ret; @@ -513,17 +514,15 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) uc.nPort = 0; uc.lpszUrlPath = NULL; uc.dwUrlPathLength = ~0u; + uc.lpszExtraInfo = NULL; + uc.dwExtraInfoLength = 0; ret = WinHttpCrackUrl(file->info.RemoteName, 0, 0, &uc); if (!ret) { TRACE("WinHttpCrackUrl failed, trying local file copy\n"); - if (!transfer_file_local(file, tmpName)) return FALSE; - } - else if (!transfer_file_http(file, &uc, tmpName)) - { - WARN("HTTP transfer failed\n"); - return FALSE; + if (!transfer_file_local(file, tmpName)) WARN("local transfer failed\n"); } + else if (!transfer_file_http(file, &uc, tmpName)) WARN("HTTP transfer failed\n"); if (transitionJobState(job, BG_JOB_STATE_CONNECTING, BG_JOB_STATE_QUEUED) || transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_QUEUED)) diff --git a/reactos/dll/win32/qmgr/job.c b/reactos/dll/win32/qmgr/job.c index a9351c76751..c0ddd7d77e5 100644 --- a/reactos/dll/win32/qmgr/job.c +++ b/reactos/dll/win32/qmgr/job.c @@ -364,6 +364,12 @@ static HRESULT WINAPI BackgroundCopyJob_Resume( && This->state != BG_JOB_STATE_TRANSFERRING) { This->state = BG_JOB_STATE_QUEUED; + This->error.context = This->error.code = 0; + if (This->error.file) + { + IBackgroundCopyFile2_Release(This->error.file); + This->error.file = NULL; + } SetEvent(globalMgr.jobEvent); } LeaveCriticalSection(&globalMgr.cs); diff --git a/reactos/dll/win32/qmgr/service.c b/reactos/dll/win32/qmgr/service.c index 702a74e9857..43fc091b1be 100644 --- a/reactos/dll/win32/qmgr/service.c +++ b/reactos/dll/win32/qmgr/service.c @@ -143,7 +143,7 @@ ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) WaitForSingleObject(fileTxThread, INFINITE); UpdateStatus(SERVICE_STOPPED, NO_ERROR, 0); CloseHandle(stop_event); - TRACE("service stoped\n"); + TRACE("service stopped\n"); CoUninitialize(); } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 87e4234c797..5fae1b0d52c 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -156,7 +156,7 @@ reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to WineStaging-1.9.4 reactos/dll/win32/propsys # Synced to WineStaging-1.9.4 reactos/dll/win32/pstorec # Synced to WineStaging-1.9.4 -reactos/dll/win32/qmgr # Synced to WineStaging-1.9.4 +reactos/dll/win32/qmgr # Synced to WineStaging-1.9.11 reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.9.4 reactos/dll/win32/query # Synced to WineStaging-1.9.4 reactos/dll/win32/rasapi32 # Synced to WineStaging-1.9.4