October 2020 - Wine-commits

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

27 Oct '20

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

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

27 Oct '20

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

Nikolay Sivov : evr: Implement sample allocator.
by Alexandre Julliard 27 Oct '20

27 Oct '20

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

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

27 Oct '20

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

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

27 Oct '20

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

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

27 Oct '20

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

Austin English : d3d8thk: Add stub dll.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: f242f0ef1d6a601959f6769b44fe554b5751c97c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f242f0ef1d6a601959f6769b… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Oct 24 03:38:32 2020 -0500 d3d8thk: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/d3d8thk/Makefile.in | 8 +++++++ dlls/d3d8thk/d3d8thk.spec | 56 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d8thk/d3d8thk_main.c | 42 ++++++++++++++++++++++++++++++++++ dlls/d3d8thk/version.rc | 26 +++++++++++++++++++++ 6 files changed, 135 insertions(+) diff --git a/configure b/configure index 2686af02232..6e1290b0cf0 100755 --- a/configure +++ b/configure @@ -1189,6 +1189,7 @@ enable_d3d10core enable_d3d11 enable_d3d12 enable_d3d8 +enable_d3d8thk enable_d3d9 enable_d3dcompiler_33 enable_d3dcompiler_34 @@ -20392,6 +20393,7 @@ wine_fn_config_makefile dlls/d3d12 enable_d3d12 wine_fn_config_makefile dlls/d3d12/tests enable_tests wine_fn_config_makefile dlls/d3d8 enable_d3d8 wine_fn_config_makefile dlls/d3d8/tests enable_tests +wine_fn_config_makefile dlls/d3d8thk enable_d3d8thk wine_fn_config_makefile dlls/d3d9 enable_d3d9 wine_fn_config_makefile dlls/d3d9/tests enable_tests wine_fn_config_makefile dlls/d3dcompiler_33 enable_d3dcompiler_33 diff --git a/configure.ac b/configure.ac index 372785ee0fd..331ae064bdc 100644 --- a/configure.ac +++ b/configure.ac @@ -3137,6 +3137,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d12) WINE_CONFIG_MAKEFILE(dlls/d3d12/tests) WINE_CONFIG_MAKEFILE(dlls/d3d8) WINE_CONFIG_MAKEFILE(dlls/d3d8/tests) +WINE_CONFIG_MAKEFILE(dlls/d3d8thk) WINE_CONFIG_MAKEFILE(dlls/d3d9) WINE_CONFIG_MAKEFILE(dlls/d3d9/tests) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_33) diff --git a/dlls/d3d8thk/Makefile.in b/dlls/d3d8thk/Makefile.in new file mode 100644 index 00000000000..b84c8d171f1 --- /dev/null +++ b/dlls/d3d8thk/Makefile.in @@ -0,0 +1,8 @@ +MODULE = d3d8thk.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + d3d8thk_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3d8thk/d3d8thk.spec b/dlls/d3d8thk/d3d8thk.spec new file mode 100644 index 00000000000..30b01e4c672 --- /dev/null +++ b/dlls/d3d8thk/d3d8thk.spec @@ -0,0 +1,56 @@ +@ stub OsThunkD3dContextCreate +@ stub OsThunkD3dContextDestroy +@ stub OsThunkD3dContextDestroyAll +@ stub OsThunkD3dDrawPrimitives2 +@ stub OsThunkD3dValidateTextureStageState +@ stub OsThunkDdAddAttachedSurface +@ stub OsThunkDdAlphaBlt +@ stub OsThunkDdAttachSurface +@ stub OsThunkDdBeginMoCompFrame +@ stub OsThunkDdBlt +@ stub OsThunkDdCanCreateD3DBuffer +@ stub OsThunkDdCanCreateSurface +@ stub OsThunkDdColorControl +@ stub OsThunkDdCreateD3DBuffer +@ stub OsThunkDdCreateDirectDrawObject +@ stub OsThunkDdCreateMoComp +@ stub OsThunkDdCreateSurface +@ stub OsThunkDdCreateSurfaceEx +@ stub OsThunkDdCreateSurfaceObject +@ stub OsThunkDdDeleteDirectDrawObject +@ stub OsThunkDdDeleteSurfaceObject +@ stub OsThunkDdDestroyD3DBuffer +@ stub OsThunkDdDestroyMoComp +@ stub OsThunkDdDestroySurface +@ stub OsThunkDdEndMoCompFrame +@ stub OsThunkDdFlip +@ stub OsThunkDdFlipToGDISurface +@ stub OsThunkDdGetAvailDriverMemory +@ stub OsThunkDdGetBltStatus +@ stub OsThunkDdGetDC +@ stub OsThunkDdGetDriverInfo +@ stub OsThunkDdGetDriverState +@ stub OsThunkDdGetDxHandle +@ stub OsThunkDdGetFlipStatus +@ stub OsThunkDdGetInternalMoCompInfo +@ stub OsThunkDdGetMoCompBuffInfo +@ stub OsThunkDdGetMoCompFormats +@ stub OsThunkDdGetMoCompGuids +@ stub OsThunkDdGetScanLine +@ stub OsThunkDdLock +@ stub OsThunkDdLockD3D +@ stub OsThunkDdQueryDirectDrawObject +@ stub OsThunkDdQueryMoCompStatus +@ stub OsThunkDdReenableDirectDrawObject +@ stub OsThunkDdReleaseDC +@ stub OsThunkDdRenderMoComp +@ stub OsThunkDdResetVisrgn +@ stub OsThunkDdSetColorKey +@ stub OsThunkDdSetExclusiveMode +@ stub OsThunkDdSetGammaRamp +@ stub OsThunkDdSetOverlayPosition +@ stub OsThunkDdUnattachSurface +@ stub OsThunkDdUnlock +@ stub OsThunkDdUnlockD3D +@ stub OsThunkDdUpdateOverlay +@ stub OsThunkDdWaitForVerticalBlank diff --git a/dlls/d3d8thk/d3d8thk_main.c b/dlls/d3d8thk/d3d8thk_main.c new file mode 100644 index 00000000000..1d89cb48720 --- /dev/null +++ b/dlls/d3d8thk/d3d8thk_main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d8thk); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/d3d8thk/version.rc b/dlls/d3d8thk/version.rc new file mode 100644 index 00000000000..444630a7745 --- /dev/null +++ b/dlls/d3d8thk/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine d3d8thk" +#define WINE_FILENAME_STR "d3d8thk.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : d3dim700: Add stub dll.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: edd00eb538259d85e5a1c58d857e7f2ec4700c41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edd00eb538259d85e5a1c58d… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Oct 25 01:22:14 2020 -0500 d3dim700: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/d3dim700/Makefile.in | 8 ++++++++ dlls/d3dim700/d3dim700.spec | 18 ++++++++++++++++++ dlls/d3dim700/d3dim700_main.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3dim700/version.rc | 26 ++++++++++++++++++++++++++ 6 files changed, 97 insertions(+) diff --git a/configure b/configure index 6e1290b0cf0..ac6a7985cc7 100755 --- a/configure +++ b/configure @@ -1205,6 +1205,7 @@ enable_d3dcompiler_43 enable_d3dcompiler_46 enable_d3dcompiler_47 enable_d3dim +enable_d3dim700 enable_d3drm enable_d3dx10_33 enable_d3dx10_34 @@ -20412,6 +20413,7 @@ wine_fn_config_makefile dlls/d3dcompiler_46 enable_d3dcompiler_46 wine_fn_config_makefile dlls/d3dcompiler_47 enable_d3dcompiler_47 wine_fn_config_makefile dlls/d3dcompiler_47/tests enable_tests wine_fn_config_makefile dlls/d3dim enable_d3dim +wine_fn_config_makefile dlls/d3dim700 enable_d3dim700 wine_fn_config_makefile dlls/d3drm enable_d3drm wine_fn_config_makefile dlls/d3drm/tests enable_tests wine_fn_config_makefile dlls/d3dx10_33 enable_d3dx10_33 diff --git a/configure.ac b/configure.ac index 331ae064bdc..2f81fd22610 100644 --- a/configure.ac +++ b/configure.ac @@ -3156,6 +3156,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_46) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47/tests) WINE_CONFIG_MAKEFILE(dlls/d3dim) +WINE_CONFIG_MAKEFILE(dlls/d3dim700) WINE_CONFIG_MAKEFILE(dlls/d3drm) WINE_CONFIG_MAKEFILE(dlls/d3drm/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_33) diff --git a/dlls/d3dim700/Makefile.in b/dlls/d3dim700/Makefile.in new file mode 100644 index 00000000000..12a28ae475a --- /dev/null +++ b/dlls/d3dim700/Makefile.in @@ -0,0 +1,8 @@ +MODULE = d3dim700.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + d3dim700_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3dim700/d3dim700.spec b/dlls/d3dim700/d3dim700.spec new file mode 100644 index 00000000000..3fe16bb86ed --- /dev/null +++ b/dlls/d3dim700/d3dim700.spec @@ -0,0 +1,18 @@ +@ stub D3DFree +@ stub D3DMalloc +@ stub D3DRealloc +@ stub Direct3DCreateDevice +@ stub CreateTexture +@ stub D3DBreakVBLock +@ stub D3DTextureUpdate +@ stub DestroyTexture +@ stub Direct3DCreate +@ stub Direct3D_HALCleanUp +@ stub FlushD3DDevices +@ stub GetLOD +@ stub GetPriority +@ stub PaletteAssociateNotify +@ stub PaletteUpdateNotify +@ stub SetLOD +@ stub SetPriority +@ stub SurfaceFlipNotify diff --git a/dlls/d3dim700/d3dim700_main.c b/dlls/d3dim700/d3dim700_main.c new file mode 100644 index 00000000000..18a211ccc74 --- /dev/null +++ b/dlls/d3dim700/d3dim700_main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dim700); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/d3dim700/version.rc b/dlls/d3dim700/version.rc new file mode 100644 index 00000000000..cff97677690 --- /dev/null +++ b/dlls/d3dim700/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine d3dim700" +#define WINE_FILENAME_STR "d3dim700.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Biswapriyo Nath : mf/evr: Initialize variables which are checked conditionally.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 8c51bcb8a1d4db65fa1df9d436dc31d4c2ed890d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c51bcb8a1d4db65fa1df9d4… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Oct 24 18:27:27 2020 +0530 mf/evr: Initialize variables which are checked conditionally. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index e408b204304..4dca8515c94 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -2057,8 +2057,8 @@ static const IMFAttributesVtbl video_renderer_attributes_vtbl = static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct video_renderer *object; - IMFVideoPresenter *presenter; - IMFTransform *mixer; + IMFVideoPresenter *presenter = NULL; + IMFTransform *mixer = NULL; HRESULT hr; TRACE("%p, %p, %p.\n", attributes, user_context, obj);

1 0

Eric Kohl : widl: Add the [allocate] acf attribute.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: ba72ef6c22b26ef9addc8c9af6c2e9ab88529ca5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba72ef6c22b26ef9addc8c9a… Author: Eric Kohl <eric.kohl(a)reactos.org> Date: Wed Oct 14 23:24:34 2020 +0200 widl: Add the [allocate] acf attribute. Signed-off-by: Eric Kohl <eric.kohl(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 3 +++ tools/widl/parser.y | 33 +++++++++++++++++++++++++++++---- tools/widl/typegen.c | 7 +++++++ tools/widl/widltypes.h | 1 + 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 925265d00db..f2c09cd8051 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -318,6 +318,7 @@ static const struct keyword keywords[] = { static const struct keyword attr_keywords[] = { {"aggregatable", tAGGREGATABLE}, + {"all_nodes", tALLNODES}, {"allocate", tALLOCATE}, {"annotation", tANNOTATION}, {"apartment", tAPARTMENT}, @@ -345,6 +346,7 @@ static const struct keyword attr_keywords[] = {"disable_consistency_check", tDISABLECONSISTENCYCHECK}, {"displaybind", tDISPLAYBIND}, {"dllname", tDLLNAME}, + {"dont_free", tDONTFREE}, {"dual", tDUAL}, {"enable_allocate", tENABLEALLOCATE}, {"encode", tENCODE}, @@ -406,6 +408,7 @@ static const struct keyword attr_keywords[] = {"restricted", tRESTRICTED}, {"retval", tRETVAL}, {"single", tSINGLE}, + {"single_node", tSINGLENODE}, {"size_is", tSIZEIS}, {"source", tSOURCE}, {"strict_context_handle", tSTRICTCONTEXTHANDLE}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5bc0d82703e..686aa6b58a8 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -172,7 +172,7 @@ static typelib_t *current_typelib; %token GREATEREQUAL LESSEQUAL %token LOGICALOR LOGICALAND %token ELLIPSIS -%token tAGGREGATABLE tALLOCATE tANNOTATION tAPPOBJECT tASYNC tASYNCUUID +%token tAGGREGATABLE tALLNODES tALLOCATE tANNOTATION tAPPOBJECT tASYNC tASYNCUUID %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS %token tCONST tCONTEXTHANDLE tCONTEXTHANDLENOSERIALIZE @@ -183,7 +183,7 @@ static typelib_t *current_typelib; %token tDEFAULTVTABLE %token tDISABLECONSISTENCYCHECK tDISPLAYBIND %token tDISPINTERFACE -%token tDLLNAME tDOUBLE tDUAL +%token tDLLNAME tDONTFREE tDOUBLE tDUAL %token tENABLEALLOCATE tENCODE tENDPOINT %token tENTRY tENUM tERRORSTATUST %token tEXPLICITHANDLE tEXTERN @@ -235,7 +235,7 @@ static typelib_t *current_typelib; %token tRETVAL %token tSAFEARRAY %token tSHORT -%token tSIGNED +%token tSIGNED tSINGLENODE %token tSIZEIS tSIZEOF %token tSMALL %token tSOURCE @@ -296,6 +296,7 @@ static typelib_t *current_typelib; %type <statement> statement typedef pragma_warning %type <stmt_list> gbl_statements imp_statements int_statements %type <warning_list> warnings +%type <num> allocate_option_list allocate_option %left ',' %right '?' ':' @@ -1150,16 +1151,20 @@ version: acf_statements : /* empty */ | acf_interface acf_statements + ; acf_int_statements : /* empty */ | acf_int_statement acf_int_statements + ; acf_int_statement : tTYPEDEF acf_attributes aKNOWNTYPE ';' { type_t *type = find_type_or_error($3, 0); type->attrs = append_attr_list(type->attrs, $2); } + ; + acf_interface : acf_attributes tINTERFACE aKNOWNTYPE '{' acf_int_statements '}' { type_t *iface = find_type_or_error2($3, 0); @@ -1167,19 +1172,38 @@ acf_interface error_loc("%s is not an interface\n", iface->name); iface->attrs = append_attr_list(iface->attrs, $1); } + ; acf_attributes : /* empty */ { $$ = NULL; }; | '[' acf_attribute_list ']' { $$ = $2; }; + ; acf_attribute_list : acf_attribute { $$ = append_attr(NULL, $1); } | acf_attribute_list ',' acf_attribute { $$ = append_attr($1, $3); } + ; acf_attribute - : tENCODE { $$ = make_attr(ATTR_ENCODE); } + : tALLOCATE '(' allocate_option_list ')' + { $$ = make_attrv(ATTR_ALLOCATE, $3); } + | tENCODE { $$ = make_attr(ATTR_ENCODE); } | tDECODE { $$ = make_attr(ATTR_DECODE); } | tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); } + ; + +allocate_option_list + : allocate_option { $$ = $1; } + | allocate_option_list ',' allocate_option + { $$ = $1 | $3; } + ; + +allocate_option + : tDONTFREE { $$ = FC_DONT_FREE; } + | tFREE { $$ = 0; } + | tALLNODES { $$ = FC_ALLOCATE_ALL_NODES; } + | tSINGLENODE { $$ = 0; } + ; %% @@ -2122,6 +2146,7 @@ struct allowed_attr allowed_attr[] = { /* attr { D ACF I Fn ARG T En Enm St Un Fi L DI M C <display name> } */ /* ATTR_AGGREGATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "aggregatable" }, + /* ATTR_ALLOCATE */ { 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "allocate" }, /* ATTR_ANNOTATION */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "annotation" }, /* ATTR_APPOBJECT */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "appobject" }, /* ATTR_ASYNC */ { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "async" }, diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 04280cbb722..4874dfd6c24 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2153,6 +2153,9 @@ static unsigned int write_nonsimple_pointer(FILE *file, const attr_list_t *attrs type_t *ref = type_pointer_get_ref_type(type); if(is_declptr(ref) && !is_user_type(ref)) flags |= FC_POINTER_DEREF; + if (pointer_type != FC_RP) { + flags |= get_attrv(type->attrs, ATTR_ALLOCATE); + } } print_file(file, 2, "0x%x, 0x%x,\t\t/* %s", @@ -2165,6 +2168,10 @@ static unsigned int write_nonsimple_pointer(FILE *file, const attr_list_t *attrs fprintf(file, " [allocated_on_stack]"); if (flags & FC_POINTER_DEREF) fprintf(file, " [pointer_deref]"); + if (flags & FC_DONT_FREE) + fprintf(file, " [dont_free]"); + if (flags & FC_ALLOCATE_ALL_NODES) + fprintf(file, " [all_nodes]"); fprintf(file, " */\n"); } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 085a0ff55f5..2e2ee7a206b 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -69,6 +69,7 @@ typedef struct list warning_list_t; enum attr_type { ATTR_AGGREGATABLE, + ATTR_ALLOCATE, ATTR_ANNOTATION, ATTR_APPOBJECT, ATTR_ASYNC,

1 0