October 2020 - Wine-Commits

Paul Gofman : kernelbase: Align stack in GetProcAddress() on x64.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 6cf3cbe4545bb6c5eb2273ab2ab90645ec2c1469 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cf3cbe4545bb6c5eb2273ab… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 27 14:01:57 2020 +0300 kernelbase: Align stack in GetProcAddress() on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/loader.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 4b615e4a08f..fc9b0ce0083 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -447,18 +447,18 @@ __ASM_GLOBAL_FUNC( GetProcAddress, "movq %rsp,%rbp\n\t" __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") - "subq $0x60,%rsp\n\t" - __ASM_SEH(".seh_stackalloc 0x60\n\t") __ASM_SEH(".seh_endprologue\n\t") - "movaps %xmm0,-0x10(%rbp)\n\t" - "movaps %xmm1,-0x20(%rbp)\n\t" - "movaps %xmm2,-0x30(%rbp)\n\t" - "movaps %xmm3,-0x40(%rbp)\n\t" + "subq $0x60,%rsp\n\t" + "andq $~15,%rsp\n\t" + "movaps %xmm0,0x20(%rsp)\n\t" + "movaps %xmm1,0x30(%rsp)\n\t" + "movaps %xmm2,0x40(%rsp)\n\t" + "movaps %xmm3,0x50(%rsp)\n\t" "call " __ASM_NAME("get_proc_address") "\n\t" - "movaps -0x40(%rbp), %xmm3\n\t" - "movaps -0x30(%rbp), %xmm2\n\t" - "movaps -0x20(%rbp), %xmm1\n\t" - "movaps -0x10(%rbp), %xmm0\n\t" + "movaps 0x50(%rsp), %xmm3\n\t" + "movaps 0x40(%rsp), %xmm2\n\t" + "movaps 0x30(%rsp), %xmm1\n\t" + "movaps 0x20(%rsp), %xmm0\n\t" "leaq 0(%rbp),%rsp\n\t" __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") "popq %rbp\n\t"

1 0

Aaron Hill : qmgr/tests: Test registering an IBackgroundCopyCallback2.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 2148167f2557cc6c7d1e2f5ffef28bd936503a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2148167f2557cc6c7d1e2f5f… Author: Aaron Hill <aa1ronham(a)gmail.com> Date: Thu Oct 15 20:38:00 2020 -0400 qmgr/tests: Test registering an IBackgroundCopyCallback2. Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/tests/Makefile.in | 2 +- dlls/qmgr/tests/job.c | 137 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 1 deletion(-) diff --git a/dlls/qmgr/tests/Makefile.in b/dlls/qmgr/tests/Makefile.in index 6482d4d9b7a..2bf92a94019 100644 --- a/dlls/qmgr/tests/Makefile.in +++ b/dlls/qmgr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = qmgr.dll -IMPORTS = ole32 shlwapi user32 +IMPORTS = uuid ole32 shlwapi user32 C_SRCS = \ enum_files.c \ diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 3e1aad1b26b..71da89facad 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -39,6 +39,123 @@ static IBackgroundCopyJob *test_job; static GUID test_jobId; static BG_JOB_TYPE test_type; +typedef struct IBackgroundCopyCallback2Impl { + IBackgroundCopyCallback2 IBackgroundCopyCallback2_iface; + LONG ref; +} IBackgroundCopyCallback2Impl; + +static inline IBackgroundCopyCallback2Impl *impl_from_IBackgroundCopyCallback2(IBackgroundCopyCallback2 *iface) +{ + return CONTAINING_RECORD(iface, IBackgroundCopyCallback2Impl, IBackgroundCopyCallback2_iface); +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_QueryInterface(IBackgroundCopyCallback2 *iface, REFIID riid, void **ppv) +{ + IBackgroundCopyCallback2Impl *This = impl_from_IBackgroundCopyCallback2(iface); + + if (!ppv) + { + return E_INVALIDARG; + } + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IBackgroundCopyCallback) || + IsEqualIID(riid, &IID_IBackgroundCopyCallback2)) + { + *ppv = &This->IBackgroundCopyCallback2_iface; + } + else + { + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IBackgroundCopyCallback2Impl_AddRef(IBackgroundCopyCallback2 *iface) +{ + IBackgroundCopyCallback2Impl *This = impl_from_IBackgroundCopyCallback2(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + trace("IBackgroundCopyCallback2Impl_AddRef called (%p, ref = %d)\n", This, ref); + return ref; +} + +static ULONG WINAPI IBackgroundCopyCallback2Impl_Release(IBackgroundCopyCallback2 *iface) +{ + IBackgroundCopyCallback2Impl *This = impl_from_IBackgroundCopyCallback2(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + trace("IBackgroundCopyCallback2Impl_Release called (%p, ref = %d)\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_JobError(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob, IBackgroundCopyError *pError) +{ + trace("IBackgroundCopyCallback2Impl_JobError called (%p, %p, %p)\n", iface, pJob, pError); + return S_OK; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_JobModification(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob, DWORD dwReserved) +{ + trace("IBackgroundCopyCallback2Impl_JobModification called (%p, %p)\n", iface, pJob); + return S_OK; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_JobTransferred(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob) +{ + trace("IBackgroundCopyCallback2Impl_JobTransferred called (%p, %p)\n", iface, pJob); + return S_OK; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_FileTransferred(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob, IBackgroundCopyFile *pFile) +{ + trace("IBackgroundCopyCallback2Impl_FileTransferred called (%p, %p, %p)\n", iface, pJob, pFile); + return S_OK; +} + + +static const IBackgroundCopyCallback2Vtbl copyCallback_vtbl = +{ + IBackgroundCopyCallback2Impl_QueryInterface, + IBackgroundCopyCallback2Impl_AddRef, + IBackgroundCopyCallback2Impl_Release, + IBackgroundCopyCallback2Impl_JobTransferred, + IBackgroundCopyCallback2Impl_JobError, + IBackgroundCopyCallback2Impl_JobModification, + IBackgroundCopyCallback2Impl_FileTransferred +}; + +static BOOL create_background_copy_callback2(IBackgroundCopyCallback2 **copyCallback) +{ + IBackgroundCopyCallback2Impl *obj; + *copyCallback = NULL; + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + + if (!obj) + { + trace("Out of memory creating IBackgroundCopyCallback2\n"); + return FALSE; + } + + obj->IBackgroundCopyCallback2_iface.lpVtbl = &copyCallback_vtbl; + obj->ref = 1; + + *copyCallback = &obj->IBackgroundCopyCallback2_iface; + + return TRUE; +} + static HRESULT test_create_manager(void) { HRESULT hres; @@ -592,6 +709,20 @@ static void test_HttpOptions(void) unsigned int i; WCHAR *headers; ULONG flags, orig_flags; + IBackgroundCopyCallback2 *copyCallback; + IUnknown *copyCallbackUnknown; + + ok(create_background_copy_callback2(&copyCallback) == TRUE, "create_background_copy_callback2 failed\n"); + + hr = IBackgroundCopyCallback2_QueryInterface(copyCallback, &IID_IUnknown, (LPVOID*)&copyCallbackUnknown); + ok(hr == S_OK,"IBackgroundCopyCallback_QueryInterface(IID_IUnknown) failed: %08x\n", hr); + + hr = IBackgroundCopyJob_SetNotifyInterface(test_job, copyCallbackUnknown); + ok(hr == S_OK,"IBackgroundCopyCallback_SetNotifyInterface failed: %08x\n", hr); + + hr = IBackgroundCopyJob_SetNotifyFlags(test_job, BG_NOTIFY_JOB_TRANSFERRED | BG_NOTIFY_JOB_ERROR | BG_NOTIFY_DISABLE | BG_NOTIFY_JOB_MODIFICATION | BG_NOTIFY_FILE_TRANSFERRED); + ok(hr == S_OK,"IBackgroundCopyCallback_SetNotifyFlags failed: %08x\n", hr); + DeleteFileW(test_localPathA); hr = IBackgroundCopyJob_AddFile(test_job, L"http://test.winehq.org/", test_localPathA); @@ -710,6 +841,12 @@ static void test_HttpOptions(void) ok(hr == BG_E_INVALID_STATE, "got 0x%08x\n", hr); DeleteFileW(test_localPathA); + + hr = IBackgroundCopyJob_SetNotifyInterface(test_job, NULL); + ok(hr == BG_E_INVALID_STATE, "got 0x%08x\n", hr); + + IUnknown_Release(copyCallbackUnknown); + IBackgroundCopyCallback2_Release(copyCallback); } typedef void (*test_t)(void);

1 0

Nikolay Sivov : mfplat: Add IMFGetService stub for 2D memory buffer.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 77d1701b99f0a9fdfe95f9412246a8d008875591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77d1701b99f0a9fdfe95f941… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 27 20:50:19 2020 +0300 mfplat: Add IMFGetService stub for 2D memory buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 13 +++++++++++++ 2 files changed, 57 insertions(+) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index a3311bc10f1..5e969e14ec9 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -31,6 +31,7 @@ struct memory_buffer { IMFMediaBuffer IMFMediaBuffer_iface; IMF2DBuffer2 IMF2DBuffer2_iface; + IMFGetService IMFGetService_iface; LONG refcount; BYTE *data; @@ -88,6 +89,11 @@ static struct memory_buffer *impl_from_IMF2DBuffer2(IMF2DBuffer2 *iface) return CONTAINING_RECORD(iface, struct memory_buffer, IMF2DBuffer2_iface); } +static struct memory_buffer *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct memory_buffer, IMFGetService_iface); +} + static inline struct sample *impl_from_IMFSample(IMFSample *iface) { return CONTAINING_RECORD(iface, struct sample, IMFSample_iface); @@ -240,6 +246,10 @@ static HRESULT WINAPI memory_1d_2d_buffer_QueryInterface(IMFMediaBuffer *iface, { *out = &buffer->IMF2DBuffer2_iface; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *out = &buffer->IMFGetService_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -511,6 +521,39 @@ static const IMF2DBuffer2Vtbl memory_2d_buffer_vtbl = memory_2d_buffer_Copy2DTo, }; +static HRESULT WINAPI memory_2d_buffer_gs_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct memory_buffer *buffer = impl_from_IMFGetService(iface); + return IMFMediaBuffer_QueryInterface(&buffer->IMFMediaBuffer_iface, riid, obj); +} + +static ULONG WINAPI memory_2d_buffer_gs_AddRef(IMFGetService *iface) +{ + struct memory_buffer *buffer = impl_from_IMFGetService(iface); + return IMFMediaBuffer_AddRef(&buffer->IMFMediaBuffer_iface); +} + +static ULONG WINAPI memory_2d_buffer_gs_Release(IMFGetService *iface) +{ + struct memory_buffer *buffer = impl_from_IMFGetService(iface); + return IMFMediaBuffer_Release(&buffer->IMFMediaBuffer_iface); +} + +static HRESULT WINAPI memory_2d_buffer_gs_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl memory_2d_buffer_gs_vtbl = +{ + memory_2d_buffer_gs_QueryInterface, + memory_2d_buffer_gs_AddRef, + memory_2d_buffer_gs_Release, + memory_2d_buffer_gs_GetService, +}; + static HRESULT memory_buffer_init(struct memory_buffer *buffer, DWORD max_length, DWORD alignment, const IMFMediaBufferVtbl *vtbl) { @@ -620,6 +663,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo } object->IMF2DBuffer2_iface.lpVtbl = &memory_2d_buffer_vtbl; + object->IMFGetService_iface.lpVtbl = &memory_2d_buffer_gs_vtbl; object->_2d.plane_size = plane_size; object->_2d.width = stride; object->_2d.height = height; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 971469ec574..906454851a8 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1818,6 +1818,7 @@ static void test_system_memory_buffer(void) HRESULT hr; DWORD length, max; BYTE *data, *data2; + IUnknown *unk; hr = MFCreateMemoryBuffer(1024, NULL); ok(hr == E_INVALIDARG || hr == E_POINTER, "got 0x%08x\n", hr); @@ -1836,6 +1837,9 @@ static void test_system_memory_buffer(void) hr = MFCreateMemoryBuffer(1024, &buffer); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaBuffer_GetMaxLength(buffer, NULL); ok(hr == E_INVALIDARG || hr == E_POINTER, "got 0x%08x\n", hr); @@ -5155,6 +5159,7 @@ static void test_MFCreate2DMediaBuffer(void) IMF2DBuffer *_2dbuffer; IMFMediaBuffer *buffer; int i, pitch, pitch2; + IUnknown *unk; HRESULT hr; BOOL ret; @@ -5177,6 +5182,10 @@ static void test_MFCreate2DMediaBuffer(void) hr = pMFCreate2DMediaBuffer(2, 3, MAKEFOURCC('N','V','1','2'), FALSE, &buffer); ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + /* Full backing buffer size, with 64 bytes per row alignment. */ hr = IMFMediaBuffer_GetMaxLength(buffer, &max_length); ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); @@ -5405,6 +5414,7 @@ static void test_MFCreateMediaBufferFromMediaType(void) HRESULT hr; IMFMediaType *media_type; unsigned int i; + IUnknown *unk; if (!pMFCreateMediaBufferFromMediaType) { @@ -5437,6 +5447,9 @@ static void test_MFCreateMediaBufferFromMediaType(void) if (FAILED(hr)) break; + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); ok(ptr->buffer_length == length, "%d: unexpected buffer length %u, expected %u.\n", i, length, ptr->buffer_length);

1 0

Hans Leidekker : msi: Use wide character string literals in action.c.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 8e13b0b99c823bc22c7eef8b8dac04de283ca462 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e13b0b99c823bc22c7eef8b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 27 11:31:41 2020 +0100 msi: Use wide character string literals in action.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 1340 ++++++++++++++++------------------------------------- 1 file changed, 407 insertions(+), 933 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8e13b0b99c823bc22c7e…

1 0

Alexandre Julliard : gdi32: Add a helper to load a font without using a face.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 0bf2c11d43cbd36ed258c868491422083f3c7f64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bf2c11d43cbd36ed258c868… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 14:10:41 2020 +0100 gdi32: Add a helper to load a font without using a face. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 259 ++++++++++++++++++++++++-------------------------- 1 file changed, 122 insertions(+), 137 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0bf2c11d43cbd36ed258…

1 0

Alexandre Julliard : gdi32: Allocate the backend font data in the load_font() helper.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 5772b064ac0194f784640f79701e384a1ffbeb3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5772b064ac0194f784640f79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 14:25:32 2020 +0100 gdi32: Allocate the backend font data in the load_font() helper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 5 ----- dlls/gdi32/freetype.c | 20 ++++++-------------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4e1c69d886e..02cd618f956 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -487,11 +487,6 @@ struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_ HeapFree( GetProcessHeap(), 0, font ); return NULL; } - if (font_funcs && !font_funcs->alloc_font( font )) - { - free_gdi_font( font ); - return NULL; - } return font; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b4764d1e8c9..d941fb18bf6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3666,18 +3666,6 @@ static UINT get_nearest_charset(const WCHAR *family_name, Face *face, UINT *cp) return DEFAULT_CHARSET; } -/************************************************************* - * freetype_alloc_font - */ -static BOOL CDECL freetype_alloc_font( struct gdi_font *font ) -{ - GdiFont *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)); - list_init(&ret->child_fonts); - ret->gdi_font = font; - font->private = ret; - return TRUE; -} - /************************************************************* * freetype_destroy_font */ @@ -4325,12 +4313,17 @@ static DWORD get_ttc_offset( FT_Face ft_face, UINT face_index ) static BOOL load_font( struct gdi_font *gdi_font ) { - GdiFont *font = get_font_ptr( gdi_font ); + GdiFont *font; INT width = 0, height; FT_Face ft_face; void *data_ptr; SIZE_T data_size; + if (!(font = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*font) ))) return FALSE; + gdi_font->private = font; + font->gdi_font = gdi_font; + list_init( &font->child_fonts ); + if (gdi_font->file[0]) { char *filename = wine_get_unix_file_name( gdi_font->file ); @@ -7294,7 +7287,6 @@ static const struct font_backend_funcs font_funcs = freetype_add_font, freetype_add_mem_font, freetype_remove_font, - freetype_alloc_font, freetype_get_font_data, freetype_get_glyph_index, freetype_get_default_glyph, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index aa6e6ddcaa9..32d50935308 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -376,7 +376,6 @@ struct font_backend_funcs INT (CDECL *add_mem_font)( void *ptr, SIZE_T size, DWORD flags ); BOOL (CDECL *remove_font)( const WCHAR *file, DWORD flags ); - BOOL (CDECL *alloc_font)( struct gdi_font *font ); DWORD (CDECL *get_font_data)( struct gdi_font *gdi_font, DWORD table, DWORD offset, void *buf, DWORD count ); BOOL (CDECL *get_glyph_index)( struct gdi_font *gdi_font, UINT *glyph );

1 0

Paul Gofman : kernel32: Align stack in get_proc_address_wrapper().
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 94f22b56a8139b9648094dad520d8a09466f6560 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f22b56a8139b9648094dad… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 27 14:01:55 2020 +0300 kernel32: Align stack in get_proc_address_wrapper(). Fixes crash on start in Nier Automata after switching kernel32 to PE. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 12100c1fe23..9b3a3952307 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -320,18 +320,18 @@ __ASM_GLOBAL_FUNC( get_proc_address_wrapper, "movq %rsp,%rbp\n\t" __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") - "subq $0x40,%rsp\n\t" - __ASM_SEH(".seh_stackalloc 0x40\n\t") __ASM_SEH(".seh_endprologue\n\t") - "movaps %xmm0,-0x10(%rbp)\n\t" - "movaps %xmm1,-0x20(%rbp)\n\t" - "movaps %xmm2,-0x30(%rbp)\n\t" - "movaps %xmm3,-0x40(%rbp)\n\t" + "subq $0x60,%rsp\n\t" + "andq $~15,%rsp\n\t" + "movaps %xmm0,0x20(%rsp)\n\t" + "movaps %xmm1,0x30(%rsp)\n\t" + "movaps %xmm2,0x40(%rsp)\n\t" + "movaps %xmm3,0x50(%rsp)\n\t" "call " __ASM_NAME("get_proc_address") "\n\t" - "movaps -0x40(%rbp), %xmm3\n\t" - "movaps -0x30(%rbp), %xmm2\n\t" - "movaps -0x20(%rbp), %xmm1\n\t" - "movaps -0x10(%rbp), %xmm0\n\t" + "movaps 0x50(%rsp), %xmm3\n\t" + "movaps 0x40(%rsp), %xmm2\n\t" + "movaps 0x30(%rsp), %xmm1\n\t" + "movaps 0x20(%rsp), %xmm0\n\t" "leaq 0(%rbp),%rsp\n\t" __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") "popq %rbp\n\t"

1 0

Esme Povirk : windowscodecs: Move TIFF decoding to unix lib.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 6abf518ece5c0a8955ed5c6a343292a67d818a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6abf518ece5c0a8955ed5c6a… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Oct 27 12:54:42 2020 -0500 windowscodecs: Move TIFF decoding to unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/decoder.c | 76 +- dlls/windowscodecs/libtiff.c | 1187 ++++++++++++++++++++++++++ dlls/windowscodecs/main.c | 32 +- dlls/windowscodecs/tiffformat.c | 1428 +------------------------------- dlls/windowscodecs/unix_iface.c | 1 + dlls/windowscodecs/unix_lib.c | 8 + dlls/windowscodecs/wincodecs_common.h | 19 + dlls/windowscodecs/wincodecs_private.h | 7 + 9 files changed, 1312 insertions(+), 1447 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6abf518ece5c0a8955ed…

1 0

Nikolay Sivov : evr: Implement sample allocator.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 26d5d384f15f5fd1080d6d8b138c211d810eb88b URL: https://source.winehq.org/git/wine.git/?a=commit;h=26d5d384f15f5fd1080d6d8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 27 20:50:20 2020 +0300 evr: Implement sample allocator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 284 +++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/evr/tests/evr.c | 23 ++--- dlls/mf/tests/mf.c | 1 - 3 files changed, 283 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=26d5d384f15f5fd1080d…

1 0

Alexandre Julliard : gdi32: Move the CreateScalableFontResource() implementation out of freetype.c.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: ed9114c1181c1af67264433f6910039a31882052 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed9114c1181c1af67264433f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 14:25:47 2020 +0100 gdi32: Move the CreateScalableFontResource() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 249 +++++++++++++++++++++++++++++++++++++- dlls/gdi32/freetype.c | 309 ++--------------------------------------------- dlls/gdi32/gdi_private.h | 3 +- 3 files changed, 257 insertions(+), 304 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed9114c1181c1af67264…

1 0