October 2021 - Wine-commits

Alexandre Julliard : include: Add prototypes for the byteswap functions.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 84bfdccf6d4f4e6d9538ec4123c65244937714e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84bfdccf6d4f4e6d9538ec41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 13 13:19:43 2021 +0200 include: Add prototypes for the byteswap functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/misc.c | 2 +- include/msvcrt/stdlib.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index bee269ed5f8..17b83069f94 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -490,7 +490,7 @@ unsigned short CDECL _byteswap_ushort(unsigned short s) /********************************************************************* * _byteswap_ulong (MSVCR80.@) */ -ULONG CDECL _byteswap_ulong(ULONG l) +__msvcrt_ulong CDECL _byteswap_ulong(__msvcrt_ulong l) { return (l<<24) + ((l<<8)&0xFF0000) + ((l>>8)&0xFF00) + (l>>24); } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 287e4030669..7a2a774dfb5 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -153,6 +153,9 @@ _ACRTIMP __int64 __cdecl _atoi64(const char*); _ACRTIMP long double __cdecl _atold(const char*); _ACRTIMP int __cdecl _atoldbl(_LDOUBLE*,char*); _ACRTIMP void __cdecl _beep(unsigned int,unsigned int); +_ACRTIMP unsigned short __cdecl _byteswap_ushort(unsigned short); +_ACRTIMP __msvcrt_ulong __cdecl _byteswap_ulong(__msvcrt_ulong); +_ACRTIMP unsigned __int64 __cdecl _byteswap_uint64(unsigned __int64); _ACRTIMP char* __cdecl _ecvt(double,int,int*,int*); _ACRTIMP char* __cdecl _fcvt(double,int,int*,int*); _ACRTIMP char* __cdecl _fullpath(char*,const char*,size_t);

1 0

Alexandre Julliard : include: Add a define to enable fastcall wrappers, similar to the thiscall one.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: d5a7d08f636c9c499771203ad2d368f4379ca6b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a7d08f636c9c499771203a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 13 21:13:27 2021 +0200 include: Add a define to enable fastcall wrappers, similar to the thiscall one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 6 +++--- dlls/hidclass.sys/pnp.c | 2 +- dlls/winebus.sys/main.c | 2 +- dlls/wineusb.sys/wineusb.c | 2 +- dlls/winexinput.sys/main.c | 2 +- include/wine/asm.h | 3 ++- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 21ce6e12c99..55a8891b6fa 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); #ifdef __i386__ -#ifndef _WIN32 +#ifdef __ASM_USE_FASTCALL_WRAPPER extern void * WINAPI wrap_fastcall_func1( void *func, const void *a ); __ASM_STDCALL_FUNC( wrap_fastcall_func1, 8, @@ -53,12 +53,12 @@ __ASM_STDCALL_FUNC( wrap_fastcall_func2, 12, #define call_fastcall_func1(func,a) wrap_fastcall_func1(func,a) #define call_fastcall_func2(func,a,b) wrap_fastcall_func2(func,a,b) -#else /* _WIN32 */ +#else /* __ASM_USE_FASTCALL_WRAPPER */ #define call_fastcall_func1(func,a) func(a) #define call_fastcall_func2(func,a,b) func(a,b) -#endif /* _WIN32 */ +#endif /* __ASM_USE_FASTCALL_WRAPPER */ DEFINE_FASTCALL1_WRAPPER( ExAcquireFastMutex ) void FASTCALL ExAcquireFastMutex( FAST_MUTEX *mutex ) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index dbf04c0a403..6dafa1b95af 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); DEFINE_DEVPROPKEY(DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2); DEFINE_GUID(GUID_DEVINTERFACE_WINEXINPUT, 0x6c53d5fd, 0x6480, 0x440f, 0xb6, 0x18, 0x47, 0x67, 0x50, 0xc5, 0xe1, 0xa6); -#if defined(__i386__) && !defined(_WIN32) +#ifdef __ASM_USE_FASTCALL_WRAPPER extern void * WINAPI wrap_fastcall_func1( void *func, const void *a ); __ASM_STDCALL_FUNC( wrap_fastcall_func1, 8, diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 16192977bef..6f44f4c9722 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -343,7 +343,7 @@ static void bus_unlink_hid_device(DEVICE_OBJECT *device) RtlLeaveCriticalSection(&device_list_cs); } -#if defined(__i386__) && !defined(_WIN32) +#ifdef __ASM_USE_FASTCALL_WRAPPER extern void * WINAPI wrap_fastcall_func1(void *func, const void *a); __ASM_STDCALL_FUNC(wrap_fastcall_func1, 8, "popl %ecx\n\t" diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 085acf77e6f..cca0257bb02 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineusb); -#if defined(__i386__) && !defined(_WIN32) +#ifdef __ASM_USE_FASTCALL_WRAPPER extern void * WINAPI wrap_fastcall_func1( void *func, const void *a ); __ASM_STDCALL_FUNC( wrap_fastcall_func1, 8, diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 05d64b05d4f..abc61e8754f 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winexinput); -#if defined(__i386__) && !defined(_WIN32) +#ifdef __ASM_USE_FASTCALL_WRAPPER extern void *WINAPI wrap_fastcall_func1(void *func, const void *a); __ASM_STDCALL_FUNC(wrap_fastcall_func1, 8, "popl %ecx\n\t" diff --git a/include/wine/asm.h b/include/wine/asm.h index 51f04548731..da1d0d803cd 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -119,6 +119,7 @@ #if defined(__i386__) && !defined(_WIN32) +# define __ASM_USE_FASTCALL_WRAPPER # define DEFINE_FASTCALL1_WRAPPER(func) \ __ASM_FASTCALL_FUNC( func, 4, \ "popl %eax\n\t" \ @@ -144,7 +145,7 @@ #if defined(__i386__) && !defined(__MINGW32__) && (!defined(_MSC_VER) || !defined(__clang__)) -#define __ASM_USE_THISCALL_WRAPPER +# define __ASM_USE_THISCALL_WRAPPER # ifdef _MSC_VER # define DEFINE_THISCALL_WRAPPER(func,args) \ __declspec(naked) void __thiscall_##func(void) \

1 0

Alex Henrie : winemenubuilder: Introduce a reg_enum_keyW helper function.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 5d8aac9cb0810285feff4188bcc6d84107217731 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d8aac9cb0810285feff4188… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 12 23:20:36 2021 -0600 winemenubuilder: Introduce a reg_enum_keyW helper function. The helper function reduces code duplication and makes the 'done' variable in the cleanup_associations function unnecessary. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 89 +++++++++++++++--------------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 5b6fe071916..522e6192b24 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1753,6 +1753,30 @@ static WCHAR *freedesktop_mime_type_for_extension(struct list *native_mime_types return match ? xwcsdup(match) : NULL; } +static WCHAR *reg_enum_keyW(HKEY key, DWORD index) +{ + WCHAR *subkey; + DWORD size = 1024 * sizeof(WCHAR); + LSTATUS ret; + + for (;;) + { + subkey = xmalloc(size); + ret = RegEnumKeyExW(key, index, subkey, &size, NULL, NULL, NULL, NULL); + if (ret == ERROR_SUCCESS) + { + return subkey; + } + if (ret != ERROR_MORE_DATA) + { + heap_free(subkey); + return NULL; + } + size *= 2; + heap_free(subkey); + } +} + static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) { DWORD size; @@ -1857,47 +1881,31 @@ static BOOL cleanup_associations(void) BOOL hasChanged = FALSE; if ((assocKey = open_associations_reg_key())) { - int i; - BOOL done = FALSE; - for (i = 0; !done;) + int i = 0; + for (;;) { - WCHAR *extensionW = NULL; - DWORD size = 1024; - LSTATUS ret; + WCHAR *extensionW; + WCHAR *command; - do - { - heap_free(extensionW); - extensionW = xmalloc(size * sizeof(WCHAR)); - ret = RegEnumKeyExW(assocKey, i, extensionW, &size, NULL, NULL, NULL, NULL); - size *= 2; - } while (ret == ERROR_MORE_DATA); + if (!(extensionW = reg_enum_keyW(assocKey, i))) + break; - if (ret == ERROR_SUCCESS) + if (!(command = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"))) { - WCHAR *command; - command = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); - if (command == NULL) + WCHAR *desktopFile = reg_get_valW(assocKey, extensionW, L"DesktopFile"); + if (desktopFile) { - WCHAR *desktopFile = reg_get_valW(assocKey, extensionW, L"DesktopFile"); - if (desktopFile) - { - WINE_TRACE("removing file type association for %s\n", wine_dbgstr_w(extensionW)); - DeleteFileW(desktopFile); - } - RegDeleteKeyW(assocKey, extensionW); - hasChanged = TRUE; - heap_free(desktopFile); + WINE_TRACE("removing file type association for %s\n", wine_dbgstr_w(extensionW)); + DeleteFileW(desktopFile); } - else - i++; - heap_free(command); + RegDeleteKeyW(assocKey, extensionW); + hasChanged = TRUE; + heap_free(desktopFile); } else { - if (ret != ERROR_NO_MORE_ITEMS) - WINE_ERR("error %d while reading registry\n", ret); - done = TRUE; + i++; + heap_free(command); } heap_free(extensionW); } @@ -1998,7 +2006,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic { struct wine_rb_tree mimeProgidTree = { winemenubuilder_rb_string_compare }; struct list nativeMimeTypes = LIST_INIT(nativeMimeTypes); - LSTATUS ret = 0; int i; BOOL hasChanged = FALSE; @@ -2010,18 +2017,12 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic for (i = 0; ; i++) { - WCHAR *extensionW = NULL; - DWORD size = 1024; + WCHAR *extensionW; - do - { - heap_free(extensionW); - extensionW = xmalloc(size * sizeof(WCHAR)); - ret = RegEnumKeyExW(HKEY_CLASSES_ROOT, i, extensionW, &size, NULL, NULL, NULL, NULL); - size *= 2; - } while (ret == ERROR_MORE_DATA); + if (!(extensionW = reg_enum_keyW(HKEY_CLASSES_ROOT, i))) + break; - if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_banned(extensionW)) + if (extensionW[0] == '.' && !is_extension_banned(extensionW)) { WCHAR *commandW = NULL; WCHAR *executableW = NULL; @@ -2129,8 +2130,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic heap_free(progIdW); } heap_free(extensionW); - if (ret != ERROR_SUCCESS) - break; } wine_rb_destroy(&mimeProgidTree, winemenubuilder_rb_destroy, NULL);

1 0

Eduard Permyakov : wbemprox: Add 'Manufacturer' and 'Name' properties to Win32_PnPEntity class.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 8257d1efdc6a00bceb994c1a58b0ffd02e2fdf3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8257d1efdc6a00bceb994c1a… Author: Eduard Permyakov <epermyakov(a)codeweavers.com> Date: Wed Oct 13 11:00:03 2021 +0300 wbemprox: Add 'Manufacturer' and 'Name' properties to Win32_PnPEntity class. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 442a9015951..d76602f4930 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -286,7 +286,9 @@ static const struct column col_physicalmemory[] = }; static const struct column col_pnpentity[] = { - { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Manufacturer", CIM_STRING }, + { L"Name", CIM_STRING }, }; static const struct column col_printer[] = { @@ -701,6 +703,8 @@ struct record_physicalmemory struct record_pnpentity { const WCHAR *device_id; + const WCHAR *manufacturer; + const WCHAR *name; }; struct record_printer { @@ -3063,6 +3067,8 @@ static enum fill_status fill_pnpentity( struct table *table, const struct expr * ARRAY_SIZE(device_id), NULL )) { rec->device_id = heap_strdupW( device_id ); + rec->manufacturer = L"The Wine Project"; + rec->name = L"Wine PnP Device"; table->num_rows++; if (!match_row( table, table->num_rows - 1, cond, &status ))

1 0

Nikolay Sivov : d3d10/effect: Use shader variable directly from pass structure on Apply().
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 63ee26f298d38e16df8b4e69a10db884e26a6542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63ee26f298d38e16df8b4e69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 13 13:43:02 2021 +0200 d3d10/effect: Use shader variable directly from pass structure on Apply(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 15 ---- dlls/d3d10/effect.c | 188 ++++++++++++++++----------------------------- dlls/d3d10/tests/effect.c | 22 ++++++ 3 files changed, 89 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63ee26f298d38e16df8b…

1 0

Nikolay Sivov : d3d10/tests: Add some tests for annotations.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: b56ed5f03f0433b886cde52fdea870c828594b95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b56ed5f03f0433b886cde52f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 13 13:43:03 2021 +0200 d3d10/tests: Add some tests for annotations. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 219 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 218 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b56ed5f03f0433b886cd…

1 0

Nikolay Sivov : d3d10/effect: Use separate structure for annotations array.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: ab5b335c13a06b62a0e5f260ee1a37709ae9ea65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab5b335c13a06b62a0e5f260… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 08:13:32 2021 +0300 d3d10/effect: Use separate structure for annotations array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 15 ++-- dlls/d3d10/effect.c | 220 +++++++++++++++++---------------------------- 2 files changed, 92 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab5b335c13a06b62a0e5…

1 0

Nikolay Sivov : d3d10/effect: Handle static variable assignments for object fields in state objects.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: e37f781cc2174d3d2a4228098f2b22dcfc573f38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e37f781cc2174d3d2a422809… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 08:13:33 2021 +0300 d3d10/effect: Handle static variable assignments for object fields in state objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 95 ++++++++++++++++++++++++++++++++-- dlls/d3d10/tests/effect.c | 128 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 182 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e37f781cc2174d3d2a42…

1 0

Nikolay Sivov : d3d10/effect: Add support for constant index and anonymous shader values in assignment parsing helper.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 99376ade2a89a0c9a41687bb53da29a748fe5bfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=99376ade2a89a0c9a41687bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 08:13:34 2021 +0300 d3d10/effect: Add support for constant index and anonymous shader values in assignment parsing helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 142 +++++++++++++++++++++++++++++++++++----- dlls/d3d10/tests/effect.c | 161 ++++++++++++++++++++++++++++++---------------- 2 files changed, 233 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99376ade2a89a0c9a416…

1 0

Nikolay Sivov : d3d10/effect: Consolidate state objects and passes property information.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 1050e6c60fdf909c517058504d2c0f5dbe534465 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1050e6c60fdf909c51705850… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 08:13:35 2021 +0300 d3d10/effect: Consolidate state objects and passes property information. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 572 ++++++++++++++++------------------------------------ 1 file changed, 176 insertions(+), 396 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1050e6c60fdf909c5170…

1 0