- Wine-Commits - list.winehq.org

Alexandre Julliard : winepulse.drv: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: d8b77f14a3d3aacf06169cbc8f0beeaba17bc199 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8b77f14a3d3aacf06169cbc8f0bee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:32:30 2022 +0100 winepulse.drv: Use the Unix call helpers. --- dlls/winepulse.drv/mmdevdrv.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 6e138ac4529..5de9a941099 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -50,8 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(pulse); -static unixlib_handle_t pulse_handle; - #define MAX_PULSE_NAME_LEN 256 #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -87,17 +85,16 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_ATTACH) { DisableThreadLibraryCalls(dll); - if (NtQueryVirtualMemory( GetCurrentProcess(), dll, MemoryWineUnixFuncs, - &pulse_handle, sizeof(pulse_handle), NULL )) + if (__wine_init_unix_call()) return FALSE; - if (__wine_unix_call(pulse_handle, process_attach, NULL)) + if (WINE_UNIX_CALL(process_attach, NULL)) return FALSE; } else if (reason == DLL_PROCESS_DETACH) { struct device_cache *device, *device_next; LIST_FOR_EACH_ENTRY_SAFE(device, device_next, &g_devices_cache, struct device_cache, entry) free(device); - __wine_unix_call(pulse_handle, process_detach, NULL); + WINE_UNIX_CALL(process_detach, NULL); if (pulse_thread) { WaitForSingleObject(pulse_thread, INFINITE); CloseHandle(pulse_thread); @@ -218,7 +215,7 @@ static inline ACImpl *impl_from_IAudioStreamVolume(IAudioStreamVolume *iface) static void pulse_call(enum unix_funcs code, void *params) { NTSTATUS status; - status = __wine_unix_call(pulse_handle, code, params); + status = WINE_UNIX_CALL(code, params); assert(!status); }

1 0

Alexandre Julliard : winemac.drv: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 5ac3c41eee8e91afc44311b9a81281237dcae68c URL: https://gitlab.winehq.org/wine/wine/-/commit/5ac3c41eee8e91afc44311b9a81281… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:30:44 2022 +0100 winemac.drv: Use the Unix call helpers. --- dlls/winemac.drv/dllmain.c | 5 +---- dlls/winemac.drv/unixlib.h | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index dd12321fa7f..41e9e908b61 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -27,7 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(macdrv); HMODULE macdrv_module = 0; -unixlib_handle_t macdrv_handle; struct quit_info { HWND *wins; @@ -406,9 +405,7 @@ static BOOL process_attach(void) { .id = 0 } }; - if (NtQueryVirtualMemory(GetCurrentProcess(), macdrv_module, MemoryWineUnixFuncs, - &macdrv_handle, sizeof(macdrv_handle), NULL)) - return FALSE; + if (__wine_init_unix_call()) return FALSE; for (str = strings; str->id; str++) str->len = LoadStringW(macdrv_module, str->id, (WCHAR *)&str->str, 0); diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index 5fe19a94fee..614e3ddb11a 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -35,8 +35,7 @@ enum macdrv_funcs unix_funcs_count }; -extern unixlib_handle_t macdrv_handle DECLSPEC_HIDDEN; -#define MACDRV_CALL(func, params) __wine_unix_call(macdrv_handle, unix_ ## func, params) +#define MACDRV_CALL(func, params) WINE_UNIX_CALL(unix_ ## func, params) /* macdrv_dnd_get_data params */ struct dnd_get_data_params

1 0

Alexandre Julliard : wineandroid.drv: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 50347810a148a50ee0717db287e74dc84f62cfb8 URL: https://gitlab.winehq.org/wine/wine/-/commit/50347810a148a50ee0717db287e74d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:31:07 2022 +0100 wineandroid.drv: Use the Unix call helpers. --- dlls/wineandroid.drv/dllmain.c | 6 +----- dlls/wineandroid.drv/unixlib.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c index ca3583b574f..3f6dbd388eb 100644 --- a/dlls/wineandroid.drv/dllmain.c +++ b/dlls/wineandroid.drv/dllmain.c @@ -32,8 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(android); -static unixlib_handle_t unix_handle; - extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static HANDLE stop_event; static HANDLE thread; @@ -124,9 +122,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) if (reason == DLL_PROCESS_ATTACH) return TRUE; DisableThreadLibraryCalls( inst ); - if (NtQueryVirtualMemory( GetCurrentProcess(), inst, MemoryWineUnixFuncs, - &unix_handle, sizeof(unix_handle), NULL )) - return FALSE; + if (__wine_init_unix_call()) return FALSE; params.register_window_callback = register_window_callback; if (ANDROID_CALL( init, &params )) return FALSE; diff --git a/dlls/wineandroid.drv/unixlib.h b/dlls/wineandroid.drv/unixlib.h index 98da6528fd5..a180e6660c8 100644 --- a/dlls/wineandroid.drv/unixlib.h +++ b/dlls/wineandroid.drv/unixlib.h @@ -30,7 +30,7 @@ enum android_funcs unix_funcs_count }; -#define ANDROID_CALL(func, params) __wine_unix_call( unix_handle, unix_ ## func, params ) +#define ANDROID_CALL(func, params) WINE_UNIX_CALL( unix_ ## func, params ) /* android_init params */ struct init_params

1 0

Alexandre Julliard : winecrt0: Add a helper function and macro to simplify Unix library usage.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 1d036c04930e449cfc374e52e9663ab8ecad0465 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d036c04930e449cfc374e52e9663a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:25:52 2022 +0100 winecrt0: Add a helper function and macro to simplify Unix library usage. --- dlls/winecrt0/unix_lib.c | 23 +++++++++++++++++++++-- include/wine/unixlib.h | 10 +++++++++- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/winecrt0/unix_lib.c b/dlls/winecrt0/unix_lib.c index c86897b9905..10be32899ba 100644 --- a/dlls/winecrt0/unix_lib.c +++ b/dlls/winecrt0/unix_lib.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef __WINE_PE_BUILD - #include <stdarg.h> #include "ntstatus.h" @@ -29,6 +27,8 @@ #include "winternl.h" #include "wine/unixlib.h" +#ifdef __WINE_PE_BUILD + static NTSTATUS (WINAPI *p__wine_unix_call)( unixlib_handle_t, unsigned int, void * ); static void load_func( void **func, const char *name, void *def ) @@ -54,3 +54,22 @@ NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, vo } #endif /* __WINE_PE_BUILD */ + +static inline void *image_base(void) +{ +#ifdef __WINE_PE_BUILD + extern IMAGE_DOS_HEADER __ImageBase; + return (void *)&__ImageBase; +#else + extern IMAGE_NT_HEADERS __wine_spec_nt_header; + return (void *)((__wine_spec_nt_header.OptionalHeader.ImageBase + 0xffff) & ~0xffff); +#endif +} + +unixlib_handle_t __wine_unixlib_handle = 0; + +NTSTATUS WINAPI __wine_init_unix_call(void) +{ + return NtQueryVirtualMemory( GetCurrentProcess(), image_base(), MemoryWineUnixFuncs, + &__wine_unixlib_handle, sizeof(__wine_unixlib_handle), NULL ); +} diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index ef60b32184c..fcb25422524 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -21,13 +21,14 @@ #ifndef __WINE_WINE_UNIXLIB_H #define __WINE_WINE_UNIXLIB_H -typedef NTSTATUS (*unixlib_entry_t)( void *args ); typedef UINT64 unixlib_handle_t; extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); #ifdef WINE_UNIX_LIB +typedef NTSTATUS (*unixlib_entry_t)( void *args ); + /* some useful helpers from ntdll */ extern const char *ntdll_get_build_dir(void); extern const char *ntdll_get_data_dir(void); @@ -264,6 +265,13 @@ static inline ULONG ntdll_wcstoul( const WCHAR *s, WCHAR **end, int base ) #define wcstol(str,e,b) ntdll_wcstol(str,e,b) #define wcstoul(str,e,b) ntdll_wcstoul(str,e,b) +#else /* WINE_UNIX_LIB */ + +extern unixlib_handle_t __wine_unixlib_handle DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI __wine_init_unix_call(void) DECLSPEC_HIDDEN; + +#define WINE_UNIX_CALL(code,args) __wine_unix_call( __wine_unixlib_handle, (code), (args) ) + #endif /* WINE_UNIX_LIB */ #endif /* __WINE_WINE_UNIXLIB_H */

1 0

Alexandre Julliard : winex11.drv: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: cb713d60066ac88a75aa74edf3af03fa0e2e817c URL: https://gitlab.winehq.org/wine/wine/-/commit/cb713d60066ac88a75aa74edf3af03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:30:16 2022 +0100 winex11.drv: Use the Unix call helpers. --- dlls/winex11.drv/dllmain.c | 6 +----- dlls/winex11.drv/unixlib.h | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index 8ed0e40d1ac..500a4a6bc44 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -23,7 +23,6 @@ HMODULE x11drv_module = 0; -unixlib_handle_t x11drv_handle; typedef NTSTATUS (*callback_func)( UINT arg ); @@ -74,10 +73,7 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) DisableThreadLibraryCalls( instance ); x11drv_module = instance; - if (NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, - &x11drv_handle, sizeof(x11drv_handle), NULL )) - return FALSE; - + if (__wine_init_unix_call()) return FALSE; if (X11DRV_CALL( init, &params )) return FALSE; callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index e8b243d67a1..7dc1d9f0ca7 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -36,8 +36,7 @@ enum x11drv_funcs unix_funcs_count, }; -extern unixlib_handle_t x11drv_handle DECLSPEC_HIDDEN; -#define X11DRV_CALL(func, params) __wine_unix_call( x11drv_handle, unix_ ## func, params ) +#define X11DRV_CALL(func, params) WINE_UNIX_CALL( unix_ ## func, params ) /* x11drv_create_desktop params */ struct create_desktop_params

1 0

Alexandre Julliard : wineoss.drv: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 07211395f32174a5d12d6bd41eaba9021f41abe2 URL: https://gitlab.winehq.org/wine/wine/-/commit/07211395f32174a5d12d6bd41eaba9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:32:09 2022 +0100 wineoss.drv: Use the Unix call helpers. --- dlls/wineoss.drv/mmdevdrv.c | 6 +----- dlls/wineoss.drv/unixlib.h | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 3bcb0f5f288..7411f87a4d7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -47,8 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) -unixlib_handle_t oss_handle = 0; - static const REFERENCE_TIME DefaultPeriod = 100000; static const REFERENCE_TIME MinimumPeriod = 50000; @@ -209,9 +207,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: - if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, - &oss_handle, sizeof(oss_handle), NULL)) - return FALSE; + if(__wine_init_unix_call()) return FALSE; break; case DLL_PROCESS_DETACH: diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 1c3ee7b93b3..f921b00e0a2 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -29,6 +29,4 @@ NTSTATUS oss_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS oss_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; #endif -extern unixlib_handle_t oss_handle; - -#define OSS_CALL(func, params) __wine_unix_call(oss_handle, func, params) +#define OSS_CALL(func, params) WINE_UNIX_CALL(func, params)

1 0

Alexandre Julliard : winealsa.drv: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 9e4e8de7c19cb0fb0447357f9117ddeac0af6978 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e4e8de7c19cb0fb0447357f9117dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:31:29 2022 +0100 winealsa.drv: Use the Unix call helpers. --- dlls/winealsa.drv/mmdevdrv.c | 6 +----- dlls/winealsa.drv/unixlib.h | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 20a27d501d3..ea48143005b 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -48,8 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(alsa); -unixlib_handle_t alsa_handle = 0; - #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static const REFERENCE_TIME DefaultPeriod = 100000; @@ -203,9 +201,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: - if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, - &alsa_handle, sizeof(alsa_handle), NULL)) - return FALSE; + if(__wine_init_unix_call()) return FALSE; break; case DLL_PROCESS_DETACH: diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 8c82281012a..de6ce71571c 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -29,6 +29,4 @@ NTSTATUS alsa_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS alsa_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; #endif -extern unixlib_handle_t alsa_handle; - -#define ALSA_CALL(func, params) __wine_unix_call(alsa_handle, func, params) +#define ALSA_CALL(func, params) WINE_UNIX_CALL(func, params)

1 0

Nikolay Sivov : kernel32/profile: Trim spaces from section names on load.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 8d9eb707c61455583a42891d6841ba9feeaf78d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d9eb707c61455583a42891d6841ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 20 17:56:06 2022 +0300 kernel32/profile: Trim spaces from section names on load. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53814 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/profile.c | 22 ++++++++++++++++++---- dlls/kernel32/tests/profile.c | 10 +++++++++- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index bf1a9170896..f65790ecc92 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -292,6 +292,16 @@ static inline ENCODING PROFILE_DetectTextEncoding(const void * buffer, int * len return ENCODING_ANSI; } +static void profile_trim_spaces(WCHAR **start, WCHAR **end) +{ + WCHAR *s = *start, *e = *end; + + while (s < e && PROFILE_isspaceW(*s)) s++; + while ((e > s) && PROFILE_isspaceW(e[-1])) e--; + + *start = s; + *end = e; +} /*********************************************************************** * PROFILE_Load @@ -302,8 +312,8 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) { void *buffer_base, *pBuffer; WCHAR * szFile; - const WCHAR *szLineStart, *szLineEnd; - const WCHAR *szValueStart, *szEnd, *next_line; + WCHAR *szLineStart, *szLineEnd, *next_line; + const WCHAR *szValueStart, *szEnd; int len; PROFILESECTION *section, *first_section; PROFILESECTION **next_section; @@ -400,8 +410,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) szLineEnd = next_line; /* get rid of white space */ - while (szLineStart < szLineEnd && PROFILE_isspaceW(*szLineStart)) szLineStart++; - while ((szLineEnd > szLineStart) && PROFILE_isspaceW(szLineEnd[-1])) szLineEnd--; + profile_trim_spaces(&szLineStart, &szLineEnd); if (szLineStart >= szLineEnd) continue; @@ -415,8 +424,13 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) } else { + /* Skip brackets */ szLineStart++; len -= 2; + szLineEnd = szLineStart + len; + profile_trim_spaces(&szLineStart, &szLineEnd); + len = szLineEnd - szLineStart; + /* no need to allocate +1 for NULL terminating character as * already included in structure */ if (!(section = HeapAlloc( GetProcessHeap(), 0, sizeof(*section) + len * sizeof(WCHAR) ))) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 18e12690f18..59842627b4f 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -80,6 +80,7 @@ static void test_profile_int(void) { SECTION, KEY, "B4294967297", TESTFILE, 1, 0}, }; int i, num_test = ARRAY_SIZE(profileInt); + char section[64]; UINT res; DeleteFileA( TESTFILE); @@ -93,6 +94,12 @@ static void test_profile_int(void) profileInt[i].defaultVal, profileInt[i].iniFile); ok((res == profileInt[i].result), "test<%02d>: ret<%010u> exp<%010u>\n", i, res, profileInt[i].result); + + sprintf(section, " %s ", profileInt[i].section); + res = GetPrivateProfileIntA(profileInt[i].section, profileInt[i].key, + profileInt[i].defaultVal, profileInt[i].iniFile); + ok((res == profileInt[i].result), "test<%02d>: ret<%010u> exp<%010u>\n", + i, res, profileInt[i].result); } DeleteFileA( TESTFILE); @@ -270,7 +277,7 @@ static void test_profile_sections_names(void) DWORD count; char buf[100]; WCHAR bufW[100]; - static const char content[]="[section1]\r\n[section2]\r\n[section3]\r\n"; + static const char content[]="[ section1 ]\r\n[section2]\r\n[section3]\r\n"; static const char testfile3[]=".\\testwine3.ini"; static const WCHAR testfile3W[]={ '.','\\','t','e','s','t','w','i','n','e','3','.','i','n','i',0 }; static const WCHAR not_here[] = {'.','\\','n','o','t','_','h','e','r','e','.','i','n','i',0}; @@ -288,6 +295,7 @@ static void test_profile_sections_names(void) ok( ret == 27, "expected return size 27, got %d\n", ret ); ok( (buf[ret-1] == 0 && buf[ret] == 0), "returned buffer not terminated with double-null\n" ); + ok( !strcmp(buf, "section1"), "Unexpected content %s.\n", debugstr_a(buf)); /* Test with exactly fitting buffer */ memset(buf, 0xc, sizeof(buf));

1 0

Anton Baskanov : ddraw: Use the wined3d_streaming_buffer helpers to manage the streaming index buffer.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 42503f4ea352315b409d76b43f70e10dc7937965 URL: https://gitlab.winehq.org/wine/wine/-/commit/42503f4ea352315b409d76b43f70e1… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Oct 21 15:21:16 2022 +0700 ddraw: Use the wined3d_streaming_buffer helpers to manage the streaming index buffer. --- dlls/ddraw/ddraw_private.h | 6 +-- dlls/ddraw/device.c | 110 +++++---------------------------------------- 2 files changed, 12 insertions(+), 104 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index d2b1fc495fc..6693a650394 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -335,11 +335,7 @@ struct d3d_device struct ddraw *ddraw; IUnknown *rt_iface; - struct wined3d_buffer *index_buffer; - UINT index_buffer_size; - UINT index_buffer_pos; - - struct wined3d_streaming_buffer vertex_buffer; + struct wined3d_streaming_buffer vertex_buffer, index_buffer; /* Viewport management */ struct list viewport_list; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 19ae3b6cf33..ac6647b8dad 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -279,8 +279,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) /* There is no need to unset any resources here, wined3d will take * care of that on uninit_3d(). */ - if (This->index_buffer) - wined3d_buffer_decref(This->index_buffer); + wined3d_streaming_buffer_cleanup(&This->index_buffer); wined3d_streaming_buffer_cleanup(&This->vertex_buffer); wined3d_device_context_set_rendertarget_views(This->immediate_context, 0, 1, &null_rtv, FALSE); @@ -3569,42 +3568,6 @@ static HRESULT WINAPI d3d_device2_DrawPrimitive(IDirect3DDevice2 *iface, * DDERR_INVALIDPARAMS if Vertices or Indices is NULL * *****************************************************************************/ -/* The caller is responsible for wined3d locking */ -static HRESULT d3d_device_prepare_index_buffer(struct d3d_device *device, UINT min_size) -{ - HRESULT hr; - - if (device->index_buffer_size < min_size || !device->index_buffer) - { - UINT size = max(device->index_buffer_size * 2, min_size); - struct wined3d_buffer_desc desc; - struct wined3d_buffer *buffer; - - TRACE("Growing index buffer to %u bytes\n", size); - - desc.byte_width = size; - desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL; - desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; - desc.misc_flags = 0; - desc.structure_byte_stride = 0; - - if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, - NULL, NULL, &ddraw_null_wined3d_parent_ops, &buffer))) - { - ERR("Failed to create index buffer, hr %#lx.\n", hr); - return hr; - } - - if (device->index_buffer) - wined3d_buffer_decref(device->index_buffer); - device->index_buffer = buffer; - device->index_buffer_size = size; - device->index_buffer_pos = 0; - } - return D3D_OK; -} - static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, D3DPRIMITIVETYPE primitive_type, DWORD fvf, void *vertices, DWORD vertex_count, WORD *indices, DWORD index_count, DWORD flags) @@ -3613,9 +3576,6 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, HRESULT hr; UINT stride = get_flexible_vertex_size(fvf); UINT vtx_size = stride * vertex_count, idx_size = index_count * sizeof(*indices); - struct wined3d_map_desc wined3d_map_desc; - struct wined3d_box wined3d_box = {0}; - struct wined3d_resource *ib; UINT vb_pos, ib_pos; TRACE("iface %p, primitive_type %#x, fvf %#lx, vertices %p, vertex_count %lu, " @@ -3635,27 +3595,14 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, &device->vertex_buffer, vertices, vtx_size, stride, &vb_pos))) goto done; - hr = d3d_device_prepare_index_buffer(device, idx_size); - if (FAILED(hr)) - goto done; - ib_pos = device->index_buffer_pos; - if (device->index_buffer_size - idx_size < ib_pos) - ib_pos = 0; - - wined3d_box.left = ib_pos; - wined3d_box.right = ib_pos + idx_size; - ib = wined3d_buffer_get_resource(device->index_buffer); - if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, - WINED3D_MAP_WRITE | (ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, + &device->index_buffer, indices, idx_size, sizeof(*indices), &ib_pos))) goto done; - memcpy(wined3d_map_desc.data, indices, idx_size); - wined3d_resource_unmap(ib, 0); - device->index_buffer_pos = ib_pos + idx_size; hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer.buffer, 0, stride); if (FAILED(hr)) goto done; - wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, WINED3DFMT_R16_UINT); + wined3d_stateblock_set_index_buffer(device->state, device->index_buffer.buffer, WINED3DFMT_R16_UINT); wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); wined3d_device_context_set_primitive_type(device->immediate_context, @@ -4043,9 +3990,6 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, UINT vtx_dst_stride = get_flexible_vertex_size(fvf); UINT vtx_dst_size = vertex_count * vtx_dst_stride; UINT idx_size = index_count * sizeof(WORD); - struct wined3d_map_desc wined3d_map_desc; - struct wined3d_box wined3d_box = {0}; - struct wined3d_resource *ib; void *dst_data; UINT vb_pos; UINT ib_pos; @@ -4069,27 +4013,14 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, pack_strided_data(dst_data, vertex_count, strided_data, fvf); wined3d_streaming_buffer_unmap(&device->vertex_buffer); - hr = d3d_device_prepare_index_buffer(device, idx_size); - if (FAILED(hr)) - goto done; - ib_pos = device->index_buffer_pos; - if (device->index_buffer_size - idx_size < ib_pos) - ib_pos = 0; - - wined3d_box.left = ib_pos; - wined3d_box.right = ib_pos + idx_size; - ib = wined3d_buffer_get_resource(device->index_buffer); - if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, - WINED3D_MAP_WRITE | (ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, + &device->index_buffer, indices, idx_size, sizeof(WORD), &ib_pos))) goto done; - memcpy(wined3d_map_desc.data, indices, idx_size); - wined3d_resource_unmap(ib, 0); - device->index_buffer_pos = ib_pos + idx_size; hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer.buffer, 0, vtx_dst_stride); if (FAILED(hr)) goto done; - wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, WINED3DFMT_R16_UINT); + wined3d_stateblock_set_index_buffer(device->state, device->index_buffer.buffer, WINED3DFMT_R16_UINT); wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); wined3d_device_context_set_primitive_type(device->immediate_context, @@ -4291,7 +4222,6 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; - struct wined3d_resource *ib; HRESULT hr; UINT ib_pos; @@ -4338,34 +4268,15 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_stateblock_set_vertex_declaration(device->state, vb_impl->wined3d_declaration); - hr = d3d_device_prepare_index_buffer(device, index_count * sizeof(WORD)); - if (FAILED(hr)) - { - wined3d_mutex_unlock(); - return hr; - } - ib_pos = device->index_buffer_pos; - - if (device->index_buffer_size - index_count * sizeof(WORD) < ib_pos) - ib_pos = 0; - - /* Copy the index stream into the index buffer. */ - wined3d_box.left = ib_pos; - wined3d_box.right = ib_pos + index_count * sizeof(WORD); - ib = wined3d_buffer_get_resource(device->index_buffer); - if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, - WINED3D_MAP_WRITE | (ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, + &device->index_buffer, indices, index_count * sizeof(WORD), sizeof(WORD), &ib_pos))) { - ERR("Failed to map buffer, hr %#lx.\n", hr); wined3d_mutex_unlock(); return hr; } - memcpy(wined3d_map_desc.data, indices, index_count * sizeof(WORD)); - wined3d_resource_unmap(ib, 0); - device->index_buffer_pos = ib_pos + index_count * sizeof(WORD); /* Set the index stream */ - wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, WINED3DFMT_R16_UINT); + wined3d_stateblock_set_index_buffer(device->state, device->index_buffer.buffer, WINED3DFMT_R16_UINT); /* Set the vertex stream source */ if (FAILED(hr = wined3d_stateblock_set_stream_source(device->state, @@ -6944,6 +6855,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, c wined3d_stateblock_incref(ddraw->state); wined3d_streaming_buffer_init(&device->vertex_buffer, WINED3D_BIND_VERTEX_BUFFER); + wined3d_streaming_buffer_init(&device->index_buffer, WINED3D_BIND_INDEX_BUFFER); /* Render to the back buffer */ rtv = ddraw_surface_get_rendertarget_view(target);

1 0

Anton Baskanov : wined3d: Factor out and expose functions to map/unmap wined3d_streaming_buffer.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: ef127f12435a43f0f82d8256f93b5823aeee3957 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef127f12435a43f0f82d8256f93b58… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Oct 21 14:22:03 2022 +0700 wined3d: Factor out and expose functions to map/unmap wined3d_streaming_buffer. --- dlls/wined3d/buffer.c | 31 +++++++++++++++++++++++++------ dlls/wined3d/wined3d.spec | 2 ++ include/wine/wined3d.h | 4 ++++ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1a953f8e218..fca7f2916b7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1685,8 +1685,9 @@ static HRESULT wined3d_streaming_buffer_prepare(struct wined3d_device *device, return hr; } -HRESULT CDECL wined3d_streaming_buffer_upload(struct wined3d_device *device, struct wined3d_streaming_buffer *buffer, - const void *data, unsigned int size, unsigned int stride, unsigned int *ret_pos) +HRESULT CDECL wined3d_streaming_buffer_map(struct wined3d_device *device, + struct wined3d_streaming_buffer *buffer, unsigned int size, unsigned int stride, + unsigned int *ret_pos, void **ret_data) { unsigned int map_flags = WINED3D_MAP_WRITE; struct wined3d_resource *resource; @@ -1695,8 +1696,8 @@ HRESULT CDECL wined3d_streaming_buffer_upload(struct wined3d_device *device, str struct wined3d_box box; HRESULT hr; - TRACE("device %p, buffer %p, data %p, size %u, stride %u, ret_pos %p.\n", - device, buffer, data, size, stride, ret_pos); + TRACE("device %p, buffer %p, size %u, stride %u, ret_pos %p, ret_data %p.\n", + device, buffer, size, stride, ret_pos, ret_data); if (FAILED(hr = wined3d_streaming_buffer_prepare(device, buffer, size))) return hr; @@ -1719,10 +1720,28 @@ HRESULT CDECL wined3d_streaming_buffer_upload(struct wined3d_device *device, str wined3d_box_set(&box, pos, 0, pos + size, 1, 0, 1); if (SUCCEEDED(hr = wined3d_resource_map(resource, 0, &map_desc, &box, map_flags))) { - memcpy(map_desc.data, data, size); - wined3d_resource_unmap(resource, 0); *ret_pos = pos; + *ret_data = map_desc.data; buffer->pos = pos + size; } return hr; } + +void CDECL wined3d_streaming_buffer_unmap(struct wined3d_streaming_buffer *buffer) +{ + wined3d_resource_unmap(&buffer->buffer->resource, 0); +} + +HRESULT CDECL wined3d_streaming_buffer_upload(struct wined3d_device *device, struct wined3d_streaming_buffer *buffer, + const void *data, unsigned int size, unsigned int stride, unsigned int *ret_pos) +{ + void *dst_data; + HRESULT hr; + + if (SUCCEEDED(hr = wined3d_streaming_buffer_map(device, buffer, size, stride, ret_pos, &dst_data))) + { + memcpy(dst_data, data, size); + wined3d_streaming_buffer_unmap(buffer); + } + return hr; +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e6126faf838..827ac295ddc 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -260,6 +260,8 @@ @ cdecl wined3d_stateblock_set_vs_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_i(ptr long long ptr) +@ cdecl wined3d_streaming_buffer_map(ptr ptr long long ptr ptr) +@ cdecl wined3d_streaming_buffer_unmap(ptr) @ cdecl wined3d_streaming_buffer_upload(ptr ptr ptr long long ptr) @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a18dcda45be..8ec397b73a5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2788,6 +2788,10 @@ HRESULT __cdecl wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *st HRESULT __cdecl wined3d_stateblock_set_vs_consts_i(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); +HRESULT __cdecl wined3d_streaming_buffer_map(struct wined3d_device *device, + struct wined3d_streaming_buffer *buffer, unsigned int size, unsigned int stride, + unsigned int *ret_pos, void **ret_data); +void __cdecl wined3d_streaming_buffer_unmap(struct wined3d_streaming_buffer *buffer); HRESULT __cdecl wined3d_streaming_buffer_upload(struct wined3d_device *device, struct wined3d_streaming_buffer *buffer, const void *data, unsigned int size, unsigned int stride, unsigned int *pos);

1 0