wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Sergei Trofimovich : aclocal.m4: Fix compatibility with upcoming autoconf-2.70.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: d7645b67c350f7179a1eba749ec4524c74948d86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7645b67c350f7179a1eba74… Author: Sergei Trofimovich <slyfox(a)gentoo.org> Date: Thu Oct 29 22:51:57 2020 +0000 aclocal.m4: Fix compatibility with upcoming autoconf-2.70. Under autoconf 2.69c (beta) `./configure` fails as: ``` ./configure ... checking for msgfmt... msgfmt ./configure: line 7441: syntax error near unexpected token `newline' ./configure: line 7441: ` ''' ``` This happens due to underquoting of a snippet argument for `AS_VAR_SET_IF` call. Signed-off-by: Sergei Trofimovich <slyfox(a)gentoo.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aclocal.m4 b/aclocal.m4 index c5edd85cee4..bd8ca6b33e5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -28,7 +28,7 @@ dnl Like AC_CHECK_TOOL but without the broken fallback to non-prefixed name dnl AC_DEFUN([WINE_CHECK_HOST_TOOL], [AS_VAR_SET_IF([ac_tool_prefix], - AC_CHECK_PROG([$1],[${ac_tool_prefix}$2],[${ac_tool_prefix}$2],,[$4])) + [AC_CHECK_PROG([$1],[${ac_tool_prefix}$2],[${ac_tool_prefix}$2],,[$4])]) AS_VAR_IF([ac_cv_prog_$1],[], [AS_VAR_IF([cross_compiling],[yes],[], [AS_UNSET([ac_cv_prog_$1])

1 0

Georg Lehmann : winevulkan: Implement VK_EXT_debug_marker.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: fc893489fe89c9fbd22f0cbe1c4327c64f05e0dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc893489fe89c9fbd22f0cbe… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Oct 29 23:48:42 2020 +0100 winevulkan: Implement VK_EXT_debug_marker. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49813 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 5 ++- dlls/winevulkan/vulkan.c | 24 +++++++++++++ dlls/winevulkan/vulkan_thunks.c | 76 +++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 44 ++++++++++++++++++++++++ include/wine/vulkan.h | 43 +++++++++++++++++++++++ 5 files changed, 191 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc893489fe89c9fbd22f…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 9c683cd12c927fe443224b90bd0efd57d7abe1f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c683cd12c927fe443224b90… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Oct 29 23:45:37 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index fb2cd8900ff..d4733396c7e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-10-14 12:00+0300\n" +"PO-Revision-Date: 2020-10-29 23:45+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10338,16 +10338,12 @@ msgid "Arabian Daylight Time" msgstr "Arabų vasaros laikas" #: dlls/tzres/tzres.rc:214 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Tocantins Standard Time" -msgstr "Kalnų juostinis laikas" +msgstr "Tokantinso juostinis laikas" #: dlls/tzres/tzres.rc:215 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Tocantins Daylight Time" -msgstr "Kalnų vasaros laikas" +msgstr "Tokantinso vasaros laikas" #: dlls/tzres/tzres.rc:190 msgid "Russian Standard Time"

1 0

Zhiyi Zhang : wined3d: Store a struct wined3d pointer in struct wined3d_swapchain_state.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: c9e2deac39924473ac538ee22a2a0c0dbe3bad85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9e2deac39924473ac538ee2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 28 14:38:44 2020 +0800 wined3d: Store a struct wined3d pointer in struct wined3d_swapchain_state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 3 ++- dlls/wined3d/wined3d_main.c | 22 +++++++++------------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index aa56634f3f3..847907c6d4c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1319,11 +1319,12 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat } GetWindowRect(window, &state->original_window_rect); + state->wined3d = wined3d; state->device_window = window; state->parent = parent; if (desc->flags & WINED3D_SWAPCHAIN_REGISTER_STATE) - wined3d_swapchain_state_register(state, wined3d); + wined3d_swapchain_state_register(state); return hr; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 7e96f874682..e1ed86e80ed 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -59,7 +59,6 @@ struct wined3d_window_hook struct wined3d_registered_swapchain_state { struct wined3d_swapchain_state *state; - struct wined3d *wined3d; DWORD thread_id; }; @@ -574,8 +573,8 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam) { - struct wined3d_registered_swapchain_state *registered_state; struct wined3d_swapchain_desc swapchain_desc; + struct wined3d_swapchain_state *state; struct wined3d_wndproc *entry; struct wined3d_output *output; MSG *msg = (MSG *)lparam; @@ -589,26 +588,25 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam for (i = 0; i < swapchain_state_table.state_count; ++i) { - registered_state = &swapchain_state_table.states[i]; + state = swapchain_state_table.states[i].state; - if (registered_state->state->device_window != msg->hwnd) + if (state->device_window != msg->hwnd) continue; - if ((entry = wined3d_find_wndproc(msg->hwnd, registered_state->wined3d)) + if ((entry = wined3d_find_wndproc(msg->hwnd, state->wined3d)) && (entry->flags & (WINED3D_REGISTER_WINDOW_NO_WINDOW_CHANGES | WINED3D_REGISTER_WINDOW_NO_ALT_ENTER))) continue; - swapchain_desc = registered_state->state->desc; + swapchain_desc = state->desc; swapchain_desc.windowed = !swapchain_desc.windowed; - if (!(output = wined3d_get_output_from_window(registered_state->wined3d, - registered_state->state->device_window))) + if (!(output = wined3d_get_output_from_window(state->wined3d, state->device_window))) { - ERR("Failed to get output from window %p.\n", registered_state->state->device_window); + ERR("Failed to get output from window %p.\n", state->device_window); break; } swapchain_desc.output = output; - wined3d_swapchain_state_set_fullscreen(registered_state->state, &swapchain_desc, NULL); + wined3d_swapchain_state_set_fullscreen(state, &swapchain_desc, NULL); wined3d_wndproc_mutex_unlock(); @@ -774,8 +772,7 @@ static struct wined3d_window_hook *wined3d_find_hook(DWORD thread_id) return NULL; } -void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, - struct wined3d *wined3d) +void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state) { struct wined3d_registered_swapchain_state *state_entry; struct wined3d_window_hook *hook; @@ -791,7 +788,6 @@ void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, state_entry = &swapchain_state_table.states[swapchain_state_table.state_count++]; state_entry->state = state; - state_entry->wined3d = wined3d; state_entry->thread_id = GetWindowThreadProcessId(state->device_window, NULL); if ((hook = wined3d_find_hook(state_entry->thread_id))) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6d7dcbc91dd..15380f5ac81 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5072,6 +5072,7 @@ void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_vie struct wined3d_swapchain_state { + struct wined3d *wined3d; struct wined3d_swapchain_desc desc; struct wined3d_swapchain_state_parent *parent; @@ -5085,8 +5086,7 @@ struct wined3d_swapchain_state }; void wined3d_swapchain_state_cleanup(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; -void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, - struct wined3d *wined3d) DECLSPEC_HIDDEN; +void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state,

1 0

Daniel Lehman : tzres: Add Tocantins Standard Time Zone.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: a7634295d6a73fbbf51dbaf0e6faae673ba26312 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7634295d6a73fbbf51dbaf0… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Oct 29 07:07:43 2020 -0700 tzres: Add Tocantins Standard Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 ++ loader/wine.inf.in | 12 +++++++++ po/ar.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ast.po | 70 ++++++++++++++++++++++++++++++---------------------- po/bg.po | 66 +++++++++++++++++++++++++++---------------------- po/ca.po | 70 ++++++++++++++++++++++++++++++---------------------- po/cs.po | 70 ++++++++++++++++++++++++++++++---------------------- po/da.po | 70 ++++++++++++++++++++++++++++++---------------------- po/de.po | 70 ++++++++++++++++++++++++++++++---------------------- po/el.po | 66 +++++++++++++++++++++++++++---------------------- po/en.po | 66 +++++++++++++++++++++++++++---------------------- po/en_US.po | 66 +++++++++++++++++++++++++++---------------------- po/eo.po | 70 ++++++++++++++++++++++++++++++---------------------- po/es.po | 70 ++++++++++++++++++++++++++++++---------------------- po/fa.po | 68 ++++++++++++++++++++++++++++---------------------- po/fi.po | 70 ++++++++++++++++++++++++++++++---------------------- po/fr.po | 70 ++++++++++++++++++++++++++++++---------------------- po/he.po | 70 ++++++++++++++++++++++++++++++---------------------- po/hi.po | 66 +++++++++++++++++++++++++++---------------------- po/hr.po | 70 ++++++++++++++++++++++++++++++---------------------- po/hu.po | 70 ++++++++++++++++++++++++++++++---------------------- po/it.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ja.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ko.po | 70 ++++++++++++++++++++++++++++++---------------------- po/lt.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ml.po | 66 +++++++++++++++++++++++++++---------------------- po/nb_NO.po | 70 ++++++++++++++++++++++++++++++---------------------- po/nl.po | 70 ++++++++++++++++++++++++++++++---------------------- po/or.po | 66 +++++++++++++++++++++++++++---------------------- po/pa.po | 66 +++++++++++++++++++++++++++---------------------- po/pl.po | 70 ++++++++++++++++++++++++++++++---------------------- po/pt_BR.po | 70 ++++++++++++++++++++++++++++++---------------------- po/pt_PT.po | 70 ++++++++++++++++++++++++++++++---------------------- po/rm.po | 66 +++++++++++++++++++++++++++---------------------- po/ro.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ru.po | 66 +++++++++++++++++++++++++++---------------------- po/si.po | 70 ++++++++++++++++++++++++++++++---------------------- po/sk.po | 70 ++++++++++++++++++++++++++++++---------------------- po/sl.po | 70 ++++++++++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 68 ++++++++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 68 ++++++++++++++++++++++++++++---------------------- po/sv.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ta.po | 66 +++++++++++++++++++++++++++---------------------- po/te.po | 66 +++++++++++++++++++++++++++---------------------- po/th.po | 68 ++++++++++++++++++++++++++++---------------------- po/tr.po | 70 ++++++++++++++++++++++++++++++---------------------- po/uk.po | 66 +++++++++++++++++++++++++++---------------------- po/wa.po | 68 ++++++++++++++++++++++++++++---------------------- po/wine.pot | 66 +++++++++++++++++++++++++++---------------------- po/zh_CN.po | 70 ++++++++++++++++++++++++++++++---------------------- po/zh_TW.po | 70 ++++++++++++++++++++++++++++++---------------------- 51 files changed, 1957 insertions(+), 1421 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7634295d6a73fbbf51d…

1 0

Nikolay Sivov : evr/tests: Add sample allocator test with surface-backed buffers.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 7aad298f7158e5b5f79a37c29626afc5b84ed784 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aad298f7158e5b5f79a37c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 29 18:03:25 2020 +0300 evr/tests: Add sample allocator test with surface-backed buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 116 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 89 insertions(+), 27 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index fbcf798157e..e4f45396ae8 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1302,13 +1302,19 @@ static void test_MFCreateVideoSampleAllocator(void) IMFVideoSampleAllocatorCallback *allocator_cb; IMFMediaType *media_type, *video_type; IMFVideoSampleAllocator *allocator; + IDirect3DDeviceManager9 *manager; IMFSample *sample, *sample2; IDirect3DSurface9 *surface; + IDirect3DDevice9 *device; IMFMediaBuffer *buffer; + unsigned int token; IMFGetService *gs; + IDirect3D9 *d3d; IUnknown *unk; + HWND window; HRESULT hr; LONG count; + BYTE *data; hr = MFCreateVideoSampleAllocator(&IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1387,48 +1393,104 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(count == 4, "Unexpected count %d.\n", count); - if (sample) - { - hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); - hr = IMFSample_QueryInterface(sample, &IID_IMFTrackedSample, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + hr = IMFSample_QueryInterface(sample, &IID_IMFTrackedSample, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); - hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#x.\n", hr); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#x.\n", hr); - /* Device manager wasn't set, sample gets regular memory buffers. */ - if (SUCCEEDED(hr)) - { - hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); - IMFGetService_Release(gs); - } + /* Device manager wasn't set, sample gets regular memory buffers. */ + if (SUCCEEDED(hr)) + { + hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMFGetService_Release(gs); + } - hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); - IMFMediaBuffer_Release(buffer); + IMFMediaBuffer_Release(buffer); - IMFSample_Release(sample); - } + IMFSample_Release(sample); IMFVideoSampleAllocatorCallback_Release(allocator_cb); - IMFMediaType_Release(media_type); - IMFVideoSampleAllocator_Release(allocator); hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocatorCallback, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + + /* Using device manager */ + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); + ok(hr == S_OK, "Failed to set a device, hr %#x.\n", hr); + + hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, (IUnknown *)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64) 320 << 32 | 240); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 0, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFGetService((IUnknown *)buffer, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IDirect3DSurface9_Release(surface); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFSample_Release(sample); + + IMFVideoSampleAllocator_Release(allocator); + + IMFMediaType_Release(media_type); + IDirect3DDeviceManager9_Release(manager); + IDirect3DDevice9_Release(device); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } struct test_host

1 0

Nikolay Sivov : include: Add IMFVideoSampleAllocatorEx.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 99c1f2a0a8f3aa60728acc239e11dad669dd0bf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99c1f2a0a8f3aa60728acc23… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 29 18:03:11 2020 +0300 include: Add IMFVideoSampleAllocatorEx. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 9f2d825bd5f..dd5de8d0d2f 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1147,6 +1147,22 @@ interface IMFVideoSampleAllocatorCallback : IUnknown ); } +[ + object, + uuid(545b3a48-3283-4f62-866f-a62d8f598f9f), + local, + pointer_default(unique) +] +interface IMFVideoSampleAllocatorEx : IMFVideoSampleAllocator +{ + HRESULT InitializeSampleAllocatorEx( + DWORD initial_sample_count, + DWORD max_sample_count, + IMFAttributes *attributes, + IMFMediaType *media_type + ); +} + enum { MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL = 0x00000001,

1 0

Alexandre Julliard : winebuild: Set PE timestamps to a hash of the file name.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: d5c089f5fa71e2ae568b2f1bcb9158223c552040 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5c089f5fa71e2ae568b2f1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 16:49:29 2020 +0100 winebuild: Set PE timestamps to a hash of the file name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44061 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index efb136a8e61..ba2edfb588f 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -51,6 +51,14 @@ int needs_get_pc_thunk = 0; static const char builtin_signature[32] = "Wine builtin DLL"; static const char fakedll_signature[32] = "Wine placeholder DLL"; +static unsigned int hash_filename( const char *name ) +{ + /* FNV-1 hash */ + unsigned int ret = 2166136261u; + while (*name) ret = (ret * 16777619) ^ *name++; + return ret; +} + /* check if entry point needs a relay thunk */ static inline int needs_relay( const ORDDEF *odp ) { @@ -405,7 +413,7 @@ void output_exports( DLLSPEC *spec ) /* export directory header */ output( "\t.long 0\n" ); /* Characteristics */ - output( "\t.long 0\n" ); /* TimeDateStamp */ + output( "\t.long %u\n", hash_filename(spec->file_name) ); /* TimeDateStamp */ output( "\t.long 0\n" ); /* MajorVersion/MinorVersion */ output_rva( ".L__wine_spec_exp_names" ); /* Name */ output( "\t.long %u\n", spec->base ); /* Base */ @@ -666,7 +674,7 @@ void output_module( DLLSPEC *spec ) output( "\t.short 0x%04x\n", /* Machine */ machine ); output( "\t.short 0\n" ); /* NumberOfSections */ - output( "\t.long 0\n" ); /* TimeDateStamp */ + output( "\t.long %u\n", hash_filename(spec->file_name) ); /* TimeDateStamp */ output( "\t.long 0\n" ); /* PointerToSymbolTable */ output( "\t.long 0\n" ); /* NumberOfSymbols */ output( "\t.short %d\n", /* SizeOfOptionalHeader */ @@ -817,7 +825,7 @@ void output_fake_module( DLLSPEC *spec ) case CPU_ARM64: put_word( IMAGE_FILE_MACHINE_ARM64 ); break; } put_word( nb_sections ); /* NumberOfSections */ - put_dword( 0 ); /* TimeDateStamp */ + put_dword( hash_filename(spec->file_name) ); /* TimeDateStamp */ put_dword( 0 ); /* PointerToSymbolTable */ put_dword( 0 ); /* NumberOfSymbols */ put_word( get_ptr_size() == 8 ?

1 0

Hans Leidekker : wbemprox/tests: Test more sound device properties.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 488ec98bf2080370d023211d4319beb79d58cc69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=488ec98bf2080370d023211d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 29 13:15:49 2020 +0100 wbemprox/tests: Test more sound device properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7ba55dffdfb..191b9f6c85a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1745,10 +1745,13 @@ static void test_Win32_SoundDevice( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; + check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); + check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + check_property( obj, L"PNPDeviceID", VT_BSTR, CIM_STRING ); check_property( obj, L"ProductName", VT_BSTR, CIM_STRING ); + check_property( obj, L"Status", VT_BSTR, CIM_STRING ); check_property( obj, L"StatusInfo", VT_I4, CIM_UINT16 ); - check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); }

1 0

Pengpeng Dong : wbemprox: Implement Win32_SoundDevice.{DeviceID, PNPDeviceID}.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 89698cfae4d9aefd3f77c2982e64f7b98e00edf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89698cfae4d9aefd3f77c298… Author: Pengpeng Dong <dongpengpeng(a)uniontech.com> Date: Thu Oct 29 13:15:48 2020 +0100 wbemprox: Implement Win32_SoundDevice.{DeviceID, PNPDeviceID}. Signed-off-by: Pengpeng Dong <dongpengpeng(a)uniontech.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 95 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 71 insertions(+), 24 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index e35aa069e1d..be22d8d3066 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -376,8 +376,10 @@ static const struct column col_sid[] = }; static const struct column col_sounddevice[] = { + { L"DeviceID", CIM_STRING }, { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING }, + { L"PNPDeviceID", CIM_STRING }, { L"ProductName", CIM_STRING }, { L"Status", CIM_STRING }, { L"StatusInfo", CIM_UINT16 }, @@ -766,8 +768,10 @@ struct record_sid }; struct record_sounddevice { + const WCHAR *deviceid; const WCHAR *manufacturer; const WCHAR *name; + const WCHAR *pnpdeviceid; const WCHAR *productname; const WCHAR *status; UINT16 statusinfo; @@ -886,10 +890,7 @@ static const struct record_quickfixengineering data_quickfixengineering[] = { { L"http://winehq.org", L"KB1234567" }, }; -static const struct record_sounddevice data_sounddevice[] = -{ - { L"The Wine Project", L"Wine Audio Device", L"Wine Audio Device", L"OK", 3 /* enabled */ } -}; + static const struct record_stdregprov data_stdregprov[] = { { reg_create_key, reg_enum_key, reg_enum_values, reg_get_stringvalue } @@ -3830,7 +3831,7 @@ static enum fill_status fill_systemenclosure( struct table *table, const struct return status; } -static WCHAR *get_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) +static WCHAR *get_videocontroller_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) { static const WCHAR fmtW[] = L"PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X\\0&DEADBEEF&0&DEAD"; UINT len = sizeof(fmtW) + 2; @@ -3846,7 +3847,7 @@ static WCHAR *get_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) #define HW_VENDOR_VMWARE 0x15ad #define HW_VENDOR_INTEL 0x8086 -static const WCHAR *get_installeddriver( UINT vendorid ) +static const WCHAR *get_videocontroller_installeddriver( UINT vendorid ) { /* FIXME: wined3d has a better table, but we cannot access this information through dxgi */ @@ -3856,12 +3857,32 @@ static const WCHAR *get_installeddriver( UINT vendorid ) return L"wine.dll"; } +static BOOL get_dxgi_adapter_desc( DXGI_ADAPTER_DESC *desc ) +{ + IDXGIFactory *factory; + IDXGIAdapter *adapter; + HRESULT hr; + + memset( desc, 0, sizeof(*desc) ); + hr = CreateDXGIFactory( &IID_IDXGIFactory, (void **)&factory ); + if (FAILED( hr )) return FALSE; + + hr = IDXGIFactory_EnumAdapters( factory, 0, &adapter ); + if (FAILED( hr )) + { + IDXGIFactory_Release( factory ); + return FALSE; + } + + hr = IDXGIAdapter_GetDesc( adapter, desc ); + IDXGIAdapter_Release( adapter ); + IDXGIFactory_Release( factory ); + return SUCCEEDED( hr ); +} + static enum fill_status fill_videocontroller( struct table *table, const struct expr *cond ) { struct record_videocontroller *rec; - HRESULT hr; - IDXGIFactory *factory = NULL; - IDXGIAdapter *adapter = NULL; DXGI_ADAPTER_DESC desc; UINT row = 0, hres = 1024, vres = 768, vidmem = 512 * 1024 * 1024; const WCHAR *name = L"VideoController1"; @@ -3870,22 +3891,13 @@ static enum fill_status fill_videocontroller( struct table *table, const struct if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; - memset (&desc, 0, sizeof(desc)); - hr = CreateDXGIFactory( &IID_IDXGIFactory, (void **)&factory ); - if (FAILED(hr)) goto done; - - hr = IDXGIFactory_EnumAdapters( factory, 0, &adapter ); - if (FAILED(hr)) goto done; - - hr = IDXGIAdapter_GetDesc( adapter, &desc ); - if (SUCCEEDED(hr)) + if (get_dxgi_adapter_desc( &desc )) { if (desc.DedicatedVideoMemory > UINT_MAX) vidmem = 0xfff00000; else vidmem = desc.DedicatedVideoMemory; name = desc.Description; } -done: rec = (struct record_videocontroller *)table->data; rec->adapter_compatibility = L"(Standard display types)"; rec->adapter_dactype = L"Integrated RAMDAC"; @@ -3902,9 +3914,9 @@ done: rec->device_id = L"VideoController1"; rec->driverdate = L"20170101000000.000000+000"; rec->driverversion = L"1.0"; - rec->installeddriver = get_installeddriver( desc.VendorId ); + rec->installeddriver = get_videocontroller_installeddriver( desc.VendorId ); rec->name = heap_strdupW( name ); - rec->pnpdevice_id = get_pnpdeviceid( &desc ); + rec->pnpdevice_id = get_videocontroller_pnpdeviceid( &desc ); rec->status = L"OK"; rec->videoarchitecture = 2; /* Unknown */ rec->videomemorytype = 2; /* Unknown */ @@ -3916,9 +3928,44 @@ done: TRACE("created %u rows\n", row); table->num_rows = row; + return status; +} - if (adapter) IDXGIAdapter_Release( adapter ); - if (factory) IDXGIFactory_Release( factory ); +static WCHAR *get_sounddevice_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) +{ + static const WCHAR fmtW[] = L"HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%04X\\0&DEADBEEF&0&DEAD"; + UINT len = sizeof(fmtW) + 2; + WCHAR *ret; + + if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + swprintf( ret, len, fmtW, desc->VendorId, desc->DeviceId, desc->SubSysId, desc->Revision ); + return ret; +} + +static enum fill_status fill_sounddevice( struct table *table, const struct expr *cond ) +{ + struct record_sounddevice *rec; + DXGI_ADAPTER_DESC desc; + UINT row = 0; + enum fill_status status = FILL_STATUS_UNFILTERED; + + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + get_dxgi_adapter_desc( &desc ); + + rec = (struct record_sounddevice *)table->data; + rec->deviceid = get_sounddevice_pnpdeviceid( &desc ); + rec->manufacturer = L"The Wine Project"; + rec->name = L"Wine Audio Device"; + rec->pnpdeviceid = get_sounddevice_pnpdeviceid( &desc ); + rec->productname = L"Wine Audio Device"; + rec->status = L"OK"; + rec->statusinfo = 3; + if (!match_row( table, row, cond, &status )) free_row_values( table, row ); + else row++; + + TRACE("created %u rows\n", row); + table->num_rows = row; return status; } @@ -3960,7 +4007,7 @@ static struct table builtin_classes[] = { L"Win32_QuickFixEngineering", C(col_quickfixengineering), D(data_quickfixengineering) }, { L"Win32_SID", C(col_sid), 0, 0, NULL, fill_sid }, { L"Win32_Service", C(col_service), 0, 0, NULL, fill_service }, - { L"Win32_SoundDevice", C(col_sounddevice), D(data_sounddevice) }, + { L"Win32_SoundDevice", C(col_sounddevice), 0, 0, NULL, fill_sounddevice }, { L"Win32_SystemEnclosure", C(col_systemenclosure), 0, 0, NULL, fill_systemenclosure }, { L"Win32_VideoController", C(col_videocontroller), 0, 0, NULL, fill_videocontroller }, { L"Win32_WinSAT", C(col_winsat), D(data_winsat) },

1 0

← Newer
1
2
3
4
5
6
7
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2020