wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Alexandre Julliard : ntdll: Add a helper function for memory allocations through mmap().
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: wine Branch: master Commit: 72b97eeba0d934ed2c8607f45429664130dd8f5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=72b97eeba0d934ed2c8607f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 3 10:52:11 2020 +0200 ntdll: Add a helper function for memory allocations through mmap(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 5 ++--- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 19 +++++++++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index cc8b519b98..f162572264 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -85,7 +85,6 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winnt.h" -#include "wine/library.h" #include "wine/server.h" #include "wine/debug.h" #include "unix_private.h" @@ -914,8 +913,8 @@ static BOOL add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, if (!entry) fd_cache[0] = fd_cache_initial_block; else { - void *ptr = wine_anon_mmap( NULL, FD_CACHE_BLOCK_SIZE * sizeof(union fd_cache_entry), - PROT_READ | PROT_WRITE, 0 ); + void *ptr = anon_mmap_alloc( FD_CACHE_BLOCK_SIZE * sizeof(union fd_cache_entry), + PROT_READ | PROT_WRITE ); if (ptr == MAP_FAILED) return FALSE; fd_cache[entry] = ptr; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index f77cb7b214..3185f3a8ac 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -177,6 +177,7 @@ extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct o data_size_t *ret_len ) DECLSPEC_HIDDEN; extern void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) DECLSPEC_HIDDEN; +extern void *anon_mmap_alloc( size_t size, int prot ) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_map_ntdll( int fd, void **module ) DECLSPEC_HIDDEN; extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 23731fb33a..907524ecc5 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -217,6 +217,13 @@ void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) return mmap( start, size, prot, MAP_PRIVATE | MAP_ANON | MAP_FIXED | flags, -1, 0 ); } +/* allocate anonymous mmap() memory at any address */ +void *anon_mmap_alloc( size_t size, int prot ) +{ + return mmap( NULL, size, prot, MAP_PRIVATE | MAP_ANON, -1, 0 ); +} + + static void mmap_add_reserved_area( void *addr, SIZE_T size ) { struct reserved_area *area; @@ -756,7 +763,7 @@ static BOOL alloc_pages_vprot( const void *addr, size_t size ) for (i = idx >> pages_vprot_shift; i < (end + pages_vprot_mask) >> pages_vprot_shift; i++) { if (pages_vprot[i]) continue; - if ((ptr = wine_anon_mmap( NULL, pages_vprot_mask + 1, PROT_READ | PROT_WRITE, 0 )) == (void *)-1) + if ((ptr = anon_mmap_alloc( pages_vprot_mask + 1, PROT_READ | PROT_WRITE )) == MAP_FAILED) return FALSE; pages_vprot[i] = ptr; } @@ -1299,8 +1306,8 @@ static struct file_view *alloc_view(void) } if (view_block_start == view_block_end) { - void *ptr = wine_anon_mmap( NULL, view_block_size, PROT_READ | PROT_WRITE, 0 ); - if (ptr == (void *)-1) return NULL; + void *ptr = anon_mmap_alloc( view_block_size, PROT_READ | PROT_WRITE ); + if (ptr == MAP_FAILED) return NULL; view_block_start = ptr; view_block_end = view_block_start + view_block_size / sizeof(*view_block_start); } @@ -1746,7 +1753,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, for (;;) { - if ((ptr = wine_anon_mmap( NULL, view_size, get_unix_prot(vprot), 0 )) == (void *)-1) + if ((ptr = anon_mmap_alloc( view_size, get_unix_prot(vprot) )) == MAP_FAILED) { if (errno == ENOMEM) return STATUS_NO_MEMORY; return STATUS_INVALID_PARAMETER; @@ -2405,9 +2412,9 @@ void virtual_init(void) if (mmap_enum_reserved_areas( alloc_virtual_heap, &alloc_views, 1 )) mmap_remove_reserved_area( alloc_views.base, alloc_views.size ); else - alloc_views.base = wine_anon_mmap( NULL, alloc_views.size, PROT_READ | PROT_WRITE, 0 ); + alloc_views.base = anon_mmap_alloc( alloc_views.size, PROT_READ | PROT_WRITE ); - assert( alloc_views.base != (void *)-1 ); + assert( alloc_views.base != MAP_FAILED ); view_block_start = alloc_views.base; view_block_end = view_block_start + view_block_size / sizeof(*view_block_start); free_ranges = (void *)((char *)alloc_views.base + view_block_size);

1 0

Alexandre Julliard : ntdll: Add a helper function for fixed anonymous mmaps.
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: wine Branch: master Commit: 74deee7df0abd7e05b433f875e86e26d7e2f447f URL: https://source.winehq.org/git/wine.git/?a=commit;h=74deee7df0abd7e05b433f87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 3 10:51:09 2020 +0200 ntdll: Add a helper function for fixed anonymous mmaps. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 30 +++++++++++++++++------------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index dcbe4eff0f..5f8fcd82be 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -610,7 +610,7 @@ static NTSTATUS map_so_dll( const IMAGE_NT_HEADERS *nt_descr, HMODULE module ) + sizeof(IMAGE_NT_HEADERS) + nb_sections * sizeof(IMAGE_SECTION_HEADER)); - if (wine_anon_mmap( addr, size, PROT_READ | PROT_WRITE, MAP_FIXED ) != addr) return STATUS_NO_MEMORY; + if (anon_mmap_fixed( addr, size, PROT_READ | PROT_WRITE, 0 ) != addr) return STATUS_NO_MEMORY; dos = (IMAGE_DOS_HEADER *)addr; nt = (IMAGE_NT_HEADERS *)((BYTE *)(dos + 1) + sizeof(builtin_signature)); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index f71963f4a9..f77cb7b214 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -176,6 +176,7 @@ extern NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret, data_size_t *ret_len ) DECLSPEC_HIDDEN; +extern void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_map_ntdll( int fd, void **module ) DECLSPEC_HIDDEN; extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 3468f771b9..23731fb33a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -211,6 +211,11 @@ static inline BOOL is_inside_signal_stack( void *ptr ) (char *)ptr < (char *)get_signal_stack() + signal_stack_size); } +/* mmap() anonymous memory at a fixed address */ +void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) +{ + return mmap( start, size, prot, MAP_PRIVATE | MAP_ANON | MAP_FIXED | flags, -1, 0 ); +} static void mmap_add_reserved_area( void *addr, SIZE_T size ) { @@ -1163,7 +1168,7 @@ static void add_reserved_area( void *addr, size_t size ) addr = user_space_limit; } /* blow away existing mappings */ - wine_anon_mmap( addr, size, PROT_NONE, MAP_NORESERVE | MAP_FIXED ); + anon_mmap_fixed( addr, size, PROT_NONE, MAP_NORESERVE ); mmap_add_reserved_area( addr, size ); } @@ -1266,7 +1271,7 @@ static inline void unmap_area( void *addr, size_t size ) break; } case 1: /* in a reserved area */ - wine_anon_mmap( addr, size, PROT_NONE, MAP_NORESERVE | MAP_FIXED ); + anon_mmap_fixed( addr, size, PROT_NONE, MAP_NORESERVE ); break; default: case 0: /* not in a reserved area */ @@ -1684,7 +1689,7 @@ static NTSTATUS map_fixed_area( void *base, size_t size, unsigned int vprot ) case 1: /* in a reserved area, make sure the address is available */ if (find_view_range( base, size )) return STATUS_CONFLICTING_ADDRESSES; /* replace the reserved area by our mapping */ - if ((ptr = wine_anon_mmap( base, size, get_unix_prot(vprot), MAP_FIXED )) != base) + if ((ptr = anon_mmap_fixed( base, size, get_unix_prot(vprot), 0 )) != base) return STATUS_INVALID_PARAMETER; break; } @@ -1725,7 +1730,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { ptr = alloc.result; TRACE( "got mem in reserved area %p-%p\n", ptr, (char *)ptr + size ); - if (wine_anon_mmap( ptr, size, get_unix_prot(vprot), MAP_FIXED ) != ptr) + if (anon_mmap_fixed( ptr, size, get_unix_prot(vprot), 0 ) != ptr) return STATUS_INVALID_PARAMETER; goto done; } @@ -1817,8 +1822,8 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start } /* Reserve the memory with an anonymous mmap */ - ptr = wine_anon_mmap( (char *)view->base + start, size, PROT_READ | PROT_WRITE, MAP_FIXED ); - if (ptr == (void *)-1) return STATUS_NO_MEMORY; + ptr = anon_mmap_fixed( (char *)view->base + start, size, PROT_READ | PROT_WRITE, 0 ); + if (ptr == MAP_FAILED) return STATUS_NO_MEMORY; /* Now read in the file */ pread( fd, ptr, size, offset ); if (prot != (PROT_READ|PROT_WRITE)) mprotect( ptr, size, prot ); /* Set the right protection */ @@ -1875,7 +1880,7 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro */ static NTSTATUS decommit_pages( struct file_view *view, size_t start, size_t size ) { - if (wine_anon_mmap( (char *)view->base + start, size, PROT_NONE, MAP_FIXED ) != (void *)-1) + if (anon_mmap_fixed( (char *)view->base + start, size, PROT_NONE, 0 ) != MAP_FAILED) { set_page_vprot_bits( (char *)view->base + start, size, 0, VPROT_COMMITTED ); return STATUS_SUCCESS; @@ -1920,7 +1925,7 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot addr = wine_anon_mmap( (void *)page_size, 0x10000 - page_size, unix_prot, 0 ); if (addr == (void *)page_size) { - if (!wine_anon_mmap( NULL, page_size, unix_prot, MAP_FIXED )) + if (!anon_mmap_fixed( NULL, page_size, unix_prot, 0 )) { addr = NULL; TRACE( "successfully mapped low 64K range\n" ); @@ -1938,7 +1943,7 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot /* now reserve the whole range */ size = (char *)dosmem_size - (char *)addr; - wine_anon_mmap( addr, size, unix_prot, MAP_FIXED ); + anon_mmap_fixed( addr, size, unix_prot, 0 ); return create_view( view, addr, size, vprot ); } @@ -2350,9 +2355,8 @@ static int CDECL alloc_virtual_heap( void *base, SIZE_T size, void *arg ) if (is_beyond_limit( base, size, address_space_limit )) address_space_limit = (char *)base + size; if (size < alloc->size) return 0; if (is_win64 && base < (void *)0x80000000) return 0; - alloc->base = wine_anon_mmap( (char *)base + size - alloc->size, alloc->size, - PROT_READ|PROT_WRITE, MAP_FIXED ); - return (alloc->base != (void *)-1); + alloc->base = anon_mmap_fixed( (char *)base + size - alloc->size, alloc->size, PROT_READ|PROT_WRITE, 0 ); + return (alloc->base != MAP_FAILED); } /*********************************************************************** @@ -2417,7 +2421,7 @@ void virtual_init(void) /* make the DOS area accessible (except the low 64K) to hide bugs in broken apps like Excel 2003 */ size = (char *)address_space_start - (char *)0x10000; if (size && mmap_is_in_reserved_area( (void*)0x10000, size ) == 1) - wine_anon_mmap( (void *)0x10000, size, PROT_READ | PROT_WRITE, MAP_FIXED ); + anon_mmap_fixed( (void *)0x10000, size, PROT_READ | PROT_WRITE, 0 ); }

1 0

Zebediah Figura : include: Document vkd3d-shader root signature functions.
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: vkd3d Branch: master Commit: 67065e4366ce919a3eff4de1d0f2f437a6b07974 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=67065e4366ce919a3eff4de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 2 20:11:21 2020 -0500 include: Document vkd3d-shader root signature functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 84 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 11fc551..16db028 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1102,13 +1102,95 @@ void vkd3d_shader_free_messages(char *messages); */ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); +/** + * Convert a byte code description of a shader root signature to a structural + * description which can be easily parsed by C code. + * + * This function corresponds to + * ID3D12VersionedRootSignatureDeserializer::GetUnconvertedRootSignatureDesc(). + * + * This function performs the reverse transformation of + * vkd3d_shader_serialize_root_signature(). + * + * This function parses a standalone root signature, and should not be confused + * with vkd3d_shader_parse_input_signature(). + * + * \param dxbc Compiled byte code, in DXBC format. + * + * \param root_signature Output location in which the decompiled root signature + * will be stored. + * \n + * Members of \a root_signature may be allocated by vkd3d-shader. The signature + * should be freed with vkd3d_shader_free_root_signature() when no longer + * needed. + * + * \param messages Optional output location for error or informational messages + * produced by the compiler. + * \n + * This parameter behaves identically to the \a messages parameter of + * vkd3d_shader_compile(). + * + * \return A member of \ref vkd3d_result. + */ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_versioned_root_signature_desc *root_signature, char **messages); +/** + * Free a structural representation of a shader root signature allocated by + * vkd3d_shader_convert_root_signature() or vkd3d_shader_parse_root_signature(). + * + * This function may free members of struct + * vkd3d_shader_versioned_root_signature_desc, but does not free the structure + * itself. + * + * \param root_signature Signature description to free. + */ void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signature_desc *root_signature); +/** + * Convert a structural description of a shader root signature to a byte code + * format capable of being read by ID3D12Device::CreateRootSignature. The + * compiled signature is compatible with Microsoft D3D 12. + * + * This function corresponds to D3D12SerializeVersionedRootSignature(). + * + * \param root_signature Description of the root signature. + * + * \param dxbc A pointer to a vkd3d_shader_code structure in which the compiled + * code will be stored. + * \n + * The compiled signature is allocated by vkd3d-shader and should be freed with + * vkd3d_shader_free_shader_code() when no longer needed. + * + * \param messages Optional output location for error or informational messages + * produced by the compiler. + * \n + * This parameter behaves identically to the \a messages parameter of + * vkd3d_shader_compile(). + * + * \return A member of \ref vkd3d_result. + */ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_root_signature_desc *root_signature, struct vkd3d_shader_code *dxbc, char **messages); - +/** + * Convert a structural representation of a root signature to a different + * version of structural representation. + * + * This function corresponds to + * ID3D12VersionedRootSignatureDeserializer::GetRootSignatureDescAtVersion(). + * + * \param dst A pointer to a vkd3d_shader_versioned_root_signature_desc + * structure in which the converted signature will be stored. + * \n + * Members of \a dst may be allocated by vkd3d-shader. The signature should be + * freed with vkd3d_shader_free_root_signature() when no longer needed. + * + * \param version The desired version to convert \a src to. This version must + * not be equal to \a src->version. + * + * \param src Input root signature description. + * + * \return A member of \ref vkd3d_result. + */ int vkd3d_shader_convert_root_signature(struct vkd3d_shader_versioned_root_signature_desc *dst, enum vkd3d_shader_root_signature_version version, const struct vkd3d_shader_versioned_root_signature_desc *src);

1 0

Zebediah Figura : include: Document vkd3d_shader_get_version().
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: vkd3d Branch: master Commit: fcee3bfa9aec0a6fb4a8bf796071cda707b43b5f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fcee3bfa9aec0a6fb4a8bf7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 2 20:11:20 2020 -0500 include: Document vkd3d_shader_get_version(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index cc5615c..11fc551 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -995,6 +995,17 @@ static inline uint32_t vkd3d_shader_create_swizzle(enum vkd3d_shader_swizzle_com #ifndef VKD3D_SHADER_NO_PROTOTYPES +/** + * Returns the current version of this library. + * + * \param major Output location for the major version of this library. + * + * \param minor Output location for the minor version of this library. + * + * \return A human-readable string describing the library name and version. This + * string is null-terminated and UTF-8 encoded. This may be a pointer to static + * data in libvkd3d-shader; it should not be freed. + */ const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); /** * Returns the source types supported, with any target type, by

1 0

Owen Rudge : winecfg: Add /v parameter to display current Windows version.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 87f41e6b408dd01055ff6a378b90d089d61ec370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87f41e6b408dd01055ff6a37… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Aug 31 23:11:39 2020 +0100 winecfg: Add /v parameter to display current Windows version. This patch allows winecfg to be called with the "/v" parameter to display the current Windows version. "/v winver" will continue to allow the Windows version to be updated. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49242 Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/appdefaults.c | 24 +++++++++++++++++++++++- programs/winecfg/main.c | 9 +++++++-- programs/winecfg/winecfg.h | 1 + 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index dd3480cd63..8068941ff8 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <stdlib.h> #include <assert.h> +#include "wine/heap.h" #include "wine/unicode.h" #include "winecfg.h" #include "resource.h" @@ -74,6 +75,8 @@ static const struct win_version win_versions[] = #endif }; +#define DEFAULT_WIN_VERSION "win7" + static const char szKey9x[] = "Software\\Microsoft\\Windows\\CurrentVersion"; static const char szKeyNT[] = "Software\\Microsoft\\Windows NT\\CurrentVersion"; static const char szKeyProdNT[] = "System\\CurrentControlSet\\Control\\ProductOptions"; @@ -146,7 +149,7 @@ static void update_comboboxes(HWND dialog) return; } if (ver != -1) winver = strdupA( win_versions[ver].szVersion ); - else winver = strdupA("win7"); + else winver = strdupA(DEFAULT_WIN_VERSION); } WINE_TRACE("winver is %s\n", winver); @@ -498,6 +501,25 @@ void print_windows_versions(void) } } +void print_current_winver(void) +{ + char *winver = get_reg_key(config_key, keypath(""), "Version", ""); + + if (!winver || !winver[0]) + { + int ver = get_registry_version(); + + if (ver == -1) + printf(DEFAULT_WIN_VERSION "\n"); + else + printf("%s\n", win_versions[ver].szVersion); + } + else + printf("%s\n", winver); + + heap_free(winver); +} + static void on_winver_change(HWND dialog) { int selection = SendDlgItemMessageW(dialog, IDC_WINVER, CB_GETCURSEL, 0, 0); diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index f29e2f036f..9b30ed6e8e 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -187,9 +187,13 @@ ProcessCmdLine(LPSTR lpCmdLine) { return -1; } - if ((lpCmdLine[1] == 'V' || lpCmdLine[1] == 'v') && (lstrlenA(lpCmdLine) > 4)) + if (lpCmdLine[1] == 'V' || lpCmdLine[1] == 'v') { - return set_winver_from_string(&lpCmdLine[3]) ? 0 : 1; + if (lstrlenA(lpCmdLine) > 4) + return set_winver_from_string(&lpCmdLine[3]) ? 0 : 1; + + print_current_winver(); + return 0; } if (lpCmdLine[1] == '?') @@ -197,6 +201,7 @@ ProcessCmdLine(LPSTR lpCmdLine) printf("Usage: winecfg [options]\n\n"); printf("Options:\n"); printf(" [no option] Launch the graphical version of this program.\n"); + printf(" /v Display the current global Windows version.\n"); printf(" /v version Set global Windows version to 'version'.\n"); printf(" /? Display this information and exit.\n\n"); printf("Valid versions for 'version':\n\n"); diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 9dd39c51c3..d022cd3d68 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -91,6 +91,7 @@ INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara /* Windows version management */ BOOL set_winver_from_string(const char *version); +void print_current_winver(void); void print_windows_versions(void); /* Drive management */

1 0

Owen Rudge : winecfg: Ensure registry key is initialised before updating Windows version.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 1eed47067460182363b09b4a3835d1797d3303b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eed47067460182363b09b4a… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Aug 31 23:10:22 2020 +0100 winecfg: Ensure registry key is initialised before updating Windows version. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 74f73a9f23..f29e2f036f 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -247,14 +247,14 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrev, LPSTR szCmdLine, int nShow) Wow64RevertWow64FsRedirection( redir ); } - cmd_ret = ProcessCmdLine(szCmdLine); - if (cmd_ret >= 0) return cmd_ret; - if (initialize(hInstance)) { WINE_ERR("initialization failed, aborting\n"); ExitProcess(1); } + cmd_ret = ProcessCmdLine(szCmdLine); + if (cmd_ret >= 0) return cmd_ret; + /* * The next 9 lines should be all that is needed * for the Wine Configuration property sheet

1 0

Zebediah Figura : wined3d: Implement OpenGL sample masks.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: d08ef1e2cacc0bbf4ee62dc3ed46638e059c2f97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d08ef1e2cacc0bbf4ee62dc3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 2 00:27:43 2020 -0500 wined3d: Implement OpenGL sample masks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/state.c | 26 +++++++++++++++++++++++--- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index c3bb951ed8..deb6144a4b 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -17849,7 +17849,7 @@ static void test_sample_mask(void) draw_quad(&test_context); ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)test_context.backbuffer, 0, (ID3D10Resource *)texture, 0, texture_desc.Format); - todo_wine check_texture_color(test_context.backbuffer, 0xbfbfbfbf, 1); + check_texture_color(test_context.backbuffer, 0xbfbfbfbf, 1); ID3D10RenderTargetView_Release(rtv); ID3D10Texture2D_Release(texture); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4704dad1aa..5b9bb50a89 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29017,7 +29017,7 @@ static void test_sample_mask(void) draw_quad(&test_context); ID3D11DeviceContext_ResolveSubresource(context, (ID3D11Resource *)test_context.backbuffer, 0, (ID3D11Resource *)texture, 0, texture_desc.Format); - todo_wine check_texture_color(test_context.backbuffer, 0x3f3f3f3f, 1); + check_texture_color(test_context.backbuffer, 0x3f3f3f3f, 1); ID3D11RenderTargetView_Release(rtv); ID3D11Texture2D_Release(texture); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index daf4a12b45..5218d8a202 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26815,7 +26815,7 @@ static void test_sample_mask(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); get_rt_readback(rt, &rb); colour = get_readback_color(&rb, 64, 64); - todo_wine ok(color_match(colour, 0xffff8080, 1), "Got unexpected colour %08x.\n", colour); + ok(color_match(colour, 0xffff8080, 1), "Got unexpected colour %08x.\n", colour); release_surface_readback(&rb); hr = IDirect3DDevice9_EndScene(device); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 08b8aab546..51a24753c8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1925,8 +1925,27 @@ static void state_antialias(struct wined3d_context *context, const struct wined3 static void state_sample_mask(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - if (state->sample_mask != 0xffffffff) - FIXME("Sample mask %#x not yet implemented.\n", state->sample_mask); + const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + unsigned int sample_mask = state->sample_mask; + + TRACE("Setting sample mask to %#x.\n", sample_mask); + if (sample_mask != 0xffffffff) + { + gl_info->gl_ops.gl.p_glEnable(GL_SAMPLE_MASK); + checkGLcall("glEnable GL_SAMPLE_MASK"); + GL_EXTCALL(glSampleMaski(0, sample_mask)); + checkGLcall("glSampleMaski"); + } + else + { + gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_MASK); + checkGLcall("glDisable GL_SAMPLE_MASK"); + } +} + +static void state_sample_mask_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + WARN("Unsupported in local OpenGL implementation: glSampleMaski.\n"); } static void state_patchedgestyle(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4603,7 +4622,8 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_BLEND, { STATE_BLEND, blend }, WINED3D_GL_EXT_NONE }, { STATE_BLEND_FACTOR, { STATE_BLEND_FACTOR, state_blend_factor }, EXT_BLEND_COLOR }, { STATE_BLEND_FACTOR, { STATE_BLEND_FACTOR, state_blend_factor_w}, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLE_MASK, { STATE_SAMPLE_MASK, state_sample_mask }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLE_MASK, { STATE_SAMPLE_MASK, state_sample_mask }, ARB_TEXTURE_MULTISAMPLE }, + { STATE_SAMPLE_MASK, { STATE_SAMPLE_MASK, state_sample_mask_w }, WINED3D_GL_EXT_NONE }, { STATE_STREAMSRC, { STATE_STREAMSRC, streamsrc }, WINED3D_GL_EXT_NONE }, { STATE_VDECL, { STATE_VDECL, vdecl_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_RASTERIZER, { STATE_RASTERIZER, rasterizer_cc }, ARB_CLIP_CONTROL },

1 0

Zebediah Figura : wined3d: Store the sample mask in wined3d_state.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 21017243b80cfb0ddb370b972e988ca0880b49c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21017243b80cfb0ddb370b97… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 2 00:27:42 2020 -0500 wined3d: Store the sample mask in wined3d_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 8 +++----- dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/cs.c | 6 +++++- dlls/wined3d/device.c | 24 +++++++++++++++--------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/state.c | 10 +++++----- dlls/wined3d/stateblock.c | 2 ++ dlls/wined3d/wined3d_private.h | 8 ++++++-- include/wine/wined3d.h | 4 ++-- 9 files changed, 40 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21017243b80cfb0ddb37…

1 0

Zebediah Figura : d3d9/tests: Add a test for sample masks.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 8333e7f29957ff22bf7811cb702d6b81d34957f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8333e7f29957ff22bf7811cb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 2 00:27:41 2020 -0500 d3d9/tests: Add a test for sample masks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5b0955b4ea..daf4a12b45 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26739,6 +26739,96 @@ static void test_alpha_to_coverage(void) DestroyWindow(window); } +static void test_sample_mask(void) +{ + IDirect3DSurface9 *rt, *ms_rt; + struct surface_readback rb; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + DWORD colour; + HWND window; + HRESULT hr; + + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xffffffff}, + {{-1.0f, 1.0f, 0.1f}, 0xffffffff}, + {{ 1.0f, -1.0f, 0.1f}, 0xffffffff}, + {{ 1.0f, 1.0f, 0.1f}, 0xffffffff}, + }; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a 3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, 0, FALSE, &ms_rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, ms_rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_MULTISAMPLEMASK, 0x5); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, NULL, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + get_rt_readback(rt, &rb); + colour = get_readback_color(&rb, 64, 64); + todo_wine ok(color_match(colour, 0xffff8080, 1), "Got unexpected colour %08x.\n", colour); + release_surface_readback(&rb); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface9_Release(ms_rt); + IDirect3DSurface9_Release(rt); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -26886,4 +26976,5 @@ START_TEST(visual) test_draw_mapped_buffer(); test_sample_attached_rendertarget(); test_alpha_to_coverage(); + test_sample_mask(); }

1 0

Zebediah Figura : d3d10core/tests: Test specifying the multisample mask via OMSetBlendState().
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 5eadfb093189497a8dfa7171b3ad498d5687c4be URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eadfb093189497a8dfa7171… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 2 00:27:40 2020 -0500 d3d10core/tests: Test specifying the multisample mask via OMSetBlendState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 67 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 97a00a0715..c3bb951ed8 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -17791,6 +17791,72 @@ static void test_multisample_resolve(void) release_test_context(&test_context); } +static void test_sample_mask(void) +{ + static const DWORD ps_code[] = + { +#if 0 + float4 main() : sv_target + { + return float4(1.0, 1.0, 1.0, 1.0); + } +#endif + 0x43425844, 0x949557e7, 0x1480242b, 0x831e64fc, 0x7c0305d2, 0x00000001, 0x000000b0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x745f7673, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, + 0x3f800000, 0x3f800000, 0x3f800000, 0x0100003e, + }; + static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + ID3D10Texture2D *texture; + ID3D10PixelShader *ps; + ID3D10Device *device; + UINT quality_levels; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, &quality_levels); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + if (!quality_levels) + { + skip("4xMSAA not supported.\n"); + release_test_context(&test_context); + return; + } + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.SampleDesc.Count = 4; + texture_desc.SampleDesc.Quality = 0; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(hr == S_OK, "Failed to create render target view, hr %#x.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + ID3D10Device_OMSetBlendState(device, NULL, NULL, 0xb); + ID3D10Device_ClearRenderTargetView(device, rtv, black); + draw_quad(&test_context); + ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)test_context.backbuffer, 0, + (ID3D10Resource *)texture, 0, texture_desc.Format); + todo_wine check_texture_color(test_context.backbuffer, 0xbfbfbfbf, 1); + + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(texture); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + static void test_depth_clip(void) { struct d3d10core_test_context test_context; @@ -18466,6 +18532,7 @@ START_TEST(d3d10core) queue_test(test_unbound_multisample_texture); queue_test(test_multiple_viewports); queue_test(test_multisample_resolve); + queue_test(test_sample_mask); queue_test(test_depth_clip); queue_test(test_staging_buffers); queue_test(test_render_a8);

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
71
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 September 2020