May 2019 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_apply_ffp_blit_state().
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: d29f0545b28baad4ae431e69ed310772090798c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d29f0545b28baad4ae431e69… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 9 19:29:12 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_apply_ffp_blit_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 8 +++++--- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a05bb2f..8409a54 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7872,7 +7872,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl wined3d_texture_load(src_texture, context, FALSE); } - context_apply_ffp_blit_state(context, device); + wined3d_context_gl_apply_ffp_blit_state(wined3d_context_gl(context), device); if (dst_location == WINED3D_LOCATION_DRAWABLE) { diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 506bb72..cf164d5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2908,12 +2908,14 @@ static void context_apply_blit_projection(const struct wined3d_context *context, /* Setup OpenGL states for fixed-function blitting. */ /* Context activation is done by the caller. */ -void context_apply_ffp_blit_state(struct wined3d_context *context, const struct wined3d_device *device) +void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl, + const struct wined3d_device *device) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_context *context = &context_gl->c; + const struct wined3d_gl_info *gl_info; unsigned int i, sampler; + gl_info = context->gl_info; if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) ERR("Applying fixed-function state without legacy context support.\n"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 06c0a23..7a20e2c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1028,7 +1028,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture_gl *dst_texture, context = context_acquire(device, &src_texture->t, src_sub_resource_idx); context_gl = wined3d_context_gl(context); gl_info = context->gl_info; - context_apply_ffp_blit_state(context, device); + wined3d_context_gl_apply_ffp_blit_state(context_gl, device); wined3d_texture_load(&dst_texture->t, context, FALSE); offscreen_buffer = context_get_offscreen_gl_buffer(context); @@ -2228,7 +2228,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit wined3d_texture_load(src_texture, context, FALSE); } - context_apply_ffp_blit_state(context, device); + wined3d_context_gl_apply_ffp_blit_state(wined3d_context_gl(context), device); if (dst_location == WINED3D_LOCATION_DRAWABLE) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb57f62..333178a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2056,6 +2056,8 @@ static inline const struct wined3d_context_gl *wined3d_context_gl_const(const st void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) DECLSPEC_HIDDEN; +void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl, + const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; @@ -2214,8 +2216,6 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; -void context_apply_ffp_blit_state(struct wined3d_context *context, - const struct wined3d_device *device) DECLSPEC_HIDDEN; void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, unsigned int unit) DECLSPEC_HIDDEN; void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_bind_and_dirtify ().
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 77bc74c6379fc121802fdf790b130da5a490ba50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77bc74c6379fc121802fdf79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 9 19:29:13 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_bind_and_dirtify(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 4 ++-- dlls/wined3d/surface.c | 8 +++---- dlls/wined3d/texture.c | 51 ++++++++++++++++++++++-------------------- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 35 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77bc74c6379fc121802f…

1 0

Alistair Leslie-Hughes : dinput: Trace This pointer in a consistent way.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 52deca4900b361e0ef4336a808bfae81af74b885 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52deca4900b361e0ef4336a8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 8 05:27:06 2019 +0000 dinput: Trace This pointer in a consistent way. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 75 +++++++++++++++++++++++---------------- dlls/dinput/dinput_main.c | 4 +-- dlls/dinput/joystick.c | 10 +++--- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 4 +-- dlls/dinput/keyboard.c | 8 +++-- dlls/dinput/mouse.c | 3 +- 8 files changed, 63 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=52deca4900b361e0ef43…

1 0

Alistair Leslie-Hughes : dinput: Ensure Cursor is visible on config dialog.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 9bcaf9769c5ae834f0f6e8fe2b28a85b286833b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bcaf9769c5ae834f0f6e8fe… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 8 07:02:50 2019 +0000 dinput: Ensure Cursor is visible on config dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/config.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index db5878b..bf44898 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -375,9 +375,15 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w SendDlgItemMessageW(dialog, IDC_CONTROLLERCOMBO, CB_SETCURSEL, 0, 0); fill_device_object_list(dialog); + ShowCursor(TRUE); + break; } + case WM_DESTROY: + ShowCursor(FALSE); + break; + case WM_NOTIFY: switch (((LPNMHDR)lParam)->code)

1 0

Jacek Caban : hidclass.sys: Make read IRP queue thread safe.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 85082e8bd3c9bcb0b45fc56b55cc7c88c653d028 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85082e8bd3c9bcb0b45fc56b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 8 23:09:03 2019 +0200 hidclass.sys: Make read IRP queue thread safe. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/Makefile.in | 2 +- dlls/hidclass.sys/device.c | 34 ++++++++++++++++++++++++---------- dlls/hidclass.sys/hid.h | 1 + dlls/hidclass.sys/pnp.c | 1 + 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index e942217..209c2df 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -1,6 +1,6 @@ MODULE = hidclass.sys IMPORTLIB = hidclass -IMPORTS = ntoskrnl +IMPORTS = hal ntoskrnl DELAYIMPORTS = setupapi hid C_SRCS = \ diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 81d5c3c..fcdb1b8 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -126,10 +126,25 @@ error: return STATUS_UNSUCCESSFUL; } +static IRP *pop_irp_from_queue(BASE_DEVICE_EXTENSION *ext) +{ + LIST_ENTRY *entry; + KIRQL old_irql; + IRP *irp = NULL; + + KeAcquireSpinLock(&ext->irp_queue_lock, &old_irql); + + entry = RemoveHeadList(&ext->irp_queue); + if (entry != &ext->irp_queue) + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); + + KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); + return irp; +} + void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) { BASE_DEVICE_EXTENSION *ext; - LIST_ENTRY *entry; IRP *irp; ext = device->DeviceExtension; @@ -145,13 +160,10 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device if (ext->ring_buffer) RingBuffer_Destroy(ext->ring_buffer); - entry = RemoveHeadList(&ext->irp_queue); - while(entry != &ext->irp_queue) + while((irp = pop_irp_from_queue(ext))) { - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); irp->IoStatus.u.Status = STATUS_DEVICE_REMOVED; IoCompleteRequest(irp, IO_NO_INCREMENT); - entry = RemoveHeadList(&ext->irp_queue); } TRACE("Delete device(%p) %s\n", device, debugstr_w(ext->device_name)); @@ -189,7 +201,6 @@ static NTSTATUS copy_packet_into_buffer(HID_XFER_PACKET *packet, BYTE* buffer, U static void HID_Device_processQueue(DEVICE_OBJECT *device) { - LIST_ENTRY *entry; IRP *irp; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; UINT buffer_size = RingBuffer_GetBufferSize(ext->ring_buffer); @@ -197,11 +208,9 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) packet = HeapAlloc(GetProcessHeap(), 0, buffer_size); - entry = RemoveHeadList(&ext->irp_queue); - while(entry != &ext->irp_queue) + while((irp = pop_irp_from_queue(ext))) { int ptr; - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size); @@ -222,7 +231,6 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) irp->IoStatus.u.Status = STATUS_UNSUCCESSFUL; } IoCompleteRequest( irp, IO_NO_INCREMENT ); - entry = RemoveHeadList(&ext->irp_queue); } HeapFree(GetProcessHeap(), 0, packet); } @@ -656,9 +664,15 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) BASE_DEVICE_EXTENSION *extension = device->DeviceExtension; if (extension->poll_interval) { + KIRQL old_irql; TRACE_(hid_report)("Queue irp\n"); + + KeAcquireSpinLock(&ext->irp_queue_lock, &old_irql); + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); rc = STATUS_PENDING; + + KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); } else { diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 769b715..ff2e7ef 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -54,6 +54,7 @@ typedef struct _BASE_DEVICE_EXTENSION { HANDLE halt_event; HANDLE thread; + KSPIN_LOCK irp_queue_lock; LIST_ENTRY irp_queue; /* Minidriver Specific stuff will end up here */ diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 08aae15..a283d63 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -114,6 +114,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ext = device->DeviceExtension; InitializeListHead(&ext->irp_queue); + KeInitializeSpinLock(&ext->irp_queue_lock); TRACE("Created device %p\n",device); status = minidriver->AddDevice(minidriver->minidriver.DriverObject, device);

1 0

Jacek Caban : hidclass.sys: Support canceling read IRPs.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: f7bc64959886e585aced90688036a59a907b9743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7bc64959886e585aced9068… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 8 23:09:16 2019 +0200 hidclass.sys: Support canceling read IRPs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index fcdb1b8..1fb3bbc 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -134,14 +134,44 @@ static IRP *pop_irp_from_queue(BASE_DEVICE_EXTENSION *ext) KeAcquireSpinLock(&ext->irp_queue_lock, &old_irql); - entry = RemoveHeadList(&ext->irp_queue); - if (entry != &ext->irp_queue) + while (!irp && (entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) + { irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); + if (!IoSetCancelRoutine(irp, NULL)) + { + /* cancel routine is already cleared, meaning that it was called. let it handle completion. */ + InitializeListHead(&irp->Tail.Overlay.s.ListEntry); + irp = NULL; + } + } KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); return irp; } +static void WINAPI read_cancel_routine(DEVICE_OBJECT *device, IRP *irp) +{ + BASE_DEVICE_EXTENSION *ext; + KIRQL old_irql; + + TRACE("cancel %p IRP on device %p\n", irp, device); + + ext = device->DeviceExtension; + + IoReleaseCancelSpinLock(irp->CancelIrql); + + KeAcquireSpinLock(&ext->irp_queue_lock, &old_irql); + + RemoveEntryList(&irp->Tail.Overlay.s.ListEntry); + + KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); + + irp->IoStatus.u.Status = STATUS_CANCELLED; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + + void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) { BASE_DEVICE_EXTENSION *ext; @@ -669,10 +699,20 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) KeAcquireSpinLock(&ext->irp_queue_lock, &old_irql); + IoSetCancelRoutine(irp, read_cancel_routine); + if (irp->Cancel && !IoSetCancelRoutine(irp, NULL)) + { + /* IRP was canceled before we set cancel routine */ + InitializeListHead(&irp->Tail.Overlay.s.ListEntry); + KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); + return STATUS_CANCELLED; + } + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); - rc = STATUS_PENDING; + IoMarkIrpPending(irp); KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); + rc = STATUS_PENDING; } else {

1 0

Conor McCarthy : mspatcha: Add functions to API header file.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 2aa494686133bf4c4b6b054a45bf1d1d429acdc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aa494686133bf4c4b6b054a… Author: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Date: Thu May 9 18:52:32 2019 +1000 mspatcha: Add functions to API header file. Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/patchapi.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/include/patchapi.h b/include/patchapi.h index 5adaf0a..1ccdf9d 100644 --- a/include/patchapi.h +++ b/include/patchapi.h @@ -1,5 +1,6 @@ /* * Copyright 2011 Hans Leidekker for CodeWeavers + * Copyright 2019 Conor McCarthy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,11 +24,33 @@ extern "C" { #endif +#define PATCH_OPTION_USE_LZX_A 0x00000001 +#define PATCH_OPTION_USE_LZX_B 0x00000002 +#define PATCH_OPTION_USE_LZX_LARGE 0x00000004 /* raise maximum window from 8 -> 32 Mb */ + +#define PATCH_OPTION_NO_BINDFIX 0x00010000 +#define PATCH_OPTION_NO_LOCKFIX 0x00020000 +#define PATCH_OPTION_NO_REBASE 0x00040000 +#define PATCH_OPTION_FAIL_IF_SAME_FILE 0x00080000 +#define PATCH_OPTION_FAIL_IF_BIGGER 0x00100000 +#define PATCH_OPTION_NO_CHECKSUM 0x00200000 +#define PATCH_OPTION_NO_RESTIMEFIX 0x00400000 +#define PATCH_OPTION_NO_TIMESTAMP 0x00800000 +#define PATCH_OPTION_INTERLEAVE_FILES 0x40000000 +#define PATCH_OPTION_RESERVED1 0x80000000 + #define APPLY_OPTION_FAIL_IF_EXACT 0x00000001 #define APPLY_OPTION_FAIL_IF_CLOSE 0x00000002 #define APPLY_OPTION_TEST_ONLY 0x00000004 #define APPLY_OPTION_VALID_FLAGS 0x00000007 +#define ERROR_PATCH_DECODE_FAILURE 0xC00E4101 +#define ERROR_PATCH_CORRUPT 0xC00E4102 +#define ERROR_PATCH_NEWER_FORMAT 0xC00E4103 +#define ERROR_PATCH_WRONG_FILE 0xC00E4104 +#define ERROR_PATCH_NOT_NECESSARY 0xC00E4105 +#define ERROR_PATCH_NOT_AVAILABLE 0xC00E4106 + typedef struct _PATCH_IGNORE_RANGE { ULONG OffsetInOldFile; @@ -41,16 +64,66 @@ typedef struct _PATCH_RETAIN_RANGE ULONG OffsetInNewFile; } PATCH_RETAIN_RANGE, *PPATCH_RETAIN_RANGE; +typedef struct _PATCH_INTERLEAVE_MAP { + ULONG CountRanges; + struct { + ULONG OldOffset; + ULONG OldLength; + ULONG NewLength; + } Range[1]; +} PATCH_INTERLEAVE_MAP, *PPATCH_INTERLEAVE_MAP; + +typedef BOOL(CALLBACK PATCH_SYMLOAD_CALLBACK)(ULONG, LPCSTR, ULONG, ULONG, ULONG, ULONG, ULONG, PVOID); + +typedef PATCH_SYMLOAD_CALLBACK *PPATCH_SYMLOAD_CALLBACK; + +typedef struct _PATCH_OPTION_DATA { + ULONG SizeOfThisStruct; + ULONG SymbolOptionFlags; + LPCSTR NewFileSymbolPath; + LPCSTR *OldFileSymbolPathArray; + ULONG ExtendedOptionFlags; + PPATCH_SYMLOAD_CALLBACK SymLoadCallback; + PVOID SymLoadContext; + PPATCH_INTERLEAVE_MAP* InterleaveMapArray; + ULONG MaxLzxWindowSize; +} PATCH_OPTION_DATA, *PPATCH_OPTION_DATA; + +typedef BOOL (CALLBACK PATCH_PROGRESS_CALLBACK)(PVOID, ULONG, ULONG); + +typedef PATCH_PROGRESS_CALLBACK *PPATCH_PROGRESS_CALLBACK; + BOOL WINAPI ApplyPatchToFileA(LPCSTR,LPCSTR,LPCSTR,ULONG); BOOL WINAPI ApplyPatchToFileW(LPCWSTR,LPCWSTR,LPCWSTR,ULONG); #define ApplyPatchToFile WINELIB_NAME_AW(ApplyPatchToFile) +BOOL WINAPI ApplyPatchToFileByHandles(HANDLE, HANDLE, HANDLE, ULONG); +BOOL WINAPI ApplyPatchToFileExA(LPCSTR, LPCSTR, LPCSTR, ULONG, PPATCH_PROGRESS_CALLBACK, PVOID); +BOOL WINAPI ApplyPatchToFileExW(LPCWSTR, LPCWSTR, LPCWSTR, ULONG, PPATCH_PROGRESS_CALLBACK, PVOID); +#define ApplyPatchToFileEx WINELIB_NAME_AW(ApplyPatchToFileEx) +BOOL WINAPI ApplyPatchToFileByHandlesEx(HANDLE, HANDLE, HANDLE, ULONG, PPATCH_PROGRESS_CALLBACK, PVOID); +BOOL WINAPI ApplyPatchToFileByBuffers(PBYTE, ULONG, PBYTE, ULONG, PBYTE*, ULONG, ULONG*, FILETIME*, ULONG, + PPATCH_PROGRESS_CALLBACK, PVOID); + +BOOL WINAPI TestApplyPatchToFileA(LPCSTR, LPCSTR, ULONG); +BOOL WINAPI TestApplyPatchToFileW(LPCWSTR, LPCWSTR, ULONG); +#define TestApplyPatchToFile WINELIB_NAME_AW(TestApplyPatchToFile) +BOOL WINAPI TestApplyPatchToFileByHandles(HANDLE, HANDLE, ULONG); +BOOL WINAPI TestApplyPatchToFileByBuffers(PBYTE, ULONG, PBYTE, ULONG, ULONG*, ULONG); + BOOL WINAPI GetFilePatchSignatureA(LPCSTR, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, ULONG, PPATCH_RETAIN_RANGE, ULONG, LPSTR); BOOL WINAPI GetFilePatchSignatureW(LPCWSTR, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, ULONG, PPATCH_RETAIN_RANGE, ULONG, LPWSTR); #define GetFilePatchSignature WINELIB_NAME_AW(GetFilePatchSignature) +BOOL WINAPI GetFilePatchSignatureByHandle(HANDLE, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, + ULONG, PPATCH_RETAIN_RANGE, ULONG, LPSTR); +BOOL WINAPI GetFilePatchSignatureByBuffer(PBYTE, ULONG, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, ULONG, + PPATCH_RETAIN_RANGE, ULONG, LPSTR); +INT WINAPI NormalizeFileForPatchSignature(PVOID, ULONG, ULONG, PATCH_OPTION_DATA*, ULONG, + ULONG, ULONG, PPATCH_IGNORE_RANGE, ULONG, PPATCH_RETAIN_RANGE); + #ifdef __cplusplus } #endif

1 0

Conor McCarthy : mspatcha: Partially implement ApplyPatchToFileW and related functions.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 8695a6986ef2b7cae7c1f3247fec8e8e14de1971 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8695a6986ef2b7cae7c1f324… Author: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Date: Thu May 9 18:52:33 2019 +1000 mspatcha: Partially implement ApplyPatchToFileW and related functions. This can patch non-executables and 64-bit executable files, but patching of 32-bit executables is not supported. They are subject to special processing which alters PE relocations to match with those in the old file to improve compression. To reverse this, the meaning of the decoding data must be interpreted. Details, including where to find that data in the patch file, are included in pa19.c. Interleaved decompression of large files is also not supported. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12501 Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mspatcha/Makefile.in | 4 +- dlls/mspatcha/lzxd_dec.c | 775 ++++++++++++++++++++++++++++++ dlls/mspatcha/lzxd_dec.h | 27 ++ dlls/mspatcha/mspatcha.spec | 28 +- dlls/mspatcha/mspatcha_main.c | 183 +++++-- dlls/mspatcha/pa19.c | 1046 +++++++++++++++++++++++++++++++++++++++++ dlls/mspatcha/pa19.h | 37 ++ 7 files changed, 2045 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8695a6986ef2b7cae7c1…

1 0

Conor McCarthy : mspatcha/tests: Test implementations of ApplyPatchToFileW and related functions.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 23e951e2562b6020e653077c4affeeea72da1a9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=23e951e2562b6020e653077c… Author: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Date: Thu May 9 18:52:34 2019 +1000 mspatcha/tests: Test implementations of ApplyPatchToFileW and related functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12501 Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/mspatcha/tests/Makefile.in | 8 + dlls/mspatcha/tests/apply_patch.c | 812 ++++++++++++++++++++++++++++++++++ dlls/mspatcha/tests/mspatcha.manifest | 11 + dlls/mspatcha/tests/mspatcha.rc | 28 ++ 6 files changed, 861 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=23e951e2562b6020e653…

1 0

Conor McCarthy : mspatcha: Add stubs for signature and normalization functions.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: f8c25628266f025e01332b780c793d96d97dad25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8c25628266f025e01332b78… Author: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Date: Thu May 9 18:52:35 2019 +1000 mspatcha: Add stubs for signature and normalization functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12501 Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mspatcha/mspatcha.spec | 10 +++---- dlls/mspatcha/mspatcha_main.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 5 deletions(-) diff --git a/dlls/mspatcha/mspatcha.spec b/dlls/mspatcha/mspatcha.spec index 060c090..f8cfc41 100644 --- a/dlls/mspatcha/mspatcha.spec +++ b/dlls/mspatcha/mspatcha.spec @@ -5,11 +5,11 @@ @ stdcall ApplyPatchToFileExA(str str str long ptr ptr) @ stdcall ApplyPatchToFileExW(wstr wstr wstr long ptr ptr) @ stdcall ApplyPatchToFileW(wstr wstr wstr long) -@ stub GetFilePatchSignatureA -@ stub GetFilePatchSignatureByBuffer -@ stub GetFilePatchSignatureByHandle -@ stub GetFilePatchSignatureW -@ stub NormalizeFileForPatchSignature +@ stdcall GetFilePatchSignatureA(str long ptr long ptr long ptr long ptr) +@ stdcall GetFilePatchSignatureByBuffer(ptr long long ptr long ptr long ptr long ptr) +@ stdcall GetFilePatchSignatureByHandle(ptr long ptr long ptr long ptr long ptr) +@ stdcall GetFilePatchSignatureW(wstr long ptr long ptr long ptr long ptr) +@ stdcall NormalizeFileForPatchSignature(ptr long long ptr long long long ptr long ptr) @ stdcall TestApplyPatchToFileA(str str long) @ stdcall TestApplyPatchToFileByBuffers(ptr long ptr long ptr long) @ stdcall TestApplyPatchToFileByHandles(ptr ptr long) diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c index 6887253..9695a7a 100644 --- a/dlls/mspatcha/mspatcha_main.c +++ b/dlls/mspatcha/mspatcha_main.c @@ -224,3 +224,69 @@ BOOL WINAPI ApplyPatchToFileByBuffers(PBYTE patch_file_view, ULONG patch_file_s return err == ERROR_SUCCESS; } + +/***************************************************** + * GetFilePatchSignatureA (MSPATCHA.@) + */ +BOOL WINAPI GetFilePatchSignatureA(LPCSTR filename, ULONG flags, PVOID data, ULONG ignore_range_count, + PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, + PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPSTR buffer) +{ + FIXME("stub - %s, %x, %p, %u, %p, %u, %p, %u, %p\n", debugstr_a(filename), flags, data, + ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/***************************************************** + * GetFilePatchSignatureW (MSPATCHA.@) + */ +BOOL WINAPI GetFilePatchSignatureW(LPCWSTR filename, ULONG flags, PVOID data, ULONG ignore_range_count, + PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, + PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPWSTR buffer) +{ + FIXME("stub - %s, %x, %p, %u, %p, %u, %p, %u, %p\n", debugstr_w(filename), flags, data, + ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/***************************************************** + * GetFilePatchSignatureByHandle (MSPATCHA.@) + */ +BOOL WINAPI GetFilePatchSignatureByHandle(HANDLE handle, ULONG flags, PVOID options, ULONG ignore_range_count, + PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, + PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPSTR buffer) +{ + FIXME("stub - %p, %x, %p, %u, %p, %u, %p, %u, %p\n", handle, flags, options, + ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/***************************************************** + * GetFilePatchSignatureByBuffer (MSPATCHA.@) + */ +BOOL WINAPI GetFilePatchSignatureByBuffer(PBYTE file_buf, ULONG file_size, ULONG flags, PVOID options, + ULONG ignore_range_count, PPATCH_IGNORE_RANGE ignore_range, + ULONG retain_range_count, PPATCH_RETAIN_RANGE retain_range, + ULONG bufsize, LPSTR buffer) +{ + FIXME("stub - %p, %u, %x, %p, %u, %p, %u, %p, %u, %p\n", file_buf, file_size, flags, options, + ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/***************************************************** + * NormalizeFileForPatchSignature (MSPATCHA.@) + */ +INT WINAPI NormalizeFileForPatchSignature(PVOID file_buffer, ULONG file_size, ULONG flags, PATCH_OPTION_DATA *options, + ULONG new_coff_base, ULONG new_coff_time, ULONG ignore_range_count, PPATCH_IGNORE_RANGE ignore_range, + ULONG retain_range_count, PPATCH_RETAIN_RANGE retain_range) +{ + FIXME("stub - %p, %u, %x, %p, %u, %u, %u, %p, %u, %p\n", file_buffer, file_size, flags, options, new_coff_base, + new_coff_time, ignore_range_count, ignore_range, retain_range_count, retain_range); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +}

1 0