admin/hakril-PythonForWindows
1
0
Fork 0
mirror of https://github.com/hakril/PythonForWindows synced 2026-06-08 14:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix BitsCopyCallback callback prototype + print error code on bits job error

Browse Source
This commit is contained in:
Clement Rouault
2017-04-20 11:52:56 +02:00
parent 979d1bd418
commit 799bca8d3f
2 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TODO
+1 -1
View File
@@ -1,5 +1,6 @@
TODO:
- Documentation
- thread.set_context in a sample
- Better WMI interface
- Bug in VARIANT_TYPE == BOOL (see Win32_OperatingSystem->Debug)
@@ -24,7 +25,6 @@ TODO:
- Clean pe_parse.py
- wintrust doc:
add : https://blogs.msdn.microsoft.com/winsdk/2016/01/05/why-cryptcatadmincalchashfromfilehandle-fails-with-a-seemingly-unexpected-error-code/
windows/bits.py
+26 -11
View File
@@ -1,7 +1,10 @@
import threading
import windows
import windows.com
from windows.generated_def.interfaces import IBackgroundCopyManager, IEnumBackgroundCopyJobs, IBackgroundCopyJob, IBackgroundCopyCallback, COMImplementation, IUnknown
from windows.generated_def import DWORD, BG_JOB_TYPE_UPLOAD, BG_JOB_STATE_SUSPENDED
from windows.generated_def.interfaces import (IBackgroundCopyManager, IEnumBackgroundCopyJobs, IBackgroundCopyJob,
IBackgroundCopyCallback, COMImplementation, IUnknown, IBackgroundCopyError)
from windows.generated_def import DWORD, BG_JOB_TYPE_UPLOAD, BG_JOB_STATE_SUSPENDED, BG_ERROR_CONTEXT, HRESULT
BackgroundCopyManager = windows.com.IID.from_string("4991d34b-80a1-4291-83b6-3328366b9097")
BackgroundCopyManager1_5 = windows.com.IID.from_string("f087771f-d74f-4c1a-bb8a-e16aca9124ea")
@@ -10,16 +13,10 @@ BackgroundCopyManager2_5 = windows.com.IID.from_string("03ca98d6-ff5d-49b8-abc6-
BackgroundCopyManager3_0 = windows.com.IID.from_string("659cdea7-489e-11d9-a9cd-000d56965251")
import threading
class BitsCopyCallback(COMImplementation):
IMPLEMENT = IBackgroundCopyCallback
def JobError(self, job, error):
def JobError(self, this, job, error):
return True
def JobTransferred(self, this, job):
@@ -34,7 +31,16 @@ class BitsCopyCallbackSetEvent(BitsCopyCallback):
super(BitsCopyCallbackSetEvent, self).__init__()
self.event = event
def JobError(self, job, error):
# With the current generated_def.interface design, the current
# prototype is:
# ctypes.WINFUNCTYPE(HRESULT, PVOID, PVOID)(4, "JobError")
# How should I address that ?
def JobError(self, this, job, error):
job = BitsCopyJob(job)
error = BitsCopyError(error)
errcode, errctx = error.error
print("Copy failed with error code <{0:#x}> (ctx={1})".format(errcode, errctx))
print("see <https://msdn.microsoft.com/en-us/library/windows/desktop/aa362823(v=vs.85).aspx>")
self.event.set()
return True
@@ -89,4 +95,13 @@ class BitsCopyJob(IBackgroundCopyJob):
def __repr__(self):
return '<{0} iid="{1}" at {2:#08x}>'.format(type(self).__name__, self.iid.to_string(), id(self))
return '<{0} iid="{1}" at {2:#08x}>'.format(type(self).__name__, self.iid.to_string(), id(self))
class BitsCopyError(IBackgroundCopyError):
@property
def error(self):
err_ctx = BG_ERROR_CONTEXT()
err = HRESULT()
self.GetError(err_ctx, err)
return (err.value & 0xffffffff, err_ctx)