December 2020 - Wine-Commits

Zebediah Figura : build: Create object directories before running bison or flex.
by Alexandre Julliard Dec. 15, 2020

Dec. 15, 2020

Module: vkd3d Branch: master Commit: 4bee8dd89bf8a2366b90ea9f76f2d176864e4463 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4bee8dd89bf8a2366b90ea9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 14 21:57:31 2020 -0600 build: Create object directories before running bison or flex. Vkd3d-Bug: https://bugs.winehq.org/show_bug.cgi?id=50334 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 32c8777..bf1d7bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -119,9 +119,11 @@ vkd3d_v_bison_0 = @echo " BISON " $@; vkd3d_v_bison_1 = libs/vkd3d-shader/preproc.yy.c: libs/vkd3d-shader/preproc.l + @$(MKDIR_P) libs/vkd3d-shader $(VKD3D_V_FLEX)$(FLEX) $(LFLAGS) -o $@ $< libs/vkd3d-shader/preproc.tab.c libs/vkd3d-shader/preproc.tab.h &: libs/vkd3d-shader/preproc.y + @$(MKDIR_P) libs/vkd3d-shader $(VKD3D_V_BISON)$(BISON) $(YFLAGS) -d -o libs/vkd3d-shader/preproc.tab.c $< BUILT_SOURCES += libs/vkd3d-shader/preproc.tab.h

1 0

Francois Gouget : ntdll/tests: Skip some registry tests when missing elevated privileges.
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: cbff1b9540a46853a1700e8c895a57dade69e16d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbff1b9540a46853a1700e8c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 14 16:06:06 2020 +0100 ntdll/tests: Skip some registry tests when missing elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 51562786e99..24832312460 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1458,6 +1458,11 @@ static void test_redirection(void) pRtlInitUnicodeString( &str, wine64W ); status = pNtCreateKey( &root64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + if (status == STATUS_ACCESS_DENIED) + { + skip("Not authorized to modify KEY_WOW64_64KEY, no redirection\n"); + return; + } ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); pRtlInitUnicodeString( &str, wine32W );

1 0

Jacek Caban : dbghelp: Fetch version info only for PE modules in minidumps.
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: 04ddabfdff644561adf0e36050db1bbc63cad83a URL: https://source.winehq.org/git/wine.git/?a=commit;h=04ddabfdff644561adf0e360… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 14 21:11:36 2020 +0100 dbghelp: Fetch version info only for PE modules in minidumps. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/minidump.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index be155c67ce9..cae966b8e80 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -540,7 +540,8 @@ static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf) mdModule.ModuleNameRva = dc->rva; ms->Length -= sizeof(WCHAR); append(dc, ms, sizeof(ULONG) + ms->Length + sizeof(WCHAR)); - fetch_module_versioninfo(ms->Buffer, &mdModule.VersionInfo); + if (!dump_elf) fetch_module_versioninfo(ms->Buffer, &mdModule.VersionInfo); + else memset(&mdModule.VersionInfo, 0, sizeof(mdModule.VersionInfo)); mdModule.CvRecord.DataSize = 0; /* FIXME */ mdModule.CvRecord.Rva = 0; /* FIXME */ mdModule.MiscRecord.DataSize = 0; /* FIXME */

1 0

Francois Gouget : ntdll/tests: The case-sensitivity tests don't need write access.
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: 84907a9eb149363782cf05037759c52e1b34ef2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=84907a9eb149363782cf0503… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 14 16:06:16 2020 +0100 ntdll/tests: The case-sensitivity tests don't need write access. This fixes the tests when missing elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 24832312460..9335d9cc927 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -614,6 +614,7 @@ static void test_NtCreateKey(void) pRtlFreeUnicodeString( &str ); /* the REGISTRY part is case-sensitive unless OBJ_CASE_INSENSITIVE is specified */ + am = GENERIC_READ; attr.Attributes = 0; pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); @@ -624,14 +625,14 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str );

1 0

Francois Gouget : ws2_32/tests: Skip some raw socket tests when missing elevated privileges.
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: 948e08152bbe12c511526e2515bd11b5da4e78fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=948e08152bbe12c511526e25… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 14 15:45:46 2020 +0100 ws2_32/tests: Skip some raw socket tests when missing elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2d69a05aec5..8711b65fcea 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2551,29 +2551,35 @@ static void test_WSASocket(void) SOCK_RAW, socktype); closesocket(sock); - todo_wine { sock = WSASocketA(0, 0, IPPROTO_RAW, NULL, 0, 0); - ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", - WSAGetLastError()); - size = sizeof(socktype); - socktype = 0xdead; - err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); - ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", - SOCK_RAW, socktype); - closesocket(sock); + if (sock != INVALID_SOCKET) + { + todo_wine { + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); + } + + sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_TCP, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); } + else if (WSAGetLastError() == WSAEACCES) + skip("SOCK_RAW is not available\n"); + else + ok(0, "Failed to create socket: %d\n", WSAGetLastError()); - sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_TCP, NULL, 0, 0); - ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", - WSAGetLastError()); - size = sizeof(socktype); - socktype = 0xdead; - err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); - ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", - SOCK_RAW, socktype); - closesocket(sock); } /* IPX socket tests */

1 0

Alexandre Julliard : gdi32: Don't create font substitutes for identical names.
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: 057b4b41483fc03fb0518195c8115ac1305eb716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=057b4b41483fc03fb0518195… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 14 16:54:55 2020 +0100 gdi32: Don't create font substitutes for identical names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5da8b620fd4..764eb110086 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -605,7 +605,7 @@ static struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *se family->refcount = 1; lstrcpynW( family->family_name, name, LF_FACESIZE ); - if (second_name && second_name[0]) + if (second_name && second_name[0] && wcsicmp( name, second_name )) { lstrcpynW( family->second_name, second_name, LF_FACESIZE ); add_gdi_font_subst( second_name, -1, name, -1 );

1 0

Michael Stefaniuc : hnetcfg/tests: Use wide-char string literals.
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: 07592f75342f14877d3e2ceb4db0a5c8ec4cdbb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07592f75342f14877d3e2ceb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Dec 13 12:42:01 2020 +0100 hnetcfg/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/tests/policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 416049c0093..e2606933079 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -109,7 +109,7 @@ static void test_interfaces(void) static void test_NetFwAuthorizedApplication(void) { INetFwAuthorizedApplication *app; - static WCHAR empty[] = {0}; + static WCHAR empty[] = L""; UNIVERSAL_NAME_INFOW *info; WCHAR fullpath[MAX_PATH]; WCHAR netpath[MAX_PATH];

1 0

Alexandre Julliard : gdi32: Properly fail mapping glyph for invalid characters in fonts without encoding.
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: a0559ad5c3678527f7153da7f9e069ca05236b52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0559ad5c3678527f7153da7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 14 16:55:14 2020 +0100 gdi32: Properly fail mapping glyph for invalid characters in fonts without encoding. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50252 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 764eb110086..00bbeb0a11f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2919,6 +2919,8 @@ static UINT get_glyph_index( struct gdi_font *font, UINT glyph ) glyph = (unsigned char)ch; font_funcs->get_glyph_index( font, &glyph, FALSE ); } + else return 0; + return glyph; }

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: 4b7ae7398ecdffafb26e25b74504660170474915 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b7ae7398ecdffafb26e25b7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 14 22:55:47 2020 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 196 +++++++++++++++++++-------------------------------------------- 1 file changed, 57 insertions(+), 139 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b7ae7398ecdffafb26e…

1 0

Henri Verbeet : wined3d: Unmap the slab if needed in wined3d_context_vk_destroy_bo().
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: b4e109f2f535138bb3d0a29fb3199f7ae10b5fe4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4e109f2f535138bb3d0a29f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 14 18:15:22 2020 +0330 wined3d: Unmap the slab if needed in wined3d_context_vk_destroy_bo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 41 +++++++++++++++++++++++++++++++---------- dlls/wined3d/context_vk.c | 9 ++++++--- dlls/wined3d/wined3d_private.h | 5 +++++ 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4e804b60502..0404aa1877b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -772,12 +772,11 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ if ((slab = bo->slab)) { - if (!(bo->map_ptr = slab->map_ptr) && !(bo->map_ptr = wined3d_bo_vk_map(&slab->bo, context_vk))) + if (!(bo->map_ptr = wined3d_bo_slab_vk_map(slab, context_vk))) { ERR("Failed to map slab.\n"); return NULL; } - ++slab->map_count; } else if (bo->memory) { @@ -811,21 +810,43 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context if ((slab = bo->slab)) { - if (--slab->map_count) - return; + wined3d_bo_slab_vk_unmap(slab, context_vk); + return; + } - wined3d_bo_vk_unmap(&slab->bo, context_vk); - slab->map_ptr = NULL; + if (bo->memory) + { + wined3d_allocator_chunk_vk_unmap(wined3d_allocator_chunk_vk(bo->memory->chunk), context_vk); return; } vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context_vk->c.device); + VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); +} - if (bo->memory) - wined3d_allocator_chunk_vk_unmap(wined3d_allocator_chunk_vk(bo->memory->chunk), context_vk); - else - VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); +void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) +{ + TRACE("slab_vk %p, context_vk %p.\n", slab_vk, context_vk); + + if (!slab_vk->map_ptr && !(slab_vk->map_ptr = wined3d_bo_vk_map(&slab_vk->bo, context_vk))) + { + ERR("Failed to map slab.\n"); + return NULL; + } + + ++slab_vk->map_count; + + return slab_vk->map_ptr; +} + +void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) +{ + if (--slab_vk->map_count) + return; + + wined3d_bo_vk_unmap(&slab_vk->bo, context_vk); + slab_vk->map_ptr = NULL; } static VkAccessFlags vk_access_mask_from_buffer_usage(VkBufferUsageFlags usage) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index bd3dc50ab01..9db363172f1 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -797,15 +797,18 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_bo_slab_vk *slab_vk; size_t object_size, idx; TRACE("context_vk %p, bo %p.\n", context_vk, bo); - if (bo->slab) + if ((slab_vk = bo->slab)) { - object_size = bo->slab->bo.size / 32; + if (bo->map_ptr) + wined3d_bo_slab_vk_unmap(slab_vk, context_vk); + object_size = slab_vk->bo.size / 32; idx = bo->buffer_offset / object_size; - wined3d_context_vk_destroy_bo_slab_slice(context_vk, bo->slab, idx, bo->command_buffer_id); + wined3d_context_vk_destroy_bo_slab_slice(context_vk, slab_vk, idx, bo->command_buffer_id); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f48778ee345..0749f95f998 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1633,6 +1633,11 @@ struct wined3d_bo_slab_vk uint32_t map; }; +void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; + struct wined3d_bo_address { UINT_PTR buffer_object;

1 0