June 2022 - Wine-Commits - list.winehq.org

Piotr Caban : d3dx11: Use CRT memory allocators.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: c9e7db923ab122d8b51ad489084841dd8d8125ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9e7db923ab122d8b51ad489… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 1 16:44:22 2022 +0200 d3dx11: Use CRT memory allocators. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx11_43/async.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index 8d947742b9d..074a8529e4e 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -72,7 +72,7 @@ static HRESULT WINAPI memorydataloader_Destroy(ID3DX11DataLoader *iface) TRACE("iface %p.\n", iface); - HeapFree(GetProcessHeap(), 0, loader); + free(loader); return S_OK; } @@ -100,7 +100,7 @@ static HRESULT WINAPI filedataloader_Load(ID3DX11DataLoader *iface) return D3D11_ERROR_FILE_NOT_FOUND; size = GetFileSize(file, NULL); - data = HeapAlloc(GetProcessHeap(), 0, size); + data = malloc(size); if (!data) { CloseHandle(file); @@ -112,11 +112,11 @@ static HRESULT WINAPI filedataloader_Load(ID3DX11DataLoader *iface) if (!ret) { ERR("Failed to read file contents.\n"); - HeapFree(GetProcessHeap(), 0, data); + free(data); return E_FAIL; } - HeapFree(GetProcessHeap(), 0, loader->data); + free(loader->data); loader->data = data; loader->size = size; @@ -144,9 +144,9 @@ static HRESULT WINAPI filedataloader_Destroy(ID3DX11DataLoader *iface) TRACE("iface %p.\n", iface); - HeapFree(GetProcessHeap(), 0, loader->u.file.path); - HeapFree(GetProcessHeap(), 0, loader->data); - HeapFree(GetProcessHeap(), 0, loader); + free(loader->u.file.path); + free(loader->data); + free(loader); return S_OK; } @@ -202,7 +202,7 @@ static HRESULT WINAPI resourcedataloader_Destroy(ID3DX11DataLoader *iface) TRACE("iface %p.\n", iface); - HeapFree(GetProcessHeap(), 0, loader); + free(loader); return S_OK; } @@ -282,7 +282,7 @@ HRESULT WINAPI D3DX11CreateAsyncMemoryLoader(const void *data, SIZE_T data_size, if (!data || !loader) return E_FAIL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -307,12 +307,12 @@ HRESULT WINAPI D3DX11CreateAsyncFileLoaderA(const char *filename, ID3DX11DataLoa return E_FAIL; len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); - filename_w = HeapAlloc(GetProcessHeap(), 0, len * sizeof(*filename_w)); + filename_w = malloc(len * sizeof(*filename_w)); MultiByteToWideChar(CP_ACP, 0, filename, -1, filename_w, len); hr = D3DX11CreateAsyncFileLoaderW(filename_w, loader); - HeapFree(GetProcessHeap(), 0, filename_w); + free(filename_w); return hr; } @@ -326,15 +326,15 @@ HRESULT WINAPI D3DX11CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX11DataLo if (!filename || !loader) return E_FAIL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; object->ID3DX11DataLoader_iface.lpVtbl = &filedataloadervtbl; - object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1) * sizeof(WCHAR)); + object->u.file.path = malloc((lstrlenW(filename) + 1) * sizeof(WCHAR)); if (!object->u.file.path) { - HeapFree(GetProcessHeap(), 0, object); + free(object); return E_OUTOFMEMORY; } lstrcpyW(object->u.file.path, filename); @@ -356,14 +356,14 @@ HRESULT WINAPI D3DX11CreateAsyncResourceLoaderA(HMODULE module, const char *reso if (!loader) return E_FAIL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; if (!(rsrc = FindResourceA(module, resource, (const char *)RT_RCDATA))) { WARN("Failed to find resource.\n"); - HeapFree(GetProcessHeap(), 0, object); + free(object); return D3DX11_ERR_INVALID_DATA; } @@ -388,14 +388,14 @@ HRESULT WINAPI D3DX11CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res if (!loader) return E_FAIL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; if (!(rsrc = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) { WARN("Failed to find resource.\n"); - HeapFree(GetProcessHeap(), 0, object); + free(object); return D3DX11_ERR_INVALID_DATA; }

1 0

Jacek Caban : wineandroid: Move DllMain to separated file.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 2801436afe4f715b63230e592f3a0be5b4cc76fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2801436afe4f715b63230e59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 4 15:22:23 2022 +0200 wineandroid: Move DllMain to separated file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/Makefile.in | 1 + dlls/wineandroid.drv/android.h | 1 + dlls/wineandroid.drv/dllmain.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/init.c | 29 +++++++++++++++-------------- dlls/wineandroid.drv/unixlib.h | 30 ++++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 14 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index 5426fc75b94..4c4b63d2e78 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -7,6 +7,7 @@ EXTRADLLFLAGS = -mcygwin C_SRCS = \ device.c \ + dllmain.c \ init.c \ keyboard.c \ opengl.c \ diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 8008db52cfb..8b62bec862d 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -34,6 +34,7 @@ #include "winbase.h" #include "ntgdi.h" #include "wine/gdi_driver.h" +#include "unixlib.h" #include "android_native.h" diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c new file mode 100644 index 00000000000..7886efe4b58 --- /dev/null +++ b/dlls/wineandroid.drv/dllmain.c @@ -0,0 +1,36 @@ +/* + * wineandroid.drv entry points + * + * Copyright 2022 Jacek Caban for CodeWeavers + * + * 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 "unixlib.h" + + +/*********************************************************************** + * dll initialisation routine + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + if (reason == DLL_PROCESS_ATTACH) return TRUE; + + DisableThreadLibraryCalls( inst ); + return !ANDROID_CALL(init, NULL); +} diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index f769608befd..c0b3332df30 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -556,7 +556,7 @@ JavaVM **p_java_vm = NULL; jobject *p_java_object = NULL; unsigned short *p_java_gdt_sel = NULL; -static BOOL process_attach(void) +static HRESULT android_init( void *arg ) { pthread_mutexattr_t attr; jclass class; @@ -565,7 +565,7 @@ static BOOL process_attach(void) JavaVM *java_vm; void *ntdll; - if (!(ntdll = dlopen( "ntdll.so", RTLD_NOW ))) return FALSE; + if (!(ntdll = dlopen( "ntdll.so", RTLD_NOW ))) return STATUS_UNSUCCESSFUL; p_java_vm = dlsym( ntdll, "java_vm" ); p_java_object = dlsym( ntdll, "java_object" ); @@ -598,19 +598,20 @@ static BOOL process_attach(void) #endif } __wine_set_user_driver( &android_drv_funcs, WINE_GDI_DRIVER_VERSION ); - return TRUE; + return STATUS_SUCCESS; } -/*********************************************************************** - * dll initialisation routine - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +const unixlib_entry_t __wine_unix_call_funcs[] = { - switch (reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - return process_attach(); - } - return TRUE; + android_init, +}; + + +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + + +/* FIXME: Use __wine_unix_call instead */ +NTSTATUS unix_call( enum android_funcs code, void *params ) +{ + return __wine_unix_call_funcs[code]( params ); } diff --git a/dlls/wineandroid.drv/unixlib.h b/dlls/wineandroid.drv/unixlib.h new file mode 100644 index 00000000000..d8327b30f08 --- /dev/null +++ b/dlls/wineandroid.drv/unixlib.h @@ -0,0 +1,30 @@ +/* + * Copyright 2022 Jacek Caban for CodeWeavers + * + * 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 "ntuser.h" +#include "wine/unixlib.h" + +enum android_funcs +{ + unix_init, + unix_funcs_count +}; + +/* FIXME: Use __wine_unix_call when the rest of the stack is ready */ +extern NTSTATUS unix_call( enum android_funcs func, void *arg ) DECLSPEC_HIDDEN; +#define ANDROID_CALL(func, params) unix_call( unix_ ## func, params )

1 0

Jacek Caban : wineandroid: Use libc for memory allocation.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 08fff518c687b46e0bff926e055925dcd70b4094 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08fff518c687b46e0bff926e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 4 15:32:21 2022 +0200 wineandroid: Use libc for memory allocation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/device.c | 16 +++++++-------- dlls/wineandroid.drv/init.c | 4 ++-- dlls/wineandroid.drv/opengl.c | 17 ++++++++-------- dlls/wineandroid.drv/window.c | 45 +++++++++++++++++++++---------------------- 4 files changed, 41 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08fff518c687b46e0bff…

1 0

Jacek Caban : wineandroid: Use pthread for window data locking.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: f9e2dac1407560f8d1f4e41e4fca4ac123209c5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9e2dac1407560f8d1f4e41e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 4 14:08:58 2022 +0200 wineandroid: Use pthread for window data locking. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/android.h | 1 + dlls/wineandroid.drv/init.c | 1 + dlls/wineandroid.drv/window.c | 19 ++++++------------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 4348818aaf2..8008db52cfb 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -81,6 +81,7 @@ extern int ioctl_set_cursor( int id, int width, int height, * USER driver */ +extern pthread_mutex_t win_data_mutex DECLSPEC_HIDDEN; extern INT ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) DECLSPEC_HIDDEN; extern UINT ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) DECLSPEC_HIDDEN; extern SHORT ANDROID_VkKeyScanEx( WCHAR ch, HKL hkl ) DECLSPEC_HIDDEN; diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 33acb4376c5..f769608befd 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -578,6 +578,7 @@ static BOOL process_attach(void) pthread_mutexattr_init( &attr ); pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); pthread_mutex_init( &drawable_mutex, &attr ); + pthread_mutex_init( &win_data_mutex, &attr ); pthread_mutexattr_destroy( &attr ); if ((java_vm = *p_java_vm)) /* running under Java */ diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 6b019445805..18ae919651d 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -60,14 +60,7 @@ struct android_win_data #define SWP_AGG_NOPOSCHANGE (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) -static CRITICAL_SECTION win_data_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &win_data_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": win_data_section") } -}; -static CRITICAL_SECTION win_data_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +pthread_mutex_t win_data_mutex; static struct android_win_data *win_data_context[32768]; @@ -130,7 +123,7 @@ static struct android_win_data *alloc_win_data( HWND hwnd ) data->hwnd = hwnd; data->window = create_ioctl_window( hwnd, FALSE, (float)get_win_monitor_dpi( hwnd ) / NtUserGetDpiForWindow( hwnd )); - EnterCriticalSection( &win_data_section ); + pthread_mutex_lock( &win_data_mutex ); win_data_context[context_idx(hwnd)] = data; } return data; @@ -143,7 +136,7 @@ static struct android_win_data *alloc_win_data( HWND hwnd ) static void free_win_data( struct android_win_data *data ) { win_data_context[context_idx( data->hwnd )] = NULL; - LeaveCriticalSection( &win_data_section ); + pthread_mutex_unlock( &win_data_mutex ); if (data->window) release_ioctl_window( data->window ); HeapFree( GetProcessHeap(), 0, data ); } @@ -159,9 +152,9 @@ static struct android_win_data *get_win_data( HWND hwnd ) struct android_win_data *data; if (!hwnd) return NULL; - EnterCriticalSection( &win_data_section ); + pthread_mutex_lock( &win_data_mutex ); if ((data = win_data_context[context_idx(hwnd)]) && data->hwnd == hwnd) return data; - LeaveCriticalSection( &win_data_section ); + pthread_mutex_unlock( &win_data_mutex ); return NULL; } @@ -173,7 +166,7 @@ static struct android_win_data *get_win_data( HWND hwnd ) */ static void release_win_data( struct android_win_data *data ) { - if (data) LeaveCriticalSection( &win_data_section ); + if (data) pthread_mutex_unlock( &win_data_mutex ); }

1 0

Jacek Caban : wineandroid: Use pthread for locking in opengl.c.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 7aaa88f821842f089c40c67e9ec57139ab2fa732 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aaa88f821842f089c40c67e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 4 14:02:53 2022 +0200 wineandroid: Use pthread for locking in opengl.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/Makefile.in | 5 +++-- dlls/wineandroid.drv/android.h | 2 ++ dlls/wineandroid.drv/init.c | 6 ++++++ dlls/wineandroid.drv/opengl.c | 25 +++++++++---------------- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index 3f9a16bea4f..5426fc75b94 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,6 +1,7 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES -MODULE = wineandroid.drv -IMPORTS = user32 ntoskrnl win32u +MODULE = wineandroid.drv +IMPORTS = user32 ntoskrnl win32u +EXTRALIBS = $(PTHREAD_LIBS) EXTRADLLFLAGS = -mcygwin diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 91f6dc83791..4348818aaf2 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -24,6 +24,7 @@ #include <limits.h> #include <stdarg.h> #include <stdlib.h> +#include <pthread.h> #include <jni.h> #include <android/log.h> #include <android/input.h> @@ -51,6 +52,7 @@ DECL_FUNCPTR( ANativeWindow_release ); * OpenGL driver */ +extern pthread_mutex_t drawable_mutex DECLSPEC_HIDDEN; extern void update_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern struct opengl_funcs *get_wgl_driver( UINT version ) DECLSPEC_HIDDEN; diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index f06eb6471c5..33acb4376c5 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -558,6 +558,7 @@ unsigned short *p_java_gdt_sel = NULL; static BOOL process_attach(void) { + pthread_mutexattr_t attr; jclass class; jobject object; JNIEnv *jni_env; @@ -574,6 +575,11 @@ static BOOL process_attach(void) load_hardware_libs(); + pthread_mutexattr_init( &attr ); + pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); + pthread_mutex_init( &drawable_mutex, &attr ); + pthread_mutexattr_destroy( &attr ); + if ((java_vm = *p_java_vm)) /* running under Java */ { #ifdef __i386__ diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index afd1ef3f7a5..0c4f14e7cff 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -105,14 +105,7 @@ static struct list gl_drawables = LIST_INIT( gl_drawables ); static void (*pglFinish)(void); static void (*pglFlush)(void); -static CRITICAL_SECTION drawable_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &drawable_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": drawable_section") } -}; -static CRITICAL_SECTION drawable_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +pthread_mutex_t drawable_mutex; static inline BOOL is_onscreen_pixel_format( int format ) { @@ -130,7 +123,7 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, HDC hdc, int format ) gl->window = create_ioctl_window( hwnd, TRUE, 1.0f ); gl->surface = 0; gl->pbuffer = p_eglCreatePbufferSurface( display, pixel_formats[gl->format - 1].config, attribs ); - EnterCriticalSection( &drawable_section ); + pthread_mutex_lock( &drawable_mutex ); list_add_head( &gl_drawables, &gl->entry ); return gl; } @@ -139,26 +132,26 @@ static struct gl_drawable *get_gl_drawable( HWND hwnd, HDC hdc ) { struct gl_drawable *gl; - EnterCriticalSection( &drawable_section ); + pthread_mutex_lock( &drawable_mutex ); LIST_FOR_EACH_ENTRY( gl, &gl_drawables, struct gl_drawable, entry ) { if (hwnd && gl->hwnd == hwnd) return gl; if (hdc && gl->hdc == hdc) return gl; } - LeaveCriticalSection( &drawable_section ); + pthread_mutex_unlock( &drawable_mutex ); return NULL; } static void release_gl_drawable( struct gl_drawable *gl ) { - if (gl) LeaveCriticalSection( &drawable_section ); + if (gl) pthread_mutex_unlock( &drawable_mutex ); } void destroy_gl_drawable( HWND hwnd ) { struct gl_drawable *gl; - EnterCriticalSection( &drawable_section ); + pthread_mutex_lock( &drawable_mutex ); LIST_FOR_EACH_ENTRY( gl, &gl_drawables, struct gl_drawable, entry ) { if (gl->hwnd != hwnd) continue; @@ -169,7 +162,7 @@ void destroy_gl_drawable( HWND hwnd ) HeapFree( GetProcessHeap(), 0, gl ); break; } - LeaveCriticalSection( &drawable_section ); + pthread_mutex_unlock( &drawable_mutex ); } static BOOL refresh_context( struct wgl_context *ctx ) @@ -439,9 +432,9 @@ static struct wgl_context * WINAPI android_wglCreateContext( HDC hdc ) */ static BOOL WINAPI android_wglDeleteContext( struct wgl_context *ctx ) { - EnterCriticalSection( &drawable_section ); + pthread_mutex_lock( &drawable_mutex ); list_remove( &ctx->entry ); - LeaveCriticalSection( &drawable_section ); + pthread_mutex_unlock( &drawable_mutex ); p_eglDestroyContext( display, ctx->context ); return HeapFree( GetProcessHeap(), 0, ctx ); }

1 0

Piotr Caban : d3dx10: Add D3DX10CreateAsyncTextureInfoProcessor implementation.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 4537fbca8d7e5c9c8e4560126e4013a977aa8056 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4537fbca8d7e5c9c8e456012… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 26 16:03:02 2022 +0200 d3dx10: Add D3DX10CreateAsyncTextureInfoProcessor implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 61 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/d3dx10_43/dxhelpers.h | 2 ++ dlls/d3dx10_43/texture.c | 27 +++++++++++--------- 3 files changed, 77 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 33abd11eed6..0d75a64ff9e 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -19,6 +19,7 @@ #include "d3d10_1.h" #include "d3dx10.h" #include "d3dcompiler.h" +#include "dxhelpers.h" #include "wine/debug.h" @@ -272,6 +273,48 @@ static const ID3DX10DataLoaderVtbl resourcedataloadervtbl = resourcedataloader_Destroy }; +struct texture_info_processor +{ + ID3DX10DataProcessor ID3DX10DataProcessor_iface; + D3DX10_IMAGE_INFO *info; +}; + +static inline struct texture_info_processor *impl_from_ID3DX10DataProcessor(ID3DX10DataProcessor *iface) +{ + return CONTAINING_RECORD(iface, struct texture_info_processor, ID3DX10DataProcessor_iface); +} + +static HRESULT WINAPI texture_info_processor_Process(ID3DX10DataProcessor *iface, void *data, SIZE_T size) +{ + struct texture_info_processor *processor = impl_from_ID3DX10DataProcessor(iface); + + TRACE("iface %p, data %p, size %Iu.\n", iface, data, size); + return get_image_info(data, size, processor->info); +} + +static HRESULT WINAPI texture_info_processor_CreateDeviceObject(ID3DX10DataProcessor *iface, void **object) +{ + TRACE("iface %p, object %p.\n", iface, object); + return S_OK; +} + +static HRESULT WINAPI texture_info_processor_Destroy(ID3DX10DataProcessor *iface) +{ + struct texture_info_processor *processor = impl_from_ID3DX10DataProcessor(iface); + + TRACE("iface %p.\n", iface); + + free(processor); + return S_OK; +} + +static ID3DX10DataProcessorVtbl texture_info_processor_vtbl = +{ + texture_info_processor_Process, + texture_info_processor_CreateDeviceObject, + texture_info_processor_Destroy +}; + HRESULT WINAPI D3DX10CompileFromMemory(const char *data, SIZE_T data_size, const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entry_point, const char *target, UINT sflags, UINT eflags, ID3DX10ThreadPump *pump, ID3D10Blob **shader, @@ -453,8 +496,22 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res HRESULT WINAPI D3DX10CreateAsyncTextureInfoProcessor(D3DX10_IMAGE_INFO *info, ID3DX10DataProcessor **processor) { - FIXME("info %p, processor %p stub!\n", info, processor); - return E_NOTIMPL; + struct texture_info_processor *object; + + TRACE("info %p, processor %p.\n", info, processor); + + if (!processor) + return E_INVALIDARG; + + object = malloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->ID3DX10DataProcessor_iface.lpVtbl = &texture_info_processor_vtbl; + object->info = info; + + *processor = &object->ID3DX10DataProcessor_iface; + return S_OK; } HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, diff --git a/dlls/d3dx10_43/dxhelpers.h b/dlls/d3dx10_43/dxhelpers.h index d85e5878a18..82fe639c2ea 100644 --- a/dlls/d3dx10_43/dxhelpers.h +++ b/dlls/d3dx10_43/dxhelpers.h @@ -21,3 +21,5 @@ extern HRESULT load_resourceA(HMODULE module, const char *resource, void **data, DWORD *size) DECLSPEC_HIDDEN; extern HRESULT load_resourceW(HMODULE module, const WCHAR *resource, void **data, DWORD *size) DECLSPEC_HIDDEN; + +extern HRESULT get_image_info(const void *data, SIZE_T size, D3DX10_IMAGE_INFO *img_info) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 722784fc117..3930df3677f 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -382,8 +382,7 @@ HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *reso return D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); } -HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, - D3DX10_IMAGE_INFO *img_info, HRESULT *hresult) +HRESULT get_image_info(const void *data, SIZE_T size, D3DX10_IMAGE_INFO *img_info) { IWICBitmapFrameDecode *frame = NULL; IWICImagingFactory *factory = NULL; @@ -395,17 +394,9 @@ HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat GUID container_format; HRESULT hr; - TRACE("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p.\n", - src_data, src_data_size, pump, img_info, hresult); - - if (!src_data || !src_data_size || !img_info) - return E_FAIL; - if (pump) - FIXME("Thread pump is not supported yet.\n"); - WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); IWICImagingFactory_CreateStream(factory, &stream); - hr = IWICStream_InitializeFromMemory(stream, (BYTE *)src_data, src_data_size); + hr = IWICStream_InitializeFromMemory(stream, (BYTE *)data, size); if (FAILED(hr)) { WARN("Failed to initialize stream.\n"); @@ -486,6 +477,20 @@ end: return S_OK; } +HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, + D3DX10_IMAGE_INFO *img_info, HRESULT *result) +{ + TRACE("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p.\n", + src_data, src_data_size, pump, img_info, result); + + if (!src_data) + return E_FAIL; + if (pump) + FIXME("Thread pump is not supported yet.\n"); + + return get_image_info(src_data, src_data_size, img_info); +} + HRESULT WINAPI D3DX10CreateTextureFromFileA(ID3D10Device *device, const char *src_file, D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) {

1 0

Piotr Caban : d3dx10: Share code for file data loading.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 099fb5fad124186d56a263d987904e0109c9b4df URL: https://source.winehq.org/git/wine.git/?a=commit;h=099fb5fad124186d56a263d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 25 19:00:20 2022 +0200 d3dx10: Share code for file data loading. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 38 ++++++++++++++++++----------- dlls/d3dx10_43/dxhelpers.h | 19 +++++++++++++++ dlls/d3dx10_43/texture.c | 60 ++++------------------------------------------ 3 files changed, 48 insertions(+), 69 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 5a8ba77db87..21fa437ac73 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -84,38 +84,48 @@ static const ID3DX10DataLoaderVtbl memorydataloadervtbl = memorydataloader_Destroy }; -static HRESULT WINAPI filedataloader_Load(ID3DX10DataLoader *iface) +HRESULT load_file(const WCHAR *path, void **data, DWORD *size) { - struct asyncdataloader *loader = impl_from_ID3DX10DataLoader(iface); - DWORD size, read_len; + DWORD read_len; HANDLE file; - void *data; BOOL ret; - TRACE("iface %p.\n", iface); - - /* Always buffer file contents, even if Load() was already called. */ - file = CreateFileW(loader->u.file.path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + file = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (file == INVALID_HANDLE_VALUE) return D3D10_ERROR_FILE_NOT_FOUND; - size = GetFileSize(file, NULL); - data = malloc(size); - if (!data) + *size = GetFileSize(file, NULL); + *data = malloc(*size); + if (!*data) { CloseHandle(file); return E_OUTOFMEMORY; } - ret = ReadFile(file, data, size, &read_len, NULL); + ret = ReadFile(file, *data, *size, &read_len, NULL); CloseHandle(file); - if (!ret) + if (!ret || read_len != *size) { WARN("Failed to read file contents.\n"); - free(data); + free(*data); return E_FAIL; } + return S_OK; +} + +static HRESULT WINAPI filedataloader_Load(ID3DX10DataLoader *iface) +{ + struct asyncdataloader *loader = impl_from_ID3DX10DataLoader(iface); + void *data; + DWORD size; + HRESULT hr; + + TRACE("iface %p.\n", iface); + + /* Always buffer file contents, even if Load() was already called. */ + if (FAILED((hr = load_file(loader->u.file.path, &data, &size)))) + return hr; free(loader->data); loader->data = data; diff --git a/dlls/d3dx10_43/dxhelpers.h b/dlls/d3dx10_43/dxhelpers.h new file mode 100644 index 00000000000..9afc9bd901a --- /dev/null +++ b/dlls/d3dx10_43/dxhelpers.h @@ -0,0 +1,19 @@ +/* + * Copyright 2022 Piotr Caban + * + * 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 + */ + +extern HRESULT load_file(const WCHAR *path, void **data, DWORD *size) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 41f9723de6b..56258fdd60d 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -23,6 +23,7 @@ #include "d3d10_1.h" #include "d3dx10.h" #include "wincodec.h" +#include "dxhelpers.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -291,57 +292,6 @@ static DXGI_FORMAT get_d3dx10_dds_format(DXGI_FORMAT format) return format; } -static HRESULT load_file(const WCHAR *filename, void **buffer, DWORD *size) -{ - HRESULT hr = S_OK; - DWORD bytes_read; - HANDLE file; - BOOL ret; - - file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); - if (file == INVALID_HANDLE_VALUE) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto done; - } - - *size = GetFileSize(file, NULL); - if (*size == INVALID_FILE_SIZE) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto done; - } - - *buffer = malloc(*size); - if (!*buffer) - { - hr = E_OUTOFMEMORY; - goto done; - } - - ret = ReadFile(file, *buffer, *size, &bytes_read, NULL); - if (!ret) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto done; - } - if (bytes_read != *size) - { - hr = E_FAIL; - goto done; - } - -done: - if (FAILED(hr)) - { - free(*buffer); - *buffer = NULL; - } - if (file != INVALID_HANDLE_VALUE) - CloseHandle(file); - return hr; -} - static HRESULT load_resource(HMODULE module, HRSRC res_info, void **buffer, DWORD *size) { HGLOBAL resource; @@ -398,8 +348,8 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadP if (!src_file || !info) return E_FAIL; - if (FAILED(load_file(src_file, &buffer, &size))) - return D3D10_ERROR_FILE_NOT_FOUND; + if (FAILED((hr = load_file(src_file, &buffer, &size)))) + return hr; hr = D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); @@ -612,8 +562,8 @@ HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *s if (!src_file || !texture) return E_FAIL; - if (FAILED(load_file(src_file, &buffer, &size))) - return D3D10_ERROR_FILE_NOT_FOUND; + if (FAILED((hr = load_file(src_file, &buffer, &size)))) + return hr; hr = D3DX10CreateTextureFromMemory(device, buffer, size, load_info, pump, texture, hresult);

1 0

Jacek Caban : wineandroid: Move wine_create_desktop_to dllmain.c.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 4f09c54887a6878b9db6d7262e663ed0a087fbe3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f09c54887a6878b9db6d726… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 4 15:27:59 2022 +0200 wineandroid: Move wine_create_desktop_to dllmain.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/android.h | 4 ++++ dlls/wineandroid.drv/dllmain.c | 9 +++++++++ dlls/wineandroid.drv/init.c | 1 + dlls/wineandroid.drv/unixlib.h | 1 + dlls/wineandroid.drv/window.c | 6 +++--- dlls/wineandroid.drv/wineandroid.drv.spec | 2 +- 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 8b62bec862d..2a09d4195ef 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -112,6 +112,10 @@ extern void ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_fla const RECT *visible_rect, const RECT *valid_rects, struct window_surface *surface ) DECLSPEC_HIDDEN; +/* unixlib interface */ + +extern NTSTATUS android_create_desktop( void *arg ) DECLSPEC_HIDDEN; + extern unsigned int screen_width DECLSPEC_HIDDEN; extern unsigned int screen_height DECLSPEC_HIDDEN; extern RECT virtual_screen_rect DECLSPEC_HIDDEN; diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c index 7886efe4b58..42719798f33 100644 --- a/dlls/wineandroid.drv/dllmain.c +++ b/dlls/wineandroid.drv/dllmain.c @@ -34,3 +34,12 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) DisableThreadLibraryCalls( inst ); return !ANDROID_CALL(init, NULL); } + + +/*********************************************************************** + * wine_create_desktop (wineandroid.@) + */ +BOOL CDECL wine_create_desktop( UINT width, UINT height ) +{ + return ANDROID_CALL( create_desktop, NULL ); +} diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index c0b3332df30..b7ee7d8a9b8 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -603,6 +603,7 @@ static HRESULT android_init( void *arg ) const unixlib_entry_t __wine_unix_call_funcs[] = { + android_create_desktop, android_init, }; diff --git a/dlls/wineandroid.drv/unixlib.h b/dlls/wineandroid.drv/unixlib.h index d8327b30f08..10fe401dea0 100644 --- a/dlls/wineandroid.drv/unixlib.h +++ b/dlls/wineandroid.drv/unixlib.h @@ -21,6 +21,7 @@ enum android_funcs { + unix_create_desktop, unix_init, unix_funcs_count }; diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 53c270eb7f3..d5e6a6961a9 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1668,9 +1668,9 @@ LRESULT ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) /*********************************************************************** - * ANDROID_create_desktop + * android_create_desktop */ -BOOL CDECL ANDROID_create_desktop( UINT width, UINT height ) +NTSTATUS android_create_desktop( void *arg ) { /* wait until we receive the surface changed event */ while (!screen_width) @@ -1682,5 +1682,5 @@ BOOL CDECL ANDROID_create_desktop( UINT width, UINT height ) } process_events( QS_ALLINPUT ); } - return TRUE; + return 0; } diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 400f5ccb991..22b97356521 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -1,2 +1,2 @@ # Desktop -@ cdecl wine_create_desktop(long long) ANDROID_create_desktop +@ cdecl wine_create_desktop(long long)

1 0

Piotr Caban : d3dx10/tests: Add D3DX10CreateAsyncTextureInfoProcessor tests.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 47847a2064a7b746f858c3c5b860c1e1d38e1483 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47847a2064a7b746f858c3c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 25 14:04:20 2022 +0200 d3dx10/tests: Add D3DX10CreateAsyncTextureInfoProcessor tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 4a734fe0149..a817f346676 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1871,6 +1871,48 @@ static void test_D3DX10CreateAsyncResourceLoader(void) ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); } +static void test_D3DX10CreateAsyncTextureInfoProcessor(void) +{ + ID3DX10DataProcessor *dp; + D3DX10_IMAGE_INFO info; + HRESULT hr; + int i; + + CoInitialize(NULL); + + hr = D3DX10CreateAsyncTextureInfoProcessor(NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncTextureInfoProcessor(&info, &dp); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3DX10DataProcessor_Process(dp, (void *)test_image[0].data, 0); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataProcessor_Process(dp, NULL, test_image[0].size); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(test_image); ++i) + { + winetest_push_context("Test %u", i); + + hr = ID3DX10DataProcessor_Process(dp, (void *)test_image[i].data, test_image[i].size); + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + check_image_info(&info, test_image + i, __LINE__); + + winetest_pop_context(); + } + + hr = ID3DX10DataProcessor_CreateDeviceObject(dp, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3DX10DataProcessor_Destroy(dp); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + CoUninitialize(); +} + static void test_get_image_info(void) { static const WCHAR test_resource_name[] = L"resource.data"; @@ -3273,6 +3315,7 @@ START_TEST(d3dx10) test_D3DX10CreateAsyncMemoryLoader(); test_D3DX10CreateAsyncFileLoader(); test_D3DX10CreateAsyncResourceLoader(); + test_D3DX10CreateAsyncTextureInfoProcessor(); test_get_image_info(); test_create_texture(); test_font();

1 0

Piotr Caban : d3dx10: Share code for resource data loading.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: a2521a90f4e87052ea21759f6732f8b0d1ed0018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2521a90f4e87052ea21759f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 25 19:53:43 2022 +0200 d3dx10: Share code for resource data loading. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 89 ++++++++++++++++++++++++++++++++++------------ dlls/d3dx10_43/compiler.c | 34 +++--------------- dlls/d3dx10_43/dxhelpers.h | 4 +++ dlls/d3dx10_43/texture.c | 70 ++++++------------------------------ 4 files changed, 85 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a2521a90f4e87052ea21…

1 0